You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by mc...@apache.org on 2008/05/25 08:54:09 UTC
svn commit: r659931 [1/2] - in
/geronimo/devtools/eclipse-plugin/branches/2.0.1: ./ assembly/
assembly/src/main/assembly/ eclipse/ emf/ emf/geronimo-1.0/
emf/geronimo-1.1/ features/ features/org.apache.geronimo.feature/
features/org.apache.geronimo.ins...
Author: mcconne
Date: Sat May 24 23:54:02 2008
New Revision: 659931
URL: http://svn.apache.org/viewvc?rev=659931&view=rev
Log:
GERONIMODEVTOOLS-347 Retrofit dependency management back to GEP 2.0.x
Added:
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/DependencyHelper.java (with props)
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/DependencyManager.java (with props)
Modified:
geronimo/devtools/eclipse-plugin/branches/2.0.1/assembly/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/assembly/src/main/assembly/site.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/eclipse/build.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/eclipse/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/emf/geronimo-1.0/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/emf/geronimo-1.1/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/emf/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.feature/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.installableruntime.jetty.feature/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.installableruntime.tomcat.feature/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.v10.feature/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.v11.feature/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.v12.feature/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.v20.feature/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/features/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.deployment.model/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.common/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v1/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v1/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v11/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v12/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v12/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v20/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Trace.java
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.ui/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v1.core/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v1.core/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v1.ui/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v1.ui/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v11.core/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v11.ui/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v12.core/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v12.core/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v20.core/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.v11.deployment.model.edit/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.v11.deployment.model/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.v11.deployment.model/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/pom.xml
geronimo/devtools/eclipse-plugin/branches/2.0.1/pom.xml
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/assembly/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/assembly/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/assembly/pom.xml Sat May 24 23:54:02 2008
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>geronimo-eclipse-plugin</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/assembly/src/main/assembly/site.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/assembly/src/main/assembly/site.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/assembly/src/main/assembly/site.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/assembly/src/main/assembly/site.xml Sat May 24 23:54:02 2008
@@ -28,20 +28,20 @@
<category-def name="org.eclipse.wst.server.core.serverAdapter" label="Geronimo WTP Server Adapters"/>
<category-def name="Geronimo Runtime" label="Apache Geronimo Runtimes"/>
- <feature url="features/org.apache.geronimo.feature_2.0.0.jar" id="org.apache.geronimo.feature" version="2.0.0">
+ <feature url="features/org.apache.geronimo.feature_2.0.1.jar" id="org.apache.geronimo.feature" version="2.0.1">
<category name="org.eclipse.wst.server.core.serverAdapter"/>
</feature>
- <feature url="features/org.apache.geronimo.v10.feature_2.0.0.jar" id="org.apache.geronimo.v10.feature" version="2.0.0">
+ <feature url="features/org.apache.geronimo.v10.feature_2.0.1.jar" id="org.apache.geronimo.v10.feature" version="2.0.1">
<category name="org.eclipse.wst.server.core.serverAdapter"/>
</feature>
- <feature url="features/org.apache.geronimo.v11.feature_2.0.0.jar" id="org.apache.geronimo.v11.feature" version="2.0.0">
+ <feature url="features/org.apache.geronimo.v11.feature_2.0.1.jar" id="org.apache.geronimo.v11.feature" version="2.0.1">
<category name="org.eclipse.wst.server.core.serverAdapter"/>
</feature>
<!--
- <feature url="features/org.apache.geronimo.v12.feature_2.0.0.jar" id="org.apache.geronimo.v12.feature" version="2.0.0">
+ <feature url="features/org.apache.geronimo.v12.feature_2.0.1.jar" id="org.apache.geronimo.v12.feature" version="2.0.1">
<category name="org.eclipse.wst.server.core.serverAdapter"/>
</feature> -->
- <feature url="features/org.apache.geronimo.v20.feature_2.0.0.jar" id="org.apache.geronimo.v20.feature" version="2.0.0">
+ <feature url="features/org.apache.geronimo.v20.feature_2.0.1.jar" id="org.apache.geronimo.v20.feature" version="2.0.1">
<category name="org.eclipse.wst.server.core.serverAdapter"/>
</feature>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/eclipse/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/eclipse/build.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/eclipse/build.xml Sat May 24 23:54:02 2008
@@ -23,22 +23,22 @@
<target name="init">
<property name="base_url" value="http://www.eclipse.org/downloads/download.php?file="/>
- <property name="europa_win32_url" value="${base_url}/eclipse/downloads/drops/R-3.3-200706251500/"/>
- <property name="europa_linux_url" value="${base_url}/eclipse/downloads/drops/R-3.3-200706251500/"/>
- <property name="europa_macos_url" value="${base_url}/eclipse/downloads/drops/R-3.3-200706251500/"/>
+ <property name="europa_win32_url" value="${base_url}/eclipse/downloads/drops/R-3.3.2-200802211800/"/>
+ <property name="europa_linux_url" value="${base_url}/eclipse/downloads/drops/R-3.3.2-200802211800"/>
+ <property name="europa_macos_url" value="${base_url}/eclipse/downloads/drops/R-3.3.2-200802211800"/>
<property name="dtp_download_url" value="${base_url}/datatools/downloads/1.5/"/>
- <property name="emf_download_url" value="${base_url}/modeling/emf/emf/downloads/drops/2.3.0/R200706262000/"/>
- <property name="gef_download_url" value="${base_url}/tools/gef/downloads/drops/R-3.3-200706281000/"/>
- <property name="wtp_download_url" value="${base_url}/webtools/downloads/drops/R2.0/R-2.0-200706260303/"/>
- <property name="europa_jee_win32" value="eclipse-SDK-3.3-win32.zip"/>
- <property name="europa_jee_linux" value="eclipse-SDK-3.3-linux-gtk.tar"/>
- <property name="europa_jee_macos" value="eclipse-SDK-3.3-macosx-carbon.tar"/>
+ <property name="emf_download_url" value="${base_url}/modeling/emf/emf/downloads/drops/2.3.2/R200802051830/"/>
+ <property name="gef_download_url" value="${base_url}/tools/gef/downloads/drops/3.3.2/R200802211602/"/>
+ <property name="wtp_download_url" value="${base_url}/webtools/downloads/drops/R2.0//R-2.0.2-20080223205547/"/>
+ <property name="europa_jee_win32" value="eclipse-SDK-3.3.2-win32.zip"/>
+ <property name="europa_jee_linux" value="eclipse-SDK-3.3.2-linux-gtk.tar"/>
+ <property name="europa_jee_macos" value="eclipse-SDK-3.3.2-macosx-carbon.tar"/>
<property name="europa_jee_linux_gz" value="${europa_jee_linux}.gz"/>
<property name="europa_jee_macos_gz" value="${europa_jee_macos}.gz"/>
- <property name="dtp_sdk" value="dtp-sdk_1.5.zip"/>
- <property name="emf_sdo" value="emf-sdo-xsd-SDK-2.3.0.zip"/>
- <property name="gef_sdk" value="GEF-SDK-3.3.zip"/>
- <property name="wtp_sdk" value="wtp-sdk-R-2.0-200706260303.zip"/>
+ <property name="dtp_sdk" value="dtp-sdk_1.5.2_022008.zip"/>
+ <property name="emf_sdo" value="emf-sdo-xsd-SDK-2.3.2.zip"/>
+ <property name="gef_sdk" value="GEF-SDK-3.3.2.zip"/>
+ <property name="wtp_sdk" value="wtp-sdk-R-2.0.2-20080223205547.zip"/>
<property name="protocol" value="&r=1&protocol=http"/>
</target>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/eclipse/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/eclipse/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/eclipse/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/eclipse/pom.xml Sat May 24 23:54:02 2008
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>geronimo-eclipse-plugin</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/emf/geronimo-1.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/emf/geronimo-1.0/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/emf/geronimo-1.0/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/emf/geronimo-1.0/pom.xml Sat May 24 23:54:02 2008
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>geronimo-emf-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<properties>
@@ -193,7 +193,7 @@
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<type>pom</type>
</dependency>
<dependency>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/emf/geronimo-1.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/emf/geronimo-1.1/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/emf/geronimo-1.1/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/emf/geronimo-1.1/pom.xml Sat May 24 23:54:02 2008
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>geronimo-emf-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<properties>
@@ -195,7 +195,7 @@
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<type>pom</type>
</dependency>
<dependency>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/emf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/emf/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/emf/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/emf/pom.xml Sat May 24 23:54:02 2008
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>geronimo-eclipse-plugin</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.feature/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.feature/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.feature/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.feature/pom.xml Sat May 24 23:54:02 2008
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-features-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.installableruntime.jetty.feature/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.installableruntime.jetty.feature/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.installableruntime.jetty.feature/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.installableruntime.jetty.feature/pom.xml Sat May 24 23:54:02 2008
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-features-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.installableruntime.tomcat.feature/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.installableruntime.tomcat.feature/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.installableruntime.tomcat.feature/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.installableruntime.tomcat.feature/pom.xml Sat May 24 23:54:02 2008
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-features-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.v10.feature/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.v10.feature/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.v10.feature/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.v10.feature/pom.xml Sat May 24 23:54:02 2008
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-features-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.v11.feature/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.v11.feature/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.v11.feature/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.v11.feature/pom.xml Sat May 24 23:54:02 2008
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-features-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.v12.feature/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.v12.feature/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.v12.feature/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.v12.feature/pom.xml Sat May 24 23:54:02 2008
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-features-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.v20.feature/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.v20.feature/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.v20.feature/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/features/org.apache.geronimo.v20.feature/pom.xml Sat May 24 23:54:02 2008
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-features-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/features/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/features/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/features/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/features/pom.xml Sat May 24 23:54:02 2008
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>geronimo-eclipse-plugin</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modules>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF Sat May 24 23:54:02 2008
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Geronimo V1 EMF Edit Models
Bundle-SymbolicName: org.apache.geronimo.deployment.model.edit; singleton:=true
-Bundle-Version: 2.0.0
+Bundle-Version: 2.0.1
Bundle-ClassPath: .
Bundle-Activator: org.apache.geronimo.deployment.model.edit.GeronimoEMFEditPlugin$Implementation
Bundle-Vendor: Apache.org
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.deployment.model.edit/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.deployment.model.edit/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.deployment.model.edit/pom.xml Sat May 24 23:54:02 2008
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
@@ -165,7 +165,7 @@
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<type>pom</type>
</dependency>
<dependency>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF Sat May 24 23:54:02 2008
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Geronimo V1 EMF Models
Bundle-SymbolicName: org.apache.geronimo.deployment.model; singleton:=true
-Bundle-Version: 2.0.0
+Bundle-Version: 2.0.1
Bundle-ClassPath: .
Bundle-Vendor: Apache.org
Bundle-Localization: plugin
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.deployment.model/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.deployment.model/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.deployment.model/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.deployment.model/pom.xml Sat May 24 23:54:02 2008
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF Sat May 24 23:54:02 2008
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Geronimo Common Runtime Plug-in
Bundle-SymbolicName: org.apache.geronimo.runtime.common;singleton:=true
-Bundle-Version: 2.0.0
+Bundle-Version: 2.0.1
Bundle-ClassPath:
lib/geronimo-j2ee-deployment_1.1_spec-1.0.jar,
lib/commons-logging-1.0.4.jar,
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.common/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.common/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.common/pom.xml Sat May 24 23:54:02 2008
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<type>pom</type>
</dependency>
<dependency>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v1/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v1/META-INF/MANIFEST.MF?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v1/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v1/META-INF/MANIFEST.MF Sat May 24 23:54:02 2008
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Geronimo V1 Runtime Plug-in
Bundle-SymbolicName: org.apache.geronimo.runtime.v1;singleton:=true
-Bundle-Version: 2.0.0
+Bundle-Version: 2.0.1
Bundle-ClassPath:
lib/openejb-builder-2.0.jar,
lib/geronimo-web-builder-1.0.jar,
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v1/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v1/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v1/pom.xml Sat May 24 23:54:02 2008
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<properties>
@@ -164,7 +164,7 @@
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<type>pom</type>
</dependency>
<dependency>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF Sat May 24 23:54:02 2008
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Geronimo V11 Runtime Plug-in
Bundle-SymbolicName: org.apache.geronimo.runtime.v11;singleton:=true
-Bundle-Version: 2.0.0
+Bundle-Version: 2.0.1
Require-Bundle: org.apache.geronimo.runtime.common;visibility:=reexport
Bundle-ClassPath: lib/openejb-builder-2.1.1.jar,
lib/geronimo-web-builder-1.1.1.jar,
@@ -179,23 +179,5 @@
schemaorg_apache_xmlbeans.namespace.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E1,
schemaorg_apache_xmlbeans.namespace.http_3A_2F_2Fwww_2Ew3_2Eorg_2FXML_2F1998_2Fnamespace,
schemaorg_apache_xmlbeans.src.http_3A_2F_2Fwww_2Ew3_2Eorg_2F2001,
- schemaorg_apache_xmlbeans.src.modules,
- schemaorg_apache_xmlbeans.system.s624ECD384556376FBF6D19CFF950A0F4,
- schemaorg_apache_xmlbeans.system.s686B996523AFA8A7C9F05CB07BC216B9,
- schemaorg_apache_xmlbeans.system.sC0CFD54C10B8C0292B30704501EF82FF,
- schemaorg_apache_xmlbeans.system.sCE8F1FAA1161B911F2297F6EBF4F2D37,
- schemaorg_apache_xmlbeans.system.sD110B3BA6E7C77F9DEDB8E0BF29A3FA7,
- schemaorg_apache_xmlbeans.system.sD54265BC20BB40986932114D35E4E1A4,
- schemaorg_apache_xmlbeans.system.sD81E1984D3B5AFD019AC1E421CD645AD,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_02483D38844388463B74BE7AE0EF65015157E4C4,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_167473D89E1DC8F91AA77030DE5274C6B244052C,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_1FE477639C3240E6A8376237B8C56D2C7C9C15EB,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_2267EB7D9E516602C6C8570149D294E8897A2838,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_490901EEEE794AA9D7B07ED01DA009061F60AF28,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_4EE4D506BDA8CFCEAFAFBABA17529CAACCEC8090,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_6A5B40E194E67E5DF4E1B38ABB86ED81D8A8AC02,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_907F9072999F8502109B085849AC541281F47682,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_D0F23FECA6787FBF9C4BF3D18DEE677DB8880200,
- schemaorg_apache_xmlbeans.type.URI_SHA_1_E566B4774FD5CE964CB8E11E4BDA9C84DF3C3908,
- schemaorg_apache_xmlbeans.type.http_3A_2F_2Fgeronimo_2Eapache_2Eorg_2Fxml_2Fns_2Fnaming_2D1_2E1
+ schemaorg_apache_xmlbeans.src.modules
Bundle-Vendor: Apache.org
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v11/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v11/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v11/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v11/pom.xml Sat May 24 23:54:02 2008
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<properties>
@@ -176,7 +176,7 @@
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<type>pom</type>
</dependency>
<dependency>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v12/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v12/META-INF/MANIFEST.MF?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v12/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v12/META-INF/MANIFEST.MF Sat May 24 23:54:02 2008
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Geronimo V12 Runtime Plug-in
Bundle-SymbolicName: org.apache.geronimo.runtime.v12;singleton:=true
-Bundle-Version: 2.0.0
+Bundle-Version: 2.0.1
Require-Bundle: org.apache.geronimo.runtime.common;visibility:=reexport
Bundle-ClassPath: lib/geronimo-common-1.2-SNAPSHOT.jar,
lib/geronimo-connector-builder-1.2-SNAPSHOT.jar,
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v12/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v12/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v12/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v12/pom.xml Sat May 24 23:54:02 2008
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<properties>
@@ -174,7 +174,7 @@
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<type>pom</type>
</dependency>
<dependency>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF Sat May 24 23:54:02 2008
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Geronimo V20 Runtime Plug-in
Bundle-SymbolicName: org.apache.geronimo.runtime.v20;singleton:=true
-Bundle-Version: 2.0.0
+Bundle-Version: 2.0.1
Require-Bundle: org.apache.geronimo.runtime.common;visibility:=reexport
Bundle-ClassPath: lib/geronimo-common-2.0.1.jar,
lib/geronimo-connector-builder-2.0.1.jar,
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v20/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v20/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.runtime.v20/pom.xml Sat May 24 23:54:02 2008
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<properties>
@@ -188,7 +188,7 @@
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<type>pom</type>
</dependency>
<dependency>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF Sat May 24 23:54:02 2008
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Geronimo Server Tools Core Plug-in
Bundle-SymbolicName: org.apache.geronimo.st.core;singleton:=true
-Bundle-Version: 2.0.0
+Bundle-Version: 2.0.1
Bundle-Activator: org.apache.geronimo.st.core.Activator
Bundle-Vendor: Apache.org
Bundle-Localization: plugin
@@ -25,7 +25,8 @@
org.eclipse.debug.core,
org.eclipse.wst.web,
org.eclipse.emf.common,
- org.eclipse.jem.util
+ org.eclipse.jem.util,
+ org.apache.geronimo.v11.deployment.model
Eclipse-LazyStart: true
Export-Package: org,
org.apache,
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/pom.xml Sat May 24 23:54:02 2008
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
@@ -86,7 +86,7 @@
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<type>pom</type>
</dependency>
<dependency>
@@ -94,5 +94,10 @@
<artifactId>org.apache.geronimo.runtime.common</artifactId>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>org.apache.geronimo.v11.deployment.model</artifactId>
+ <version>${version}</version>
+ </dependency>
</dependencies>
</project>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java Sat May 24 23:54:02 2008
@@ -36,6 +36,7 @@
import org.apache.geronimo.st.core.commands.DeploymentCmdStatus;
import org.apache.geronimo.st.core.commands.DeploymentCommandFactory;
import org.apache.geronimo.st.core.commands.IDeploymentCommand;
+import org.apache.geronimo.st.core.internal.DependencyHelper;
import org.apache.geronimo.st.core.internal.Messages;
import org.apache.geronimo.st.core.internal.Trace;
import org.apache.geronimo.st.core.operations.ISharedLibEntryCreationDataModelProperties;
@@ -202,6 +203,20 @@
* @see org.eclipse.wst.server.core.model.ServerBehaviourDelegate#publishModules(int, java.util.List, java.util.List, org.eclipse.core.runtime.MultiStatus, org.eclipse.core.runtime.IProgressMonitor)
*/
protected void publishModules(int kind, List modules, List deltaKind, MultiStatus multi, IProgressMonitor monitor) {
+ Trace.tracePoint("Entry", "GeronimoServerBehaviourDelegate.publishModules", deltaKindToString(kind), Arrays.asList(modules).toString(), Arrays.asList(deltaKind).toString(), multi, monitor);
+
+ //
+ // WTP publishes modules in reverse alphabetical order which does not account for possible
+ // dependencies between modules. If necessary reorder the publish order of the modules
+ // based on any discovered dependencies.
+ //
+ if (modules != null && modules.size() > 0) {
+ DependencyHelper dh = new DependencyHelper();
+ List list = dh.reorderModules(modules, deltaKind);
+ modules = (List) list.get(0);
+ deltaKind = (List) list.get(1);
+ }
+
IStatus status = Status.OK_STATUS;
if (modules != null && modules.size() > 0 && getGeronimoServer().isInPlaceSharedLib()) {
List rootModules = new ArrayList<IModule>();
@@ -246,6 +261,8 @@
} else {
multi.add(status);
}
+
+ Trace.tracePoint("Exit ", "GeronimoServerBehaviourDelegate.publishModules");
}
/*
Added: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/DependencyHelper.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/DependencyHelper.java?rev=659931&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/DependencyHelper.java (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/DependencyHelper.java Sat May 24 23:54:02 2008
@@ -0,0 +1,486 @@
+/*
+ * 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.
+ */
+
+package org.apache.geronimo.st.core.internal;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.geronimo.st.core.GeronimoUtils;
+import org.apache.geronimo.xml.ns.deployment.ArtifactType;
+import org.apache.geronimo.xml.ns.deployment.DependenciesType;
+import org.apache.geronimo.xml.ns.deployment.DependencyType;
+import org.apache.geronimo.xml.ns.deployment.DeploymentFactory;
+import org.apache.geronimo.xml.ns.deployment.EnvironmentType;
+import org.apache.geronimo.xml.ns.j2ee.application.ApplicationPackage;
+import org.apache.geronimo.xml.ns.j2ee.application.ApplicationType;
+import org.apache.geronimo.xml.ns.j2ee.application.util.ApplicationResourceFactoryImpl;
+import org.apache.geronimo.xml.ns.j2ee.connector.ConnectorPackage;
+import org.apache.geronimo.xml.ns.j2ee.connector.ConnectorType;
+import org.apache.geronimo.xml.ns.j2ee.connector.util.ConnectorResourceFactoryImpl;
+import org.apache.geronimo.xml.ns.j2ee.web.DocumentRoot;
+import org.apache.geronimo.xml.ns.j2ee.web.WebAppType;
+import org.apache.geronimo.xml.ns.j2ee.web.WebPackage;
+import org.apache.geronimo.xml.ns.j2ee.web.util.WebResourceFactoryImpl;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
+import org.openejb.xml.ns.openejb.jar.JarPackage;
+import org.openejb.xml.ns.openejb.jar.OpenejbJarType;
+import org.openejb.xml.ns.openejb.jar.util.JarResourceFactoryImpl;
+
+/**
+ * <b>DependencyHelper</b> is a helper class with various methods to aid in the discovery of
+ * inter-dependencies between modules being deployed from the GEP to the Geronimo server. It
+ * performs the following capabilities:
+ * <ol>
+ * <li>Discovery of dependencies between modules<p>
+ * <li>Provides the proper publishing ordering of the modules based on the discovered
+ * dependencies<p>
+ * <li><b>TODO:</b> Query the server searching for missing dependencies
+ * </ol>
+ *
+ * @version $Rev$ $Date$
+ */
+public class DependencyHelper {
+
+ private DependencyManager dm = new DependencyManager();
+ private List inputModules = new ArrayList();
+ private List inputDeltaKind = new ArrayList();
+ private List reorderedModules = new ArrayList();
+ private List reorderedKinds = new ArrayList();
+
+
+ /**
+ * Reorder the publish order of the modules based on any discovered dependencies
+ *
+ * @param modules Modules to be published to the Geronimo server
+ * @param deltaKind Publish kind constant for each module
+ *
+ * @return List of reordered modules and deltaKind (or input if no change)
+ */
+ public List reorderModules( List modules, List deltaKind ) {
+ Trace.tracePoint("Entry", "DependencyHelper.reorderModules", modules, deltaKind);
+
+ if (modules.size() == 0) {
+ List reorderedLists = new ArrayList(2);
+ reorderedLists.add(modules);
+ reorderedLists.add(deltaKind);
+ Trace.tracePoint("Exit ", "DependencyHelper.reorderModules", reorderedLists);
+ return reorderedLists;
+ }
+
+ inputModules = modules;
+ inputDeltaKind = deltaKind;
+
+ //
+ // Iterate through all the modules and register the dependencies
+ //
+ for (int ii=0; ii<modules.size(); ii++) {
+ IModule[] module = (IModule[]) modules.get(ii);
+ int moduleDeltaKind = ((Integer)deltaKind.get(ii)).intValue();
+ if (moduleDeltaKind != ServerBehaviourDelegate.REMOVED) {
+ EnvironmentType environment = getEnvironment(module[0]);
+ if (environment != null) {
+ ArtifactType child = environment.getModuleId();
+ DependenciesType dependencies = environment.getDependencies();
+ if (dependencies != null) {
+ List<DependencyType> depList = dependencies.getDependency();
+ for ( DependencyType dep : depList) {
+ ArtifactType parent = createArtifactType( dep.getGroupId(),
+ dep.getArtifactId(),
+ dep.getVersion(),
+ dep.getType() );
+ dm.addDependency( child, parent );
+ }
+ }
+ }
+ }
+ }
+
+ //
+ // Iterate through all the modules again and reorder as necessary
+ //
+ for (int ii=0; ii<modules.size(); ii++) {
+ IModule[] module = (IModule[]) modules.get(ii);
+ int moduleDeltaKind = ((Integer)deltaKind.get(ii)).intValue();
+ if (!reorderedModules.contains(module)) {
+ // Not already moved
+ if (moduleDeltaKind == ServerBehaviourDelegate.REMOVED) {
+ // Move module if going to be removed
+ reorderedModules.add(module);
+ reorderedKinds.add(moduleDeltaKind);
+ }
+ else {
+ EnvironmentType environment = getEnvironment(module[0]);
+ if (environment != null) {
+ ArtifactType artifact = environment.getModuleId();
+ if (artifact == null) {
+ // Move if null (nothing can be done)
+ if (!reorderedModules.contains(module)) {
+ reorderedModules.add(module);
+ reorderedKinds.add(moduleDeltaKind);
+ }
+ }
+ else if (dm.getParents(artifact).contains(artifact) ||
+ dm.getChildren(artifact).contains(artifact)) {
+ // Move if a tight circular dependency (nothing can be done)
+ if (!reorderedModules.contains(module)) {
+ reorderedModules.add(module);
+ reorderedKinds.add(moduleDeltaKind);
+ }
+ }
+ else if (dm.getParents(artifact).size() == 0) {
+ // Move if no parents (nothing to do)
+ if (!reorderedModules.contains(module)) {
+ reorderedModules.add(module);
+ reorderedKinds.add(moduleDeltaKind);
+ }
+ }
+ else if (dm.getParents(artifact).size() > 0) {
+ // Move parents first
+ processParents(dm.getParents(artifact), artifact);
+ // Move self
+ if (!reorderedModules.contains(module)) {
+ reorderedModules.add(module);
+ reorderedKinds.add(moduleDeltaKind);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ //
+ // Ensure return lists are exactly the same size as the input lists
+ //
+ assert reorderedModules.size() == modules.size();
+ assert reorderedKinds.size() == deltaKind.size();
+
+ //
+ // Return List of lists
+ //
+ List reorderedLists = new ArrayList(2);
+ reorderedLists.add(reorderedModules);
+ reorderedLists.add(reorderedKinds);
+
+ Trace.tracePoint("Exit ", "DependencyHelper.reorderModules", reorderedLists);
+ return reorderedLists;
+ }
+
+
+ /**
+ *
+ */
+ public void close() {
+ dm.close();
+ }
+
+
+ /*--------------------------------------------------------------------------------------------*\
+ | |
+ | Private method(s) |
+ | |
+ \*--------------------------------------------------------------------------------------------*/
+
+ /**
+ * Process the parents for a given artifact. The terminatingArtifact parameter will be used as
+ * the terminating condition to ensure there will not be an infinite loop (i.e., if
+ * terminatingArtifact is encountered again there is a circular dependency).
+ *
+ * @param parents
+ * @param terminatingArtifact
+ */
+ private void processParents(Set parents, ArtifactType terminatingArtifact) {
+ Trace.tracePoint("Enter", "DependencyHelper.processParents", parents, terminatingArtifact );
+
+ if (parents == null) {
+ Trace.tracePoint("Exit ", "DependencyHelper.processParents", null);
+ return;
+ }
+ for (Iterator ii = parents.iterator(); ii.hasNext();) {
+ ArtifactType artifact = (ArtifactType)ii.next();
+ if (dm.getParents(artifact).size() > 0 && !artifact.equals(terminatingArtifact)) {
+ // Keep processing parents (as long as no circular dependencies)
+ processParents(dm.getParents(artifact), terminatingArtifact);
+ // Move self
+ IModule[] module = getModule(artifact);
+ int moduleDeltaKind = getDeltaKind(artifact);
+ if (!reorderedModules.contains(module)) {
+ reorderedModules.add(module);
+ reorderedKinds.add(moduleDeltaKind);
+ }
+ }
+ else {
+ // Move parent
+ IModule[] module = getModule(artifact);
+ int moduleDeltaKind = getDeltaKind(artifact);
+ if (!reorderedModules.contains(module)) {
+ reorderedModules.add(module);
+ reorderedKinds.add(moduleDeltaKind);
+ }
+ }
+ }
+
+ Trace.tracePoint("Exit ", "DependencyHelper.processParents");
+ }
+
+
+ /**
+ * Returns the Environment for the given IModule
+ *
+ * @param module IModule to be published
+ *
+ * @return Environment
+ */
+ private EnvironmentType getEnvironment(IModule module) {
+ Trace.tracePoint("Enter", "DependencyHelper.getEnvironment", module);
+
+ EnvironmentType environment = null;
+ if (GeronimoUtils.isWebModule(module)) {
+ WebAppType plan = getWebDeploymentPlan(module);
+ if (plan != null)
+ environment = plan.getEnvironment();
+ }
+ else if (GeronimoUtils.isEjbJarModule(module)) {
+ OpenejbJarType plan = getOpenEjbDeploymentPlan(module);
+ if (plan != null)
+ environment = plan.getEnvironment();
+ }
+ else if (GeronimoUtils.isEarModule(module)) {
+ ApplicationType plan = getApplicationDeploymentPlan(module);
+ if (plan != null)
+ environment = plan.getEnvironment();
+ }
+ else if (GeronimoUtils.isRARModule(module)) {
+ ConnectorType plan = getConnectorDeploymentPlan(module);
+ if (plan != null)
+ environment = plan.getEnvironment();
+ }
+
+ Trace.tracePoint("Exit ", "DependencyHelper.getEnvironment", environment);
+ return environment;
+ }
+
+
+ /**
+ * Return the IModule[] for a given artifact
+ *
+ * @param artifact
+ *
+ * @return IModule[]
+ */
+ private IModule[] getModule(ArtifactType artifact) {
+ Trace.tracePoint("Enter", "DependencyHelper.getModule", artifact);
+
+ for (int ii=0; ii<inputModules.size(); ii++) {
+ IModule[] module = (IModule[]) inputModules.get(ii);
+ int moduleDeltaKind = ((Integer)inputDeltaKind.get(ii)).intValue();
+ EnvironmentType environment = getEnvironment(module[0]);
+ if (environment != null) {
+ ArtifactType moduleArtifact = environment.getModuleId();
+ if (artifact.equals(moduleArtifact)) {
+ Trace.tracePoint("Exit ", "DependencyHelper.getModule", module);
+ return module;
+ }
+ }
+ }
+
+ Trace.tracePoint("Exit ", "DependencyHelper.getModule", null);
+ return null;
+ }
+
+
+ /**
+ * Return the deltaKind array index for a given artifact
+ *
+ * @param artifact
+ *
+ * @return int
+ */
+ private int getDeltaKind(ArtifactType artifact) {
+ Trace.tracePoint("Enter", "DependencyHelper.getDeltaKind", artifact);
+
+ for (int ii=0; ii<inputModules.size(); ii++) {
+ IModule[] module = (IModule[]) inputModules.get(ii);
+ int moduleDeltaKind = ((Integer)inputDeltaKind.get(ii)).intValue();
+ EnvironmentType environment = getEnvironment(module[0]);
+ if (environment != null) {
+ ArtifactType moduleArtifact = environment.getModuleId();
+ if (artifact.equals(moduleArtifact)) {
+ Trace.tracePoint("Exit ", "DependencyHelper.getDeltaKind", moduleDeltaKind);
+ return moduleDeltaKind;
+ }
+ }
+ }
+ Trace.tracePoint("Exit ", "DependencyHelper.getDeltaKind", 0);
+ return 0;
+ }
+
+ /**
+ * Returns the WebApp for the given IModule
+ *
+ * @param module IModule to be published
+ *
+ * @return WebApp
+ */
+ private WebAppType getWebDeploymentPlan(IModule module) {
+ Trace.tracePoint("Enter", "DependencyHelper.getWebDeploymentPlan", module);
+
+ IVirtualComponent comp = GeronimoUtils.getVirtualComponent(module);
+ IFile file = GeronimoUtils.getWebDeploymentPlanFile(comp);
+ if (file.getName().equals(GeronimoUtils.WEB_PLAN_NAME) && file.exists()) {
+ ResourceSet resourceSet = new ResourceSetImpl();
+ register(resourceSet, new WebResourceFactoryImpl(), WebPackage.eINSTANCE, WebPackage.eNS_URI);
+ Resource resource = load(file, resourceSet);
+ if (resource != null) {
+ return ((DocumentRoot) resource.getContents().get(0)).getWebApp();
+ }
+ }
+
+ Trace.tracePoint("Exit ", "DependencyHelper.getWebDeploymentPlan", null);
+ return null;
+ }
+
+
+ /**
+ * Returns the OpenEjbJar for the given IModule
+ *
+ * @param module IModule to be published
+ *
+ * @return OpenEjbJar
+ */
+ private OpenejbJarType getOpenEjbDeploymentPlan(IModule module) {
+ Trace.tracePoint("Enter", "DependencyHelper.getOpenEjbDeploymentPlan", module);
+
+ IVirtualComponent comp = GeronimoUtils.getVirtualComponent(module);
+ IFile file = GeronimoUtils.getOpenEjbDeploymentPlanFile(comp);
+ if (file.getName().equals(GeronimoUtils.OPENEJB_PLAN_NAME) && file.exists()) {
+ ResourceSet resourceSet = new ResourceSetImpl();
+ register(resourceSet, new JarResourceFactoryImpl(), JarPackage.eINSTANCE, JarPackage.eNS_URI);
+ Resource resource = load(file, resourceSet);
+ if (resource != null) {
+ return ((org.openejb.xml.ns.openejb.jar.DocumentRoot) resource.getContents().get(0)).getOpenejbJar();
+ }
+ }
+
+ Trace.tracePoint("Exit ", "DependencyHelper.getOpenEjbDeploymentPlan", null);
+ return null;
+ }
+
+
+ /**
+ * Returns the Application for the given IModule
+ *
+ * @param module IModule to be published
+ *
+ * @return Application
+ */
+ private ApplicationType getApplicationDeploymentPlan(IModule module) {
+ Trace.tracePoint("Enter", "DependencyHelper.getApplicationDeploymentPlan", module);
+
+ IVirtualComponent comp = GeronimoUtils.getVirtualComponent(module);
+ IFile file = GeronimoUtils.getApplicationDeploymentPlanFile(comp);
+ if (file.getName().equals(GeronimoUtils.APP_PLAN_NAME) && file.exists()) {
+ ResourceSet resourceSet = new ResourceSetImpl();
+ register(resourceSet, new ApplicationResourceFactoryImpl(), ApplicationPackage.eINSTANCE, ApplicationPackage.eNS_URI);
+ Resource resource = load(file, resourceSet);
+ if (resource != null) {
+ return ((org.apache.geronimo.xml.ns.j2ee.application.DocumentRoot) resource.getContents().get(0)).getApplication();
+ }
+ }
+
+ Trace.tracePoint("Exit ", "DependencyHelper.getApplicationDeploymentPlan", null);
+ return null;
+ }
+
+
+ /**
+ * Returns the Connector for the given IModule
+ *
+ * @param module IModule to be published
+ *
+ * @return Application
+ */
+ private ConnectorType getConnectorDeploymentPlan(IModule module) {
+ Trace.tracePoint("Enter", "DependencyHelper.getApplicationDeploymentPlan", module);
+
+ IVirtualComponent comp = GeronimoUtils.getVirtualComponent(module);
+ IFile file = GeronimoUtils.getConnectorDeploymentPlanFile(comp);
+ if (file.getName().equals(GeronimoUtils.CONNECTOR_PLAN_NAME) && file.exists()) {
+ ResourceSet resourceSet = new ResourceSetImpl();
+ register(resourceSet, new ConnectorResourceFactoryImpl(), ConnectorPackage.eINSTANCE, ConnectorPackage.eNS_URI);
+ Resource resource = load(file, resourceSet);
+ if (resource != null) {
+ Trace.tracePoint("Exit ", "DependencyHelper.getApplicationDeploymentPlan");
+ return ((org.apache.geronimo.xml.ns.j2ee.connector.DocumentRoot) resource.getContents().get(0)).getConnector();
+ }
+ }
+
+ Trace.tracePoint("Exit ", "DependencyHelper.getApplicationDeploymentPlan", null);
+ return null;
+ }
+
+
+ private static Resource load(IFile dpFile, ResourceSet resourceSet) {
+ try {
+
+ URI uri = URI.createPlatformResourceURI(dpFile.getFullPath().toString(), false);
+
+ Resource resource = resourceSet.createResource(uri);
+ if (!resource.isLoaded()) {
+ resource.load(null);
+ }
+ return resource;
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+
+ private static void register(ResourceSet resourceSet,
+ Resource.Factory factory, EPackage pkg, String nsUri) {
+ resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(Resource.Factory.Registry.DEFAULT_EXTENSION, factory);
+ resourceSet.getPackageRegistry().put(nsUri, pkg);
+ }
+
+
+ private static ArtifactType createArtifactType(String groupId, String artifactId, String version, String type) {
+ ArtifactType artifact = DeploymentFactory.eINSTANCE.createArtifactType();
+ if (groupId != null)
+ artifact.setGroupId(groupId);
+ if (artifactId != null)
+ artifact.setArtifactId(artifactId);
+ if (version != null)
+ artifact.setVersion(version);
+ artifact.setType(type);
+ return artifact;
+ }
+}
\ No newline at end of file
Propchange: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/DependencyHelper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/DependencyHelper.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/DependencyHelper.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/DependencyManager.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/DependencyManager.java?rev=659931&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/DependencyManager.java (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/DependencyManager.java Sat May 24 23:54:02 2008
@@ -0,0 +1,214 @@
+/*
+ * 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.
+ */
+
+package org.apache.geronimo.st.core.internal;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.geronimo.xml.ns.deployment.ArtifactType;
+
+
+/**
+ * <b>DependencyManager</b> is very closely-based on the similar class in the Geronimo server.
+ * DependencyManager is the record keeper of the dependencies in the Geronimo Eclipse Plugin. The
+ * DependencyManager does not enforce any dependencies, it is simply a place where components can
+ * register their intent to be dependent on another component, and where other components can query
+ * those dependencies.
+ *
+ * <p>Like the DependencyManager in the Geronimo server, it uses the nomenclature of parent-child
+ * where a child is dependent on a parent. The names parent and child have no other meaning are just
+ * a convenience to make the code readable.
+ *
+ * <p>The initial usage of this DependencyManager in the GEP is somewhat limited but other usages
+ * are possible<p>
+ *
+ * @version $Rev$ $Date$
+ */
+public class DependencyManager {
+
+ //
+ // Map from child to a list of parents
+ //
+ private final Map childToParentMap = new HashMap();
+
+ //
+ // Map from parent back to a list of its children
+ //
+ private final Map parentToChildMap = new HashMap();
+
+
+ /**
+ *
+ */
+ public void close() {
+ childToParentMap.clear();
+ parentToChildMap.clear();
+ }
+
+
+ /**
+ * Declares a dependency from a child to a parent.
+ *
+ * @param child the dependent component
+ * @param parent the component the child is depending on
+ */
+ public void addDependency(ArtifactType child, ArtifactType parent) {
+ Trace.tracePoint("Entry", "DependencyManager.addDependency", child, parent);
+
+ Set parents = (Set) childToParentMap.get(child);
+ if (parents == null) {
+ parents = new HashSet();
+ childToParentMap.put(child, parents);
+ }
+ parents.add(parent);
+
+ Set children = (Set) parentToChildMap.get(parent);
+ if (children == null) {
+ children = new HashSet();
+ parentToChildMap.put(parent, children);
+ }
+ children.add(child);
+
+ Trace.tracePoint("Exit ", "DependencyManager.addDependency", childToParentMap.size() );
+ Trace.tracePoint("Exit ", "DependencyManager.addDependency", parentToChildMap.size() );
+ }
+
+
+ /**
+ * Removes a dependency from a child to a parent
+ *
+ * @param child the dependnet component
+ * @param parent the component that the child wil no longer depend on
+ */
+ public void removeDependency(ArtifactType child, ArtifactType parent) {
+ Trace.tracePoint("Entry", "DependencyManager.removeDependency", child, parent);
+
+ Set parents = (Set) childToParentMap.get(child);
+ if (parents != null) {
+ parents.remove(parent);
+ }
+
+ Set children = (Set) parentToChildMap.get(parent);
+ if (children != null) {
+ children.remove(child);
+ }
+
+ Trace.tracePoint("Exit ", "DependencyManager.addDependency");
+ }
+
+
+ /**
+ * Removes all dependencies for a child
+ *
+ * @param child the component that will no longer depend on anything
+ */
+ public void removeAllDependencies(ArtifactType child) {
+ Trace.tracePoint("Entry", "DependencyManager.removeAllDependencies", child);
+
+ Set parents = (Set) childToParentMap.remove(child);
+ if (parents == null) {
+ return;
+ }
+
+ for (Iterator iterator = parents.iterator(); iterator.hasNext();) {
+ ArtifactType parent = (ArtifactType) iterator.next();
+ Set children = (Set) parentToChildMap.get(parent);
+ if (children != null) {
+ children.remove(child);
+ }
+ }
+
+ Trace.tracePoint("Exit ", "DependencyManager.removeAllDependencies");
+ }
+
+
+ /**
+ * Adds dependencies from the child to every parent in the parents set
+ *
+ * @param child the dependent component
+ * @param parents the set of components the child is depending on
+ */
+ public void addDependencies(ArtifactType child, Set parents) {
+ Trace.tracePoint("Entry", "DependencyManager.addDependencies", child, parents);
+
+ Set existingParents = (Set) childToParentMap.get(child);
+ if (existingParents == null) {
+ existingParents = new HashSet(parents);
+ childToParentMap.put(child, existingParents);
+ }
+ else {
+ existingParents.addAll(parents);
+ }
+
+ for (Iterator i = parents.iterator(); i.hasNext();) {
+ Object startParent = i.next();
+ Set children = (Set) parentToChildMap.get(startParent);
+ if (children == null) {
+ children = new HashSet();
+ parentToChildMap.put(startParent, children);
+ }
+ children.add(child);
+ }
+
+ Trace.tracePoint("Exit ", "DependencyManager.addDependencies");
+ }
+
+
+ /**
+ * Gets the set of parents that the child is depending on
+ *
+ * @param child the dependent component
+ * @return a collection containing all of the components the child depends on; will never be null
+ */
+ public Set getParents(ArtifactType child) {
+ Trace.tracePoint("Entry", "DependencyManager.getParents", child);
+
+ Set parents = (Set) childToParentMap.get(child);
+ if (parents == null) {
+ Trace.tracePoint("Exit", "DependencyManager.getParents", 0);
+ return Collections.EMPTY_SET;
+ }
+
+ Trace.tracePoint("Exit", "DependencyManager.getParents", parents.size() );
+ return new HashSet(parents);
+ }
+
+
+ /**
+ * Gets all of the children that have a dependency on the specified parent.
+ *
+ * @param parent the component the returned childen set depend on
+ * @return a collection containing all of the components that depend on the parent; will never be null
+ */
+ public Set getChildren(ArtifactType parent) {
+ Trace.tracePoint("Entry", "DependencyManager.getChildren", parent);
+
+ Set children = (Set) parentToChildMap.get(parent);
+ if (children == null) {
+ Trace.tracePoint("Exit ", "DependencyManager.getChildren", 0);
+ return Collections.EMPTY_SET;
+ }
+
+ Trace.tracePoint("Exit ", "DependencyManager.getChildren", children.size() );
+ return new HashSet(children);
+ }
+}
Propchange: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/DependencyManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/DependencyManager.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/DependencyManager.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Trace.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Trace.java?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Trace.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/internal/Trace.java Sat May 24 23:54:02 2008
@@ -79,4 +79,48 @@
if (t != null)
t.printStackTrace();
}
-}
\ No newline at end of file
+
+ /**
+ * Trace the given message
+ *
+ * @param tracePoint
+ * The trace point (e.g., "Exit", "Entry", "Constructor", etc....
+ *
+ * @param classDotMethod
+ * The class name + method name (e.g., "Class.method()")
+ *
+ * @param parm1,2,3,4,5
+ * Method parameters if the trace point is an "Entry"
+ * or
+ * Return value if the trace point is an "Exit"
+ */
+ public static void tracePoint(String tracePoint, String classDotMethod) {
+ trace(Trace.INFO, tracePoint + ": " + classDotMethod + "()" );
+ }
+ public static void tracePoint(String tracePoint, String classDotMethod, Object parm1) {
+ trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "] )" );
+ }
+
+ public static void tracePoint(String tracePoint, String classDotMethod, Object parm1, Object parm2) {
+ trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
+ "parm2=[" + (parm2 == null ? null : parm2.toString()) + "] )" );
+ }
+ public static void tracePoint(String tracePoint, String classDotMethod, Object parm1, Object parm2, Object parm3) {
+ trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
+ "parm2=[" + (parm2 == null ? null : parm2.toString()) + "], " +
+ "parm3=[" + (parm3 == null ? null : parm3.toString()) + "] )" );
+ }
+ public static void tracePoint(String tracePoint, String classDotMethod, Object parm1, Object parm2, Object parm3, Object parm4) {
+ trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
+ "parm2=[" + (parm2 == null ? null : parm2.toString()) + "], " +
+ "parm3=[" + (parm3 == null ? null : parm3.toString()) + "], " +
+ "parm4=[" + (parm4 == null ? null : parm4.toString()) + "] )" );
+ }
+ public static void tracePoint(String tracePoint, String classDotMethod, Object parm1, Object parm2, Object parm3, Object parm4, Object parm5) {
+ trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
+ "parm2=[" + (parm2 == null ? null : parm2.toString()) + "], " +
+ "parm3=[" + (parm3 == null ? null : parm3.toString()) + "], " +
+ "parm4=[" + (parm4 == null ? null : parm4.toString()) + "], " +
+ "parm5=[" + (parm5 == null ? null : parm5.toString()) + "] )" );
+ }
+}
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF Sat May 24 23:54:02 2008
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Geronimo Server Tools UI Plug-in
Bundle-SymbolicName: org.apache.geronimo.st.ui;singleton:=true
-Bundle-Version: 2.0.0
+Bundle-Version: 2.0.1
Bundle-Activator: org.apache.geronimo.st.ui.Activator
Bundle-Vendor: Apache.org
Bundle-Localization: plugin
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.ui/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.ui/pom.xml Sat May 24 23:54:02 2008
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
@@ -86,7 +86,7 @@
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<type>pom</type>
</dependency>
<dependency>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v1.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v1.core/META-INF/MANIFEST.MF?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v1.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v1.core/META-INF/MANIFEST.MF Sat May 24 23:54:02 2008
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Geronimo V1 Server Tools Core Plug-in
Bundle-SymbolicName: org.apache.geronimo.st.v1.core;singleton:=true
-Bundle-Version: 2.0.0
+Bundle-Version: 2.0.1
Bundle-Activator: org.apache.geronimo.st.v1.core.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v1.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v1.core/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v1.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v1.core/pom.xml Sat May 24 23:54:02 2008
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<type>pom</type>
</dependency>
<dependency>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v1.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v1.ui/META-INF/MANIFEST.MF?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v1.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v1.ui/META-INF/MANIFEST.MF Sat May 24 23:54:02 2008
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Geronimo Server Tools V1 UI Plug-in
Bundle-SymbolicName: org.apache.geronimo.st.v1.ui;singleton:=true
-Bundle-Version: 2.0.0
+Bundle-Version: 2.0.1
Bundle-Activator: org.apache.geronimo.st.v1.ui.Activator
Bundle-Vendor: Apache.org
Bundle-Localization: plugin
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v1.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v1.ui/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v1.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v1.ui/pom.xml Sat May 24 23:54:02 2008
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<type>pom</type>
</dependency>
<dependency>
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF Sat May 24 23:54:02 2008
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Geronimo v11 Server Tools Core Plug-in
Bundle-SymbolicName: org.apache.geronimo.st.v11.core;singleton:=true
-Bundle-Version: 2.0.0
+Bundle-Version: 2.0.1
Bundle-Activator: org.apache.geronimo.st.v11.core.Activator
Bundle-Vendor: Apache.org
Bundle-Localization: plugin
Modified: geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v11.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v11.core/pom.xml?rev=659931&r1=659930&r2=659931&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v11.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.0.1/plugins/org.apache.geronimo.st.v11.core/pom.xml Sat May 24 23:54:02 2008
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse-plugins-parent</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<build>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>eclipse</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<type>pom</type>
</dependency>
<dependency>