Author: hibou
Date: Mon Dec 20 10:53:52 2010
New Revision: 1051057
URL: http://svn.apache.org/viewvc?rev=1051057&view=rev
Log:
Update the sample so it actually work
Modified:
ant/ivy/core/trunk/doc/samples/eclipse-plugin/build.xml
ant/ivy/core/trunk/doc/samples/eclipse-plugin/ivy.xml
ant/ivy/core/trunk/doc/samples/eclipse-plugin/ivysettings.xml
Modified: ant/ivy/core/trunk/doc/samples/eclipse-plugin/build.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/samples/eclipse-plugin/build.xml?rev=1051057&r1=1051056&r2=1051057&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/samples/eclipse-plugin/build.xml (original)
+++ ant/ivy/core/trunk/doc/samples/eclipse-plugin/build.xml Mon Dec 20 10:53:52
2010
@@ -50,7 +50,7 @@
<target name="ivy:resolve" depends="ivy:configure">
<!-- classical resolve and cache-path -->
<ivy:resolve file="ivy.xml" conf="*" />
- <ivy:cachepath pathid="compile.classpath" conf="default"
useOrigin="true" />
+ <ivy:cachepath pathid="compile.classpath" conf="compile"
useOrigin="true" />
</target>
<target name="compile" depends="ivy:resolve" description="Compile the
Eclipse plugin">
Modified: ant/ivy/core/trunk/doc/samples/eclipse-plugin/ivy.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/samples/eclipse-plugin/ivy.xml?rev=1051057&r1=1051056&r2=1051057&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/samples/eclipse-plugin/ivy.xml (original)
+++ ant/ivy/core/trunk/doc/samples/eclipse-plugin/ivy.xml Mon Dec 20 10:53:52
2010
@@ -17,18 +17,23 @@
specific language governing permissions and limitations
under the License.
-->
-<ivy-module version="2.2">
- <info organisation="com.acme" module="myplugin">
- <extends location="META-INF/MANIFEST.MF" />
+<ivy-module version="2.2" xmlns:o="http://ant.apache.org/ivy/osgi";>
+ <info organisation="" module="myplugin">
+ <extends organisation="" module="myplugin" revision="1.0.0.qualifier"
location="META-INF/MANIFEST.MF" />
</info>
<configurations>
<conf name="compile" extends="default,embedded"
description="Dependencies for the compilation" />
<conf name="embedded"
description="Dependencies embedded into the plugin's jar" />
+ <conf name="win32" extends="compile" description="To run
on Microsoft Windows" />
+ <conf name="macos" extends="compile" description="To run
on Mac OS X" />
+ <conf name="gtk" extends="compile" description="To run
on Linux" />
</configurations>
<dependencies>
<!-- exemple of a dependency that we can't declare in the MANIFEST.MF
because we want it to be embedded -->
<!--dependency osgi="bundle" org=""
module="org.apache.commons.httpcore" rev="4.1.0" conf="embedded->default" /-->
<!-- Ivy-Osgi doesn't understand bundle fragment -->
- <dependency osgi="bundle" org="" name="org.eclipse.swt.cocoa.macosx"
rev="3.+" />
+ <dependency o:type="bundle" org=""
name="org.eclipse.swt.win32.win32.x86" rev="3.+" conf="win32->default" />
+ <dependency o:type="bundle" org=""
name="org.eclipse.swt.cocoa.macosx.x86_64" rev="3.+" conf="macos->default" />
+ <dependency o:type="bundle" org=""
name="org.eclipse.swt.gtk.linux.x86" rev="3.+" conf="linux->default" />
</dependencies>
</ivy-module>
Modified: ant/ivy/core/trunk/doc/samples/eclipse-plugin/ivysettings.xml
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/doc/samples/eclipse-plugin/ivysettings.xml?rev=1051057&r1=1051056&r2=1051057&view=diff
==============================================================================
--- ant/ivy/core/trunk/doc/samples/eclipse-plugin/ivysettings.xml (original)
+++ ant/ivy/core/trunk/doc/samples/eclipse-plugin/ivysettings.xml Mon Dec 20
10:53:52 2010
@@ -20,28 +20,8 @@
<!-- Load the properties where is defined the eclipse location -->
<properties file="ivysettings.properties" />
- <!-- We need some custom types -->
- <!-- The parser of ivy.xml that can reference a MANIFEST.MF-->
- <typedef name="osgi-ivyparser"
classname="org.apache.ivy.osgi.ivy.OsgiIvyParser" />
- <!-- The Ivy Osgi repo resolver -->
- <typedef name="osgi-repo"
classname="org.apache.ivy.osgi.repo.BundleRepoResolver" />
- <!-- Ivy Osgi's latest startegy -->
- <typedef name="osgi-latest"
classname="org.apache.ivy.osgi.ivy.OsgiRevisionStrategy" />
- <!-- Ivy's default provider of OSGi execution environement profiles -->
- <typedef name="osgi-profileProvider"
classname="org.apache.ivy.osgi.repo.osgi.ExecutionEnvironmentProfileProvider" />
-
- <!-- We will use Ivy Osgi's latest strategy -->
- <latest-strategies>
- <osgi-latest name="osgi-latest-revision" />
- </latest-strategies>
-
- <!-- We will use Ivy Osgi's parsers -->
- <parsers>
- <osgi-manifest-parser />
- </parsers>
-
<!-- We need to define the Ivy Osgi latest strategy as the default one -->
- <settings defaultResolver="eclipse"
defaultLatestStrategy="osgi-latest-revision" />
+ <settings defaultResolver="eclipse" defaultLatestStrategy="latest-osgi" />
<!-- These are usual cache setup -->
<caches resolutionCacheDir="${ivy.settings.dir}/cache/resolution"
useOrigin="true">
@@ -50,9 +30,7 @@
<!-- We just need to define our Ivy OSGi resolver -->
<resolvers>
- <obr name="eclipse"
repoXmlFile="${ivy.settings.dir}/target/repo-eclipse.xml">
- <osgi-profileProvider />
- </obr>
+ <obr name="eclipse"
repoXmlFile="${ivy.settings.dir}/target/repo-eclipse.xml" />
</resolvers>
</ivysettings>
