geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r390441 - in /geronimo/devtools/eclipse-plugin/trunk: ./ maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/ plugins/ plugins/org.apache.geronimo.deployment.model.edit/ plugins/org.apache.geronimo...
Date Fri, 31 Mar 2006 15:03:15 GMT
Author: sppatel
Date: Fri Mar 31 07:03:12 2006
New Revision: 390441

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

Added:
    geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml   (with props)
Modified:
    geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.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.ui/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/pom.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.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/InstallPluginDependenciesMojo.java?rev=390441&r1=390440&r2=390441&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java
Fri Mar 31 07:03:12 2006
@@ -54,9 +54,9 @@
 	private MavenProject project;
 
 	/**
-	 * @parameter expression="${eclipse.home}"
+	 * @parameter expression="${eclipseHome}"
 	 */
-	private File eclipsehome;
+	private File eclipseHome;
 
 	/**
 	 * @parameter expression="${component.org.apache.maven.artifact.factory.ArtifactFactory}"
@@ -97,9 +97,9 @@
 
 		if (!isValid())
 			throw new MojoFailureException("Eclipse home directory is not valid. "
-					+ eclipsehome);
+					+ eclipseHome);
 
-		File pluginsDir = new File(eclipsehome.getAbsolutePath().concat(File.separator
+		File pluginsDir = new File(eclipseHome.getAbsolutePath().concat(File.separator
 				+ "plugins"));
 
 		processDependenciesOnly(pluginsDir);
@@ -133,7 +133,7 @@
 	}
 
 	protected boolean isValid() {
-		return eclipsehome != null && eclipsehome.isDirectory();
+		return eclipseHome != null && eclipseHome.isDirectory();
 	}
 
 	protected void process(File file, int depth, Dependency dependency) {

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=390441&r1=390440&r2=390441&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
Fri Mar 31 07:03:12 2006
@@ -6,7 +6,7 @@
   <name>Geronimo Eclipse Plugin :: Plugin :: ${artifactId}</name>
   <parent>
     <groupId>org.apache.geronimo.devtools</groupId>
-    <artifactId>geronimo-eclipse-plugin</artifactId>
+    <artifactId>eclipse-plugins-parent</artifactId>
     <version>1.0</version>
   </parent>
   <properties>
@@ -27,8 +27,41 @@
         </includes>
       </resource>
     </resources>
+    
     <plugins>
       <plugin>
+        <groupId>org.apache.geronimo.devtools</groupId>
+        <artifactId>maven-geronimodevtools-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>install-dependencies</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>download</goal>
+              <goal>install</goal>
+            </goals>
+          </execution>
+          <!-- TODO remove following execution after 3.2 migration
+          need for running osgi under 3.2 due to platform bugs -->
+          <execution>
+            <id>create-emf-image</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>download</goal>
+            </goals>
+            <configuration>
+              <platformUrl>http://download.eclipse.org/eclipse/downloads/drops/I20060329-0800/eclipse-SDK-I20060329-0800</platformUrl>
+              <urls>
+                <url>${emfUrl}</url>
+              </urls>
+              <installLocation>${settings.localRepository}/eclipse/temp/</installLocation>
+              <propsFile>${settings.localRepository}/eclipse/temp/install.props</propsFile>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
@@ -37,6 +70,7 @@
           </archive>
         </configuration>
       </plugin>
+      
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>dependency-maven-plugin</artifactId>
@@ -60,12 +94,14 @@
           <outputDirectory>${imported-resources}</outputDirectory>
         </configuration>
       </plugin>
+      
       <plugin>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>maven-emf-plugin</artifactId>
         <configuration>
+          <!-- TODO remove <eclipseHome> after 3.2 migration -->
+          <eclipseHome>${settings.localRepository}/eclipse/temp/eclipse</eclipseHome>
           <workspace>${project.basedir}/..</workspace>
-          <!--<projectRootDirectory>${project.basedir}/..</projectRootDirectory>-->
           <type>edit</type>
         </configuration>
         <executions>

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=390441&r1=390440&r2=390441&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
Fri Mar 31 07:03:12 2006
@@ -4,14 +4,17 @@
   <packaging>jar</packaging>
   <version>${org.apache.geronimo.deployment.model_version}</version>
   <name>Geronio Eclipse Plugin :: Plugin :: ${artifactId}</name>
+  
   <parent>
     <groupId>org.apache.geronimo.devtools</groupId>
-    <artifactId>geronimo-eclipse-plugin</artifactId>
+    <artifactId>eclipse-plugins-parent</artifactId>
     <version>1.0</version>
   </parent>
+  
   <properties>
     <imported-resources>${project.build.directory}/imported-resources</imported-resources>
   </properties>
+  
   <build>
     <resources>
       <resource>
@@ -27,8 +30,41 @@
         </includes>
       </resource>
     </resources>
+    
     <plugins>
       <plugin>
+        <groupId>org.apache.geronimo.devtools</groupId>
+        <artifactId>maven-geronimodevtools-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>install-dependencies</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>download</goal>
+              <goal>install</goal>
+            </goals>
+          </execution>
+          <!-- TODO remove following execution after 3.2 migration
+          need for running osgi under 3.2 due to platform bugs -->
+          <execution>
+            <id>create-emf-image</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>download</goal>
+            </goals>
+            <configuration>
+              <platformUrl>http://download.eclipse.org/eclipse/downloads/drops/I20060329-0800/eclipse-SDK-I20060329-0800</platformUrl>
+              <urls>
+                <url>${emfUrl}</url>
+              </urls>
+              <installLocation>${settings.localRepository}/eclipse/temp/</installLocation>
+              <propsFile>${settings.localRepository}/eclipse/temp/install.props</propsFile>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    
+      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
@@ -64,8 +100,9 @@
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>maven-emf-plugin</artifactId>
         <configuration>
+          <!-- TODO remove <eclipseHome> after 3.2 migration -->
+          <eclipseHome>${settings.localRepository}/eclipse/temp/eclipse</eclipseHome>
           <workspace>${project.basedir}/..</workspace>
-          <!--<projectRootDirectory>${project.basedir}/..</projectRootDirectory>-->
           <type>model</type>
         </configuration>
         <executions>

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=390441&r1=390440&r2=390441&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
Fri Mar 31 07:03:12 2006
@@ -6,7 +6,7 @@
   <name>Geronimo Eclipse Plugin :: Plugin :: ${artifactId}</name>
   <parent>
     <groupId>org.apache.geronimo.devtools</groupId>
-    <artifactId>geronimo-eclipse-plugin</artifactId>
+    <artifactId>eclipse-plugins-parent</artifactId>
     <version>1.0</version>
   </parent>
   <build>
@@ -51,7 +51,23 @@
         </includes>
       </resource>
     </resources>
+    
     <plugins>
+      <plugin>
+        <groupId>org.apache.geronimo.devtools</groupId>
+        <artifactId>maven-geronimodevtools-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>install-dependencies</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>download</goal>
+              <goal>install</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>

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=390441&r1=390440&r2=390441&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 Fri Mar
31 07:03:12 2006
@@ -6,7 +6,7 @@
   <name>Geronimo Eclipse Plugin :: Plugin :: ${artifactId}</name>
   <parent>
     <groupId>org.apache.geronimo.devtools</groupId>
-    <artifactId>geronimo-eclipse-plugin</artifactId>
+    <artifactId>eclipse-plugins-parent</artifactId>
     <version>1.0</version>
   </parent>
   <build>
@@ -44,7 +44,23 @@
         </includes>
       </resource>
     </resources>
+    
     <plugins>
+      <plugin>
+        <groupId>org.apache.geronimo.devtools</groupId>
+        <artifactId>maven-geronimodevtools-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>install-dependencies</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>download</goal>
+              <goal>install</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml?rev=390441&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml Fri Mar 31 07:03:12 2006
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2006 The Apache Software Foundation
+
+    Licensed 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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.geronimo.devtools</groupId>
+  <artifactId>eclipse-plugins-parent</artifactId>
+  <packaging>pom</packaging>
+  <name>Geronimo Eclipse Plugin :: Parent POM :: ${artifactId}</name>
+  <version>1.0</version>
+  <description>Parent POM for Geronimo Eclipse Plugin</description>
+  <url>http://geronimo.apache.org/devtools</url>
+  
+  <parent>
+    <groupId>org.apache.geronimo.devtools</groupId>
+    <artifactId>geronimo-eclipse-plugin</artifactId> 
+    <version>1.0</version>
+  </parent>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.geronimo.devtools</groupId>
+        <artifactId>maven-geronimodevtools-plugin</artifactId>
+        <configuration>
+          <platformUrl>${platformUrl}</platformUrl>
+          <urls>
+            <url>${emfUrl}</url>
+            <url>${jemUrl}</url>
+            <url>${gefUrl}</url>
+            <url>${wtpUrl}</url>
+          </urls>
+          <eclipseHome>${settings.localRepository}/eclipse/eclipse/</eclipseHome>
+        </configuration>
+        <!--<executions>
+          <execution>
+            <phase>validate</phase>
+            <goals>
+              <goal>download</goal>
+              <goal>install</goal>
+            </goals>
+          </execution>
+        </executions>-->
+      </plugin>
+    </plugins>
+  </build>
+  
+  <modules>
+    <module>org.apache.geronimo.deployment.model</module>
+    <module>org.apache.geronimo.deployment.model.edit</module>
+    <module>org.apache.geronimo.devtools.eclipse.core</module>
+    <module>org.apache.geronimo.jetty.j2ee.server.v1</module>
+    <module>org.apache.geronimo.tomcat.j2ee.server.v1</module>
+    <module>org.apache.geronimo.ui</module>
+    <module>org.apache.geronimo.runtime.v1</module>
+  </modules>
+  
+</project>

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=390441&r1=390440&r2=390441&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Fri Mar 31 07:03:12 2006
@@ -29,7 +29,7 @@
   <url>http://geronimo.apache.org/devtools</url>
   
   <prerequisites>
-    <maven>2.0.3-SNAPSHOT</maven>
+    <maven>2.0.3</maven>
   </prerequisites>
 
   <issueManagement>
@@ -123,8 +123,8 @@
     <stax-api_version>1.0</stax-api_version>
     <junitVersion>3.8.1</junitVersion>
     <!-- Eclipse Distribution URLs -->
-    <!--<platformDriver>R-3.1.2-200601181600/eclipse-SDK-3.1.2</platformDriver>-->
-    <platformDriver>I20060329-0800/eclipse-SDK-I20060329-0800</platformDriver>
+    <platformDriver>R-3.1.2-200601181600/eclipse-SDK-3.1.2</platformDriver>
+    <!--<platformDriver>I20060329-0800/eclipse-SDK-I20060329-0800</platformDriver>-->
     <platformUrl>http://download.eclipse.org/eclipse/downloads/drops/${platformDriver}</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>
@@ -133,8 +133,8 @@
     <!-- Eclipse Project Distro Versions -->
     <platformVersion>[3.1.2,)</platformVersion>
     <emfVersion>[2.1.0,)</emfVersion>
-    <jemVersion>3.1.1</jemVersion>
-    <wtpVersion>1.1.0.1</wtpVersion>
+    <jemVersion>1.0.1-1</jemVersion>
+    <wtpVersion>1.0.1</wtpVersion>
     <!-- Eclipse Platform Dependencies -->
     <org.eclipse.core.runtime_version>${platformVersion}</org.eclipse.core.runtime_version>
     <org.eclipse.core.resources_version>${platformVersion}</org.eclipse.core.resources_version>
@@ -216,32 +216,6 @@
   <build>
     <defaultGoal>install</defaultGoal>
     <sourceDirectory>src/</sourceDirectory>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.geronimo.devtools</groupId>
-        <artifactId>maven-geronimodevtools-plugin</artifactId>
-        <configuration>
-          <platformUrl>${platformUrl}</platformUrl>
-          <urls>
-            <url>${emfUrl}</url>
-            <url>${jemUrl}</url>
-            <url>${gefUrl}</url>
-            <url>${wtpUrl}</url>
-          </urls>
-          <eclipsehome>${settings.localRepository}/eclipse/eclipse/</eclipsehome>
-          <versionType>snapshot</versionType>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>validate</phase>
-            <goals>
-              <goal>download</goal>
-              <goal>install</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
   </build>
   
   <repositories>
@@ -285,13 +259,7 @@
 
   <modules>
     <module>geronimo-emf-common</module>
-    <module>plugins/org.apache.geronimo.deployment.model</module>
-    <module>plugins/org.apache.geronimo.deployment.model.edit</module>
-    <module>plugins/org.apache.geronimo.devtools.eclipse.core</module>
-    <module>plugins/org.apache.geronimo.jetty.j2ee.server.v1</module>
-    <module>plugins/org.apache.geronimo.tomcat.j2ee.server.v1</module>
-    <module>plugins/org.apache.geronimo.ui</module>
-    <module>plugins/org.apache.geronimo.runtime.v1</module>
+    <module>plugins/</module>
     <module>features/org.apache.geronimo.feature</module>
     <module>features/org.apache.geronimo.installableruntime.jetty.feature</module>
     <module>features/org.apache.geronimo.installableruntime.tomcat.feature</module>



Mime
View raw message