You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2010/12/14 17:28:36 UTC
svn commit: r1049146 [12/19] - in /ant/ivy/core/trunk: ./
src/etc/checkstyle/ src/etc/license/ src/example/build-a-ivy-repository/
src/example/build-a-ivy-repository/settings/ src/example/chained-resolvers/
src/example/chained-resolvers/chainedresolver...
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-noartifact.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-noartifact.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-nopublication.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-nopublication.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-novalidate.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-novalidate.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-publication-defaultconf.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-publication-defaultconf.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Tue Dec 14 16:28:01 2010
@@ -1 +1 @@
-text/plain
+text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-simple.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-simple.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs1.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs2.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs2.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs3.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs3.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs4.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs4.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs5.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update-excludedconfs5.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update-withvar.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update-withvar.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update-withvar.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update-withvar.xml Tue Dec 14 16:28:01 2010
@@ -1,110 +1,110 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<?xml-stylesheet type="text/xsl" href="http://www.somesite.com/ivy-doc.xsl"?>
-<!--
- 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.
--->
-<!-- A comment before the first tag -->
-<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" xmlns:e="http://ant.apache.org/ivy/extra">
- <!-- A comment with accent é & special characters -->
- <info organisation="${myorg}"
- module="${mymodule}"
- revision="${myrev}"
- status="${mystatus}"
- e:myextra="myval"
- publication="{mypubdate}">
-
- <license name="${mylicense}" url="${mylicenseurl}"/>
-
- <ivyauthor name="jayasoft" url="http://www.jayasoft.org/"/>
- <ivyauthor name="${myorg}" url="${myorgurl}"/>
-
- <repository name="${ivyrep}" url="${ivyrepurl}" pattern="${ivyreppattern}" ivys="${ivys}" artifacts="${artifacts}"/>
-
- <description homepage="${homepage}">
- This module is <b>great</b> !<br/>
- You can use it especially with myconf1 & myconf2, and myconf4 is not too bad too.
- </description>
- </info>
- <configurations>
- <include file="${includefile}"/>
- <conf name="${myvar}" description="${mydesc}"/>
- <conf name="myconf2" description="desc 2" visibility="${visibility}"/>
- <conf name="myconf3" description="desc 3" visibility="private"/>
- <conf name="myconf4" description="desc 4" extends="${myvar}, myconf2"/>
- <conf name="myoldconf" description="my old desc" deprecated="${deprecated}"/>
- </configurations>
- <publications>
- <artifact name="${myartifact1}" type="${mytype}"/>
- <artifact name="myartifact2" type="jar" conf="${myvar}"/>
- <artifact name="myartifact3" type="jar" conf="myconf1, myconf2, myconf3"/>
- <artifact name="myartifact4" type="jar">
- <conf name="${myvar}"/>
- <conf name="myconf3"/>
- </artifact>
- </publications>
- <dependencies>
- <dependency name="${mymodule2}" rev="${mymodule2rev}"/>
- <dependency name="mymodule3" rev="2.0" changing="${changing}" transitive="${transitive}"/>
- <dependency org="yourorg" name="yourmodule1" branch="trunk" rev="1.1" branchConstraint="branch1" revConstraint="1+" conf="${myvar}"/>
- <dependency org="yourorg" name="yourmodule2" branch="branch1" rev="2+" conf="myconf1->yourconf1"/>
- <dependency org="yourorg" name="yourmodule3" rev="3.1" conf="myconf1->yourconf1, yourconf2"/>
- <dependency org="yourorg" name="yourmodule4" rev="4.1" conf="myconf1, myconf2->yourconf1, yourconf2"/>
- <dependency org="yourorg" name="yourmodule5" rev="5.1" conf="myconf1->yourconf1;myconf2->yourconf1, yourconf2"/>
-
- <dependency org="yourorg" name="yourmodule6" rev="latest.integration">
- <conf name="${myvar}" mapped="${targetconf}"/>
- <conf name="myconf2" mapped="yourconf1, yourconf2"/>
- </dependency>
-
- <dependency org="yourorg" name="yourmodule7" rev="7.1">
- <conf name="myconf1">
- <mapped name="yourconf1"/>
- </conf>
- <conf name="myconf2">
- <mapped name="yourconf1"/>
- <mapped name="yourconf2"/>
- </conf>
- </dependency>
-
- <dependency org="yourorg" name="yourmodule8" rev="8.1">
- <artifact name="yourartifact8-1" type="jar"/>
- <artifact name="yourartifact8-2" type="jar"/>
- </dependency>
-
- <dependency org="yourorg" name="yourmodule9" rev="9.1" conf="myconf1,myconf2,myconf3->default">
- <artifact name="${art9-1}" type="${mytype}" conf="${myvar},myconf2"/>
- <artifact name="yourartifact9-2" type="jar">
- <conf name="myconf2"/>
- <conf name="${conf3}"/>
- </artifact>
- </dependency>
-
- <dependency org="yourorg" name="yourmodule10" rev="10.1">
- <include name="${includename}" type="${mytype}"/>
- <include ext="${includeext}"/>
- <exclude name="${excludename}"/>
- </dependency>
- <dependency org="yourorg" name="yourmodule11" rev="11.1" conf="*->@"/>
-
- <exclude module="${excludemodule}" matcher="${excludematcher}" conf="${myvar}"/>
- <exclude org="${excludeorg}" module="test" artifact="${excludeartifact}" type="${excludetype}" ext="jar"/>
- <override org="yourorg" module=".*1" matcher="regexp" branch="BRANCH" rev="1.0"/>
- <conflict org="${yourorg}" module="${yourmodule}" matcher="${regexp}" manager="${all}"/>
- <conflict org="theirorg" module="theirmodule1" rev="${theirrev}"/>
- </dependencies>
-</ivy-module>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml-stylesheet type="text/xsl" href="http://www.somesite.com/ivy-doc.xsl"?>
+<!--
+ 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.
+-->
+<!-- A comment before the first tag -->
+<ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd" xmlns:e="http://ant.apache.org/ivy/extra">
+ <!-- A comment with accent é & special characters -->
+ <info organisation="${myorg}"
+ module="${mymodule}"
+ revision="${myrev}"
+ status="${mystatus}"
+ e:myextra="myval"
+ publication="{mypubdate}">
+
+ <license name="${mylicense}" url="${mylicenseurl}"/>
+
+ <ivyauthor name="jayasoft" url="http://www.jayasoft.org/"/>
+ <ivyauthor name="${myorg}" url="${myorgurl}"/>
+
+ <repository name="${ivyrep}" url="${ivyrepurl}" pattern="${ivyreppattern}" ivys="${ivys}" artifacts="${artifacts}"/>
+
+ <description homepage="${homepage}">
+ This module is <b>great</b> !<br/>
+ You can use it especially with myconf1 & myconf2, and myconf4 is not too bad too.
+ </description>
+ </info>
+ <configurations>
+ <include file="${includefile}"/>
+ <conf name="${myvar}" description="${mydesc}"/>
+ <conf name="myconf2" description="desc 2" visibility="${visibility}"/>
+ <conf name="myconf3" description="desc 3" visibility="private"/>
+ <conf name="myconf4" description="desc 4" extends="${myvar}, myconf2"/>
+ <conf name="myoldconf" description="my old desc" deprecated="${deprecated}"/>
+ </configurations>
+ <publications>
+ <artifact name="${myartifact1}" type="${mytype}"/>
+ <artifact name="myartifact2" type="jar" conf="${myvar}"/>
+ <artifact name="myartifact3" type="jar" conf="myconf1, myconf2, myconf3"/>
+ <artifact name="myartifact4" type="jar">
+ <conf name="${myvar}"/>
+ <conf name="myconf3"/>
+ </artifact>
+ </publications>
+ <dependencies>
+ <dependency name="${mymodule2}" rev="${mymodule2rev}"/>
+ <dependency name="mymodule3" rev="2.0" changing="${changing}" transitive="${transitive}"/>
+ <dependency org="yourorg" name="yourmodule1" branch="trunk" rev="1.1" branchConstraint="branch1" revConstraint="1+" conf="${myvar}"/>
+ <dependency org="yourorg" name="yourmodule2" branch="branch1" rev="2+" conf="myconf1->yourconf1"/>
+ <dependency org="yourorg" name="yourmodule3" rev="3.1" conf="myconf1->yourconf1, yourconf2"/>
+ <dependency org="yourorg" name="yourmodule4" rev="4.1" conf="myconf1, myconf2->yourconf1, yourconf2"/>
+ <dependency org="yourorg" name="yourmodule5" rev="5.1" conf="myconf1->yourconf1;myconf2->yourconf1, yourconf2"/>
+
+ <dependency org="yourorg" name="yourmodule6" rev="latest.integration">
+ <conf name="${myvar}" mapped="${targetconf}"/>
+ <conf name="myconf2" mapped="yourconf1, yourconf2"/>
+ </dependency>
+
+ <dependency org="yourorg" name="yourmodule7" rev="7.1">
+ <conf name="myconf1">
+ <mapped name="yourconf1"/>
+ </conf>
+ <conf name="myconf2">
+ <mapped name="yourconf1"/>
+ <mapped name="yourconf2"/>
+ </conf>
+ </dependency>
+
+ <dependency org="yourorg" name="yourmodule8" rev="8.1">
+ <artifact name="yourartifact8-1" type="jar"/>
+ <artifact name="yourartifact8-2" type="jar"/>
+ </dependency>
+
+ <dependency org="yourorg" name="yourmodule9" rev="9.1" conf="myconf1,myconf2,myconf3->default">
+ <artifact name="${art9-1}" type="${mytype}" conf="${myvar},myconf2"/>
+ <artifact name="yourartifact9-2" type="jar">
+ <conf name="myconf2"/>
+ <conf name="${conf3}"/>
+ </artifact>
+ </dependency>
+
+ <dependency org="yourorg" name="yourmodule10" rev="10.1">
+ <include name="${includename}" type="${mytype}"/>
+ <include ext="${includeext}"/>
+ <exclude name="${excludename}"/>
+ </dependency>
+ <dependency org="yourorg" name="yourmodule11" rev="11.1" conf="*->@"/>
+
+ <exclude module="${excludemodule}" matcher="${excludematcher}" conf="${myvar}"/>
+ <exclude org="${excludeorg}" module="test" artifact="${excludeartifact}" type="${excludetype}" ext="jar"/>
+ <override org="yourorg" module=".*1" matcher="regexp" branch="BRANCH" rev="1.0"/>
+ <conflict org="${yourorg}" module="${yourmodule}" matcher="${regexp}" manager="${all}"/>
+ <conflict org="theirorg" module="theirmodule1" rev="${theirrev}"/>
+ </dependencies>
+</ivy-module>
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update-withvar.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update-withvar.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update-withvar.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-update.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-with-comments.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-with-comments.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-with-comments.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-with-comments.xml Tue Dec 14 16:28:01 2010
@@ -1,38 +1,38 @@
-<?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
- 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-module version="1.0">
- <info organisation="myorg"
- module="mymodule"
- revision="1.0"
- status="integration"
- publication="20050913185628"
- />
- <configurations>
- <conf name="default" visibility="public"/>
- </configurations>
- <publications>
- <artifact name="mymodule" type="jar" ext="jar" conf="default"/>
- </publications>
- <dependencies>
- <dependency org="myorg" name="mod1" rev="1.0" conf="*->*"/><!-- dependency 1 -->
- <dependency org="test" name="mod2" rev="2.0" conf="default->default"/><!-- dependency 2 -->
- <dependency org="test" name="mod3" rev="2.0" conf="default->*"><!-- dependency 3 (IVY-888) --></dependency>
- </dependencies>
-</ivy-module>
+<?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
+ 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-module version="1.0">
+ <info organisation="myorg"
+ module="mymodule"
+ revision="1.0"
+ status="integration"
+ publication="20050913185628"
+ />
+ <configurations>
+ <conf name="default" visibility="public"/>
+ </configurations>
+ <publications>
+ <artifact name="mymodule" type="jar" ext="jar" conf="default"/>
+ </publications>
+ <dependencies>
+ <dependency org="myorg" name="mod1" rev="1.0" conf="*->*"/><!-- dependency 1 -->
+ <dependency org="test" name="mod2" rev="2.0" conf="default->default"/><!-- dependency 2 -->
+ <dependency org="test" name="mod3" rev="2.0" conf="default->*"><!-- dependency 3 (IVY-888) --></dependency>
+ </dependencies>
+</ivy-module>
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-with-comments.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-with-comments.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-with-comments.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-dependencies.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-dependencies.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-extends.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-extends.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-extends.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-extends.xml Tue Dec 14 16:28:01 2010
@@ -1,44 +1,44 @@
-<?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
- 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-module version="2.2">
- <info organisation="myorg"
- module="mymodule"
- revision="working@localhost"
- status="integration"
- publication="20091206000000"
- >
- <extends organisation="myorg" module="myparent" revision="myrev" location="test-extends-parent.xml" extendType="all"/>
- <description>
- Parent module description.
- </description>
- </info>
- <configurations>
- <conf name="default" visibility="public"/>
- <conf name="conf1" visibility="public"/>
- <conf name="conf2" visibility="private"/>
- </configurations>
- <publications>
- <artifact name="mymodule" type="jar" ext="jar" conf="default,conf1,conf2"/>
- </publications>
- <dependencies>
- <dependency org="myorg" name="mymodule1" rev="1.0" conf="default->default"/>
- <dependency org="myorg" name="mymodule2" rev="2.0" conf="conf1->conf1;conf2->conf2"/>
- </dependencies>
-</ivy-module>
+<?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
+ 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-module version="2.2">
+ <info organisation="myorg"
+ module="mymodule"
+ revision="working@localhost"
+ status="integration"
+ publication="20091206000000"
+ >
+ <extends organisation="myorg" module="myparent" revision="myrev" location="test-extends-parent.xml" extendType="all"/>
+ <description>
+ Parent module description.
+ </description>
+ </info>
+ <configurations>
+ <conf name="default" visibility="public"/>
+ <conf name="conf1" visibility="public"/>
+ <conf name="conf2" visibility="private"/>
+ </configurations>
+ <publications>
+ <artifact name="mymodule" type="jar" ext="jar" conf="default,conf1,conf2"/>
+ </publications>
+ <dependencies>
+ <dependency org="myorg" name="mymodule1" rev="1.0" conf="default->default"/>
+ <dependency org="myorg" name="mymodule2" rev="2.0" conf="conf1->conf1;conf2->conf2"/>
+ </dependencies>
+</ivy-module>
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-extends.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-extends.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-extends.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Tue Dec 14 16:28:01 2010
@@ -1 +1 @@
-text/plain
+text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-full.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-full.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-info.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-info.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-info.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-info.xml Tue Dec 14 16:28:01 2010
@@ -1,38 +1,38 @@
-<?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
- 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-module version="2.0">
- <info organisation="myorg"
- module="mymodule"
- revision="NONE"
- status="integration"
- publication="20050501110000"
- >
- <license name="Apache Sofware License" url="http://www.apache.org/licenses/LICENSE-2.0.txt" />
- <description homepage="http://myorg.com/mymodule">
- My module description.
- </description>
- </info>
- <configurations>
- <conf name="default" visibility="public"/>
- </configurations>
- <publications>
- <artifact name="mymodule" type="jar" ext="jar" conf="default"/>
- </publications>
-</ivy-module>
+<?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
+ 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-module version="2.0">
+ <info organisation="myorg"
+ module="mymodule"
+ revision="NONE"
+ status="integration"
+ publication="20050501110000"
+ >
+ <license name="Apache Sofware License" url="http://www.apache.org/licenses/LICENSE-2.0.txt" />
+ <description homepage="http://myorg.com/mymodule">
+ My module description.
+ </description>
+ </info>
+ <configurations>
+ <conf name="default" visibility="public"/>
+ </configurations>
+ <publications>
+ <artifact name="mymodule" type="jar" ext="jar" conf="default"/>
+ </publications>
+</ivy-module>
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-info.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-info.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-info.xml
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Tue Dec 14 16:28:01 2010
@@ -1 +1 @@
-text/plain
+text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-simple.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test-write-simple.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/test.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/updated.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/parser/xml/updated.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportParserTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportParserTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/XmlReportWriterTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/ivy-635.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/ivy-635.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/ivy-635.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/ivy-635.xml Tue Dec 14 16:28:01 2010
@@ -1,25 +1,25 @@
-<!--
- 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-module version="1.0">
- <info organisation="apache"
- module="ivy-635" />
- <dependencies>
- <dependency org="apache" name="mod1" rev="1.0" />
- </dependencies>
-</ivy-module>
+<!--
+ 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-module version="1.0">
+ <info organisation="apache"
+ module="ivy-635" />
+ <dependencies>
+ <dependency org="apache" name="mod1" rev="1.0" />
+ </dependencies>
+</ivy-module>
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/ivy-635.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/ivy-635.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/ivy-635.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/ivy-with-info.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/report/ivy-with-info.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/AbstractDependencyResolverTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/AbstractDependencyResolverTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/DualResolverTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/FileSystemResolverTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioHelper.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/IvyRepResolverTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/Maven2LocalTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/Maven2LocalTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/MockResolver.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/MockResolver.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/PackagerResolverTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ResolverTestHelper.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/URLResolverTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/chainresolverconf.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/chainresolverconf.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/dualresolverconf-bad.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/dualresolverconf-bad.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/dualresolverconf.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/dualresolverconf.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ibiblioresolverconf.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/ibiblioresolverconf.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java Tue Dec 14 16:28:01 2010
@@ -1,41 +1,41 @@
-/*
- * 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.
- *
- */
-package org.apache.ivy.plugins.resolver.util;
-
-import java.io.File;
-import java.util.Arrays;
-
-import org.apache.ivy.plugins.repository.file.FileRepository;
-
-import junit.framework.TestCase;
-
-public class ResolverHelperTest extends TestCase {
-
- public void testListTokenValuesForIvy1238() {
- FileRepository rep = new FileRepository(new File(".").getAbsoluteFile());
- String[] revisions = ResolverHelper.listTokenValues(rep, "test/repositories/IVY-1238/ivy-org/modA/v[revision]/ivy.xml", "revision");
-
- assertNotNull(revisions);
- assertEquals(2, revisions.length);
-
- Arrays.sort(revisions);
- assertEquals("1.0", revisions[0]);
- assertEquals("2.0", revisions[1]);
- }
-
-}
+/*
+ * 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.
+ *
+ */
+package org.apache.ivy.plugins.resolver.util;
+
+import java.io.File;
+import java.util.Arrays;
+
+import org.apache.ivy.plugins.repository.file.FileRepository;
+
+import junit.framework.TestCase;
+
+public class ResolverHelperTest extends TestCase {
+
+ public void testListTokenValuesForIvy1238() {
+ FileRepository rep = new FileRepository(new File(".").getAbsoluteFile());
+ String[] revisions = ResolverHelper.listTokenValues(rep, "test/repositories/IVY-1238/ivy-org/modA/v[revision]/ivy.xml", "revision");
+
+ assertNotNull(revisions);
+ assertEquals(2, revisions.length);
+
+ Arrays.sort(revisions);
+ assertEquals("1.0", revisions[0]);
+ assertEquals("2.0", revisions[1]);
+ }
+
+}
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/resolver/util/ResolverHelperTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java Tue Dec 14 16:28:01 2010
@@ -1,91 +1,91 @@
-/*
- * 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.
- *
- */
-package org.apache.ivy.plugins.trigger;
-
-import java.io.File;
-import java.util.Date;
-
-import junit.framework.TestCase;
-
-import org.apache.ivy.core.event.resolve.StartResolveEvent;
-import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
-import org.apache.ivy.core.module.id.ModuleRevisionId;
-import org.apache.ivy.util.FileUtil;
-import org.apache.ivy.util.Message;
-import org.apache.ivy.util.MockMessageLogger;
-
-public class LogTriggerTest extends TestCase {
- private static final String LINE_SEPARATOR = System.getProperty("line.separator");
-
- private StartResolveEvent ev;
- private LogTrigger trigger;
- private File testDir;
-
- protected void setUp() {
- ev = new StartResolveEvent(
- DefaultModuleDescriptor.newBasicInstance(ModuleRevisionId.parse("o#A;1"), new Date()),
- new String[] {"c"});
- trigger = new LogTrigger();
- trigger.setEvent(ev.getName());
- testDir = new File("build/test/trigger");
- testDir.mkdirs();
- }
-
- protected void tearDown() throws Exception {
- FileUtil.forceDelete(testDir);
- }
-
- public void testMessage() throws Exception {
- trigger.setMessage("msg: ${organisation} ${module} ${revision}");
-
- MockMessageLogger mockLogger = new MockMessageLogger();
- Message.setDefaultLogger(mockLogger);
- trigger.progress(ev);
-
- mockLogger.assertLogInfoContains("msg: o A 1");
- }
-
- public void testFile() throws Exception {
- trigger.setMessage("msg: ${organisation} ${module} ${revision}");
- File f = new File(testDir, "test.log");
- trigger.setFile(f);
-
- trigger.progress(ev);
-
- assertTrue(f.exists());
- assertEquals("msg: o A 1" + LINE_SEPARATOR, FileUtil.readEntirely(f));
-
- trigger.progress(ev);
-
- assertEquals("msg: o A 1" + LINE_SEPARATOR + "msg: o A 1" + LINE_SEPARATOR,
- FileUtil.readEntirely(f));
- }
-
- public void testFileNoAppend() throws Exception {
- trigger.setMessage("msg: ${organisation} ${module} ${revision}");
- File f = new File(testDir, "test.log");
- trigger.setFile(f);
- trigger.setAppend(false);
-
- trigger.progress(ev);
- trigger.progress(ev);
-
- assertTrue(f.exists());
- assertEquals("msg: o A 1" + LINE_SEPARATOR, FileUtil.readEntirely(f));
- }
-}
+/*
+ * 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.
+ *
+ */
+package org.apache.ivy.plugins.trigger;
+
+import java.io.File;
+import java.util.Date;
+
+import junit.framework.TestCase;
+
+import org.apache.ivy.core.event.resolve.StartResolveEvent;
+import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.util.FileUtil;
+import org.apache.ivy.util.Message;
+import org.apache.ivy.util.MockMessageLogger;
+
+public class LogTriggerTest extends TestCase {
+ private static final String LINE_SEPARATOR = System.getProperty("line.separator");
+
+ private StartResolveEvent ev;
+ private LogTrigger trigger;
+ private File testDir;
+
+ protected void setUp() {
+ ev = new StartResolveEvent(
+ DefaultModuleDescriptor.newBasicInstance(ModuleRevisionId.parse("o#A;1"), new Date()),
+ new String[] {"c"});
+ trigger = new LogTrigger();
+ trigger.setEvent(ev.getName());
+ testDir = new File("build/test/trigger");
+ testDir.mkdirs();
+ }
+
+ protected void tearDown() throws Exception {
+ FileUtil.forceDelete(testDir);
+ }
+
+ public void testMessage() throws Exception {
+ trigger.setMessage("msg: ${organisation} ${module} ${revision}");
+
+ MockMessageLogger mockLogger = new MockMessageLogger();
+ Message.setDefaultLogger(mockLogger);
+ trigger.progress(ev);
+
+ mockLogger.assertLogInfoContains("msg: o A 1");
+ }
+
+ public void testFile() throws Exception {
+ trigger.setMessage("msg: ${organisation} ${module} ${revision}");
+ File f = new File(testDir, "test.log");
+ trigger.setFile(f);
+
+ trigger.progress(ev);
+
+ assertTrue(f.exists());
+ assertEquals("msg: o A 1" + LINE_SEPARATOR, FileUtil.readEntirely(f));
+
+ trigger.progress(ev);
+
+ assertEquals("msg: o A 1" + LINE_SEPARATOR + "msg: o A 1" + LINE_SEPARATOR,
+ FileUtil.readEntirely(f));
+ }
+
+ public void testFileNoAppend() throws Exception {
+ trigger.setMessage("msg: ${organisation} ${module} ${revision}");
+ File f = new File(testDir, "test.log");
+ trigger.setFile(f);
+ trigger.setAppend(false);
+
+ trigger.progress(ev);
+ trigger.progress(ev);
+
+ assertTrue(f.exists());
+ assertEquals("msg: o A 1" + LINE_SEPARATOR, FileUtil.readEntirely(f));
+ }
+}
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/trigger/LogTriggerTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java Tue Dec 14 16:28:01 2010
@@ -1,47 +1,47 @@
-/*
- * 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.
- *
- */
-package org.apache.ivy.plugins.version;
-
-import junit.framework.TestCase;
-
-import org.apache.ivy.core.module.id.ModuleRevisionId;
-import org.apache.ivy.core.module.status.Status;
-import org.apache.ivy.core.module.status.StatusManager;
-
-public class LatestVersionMatcherTest extends TestCase {
- private LatestVersionMatcher vm = new LatestVersionMatcher();
-
- public void testNeedModuleDescriptorStandardStatus() throws Exception {
- assertNeed("latest.release", true);
- assertNeed("latest.milestone", true);
- assertNeed("latest.integration", false);
- }
-
- public void testNeedModuleDescriptorCustomStatus() throws Exception {
- StatusManager.getCurrent().addStatus(new Status("release", false));
- StatusManager.getCurrent().addStatus(new Status("snapshot", true));
-
- assertNeed("latest.release", true);
- assertNeed("latest.snapshot", false);
- }
-
- // assertion helper methods
- private void assertNeed(String askedVersion, boolean b) {
- assertEquals(b, vm.needModuleDescriptor(ModuleRevisionId.newInstance("org", "name", askedVersion), null));
- }
-}
+/*
+ * 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.
+ *
+ */
+package org.apache.ivy.plugins.version;
+
+import junit.framework.TestCase;
+
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.core.module.status.Status;
+import org.apache.ivy.core.module.status.StatusManager;
+
+public class LatestVersionMatcherTest extends TestCase {
+ private LatestVersionMatcher vm = new LatestVersionMatcher();
+
+ public void testNeedModuleDescriptorStandardStatus() throws Exception {
+ assertNeed("latest.release", true);
+ assertNeed("latest.milestone", true);
+ assertNeed("latest.integration", false);
+ }
+
+ public void testNeedModuleDescriptorCustomStatus() throws Exception {
+ StatusManager.getCurrent().addStatus(new Status("release", false));
+ StatusManager.getCurrent().addStatus(new Status("snapshot", true));
+
+ assertNeed("latest.release", true);
+ assertNeed("latest.snapshot", false);
+ }
+
+ // assertion helper methods
+ private void assertNeed(String askedVersion, boolean b) {
+ assertEquals(b, vm.needModuleDescriptor(ModuleRevisionId.newInstance("org", "name", askedVersion), null));
+ }
+}
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/LatestVersionMatcherTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/MockVersionMatcher.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/MockVersionMatcher.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java Tue Dec 14 16:28:01 2010
@@ -1,101 +1,101 @@
-/*
- * 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.
- *
- */
-package org.apache.ivy.plugins.version;
-
-import org.apache.ivy.core.module.id.ModuleRevisionId;
-
-import junit.framework.TestCase;
-
-public class PatternVersionMatcherTest extends TestCase {
- public void testSingleMatch() {
- PatternVersionMatcher pvm = new PatternVersionMatcher();
- pvm.addMatch(generateRegexpMatch1());
-
- assertAccept(pvm, "foo(1,3)", "1.4.1", false);
- assertAccept(pvm, "foo(1,3)", "1.3", false);
- assertAccept(pvm, "foo(1,3)", "2.3.1", false);
-
- assertAccept(pvm, "foo(1,3)", "1.3.1", true);
- }
-
- public void testMultipleMatchEqualRevisions() {
- PatternVersionMatcher pvm = new PatternVersionMatcher();
- pvm.addMatch(generateRegexpMatch1());
- pvm.addMatch(generateRegexpMatch2());
-
- assertAccept(pvm, "foo(1,3)", "1.3", true);
- assertAccept(pvm, "foo(1,3)", "1.3.1", true);
- }
-
- public void testMultipleMatchNonEqualRevisions() {
- PatternVersionMatcher pvm = new PatternVersionMatcher();
- pvm.addMatch(generateRegexpMatch1());
- pvm.addMatch(generateRegexpMatch3());
-
- assertAccept(pvm, "foo(1,3)", "1.3", false);
- assertAccept(pvm, "bar(1,3)", "1.3", true);
- assertAccept(pvm, "foo(1,3)", "1.3.1", true);
- }
-
- /**
- * Generates a Match instance that has the following xml representation:
- * <match revision="foo" pattern="${major}\.${minor}\.\d+" args="major, minor" matcher="regexp" />
- * @return
- */
- private Match generateRegexpMatch1() {
- Match match = new Match();
- match.setRevision("foo");
- match.setPattern("${major}\\.${minor}\\.\\d+");
- match.setArgs("major, minor");
- match.setMatcher("regexp");
-
- return match;
- }
-
- /**
- * Generates a Match instance that has the following xml representation:
- * <match revision="foo" pattern="${major}\.${minor}" args="major, minor" matcher="regexp" />
- * @return
- */
- private Match generateRegexpMatch2() {
- Match match = new Match();
- match.setRevision("foo");
- match.setPattern("${major}\\.${minor}");
- match.setArgs("major, minor");
- match.setMatcher("regexp");
-
- return match;
- }
-
- private Match generateRegexpMatch3() {
- Match match = new Match();
- match.setRevision("bar");
- match.setPattern("${major}\\.${minor}");
- match.setArgs("major, minor");
- match.setMatcher("regexp");
-
- return match;
- }
-
-
- private void assertAccept(PatternVersionMatcher matcher, String askedVersion,
- String depVersion, boolean b) {
- assertEquals(b, matcher.accept(ModuleRevisionId.newInstance("org", "name", askedVersion),
- ModuleRevisionId.newInstance("org", "name", depVersion)));
- }
-}
+/*
+ * 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.
+ *
+ */
+package org.apache.ivy.plugins.version;
+
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+
+import junit.framework.TestCase;
+
+public class PatternVersionMatcherTest extends TestCase {
+ public void testSingleMatch() {
+ PatternVersionMatcher pvm = new PatternVersionMatcher();
+ pvm.addMatch(generateRegexpMatch1());
+
+ assertAccept(pvm, "foo(1,3)", "1.4.1", false);
+ assertAccept(pvm, "foo(1,3)", "1.3", false);
+ assertAccept(pvm, "foo(1,3)", "2.3.1", false);
+
+ assertAccept(pvm, "foo(1,3)", "1.3.1", true);
+ }
+
+ public void testMultipleMatchEqualRevisions() {
+ PatternVersionMatcher pvm = new PatternVersionMatcher();
+ pvm.addMatch(generateRegexpMatch1());
+ pvm.addMatch(generateRegexpMatch2());
+
+ assertAccept(pvm, "foo(1,3)", "1.3", true);
+ assertAccept(pvm, "foo(1,3)", "1.3.1", true);
+ }
+
+ public void testMultipleMatchNonEqualRevisions() {
+ PatternVersionMatcher pvm = new PatternVersionMatcher();
+ pvm.addMatch(generateRegexpMatch1());
+ pvm.addMatch(generateRegexpMatch3());
+
+ assertAccept(pvm, "foo(1,3)", "1.3", false);
+ assertAccept(pvm, "bar(1,3)", "1.3", true);
+ assertAccept(pvm, "foo(1,3)", "1.3.1", true);
+ }
+
+ /**
+ * Generates a Match instance that has the following xml representation:
+ * <match revision="foo" pattern="${major}\.${minor}\.\d+" args="major, minor" matcher="regexp" />
+ * @return
+ */
+ private Match generateRegexpMatch1() {
+ Match match = new Match();
+ match.setRevision("foo");
+ match.setPattern("${major}\\.${minor}\\.\\d+");
+ match.setArgs("major, minor");
+ match.setMatcher("regexp");
+
+ return match;
+ }
+
+ /**
+ * Generates a Match instance that has the following xml representation:
+ * <match revision="foo" pattern="${major}\.${minor}" args="major, minor" matcher="regexp" />
+ * @return
+ */
+ private Match generateRegexpMatch2() {
+ Match match = new Match();
+ match.setRevision("foo");
+ match.setPattern("${major}\\.${minor}");
+ match.setArgs("major, minor");
+ match.setMatcher("regexp");
+
+ return match;
+ }
+
+ private Match generateRegexpMatch3() {
+ Match match = new Match();
+ match.setRevision("bar");
+ match.setPattern("${major}\\.${minor}");
+ match.setArgs("major, minor");
+ match.setMatcher("regexp");
+
+ return match;
+ }
+
+
+ private void assertAccept(PatternVersionMatcher matcher, String askedVersion,
+ String depVersion, boolean b) {
+ assertEquals(b, matcher.accept(ModuleRevisionId.newInstance("org", "name", askedVersion),
+ ModuleRevisionId.newInstance("org", "name", depVersion)));
+ }
+}
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/PatternVersionMatcherTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/version/VersionRangeMatcherTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/CacheCleaner.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/CacheCleaner.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/ConfiguratorTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/ConfiguratorTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/IvyPatternHelperTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/IvyPatternHelperTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/MockMessageLogger.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/MockMessageLogger.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/StringUtilsTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/StringUtilsTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java Tue Dec 14 16:28:01 2010
@@ -1,84 +1,84 @@
-/*
- * 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.
- *
- */
-package org.apache.ivy.util.url;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import org.apache.ivy.util.CopyProgressListener;
-
-import junit.framework.TestCase;
-
-public class AbstractURLHandlerTest extends TestCase {
-
- /**
- * JUnit test for IVY-923.
- */
- public void testNormalizeToStringWithSpaceURL() throws Exception {
- AbstractURLHandler handler = new TestURLHandler();
- String normalizedUrl = handler.normalizeToString(new URL("http://ant.apache.org/ivy/url with space/ivy-1.0.xml"));
- assertEquals("http://ant.apache.org/ivy/url%20with%20space/ivy-1.0.xml", normalizedUrl);
- }
-
- /**
- * JUnit test for IVY-923.
- */
- public void testNormalizeToStringWithPlusCharacter() throws Exception {
- AbstractURLHandler handler = new TestURLHandler();
- String normalizedUrl = handler.normalizeToString(new URL("http://ant.apache.org/ivy/ivy-1.+.xml"));
- assertEquals("http://ant.apache.org/ivy/ivy-1.%2B.xml", normalizedUrl);
- }
-
- public void testNormalizeToStringWithUnderscoreInHostname() throws Exception {
- AbstractURLHandler handler = new TestURLHandler();
- String normalizedUrl = handler.normalizeToString(new URL("http://peat_hal.users.sourceforge.net/m2repository"));
- assertEquals("http://peat_hal.users.sourceforge.net/m2repository", normalizedUrl);
- }
-
- public void testNormalizeToStringWithUnderscoreInHostnameAndSpaceInPath() throws Exception {
- AbstractURLHandler handler = new TestURLHandler();
- String normalizedUrl = handler.normalizeToString(new URL("http://peat_hal.users.sourceforge.net/m2 repository"));
- assertEquals("http://peat_hal.users.sourceforge.net/m2%20repository", normalizedUrl);
- }
-
- private static class TestURLHandler extends AbstractURLHandler {
-
- public void download(URL src, File dest, CopyProgressListener l) throws IOException {
- throw new UnsupportedOperationException();
- }
-
- public URLInfo getURLInfo(URL url) {
- throw new UnsupportedOperationException();
- }
-
- public URLInfo getURLInfo(URL url, int timeout) {
- throw new UnsupportedOperationException();
- }
-
- public InputStream openStream(URL url) throws IOException {
- throw new UnsupportedOperationException();
- }
-
- public void upload(File src, URL dest, CopyProgressListener l) throws IOException {
- throw new UnsupportedOperationException();
- }
-
- }
-}
+/*
+ * 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.
+ *
+ */
+package org.apache.ivy.util.url;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+import org.apache.ivy.util.CopyProgressListener;
+
+import junit.framework.TestCase;
+
+public class AbstractURLHandlerTest extends TestCase {
+
+ /**
+ * JUnit test for IVY-923.
+ */
+ public void testNormalizeToStringWithSpaceURL() throws Exception {
+ AbstractURLHandler handler = new TestURLHandler();
+ String normalizedUrl = handler.normalizeToString(new URL("http://ant.apache.org/ivy/url with space/ivy-1.0.xml"));
+ assertEquals("http://ant.apache.org/ivy/url%20with%20space/ivy-1.0.xml", normalizedUrl);
+ }
+
+ /**
+ * JUnit test for IVY-923.
+ */
+ public void testNormalizeToStringWithPlusCharacter() throws Exception {
+ AbstractURLHandler handler = new TestURLHandler();
+ String normalizedUrl = handler.normalizeToString(new URL("http://ant.apache.org/ivy/ivy-1.+.xml"));
+ assertEquals("http://ant.apache.org/ivy/ivy-1.%2B.xml", normalizedUrl);
+ }
+
+ public void testNormalizeToStringWithUnderscoreInHostname() throws Exception {
+ AbstractURLHandler handler = new TestURLHandler();
+ String normalizedUrl = handler.normalizeToString(new URL("http://peat_hal.users.sourceforge.net/m2repository"));
+ assertEquals("http://peat_hal.users.sourceforge.net/m2repository", normalizedUrl);
+ }
+
+ public void testNormalizeToStringWithUnderscoreInHostnameAndSpaceInPath() throws Exception {
+ AbstractURLHandler handler = new TestURLHandler();
+ String normalizedUrl = handler.normalizeToString(new URL("http://peat_hal.users.sourceforge.net/m2 repository"));
+ assertEquals("http://peat_hal.users.sourceforge.net/m2%20repository", normalizedUrl);
+ }
+
+ private static class TestURLHandler extends AbstractURLHandler {
+
+ public void download(URL src, File dest, CopyProgressListener l) throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ public URLInfo getURLInfo(URL url) {
+ throw new UnsupportedOperationException();
+ }
+
+ public URLInfo getURLInfo(URL url, int timeout) {
+ throw new UnsupportedOperationException();
+ }
+
+ public InputStream openStream(URL url) throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ public void upload(File src, URL dest, CopyProgressListener l) throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ }
+}
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/ApacheURLListerTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/ArtifactoryListingTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/ArtifactoryListingTest.java?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/ArtifactoryListingTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/ArtifactoryListingTest.java Tue Dec 14 16:28:01 2010
@@ -1,35 +1,35 @@
-/*
- * 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.
- *
- */
-package org.apache.ivy.util.url;
-
-import java.net.URL;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-public class ArtifactoryListingTest extends TestCase {
- // remote.test
-
- public void testWicketListing() throws Exception {
- ApacheURLLister lister = new ApacheURLLister();
-
- List content = lister.listAll(new URL("http://repo.jfrog.org/artifactory/libs-releases-local/org/apache/wicket/wicket/"));
- assertNotNull(content);
- assertEquals(2, content.size());
- }
-}
+/*
+ * 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.
+ *
+ */
+package org.apache.ivy.util.url;
+
+import java.net.URL;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+public class ArtifactoryListingTest extends TestCase {
+ // remote.test
+
+ public void testWicketListing() throws Exception {
+ ApacheURLLister lister = new ApacheURLLister();
+
+ List content = lister.listAll(new URL("http://repo.jfrog.org/artifactory/libs-releases-local/org/apache/wicket/wicket/"));
+ assertNotNull(content);
+ assertEquals(2, content.size());
+ }
+}
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/ArtifactoryListingTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/ArtifactoryListingTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/BasicURLHandlerTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/apache-dir-listing.html
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/apache-dir-listing.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/apache-file-listing.html
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/apache-file-listing.html
------------------------------------------------------------------------------
svn:mime-type = text/html
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/archiva-listing.html
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/util/url/archiva-listing.html
------------------------------------------------------------------------------
svn:mime-type = text/html