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 [10/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...
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/IvySettingsTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/IvySettingsTest.java?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/IvySettingsTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/IvySettingsTest.java Tue Dec 14 16:28:01 2010
@@ -1,48 +1,48 @@
-/*
- * 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.core.settings;
-
-import java.io.IOException;
-import java.text.ParseException;
-
-import junit.framework.TestCase;
-
-import org.apache.ivy.Ivy;
-import org.apache.ivy.plugins.resolver.DependencyResolver;
-
-public class IvySettingsTest extends TestCase {
-
- public void testChangeDefaultResolver() throws ParseException, IOException {
- Ivy ivy = new Ivy();
- ivy.configureDefault();
-
- IvySettings settings = ivy.getSettings();
- DependencyResolver defaultResolver = settings.getDefaultResolver();
-
- assertNotNull(defaultResolver);
- assertEquals("default", defaultResolver.getName());
- assertSame("default resolver cached", defaultResolver, settings.getDefaultResolver());
-
- settings.setDefaultResolver("public");
- DependencyResolver newDefault = settings.getDefaultResolver();
- assertNotNull(newDefault);
- assertNotSame("default resolver has changed", defaultResolver, newDefault);
- assertEquals("resolver changed successfully", "public", newDefault.getName());
- }
-
-}
+/*
+ * 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.core.settings;
+
+import java.io.IOException;
+import java.text.ParseException;
+
+import junit.framework.TestCase;
+
+import org.apache.ivy.Ivy;
+import org.apache.ivy.plugins.resolver.DependencyResolver;
+
+public class IvySettingsTest extends TestCase {
+
+ public void testChangeDefaultResolver() throws ParseException, IOException {
+ Ivy ivy = new Ivy();
+ ivy.configureDefault();
+
+ IvySettings settings = ivy.getSettings();
+ DependencyResolver defaultResolver = settings.getDefaultResolver();
+
+ assertNotNull(defaultResolver);
+ assertEquals("default", defaultResolver.getName());
+ assertSame("default resolver cached", defaultResolver, settings.getDefaultResolver());
+
+ settings.setDefaultResolver("public");
+ DependencyResolver newDefault = settings.getDefaultResolver();
+ assertNotNull(newDefault);
+ assertNotSame("default resolver has changed", defaultResolver, newDefault);
+ assertEquals("resolver changed successfully", "public", newDefault.getName());
+ }
+
+}
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/IvySettingsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/IvySettingsTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/OnlineXmlSettingsParserTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/OnlineXmlSettingsParserTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/XmlSettingsParserTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-properties-relative-to-ivyconf.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivyconf-properties-relative-to-ivyconf.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-cache-invalid.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-cache-invalid.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/core/settings/ivysettings-cache.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-cache.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-conflict-manager.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-conflict-manager.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-custom-typedef.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-custom-typedef.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-custom-typedef2.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-custom-typedef2.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-extra-module-attribute.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-extra-module-attribute.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-extra-module-attribute.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-extra-module-attribute.xml Tue Dec 14 16:28:01 2010
@@ -1,24 +1,24 @@
-<!--
- 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.
--->
-<ivysettings>
- <modules>
- <module organisation="apache" name="ivy" myattr="test.*" matcher="regexp" resolveMode="dynamic" />
- <module organisation="apache" name=".*" />
- </modules>
-</ivysettings>
+<!--
+ 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.
+-->
+<ivysettings>
+ <modules>
+ <module organisation="apache" name="ivy" myattr="test.*" matcher="regexp" resolveMode="dynamic" />
+ <module organisation="apache" name=".*" />
+ </modules>
+</ivysettings>
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-extra-module-attribute.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-extra-module-attribute.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-extra-module-attribute.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-include-absolute-file.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-include-absolute-file.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-include-missing-file.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-include-missing-file.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-include-special.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-include-special.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-include-special.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-include-special.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.
--->
-<ivysettings>
- <include file="ivysettings-macro#2.xml"/>
- <resolvers>
- <mymacro name="includeworks" mymainrep="${ivy.basedir}/included/myrep"
- mysecondrep="${ivy.basedir}/included/secondrep"/>
- </resolvers>
-</ivysettings>
+<!--
+ 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.
+-->
+<ivysettings>
+ <include file="ivysettings-macro#2.xml"/>
+ <resolvers>
+ <mymacro name="includeworks" mymainrep="${ivy.basedir}/included/myrep"
+ mysecondrep="${ivy.basedir}/included/secondrep"/>
+ </resolvers>
+</ivysettings>
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-include-special.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-include-special.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-include-special.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-include.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-include.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-lock-strategies.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-lock-strategies.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-macro#2.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-macro%232.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-macro#2.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-macro#2.xml Tue Dec 14 16:28:01 2010
@@ -1,45 +1,45 @@
-<!--
- 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.
--->
-<ivysettings>
- <property name="ivy.test.prop" value="myvalue" />
- <macrodef name="mymacro">
- <attribute name="mymainrep"/>
- <attribute name="mysecondrep"/>
- <attribute name="myseconddirlayout" default="[organisation]/[module]/[type]s"/>
- <chain>
- <filesystem name="fs1">
- <ivy pattern="@{mymainrep}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
- <artifact pattern="@{mymainrep}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
- </filesystem>
- <filesystem name="fs2" latest="latest-time">
- <ivy pattern="@{mysecondrep}/@{myseconddirlayout}/ivy-[revision].xml"/>
- <artifact pattern="@{mysecondrep}/@{myseconddirlayout}/[artifact]-[revision].[ext]"/>
- </filesystem>
- </chain>
- </macrodef>
-
- <resolvers>
- <mymacro name="default" mymainrep="${ivy.basedir}/path/to/myrep"
- mysecondrep="${ivy.basedir}/path/to/secondrep"/>
- <mymacro name="other"
- mymainrep="${ivy.basedir}/path/to/myrep"
- mysecondrep="${ivy.basedir}/path/to/secondrep"
- myseconddirlayout="[module]/[type]s"/>
- </resolvers>
-</ivysettings>
+<!--
+ 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.
+-->
+<ivysettings>
+ <property name="ivy.test.prop" value="myvalue" />
+ <macrodef name="mymacro">
+ <attribute name="mymainrep"/>
+ <attribute name="mysecondrep"/>
+ <attribute name="myseconddirlayout" default="[organisation]/[module]/[type]s"/>
+ <chain>
+ <filesystem name="fs1">
+ <ivy pattern="@{mymainrep}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
+ <artifact pattern="@{mymainrep}/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
+ </filesystem>
+ <filesystem name="fs2" latest="latest-time">
+ <ivy pattern="@{mysecondrep}/@{myseconddirlayout}/ivy-[revision].xml"/>
+ <artifact pattern="@{mysecondrep}/@{myseconddirlayout}/[artifact]-[revision].[ext]"/>
+ </filesystem>
+ </chain>
+ </macrodef>
+
+ <resolvers>
+ <mymacro name="default" mymainrep="${ivy.basedir}/path/to/myrep"
+ mysecondrep="${ivy.basedir}/path/to/secondrep"/>
+ <mymacro name="other"
+ mymainrep="${ivy.basedir}/path/to/myrep"
+ mysecondrep="${ivy.basedir}/path/to/secondrep"
+ myseconddirlayout="[module]/[type]s"/>
+ </resolvers>
+</ivysettings>
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-macro#2.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-macro#2.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-macro#2.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-macro+ref.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-macro+ref.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-macro+ref2.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-macro+ref2.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/core/settings/ivysettings-macro.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-macro.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-outputter.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-outputter.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-packager.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-packager.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/core/settings/ivysettings-parser.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-parser.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-properties-missing-file.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-properties-missing-file.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-properties-missing-file.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-properties-missing-file.xml Tue Dec 14 16:28:01 2010
@@ -1,52 +1,52 @@
-<!--
- 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.
--->
-<ivysettings>
- <properties file="missing-file.xml"/>
-
- <property name="shared" value="${ivy.basedir}/sharedrep" override="false"/>
- <properties file="ivysettings.properties" override="false" />
- <settings defaultResolver="libraries" validate="false" />
- <caches defaultCacheDir="${ivy.basedir}/mycache" checkUpToDate="false"
- ivyPattern="[module]/ivys/ivy-[revision].xml"
- artifactPattern="[module]/[type]s/[artifact]-[revision].[ext]" />
- <latest-strategies>
- <latest-revision name="mylatest-revision">
- <specialMeaning name="PRE" value="-2"/>
- <specialMeaning name="QA" value="4"/>
- </latest-revision>
- </latest-strategies>
- <resolvers>
- <chain name="internal">
- <filesystem name="int1" latest="latest-time">
- <ivy pattern="${shared}/[organisation]/[module]/ivys/ivy-[revision].xml"/>
- <artifact pattern="${shared}/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"/>
- </filesystem>
- <ibiblio name="int2"/>
- </chain>
- <filesystem name="libraries" latest="latest-revision">
- <ivy pattern="${libraries.dir}/[organisation]/[module]/ivys/ivy-[revision].xml"/>
- <artifact pattern="${libraries.dir}/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"/>
- </filesystem>
- </resolvers>
- <modules>
- <module organisation="apache" name="ivy*" revision="2*" matcher="glob" resolver="int2"/>
- <module organisation="apache" name="ivy*" matcher="glob" resolver="int1"/>
- <module organisation="apache" name=".*" resolver="internal"/>
- </modules>
-</ivysettings>
+<!--
+ 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.
+-->
+<ivysettings>
+ <properties file="missing-file.xml"/>
+
+ <property name="shared" value="${ivy.basedir}/sharedrep" override="false"/>
+ <properties file="ivysettings.properties" override="false" />
+ <settings defaultResolver="libraries" validate="false" />
+ <caches defaultCacheDir="${ivy.basedir}/mycache" checkUpToDate="false"
+ ivyPattern="[module]/ivys/ivy-[revision].xml"
+ artifactPattern="[module]/[type]s/[artifact]-[revision].[ext]" />
+ <latest-strategies>
+ <latest-revision name="mylatest-revision">
+ <specialMeaning name="PRE" value="-2"/>
+ <specialMeaning name="QA" value="4"/>
+ </latest-revision>
+ </latest-strategies>
+ <resolvers>
+ <chain name="internal">
+ <filesystem name="int1" latest="latest-time">
+ <ivy pattern="${shared}/[organisation]/[module]/ivys/ivy-[revision].xml"/>
+ <artifact pattern="${shared}/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"/>
+ </filesystem>
+ <ibiblio name="int2"/>
+ </chain>
+ <filesystem name="libraries" latest="latest-revision">
+ <ivy pattern="${libraries.dir}/[organisation]/[module]/ivys/ivy-[revision].xml"/>
+ <artifact pattern="${libraries.dir}/[organisation]/[module]/[type]s/[artifact]-[revision].[type]"/>
+ </filesystem>
+ </resolvers>
+ <modules>
+ <module organisation="apache" name="ivy*" revision="2*" matcher="glob" resolver="int2"/>
+ <module organisation="apache" name="ivy*" matcher="glob" resolver="int1"/>
+ <module organisation="apache" name=".*" resolver="internal"/>
+ </modules>
+</ivysettings>
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-properties-missing-file.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-properties-missing-file.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-properties-missing-file.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/core/settings/ivysettings-ref.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-ref.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-resolveMode.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-resolveMode.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-status.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-status.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-test.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-test.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-typedef.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-typedef.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-vmatcher1.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-vmatcher1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-vmatcher2.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings-vmatcher2.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/settings/ivysettings.properties
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/sort/SortTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/core/sort/SortTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/core/ExecutionEnvironmentProfileLoaderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/core/ExecutionEnvironmentProfileLoaderTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/core/ExecutionEnvironmentProfileLoaderTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/core/ManifestHeaderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/core/ManifestHeaderTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/core/ManifestHeaderTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/core/ManifestParserTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/core/ManifestParserTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/core/ManifestParserTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/obr/OBRParserTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/obr/RequirementFilterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/obr/RequirementFilterTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/obr/RequirementFilterTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/repo/BundleRepoTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/repo/BundleRepoTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/repo/BundleRepoTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/ArtifactTokensTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/ArtifactTokensTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/ArtifactTokensTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/ParseUtilTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/ParseUtilTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/ParseUtilTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/VersionRangeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/VersionRangeTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/VersionRangeTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/VersionTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/VersionTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/util/VersionTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java Tue Dec 14 16:28:01 2010
@@ -1,50 +1,50 @@
-/*
- * 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.circular;
-
-import junit.framework.TestCase;
-
-import org.apache.ivy.TestHelper;
-import org.apache.ivy.util.Message;
-import org.apache.ivy.util.MockMessageLogger;
-
-public class IgnoreCircularDependencyStrategyTest extends TestCase {
- private CircularDependencyStrategy strategy;
- private MockMessageLogger mockMessageImpl;
-
- protected void setUp() throws Exception {
- strategy = IgnoreCircularDependencyStrategy.getInstance();
-
- mockMessageImpl = new MockMessageLogger();
- Message.setDefaultLogger(mockMessageImpl);
- }
-
- public void testLog() throws Exception {
- strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.0, #B;1.0"));
-
- mockMessageImpl.assertLogVerboseContains("circular dependency found: #A;1.0->#B;1.0");
- }
-
- public void testRemoveDuplicates() throws Exception {
- strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
- strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
-
- // should only log the circular dependency once
- assertEquals(1, mockMessageImpl.getLogs().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.plugins.circular;
+
+import junit.framework.TestCase;
+
+import org.apache.ivy.TestHelper;
+import org.apache.ivy.util.Message;
+import org.apache.ivy.util.MockMessageLogger;
+
+public class IgnoreCircularDependencyStrategyTest extends TestCase {
+ private CircularDependencyStrategy strategy;
+ private MockMessageLogger mockMessageImpl;
+
+ protected void setUp() throws Exception {
+ strategy = IgnoreCircularDependencyStrategy.getInstance();
+
+ mockMessageImpl = new MockMessageLogger();
+ Message.setDefaultLogger(mockMessageImpl);
+ }
+
+ public void testLog() throws Exception {
+ strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.0, #B;1.0"));
+
+ mockMessageImpl.assertLogVerboseContains("circular dependency found: #A;1.0->#B;1.0");
+ }
+
+ public void testRemoveDuplicates() throws Exception {
+ strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
+ strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
+
+ // should only log the circular dependency once
+ assertEquals(1, mockMessageImpl.getLogs().size());
+ }
+}
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/circular/IgnoreCircularDependencyStrategyTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java Tue Dec 14 16:28:01 2010
@@ -1,90 +1,90 @@
-/*
- * 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.circular;
-
-import junit.framework.TestCase;
-
-import org.apache.ivy.TestHelper;
-import org.apache.ivy.core.IvyContext;
-import org.apache.ivy.core.event.EventManager;
-import org.apache.ivy.core.resolve.ResolveData;
-import org.apache.ivy.core.resolve.ResolveEngine;
-import org.apache.ivy.core.resolve.ResolveOptions;
-import org.apache.ivy.core.settings.IvySettings;
-import org.apache.ivy.core.sort.SortEngine;
-import org.apache.ivy.util.Message;
-import org.apache.ivy.util.MockMessageLogger;
-
-public class WarnCircularDependencyStrategyTest extends TestCase {
- private CircularDependencyStrategy strategy;
- private MockMessageLogger mockMessageImpl;
-
- protected void setUp() throws Exception {
- strategy = WarnCircularDependencyStrategy.getInstance();
-
- resetLogger();
- }
-
- private void resetLogger() {
- mockMessageImpl = new MockMessageLogger();
- Message.setDefaultLogger(mockMessageImpl);
- }
-
- public void testLog() throws Exception {
- strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.0, #B;1.0"));
-
- mockMessageImpl.assertLogWarningContains("circular dependency found: #A;1.0->#B;1.0");
- }
-
- public void testRemoveDuplicates() throws Exception {
- strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
- strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
-
- // should only log the circular dependency once
- assertEquals(1, mockMessageImpl.getLogs().size());
- }
-
- public void testRemoveDuplicates2() throws Exception {
- setResolveContext("1");
- resetLogger();
- strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
- strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
-
- // should only log the circular dependency once
- assertEquals(1, mockMessageImpl.getLogs().size());
-
- setResolveContext("2");
- resetLogger();
- strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
- // should log the message
- assertEquals(1, mockMessageImpl.getLogs().size());
-
- strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
-
- // should not log the message again
- assertEquals(1, mockMessageImpl.getLogs().size());
- }
-
- private void setResolveContext(String resolveId) {
- IvySettings settings = new IvySettings();
- IvyContext.getContext().setResolveData(
- new ResolveData(
- new ResolveEngine(settings, new EventManager(), new SortEngine(settings)),
- new ResolveOptions().setResolveId(resolveId)));
- }
-}
+/*
+ * 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.circular;
+
+import junit.framework.TestCase;
+
+import org.apache.ivy.TestHelper;
+import org.apache.ivy.core.IvyContext;
+import org.apache.ivy.core.event.EventManager;
+import org.apache.ivy.core.resolve.ResolveData;
+import org.apache.ivy.core.resolve.ResolveEngine;
+import org.apache.ivy.core.resolve.ResolveOptions;
+import org.apache.ivy.core.settings.IvySettings;
+import org.apache.ivy.core.sort.SortEngine;
+import org.apache.ivy.util.Message;
+import org.apache.ivy.util.MockMessageLogger;
+
+public class WarnCircularDependencyStrategyTest extends TestCase {
+ private CircularDependencyStrategy strategy;
+ private MockMessageLogger mockMessageImpl;
+
+ protected void setUp() throws Exception {
+ strategy = WarnCircularDependencyStrategy.getInstance();
+
+ resetLogger();
+ }
+
+ private void resetLogger() {
+ mockMessageImpl = new MockMessageLogger();
+ Message.setDefaultLogger(mockMessageImpl);
+ }
+
+ public void testLog() throws Exception {
+ strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.0, #B;1.0"));
+
+ mockMessageImpl.assertLogWarningContains("circular dependency found: #A;1.0->#B;1.0");
+ }
+
+ public void testRemoveDuplicates() throws Exception {
+ strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
+ strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
+
+ // should only log the circular dependency once
+ assertEquals(1, mockMessageImpl.getLogs().size());
+ }
+
+ public void testRemoveDuplicates2() throws Exception {
+ setResolveContext("1");
+ resetLogger();
+ strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
+ strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
+
+ // should only log the circular dependency once
+ assertEquals(1, mockMessageImpl.getLogs().size());
+
+ setResolveContext("2");
+ resetLogger();
+ strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
+ // should log the message
+ assertEquals(1, mockMessageImpl.getLogs().size());
+
+ strategy.handleCircularDependency(TestHelper.parseMridsToArray("#A;1.1, #B;1.0"));
+
+ // should not log the message again
+ assertEquals(1, mockMessageImpl.getLogs().size());
+ }
+
+ private void setResolveContext(String resolveId) {
+ IvySettings settings = new IvySettings();
+ IvyContext.getContext().setResolveData(
+ new ResolveData(
+ new ResolveEngine(settings, new EventManager(), new SortEngine(settings)),
+ new ResolveOptions().setResolveId(resolveId)));
+ }
+}
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java Tue Dec 14 16:28:01 2010
@@ -1,188 +1,188 @@
-/*
- * 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.conflict;
-
-import java.io.IOException;
-import java.text.ParseException;
-
-import junit.framework.TestCase;
-
-import org.apache.ivy.Ivy;
-import org.apache.ivy.TestFixture;
-import org.apache.ivy.TestHelper;
-import org.apache.ivy.core.report.ConfigurationResolveReport;
-import org.apache.ivy.core.report.ResolveReport;
-
-public class LatestCompatibleConflictManagerTest extends TestCase {
- private TestFixture fixture;
-
- protected void setUp() throws Exception {
- fixture = new TestFixture();
- LatestCompatibleConflictManager cm = new LatestCompatibleConflictManager();
- fixture.getSettings().addConfigured(cm);
- fixture.getSettings().setDefaultConflictManager(cm);
- }
-
- protected void tearDown() throws Exception {
- fixture.clean();
- }
-
- public void testInitFromSettings() throws Exception {
- Ivy ivy = new Ivy();
- ivy.configure(LatestCompatibleConflictManagerTest
- .class.getResource("ivysettings-latest-compatible.xml"));
- ConflictManager cm = ivy.getSettings().getDefaultConflictManager();
- assertTrue(cm instanceof LatestCompatibleConflictManager);
- }
-
- public void testCompatibilityResolve1() throws Exception {
- fixture
- .addMD("#A;1-> { #B;1.4 #C;[2.0,2.5] }")
- .addMD("#B;1.4->#D;1.5")
- .addMD("#C;2.5->#D;[1.0,1.6]")
- .addMD("#D;1.5").addMD("#D;1.6")
- .init();
- resolveAndAssert("#A;1", "#B;1.4, #C;2.5, #D;1.5");
- }
-
- public void testCompatibilityResolve2() throws Exception {
- fixture
- .addMD("#A;2-> { #B;[1.0,1.5] #C;[2.0,2.5] }")
- .addMD("#B;1.4->#D;1.5")
- .addMD("#B;1.5->#D;2.0")
- .addMD("#C;2.5->#D;[1.0,1.6]")
- .addMD("#D;1.5").addMD("#D;1.6").addMD("#D;2.0")
- .init();
- resolveAndAssert("#A;2", "#B;1.4, #C;2.5, #D;1.5");
- }
-
- public void testCompatibilityResolve3() throws Exception {
- fixture
- .addMD("#A;3-> { #B;[2.0,2.5] #C;[3.0,3.5] }")
- .addMD("#B;2.3-> { #D;1.5 #E;1.0 }")
- .addMD("#B;2.4-> { #D;1.5 #E;2.0 }")
- .addMD("#B;2.5-> { #D;2.0 }")
- .addMD("#C;3.4-> { #D;[1.0,1.6] #E;1.0 }")
- .addMD("#C;3.5-> { #D;[1.0,1.6] #E;1.9 }")
- .addMD("#D;1.5").addMD("#D;1.6").addMD("#D;2.0")
- .addMD("#E;1.0").addMD("#E;1.9").addMD("#E;2.0")
- .init();
- resolveAndAssert("#A;3", "#B;2.3, #C;3.4, #D;1.5, #E;1.0");
- }
-
- public void testCompatibilityResolve4() throws Exception {
- fixture
- .addMD("#A;4-> { #B;[1.0,1.5] #C;[2.0,2.5] #F;[1.0,1.1] }")
- .addMD("#B;1.4->#D;1.5")
- .addMD("#B;1.5->#D;2.0")
- .addMD("#C;2.5->#D;[1.0,1.6]")
- .addMD("#F;1.0->#D;1.5")
- .addMD("#F;1.1->#D;1.6")
- .addMD("#D;1.5").addMD("#D;1.6").addMD("#D;2.0")
- .init();
- resolveAndAssert("#A;4", "#B;1.4, #C;2.5, #D;1.5, #F;1.0");
- }
-
- public void testCompatibilityResolve5() throws Exception {
- fixture
- .addMD("#A;5->{ #B;[1.0,1.5] #C;2.6 }")
- .addMD("#B;1.3->{ }")
- .addMD("#B;1.4->#D;1.5")
- .addMD("#B;1.5->#D;2.0")
- .addMD("#C;2.6->#D;1.6")
- .addMD("#D;1.5").addMD("#D;1.6").addMD("#D;2.0")
- .init();
- resolveAndAssert("#A;5", "#B;1.3, #C;2.6, #D;1.6");
- }
-
- public void testCompatibilityResolve6() throws Exception {
- fixture
- .addMD("#A;1-> { #C;[2.0,2.5] #B;1.4 }")
- .addMD("#B;1.4->#D;1.5")
- .addMD("#C;2.5->#D;[1.0,1.6]")
- .addMD("#D;1.5").addMD("#D;1.6")
- .init();
- resolveAndAssert("#A;1", "#B;1.4, #C;2.5, #D;1.5");
- }
-
- public void testCompatibilityResolveCircularDependency1() throws Exception {
- fixture
- .addMD("#A;6->{ #B;[3.0,3.5] #C;4.6 }")
- .addMD("#B;3.4->#D;2.5")
- .addMD("#B;3.5->#D;3.0")
- .addMD("#C;4.6->#D;2.5")
- .addMD("#D;3.0->#B;3.5") // circular dependency
- .addMD("#D;2.5->#B;3.4") // circular dependency
- .init();
- resolveAndAssert("#A;6", "#B;3.4, #C;4.6, #D;2.5");
- }
-
- public void testCompatibilityResolveCircularDependency2() throws Exception {
- fixture
- .addMD("#A;1->#C;2")
- .addMD("#C;1->#B;1")
- .addMD("#C;2->#B;2")
- .addMD("#C;3->#B;3")
- .addMD("#B;1->#C;latest.integration") // circular dependency
- .addMD("#B;2->#C;latest.integration") // circular dependency
- .addMD("#B;3->#C;latest.integration") // circular dependency
- .init();
- resolveAndAssert("#A;1", "#B;2, #C;2");
- }
-
- public void testCompatibilityResolveCircularDependency3() throws Exception {
- // same as 2, but A depends on B
- fixture
- .addMD("#A;1->#B;2")
- .addMD("#C;1->#B;1")
- .addMD("#C;2->#B;2")
- .addMD("#C;3->#B;3")
- .addMD("#B;1->#C;latest.integration") // circular dependency
- .addMD("#B;2->#C;latest.integration") // circular dependency
- .addMD("#B;3->#C;latest.integration") // circular dependency
- .init();
- resolveAndAssert("#A;1", "#B;2, #C;2");
- }
-
-
- public void testConflict() throws Exception {
- try {
- fixture
- .addMD("#A;conflict-> { #B;[1.5,1.6] #C;2.5 }")
- .addMD("#B;1.5->#D;2.0")
- .addMD("#B;1.6->#D;2.0")
- .addMD("#C;2.5->#D;[1.0,1.6]")
- .addMD("#D;1.5").addMD("#D;1.6").addMD("#D;2.0")
- .init();
- fixture.resolve("#A;conflict");
-
- fail("Resolve should have failed with a conflict");
- } catch (StrictConflictException e) {
- // this is expected
- }
- }
-
- private void resolveAndAssert(String mrid, String expectedModuleSet)
- throws ParseException, IOException {
- ResolveReport report = fixture.resolve(mrid);
- assertFalse(report.hasError());
- ConfigurationResolveReport defaultReport = report.getConfigurationReport("default");
- TestHelper.assertModuleRevisionIds(expectedModuleSet,
- defaultReport.getModuleRevisionIds());
- }
-}
+/*
+ * 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.conflict;
+
+import java.io.IOException;
+import java.text.ParseException;
+
+import junit.framework.TestCase;
+
+import org.apache.ivy.Ivy;
+import org.apache.ivy.TestFixture;
+import org.apache.ivy.TestHelper;
+import org.apache.ivy.core.report.ConfigurationResolveReport;
+import org.apache.ivy.core.report.ResolveReport;
+
+public class LatestCompatibleConflictManagerTest extends TestCase {
+ private TestFixture fixture;
+
+ protected void setUp() throws Exception {
+ fixture = new TestFixture();
+ LatestCompatibleConflictManager cm = new LatestCompatibleConflictManager();
+ fixture.getSettings().addConfigured(cm);
+ fixture.getSettings().setDefaultConflictManager(cm);
+ }
+
+ protected void tearDown() throws Exception {
+ fixture.clean();
+ }
+
+ public void testInitFromSettings() throws Exception {
+ Ivy ivy = new Ivy();
+ ivy.configure(LatestCompatibleConflictManagerTest
+ .class.getResource("ivysettings-latest-compatible.xml"));
+ ConflictManager cm = ivy.getSettings().getDefaultConflictManager();
+ assertTrue(cm instanceof LatestCompatibleConflictManager);
+ }
+
+ public void testCompatibilityResolve1() throws Exception {
+ fixture
+ .addMD("#A;1-> { #B;1.4 #C;[2.0,2.5] }")
+ .addMD("#B;1.4->#D;1.5")
+ .addMD("#C;2.5->#D;[1.0,1.6]")
+ .addMD("#D;1.5").addMD("#D;1.6")
+ .init();
+ resolveAndAssert("#A;1", "#B;1.4, #C;2.5, #D;1.5");
+ }
+
+ public void testCompatibilityResolve2() throws Exception {
+ fixture
+ .addMD("#A;2-> { #B;[1.0,1.5] #C;[2.0,2.5] }")
+ .addMD("#B;1.4->#D;1.5")
+ .addMD("#B;1.5->#D;2.0")
+ .addMD("#C;2.5->#D;[1.0,1.6]")
+ .addMD("#D;1.5").addMD("#D;1.6").addMD("#D;2.0")
+ .init();
+ resolveAndAssert("#A;2", "#B;1.4, #C;2.5, #D;1.5");
+ }
+
+ public void testCompatibilityResolve3() throws Exception {
+ fixture
+ .addMD("#A;3-> { #B;[2.0,2.5] #C;[3.0,3.5] }")
+ .addMD("#B;2.3-> { #D;1.5 #E;1.0 }")
+ .addMD("#B;2.4-> { #D;1.5 #E;2.0 }")
+ .addMD("#B;2.5-> { #D;2.0 }")
+ .addMD("#C;3.4-> { #D;[1.0,1.6] #E;1.0 }")
+ .addMD("#C;3.5-> { #D;[1.0,1.6] #E;1.9 }")
+ .addMD("#D;1.5").addMD("#D;1.6").addMD("#D;2.0")
+ .addMD("#E;1.0").addMD("#E;1.9").addMD("#E;2.0")
+ .init();
+ resolveAndAssert("#A;3", "#B;2.3, #C;3.4, #D;1.5, #E;1.0");
+ }
+
+ public void testCompatibilityResolve4() throws Exception {
+ fixture
+ .addMD("#A;4-> { #B;[1.0,1.5] #C;[2.0,2.5] #F;[1.0,1.1] }")
+ .addMD("#B;1.4->#D;1.5")
+ .addMD("#B;1.5->#D;2.0")
+ .addMD("#C;2.5->#D;[1.0,1.6]")
+ .addMD("#F;1.0->#D;1.5")
+ .addMD("#F;1.1->#D;1.6")
+ .addMD("#D;1.5").addMD("#D;1.6").addMD("#D;2.0")
+ .init();
+ resolveAndAssert("#A;4", "#B;1.4, #C;2.5, #D;1.5, #F;1.0");
+ }
+
+ public void testCompatibilityResolve5() throws Exception {
+ fixture
+ .addMD("#A;5->{ #B;[1.0,1.5] #C;2.6 }")
+ .addMD("#B;1.3->{ }")
+ .addMD("#B;1.4->#D;1.5")
+ .addMD("#B;1.5->#D;2.0")
+ .addMD("#C;2.6->#D;1.6")
+ .addMD("#D;1.5").addMD("#D;1.6").addMD("#D;2.0")
+ .init();
+ resolveAndAssert("#A;5", "#B;1.3, #C;2.6, #D;1.6");
+ }
+
+ public void testCompatibilityResolve6() throws Exception {
+ fixture
+ .addMD("#A;1-> { #C;[2.0,2.5] #B;1.4 }")
+ .addMD("#B;1.4->#D;1.5")
+ .addMD("#C;2.5->#D;[1.0,1.6]")
+ .addMD("#D;1.5").addMD("#D;1.6")
+ .init();
+ resolveAndAssert("#A;1", "#B;1.4, #C;2.5, #D;1.5");
+ }
+
+ public void testCompatibilityResolveCircularDependency1() throws Exception {
+ fixture
+ .addMD("#A;6->{ #B;[3.0,3.5] #C;4.6 }")
+ .addMD("#B;3.4->#D;2.5")
+ .addMD("#B;3.5->#D;3.0")
+ .addMD("#C;4.6->#D;2.5")
+ .addMD("#D;3.0->#B;3.5") // circular dependency
+ .addMD("#D;2.5->#B;3.4") // circular dependency
+ .init();
+ resolveAndAssert("#A;6", "#B;3.4, #C;4.6, #D;2.5");
+ }
+
+ public void testCompatibilityResolveCircularDependency2() throws Exception {
+ fixture
+ .addMD("#A;1->#C;2")
+ .addMD("#C;1->#B;1")
+ .addMD("#C;2->#B;2")
+ .addMD("#C;3->#B;3")
+ .addMD("#B;1->#C;latest.integration") // circular dependency
+ .addMD("#B;2->#C;latest.integration") // circular dependency
+ .addMD("#B;3->#C;latest.integration") // circular dependency
+ .init();
+ resolveAndAssert("#A;1", "#B;2, #C;2");
+ }
+
+ public void testCompatibilityResolveCircularDependency3() throws Exception {
+ // same as 2, but A depends on B
+ fixture
+ .addMD("#A;1->#B;2")
+ .addMD("#C;1->#B;1")
+ .addMD("#C;2->#B;2")
+ .addMD("#C;3->#B;3")
+ .addMD("#B;1->#C;latest.integration") // circular dependency
+ .addMD("#B;2->#C;latest.integration") // circular dependency
+ .addMD("#B;3->#C;latest.integration") // circular dependency
+ .init();
+ resolveAndAssert("#A;1", "#B;2, #C;2");
+ }
+
+
+ public void testConflict() throws Exception {
+ try {
+ fixture
+ .addMD("#A;conflict-> { #B;[1.5,1.6] #C;2.5 }")
+ .addMD("#B;1.5->#D;2.0")
+ .addMD("#B;1.6->#D;2.0")
+ .addMD("#C;2.5->#D;[1.0,1.6]")
+ .addMD("#D;1.5").addMD("#D;1.6").addMD("#D;2.0")
+ .init();
+ fixture.resolve("#A;conflict");
+
+ fail("Resolve should have failed with a conflict");
+ } catch (StrictConflictException e) {
+ // this is expected
+ }
+ }
+
+ private void resolveAndAssert(String mrid, String expectedModuleSet)
+ throws ParseException, IOException {
+ ResolveReport report = fixture.resolve(mrid);
+ assertFalse(report.hasError());
+ ConfigurationResolveReport defaultReport = report.getConfigurationReport("default");
+ TestHelper.assertModuleRevisionIds(expectedModuleSet,
+ defaultReport.getModuleRevisionIds());
+ }
+}
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestCompatibleConflictManagerTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/LatestConflictManagerTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/RegexpConflictManagerTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/StrictConflictManagerTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-383.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-383.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-388.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-388.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-conflict-dynamic.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-conflict-dynamic.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-conflict-dynamic.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-conflict-dynamic.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="resolve-noconflict" revision="1.0" status="release"/>
- <dependencies>
- <dependency org="org1" name="mod1.2" rev="2.+"/>
- <dependency org="org2" name="mod2.1" rev="0.3"/>
- </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="resolve-noconflict" revision="1.0" status="release"/>
+ <dependencies>
+ <dependency org="org1" name="mod1.2" rev="2.+"/>
+ <dependency org="org2" name="mod2.1" rev="0.3"/>
+ </dependencies>
+</ivy-module>
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-conflict-dynamic.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-conflict-dynamic.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-conflict-dynamic.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-conflict.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-conflict.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-latest-time-1.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-latest-time-1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-latest-time-2.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-latest-time-2.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-latest-time-transitivity.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-latest-time-transitivity.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-no-regexp-conflict.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-no-regexp-conflict.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-noconflict-dynamic.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-noconflict-dynamic.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-noconflict-dynamic.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-noconflict-dynamic.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="resolve-noconflict" revision="1.0" status="release"/>
- <dependencies>
- <dependency org="org1" name="mod1.2" rev="[2.0,2.1["/>
- <dependency org="org2" name="mod2.1" rev="0.3"/>
- </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="resolve-noconflict" revision="1.0" status="release"/>
+ <dependencies>
+ <dependency org="org1" name="mod1.2" rev="[2.0,2.1["/>
+ <dependency org="org2" name="mod2.1" rev="0.3"/>
+ </dependencies>
+</ivy-module>
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-noconflict-dynamic.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-noconflict-dynamic.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-noconflict-dynamic.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-noconflict.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivy-noconflict.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest-compatible.xml
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest-compatible.xml?rev=1049146&r1=1049145&r2=1049146&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest-compatible.xml (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest-compatible.xml Tue Dec 14 16:28:01 2010
@@ -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.
--->
-<ivysettings>
-
- <settings defaultCache="${ivy.basedir}/build/cache" defaultResolver="test" defaultConflictManager="latest-compatible" />
-
- <resolvers>
- <filesystem name="test">
- <ivy pattern="${ivy.basedir}/test/repositories/latest-compatible/[module]/[revision]/[artifact].[ext]"/>
- <artifact
- pattern="${ivy.basedir}/test/repositories/latest-compatible/[module]/[revision]/[artifact].[ext]"/>
- </filesystem>
- </resolvers>
-</ivysettings>
+<!--
+ 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.
+-->
+<ivysettings>
+
+ <settings defaultCache="${ivy.basedir}/build/cache" defaultResolver="test" defaultConflictManager="latest-compatible" />
+
+ <resolvers>
+ <filesystem name="test">
+ <ivy pattern="${ivy.basedir}/test/repositories/latest-compatible/[module]/[revision]/[artifact].[ext]"/>
+ <artifact
+ pattern="${ivy.basedir}/test/repositories/latest-compatible/[module]/[revision]/[artifact].[ext]"/>
+ </filesystem>
+ </resolvers>
+</ivysettings>
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest-compatible.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest-compatible.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest-compatible.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/conflict/ivysettings-latest-time-transitivity.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest-time-transitivity.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest-time.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest-time.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-latest.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-regexp-test.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/core/trunk/test/java/org/apache/ivy/plugins/conflict/ivysettings-regexp-test.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml