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/03/04 04:59:46 UTC
svn commit: r633359 - in /geronimo/devtools/eclipse-plugin/trunk: ./
assembly/ assembly/src/main/assembly/
features/org.apache.geronimo.installableruntime.jetty.feature/
features/org.apache.geronimo.installableruntime.tomcat.feature/
plugins/org.apache...
Author: mcconne
Date: Mon Mar 3 19:59:45 2008
New Revision: 633359
URL: http://svn.apache.org/viewvc?rev=633359&view=rev
Log:
GERONIMODEVTOOLS-287 Enable 2.1 server downloads from a valid Eclipse update and/or staging site
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.installableruntime.jetty.feature/feature.xml
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/ModuleArtifactMapper.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
geronimo/devtools/eclipse-plugin/trunk/pom.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=633359&r1=633358&r2=633359&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml Mon Mar 3 19:59:45 2008
@@ -175,12 +175,12 @@
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.installableruntime.jetty.feature</artifactId>
- <version>${version}</version>
+ <version>${org.apache.geronimo.installableruntime.jetty.feature_version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.installableruntime.tomcat.feature</artifactId>
- <version>${version}</version>
+ <version>${org.apache.geronimo.installableruntime.tomcat.feature_version}</version>
</dependency>
</dependencies>
</project>
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=633359&r1=633358&r2=633359&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 Mon Mar 3 19:59:45 2008
@@ -72,7 +72,6 @@
<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.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>
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=633359&r1=633358&r2=633359&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 Mon Mar 3 19:59:45 2008
@@ -31,30 +31,33 @@
<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.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.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.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.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">
+
+ <feature url="features/org.apache.geronimo.installableruntime.jetty.feature_2.1.jar"
+ id="org.apache.geronimo.installableruntime.jetty.feature" version="2.1">
<category name="Geronimo Runtime"/>
</feature>
+
<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.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"/>
+ <archive path="features/org.apache.geronimo.installableruntime.jetty.feature_2.1.0/geronimo-jetty6-javaee5-2.1.0.zip"
+ url="runtimes/geronimo-jetty6-javaee5-2.1-bin.zip"/>
+
+ <archive path="features/org.apache.geronimo.installableruntime.tomcat.feature_2.1.0/geronimo-tomcat6-javaee5-2.1.0.zip"
+ url="runtimes/geronimo-tomcat6-javaee5-2.1-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=633359&r1=633358&r2=633359&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 Mon Mar 3 19:59:45 2008
@@ -61,7 +61,6 @@
<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.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>
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml?rev=633359&r1=633358&r2=633359&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml Mon Mar 3 19:59:45 2008
@@ -21,7 +21,7 @@
<feature
id="org.apache.geronimo.installableruntime.jetty.feature"
label="Geronimo 2.1 (Jetty) Runtime"
- version="2.1.0"
+ version="${org.apache.geronimo.installableruntime.jetty.feature_version}"
provider-name="%providerName"
image="bigG.gif">
@@ -38,7 +38,7 @@
</license>
<data
- id="geronimo-jetty6-jee5-${org.apache.geronimo.installableruntime.jetty.feature_version}.zip"
+ id="geronimo-jetty6-javaee5-${org.apache.geronimo.installableruntime.jetty.feature_version}.zip"
download-size="0"
install-size="0"/>
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml?rev=633359&r1=633358&r2=633359&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml Mon Mar 3 19:59:45 2008
@@ -21,7 +21,7 @@
<feature
id="org.apache.geronimo.installableruntime.tomcat.feature"
label="Geronimo 2.1 (Tomcat) Runtime"
- version="2.1.0"
+ version="${org.apache.geronimo.installableruntime.tomcat.feature_version}"
provider-name="%providerName"
image="bigG.gif">
@@ -38,7 +38,7 @@
</license>
<data
- id="geronimo-tomcat6-jee5-${org.apache.geronimo.installableruntime.tomcat.feature_version}.zip"
+ id="geronimo-tomcat6-javaee5-${org.apache.geronimo.installableruntime.tomcat.feature_version}.zip"
download-size="0"
install-size="0"/>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/ModuleArtifactMapper.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/ModuleArtifactMapper.java?rev=633359&r1=633358&r2=633359&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/ModuleArtifactMapper.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/ModuleArtifactMapper.java Mon Mar 3 19:59:45 2008
@@ -38,7 +38,6 @@
import org.eclipse.wst.server.core.util.SocketUtil;
import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.io.xml.DomDriver;
/**
* @version $Rev$ $Date$
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java?rev=633359&r1=633358&r2=633359&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/internal/GeronimoRuntimeWizardFragment.java Mon Mar 3 19:59:45 2008
@@ -232,7 +232,17 @@
InstallableRuntime installable = (InstallableRuntime) (tomcat.getSelection() ? gWithTomcat
: gWithJetty);
String version = installable.getFeatureVersion();
- installPath = installPath.append("geronimo-" + (tomcat.getSelection() ? "tomcat6" : "jetty6") + "-jee5-" + version);
+ if ( version.startsWith("2.1") ) {
+ installPath = installPath.append("geronimo-" + (tomcat.getSelection() ? "tomcat6" : "jetty6") + "-javaee5-" + version);
+ }
+ else {
+ if ( version.startsWith("2.0") ) {
+ installPath = installPath.append("geronimo-" + (tomcat.getSelection() ? "tomcat6" : "jetty6") + "-jee5-" + version);
+ }
+ else {
+ installPath = installPath.append("geronimo-" + (tomcat.getSelection() ? "tomcat6" : "jetty6") + "-j2ee-" + version);
+ }
+ }
installDir.setText(installPath.toOSString());
}
});
Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=633359&r1=633358&r2=633359&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Mon Mar 3 19:59:45 2008
@@ -118,6 +118,7 @@
<sourceDirectory>src/</sourceDirectory>
<pluginManagement>
<plugins>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@@ -139,6 +140,7 @@
</dependency>
</dependencies>
</plugin>
+
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-eclipsepde-plugin</artifactId>
@@ -147,11 +149,19 @@
<eclipseHome>${settings.localRepository}/eclipse/eclipse/</eclipseHome>
</configuration>
</plugin>
+
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-emf-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-1</version>
+ </plugin>
+
</plugins>
</pluginManagement>
<plugins>