geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r414941 - in /geronimo/devtools/eclipse-plugin/trunk: maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/ plugins/org.apache.geronimo.st.v1.core/serverdef/ plugins/org.apache.geronimo.st.v11.core/serverdef/
Date Fri, 16 Jun 2006 22:05:14 GMT
Author: sppatel
Date: Fri Jun 16 15:05:14 2006
New Revision: 414941

URL: http://svn.apache.org/viewvc?rev=414941&view=rev
Log:
re-add server.jar as cp entry

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.st.v1.core/serverdef/geronimo10.serverdef
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/serverdef/geronimo11.serverdef

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/viewvc/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/LaunchOSGIMojo.java?rev=414941&r1=414940&r2=414941&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
Fri Jun 16 15:05:14 2006
@@ -145,6 +145,8 @@
 			} catch (Exception e) {
 				e.printStackTrace();
 			} 
+			clazz = null;
+			getPluginContext().remove(STARTER);
 		} else {
 			getPluginContext().put(CURRENT_EXECUTION, new Integer(getCurrentExecution() + 1));
 		}

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/serverdef/geronimo10.serverdef
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/serverdef/geronimo10.serverdef?rev=414941&r1=414940&r2=414941&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/serverdef/geronimo10.serverdef
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/serverdef/geronimo10.serverdef
Fri Jun 16 15:05:14 2006
@@ -84,6 +84,10 @@
 		<vmParameters></vmParameters>
 		<classpathReference>geronimo.server</classpathReference>
 	</start>
+	
+    <classpath id="geronimo.server">
+		<archive path="${serverRootDirectory}/bin/server.jar" />
+	</classpath>
 
 	<classpath id="geronimo.project">
 		<archive path="${serverRootDirectory}/repository" />

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/serverdef/geronimo11.serverdef
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/serverdef/geronimo11.serverdef?rev=414941&r1=414940&r2=414941&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/serverdef/geronimo11.serverdef
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/serverdef/geronimo11.serverdef
Fri Jun 16 15:05:14 2006
@@ -76,6 +76,10 @@
 		<vmParameters></vmParameters>
 		<classpathReference>geronimo.server</classpathReference>
 	</start>
+	
+    <classpath id="geronimo.server">
+		<archive path="${serverRootDirectory}/bin/server.jar" />
+	</classpath>
 
 	<classpath id="geronimo.project">
 		<archive path="${serverRootDirectory}/repository"/>



Mime
View raw message