Author: hibou
Date: Mon Aug 11 07:18:39 2008
New Revision: 684756
URL: http://svn.apache.org/viewvc?rev=684756&view=rev
Log:
IVYDE-111 and IVYDE-50: add some test projects to test the cache managing in
IvyDE
Added:
ant/ivy/ivyde/trunk/test/fakerepo/
ant/ivy/ivyde/trunk/test/fakerepo/.project
ant/ivy/ivyde/trunk/test/fakerepo/myorg/
ant/ivy/ivyde/trunk/test/fakerepo/myorg/mymodule/
ant/ivy/ivyde/trunk/test/fakerepo/myorg/mymodule/ivy-1.1.xml (with props)
ant/ivy/ivyde/trunk/test/fakerepo/myorg/mymodule/jars/
ant/ivy/ivyde/trunk/test/fakerepo/myorg/mymodule/jars/mymodule-1.1.jar
ant/ivy/ivyde/trunk/test/fakerepo/myorg/mymodule/javadocs/
ant/ivy/ivyde/trunk/test/fakerepo/myorg/mymodule/javadocs/mymodule-1.1.jar
ant/ivy/ivyde/trunk/test/fakerepo/myorg/mymodule/sources/
ant/ivy/ivyde/trunk/test/fakerepo/myorg/mymodule/sources/mymodule-1.1.jar
ant/ivy/ivyde/trunk/test/local-cache/ (with props)
ant/ivy/ivyde/trunk/test/local-cache/.classpath
ant/ivy/ivyde/trunk/test/local-cache/.project
ant/ivy/ivyde/trunk/test/local-cache/ivy.xml (with props)
ant/ivy/ivyde/trunk/test/local-cache/ivysettings.xml (with props)
ant/ivy/ivyde/trunk/test/local-cache/src/
ant/ivy/ivyde/trunk/test/useOrigin/ (with props)
ant/ivy/ivyde/trunk/test/useOrigin/.classpath
ant/ivy/ivyde/trunk/test/useOrigin/.project
ant/ivy/ivyde/trunk/test/useOrigin/ivy.xml (with props)
ant/ivy/ivyde/trunk/test/useOrigin/ivysettings.xml (with props)
ant/ivy/ivyde/trunk/test/useOrigin/src/
Modified:
ant/ivy/ivyde/trunk/test/ (props changed)
ant/ivy/ivyde/trunk/test/project-dependent/ivy.xml
Propchange: ant/ivy/ivyde/trunk/test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 11 07:18:39 2008
@@ -0,0 +1 @@
+cache-fakerepo
Added: ant/ivy/ivyde/trunk/test/fakerepo/.project
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/fakerepo/.project?rev=684756&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/fakerepo/.project (added)
+++ ant/ivy/ivyde/trunk/test/fakerepo/.project Mon Aug 11 07:18:39 2008
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>ivydetest-fakerepo</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Added: ant/ivy/ivyde/trunk/test/fakerepo/myorg/mymodule/ivy-1.1.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/fakerepo/myorg/mymodule/ivy-1.1.xml?rev=684756&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/fakerepo/myorg/mymodule/ivy-1.1.xml (added)
+++ ant/ivy/ivyde/trunk/test/fakerepo/myorg/mymodule/ivy-1.1.xml Mon Aug 11
07:18:39 2008
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="1.0">
+ <info organisation="myorg"
+ module="mymodule"
+ revision="1.1"
+ status="release"
+ publication="20080811152510"
+ default="true"
+ />
+ <configurations>
+ <conf name="default" visibility="public"/>
+ </configurations>
+ <publications>
+ <artifact name="mymodule" type="jar" ext="jar" conf="default"/>
+ <artifact name="mymodule" type="source" ext="jar" conf="default"/>
+ <artifact name="mymodule" type="javadoc" ext="jar" conf="default"/>
+ </publications>
+</ivy-module>
Propchange: ant/ivy/ivyde/trunk/test/fakerepo/myorg/mymodule/ivy-1.1.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/ivyde/trunk/test/fakerepo/myorg/mymodule/ivy-1.1.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/ivyde/trunk/test/fakerepo/myorg/mymodule/ivy-1.1.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ant/ivy/ivyde/trunk/test/fakerepo/myorg/mymodule/jars/mymodule-1.1.jar
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/fakerepo/myorg/mymodule/jars/mymodule-1.1.jar?rev=684756&view=auto
==============================================================================
(empty)
Added:
ant/ivy/ivyde/trunk/test/fakerepo/myorg/mymodule/javadocs/mymodule-1.1.jar
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/fakerepo/myorg/mymodule/javadocs/mymodule-1.1.jar?rev=684756&view=auto
==============================================================================
(empty)
Added: ant/ivy/ivyde/trunk/test/fakerepo/myorg/mymodule/sources/mymodule-1.1.jar
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/fakerepo/myorg/mymodule/sources/mymodule-1.1.jar?rev=684756&view=auto
==============================================================================
(empty)
Propchange: ant/ivy/ivyde/trunk/test/local-cache/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 11 07:18:39 2008
@@ -0,0 +1,2 @@
+bin
+
Added: ant/ivy/ivyde/trunk/test/local-cache/.classpath
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/local-cache/.classpath?rev=684756&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/local-cache/.classpath (added)
+++ ant/ivy/ivyde/trunk/test/local-cache/.classpath Mon Aug 11 07:18:39 2008
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?ivyXmlPath=ivy.xml&confs=*&ivySettingsPath=file%3A%2F%2F.%2Fivysettings.xml&acceptedTypes=jar&sourceTypes=source&javadocTypes=javadoc&sourceSuffixes=-source%2C-sources%2C-src&javadocSuffixes=-javadoc%2C-javadocs%2C-doc%2C-docs&doRetrieve=false&retrievePattern=lib%2F%5Bconf%5D%2F%5Bartifact%5D.%5Bext%5D&alphaOrder=false"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: ant/ivy/ivyde/trunk/test/local-cache/.project
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/local-cache/.project?rev=684756&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/local-cache/.project (added)
+++ ant/ivy/ivyde/trunk/test/local-cache/.project Mon Aug 11 07:18:39 2008
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>ivydetest-local-cache</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>
+ </natures>
+</projectDescription>
Added: ant/ivy/ivyde/trunk/test/local-cache/ivy.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/local-cache/ivy.xml?rev=684756&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/local-cache/ivy.xml (added)
+++ ant/ivy/ivyde/trunk/test/local-cache/ivy.xml Mon Aug 11 07:18:39 2008
@@ -0,0 +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.
+-->
+<ivy-module version="1.0">
+ <info organisation="org.apache.ivyde" module="ivytest-useOrigin">
+ <description>
+ </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/local-cache/ivy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/ivyde/trunk/test/local-cache/ivy.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/ivyde/trunk/test/local-cache/ivy.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ant/ivy/ivyde/trunk/test/local-cache/ivysettings.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/local-cache/ivysettings.xml?rev=684756&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/local-cache/ivysettings.xml (added)
+++ ant/ivy/ivyde/trunk/test/local-cache/ivysettings.xml Mon Aug 11 07:18:39
2008
@@ -0,0 +1,10 @@
+<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/local-cache/ivysettings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/ivyde/trunk/test/local-cache/ivysettings.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/ivyde/trunk/test/local-cache/ivysettings.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: ant/ivy/ivyde/trunk/test/project-dependent/ivy.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/project-dependent/ivy.xml?rev=684756&r1=684755&r2=684756&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/test/project-dependent/ivy.xml (original)
+++ ant/ivy/ivyde/trunk/test/project-dependent/ivy.xml Mon Aug 11 07:18:39 2008
@@ -17,9 +17,8 @@
under the License.
-->
<ivy-module version="1.0">
- <info organisation="org.apache.ivyde" module="ivytest-simple">
+ <info organisation="org.apache.ivyde"
module="ivytest-project-dependant">
<description>
-Simple project having a dependency on commons-loggins on a m2 repository
</description>
</info>
<configurations>
Propchange: ant/ivy/ivyde/trunk/test/useOrigin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug 11 07:18:39 2008
@@ -0,0 +1,2 @@
+bin
+
Added: ant/ivy/ivyde/trunk/test/useOrigin/.classpath
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/useOrigin/.classpath?rev=684756&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/useOrigin/.classpath (added)
+++ ant/ivy/ivyde/trunk/test/useOrigin/.classpath Mon Aug 11 07:18:39 2008
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/?ivyXmlPath=ivy.xml&confs=*&ivySettingsPath=file%3A%2F%2F.%2Fivysettings.xml&acceptedTypes=jar&sourceTypes=source&javadocTypes=javadoc&sourceSuffixes=-source%2C-sources%2C-src&javadocSuffixes=-javadoc%2C-javadocs%2C-doc%2C-docs&doRetrieve=false&retrievePattern=lib%2F%5Bconf%5D%2F%5Bartifact%5D.%5Bext%5D&alphaOrder=false"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: ant/ivy/ivyde/trunk/test/useOrigin/.project
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/useOrigin/.project?rev=684756&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/useOrigin/.project (added)
+++ ant/ivy/ivyde/trunk/test/useOrigin/.project Mon Aug 11 07:18:39 2008
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>ivydetest-useOrigin</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>
+ </natures>
+</projectDescription>
Added: ant/ivy/ivyde/trunk/test/useOrigin/ivy.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/useOrigin/ivy.xml?rev=684756&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/useOrigin/ivy.xml (added)
+++ ant/ivy/ivyde/trunk/test/useOrigin/ivy.xml Mon Aug 11 07:18:39 2008
@@ -0,0 +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.
+-->
+<ivy-module version="1.0">
+ <info organisation="org.apache.ivyde" module="ivytest-useOrigin">
+ <description>
+ </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/useOrigin/ivy.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/ivyde/trunk/test/useOrigin/ivy.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/ivyde/trunk/test/useOrigin/ivy.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: ant/ivy/ivyde/trunk/test/useOrigin/ivysettings.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/test/useOrigin/ivysettings.xml?rev=684756&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/test/useOrigin/ivysettings.xml (added)
+++ ant/ivy/ivyde/trunk/test/useOrigin/ivysettings.xml Mon Aug 11 07:18:39 2008
@@ -0,0 +1,10 @@
+<ivysettings>
+ <caches defaultCacheDir="${ivy.settings.dir}/../cache-fakerepo"
useOrigin="true" />
+ <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/useOrigin/ivysettings.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ant/ivy/ivyde/trunk/test/useOrigin/ivysettings.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author HeadURL Id
Propchange: ant/ivy/ivyde/trunk/test/useOrigin/ivysettings.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
