You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by tk...@apache.org on 2008/07/08 21:07:46 UTC
svn commit: r674917 - in /geronimo/devtools/eclipse-plugin/trunk: assembly/
assembly/src/main/assembly/ features/ features/org.apache.geronimo.feature/
features/org.apache.geronimo.installableruntime.jetty.feature/
features/org.apache.geronimo.installa...
Author: tkirby
Date: Tue Jul 8 12:07:45 2008
New Revision: 674917
URL: http://svn.apache.org/viewvc?rev=674917&view=rev
Log:
(GERONIMODEVTOOLS-417) Create a separate installable runtime feature for each version and type of geronimo server
Added:
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.jetty.v20.feature/
- copied from r674905, geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v20.feature/
- copied from r674905, geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/
Removed:
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/
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
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/.project
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.jetty.v20.feature/.project
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.jetty.v20.feature/feature.xml
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.jetty.v20.feature/pom.xml
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.jetty.v20.feature/project.xml
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v20.feature/.project
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v20.feature/feature.xml
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v20.feature/pom.xml
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v20.feature/project.xml
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/.project
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/.project
geronimo/devtools/eclipse-plugin/trunk/features/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.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=674917&r1=674916&r2=674917&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml Tue Jul 8 12:07:45 2008
@@ -138,14 +138,26 @@
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>org.apache.geronimo.installableruntime.jetty.feature</artifactId>
- <version>${org.apache.geronimo.installableruntime.jetty.feature_version}</version>
+ <artifactId>org.apache.geronimo.server.jetty.v20.feature</artifactId>
+ <version>${org.apache.geronimo.server.jetty.v20.feature_version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>org.apache.geronimo.installableruntime.tomcat.feature</artifactId>
- <version>${org.apache.geronimo.installableruntime.tomcat.feature_version}</version>
+ <artifactId>org.apache.geronimo.server.tomcat.v20.feature</artifactId>
+ <version>${org.apache.geronimo.server.tomcat.v20.feature_version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>org.apache.geronimo.server.jetty.v21.feature</artifactId>
+ <version>${org.apache.geronimo.server.jetty.v21.feature_version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>org.apache.geronimo.server.tomcat.v21.feature</artifactId>
+ <version>${org.apache.geronimo.server.tomcat.v21.feature_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=674917&r1=674916&r2=674917&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 Tue Jul 8 12:07:45 2008
@@ -70,8 +70,10 @@
<unpack>true</unpack>
<includes>
<include>org.apache.geronimo.devtools:org.apache.geronimo.feature</include>
- <include>org.apache.geronimo.devtools:org.apache.geronimo.installableruntime.jetty.feature</include>
- <include>org.apache.geronimo.devtools:org.apache.geronimo.installableruntime.tomcat.feature</include>
+ <include>org.apache.geronimo.devtools:org.apache.geronimo.server.jetty.v20.feature</include>
+ <include>org.apache.geronimo.devtools:org.apache.geronimo.server.tomcat.v20.feature</include>
+ <include>org.apache.geronimo.devtools:org.apache.geronimo.server.jetty.v21.feature</include>
+ <include>org.apache.geronimo.devtools:org.apache.geronimo.server.tomcat.v21.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>
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=674917&r1=674916&r2=674917&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 Tue Jul 8 12:07:45 2008
@@ -110,7 +110,8 @@
<feature url="features/org.apache.geronimo.installableruntime.jetty.feature_2.1.1.jar" id="org.apache.geronimo.installableruntime.jetty.feature" version="2.1.1">
<category name="Geronimo Runtime"/>
</feature>
- <feature url="features/org.apache.geronimo.installableruntime.jetty.feature_2.1.2.jar" id="org.apache.geronimo.installableruntime.jetty.feature" version="2.1.2">
+ <feature url="features/org.apache.geronimo.server.jetty.v20.feature_2.1.2.jar" id="org.apache.geronimo.server.jetty.v20.feature" version="2.1.2">
+ <feature url="features/org.apache.geronimo.server.jetty.v21.feature_2.1.2.jar" id="org.apache.geronimo.server.jetty.v21.feature" version="2.1.2">
<category name="Geronimo Runtime"/>
</feature>
@@ -120,7 +121,8 @@
<archive path="features/org.apache.geronimo.installableruntime.jetty.feature_2.0.1/geronimo-jetty6-jee5-2.0.1.zip" url="../../2.0.1/geronimo-jetty6-jee5-2.0.1-bin.zip"/>
<archive path="features/org.apache.geronimo.installableruntime.jetty.feature_2.1.0/geronimo-jetty6-javaee5-2.1.zip" url="../../2.1/geronimo-jetty6-javaee5-2.1-bin.zip"/>
<archive path="features/org.apache.geronimo.installableruntime.jetty.feature_2.1.1/geronimo-jetty6-javaee5-2.1.1.zip" url="../../2.1/geronimo-jetty6-javaee5-2.1.1-bin.zip"/>
- <archive path="features/org.apache.geronimo.installableruntime.jetty.feature_2.1.2/geronimo-jetty6-javaee5-2.1.2.zip" url="../../2.1/geronimo-jetty6-javaee5-2.1.2-bin.zip"/>
+ <archive path="features/org.apache.geronimo.server.jetty.v20.feature_2.1.2/geronimo-jetty6-jee5-2.0.1.zip" url="../../2.1/geronimo-jetty6-javaee5-2.1.2-bin.zip"/>
+ <archive path="features/org.apache.geronimo.server.jetty.v21.feature_2.1.2/geronimo-jetty6-javaee5-2.1.2.zip" url="../../2.1/geronimo-jetty6-javaee5-2.1.2-bin.zip"/>
<!--
@@ -146,7 +148,8 @@
<feature url="features/org.apache.geronimo.installableruntime.tomcat.feature_2.1.1.jar" id="org.apache.geronimo.installableruntime.tomcat.feature" version="2.1.1">
<category name="Geronimo Runtime"/>
</feature>
- <feature url="features/org.apache.geronimo.installableruntime.tomcat.feature_2.1.2.jar" id="org.apache.geronimo.installableruntime.tomcat.feature" version="2.1.2">
+ <feature url="features/org.apache.geronimo.server.tomcat.v20.feature_2.1.2.jar" id="org.apache.geronimo.server.tomcat.v20.feature" version="2.1.2">
+ <feature url="features/org.apache.geronimo.server.tomcat.v21.feature_2.1.2.jar" id="org.apache.geronimo.server.tomcat.v21.feature" version="2.1.2">
<category name="Geronimo Runtime"/>
</feature>
@@ -156,6 +159,7 @@
<archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_2.0.1/geronimo-tomcat6-jee5-2.0.1.zip" url="../../2.0.1/geronimo-tomcat6-jee5-2.0.1-bin.zip"/>
<archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_2.1.0/geronimo-tomcat6-javaee5-2.1.zip" url="../../2.1/geronimo-tomcat6-javaee5-2.1-bin.zip"/>
<archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_2.1.1/geronimo-tomcat6-javaee5-2.1.1.zip" url="../../2.1/geronimo-tomcat6-javaee5-2.1.1-bin.zip"/>
- <archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_2.1.2/geronimo-tomcat6-javaee5-2.1.2.zip" url="../../2.1/geronimo-tomcat6-javaee5-2.1.2-bin.zip"/>
+ <archive path="features/org.apache.geronimo.server.tomcat.v20.feature_2.1.2/geronimo-tomcat6-jee5-2.0.1.zip" url="../../2.1/geronimo-tomcat6-jee5-2.0.1.zip"/>
+ <archive path="features/org.apache.geronimo.server.tomcat.v21.feature_2.1.2/geronimo-tomcat6-javaee5-2.1.2.zip" url="../../2.1/geronimo-tomcat6-javaee5-2.1.2-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=674917&r1=674916&r2=674917&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 Tue Jul 8 12:07:45 2008
@@ -69,8 +69,10 @@
<outputDirectory>features/</outputDirectory>
<includes>
<include>org.apache.geronimo.devtools:org.apache.geronimo.feature</include>
- <include>org.apache.geronimo.devtools:org.apache.geronimo.installableruntime.jetty.feature</include>
- <include>org.apache.geronimo.devtools:org.apache.geronimo.installableruntime.tomcat.feature</include>
+ <include>org.apache.geronimo.devtools:org.apache.geronimo.server.jetty.v20.feature</include>
+ <include>org.apache.geronimo.devtools:org.apache.geronimo.server.tomcat.v20.feature</include>
+ <include>org.apache.geronimo.devtools:org.apache.geronimo.server.jetty.v21.feature</include>
+ <include>org.apache.geronimo.devtools:org.apache.geronimo.server.tomcat.v21.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>
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/.project
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/.project?rev=674917&r1=674916&r2=674917&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/.project (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/.project Tue Jul 8 12:07:45 2008
@@ -1,17 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.apache.geronimo.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+ <name>org.apache.geronimo.feature</name>
+ <comment>Apache Geronimo Eclipse Plugin and WTP Server Adapter</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>LaunchConfigHandle</key>
+ <value><project>/.externalToolBuilders/Maven_Ant_Builder.launch</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.jetty.v20.feature/.project
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.jetty.v20.feature/.project?rev=674917&r1=674905&r2=674917&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.jetty.v20.feature/.project (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.jetty.v20.feature/.project Tue Jul 8 12:07:45 2008
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.apache.geronimo.installableruntime.jetty.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+ <name>org.apache.geronimo.server.jetty.v20.feature</name>
+ <comment>Apache Geronimo Eclipse Plugin and WTP Server Adapter</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.jetty.v20.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.jetty.v20.feature/feature.xml?rev=674917&r1=674905&r2=674917&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.jetty.v20.feature/feature.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.jetty.v20.feature/feature.xml Tue Jul 8 12:07:45 2008
@@ -19,7 +19,7 @@
<!-- $Rev$ $Date$ -->
<feature
- id="org.apache.geronimo.installableruntime.jetty.feature"
+ id="org.apache.geronimo.server.jetty.v20.feature"
label="Geronimo 2.1.2 (Jetty) Runtime"
version="2.1.2"
provider-name="%providerName"
@@ -39,11 +39,6 @@
</license>
<data
- id="geronimo-jetty6-javaee5-2.1.2.zip"
- download-size="75780"
- install-size="96294"/>
-
- <data
id="geronimo-jetty6-jee5-2.0.2.zip"
download-size="56207"
install-size="67224"/>
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.jetty.v20.feature/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.jetty.v20.feature/pom.xml?rev=674917&r1=674905&r2=674917&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.jetty.v20.feature/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.jetty.v20.feature/pom.xml Tue Jul 8 12:07:45 2008
@@ -17,9 +17,9 @@
<!-- $Rev$ $Date$ -->
<project>
<modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.geronimo.installableruntime.jetty.feature</artifactId>
+ <artifactId>org.apache.geronimo.server.jetty.v20.feature</artifactId>
<packaging>jar</packaging>
- <version>${org.apache.geronimo.installableruntime.jetty.feature_version}</version>
+ <version>${org.apache.geronimo.server.jetty.v20.feature_version}</version>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.jetty.v20.feature/project.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.jetty.v20.feature/project.xml?rev=674917&r1=674905&r2=674917&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.jetty.v20.feature/project.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.jetty.v20.feature/project.xml Tue Jul 8 12:07:45 2008
@@ -20,9 +20,9 @@
<project>
<extend>../../etc/project.xml</extend>
- <id>org.apache.geronimo.installableruntime.jetty.feature</id>
- <name>org.apache.geronimo.installableruntime.jetty.feature</name>
- <currentVersion>${org.apache.geronimo.installableruntime.jetty.feature_version}</currentVersion>
+ <id>org.apache.geronimo.server.jetty.v20.feature</id>
+ <name>org.apache.geronimo.server.jetty.v20.feature</name>
+ <currentVersion>${org.apache.geronimo.server.jetty.v20.feature_version}</currentVersion>
<build>
<resources>
<resource>
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v20.feature/.project
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v20.feature/.project?rev=674917&r1=674905&r2=674917&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v20.feature/.project (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v20.feature/.project Tue Jul 8 12:07:45 2008
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.apache.geronimo.installableruntime.tomcat.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+ <name>org.apache.geronimo.server.tomcat.v21.feature</name>
+ <comment>Apache Geronimo Eclipse Plugin and WTP Server Adapter</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v20.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v20.feature/feature.xml?rev=674917&r1=674905&r2=674917&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v20.feature/feature.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v20.feature/feature.xml Tue Jul 8 12:07:45 2008
@@ -19,7 +19,7 @@
<!-- $Rev$ $Date$ -->
<feature
- id="org.apache.geronimo.installableruntime.tomcat.feature"
+ id="org.apache.geronimo.server.tomcat.v20.feature"
label="Geronimo 2.1.2 (Tomcat) Runtime"
version="2.1.2"
provider-name="%providerName"
@@ -37,11 +37,6 @@
%license
</license>
- <data
- id="geronimo-tomcat6-javaee5-2.1.2.zip"
- download-size="76977"
- install-size="143977"/>
-
<data
id="geronimo-tomcat6-jee5-2.0.2.zip"
download-size="56882"
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v20.feature/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v20.feature/pom.xml?rev=674917&r1=674905&r2=674917&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v20.feature/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v20.feature/pom.xml Tue Jul 8 12:07:45 2008
@@ -17,9 +17,9 @@
<!-- $Rev$ $Date$ -->
<project>
<modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.geronimo.installableruntime.tomcat.feature</artifactId>
+ <artifactId>org.apache.geronimo.server.tomcat.v21.feature</artifactId>
<packaging>jar</packaging>
- <version>${org.apache.geronimo.installableruntime.tomcat.feature_version}</version>
+ <version>${org.apache.geronimo.server.tomcat.v21.feature_version}</version>
<name>${artifactId}</name>
<parent>
<groupId>org.apache.geronimo.devtools</groupId>
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v20.feature/project.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v20.feature/project.xml?rev=674917&r1=674905&r2=674917&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v20.feature/project.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.server.tomcat.v20.feature/project.xml Tue Jul 8 12:07:45 2008
@@ -20,9 +20,9 @@
<project>
<extend>../../etc/project.xml</extend>
- <id>org.apache.geronimo.installableruntime.tomcat.feature</id>
- <name>org.apache.geronimo.installableruntime.tomcat.feature</name>
- <currentVersion>${org.apache.geronimo.installableruntime.tomcat.feature_version}</currentVersion>
+ <id>org.apache.geronimo.server.tomcat.feature</id>
+ <name>org.apache.geronimo.server.tomcat.feature</name>
+ <currentVersion>${org.apache.geronimo.server.tomcat.feature_version}</currentVersion>
<build>
<resources>
<resource>
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/.project
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/.project?rev=674917&r1=674916&r2=674917&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/.project (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v20.feature/.project Tue Jul 8 12:07:45 2008
@@ -1,17 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.apache.geronimo.v20.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+ <name>org.apache.geronimo.v20.feature</name>
+ <comment>Apache Geronimo Eclipse Plugin and WTP Server Adapter</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>LaunchConfigHandle</key>
+ <value><project>/.externalToolBuilders/Maven_Ant_Builder.launch</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/.project
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/.project?rev=674917&r1=674916&r2=674917&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/.project (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v21.feature/.project Tue Jul 8 12:07:45 2008
@@ -1,17 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.apache.geronimo.v21.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+ <name>org.apache.geronimo.v21.feature</name>
+ <comment>Apache Geronimo Eclipse Plugin and WTP Server Adapter</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>LaunchConfigHandle</key>
+ <value><project>/.externalToolBuilders/Maven_Ant_Builder.launch</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/features/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/pom.xml?rev=674917&r1=674916&r2=674917&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/pom.xml Tue Jul 8 12:07:45 2008
@@ -32,7 +32,9 @@
<module>org.apache.geronimo.feature</module>
<module>org.apache.geronimo.v20.feature</module>
<module>org.apache.geronimo.v21.feature</module>
- <module>org.apache.geronimo.installableruntime.jetty.feature</module>
- <module>org.apache.geronimo.installableruntime.tomcat.feature</module>
+ <module>org.apache.geronimo.server.jetty.v20.feature</module>
+ <module>org.apache.geronimo.server.jetty.v21.feature</module>
+ <module>org.apache.geronimo.server.tomcat.v20.feature</module>
+ <module>org.apache.geronimo.server.tomcat.v21.feature</module>
</modules>
</project>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml?rev=674917&r1=674916&r2=674917&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml Tue Jul 8 12:07:45 2008
@@ -62,13 +62,13 @@
<extension point="org.eclipse.wst.server.core.installableRuntimes">
<installableRuntime id="org.apache.geronimo.runtime.tomcat.20"
featureVersion="2.1.2"
- featureId="org.apache.geronimo.installableruntime.tomcat.feature"
+ featureId="org.apache.geronimo.server.tomcat.v20.feature"
featureSite="http://people.apache.org/~mcconne/releases/2.1.2/RC1/staging_site/"
path="geronimo-tomcat6-jee5-2.0.2.zip">
</installableRuntime>
<installableRuntime id="org.apache.geronimo.runtime.jetty.20"
featureVersion="2.1.2"
- featureId="org.apache.geronimo.installableruntime.jetty.feature"
+ featureId="org.apache.geronimo.server.jetty.v20.feature"
featureSite="http://people.apache.org/~mcconne/releases/2.1.2/RC1/staging_site/"
path="geronimo-jetty6-jee5-2.0.2.zip">
</installableRuntime>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml?rev=674917&r1=674916&r2=674917&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml Tue Jul 8 12:07:45 2008
@@ -81,13 +81,13 @@
<extension point="org.eclipse.wst.server.core.installableRuntimes">
<installableRuntime id="org.apache.geronimo.runtime.tomcat.21"
featureVersion="2.1.2"
- featureId="org.apache.geronimo.installableruntime.tomcat.feature"
+ featureId="org.apache.geronimo.server.tomcat.v21.feature"
featureSite="http://people.apache.org/~mcconne/releases/2.1.2/RC1/staging_site/"
path="geronimo-tomcat6-javaee5-2.1.2.zip">
</installableRuntime>
<installableRuntime id="org.apache.geronimo.runtime.jetty.21"
featureVersion="2.1.2"
- featureId="org.apache.geronimo.installableruntime.jetty.feature"
+ featureId="org.apache.geronimo.server.jetty.v21.feature"
featureSite="http://people.apache.org/~mcconne/releases/2.1.2/RC1/staging_site/"
path="geronimo-jetty6-javaee5-2.1.2.zip">
</installableRuntime>