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 2012/07/30 19:02:53 UTC
svn commit: r1367175 - in /ant/ivy/ivyde/trunk/test: settings-by-project/
settings-by-project2/ settings-by-project2/src/
Author: hibou
Date: Mon Jul 30 17:02:52 2012
New Revision: 1367175
URL: http://svn.apache.org/viewvc?rev=1367175&view=rev
Log:
Test the other way of specifying a settings relative to the current project
Added:
ant/ivy/ivyde/trunk/test/settings-by-project2/ (with props)
ant/ivy/ivyde/trunk/test/settings-by-project2/.classpath (with props)
ant/ivy/ivyde/trunk/test/settings-by-project2/.project (with props)
ant/ivy/ivyde/trunk/test/settings-by-project2/ivy.xml (with props)
ant/ivy/ivyde/trunk/test/settings-by-project2/ivysettings.xml (with props)
ant/ivy/ivyde/trunk/test/settings-by-project2/src/
Modified:
ant/ivy/ivyde/trunk/test/settings-by-project/ivy.xml
Modified: ant/ivy/ivyde/trunk/test/settings-by-project/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/settings-by-project/ivy.xml?rev=1367175&r1=1367174&r2=1367175&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/test/settings-by-project/ivy.xml (original)
+++ ant/ivy/ivyde/trunk/test/settings-by-project/ivy.xml Mon Jul 30 17:02:52 2012
@@ -19,7 +19,7 @@
<ivy-module version="1.0">
<info organisation="org.apache.ivyde" module="ivytest-settings-by-project">
<description>
- Project with settings local to the project
+ Project with settings local to the project (using the variable ivyproject_loc)
</description>
</info>
<configurations>
Propchange: ant/ivy/ivyde/trunk/test/settings-by-project2/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jul 30 17:02:52 2012
@@ -0,0 +1 @@
+bin
Added: ant/ivy/ivyde/trunk/test/settings-by-project2/.classpath
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/settings-by-project2/.classpath?rev=1367175&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ant/ivy/ivyde/trunk/test/settings-by-project2/.classpath
------------------------------------------------------------------------------
svn:mime-type = application/xml
Added: ant/ivy/ivyde/trunk/test/settings-by-project2/.project
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/settings-by-project2/.project?rev=1367175&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/settings-by-project2/.project (added)
+++ ant/ivy/ivyde/trunk/test/settings-by-project2/.project Mon Jul 30 17:02:52 2012
@@ -0,0 +1,36 @@
+<?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.
+-->
+<projectDescription>
+ <name>ivydetest-settings-by-project2</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.apache.ivyde.eclipse.ivynature</nature>
+ </natures>
+</projectDescription>
Propchange: ant/ivy/ivyde/trunk/test/settings-by-project2/.project
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/ivyde/trunk/test/settings-by-project2/.project
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/ivyde/trunk/test/settings-by-project2/.project
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ant/ivy/ivyde/trunk/test/settings-by-project2/ivy.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/settings-by-project2/ivy.xml?rev=1367175&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/settings-by-project2/ivy.xml (added)
+++ ant/ivy/ivyde/trunk/test/settings-by-project2/ivy.xml Mon Jul 30 17:02:52 2012
@@ -0,0 +1,31 @@
+<!--
+ 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="org.apache.ivyde" module="ivytest-settings-by-project2">
+ <description>
+ Project with settings local to the project, but not with the variable ivyproject_loc
+ </description>
+ </info>
+ <configurations>
+ <conf name="default" />
+ </configurations>
+ <dependencies>
+ <dependency org="myorg" name="mymodule" rev="1.1" conf="default" />
+ </dependencies>
+</ivy-module>
Propchange: ant/ivy/ivyde/trunk/test/settings-by-project2/ivy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/ivyde/trunk/test/settings-by-project2/ivy.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/ivyde/trunk/test/settings-by-project2/ivy.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ant/ivy/ivyde/trunk/test/settings-by-project2/ivysettings.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/settings-by-project2/ivysettings.xml?rev=1367175&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/settings-by-project2/ivysettings.xml (added)
+++ ant/ivy/ivyde/trunk/test/settings-by-project2/ivysettings.xml Mon Jul 30 17:02:52 2012
@@ -0,0 +1,28 @@
+<!--
+ 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>
+ <caches defaultCacheDir="${ivy.settings.dir}/../cache-fakerepo" useOrigin="false" />
+ <settings defaultResolver="fakerepo" checkUpToDate="false" />
+ <resolvers>
+ <filesystem name="fakerepo">
+ <ivy pattern="${ivy.settings.dir}/../fakerepo/[organisation]/[module]/ivy-[revision].xml"/>
+ <artifact pattern="${ivy.settings.dir}/../fakerepo/[organisation]/[module]/[type]s/[artifact]-[revision].[ext]"/>
+ </filesystem>
+ </resolvers>
+</ivysettings>
Propchange: ant/ivy/ivyde/trunk/test/settings-by-project2/ivysettings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/ivyde/trunk/test/settings-by-project2/ivysettings.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/ivyde/trunk/test/settings-by-project2/ivysettings.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml