geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r386355 - in /geronimo/devtools/eclipse-plugin/trunk: ./ features/org.apache.geronimo.installableruntime.jetty.feature/ features/org.apache.geronimo.installableruntime.tomcat.feature/ maven-plugins/maven-geronimodevtools-plugin/src/main/jav...
Date Thu, 16 Mar 2006 15:43:52 GMT
Author: sppatel
Date: Thu Mar 16 07:43:50 2006
New Revision: 386355

URL: http://svn.apache.org/viewcvs?rev=386355&view=rev
Log:
m2 fixes

Modified:
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/DownloadMojo.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jetty.j2ee.server.v1/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.tomcat.j2ee.server.v1/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/pom.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/pom.xml?rev=386355&r1=386354&r2=386355&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/pom.xml
Thu Mar 16 07:43:50 2006
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>org.apache.geronimo.installableruntime.jetty.feature</artifactId>
   <packaging>jar</packaging>
-  <version>${org.apache.geronimo.deployment.feature_version}</version>
+  <version>${org.apache.geronimo.installableruntime.jetty.feature_version}</version>
   <name>Geronio Eclipse Plugin :: Feature :: ${artifactId}</name>
   <parent>
     <groupId>org.apache.geronimo.devtools</groupId>

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/pom.xml?rev=386355&r1=386354&r2=386355&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/pom.xml
Thu Mar 16 07:43:50 2006
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>org.apache.geronimo.installableruntime.tomcat.feature</artifactId>
   <packaging>jar</packaging>
-  <version>${org.apache.geronimo.deployment.feature_version}</version>
+  <version>${org.apache.geronimo.installableruntime.tomcat.feature_version}</version>
   <name>Geronio Eclipse Plugin :: Feature :: ${artifactId}</name>
   <parent>
     <groupId>org.apache.geronimo.devtools</groupId>

Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/DownloadMojo.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/DownloadMojo.java?rev=386355&r1=386354&r2=386355&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/DownloadMojo.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/DownloadMojo.java
Thu Mar 16 07:43:50 2006
@@ -20,6 +20,7 @@
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Properties;
 
@@ -49,14 +50,21 @@
 
 	/**
 	 * @parameter
+	 * @required
 	 */
 	private URL[] urls;
 
+	/**
+	 * @parameter
+	 * @required
+	 */
+	private URL platformUrl;
+
 	private File distributionDir;
 	private File installDir;
 	private File pluginsDir;
 	private File propsFile;
-	
+
 	private Properties props;
 
 	public DownloadMojo() {
@@ -94,10 +102,25 @@
 			distributionDir.mkdirs();
 
 		load();
-		for (int i = 0; i < urls.length; i++) {
-			File distro = getRepositoryDestination(urls[i]);
+
+		URL[] allUrls = urls;
+		if (platformUrl != null) {
+			String platformDriver = platformUrl.toExternalForm()
+					+ "-" + getPlatformUrlSuffix();
+			allUrls = new URL[urls.length + 1];
+			try {
+				URL url = new URL(platformDriver);
+				System.arraycopy(urls, 0, allUrls, 0, urls.length);
+				allUrls[allUrls.length - 1] = url;
+			} catch (MalformedURLException e) {
+				throw new MojoFailureException(e.getMessage());
+			}
+		}
+
+		for (int i = 0; i < allUrls.length; i++) {
+			File distro = getRepositoryDestination(allUrls[i]);
 			if (!distro.exists()) {
-				download(urls[i]);
+				download(allUrls[i]);
 			} else {
 				getLog().info(distro.getName()
 						+ " already exists in local repository");
@@ -107,6 +130,18 @@
 		}
 		setModified();
 		save();
+	}
+
+	private String getPlatformUrlSuffix() {
+		String os = System.getProperty("os.name");
+		if (os.startsWith("Windows")) {
+			return "win32.zip";
+		} else if (os.startsWith("Linux")) {
+			return "linux-gtk.tar.gz";
+		} else if (os.startsWith("Mac")) {
+			return "macosx-carbon.tar.gz";
+		}
+		return "win32.zip";
 	}
 
 	private File getRepositoryDestination(URL url) {

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml?rev=386355&r1=386354&r2=386355&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
Thu Mar 16 07:43:50 2006
@@ -3,7 +3,7 @@
 	<artifactId>org.apache.geronimo.deployment.model.edit</artifactId>
   <packaging>jar</packaging>
   <version>${org.apache.geronimo.deployment.model.edit_version}</version>
-  <name>${artifactId}</name>
+  <name>Geronimo Eclipse Plugin :: Plugin :: ${artifactId}</name>
   <parent>
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>geronimo-eclipse-plugin</artifactId>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml?rev=386355&r1=386354&r2=386355&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
Thu Mar 16 07:43:50 2006
@@ -3,7 +3,7 @@
   <artifactId>org.apache.geronimo.deployment.model</artifactId>
   <packaging>jar</packaging>
   <version>${org.apache.geronimo.deployment.model_version}</version>
-  <name>${artifactId}</name>
+  <name>Geronio Eclipse Plugin :: Plugin :: ${artifactId}</name>
   <parent>
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>geronimo-eclipse-plugin</artifactId>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/pom.xml?rev=386355&r1=386354&r2=386355&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/pom.xml
Thu Mar 16 07:43:50 2006
@@ -3,7 +3,7 @@
 	<artifactId>org.apache.geronimo.devtools.eclipse.core</artifactId>
   <packaging>jar</packaging>
   <version>${org.apache.geronimo.devtools.eclipse.core_version}</version>
-  <name>${artifactId}</name>
+  <name>Geronimo Eclipse Plugin :: Plugin :: ${artifactId}</name>
   <parent>
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>geronimo-eclipse-plugin</artifactId>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jetty.j2ee.server.v1/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jetty.j2ee.server.v1/pom.xml?rev=386355&r1=386354&r2=386355&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jetty.j2ee.server.v1/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jetty.j2ee.server.v1/pom.xml
Thu Mar 16 07:43:50 2006
@@ -4,5 +4,5 @@
   <artifactId>org.apache.geronimo.jetty.j2ee.server.v1</artifactId>
   <packaging>jar</packaging>
   <version>${org.apache.geronimo.jetty.j2ee.server.v1_version}</version>
-  <name>${artifactId}</name>
+  <name>Geronimo Eclipse Plugin :: Plugin :: ${artifactId}</name>
 </project>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml?rev=386355&r1=386354&r2=386355&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml
Thu Mar 16 07:43:50 2006
@@ -3,7 +3,7 @@
   <artifactId>org.apache.geronimo.runtime.v1</artifactId>
   <packaging>jar</packaging>
   <version>${org.apache.geronimo.runtime.v1_version}</version>
-  <name>${artifactId}</name>
+  <name>Geronimo Eclipse Plugin :: Plugin :: ${artifactId}</name>
   <parent>
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>geronimo-eclipse-plugin</artifactId>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.tomcat.j2ee.server.v1/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.tomcat.j2ee.server.v1/pom.xml?rev=386355&r1=386354&r2=386355&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.tomcat.j2ee.server.v1/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.tomcat.j2ee.server.v1/pom.xml
Thu Mar 16 07:43:50 2006
@@ -4,5 +4,5 @@
   <artifactId>org.apache.geronimo.tomcat.j2ee.server.v1</artifactId>
   <packaging>jar</packaging>
   <version>${org.apache.geronimo.tomcat.j2ee.server.v1_version}</version>
-  <name>${artifactId}</name>
+  <name>Geronimo Eclipse Plugin :: Plugin :: ${artifactId}</name>
 </project>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/pom.xml?rev=386355&r1=386354&r2=386355&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/pom.xml Thu Mar
16 07:43:50 2006
@@ -3,7 +3,7 @@
 	<artifactId>org.apache.geronimo.ui</artifactId>
   <packaging>jar</packaging>
   <version>${org.apache.geronimo.ui_version}</version>
-  <name>${artifactId}</name>
+  <name>Geronimo Eclipse Plugin :: Plugin :: ${artifactId}</name>
   <parent>
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>geronimo-eclipse-plugin</artifactId>

Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=386355&r1=386354&r2=386355&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Thu Mar 16 07:43:50 2006
@@ -23,7 +23,7 @@
   <groupId>org.apache.geronimo.devtools</groupId>
   <artifactId>geronimo-eclipse-plugin</artifactId>
   <packaging>pom</packaging>
-  <name>Geronimo Eclipse Plugin</name>
+  <name>Geronimo Eclipse Plugin :: Root POM :: ${artifactId}</name>
   <version>1.0</version>
   <description>Parent POM for Geronimo Eclipse Plugin</description>
   <url>http://geronimo.apache.org/devtools</url>
@@ -123,7 +123,8 @@
     <stax-api_version>1.0</stax-api_version>
     <junitVersion>3.8.1</junitVersion>
     <!-- Eclipse Distribution URLs -->
-    <platformUrl>http://download.eclipse.org/eclipse/downloads/drops/R-3.1.2-200601181600/eclipse-SDK-3.1.2-macosx-carbon.tar.gz</platformUrl>
+    <platformDriverName>eclipse-SDK-3.1.2</platformDriverName>
+    <platformUrl>http://download.eclipse.org/eclipse/downloads/drops/R-3.1.2-200601181600/${platformDriverName}</platformUrl>
     <emfUrl>http://download.eclipse.org/tools/emf/downloads/drops/2.1.2/R200601191349/emf-sdo-xsd-SDK-2.1.2.zip</emfUrl>
     <jemUrl>http://download.eclipse.org/tools/ve/downloads/drops/R-1.1.0.1-200509071822/JEM-SDK-1.1.0.1.zip</jemUrl>
     <gefUrl>http://download.eclipse.org/tools/gef/downloads/drops/R-3.1.1-200509301327/GEF-SDK-3.1.1.zip</gefUrl>
@@ -219,8 +220,8 @@
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>maven-geronimodevtools-plugin</artifactId>
         <configuration>
+          <platformUrl>${platformUrl}</platformUrl>
           <urls>
-            <url>${platformUrl}</url>
             <url>${emfUrl}</url>
             <url>${jemUrl}</url>
             <url>${gefUrl}</url>
@@ -291,7 +292,7 @@
     <module>plugins/org.apache.geronimo.ui</module>
     <module>plugins/org.apache.geronimo.runtime.v1</module>
     <module>features/org.apache.geronimo.feature</module>
-    <module>features/org.apache.geronimo.installableruntime.j2ee.feature</module>
+    <module>features/org.apache.geronimo.installableruntime.jetty.feature</module>
     <module>features/org.apache.geronimo.installableruntime.tomcat.feature</module>
   </modules>
   



Mime
View raw message