You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by xa...@apache.org on 2007/12/19 16:00:32 UTC
svn commit: r605564 - in /ant/ivy/ivyde/trunk: .classpath CHANGES.txt
META-INF/ META-INF/MANIFEST.MF build.properties plugin.xml
Author: xavier
Date: Wed Dec 19 07:00:32 2007
New Revision: 605564
URL: http://svn.apache.org/viewvc?rev=605564&view=rev
Log:
- migrate plugin metadata to OSGi
- IMPROVE: Use Ivy Bundle instead of packaging ivy.jar in IvyDE bundle (IVYDE-67)
Added:
ant/ivy/ivyde/trunk/META-INF/
ant/ivy/ivyde/trunk/META-INF/MANIFEST.MF (with props)
Modified:
ant/ivy/ivyde/trunk/.classpath
ant/ivy/ivyde/trunk/CHANGES.txt
ant/ivy/ivyde/trunk/build.properties
ant/ivy/ivyde/trunk/plugin.xml
Modified: ant/ivy/ivyde/trunk/.classpath
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/.classpath?rev=605564&r1=605563&r2=605564&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/.classpath (original)
+++ ant/ivy/ivyde/trunk/.classpath Wed Dec 19 07:00:32 2007
@@ -2,9 +2,8 @@
<classpath>
<classpathentry kind="src" path="src/java"/>
<classpathentry kind="src" path="test/java"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.apache.ivyde.eclipse.cpcontainer.IVYDE_CONTAINER/ivy.xml/*"/>
- <classpathentry kind="var" path="JUNIT_HOME/junit.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.jdt.source_3.0.0/src/org.junit_3.8.1/junitsrc.zip"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ant/ivy/ivyde/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/CHANGES.txt?rev=605564&r1=605563&r2=605564&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/CHANGES.txt (original)
+++ ant/ivy/ivyde/trunk/CHANGES.txt Wed Dec 19 07:00:32 2007
@@ -5,6 +5,7 @@
===========================
- NEW: [build] Use the latest ivy to resolve dependencies (IVYDE-62) (thanks to Nicolas Lalevée)
+- IMPROVE: Use Ivy Bundle instead of packaging ivy.jar in IvyDE bundle (IVYDE-67)
- IMPROVE: enable 'Resolve all' action (IVYDE-42) (thanks to Thomas FRIOL)
- IMPROVE: Support javadoc and sources even in modules where they are not declared (IVYDE-46)
- IMPROVE: Simplify the resolve process (IVYDE-64) (thanks to Nicolas Lalevée)
Added: ant/ivy/ivyde/trunk/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/META-INF/MANIFEST.MF?rev=605564&view=auto
==============================================================================
--- ant/ivy/ivyde/trunk/META-INF/MANIFEST.MF (added)
+++ ant/ivy/ivyde/trunk/META-INF/MANIFEST.MF Wed Dec 19 07:00:32 2007
@@ -0,0 +1,40 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: IvyDE Eclipse Plug-in
+Bundle-SymbolicName: org.apache.ivyde.eclipse; singleton:=true
+Bundle-Version: 1.3.0.20071219120000
+Bundle-ClassPath: ivyde-eclipse.jar
+Bundle-Activator: org.apache.ivyde.eclipse.IvyPlugin
+Bundle-Vendor: Apache Software Foundation
+Bundle-Localization: plugin
+Export-Package: .,
+ org.apache.ivyde.eclipse,
+ org.apache.ivyde.eclipse.core.model,
+ org.apache.ivyde.eclipse.cpcontainer,
+ org.apache.ivyde.eclipse.cpcontainer.fragmentinfo,
+ org.apache.ivyde.eclipse.ui.actions,
+ org.apache.ivyde.eclipse.ui.console,
+ org.apache.ivyde.eclipse.ui.core,
+ org.apache.ivyde.eclipse.ui.core.model,
+ org.apache.ivyde.eclipse.ui.editors,
+ org.apache.ivyde.eclipse.ui.editors.pages,
+ org.apache.ivyde.eclipse.ui.editors.xml,
+ org.apache.ivyde.eclipse.ui.preferences,
+ org.apache.ivyde.eclipse.ui.properties,
+ org.apache.ivyde.eclipse.ui.search,
+ org.apache.ivyde.eclipse.ui.views,
+ org.apache.ivyde.eclipse.ui.wizards
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.jface.text,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.core.resources,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.forms,
+ org.eclipse.search,
+ org.eclipse.jdt.core,
+ org.eclipse.jdt.ui,
+ org.eclipse.ui.console,
+ org.apache.ivy
+Eclipse-LazyStart: true
Propchange: ant/ivy/ivyde/trunk/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ant/ivy/ivyde/trunk/build.properties
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/build.properties?rev=605564&r1=605563&r2=605564&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/build.properties (original)
+++ ant/ivy/ivyde/trunk/build.properties Wed Dec 19 07:00:32 2007
@@ -15,16 +15,8 @@
ivyde-eclipse.jar,\
icons/,\
CHANGES.txt,\
- lib/default/commons-logging.jar,\
- lib/default/commons-httpclient.jar,\
LICENSE.txt,\
- lib/default/ivy-core.jar,\
- lib/default/oro.jar,\
- lib/default/commons-codec.jar,\
- lib/ant/ivy.jar,\
- lib/default/commons-vfs.jar,\
- lib/default/jsch.jar,\
- lib/default/slide-webdavlib.jar
+ META-INF/
module.type = tools
@@ -39,9 +31,4 @@
LICENSE.txt,\
CHANGES.txt,\
ivy-dev.xml
-src.excludes = src/doc/
-jars.extra.classpath = lib/default/commons-codec.jar,\
- lib/default/commons-httpclient.jar,\
- lib/default/commons-logging.jar,\
- lib/default/ivy-core.jar,\
- lib/default/oro.jar
+src.excludes = src/doc/
\ No newline at end of file
Modified: ant/ivy/ivyde/trunk/plugin.xml
URL: http://svn.apache.org/viewvc/ant/ivy/ivyde/trunk/plugin.xml?rev=605564&r1=605563&r2=605564&view=diff
==============================================================================
--- ant/ivy/ivyde/trunk/plugin.xml (original)
+++ ant/ivy/ivyde/trunk/plugin.xml Wed Dec 19 07:00:32 2007
@@ -1,57 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
-<plugin
- id="org.apache.ivyde.eclipse"
- name="IvyDE Eclipse Plug-in"
- version="1.3.0.20071119103400"
- provider-name="Apache"
- class="org.apache.ivyde.eclipse.IvyPlugin">
-
- <runtime>
- <library name="ivyde-eclipse.jar"/>
- <library name="lib/default/ivy-core.jar">
- <export name="*"/>
- </library>
- <library name="lib/default/commons-codec.jar">
- </library>
- <library name="lib/default/commons-httpclient.jar">
- </library>
- <library name="lib/default/commons-logging.jar">
- </library>
- <library name="lib/default/oro.jar">
- <export name="*"/>
- </library>
- <library name="lib/default/commons-vfs.jar">
- <export name="*"/>
- </library>
- <library name="lib/default/jsch.jar">
- <export name="*"/>
- </library>
- <library name="lib/default/slide-webdavlib.jar">
- <export name="*"/>
- </library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.jface.text"/>
- <import plugin="org.eclipse.ui.editors"/>
- <import plugin="org.eclipse.ui.workbench.texteditor"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.ui.ide"/>
- <import plugin="org.eclipse.ui.forms"/>
- <import plugin="org.eclipse.search"/>
- <import plugin="org.eclipse.jdt.core" />
- <import plugin="org.eclipse.jdt.ui" />
- <import plugin="org.eclipse.ui.console"/>
- </requires>
-
- <extension
- point="org.eclipse.ant.core.extraClasspathEntries">
- <extraClasspathEntry library="lib/ant/ivy.jar"/>
- </extension>
-
+<plugin>
<extension point="org.eclipse.ui.console.consoleFactories">
<consoleFactory
label="Ivy Console"