Author: gscokart
Date: Sun Apr 13 10:40:39 2008
New Revision: 647594
URL: http://svn.apache.org/viewvc?rev=647594&view=rev
Log:
Prepare a test for IVY-372 (include in ivysettings should use relative path)
Added:
incubator/ivy/site/test/ivyconf-include-http-absolute-file.xml (with
props)
incubator/ivy/site/test/ivyconf-include-http-relative-file.xml (with
props)
incubator/ivy/site/test/ivyconf-include-http-relative-url.xml (with props)
Modified:
incubator/ivy/site/test/ivyconf-include-http-url.xml
Added: incubator/ivy/site/test/ivyconf-include-http-absolute-file.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/site/test/ivyconf-include-http-absolute-file.xml?rev=647594&view=auto
==============================================================================
--- incubator/ivy/site/test/ivyconf-include-http-absolute-file.xml (added)
+++ incubator/ivy/site/test/ivyconf-include-http-absolute-file.xml Sun Apr 13
10:40:39 2008
@@ -0,0 +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>
+ <include
file="${user.dir}/test/java/org/apache/ivy/core/settings/ivysettings-macro.xml"/>
+ <resolvers>
+ <mymacro name="includeworks" mymainrep="included/myrep"
mysecondrep="included/secondrep"/>
+ </resolvers>
+</ivysettings>
Propchange: incubator/ivy/site/test/ivyconf-include-http-absolute-file.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/ivy/site/test/ivyconf-include-http-relative-file.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/site/test/ivyconf-include-http-relative-file.xml?rev=647594&view=auto
==============================================================================
--- incubator/ivy/site/test/ivyconf-include-http-relative-file.xml (added)
+++ incubator/ivy/site/test/ivyconf-include-http-relative-file.xml Sun Apr 13
10:40:39 2008
@@ -0,0 +1,21 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<ivysettings>
+ <include file="ivyconf.xml"/>
+</ivysettings>
Propchange: incubator/ivy/site/test/ivyconf-include-http-relative-file.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/ivy/site/test/ivyconf-include-http-relative-url.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/site/test/ivyconf-include-http-relative-url.xml?rev=647594&view=auto
==============================================================================
--- incubator/ivy/site/test/ivyconf-include-http-relative-url.xml (added)
+++ incubator/ivy/site/test/ivyconf-include-http-relative-url.xml Sun Apr 13
10:40:39 2008
@@ -0,0 +1,21 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<ivysettings>
+ <include url="ivyconf.xml"/>
+</ivysettings>
Propchange: incubator/ivy/site/test/ivyconf-include-http-relative-url.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/ivy/site/test/ivyconf-include-http-url.xml
URL:
http://svn.apache.org/viewvc/incubator/ivy/site/test/ivyconf-include-http-url.xml?rev=647594&r1=647593&r2=647594&view=diff
==============================================================================
--- incubator/ivy/site/test/ivyconf-include-http-url.xml (original)
+++ incubator/ivy/site/test/ivyconf-include-http-url.xml Sun Apr 13 10:40:39
2008
@@ -16,6 +16,6 @@
specific language governing permissions and limitations
under the License.
-->
-<ivyconf>
+<ivysettings>
<include url="http://incubator.apache.org/ivy/test/ivyconf.xml"/>
-</ivyconf>
+</ivysettings>
