natas_hw
/
ant-ivy
mirror of https://github.com/apache/ant-ivy
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Checkstyle: trim trailing whitespace, replace tabs

This commit is contained in:
Gintas Grigelionis 2018-03-03 11:30:06 +01:00
parent 075134d7d0
commit 08e1d1cca8
51 changed files with 949 additions and 970 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/etc/checkstyle/checkstyle-suppress.xml
View File

@ -18,8 +18,8 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<suppressions>
<suppress checks="MagicNumber" files=".*[\\/]test[\\/]java[\\/].*"/>
</suppressions>
<suppress checks="MagicNumber" files=".*[\\/]test[\\/]java[\\/].*"/>
</suppressions>

1
src/etc/checkstyle/checkstyle-text.xsl
View File

@ -30,4 +30,3 @@
<xsl:value-of select="@message"/>
</xsl:template>
</xsl:stylesheet>

1
src/etc/checkstyle/checkstyle-xdoc.xsl
View File

@ -126,4 +126,3 @@
</xsl:attribute>
</xsl:template>
</xsl:stylesheet>

2
src/etc/license/license-header.xml
View File

@ -14,5 +14,5 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->

268
src/example/build-a-ivy-repository/settings/ivysettings-advanced.xml
View File

@ -14,148 +14,146 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<ivysettings>
<settings defaultResolver="my-repository"
defaultConflictManager="all" /> <!-- in order to get all revisions without any eviction -->
<caches defaultCacheDir="${ivy.cache.dir}/advanced" />
<settings defaultResolver="my-repository"
defaultConflictManager="all"/> <!-- in order to get all revisions without any eviction -->
<caches defaultCacheDir="${ivy.cache.dir}/advanced"/>
<!--
You can override this property to use one of the mirrors listed on
http://docs.codehaus.org/display/MAVENUSER/Mirrors+Repositories
-->
<property name="ibiblio-maven2-root" value="https://repo1.maven.org/maven2/" override="false" />
<!--
You can override this property to use one of the mirrors listed on
http://docs.codehaus.org/display/MAVENUSER/Mirrors+Repositories
-->
<property name="ibiblio-maven2-root" value="https://repo1.maven.org/maven2/" override="false"/>
<namespaces>
<namespace name="maven2">
<rule> <!-- imported apache maven1 projects -->
<fromsystem>
<src org="apache" module=".+"/>
<namespaces>
<namespace name="maven2">
<rule> <!-- imported apache maven1 projects -->
<fromsystem>
<src org="apache" module=".+"/>
<dest org="$m0" module="$m0"/>
</fromsystem>
<tosystem>
<src org="commons-.+" module="commons-.+" />
<src org="ant" module=".*" />
<src org="avalon-.+" module="avalon-.+" />
<src org="avalon" module="avalon" />
<src org="axis" module="axis" />
<src org="axis2" module="axis2" />
<src org="batik" module="batik" />
<src org="bcel" module="bcel" />
<src org="beehive" module="beehive" />
<src org="bsf" module="bsf" />
<src org="cactus" module="cactus" />
<src org="cocoon" module="cocoon" />
<src org="cornerstone-.+" module="cornerstone-.+" />
<src org="create-checksums" module="create-checksums" />
<src org="crimson" module="crimson" />
<src org="directory-.+" module="directory-.+" />
<src org="directory" module="directory" />
<src org="ecs" module="ecs" />
<src org="excalibur-.+" module="excalibur-.+" />
<src org="excalibur" module="excalibur" />
<src org="fop" module="fop" />
<src org="fulcrum" module="fulcrum" />
<src org="geronimo-.+" module="geronimo-.+" />
<src org="geronimo" module="geronimo" />
<src org="hivemind" module="hivemind" />
<src org="jakarta-regexp" module="jakarta-regexp" />
<src org="james" module="james" />
<src org="jaxme" module="jaxme" />
<src org="jcs-javagroups" module="jcs-javagroups" />
<src org="jcs" module="jcs" />
<src org="jspapi" module="jspapi" />
<src org="jstl" module="jstl" />
<src org="juddi" module="juddi" />
<src org="log4j" module="log4j" />
<src org="logkit" module="logkit" />
<src org="lucene" module="lucene" />
<src org="magicGball" module="magicGball" />
<src org="maven" module="maven" />
<src org="merlin-developer" module="merlin-developer" />
<src org="merlin" module="merlin" />
<src org="muse" module="muse" />
<src org="myfaces" module="myfaces" />
<src org="nekohtml" module="nekohtml" />
<src org="ojb" module="ojb" />
<src org="oro" module="oro" />
<src org="pluto-container" module="pluto-container" />
<src org="poi" module="poi" />
<src org="pubscribe" module="pubscribe" />
<src org="sandesha" module="sandesha" />
<src org="servletapi" module="servletapi" />
<src org="slide" module=".*" />
<src org="stratum" module="stratum" />
<src org="struts" module="struts" />
<src org="taglibs" module="taglibs" />
<src org="tapestry" module="tapestry" />
<src org="tomcat-util" module="tomcat-util" />
<src org="tomcat" module="tomcat" />
<src org="torque" module="torque" />
<src org="turbine" module="turbine" />
<src org="velocity-.+" module="velocity-.+" />
<src org="velocity" module="velocity" />
<src org="ws-commons.*" module="ws-commons.*" />
<src org="wsdl4j" module="wsdl4j" />
<src org="wsrf" module="wsrf" />
<src org="xalan" module="xalan" />
<src org="xerces" module=".*" />
<src org="xercesjarv" module="xercesjarv" />
<src org="xml-apis" module="xml-apis" />
<src org="xml-resolver" module="xml-resolver" />
<src org="xml-security" module="xml-security" />
<src org="xmlbeans" module="xmlbeans" />
<src org="xmlrpc" module="xmlrpc" />
<dest org="apache" module="$m0"/>
</tosystem>
</rule>
<src org="commons-.+" module="commons-.+"/>
<src org="ant" module=".*"/>
<src org="avalon-.+" module="avalon-.+"/>
<src org="avalon" module="avalon"/>
<src org="axis" module="axis"/>
<src org="axis2" module="axis2"/>
<src org="batik" module="batik"/>
<src org="bcel" module="bcel"/>
<src org="beehive" module="beehive"/>
<src org="bsf" module="bsf"/>
<src org="cactus" module="cactus"/>
<src org="cocoon" module="cocoon"/>
<src org="cornerstone-.+" module="cornerstone-.+"/>
<src org="create-checksums" module="create-checksums"/>
<src org="crimson" module="crimson"/>
<src org="directory-.+" module="directory-.+"/>
<src org="directory" module="directory"/>
<src org="ecs" module="ecs"/>
<src org="excalibur-.+" module="excalibur-.+"/>
<src org="excalibur" module="excalibur"/>
<src org="fop" module="fop"/>
<src org="fulcrum" module="fulcrum"/>
<src org="geronimo-.+" module="geronimo-.+"/>
<src org="geronimo" module="geronimo"/>
<src org="hivemind" module="hivemind"/>
<src org="jakarta-regexp" module="jakarta-regexp"/>
<src org="james" module="james"/>
<src org="jaxme" module="jaxme"/>
<src org="jcs-javagroups" module="jcs-javagroups"/>
<src org="jcs" module="jcs"/>
<src org="jspapi" module="jspapi"/>
<src org="jstl" module="jstl"/>
<src org="juddi" module="juddi"/>
<src org="log4j" module="log4j"/>
<src org="logkit" module="logkit"/>
<src org="lucene" module="lucene"/>
<src org="magicGball" module="magicGball"/>
<src org="maven" module="maven"/>
<src org="merlin-developer" module="merlin-developer"/>
<src org="merlin" module="merlin"/>
<src org="muse" module="muse"/>
<src org="myfaces" module="myfaces"/>
<src org="nekohtml" module="nekohtml"/>
<src org="ojb" module="ojb"/>
<src org="oro" module="oro"/>
<src org="pluto-container" module="pluto-container"/>
<src org="poi" module="poi"/>
<src org="pubscribe" module="pubscribe"/>
<src org="sandesha" module="sandesha"/>
<src org="servletapi" module="servletapi"/>
<src org="slide" module=".*"/>
<src org="stratum" module="stratum"/>
<src org="struts" module="struts"/>
<src org="taglibs" module="taglibs"/>
<src org="tapestry" module="tapestry"/>
<src org="tomcat-util" module="tomcat-util"/>
<src org="tomcat" module="tomcat"/>
<src org="torque" module="torque"/>
<src org="turbine" module="turbine"/>
<src org="velocity-.+" module="velocity-.+"/>
<src org="velocity" module="velocity"/>
<src org="ws-commons.*" module="ws-commons.*"/>
<src org="wsdl4j" module="wsdl4j"/>
<src org="wsrf" module="wsrf"/>
<src org="xalan" module="xalan"/>
<src org="xerces" module=".*"/>
<src org="xercesjarv" module="xercesjarv"/>
<src org="xml-apis" module="xml-apis"/>
<src org="xml-resolver" module="xml-resolver"/>
<src org="xml-security" module="xml-security"/>
<src org="xmlbeans" module="xmlbeans"/>
<src org="xmlrpc" module="xmlrpc"/>
<rule> <!-- new apache projects -->
<fromsystem>
<src org="apache" />
<dest org="org.apache"/>
</fromsystem>
<tosystem>
<src org="org.apache" />
<dest org="apache" />
</tosystem>
</rule>
<rule> <!-- hibernate -->
<fromsystem>
<src org="hibernate" />
<dest org="org.hibernate"/>
</fromsystem>
<tosystem>
<src org="org.hibernate" />
<dest org="hibernate" />
</tosystem>
</rule>
<rule> <!-- net.sf projects -->
<fromsystem>
<src org="ehcache" />
<dest org="net.sf.$o0"/>
</fromsystem>
<tosystem>
<src org="net.sf.(.+)" />
<dest org="$o1" />
</tosystem>
</rule>
</namespace>
</namespaces>
<dest org="apache" module="$m0"/>
</tosystem>
</rule>
<resolvers>
<filesystem name="my-repository">
<ivy pattern="${dest.repo.dir}/advanced/[organisation]/[module]/ivys/ivy-[revision].xml"/>
<artifact pattern="${dest.repo.dir}/advanced/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
</filesystem>
<ibiblio name="libraries"
root="${ibiblio-maven2-root}"
m2compatible="true"
namespace="maven2"
/>
</resolvers>
<rule> <!-- new apache projects -->
<fromsystem>
<src org="apache"/>
<dest org="org.apache"/>
</fromsystem>
<tosystem>
<src org="org.apache"/>
<dest org="apache"/>
</tosystem>
</rule>
<rule> <!-- hibernate -->
<fromsystem>
<src org="hibernate"/>
<dest org="org.hibernate"/>
</fromsystem>
<tosystem>
<src org="org.hibernate"/>
<dest org="hibernate"/>
</tosystem>
</rule>
<rule> <!-- net.sf projects -->
<fromsystem>
<src org="ehcache"/>
<dest org="net.sf.$o0"/>
</fromsystem>
<tosystem>
<src org="net.sf.(.+)"/>
<dest org="$o1"/>
</tosystem>
</rule>
</namespace>
</namespaces>
<resolvers>
<filesystem name="my-repository">
<ivy pattern="${dest.repo.dir}/advanced/[organisation]/[module]/ivys/ivy-[revision].xml"/>
<artifact pattern="${dest.repo.dir}/advanced/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
</filesystem>
<ibiblio name="libraries"
root="${ibiblio-maven2-root}"
m2compatible="true"
namespace="maven2"/>
</resolvers>
</ivysettings>

22
src/example/build-a-ivy-repository/settings/ivysettings-basic.xml
View File

@ -14,17 +14,17 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<ivysettings>
<settings defaultResolver="libraries"
defaultConflictManager="all" /> <!-- in order to get all revisions without any eviction -->
<caches defaultCacheDir="${ivy.cache.dir}/no-namespace" />
<resolvers>
<ibiblio name="libraries" m2compatible="true" />
<filesystem name="my-repository">
<ivy pattern="${dest.repo.dir}/no-namespace/[organisation]/[module]/ivys/ivy-[revision].xml"/>
<artifact pattern="${dest.repo.dir}/no-namespace/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
</filesystem>
</resolvers>
<settings defaultResolver="libraries"
defaultConflictManager="all"/> <!-- in order to get all revisions without any eviction -->
<caches defaultCacheDir="${ivy.cache.dir}/no-namespace"/>
<resolvers>
<ibiblio name="libraries" m2compatible="true"/>
<filesystem name="my-repository">
<ivy pattern="${dest.repo.dir}/no-namespace/[organisation]/[module]/ivys/ivy-[revision].xml"/>
<artifact pattern="${dest.repo.dir}/no-namespace/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
</filesystem>
</resolvers>
</ivysettings>

6
src/example/chained-resolvers/settings/ivysettings.xml
View File

@ -14,16 +14,16 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<ivysettings>
<settings defaultResolver="chain-example"/>
<resolvers>
<chain name="chain-example">
<filesystem name="libraries">
<artifact pattern="${ivy.settings.dir}/repository/[artifact]-[revision].[ext]" />
<artifact pattern="${ivy.settings.dir}/repository/[artifact]-[revision].[ext]"/>
</filesystem>
<ibiblio name="ibiblio" m2compatible="true" />
<ibiblio name="ibiblio" m2compatible="true"/>
</chain>
</resolvers>
</ivysettings>

36
src/example/configurations/jdbc-example/src/dev.properties
View File

@ -1,19 +1,19 @@
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
driver.class=com.mckoi.JDBCDriver

36
src/example/configurations/jdbc-example/src/prod.properties
View File

@ -1,19 +1,19 @@
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
driver.class=org.gjt.mm.mysql.Driver

36
src/example/dependence/settings/ivysettings.properties
View File

@ -1,19 +1,19 @@
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
repository.dir=${ivy.settings.dir}/repository

28
src/example/dependence/settings/ivysettings.xml
View File

@ -14,20 +14,20 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<ivysettings>
<properties file="${ivy.settings.dir}/ivysettings.properties"/>
<settings defaultResolver="libraries" />
<caches defaultCacheDir="${ivy.settings.dir}/ivy-cache" />
<resolvers>
<filesystem name="projects">
<artifact pattern="${repository.dir}/[artifact]-[revision].[ext]" />
<ivy pattern="${repository.dir}/[module]-[revision].xml" />
</filesystem>
<ibiblio name="libraries" m2compatible="true" usepoms="false" />
</resolvers>
<modules>
<module organisation="org.apache" name="dependee" resolver="projects"/>
</modules>
<properties file="${ivy.settings.dir}/ivysettings.properties"/>
<settings defaultResolver="libraries"/>
<caches defaultCacheDir="${ivy.settings.dir}/ivy-cache"/>
<resolvers>
<filesystem name="projects">
<artifact pattern="${repository.dir}/[artifact]-[revision].[ext]"/>
<ivy pattern="${repository.dir}/[module]-[revision].xml"/>
</filesystem>
<ibiblio name="libraries" m2compatible="true" usepoms="false"/>
</resolvers>
<modules>
<module organisation="org.apache" name="dependee" resolver="projects"/>
</modules>
</ivysettings>

13
src/example/dual/repository/commons-httpclient-ivy-2.0.2.xml
View File

@ -14,15 +14,14 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<ivy-module version="1.0">
<info
organisation="commons-httpclient"
module="commons-httpclient"
revision="2.0.2"
status="release"
publication="20041010174300"/>
<info organisation="commons-httpclient"
module="commons-httpclient"
revision="2.0.2"
status="release"
publication="20041010174300"/>
<dependencies>
<dependency org="commons-logging" name="commons-logging" rev="1.0.4" conf="default"/>
</dependencies>

6
src/example/dual/settings/ivysettings.xml
View File

@ -14,16 +14,16 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<ivysettings>
<settings defaultResolver="dual-example"/>
<resolvers>
<dual name="dual-example">
<filesystem name="ivys">
<ivy pattern="${ivy.settings.dir}/../repository/[module]-ivy-[revision].xml" />
<ivy pattern="${ivy.settings.dir}/../repository/[module]-ivy-[revision].xml"/>
</filesystem>
<ibiblio name="ibiblio" m2compatible="true" usepoms="false" />
<ibiblio name="ibiblio" m2compatible="true" usepoms="false"/>
</dual>
</resolvers>
</ivysettings>

20
src/example/go-ivy/build.xml
View File

@ -78,25 +78,25 @@
<target name="go" depends="install-ivy, generate-src"
description="--> resolve dependencies, compile and run the project">
<echo message="using ivy to resolve commons-lang 2.1..."/>
<!-- here comes the magic line: asks ivy to resolve a dependency on
<!-- here comes the magic line: asks ivy to resolve a dependency on
commons-lang 2.1 and to build an ant path with it from its cache -->
<ivy:cachepath organisation="commons-lang" module="commons-lang" revision="2.1"
<ivy:cachepath organisation="commons-lang" module="commons-lang" revision="2.1"
pathid="lib.path.id" inline="true"/>
<echo message="compiling..."/>
<mkdir dir="${build.dir}"/>
<javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="lib.path.id" includeAntRuntime="false"/>
<echo message="compiling..."/>
<mkdir dir="${build.dir}"/>
<javac srcdir="${src.dir}" destdir="${build.dir}" classpathref="lib.path.id" includeAntRuntime="false"/>
<echo>
<echo>
We are now ready to execute our simple program with its dependency on commons-lang.
Let's go!
</echo>
<java classname="example.Hello">
</echo>
<java classname="example.Hello">
<classpath>
<path refid="lib.path.id"/>
<path location="${build.dir}"/>
<path location="${build.dir}"/>
</classpath>
</java>
</java>
</target>
<!-- =================================

4
src/example/multi-project/build.xml
View File

@ -45,8 +45,8 @@
<target name="buildlist" depends="load-ivy">
<ivy:buildlist reference="build-path">
<fileset dir="projects" includes="**/build.xml"/>
</ivy:buildlist>
<fileset dir="projects" includes="**/build.xml"/>
</ivy:buildlist>
</target>
<target name="publish-all" depends="buildlist"

36
src/example/multi-project/common/build.properties
View File

@ -1,21 +1,21 @@
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
lib.dir = ${basedir}/lib
build.dir = ${basedir}/build
classes.dir = ${build.dir}/classes

36
src/example/multi-project/projects/console/build.properties
View File

@ -1,21 +1,21 @@
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
projects.dir = ${basedir}/..
wkspace.dir = ${projects.dir}/..
common.dir = ${wkspace.dir}/common

8
src/example/multi-project/projects/console/build.xml
View File

@ -14,10 +14,10 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<project name="console" default="compile">
<property file="build.properties"/>
<import file="${common.dir}/common.xml"/>
<property file="build.properties"/>
<import file="${common.dir}/common.xml"/>
</project>

36
src/example/multi-project/projects/find/build.properties
View File

@ -1,21 +1,21 @@
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
projects.dir = ${basedir}/..
wkspace.dir = ${projects.dir}/..
common.dir = ${wkspace.dir}/common

8
src/example/multi-project/projects/find/build.xml
View File

@ -14,10 +14,10 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<project name="find" default="compile">
<property file="build.properties"/>
<import file="${common.dir}/common.xml"/>
<property file="build.properties"/>
<import file="${common.dir}/common.xml"/>
</project>

36
src/example/multi-project/projects/list/build.properties
View File

@ -1,21 +1,21 @@
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
projects.dir = ${basedir}/..
wkspace.dir = ${projects.dir}/..
common.dir = ${wkspace.dir}/common

8
src/example/multi-project/projects/list/build.xml
View File

@ -14,10 +14,10 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<project name="list" default="compile">
<property file="build.properties"/>
<import file="${common.dir}/common.xml"/>
<property file="build.properties"/>
<import file="${common.dir}/common.xml"/>
</project>

36
src/example/multi-project/projects/size/build.properties
View File

@ -1,21 +1,21 @@
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
projects.dir = ${basedir}/..
wkspace.dir = ${projects.dir}/..
common.dir = ${wkspace.dir}/common

8
src/example/multi-project/projects/size/build.xml
View File

@ -14,10 +14,10 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<project name="size" default="compile">
<property file="build.properties"/>
<import file="${common.dir}/common.xml"/>
<property file="build.properties"/>
<import file="${common.dir}/common.xml"/>
</project>

36
src/example/multi-project/projects/sizewhere/build.properties
View File

@ -1,21 +1,21 @@
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
projects.dir = ${basedir}/..
wkspace.dir = ${projects.dir}/..
common.dir = ${wkspace.dir}/common

8
src/example/multi-project/projects/sizewhere/build.xml
View File

@ -14,10 +14,10 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<project name="sizewhere" default="compile">
<property file="build.properties"/>
<import file="${common.dir}/common.xml"/>
<property file="build.properties"/>
<import file="${common.dir}/common.xml"/>
</project>

36
src/example/multi-project/projects/version/build.properties
View File

@ -1,21 +1,21 @@
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
projects.dir = ${basedir}/..
wkspace.dir = ${projects.dir}/..
common.dir = ${wkspace.dir}/common

8
src/example/multi-project/projects/version/build.xml
View File

@ -14,10 +14,10 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<project name="version" default="compile">
<property file="build.properties"/>
<import file="${common.dir}/common.xml"/>
<property file="build.properties"/>
<import file="${common.dir}/common.xml"/>
</project>

3
src/example/packager-resolver/ivysettings.xml
View File

@ -14,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<ivysettings>
<resolvers>
@ -32,4 +32,3 @@
</modules>
<caches useOrigin="true"/>
</ivysettings>

66
src/java/org/apache/ivy/ant/antlib.xml
View File

@ -15,39 +15,39 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<antlib xmlns:current="ant:current">
<typedef name="settings" classname="org.apache.ivy.ant.IvyAntSettings"/>
<typedef name="resources" classname="org.apache.ivy.ant.IvyResources" onerror="report"/>
<taskdef name="configure" classname="org.apache.ivy.ant.IvyConfigure"/>
<taskdef name="resolve" classname="org.apache.ivy.ant.IvyResolve"/>
<taskdef name="retrieve" classname="org.apache.ivy.ant.IvyRetrieve"/>
<taskdef name="deliver" classname="org.apache.ivy.ant.IvyDeliver"/>
<taskdef name="publish" classname="org.apache.ivy.ant.IvyPublish"/>
<taskdef name="extract" classname="org.apache.ivy.ant.IvyExtractFromSources"/>
<taskdef name="cachepath" classname="org.apache.ivy.ant.IvyCachePath"/>
<taskdef name="cachefileset" classname="org.apache.ivy.ant.IvyCacheFileset"/>
<taskdef name="report" classname="org.apache.ivy.ant.IvyReport"/>
<taskdef name="repreport" classname="org.apache.ivy.ant.IvyRepositoryReport"/>
<taskdef name="var" classname="org.apache.ivy.ant.IvyVar"/>
<taskdef name="check" classname="org.apache.ivy.ant.IvyCheck"/>
<taskdef name="artifactproperty" classname="org.apache.ivy.ant.IvyArtifactProperty"/>
<taskdef name="buildlist" classname="org.apache.ivy.ant.IvyBuildList"/>
<taskdef name="install" classname="org.apache.ivy.ant.IvyInstall"/>
<taskdef name="convertpom" classname="org.apache.ivy.ant.IvyConvertPom"/>
<taskdef name="makepom" classname="org.apache.ivy.ant.IvyMakePom"/>
<taskdef name="artifactreport" classname="org.apache.ivy.ant.IvyArtifactReport"/>
<taskdef name="info" classname="org.apache.ivy.ant.IvyInfo"/>
<taskdef name="addpath" classname="org.apache.ivy.ant.AddPathTask"/>
<taskdef name="listmodules" classname="org.apache.ivy.ant.IvyListModules"/>
<taskdef name="findrevision" classname="org.apache.ivy.ant.IvyFindRevision"/>
<taskdef name="buildnumber" classname="org.apache.ivy.ant.IvyBuildNumber"/>
<taskdef name="cleancache" classname="org.apache.ivy.ant.IvyCleanCache"/>
<taskdef name="buildobr" classname="org.apache.ivy.ant.BuildOBRTask"/>
<taskdef name="convertmanifest" classname="org.apache.ivy.ant.ConvertManifestTask"/>
<taskdef name="fixdeps" classname="org.apache.ivy.ant.FixDepsTask"/>
<taskdef name="dependencytree" classname="org.apache.ivy.ant.IvyDependencyTree"/>
<taskdef name="checkdepsupdate" classname="org.apache.ivy.ant.IvyDependencyUpdateChecker"/>
<typedef name="workspaceresolver" classname="org.apache.ivy.ant.AntWorkspaceResolver"/>
<typedef name="settings" classname="org.apache.ivy.ant.IvyAntSettings"/>
<typedef name="resources" classname="org.apache.ivy.ant.IvyResources" onerror="report"/>
<taskdef name="configure" classname="org.apache.ivy.ant.IvyConfigure"/>
<taskdef name="resolve" classname="org.apache.ivy.ant.IvyResolve"/>
<taskdef name="retrieve" classname="org.apache.ivy.ant.IvyRetrieve"/>
<taskdef name="deliver" classname="org.apache.ivy.ant.IvyDeliver"/>
<taskdef name="publish" classname="org.apache.ivy.ant.IvyPublish"/>
<taskdef name="extract" classname="org.apache.ivy.ant.IvyExtractFromSources"/>
<taskdef name="cachepath" classname="org.apache.ivy.ant.IvyCachePath"/>
<taskdef name="cachefileset" classname="org.apache.ivy.ant.IvyCacheFileset"/>
<taskdef name="report" classname="org.apache.ivy.ant.IvyReport"/>
<taskdef name="repreport" classname="org.apache.ivy.ant.IvyRepositoryReport"/>
<taskdef name="var" classname="org.apache.ivy.ant.IvyVar"/>
<taskdef name="check" classname="org.apache.ivy.ant.IvyCheck"/>
<taskdef name="artifactproperty" classname="org.apache.ivy.ant.IvyArtifactProperty"/>
<taskdef name="buildlist" classname="org.apache.ivy.ant.IvyBuildList"/>
<taskdef name="install" classname="org.apache.ivy.ant.IvyInstall"/>
<taskdef name="convertpom" classname="org.apache.ivy.ant.IvyConvertPom"/>
<taskdef name="makepom" classname="org.apache.ivy.ant.IvyMakePom"/>
<taskdef name="artifactreport" classname="org.apache.ivy.ant.IvyArtifactReport"/>
<taskdef name="info" classname="org.apache.ivy.ant.IvyInfo"/>
<taskdef name="addpath" classname="org.apache.ivy.ant.AddPathTask"/>
<taskdef name="listmodules" classname="org.apache.ivy.ant.IvyListModules"/>
<taskdef name="findrevision" classname="org.apache.ivy.ant.IvyFindRevision"/>
<taskdef name="buildnumber" classname="org.apache.ivy.ant.IvyBuildNumber"/>
<taskdef name="cleancache" classname="org.apache.ivy.ant.IvyCleanCache"/>
<taskdef name="buildobr" classname="org.apache.ivy.ant.BuildOBRTask"/>
<taskdef name="convertmanifest" classname="org.apache.ivy.ant.ConvertManifestTask"/>
<taskdef name="fixdeps" classname="org.apache.ivy.ant.FixDepsTask"/>
<taskdef name="dependencytree" classname="org.apache.ivy.ant.IvyDependencyTree"/>
<taskdef name="checkdepsupdate" classname="org.apache.ivy.ant.IvyDependencyUpdateChecker"/>
<typedef name="workspaceresolver" classname="org.apache.ivy.ant.AntWorkspaceResolver"/>
</antlib>

38
src/java/org/apache/ivy/core/module/id/package.html
View File

@ -1,4 +1,3 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@ -15,7 +14,7 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<html>
<head>
@ -28,12 +27,12 @@ This packages gathers classes used to represent identifiers of objects involved
As identifiers, they do not store any information on the module content and detailed metadata (like dependencies).
</p>
<h2>Classes</h2>
<ul>
<li>ModuleId</li> is used as the identifier of module, without considering its version. It's basically an organization and module name couple.
<li>ModuleRevisionId</li> is used as the identifier of a module in a particular version or version constraint. It is composed of a ModuleId, a revision, and optionally a branch and extra attributes.
<li>ArtifactId</li> identifies an artifact without considering its version. It's basically a ModuleId and an artifact name, type and extension, plus optional extra attributes.
<li>ArtifactRevisionId</li> identifies an artifact of a module in a particular version. It is composed of a ModuleRevisionId along with artifact identifier like the name type and extension.
</ul>
<dl>
<dt>ModuleId</dt><dd>is used as the identifier of module, without considering its version. It's basically an organization and module name couple.</dd>
<dt>ModuleRevisionId</dt><dd>is used as the identifier of a module in a particular version or version constraint. It is composed of a ModuleId, a revision, and optionally a branch and extra attributes.</dd>
<dt>ArtifactId</dt><dd>identifies an artifact without considering its version. It's basically a ModuleId and an artifact name, type and extension, plus optional extra attributes.</dd>
<dt>ArtifactRevisionId</dt><dd>identifies an artifact of a module in a particular version. It is composed of a ModuleRevisionId along with artifact identifier like the name type and extension.</dd>
</dl>
<h2>Text Representation</h2>
<p>
These classes share an homogeneous text representation, which can be easily obtained through the toString() method.
@ -44,16 +43,17 @@ The # before the branch is present only if the branch is not empty.<br/>
The type and surrounding parenthesis are present only if different from the extension.
</p>
<p>
A textual representation can be parsed into an object (supported for ModuleRevisionId only yet), as long as a strict set of characters is used for each field (which is recommended).<br/>
A textual representation can be parsed into an object (supported for ModuleRevisionId only yet), as long as a strict set of characters is used for each field (which is recommended).
</p>
Allowed characters are:
<ul>
<li>organisation</li> a-z A-Z 0-9 - / . _ + =
<li>module</li> a-z A-Z 0-9 - / . _ + =
<li>branch</li> a-z A-Z 0-9 - / . _ + =
<li>revision</li> a-z A-Z 0-9 - / . _ + = , [ ] { } ( ) : @
<li>artifact</li> a-z A-Z 0-9 - / . _ + =
<li>extension</li> a-z A-Z 0-9 - / . _ + =
<li>type</li> a-z A-Z 0-9 - / . _ + =
</ul>
<dl>
<dt>organisation</dt><dd><code>a-z A-Z 0-9 - / . _ + =</code></dd>
<dt>module</dt><dd><code>a-z A-Z 0-9 - / . _ + =</code></dd>
<dt>branch</dt><dd><code>a-z A-Z 0-9 - / . _ + =</code></dd>
<dt>revision</dt><dd><code>a-z A-Z 0-9 - / . _ + = , [ ] { } ( ) : @</code></dd>
<dt>artifact</dt><dd><code>a-z A-Z 0-9 - / . _ + =</code></dd>
<dt>extension</dt><dd><code>a-z A-Z 0-9 - / . _ + =</code></dd>
<dt>type</dt><dd><code>a-z A-Z 0-9 - / . _ + =</code></dd>
</dl>
</body>
</body>

38
src/java/org/apache/ivy/core/settings/ivy.properties
View File

@ -1,26 +1,26 @@
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
ivy.project.dir = ${basedir}
ivy.lib.dir = ${ivy.project.dir}/lib
ivy.build.artifacts.dir = ${ivy.project.dir}/build/artifacts
ivy.distrib.dir = ${ivy.project.dir}/distrib
ivy.resolver.default.check.modified = false
ivy.default.always.check.exact.revision = false

18
src/java/org/apache/ivy/core/settings/ivysettings-1.4.xml
View File

@ -14,15 +14,15 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<ivysettings>
<settings defaultResolver="default"/>
<resolvers>
<ivyrep name="public" ivyroot="http://ivyrep.jayasoft.org/" />
</resolvers>
<include url="${ivy.default.settings.dir}/ivysettings-shared.xml"/>
<include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
<include url="${ivy.default.settings.dir}/ivysettings-main-chain.xml"/>
<include url="${ivy.default.settings.dir}/ivysettings-default-chain.xml"/>
<settings defaultResolver="default"/>
<resolvers>
<ivyrep name="public" ivyroot="http://ivyrep.jayasoft.org/"/>
</resolvers>
<include url="${ivy.default.settings.dir}/ivysettings-shared.xml"/>
<include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
<include url="${ivy.default.settings.dir}/ivysettings-main-chain.xml"/>
<include url="${ivy.default.settings.dir}/ivysettings-default-chain.xml"/>
</ivysettings>

14
src/java/org/apache/ivy/core/settings/ivysettings-default-chain.xml
View File

@ -14,13 +14,13 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<ivysettings>
<resolvers>
<chain name="default" returnFirst="true" checkmodified="true">
<resolver ref="local"/>
<resolver ref="main"/>
</chain>
</resolvers>
<resolvers>
<chain name="default" returnFirst="true" checkmodified="true">
<resolver ref="local"/>
<resolver ref="main"/>
</chain>
</resolvers>
</ivysettings>

20
src/java/org/apache/ivy/core/settings/ivysettings-local.xml
View File

@ -14,16 +14,16 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<ivysettings>
<property name="ivy.local.default.root" value="${ivy.default.ivy.user.dir}/local" override="false"/>
<property name="ivy.local.default.ivy.pattern" value="[organisation]/[module]/[revision]/[type]s/[artifact].[ext]" override="false"/>
<property name="ivy.local.default.artifact.pattern" value="[organisation]/[module]/[revision]/[type]s/[artifact].[ext]" override="false"/>
<resolvers>
<filesystem name="local">
<ivy pattern="${ivy.local.default.root}/${ivy.local.default.ivy.pattern}" />
<artifact pattern="${ivy.local.default.root}/${ivy.local.default.artifact.pattern}" />
</filesystem>
</resolvers>
<property name="ivy.local.default.root" value="${ivy.default.ivy.user.dir}/local" override="false"/>
<property name="ivy.local.default.ivy.pattern" value="[organisation]/[module]/[revision]/[type]s/[artifact].[ext]" override="false"/>
<property name="ivy.local.default.artifact.pattern" value="[organisation]/[module]/[revision]/[type]s/[artifact].[ext]" override="false"/>
<resolvers>
<filesystem name="local">
<ivy pattern="${ivy.local.default.root}/${ivy.local.default.ivy.pattern}" />
<artifact pattern="${ivy.local.default.root}/${ivy.local.default.artifact.pattern}" />
</filesystem>
</resolvers>
</ivysettings>

14
src/java/org/apache/ivy/core/settings/ivysettings-main-chain.xml
View File

@ -14,13 +14,13 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<ivysettings>
<resolvers>
<chain name="main" dual="true">
<resolver ref="shared"/>
<resolver ref="public"/>
</chain>
</resolvers>
<resolvers>
<chain name="main" dual="true">
<resolver ref="shared"/>
<resolver ref="public"/>
</chain>
</resolvers>
</ivysettings>

8
src/java/org/apache/ivy/core/settings/ivysettings-public.xml
View File

@ -14,10 +14,10 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<ivysettings>
<resolvers>
<ibiblio name="public" m2compatible="true"/>
</resolvers>
<resolvers>
<ibiblio name="public" m2compatible="true"/>
</resolvers>
</ivysettings>

20
src/java/org/apache/ivy/core/settings/ivysettings-shared.xml
View File

@ -14,16 +14,16 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<ivysettings>
<property name="ivy.shared.default.root" value="${ivy.default.ivy.user.dir}/shared" override="false"/>
<property name="ivy.shared.default.ivy.pattern" value="[organisation]/[module]/[revision]/[type]s/[artifact].[ext]" override="false"/>
<property name="ivy.shared.default.artifact.pattern" value="[organisation]/[module]/[revision]/[type]s/[artifact].[ext]" override="false"/>
<resolvers>
<filesystem name="shared">
<ivy pattern="${ivy.shared.default.root}/${ivy.shared.default.ivy.pattern}" />
<artifact pattern="${ivy.shared.default.root}/${ivy.shared.default.artifact.pattern}" />
</filesystem>
</resolvers>
<property name="ivy.shared.default.root" value="${ivy.default.ivy.user.dir}/shared" override="false"/>
<property name="ivy.shared.default.ivy.pattern" value="[organisation]/[module]/[revision]/[type]s/[artifact].[ext]" override="false"/>
<property name="ivy.shared.default.artifact.pattern" value="[organisation]/[module]/[revision]/[type]s/[artifact].[ext]" override="false"/>
<resolvers>
<filesystem name="shared">
<ivy pattern="${ivy.shared.default.root}/${ivy.shared.default.ivy.pattern}" />
<artifact pattern="${ivy.shared.default.root}/${ivy.shared.default.artifact.pattern}" />
</filesystem>
</resolvers>
</ivysettings>

14
src/java/org/apache/ivy/core/settings/ivysettings.xml
View File

@ -14,13 +14,13 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<ivysettings>
<settings defaultResolver="default"/>
<include url="${ivy.default.settings.dir}/ivysettings-public.xml"/>
<include url="${ivy.default.settings.dir}/ivysettings-shared.xml"/>
<include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
<include url="${ivy.default.settings.dir}/ivysettings-main-chain.xml"/>
<include url="${ivy.default.settings.dir}/ivysettings-default-chain.xml"/>
<settings defaultResolver="default"/>
<include url="${ivy.default.settings.dir}/ivysettings-public.xml"/>
<include url="${ivy.default.settings.dir}/ivysettings-shared.xml"/>
<include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
<include url="${ivy.default.settings.dir}/ivysettings-main-chain.xml"/>
<include url="${ivy.default.settings.dir}/ivysettings-default-chain.xml"/>
</ivysettings>

36
src/java/org/apache/ivy/core/settings/repository.properties
View File

@ -1,21 +1,21 @@
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
ivy.ibiblio.default.artifact.root = http://www.ibiblio.org/maven/
ivy.ibiblio.default.artifact.pattern = [module]/[type]s/[artifact]-[revision].[ext]

106
src/java/org/apache/ivy/core/settings/typedef.properties
View File

@ -1,70 +1,68 @@
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
filesystem = org.apache.ivy.plugins.resolver.FileSystemResolver
chain = org.apache.ivy.plugins.resolver.ChainResolver
ibiblio = org.apache.ivy.plugins.resolver.IBiblioResolver
bintray = org.apache.ivy.plugins.resolver.BintrayResolver
url = org.apache.ivy.plugins.resolver.URLResolver
dual = org.apache.ivy.plugins.resolver.DualResolver
ivyrep = org.apache.ivy.plugins.resolver.IvyRepResolver
ssh = org.apache.ivy.plugins.resolver.SshResolver
sftp = org.apache.ivy.plugins.resolver.SFTPResolver
vsftp = org.apache.ivy.plugins.resolver.VsftpResolver
vfs = org.apache.ivy.plugins.resolver.VfsResolver
jar = org.apache.ivy.plugins.resolver.JarResolver
packager = org.apache.ivy.plugins.resolver.packager.PackagerResolver
obr = org.apache.ivy.osgi.obr.OBRResolver
mirroredurl = org.apache.ivy.plugins.resolver.MirroredURLResolver
updatesite = org.apache.ivy.osgi.updatesite.UpdateSiteResolver
osgi-agg = org.apache.ivy.osgi.repo.AggregatedOSGiResolver
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
filesystem = org.apache.ivy.plugins.resolver.FileSystemResolver
chain = org.apache.ivy.plugins.resolver.ChainResolver
ibiblio = org.apache.ivy.plugins.resolver.IBiblioResolver
bintray = org.apache.ivy.plugins.resolver.BintrayResolver
url = org.apache.ivy.plugins.resolver.URLResolver
dual = org.apache.ivy.plugins.resolver.DualResolver
ivyrep = org.apache.ivy.plugins.resolver.IvyRepResolver
ssh = org.apache.ivy.plugins.resolver.SshResolver
sftp = org.apache.ivy.plugins.resolver.SFTPResolver
vsftp = org.apache.ivy.plugins.resolver.VsftpResolver
vfs = org.apache.ivy.plugins.resolver.VfsResolver
jar = org.apache.ivy.plugins.resolver.JarResolver
packager = org.apache.ivy.plugins.resolver.packager.PackagerResolver
obr = org.apache.ivy.osgi.obr.OBRResolver
mirroredurl = org.apache.ivy.plugins.resolver.MirroredURLResolver
updatesite = org.apache.ivy.osgi.updatesite.UpdateSiteResolver
osgi-agg = org.apache.ivy.osgi.repo.AggregatedOSGiResolver
latest-revision = org.apache.ivy.plugins.latest.LatestRevisionStrategy
latest-lexico = org.apache.ivy.plugins.latest.LatestLexicographicStrategy
latest-time = org.apache.ivy.plugins.latest.LatestTimeStrategy
fixed-cm = org.apache.ivy.plugins.conflict.FixedConflictManager
latest-cm = org.apache.ivy.plugins.conflict.LatestConflictManager
fixed-cm = org.apache.ivy.plugins.conflict.FixedConflictManager
latest-cm = org.apache.ivy.plugins.conflict.LatestConflictManager
compatible-cm = org.apache.ivy.plugins.conflict.LatestCompatibleConflictManager
no-cm = org.apache.ivy.plugins.conflict.NoConflictManager
strict-cm = org.apache.ivy.plugins.conflict.StrictConflictManager
regexp-cm = org.apache.ivy.plugins.conflict.RegexpConflictManager
no-cm = org.apache.ivy.plugins.conflict.NoConflictManager
strict-cm = org.apache.ivy.plugins.conflict.StrictConflictManager
regexp-cm = org.apache.ivy.plugins.conflict.RegexpConflictManager
namespace = org.apache.ivy.plugins.namespace.Namespace
namespace = org.apache.ivy.plugins.namespace.Namespace
exact-vm = org.apache.ivy.plugins.version.ExactVersionMatcher
chain-vm = org.apache.ivy.plugins.version.ChainVersionMatcher
latest-vm = org.apache.ivy.plugins.version.LatestVersionMatcher
sub-vm = org.apache.ivy.plugins.version.SubVersionMatcher
range-vm = org.apache.ivy.plugins.version.VersionRangeMatcher
pattern-vm = org.apache.ivy.plugins.version.PatternVersionMatcher
maven-tsnap-vm = org.apache.ivy.plugins.version.MavenTimedSnapshotVersionMatcher
exact-vm = org.apache.ivy.plugins.version.ExactVersionMatcher
chain-vm = org.apache.ivy.plugins.version.ChainVersionMatcher
latest-vm = org.apache.ivy.plugins.version.LatestVersionMatcher
sub-vm = org.apache.ivy.plugins.version.SubVersionMatcher
range-vm = org.apache.ivy.plugins.version.VersionRangeMatcher
pattern-vm = org.apache.ivy.plugins.version.PatternVersionMatcher
maven-tsnap-vm = org.apache.ivy.plugins.version.MavenTimedSnapshotVersionMatcher
ant-build = org.apache.ivy.ant.AntBuildTrigger
ant-call = org.apache.ivy.ant.AntCallTrigger
log = org.apache.ivy.plugins.trigger.LogTrigger
ant-build = org.apache.ivy.ant.AntBuildTrigger
ant-call = org.apache.ivy.ant.AntCallTrigger
log = org.apache.ivy.plugins.trigger.LogTrigger
cache = org.apache.ivy.core.cache.DefaultRepositoryCacheManager
cache = org.apache.ivy.core.cache.DefaultRepositoryCacheManager
pgp = org.apache.ivy.plugins.signer.bouncycastle.OpenPGPSignatureGenerator
osgi-manifest-parser = org.apache.ivy.osgi.core.OSGiManifestParser
timeout-constraint = org.apache.ivy.core.settings.NamedTimeoutConstraint

44
src/java/org/apache/ivy/osgi/core/jvm-packages.properties
View File

@ -1,30 +1,30 @@
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
# ***************************************************************
# * Licensed to the Apache Software Foundation (ASF) under one
# * or more contributor license agreements. See the NOTICE file
# * distributed with this work for additional information
# * regarding copyright ownership. The ASF licenses this file
# * to you under the Apache License, Version 2.0 (the
# * "License"); you may not use this file except in compliance
# * with the License. You may obtain a copy of the License at
# *
# * http://www.apache.org/licenses/LICENSE-2.0
# *
# * Unless required by applicable law or agreed to in writing,
# * software distributed under the License is distributed on an
# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# * KIND, either express or implied. See the License for the
# * specific language governing permissions and limitations
# * under the License.
# ***************************************************************
OSGi/Minimum-1.0.aliases = OSGI_MINIMUM-1.0
OSGi/Minimum-1.0.pkglist =
OSGi/Minimum-1.0.pkglist =
OSGi/Minimum-1.1.aliases = OSGI_MINIMUM-1.1
OSGi/Minimum-1.1.pkglist =
OSGi/Minimum-1.1.pkglist =
OSGi/Minimum-1.2.aliases = OSGI_MINIMUM-1.2
OSGi/Minimum-1.2.pkglist =
OSGi/Minimum-1.2.pkglist =
CDC-1.0/Foundation-1.0.aliases = CDC-1.0_Foundation-1.0
CDC-1.0/Foundation-1.0.pkglist = \
@ -215,6 +215,6 @@ JavaSE-1.6.pkglist = \
JavaSE-1.7.extends = JavaSE-1.6
JavaSE-1.7.pkglist = \
javax.swing.plaf.nimbus
JavaSE-1.8.extends = JavaSE-1.7
JavaSE-1.8.pkglist =

2
src/java/org/apache/ivy/plugins/circular/CircularDependencyException.java
View File

@ -28,7 +28,7 @@ import org.apache.ivy.core.module.id.ModuleRevisionId;
public class CircularDependencyException extends RuntimeException {
/**
*
*
*/
private static final long serialVersionUID = 670272039106237360L;

2
src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java
View File

@ -81,7 +81,7 @@ public final class PomModuleDescriptorParser implements ModuleDescriptorParser {
private static final PomModuleDescriptorParser INSTANCE = new PomModuleDescriptorParser();
private static final String PARENT_MAP_KEY = PomModuleDescriptorParser.class.getName() + ".parentMap";
public static PomModuleDescriptorParser getInstance() {
return INSTANCE;
}

11
src/java/org/apache/ivy/plugins/report/ivy-report-dot-all.xsl
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@ -15,19 +15,18 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method="text"/>
<xsl:template match="/ivy-report">
<xsl:text>/* * directed graph dot input file. * * generated by ivy report */
digraph G {</xsl:text>
<xsl:for-each select="dependencies/module">
<xsl:text>"</xsl:text><xsl:value-of select="@name"/><xsl:text>"</xsl:text>
<xsl:text>"</xsl:text><xsl:value-of select="@name"/><xsl:text>"</xsl:text>
</xsl:for-each>
<xsl:for-each select="dependencies/module/revision[not(@evicted)]/caller[@organisation!='caller']">
<xsl:text>"</xsl:text><xsl:value-of select="@name"/><xsl:text>" -&gt; "</xsl:text><xsl:value-of select="../../@name"/><xsl:text>";</xsl:text>
<xsl:text>"</xsl:text><xsl:value-of select="@name"/><xsl:text>" -&gt; "</xsl:text><xsl:value-of select="../../@name"/><xsl:text>";</xsl:text>
</xsl:for-each>
<xsl:text>}</xsl:text>
</xsl:template>

42
src/java/org/apache/ivy/plugins/report/ivy-report-dot.xsl
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@ -14,36 +15,35 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output method="text"/>
<xsl:template match="/ivy-report">
/* * directed graph dot input file. * * generated by ivy report */
digraph G {
"<xsl:value-of select="info/@organisation"/>-<xsl:value-of select="info/@module"/>" [label="<xsl:value-of select="info/@module"/>"];
<xsl:for-each select="dependencies/module">
"<xsl:value-of select="@organisation"/>-<xsl:value-of select="@name"/>" [label="<xsl:value-of select="@name"/>
<xsl:for-each select="revision">
"<xsl:value-of select="info/@organisation"/>-<xsl:value-of select="info/@module"/>" [label="<xsl:value-of select="info/@module"/>"];
<xsl:for-each select="dependencies/module">
"<xsl:value-of select="@organisation"/>-<xsl:value-of select="@name"/>" [label="<xsl:value-of select="@name"/>
<xsl:for-each select="revision">
<xsl:text>\n</xsl:text>
<xsl:value-of select="@name"/><xsl:if test="@error"> (error)</xsl:if><xsl:if test="@evicted"> (evicted)</xsl:if>
</xsl:for-each>
<xsl:text>"];
</xsl:for-each>
<xsl:text>"];
</xsl:text>
</xsl:for-each>
<xsl:for-each select="dependencies/module/revision[not(@evicted)]/caller">
<xsl:text>"</xsl:text>
<xsl:value-of select="@organisation"/>-<xsl:value-of select="@name"/>
<xsl:text>" -> "</xsl:text>
<xsl:value-of select="../../@organisation"/>-<xsl:value-of select="../../@name"/>
<xsl:text>" [label="</xsl:text>
<xsl:value-of select="@rev"/>
<xsl:text>"]</xsl:text>
<xsl:text>;
</xsl:for-each>
<xsl:for-each select="dependencies/module/revision[not(@evicted)]/caller">
<xsl:text>"</xsl:text>
<xsl:value-of select="@organisation"/>-<xsl:value-of select="@name"/>
<xsl:text>" -> "</xsl:text>
<xsl:value-of select="../../@organisation"/>-<xsl:value-of select="../../@name"/>
<xsl:text>" [label="</xsl:text>
<xsl:value-of select="@rev"/>
<xsl:text>"]</xsl:text>
<xsl:text>;
</xsl:text>
</xsl:for-each>
<xsl:text>}</xsl:text>
</xsl:for-each>
<xsl:text>}</xsl:text>
</xsl:template>
</xsl:stylesheet>

17
src/java/org/apache/ivy/plugins/report/ivy-report-graph-all.xsl
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@ -15,15 +15,14 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:template match="/ivy-report">
<graphml xmlns="http://graphml.graphdrawing.org/xmlns/graphml"
<graphml xmlns="http://graphml.graphdrawing.org/xmlns/graphml"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns/graphml http://www.yworks.com/xml/schema/graphml/1.0/ygraphml.xsd"
xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns/graphml http://www.yworks.com/xml/schema/graphml/1.0/ygraphml.xsd"
xmlns:y="http://www.yworks.com/xml/graphml">
<key id="d0" for="node" yfiles.type="nodegraphics"/>
<key id="d1" for="edge" yfiles.type="edgegraphics"/>
@ -34,7 +33,7 @@
<data key="d0" >
<y:ShapeNode>
<y:Fill color="#FFFFCC" transparent="false"/>
<y:BorderStyle type="line" width="1.0" color="#000000" />
<y:BorderStyle type="line" width="1.0" color="#000000"/>
<y:NodeLabel visible="true" alignment="center" fontFamily="Dialog" fontSize="12" fontStyle="plain" textColor="#000000" modelName="internal" modelPosition="c" autoSizePolicy="center">
<xsl:value-of select="@name"/>
</y:NodeLabel>
@ -50,7 +49,7 @@
<xsl:attribute name="target"><xsl:value-of select="../../@organisation"/>-<xsl:value-of select="../../@name"/></xsl:attribute>
<data key="d1">
<y:PolyLineEdge>
<y:LineStyle type="line" width="1.0" color="#000000" />
<y:LineStyle type="line" width="1.0" color="#000000"/>
<y:Arrows source="none" target="standard"/>
<y:BendStyle smoothed="false"/>
</y:PolyLineEdge>
@ -58,7 +57,7 @@
</xsl:element>
</xsl:for-each>
</graph>
</graphml>
</graphml>
</xsl:template>
</xsl:stylesheet>

19
src/java/org/apache/ivy/plugins/report/ivy-report-graph.xsl
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@ -15,15 +15,14 @@
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
under the License.
-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:template match="/ivy-report">
<graphml xmlns="http://graphml.graphdrawing.org/xmlns/graphml"
<graphml xmlns="http://graphml.graphdrawing.org/xmlns/graphml"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns/graphml http://www.yworks.com/xml/schema/graphml/1.0/ygraphml.xsd"
xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns/graphml http://www.yworks.com/xml/schema/graphml/1.0/ygraphml.xsd"
xmlns:y="http://www.yworks.com/xml/graphml">
<key id="d0" for="node" yfiles.type="nodegraphics"/>
<key id="d1" for="edge" yfiles.type="edgegraphics"/>
@ -33,7 +32,7 @@
<data key="d0" >
<y:ShapeNode>
<y:Fill color="#CCCCFF" transparent="false"/>
<y:BorderStyle type="line" width="1.0" color="#000000" />
<y:BorderStyle type="line" width="1.0" color="#000000"/>
<y:NodeLabel visible="true" alignment="center" fontFamily="Dialog" fontSize="12" fontStyle="plain" textColor="#000000" modelName="internal" modelPosition="c" autoSizePolicy="center">
<xsl:value-of select="info/@module"/>
</y:NodeLabel>
@ -47,7 +46,7 @@
<data key="d0" >
<y:ShapeNode>
<y:Fill color="#FFFFCC" transparent="false"/>
<y:BorderStyle type="line" width="1.0" color="#000000" />
<y:BorderStyle type="line" width="1.0" color="#000000"/>
<y:NodeLabel visible="true" alignment="center" fontFamily="Dialog" fontSize="12" fontStyle="plain" textColor="#000000" modelName="internal" modelPosition="c" autoSizePolicy="center">
<xsl:value-of select="@name"/>
<xsl:for-each select="revision">
@ -68,7 +67,7 @@
<xsl:attribute name="target"><xsl:value-of select="../../@organisation"/>-<xsl:value-of select="../../@name"/></xsl:attribute>
<data key="d1">
<y:PolyLineEdge>
<y:LineStyle type="line" width="1.0" color="#000000" />
<y:LineStyle type="line" width="1.0" color="#000000"/>
<y:Arrows source="none" target="standard"/>
<y:EdgeLabel visible="true" alignment="center" fontFamily="Dialog" fontSize="12" fontStyle="plain" textColor="#000000" modelName="free" modelPosition="anywhere" preferredPlacement="target" distance="2.0" ratio="0.5">
<xsl:value-of select="@rev"/>
@ -79,7 +78,7 @@
</xsl:element>
</xsl:for-each>
</graph>
</graphml>
</graphml>
</xsl:template>
</xsl:stylesheet>

259
src/java/org/apache/ivy/plugins/report/ivy-report.css
View File

@ -15,71 +15,71 @@
* limitations under the License.
*
*/
body {
font-family:"Trebuchet MS",Verdana,Geneva,Arial,Helvetica,sans-serif;
font-size:small;
font-family: "Trebuchet MS",Verdana,Geneva,Arial,Helvetica,sans-serif;
font-size: small;
}
div#logo {
float: right;
padding-left: 10px;
padding-bottom: 10px;
float: right;
padding-left: 10px;
padding-bottom: 10px;
background: white;
text-align: center;
}
#logo img {
border: 0;
border: 0;
}
div#date {
font-style: italic;
padding-left: 60px;
padding-bottom: 40px;
font-style: italic;
padding-left: 60px;
padding-bottom: 40px;
}
h1 {
margin-bottom:2px;
border-color:#7A9437;
border-style:solid;
border-width:0 0 3px 0;
margin-bottom: 2px;
border-color: #7A9437;
border-style: solid;
border-width: 0 0 3px 0;
}
span#module {
color:#7A9437;
text-decoration:none;
color: #7A9437;
text-decoration: none;
}
span#organisation {
color:black;
text-decoration:none;
color: black;
text-decoration: none;
}
#confmenu {
color: #000;
border-bottom: 2px solid black;
margin: 12px 0px 0px 0px;
padding: 0px;
z-index: 1;
padding-left: 10px
color: #000;
border-bottom: 2px solid black;
margin: 12px 0px 0px 0px;
padding: 0px;
z-index: 1;
padding-left: 10px
}
#confmenu li {
display: inline;
overflow: hidden;
list-style-type: none;
display: inline;
overflow: hidden;
list-style-type: none;
}
#confmenu a, a.active {
color: #DEDECF;
background: #898B5E;
font: bold 1em "Trebuchet MS", Arial, sans-serif;
border: 2px solid black;
padding: 2px 5px 0px 5px;
text-decoration: none;
color: #DEDECF;
background: #898B5E;
font: bold 1em "Trebuchet MS", Arial, sans-serif;
border: 2px solid black;
padding: 2px 5px 0px 5px;
text-decoration: none;
}
/*
@ -88,192 +88,183 @@ background: #DEE4CD
*/
#confmenu a.active {
color: #7A9437;
background: #DEE4CD;
border-bottom: 3px solid #DEE4CD;
color: #7A9437;
background: #DEE4CD;
border-bottom: 3px solid #DEE4CD;
}
#confmenu a:hover {
color: #fff;
background: #ADC09F;
color: #fff;
background: #ADC09F;
}
#confmenu a:visited {
color: #DEDECF;
color: #DEDECF;
}
#confmenu a.active:visited {
color: #7A9437;
color: #7A9437;
}
#confmenu a.active:hover {
background: #DEE4CD;
color: #DEDECF;
background: #DEE4CD;
color: #DEDECF;
}
#content {
background: #DEE4CD;
padding: 20px;
border: 2px solid black;
border-top: none;
z-index: 2;
background: #DEE4CD;
padding: 20px;
border: 2px solid black;
border-top: none;
z-index: 2;
}
#content a {
text-decoration: none;
color: #E8E9BE;
text-decoration: none;
color: #E8E9BE;
}
#content a:hover {
background: #898B5E;
#content a:hover {
background: #898B5E;
}
h2 {
margin-bottom:2px;
font-size:medium;
border-color:#7A9437;
border-style:solid;
border-width:0 0 2px 0;
margin-bottom: 2px;
font-size: medium;
border-color: #7A9437;
border-style: solid;
border-width: 0 0 2px 0;
}
h3 {
margin-top:30px;
margin-bottom:2px;
margin-top: 30px;
margin-bottom: 2px;
padding: 5 5 5 0;
font-size: 24px;
border-style:solid;
border-width:0 0 2px 0;
border-style: solid;
border-width: 0 0 2px 0;
}
h4 {
margin-bottom:2px;
margin-top:2px;
font-size:medium;
border-color:#7A9437;
border-style:dashed;
border-width:0 0 1px 0;
margin-bottom: 2px;
margin-top: 2px;
font-size: medium;
border-color: #7A9437;
border-style: dashed;
border-width: 0 0 1px 0;
}
h5 {
margin-bottom:2px;
margin-top:2px;
margin-left:20px;
font-size:medium;
margin-bottom: 2px;
margin-top: 2px;
margin-left: 20px;
font-size: medium;
}
span.resolved {
padding-left: 15px;
font-weight: 500;
font-size: small;
padding-left: 15px;
font-weight: 500;
font-size: small;
}
#content table {
border-collapse:collapse;
width:90%;
margin:auto;
margin-top: 5px;
border-collapse: collapse;
width: 90%;
margin: auto;
margin-top: 5px;
}
#content thead {
background-color:#CED4BD;
border:1px solid #7A9437;
background-color: #CED4BD;
border: 1px solid #7A9437;
}
#content tbody {
border-collapse:collapse;
background-color:#FFFFFF;
border:1px solid #7A9437;
border-collapse: collapse;
background-color: #FFFFFF;
border: 1px solid #7A9437;
}
#content th {
font-family:monospace;
border:1px solid #7A9437;
padding:5px;
font-family: monospace;
border: 1px solid #7A9437;
padding: 5px;
}
#content td {
border:1px dotted #7A9437;
padding:0 3 0 3;
border: 1px dotted #7A9437;
padding: 0 3 0 3;
}
#content table a {
color:#7A9437;
text-decoration:none;
color: #7A9437;
text-decoration: none;
}
#content table a:hover {
background-color:#CED4BD;
color:#7A9437;
background-color: #CED4BD;
color: #7A9437;
}
table.deps {
border-collapse:collapse;
width:90%;
margin:auto;
margin-top: 5px;
border-collapse: collapse;
width: 90%;
margin: auto;
margin-top: 5px;
}
table.deps thead {
background-color:#CED4BD;
border:1px solid #7A9437;
background-color: #CED4BD;
border: 1px solid #7A9437;
}
table.deps tbody {
border-collapse:collapse;
background-color:#FFFFFF;
border:1px solid #7A9437;
border-collapse: collapse;
background-color: #FFFFFF;
border: 1px solid #7A9437;
}
table.deps th {
font-family:monospace;
border:1px solid #7A9437;
padding:2;
font-family: monospace;
border: 1px solid #7A9437;
padding: 2;
}
table.deps td {
border:1px dotted #7A9437;
padding:0 3 0 3;
border: 1px dotted #7A9437;
padding: 0 3 0 3;
}
table.header {
border:0;
width:90%;
margin:auto;
margin-top: 5px;
border: 0;
width: 90%;
margin: auto;
margin-top: 5px;
}
table.header thead {
border:0;
border: 0;
}
table.header tbody {
border:0;
border: 0;
}
table.header tr {
padding:0px;
border:0;
padding: 0px;
border: 0;
}
table.header td {
padding:0 3 0 3;
border:0;
padding: 0 3 0 3;
border: 0;
}
td.title {
width:150px;
margin-right:15px;
font-size:small;
font-weight:700;
width: 150px;
margin-right: 15px;
font-size: small;
font-weight: 700;
}
td.title:first-letter {
color:#7A9437;
background-color:transparent;
color: #7A9437;
background-color: transparent;
}

341
src/java/org/apache/ivy/plugins/report/ivy-report.xsl
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@ -17,8 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="confs" select="/ivy-report/info/@confs"/>
<xsl:param name="extension" select="'xml'"/>
@ -66,13 +65,13 @@
</tr>
</thead>
<tbody>
<xsl:for-each select="$modules/revision/caller[(@organisation=$org and @name=$mod) and @callerrev=$rev]">
<xsl:for-each select="$modules/revision/caller[(@organisation=$org and @name=$mod) and @callerrev=$rev]">
<xsl:call-template name="called">
<xsl:with-param name="callstack" select="concat($org, string('/'), $mod)"/>
<xsl:with-param name="indent" select="string('')"/>
<xsl:with-param name="revision" select=".."/>
<xsl:with-param name="callstack" select="concat($org, string('/'), $mod)"/>
<xsl:with-param name="indent" select="string('')"/>
<xsl:with-param name="revision" select=".."/>
</xsl:call-template>
</xsl:for-each>
</xsl:for-each>
</tbody>
</table>
</xsl:if>
@ -91,80 +90,80 @@
<xsl:param name="status" select="$revision/@status"/>
<tr>
<td>
<xsl:element name="a">
<xsl:attribute name="href">#<xsl:value-of select="$organisation"/>-<xsl:value-of select="$module"/></xsl:attribute>
<xsl:value-of select="concat($indent, ' ')"/>
<xsl:value-of select="$module"/>
by
<xsl:value-of select="$organisation"/>
</xsl:element>
<xsl:element name="a">
<xsl:attribute name="href">#<xsl:value-of select="$organisation"/>-<xsl:value-of select="$module"/></xsl:attribute>
<xsl:value-of select="concat($indent, ' ')"/>
<xsl:value-of select="$module"/>
by
<xsl:value-of select="$organisation"/>
</xsl:element>
</td>
<td>
<xsl:element name="a">
<xsl:attribute name="href">#<xsl:value-of select="$organisation"/>-<xsl:value-of select="$module"/>-<xsl:value-of select="$rev"/></xsl:attribute>
<xsl:value-of select="$rev"/>
</xsl:element>
<xsl:element name="a">
<xsl:attribute name="href">#<xsl:value-of select="$organisation"/>-<xsl:value-of select="$module"/>-<xsl:value-of select="$rev"/></xsl:attribute>
<xsl:value-of select="$rev"/>
</xsl:element>
</td>
<td align="center">
<xsl:value-of select="$status"/>
<xsl:value-of select="$status"/>
</td>
<td align="center">
<xsl:value-of select="$resolver"/>
<xsl:value-of select="$resolver"/>
</td>
<td align="center">
<xsl:value-of select="$isdefault"/>
<xsl:value-of select="$isdefault"/>
</td>
<td align="center">
<xsl:call-template name="licenses">
<xsl:call-template name="licenses">
<xsl:with-param name="revision" select="$revision"/>
</xsl:call-template>
</xsl:call-template>
</td>
<td align="center">
<xsl:value-of select="round(sum($revision/artifacts/artifact/@size) div 1024)"/> kB
<xsl:value-of select="round(sum($revision/artifacts/artifact/@size) div 1024)"/> kB
</td>
<td align="center">
<xsl:call-template name="icons">
<xsl:with-param name="revision" select="$revision"/>
</xsl:call-template>
<xsl:call-template name="icons">
<xsl:with-param name="revision" select="$revision"/>
</xsl:call-template>
</td>
</tr>
<xsl:if test="not($revision/@evicted)">
<xsl:if test="not(contains($callstack, concat($organisation, string('/'), $module)))">
<xsl:for-each select="$modules/revision/caller[(@organisation=$organisation and @name=$module) and @callerrev=$rev]">
<xsl:call-template name="called">
<xsl:with-param name="callstack" select="concat($callstack, string('#'), $organisation, string('/'), $module)"/>
<xsl:with-param name="indent" select="concat($indent, string('---'))"/>
<xsl:with-param name="revision" select=".."/>
</xsl:call-template>
</xsl:for-each>
</xsl:if>
<xsl:if test="not(contains($callstack, concat($organisation, string('/'), $module)))">
<xsl:for-each select="$modules/revision/caller[(@organisation=$organisation and @name=$module) and @callerrev=$rev]">
<xsl:call-template name="called">
<xsl:with-param name="callstack" select="concat($callstack, string('#'), $organisation, string('/'), $module)"/>
<xsl:with-param name="indent" select="concat($indent, string('---'))"/>
<xsl:with-param name="revision" select=".."/>
</xsl:call-template>
</xsl:for-each>
</xsl:if>
</xsl:if>
</xsl:template>
<xsl:template name="licenses">
<xsl:param name="revision"/>
<xsl:for-each select="$revision/license">
<span style="padding-right:3px;">
<xsl:if test="@url">
<xsl:element name="a">
<xsl:attribute name="href"><xsl:value-of select="@url"/></xsl:attribute>
<xsl:value-of select="@name"/>
</xsl:element>
</xsl:if>
<xsl:if test="not(@url)">
<xsl:value-of select="@name"/>
</xsl:if>
</span>
</xsl:for-each>
<xsl:param name="revision"/>
<xsl:for-each select="$revision/license">
<span style="padding-right:3px;">
<xsl:if test="@url">
<xsl:element name="a">
<xsl:attribute name="href"><xsl:value-of select="@url"/></xsl:attribute>
<xsl:value-of select="@name"/>
</xsl:element>
</xsl:if>
<xsl:if test="not(@url)">
<xsl:value-of select="@name"/>
</xsl:if>
</span>
</xsl:for-each>
</xsl:template>
<xsl:template name="icons">
<xsl:param name="revision"/>
<xsl:if test="$revision/@searched = 'true'">
<img src="http://ant.apache.org/ivy/images/searched.gif" alt="searched" title="required a search in repository"/>
<img src="http://ant.apache.org/ivy/images/searched.gif" alt="searched" title="required a search in repository"/>
</xsl:if>
<xsl:if test="$revision/@downloaded = 'true'">
<img src="http://ant.apache.org/ivy/images/downloaded.gif" alt="downloaded" title="downloaded from repository"/>
<img src="http://ant.apache.org/ivy/images/downloaded.gif" alt="downloaded" title="downloaded from repository"/>
</xsl:if>
<xsl:if test="$revision/@evicted">
<xsl:element name="img">
@ -189,21 +188,21 @@
<xsl:param name="error"/>
<tr>
<td>
<xsl:element name="a">
<xsl:attribute name="href">#<xsl:value-of select="$organisation"/>-<xsl:value-of select="$module"/></xsl:attribute>
<xsl:value-of select="$module"/>
by
<xsl:value-of select="$organisation"/>
</xsl:element>
<xsl:element name="a">
<xsl:attribute name="href">#<xsl:value-of select="$organisation"/>-<xsl:value-of select="$module"/></xsl:attribute>
<xsl:value-of select="$module"/>
by
<xsl:value-of select="$organisation"/>
</xsl:element>
</td>
<td>
<xsl:element name="a">
<xsl:attribute name="href">#<xsl:value-of select="$organisation"/>-<xsl:value-of select="$module"/>-<xsl:value-of select="$revision"/></xsl:attribute>
<xsl:value-of select="$revision"/>
</xsl:element>
<xsl:element name="a">
<xsl:attribute name="href">#<xsl:value-of select="$organisation"/>-<xsl:value-of select="$module"/>-<xsl:value-of select="$revision"/></xsl:attribute>
<xsl:value-of select="$revision"/>
</xsl:element>
</td>
<td>
<xsl:value-of select="$error"/>
<xsl:value-of select="$error"/>
</td>
</tr>
</xsl:template>
@ -212,17 +211,17 @@
<xsl:param name="configurations"/>
<xsl:if test="contains($configurations, ',')">
<xsl:call-template name="conf">
<xsl:with-param name="conf" select="normalize-space(substring-before($configurations,','))"/>
</xsl:call-template>
<xsl:call-template name="confs">
<xsl:with-param name="configurations" select="substring-after($configurations,',')"/>
</xsl:call-template>
<xsl:call-template name="conf">
<xsl:with-param name="conf" select="normalize-space(substring-before($configurations,','))"/>
</xsl:call-template>
<xsl:call-template name="confs">
<xsl:with-param name="configurations" select="substring-after($configurations,',')"/>
</xsl:call-template>
</xsl:if>
<xsl:if test="not(contains($configurations, ','))">
<xsl:call-template name="conf">
<xsl:with-param name="conf" select="normalize-space($configurations)"/>
</xsl:call-template>
<xsl:call-template name="conf">
<xsl:with-param name="conf" select="normalize-space($configurations)"/>
</xsl:call-template>
</xsl:if>
</xsl:template>
@ -230,13 +229,13 @@
<xsl:param name="conf"/>
<li>
<xsl:element name="a">
<xsl:element name="a">
<xsl:if test="$conf = $myconf">
<xsl:attribute name="class">active</xsl:attribute>
<xsl:attribute name="class">active</xsl:attribute>
</xsl:if>
<xsl:attribute name="href"><xsl:value-of select="$myorg"/>-<xsl:value-of select="$mymod"/>-<xsl:value-of select="$conf"/>.<xsl:value-of select="$extension"/></xsl:attribute>
<xsl:value-of select="$conf"/>
</xsl:element>
</xsl:element>
</li>
</xsl:template>
@ -262,45 +261,45 @@
<body>
<div id="logo"><a href="http://ant.apache.org/ivy/"><img src="http://ant.apache.org/ivy/images/logo.png"/></a></div>
<h1>
<xsl:element name="a">
<xsl:element name="a">
<xsl:attribute name="name"><xsl:value-of select="info/@organisation"/>-<xsl:value-of select="info/@module"/></xsl:attribute>
</xsl:element>
<span id="module">
<xsl:value-of select="concat(info/@module, ' ', info/@revision)"/>
</span>
by
<span id="organisation">
<xsl:value-of select="info/@organisation"/>
</span>
</xsl:element>
<span id="module">
<xsl:value-of select="concat(info/@module, ' ', info/@revision)"/>
</span>
by
<span id="organisation">
<xsl:value-of select="info/@organisation"/>
</span>
</h1>
<div id="date">
resolved on
<xsl:call-template name="date">
<xsl:with-param name="date" select="info/@date"/>
</xsl:call-template>
resolved on
<xsl:call-template name="date">
<xsl:with-param name="date" select="info/@date"/>
</xsl:call-template>
</div>
<ul id="confmenu">
<xsl:call-template name="confs">
<xsl:with-param name="configurations" select="$confs"/>
</xsl:call-template>
<xsl:call-template name="confs">
<xsl:with-param name="configurations" select="$confs"/>
</xsl:call-template>
</ul>
<div id="content">
<h2>Dependencies Stats</h2>
<table class="header">
<tr><td class="title">Modules</td><td class="value"><xsl:value-of select="count($modules)"/></td></tr>
<tr><td class="title">Revisions</td><td class="value"><xsl:value-of select="count($revisions)"/>
(<xsl:value-of select="count($searcheds)"/> searched <img src="http://ant.apache.org/ivy/images/searched.gif" alt="searched" title="module revisions which required a search with a dependency resolver to be resolved"/>,
<xsl:value-of select="count($downloadeds)"/> downloaded <img src="http://ant.apache.org/ivy/images/downloaded.gif" alt="downloaded" title="module revisions for which ivy file was downloaded by dependency resolver"/>,
<xsl:value-of select="count($evicteds)"/> evicted <img src="http://ant.apache.org/ivy/images/evicted.gif" alt="evicted" title="module revisions which were evicted by others"/>,
<xsl:value-of select="count($errors)"/> errors <img src="http://ant.apache.org/ivy/images/error.gif" alt="error" title="module revisions on which error occurred"/>)</td></tr>
<tr><td class="title">Artifacts</td><td class="value"><xsl:value-of select="count($artifacts)"/>
(<xsl:value-of select="count($dlartifacts)"/> downloaded,
<xsl:value-of select="count($faileds)"/> failed)</td></tr>
<tr><td class="title">Artifacts size</td><td class="value"><xsl:value-of select="round(sum($artifacts/@size) div 1024)"/> kB
(<xsl:value-of select="round(sum($dlartifacts/@size) div 1024)"/> kB downloaded,
<xsl:value-of select="round(sum($cacheartifacts/@size) div 1024)"/> kB in cache)</td></tr>
</table>
<table class="header">
<tr><td class="title">Modules</td><td class="value"><xsl:value-of select="count($modules)"/></td></tr>
<tr><td class="title">Revisions</td><td class="value"><xsl:value-of select="count($revisions)"/>
(<xsl:value-of select="count($searcheds)"/> searched <img src="http://ant.apache.org/ivy/images/searched.gif" alt="searched" title="module revisions which required a search with a dependency resolver to be resolved"/>,
<xsl:value-of select="count($downloadeds)"/> downloaded <img src="http://ant.apache.org/ivy/images/downloaded.gif" alt="downloaded" title="module revisions for which ivy file was downloaded by dependency resolver"/>,
<xsl:value-of select="count($evicteds)"/> evicted <img src="http://ant.apache.org/ivy/images/evicted.gif" alt="evicted" title="module revisions which were evicted by others"/>,
<xsl:value-of select="count($errors)"/> errors <img src="http://ant.apache.org/ivy/images/error.gif" alt="error" title="module revisions on which error occurred"/>)</td></tr>
<tr><td class="title">Artifacts</td><td class="value"><xsl:value-of select="count($artifacts)"/>
(<xsl:value-of select="count($dlartifacts)"/> downloaded,
<xsl:value-of select="count($faileds)"/> failed)</td></tr>
<tr><td class="title">Artifacts size</td><td class="value"><xsl:value-of select="round(sum($artifacts/@size) div 1024)"/> kB
(<xsl:value-of select="round(sum($dlartifacts/@size) div 1024)"/> kB downloaded,
<xsl:value-of select="round(sum($cacheartifacts/@size) div 1024)"/> kB in cache)</td></tr>
</table>
<xsl:if test="count($errors) > 0">
<h2>Errors</h2>
@ -315,10 +314,10 @@
<tbody>
<xsl:for-each select="$errors">
<xsl:call-template name="error">
<xsl:with-param name="organisation" select="../@organisation"/>
<xsl:with-param name="module" select="../@name"/>
<xsl:with-param name="revision" select="@name"/>
<xsl:with-param name="error" select="@error"/>
<xsl:with-param name="organisation" select="../@organisation"/>
<xsl:with-param name="module" select="../@name"/>
<xsl:with-param name="revision" select="@name"/>
<xsl:with-param name="error" select="@error"/>
</xsl:call-template>
</xsl:for-each>
</tbody>
@ -336,35 +335,35 @@
</tr>
</thead>
<tbody>
<xsl:for-each select="$conflicts">
<xsl:for-each select="$conflicts">
<tr>
<td>
<xsl:element name="a">
<xsl:attribute name="href">#<xsl:value-of select="@organisation"/>-<xsl:value-of select="@name"/></xsl:attribute>
<xsl:value-of select="@name"/>
by
<xsl:value-of select="@organisation"/>
</xsl:element>
<xsl:element name="a">
<xsl:attribute name="href">#<xsl:value-of select="@organisation"/>-<xsl:value-of select="@name"/></xsl:attribute>
<xsl:value-of select="@name"/>
by
<xsl:value-of select="@organisation"/>
</xsl:element>
</td>
<td>
<xsl:for-each select="revision[not(@evicted)]">
<xsl:element name="a">
<xsl:attribute name="href">#<xsl:value-of select="../@organisation"/>-<xsl:value-of select="../@name"/>-<xsl:value-of select="@name"/></xsl:attribute>
<xsl:value-of select="@name"/>
</xsl:element>
<xsl:text> </xsl:text>
</xsl:for-each>
<xsl:for-each select="revision[not(@evicted)]">
<xsl:element name="a">
<xsl:attribute name="href">#<xsl:value-of select="../@organisation"/>-<xsl:value-of select="../@name"/>-<xsl:value-of select="@name"/></xsl:attribute>
<xsl:value-of select="@name"/>
</xsl:element>
<xsl:text> </xsl:text>
</xsl:for-each>
</td>
<td>
<xsl:for-each select="revision[@evicted]">
<xsl:element name="a">
<xsl:attribute name="href">#<xsl:value-of select="../@organisation"/>-<xsl:value-of select="../@name"/>-<xsl:value-of select="@name"/></xsl:attribute>
<xsl:value-of select="@name"/>
<xsl:text> </xsl:text>
<xsl:value-of select="@evicted-reason"/>
</xsl:element>
<xsl:text> </xsl:text>
</xsl:for-each>
<xsl:for-each select="revision[@evicted]">
<xsl:element name="a">
<xsl:attribute name="href">#<xsl:value-of select="../@organisation"/>-<xsl:value-of select="../@name"/>-<xsl:value-of select="@name"/></xsl:attribute>
<xsl:value-of select="@name"/>
<xsl:text> </xsl:text>
<xsl:value-of select="@evicted-reason"/>
</xsl:element>
<xsl:text> </xsl:text>
</xsl:for-each>
</td>
</tr>
</xsl:for-each>
@ -400,41 +399,41 @@
</span>
</h4>
<table class="header">
<xsl:if test="@homepage">
<xsl:if test="@homepage">
<tr><td class="title">Home Page</td><td class="value">
<xsl:element name="a">
<xsl:attribute name="href"><xsl:value-of select="@homepage"/></xsl:attribute>
<xsl:value-of select="@homepage"/>
</xsl:element></td>
</tr>
</xsl:if>
<xsl:attribute name="href"><xsl:value-of select="@homepage"/></xsl:attribute>
<xsl:value-of select="@homepage"/>
</xsl:element></td>
</tr>
</xsl:if>
<tr><td class="title">Status</td><td class="value"><xsl:value-of select="@status"/></td></tr>
<tr><td class="title">Publication</td><td class="value"><xsl:value-of select="@pubdate"/></td></tr>
<tr><td class="title">Resolver</td><td class="value"><xsl:value-of select="@resolver"/></td></tr>
<tr><td class="title">Configurations</td><td class="value"><xsl:value-of select="@conf"/></td></tr>
<tr><td class="title">Artifacts size</td><td class="value"><xsl:value-of select="round(sum(artifacts/artifact/@size) div 1024)"/> kB
(<xsl:value-of select="round(sum(artifacts/artifact[@status='successful']/@size) div 1024)"/> kB downloaded,
<xsl:value-of select="round(sum(artifacts/artifact[@status='no']/@size) div 1024)"/> kB in cache)</td></tr>
<xsl:if test="count(license) > 0">
<tr><td class="title">Licenses</td><td class="value">
<xsl:call-template name="licenses">
<xsl:with-param name="revision" select="."/>
</xsl:call-template>
</td></tr>
</xsl:if>
<xsl:if test="@evicted">
<tr><td class="title">Evicted by</td><td class="value">
<b>
<xsl:for-each select="evicted-by">
<xsl:value-of select="@rev"/>
<xsl:text> </xsl:text>
</xsl:for-each>
</b>
<xsl:text> </xsl:text>
<b><xsl:value-of select="@evicted-reason"/></b>
in <b><xsl:value-of select="@evicted"/></b> conflict manager
</td></tr>
</xsl:if>
(<xsl:value-of select="round(sum(artifacts/artifact[@status='successful']/@size) div 1024)"/> kB downloaded,
<xsl:value-of select="round(sum(artifacts/artifact[@status='no']/@size) div 1024)"/> kB in cache)</td></tr>
<xsl:if test="count(license) > 0">
<tr><td class="title">Licenses</td><td class="value">
<xsl:call-template name="licenses">
<xsl:with-param name="revision" select="."/>
</xsl:call-template>
</td></tr>
</xsl:if>
<xsl:if test="@evicted">
<tr><td class="title">Evicted by</td><td class="value">
<b>
<xsl:for-each select="evicted-by">
<xsl:value-of select="@rev"/>
<xsl:text> </xsl:text>
</xsl:for-each>
</b>
<xsl:text> </xsl:text>
<b><xsl:value-of select="@evicted-reason"/></b>
in <b><xsl:value-of select="@evicted"/></b> conflict manager
</td></tr>
</xsl:if>
</table>
<h5>Required by</h5>
<table>
@ -448,14 +447,14 @@
</tr>
</thead>
<tbody>
<xsl:for-each select="caller">
<xsl:for-each select="caller">
<tr>
<td><xsl:value-of select="@organisation"/></td>
<td>
<xsl:element name="a">
<xsl:attribute name="href">#<xsl:value-of select="@organisation"/>-<xsl:value-of select="@name"/></xsl:attribute>
<xsl:value-of select="@name"/>
</xsl:element>
<xsl:element name="a">
<xsl:attribute name="href">#<xsl:value-of select="@organisation"/>-<xsl:value-of select="@name"/></xsl:attribute>
<xsl:value-of select="@name"/>
</xsl:element>
</td>
<td><xsl:value-of select="@callerrev"/></td>
<td><xsl:value-of select="@conf"/></td>
@ -468,9 +467,9 @@
<h5>Dependencies</h5>
<xsl:call-template name="calling">
<xsl:with-param name="org" select="../@organisation"/>
<xsl:with-param name="mod" select="../@name"/>
<xsl:with-param name="rev" select="@name"/>
<xsl:with-param name="org" select="../@organisation"/>
<xsl:with-param name="mod" select="../@name"/>
<xsl:with-param name="rev" select="@name"/>
</xsl:call-template>
<h5>Artifacts</h5>
<xsl:if test="count(artifacts/artifact) = 0">
@ -490,7 +489,7 @@
</tr>
</thead>
<tbody>
<xsl:for-each select="artifacts/artifact">
<xsl:for-each select="artifacts/artifact">
<tr>
<td><xsl:value-of select="@name"/></td>
<td><xsl:value-of select="@type"/></td>
@ -498,7 +497,7 @@
<td align="center"><xsl:value-of select="@status"/></td>
<td align="center"><xsl:value-of select="round(number(@size) div 1024)"/> kB</td>
</tr>
</xsl:for-each>
</xsl:for-each>
</tbody>
</table>
</xsl:if>

2
src/java/org/apache/ivy/plugins/resolver/packager/build.xml
View File

@ -46,7 +46,7 @@
<xslt style="packager.xsl" in="packager.xml" out="packager-output.xml">
<param name="resourceURL" expression="${resourceURL}"/>
<param name="restricted" expression="${ivy.packager.restricted}"/>
<param name="quiet" expression="${ivy.packager.quiet}"/>
<param name="quiet" expression="${ivy.packager.quiet}"/>
</xslt>
</target>