geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r390684 - in /geronimo/devtools/eclipse-plugin/trunk: ./ maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/ plugins/org.apache.geronimo.devtools.eclipse.core/ plugins/org.apache.geronimo.runtime.v1/
Date Sat, 01 Apr 2006 15:36:28 GMT
Author: sppatel
Date: Sat Apr  1 07:36:26 2006
New Revision: 390684

URL: http://svn.apache.org/viewcvs?rev=390684&view=rev
Log:
add jst.j2ee runtime dependencies

Modified:
    geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/LaunchOSGIMojo.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/pom.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/LaunchOSGIMojo.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/LaunchOSGIMojo.java?rev=390684&r1=390683&r2=390684&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/LaunchOSGIMojo.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/LaunchOSGIMojo.java
Sat Apr  1 07:36:26 2006
@@ -23,13 +23,18 @@
 import java.net.URLClassLoader;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
 
+import org.apache.maven.model.Plugin;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.Delete;
 
 abstract public class LaunchOSGIMojo extends AbstractMojo {
 
@@ -107,7 +112,10 @@
 		} catch (Exception e) {
 			throw new MojoFailureException(e.getMessage());
 		}
+		
 	}
+	
+
 
 	protected abstract String getApplicationID();
 
@@ -143,5 +151,19 @@
 
 	protected void validate() throws MojoFailureException {
 
+	}
+	
+	private int getTotalExecutions() {
+		int totalExecutions = 0;
+		List plugins = mavenProject.getBuild().getPlugins();
+		Iterator i = plugins.iterator();
+		while(i.hasNext()) {
+			Plugin plugin = (Plugin) i.next();
+			if(plugin.getArtifactId().equals("maven-emf-plugin")) {
+				totalExecutions = plugin.getExecutions().size();
+				break;
+			}
+		}
+		return totalExecutions;
 	}
 }

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=390684&r1=390683&r2=390684&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
Sat Apr  1 07:36:26 2006
@@ -131,7 +131,12 @@
       <groupId>org.eclipse.plugins</groupId>
       <artifactId>org.eclipse.wst.web</artifactId>
       <version>${org.eclipse.wst.web_version}</version>
-    </dependency>    
+    </dependency> 
+    <dependency>
+      <groupId>org.eclipse.plugins</groupId>
+      <artifactId>org.eclipse.jst.j2ee</artifactId>
+      <version>${org.eclipse.jst.j2ee_version}</version>
+    </dependency>     
     <dependency>
       <groupId>org.eclipse.plugins</groupId>
       <artifactId>org.eclipse.jst.j2ee.web</artifactId>

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=390684&r1=390683&r2=390684&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
Sat Apr  1 07:36:26 2006
@@ -139,28 +139,51 @@
           </execution>
         </executions>
       </plugin>
-        <plugin>
-          <groupId>org.apache.geronimo.devtools</groupId>
-          <artifactId>maven-geronimodevtools-plugin</artifactId>
-          <configuration>
-            <templateFile>pluginXmlTemplate.vm</templateFile>
-            <destFile>plugin.xml</destFile>
-            <libDir>lib</libDir>
-            <contextMap>
-              <id>${artifactId}</id>
-              <name>Apache Geronimo Runtime V${version} Plug-in</name>
-              <version>${version}</version>
-            </contextMap>
-          </configuration>
-          <executions>
-            <execution>
-              <phase>process-resources</phase>
-              <goals>
-                <goal>pluginxml</goal>
-              </goals>
-            </execution>
-          </executions>
+      <plugin>
+        <groupId>org.apache.geronimo.devtools</groupId>
+        <artifactId>maven-geronimodevtools-plugin</artifactId>
+        <configuration>
+          <templateFile>pluginXmlTemplate.vm</templateFile>
+          <destFile>plugin.xml</destFile>
+          <libDir>lib</libDir>
+          <contextMap>
+            <id>${artifactId}</id>
+            <name>Apache Geronimo Runtime V${version} Plug-in</name>
+            <version>${version}</version>
+          </contextMap>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>pluginxml</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
     </plugins>
   </build>
+  
+  <dependencies>
+    <dependency>
+      <groupId>geronimo</groupId>
+      <artifactId>geronimo-kernel</artifactId>
+      <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>geronimo</groupId>
+      <artifactId>geronimo-deploy-jsr88</artifactId>
+      <version>${geronimo_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+        <version>${geronimo_spec_version}</version>
+    </dependency>
+    <dependency>
+        <groupId>openejb</groupId>
+        <artifactId>openejb-builder</artifactId>
+        <version>${openejb_version}</version>
+    </dependency>
+  </dependencies>
 </project>

Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=390684&r1=390683&r2=390684&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Sat Apr  1 07:36:26 2006
@@ -171,6 +171,7 @@
     <org.eclipse.wst.common.frameworks_version>${wtpVersion}</org.eclipse.wst.common.frameworks_version>
     <org.eclipse.wst.server.ui_version>${wtpVersion}</org.eclipse.wst.server.ui_version>
     <org.eclipse.jst.server.core_version>${wtpVersion}</org.eclipse.jst.server.core_version>
+    <org.eclipse.jst.j2ee_version>${wtpVersion}</org.eclipse.jst.j2ee_version>
     <org.eclipse.jst.j2ee.web_version>${wtpVersion}</org.eclipse.jst.j2ee.web_version>
     <org.eclipse.jst.j2ee.ejb_version>${wtpVersion}</org.eclipse.jst.j2ee.ejb_version>
     <org.eclipse.jst.j2ee.jca_version>${wtpVersion}</org.eclipse.jst.j2ee.jca_version>



Mime
View raw message