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/01/12 03:31:41 UTC
svn commit: r611353 - in /geronimo/devtools/eclipse-plugin/trunk/assembly:
pom.xml src/main/assembly/deployable.xml src/main/assembly/site.xml
src/main/assembly/updatesite.xml
Author: mcconne
Date: Fri Jan 11 18:31:39 2008
New Revision: 611353
URL: http://svn.apache.org/viewvc?rev=611353&view=rev
Log:
assembly changes for 2.1 server support
Modified:
geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml
geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml
geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml
geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml
Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml?rev=611353&r1=611352&r2=611353&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml Fri Jan 11 18:31:39 2008
@@ -74,6 +74,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>org.apache.geronimo.st.v21.core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.deployment.model</artifactId>
<version>${version}</version>
</dependency>
@@ -114,6 +119,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>org.apache.geronimo.runtime.v21</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.st.ui</artifactId>
<version>${version}</version>
</dependency>
@@ -134,6 +144,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>org.apache.geronimo.st.v21.ui</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.feature</artifactId>
<version>${version}</version>
</dependency>
@@ -150,6 +165,11 @@
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.v20.feature</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>org.apache.geronimo.v21.feature</artifactId>
<version>${version}</version>
</dependency>
<dependency>
Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml?rev=611353&r1=611352&r2=611353&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml Fri Jan 11 18:31:39 2008
@@ -47,6 +47,7 @@
<include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v1</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v11</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v20</include>
+ <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v21</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.core</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.ui</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.v1.core</include>
@@ -55,6 +56,8 @@
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.ui</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.v20.core</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.v20.ui</include>
+ <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v21.core</include>
+ <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v21.ui</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.v11.deployment.model</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.v11.deployment.model.edit</include>
</includes>
@@ -72,6 +75,7 @@
<include>org.apache.geronimo.devtools:org.apache.geronimo.v10.feature</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.v11.feature</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.v20.feature</include>
+ <include>org.apache.geronimo.devtools:org.apache.geronimo.v21.feature</include>
</includes>
</dependencySet>
Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml?rev=611353&r1=611352&r2=611353&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/site.xml Fri Jan 11 18:31:39 2008
@@ -28,30 +28,33 @@
<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.1.jar" id="org.apache.geronimo.feature" version="2.0.1">
+ <feature url="features/org.apache.geronimo.feature_2.1.0.jar" id="org.apache.geronimo.feature" version="2.1.0">
<category name="org.eclipse.wst.server.core.serverAdapter"/>
</feature>
- <feature url="features/org.apache.geronimo.v10.feature_2.0.1.jar" id="org.apache.geronimo.v10.feature" version="2.0.1">
+ <feature url="features/org.apache.geronimo.v10.feature_2.1.0.jar" id="org.apache.geronimo.v10.feature" version="2.1.0">
<category name="org.eclipse.wst.server.core.serverAdapter"/>
</feature>
- <feature url="features/org.apache.geronimo.v11.feature_2.0.1.jar" id="org.apache.geronimo.v11.feature" version="2.0.1">
+ <feature url="features/org.apache.geronimo.v11.feature_2.1.0.jar" id="org.apache.geronimo.v11.feature" version="2.1.0">
<category name="org.eclipse.wst.server.core.serverAdapter"/>
</feature>
- <feature url="features/org.apache.geronimo.v20.feature_2.0.1.jar" id="org.apache.geronimo.v20.feature" version="2.0.1">
+ <feature url="features/org.apache.geronimo.v20.feature_2.1.0.jar" id="org.apache.geronimo.v20.feature" version="2.1.0">
<category name="org.eclipse.wst.server.core.serverAdapter"/>
</feature>
- <feature url="features/org.apache.geronimo.installableruntime.jetty.feature_2.0.1.jar"
- id="org.apache.geronimo.installableruntime.jetty.feature" version="2.0.1">
+ <feature url="features/org.apache.geronimo.v21.feature_2.1.0.jar" id="org.apache.geronimo.v21.feature" version="2.1.0">
+ <category name="org.eclipse.wst.server.core.serverAdapter"/>
+ </feature>
+ <feature url="features/org.apache.geronimo.installableruntime.jetty.feature_2.1.0.jar"
+ id="org.apache.geronimo.installableruntime.jetty.feature" version="2.1.0">
<category name="Geronimo Runtime"/>
</feature>
- <feature url="features/org.apache.geronimo.installableruntime.tomcat.feature_2.0.1.jar"
- id="org.apache.geronimo.installableruntime.tomcat.feature" version="2.0.1">
+ <feature url="features/org.apache.geronimo.installableruntime.tomcat.feature_2.1.0.jar"
+ id="org.apache.geronimo.installableruntime.tomcat.feature" version="2.1.0">
<category name="Geronimo Runtime"/>
</feature>
- <archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_2.0.1/geronimo-tomcat6-jee5-2.0.1.zip"
- url="runtimes/geronimo-tomcat6-jee5-2.0.1-bin.zip"/>
- <archive path="features/org.apache.geronimo.installableruntime.jetty.feature_2.0.1/geronimo-jetty6-jee5-2.0.1.zip"
- url="runtimes/geronimo-jetty6-jee5-2.0.1-bin.zip"/>
+ <archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_2.1.0/geronimo-tomcat6-jee5-2.1.0.zip"
+ url="runtimes/geronimo-tomcat6-jee5-2.1.0-bin.zip"/>
+ <archive path="features/org.apache.geronimo.installableruntime.jetty.feature_2.1.0/geronimo-jetty6-jee5-2.1.0.zip"
+ url="runtimes/geronimo-jetty6-jee5-2.1.0-bin.zip"/>
</site>
Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml?rev=611353&r1=611352&r2=611353&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml Fri Jan 11 18:31:39 2008
@@ -37,6 +37,7 @@
<include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v1</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v11</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v20</include>
+ <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v21</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.core</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.ui</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.v1.core</include>
@@ -45,6 +46,8 @@
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.ui</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.v20.core</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.v20.ui</include>
+ <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v21.core</include>
+ <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v21.ui</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.v11.deployment.model</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.v11.deployment.model.edit</include>
</includes>
@@ -61,6 +64,7 @@
<include>org.apache.geronimo.devtools:org.apache.geronimo.v10.feature</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.v11.feature</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.v20.feature</include>
+ <include>org.apache.geronimo.devtools:org.apache.geronimo.v21.feature</include>
</includes>
</dependencySet>