geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From de...@apache.org
Subject svn commit: r931822 - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.runtime.v30/ org.apache.geronimo.runtime.v30/META-INF/ org.apache.geronimo.st.core/ org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/ org...
Date Thu, 08 Apr 2010 07:45:26 GMT
Author: delos
Date: Thu Apr  8 07:45:25 2010
New Revision: 931822

URL: http://svn.apache.org/viewvc?rev=931822&view=rev
Log:
GERONIMODEVTOOLS-603 update plugins for 3.0 server adapter and make 3.0 server runnable with
it

Removed:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v21/
Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/.project
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/.project
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/Activator.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentPlanInstallConfig.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoRuntime.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServer.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviour.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerInfo.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Trace.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBModelUtils.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBObjectFactoryImpl.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/operations/GeronimoServerPluginManager.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/.project
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/.project
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/.project?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/.project
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/.project
Thu Apr  8 07:45:25 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.apache.geronimo.runtime.v22</name>
+	<name>org.apache.geronimo.runtime.v30</name>
 	<comment></comment>
 	<projects>
 	</projects>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF
Thu Apr  8 07:45:25 2010
@@ -56,7 +56,6 @@ Export-Package: 
  org.apache.geronimo.system.configuration.cli,
  org.apache.geronimo.system.configuration.condition,
  org.apache.geronimo.system.jmx,
- org.apache.geronimo.system.logging,
  org.apache.geronimo.system.logging.log4j,
  org.apache.geronimo.system.main,
  org.apache.geronimo.system.plugin,
@@ -65,7 +64,6 @@ Export-Package: 
  org.apache.geronimo.system.repository,
  org.apache.geronimo.system.resolver,
  org.apache.geronimo.system.serverinfo,
- org.apache.geronimo.system.sharedlib,
  org.apache.geronimo.system.threads,
  org.apache.geronimo.system.util,
  org.codehaus.plexus.archiver,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml
Thu Apr  8 07:45:25 2010
@@ -66,6 +66,7 @@
         <runtime-component-version type="org.apache.geronimo.runtime" version="2.0"/>
         <runtime-component-version type="org.apache.geronimo.runtime" version="2.1"/>
         <runtime-component-version type="org.apache.geronimo.runtime" version="2.2"/>
+        <runtime-component-version type="org.apache.geronimo.runtime" version="3.0"/>
 
         <!-- GERONIMODEVTOOLS-331 -->
         <adapter>
@@ -119,6 +120,17 @@
             <facet id="jst.appclient"   version="1.2,1.3,1.4,5.0"/>
             <facet id="jst.utility"     version="1.0"/>
         </supported>
+        
+         <supported>
+            <runtime-component id="org.apache.geronimo.runtime" version="3.0"/>
+            <facet id="org.apache.geronimo.facet" version="1.3"/>
+            <facet id="jst.web"         version="2.2,2.3,2.4,2.5,3.0"/>
+            <facet id="jst.ejb"         version="1.1,2.0,2.1,3.0,3.1"/>
+            <facet id="jst.ear"         version="1.2,1.3,1.4,5.0"/>
+            <facet id="jst.connector"   version="1.0,1.5,1.6"/>
+            <facet id="jst.appclient"   version="1.2,1.3,1.4,5.0"/>
+            <facet id="jst.utility"     version="1.0"/>
+        </supported>
     </extension>
     
     
@@ -198,7 +210,7 @@
    </extension>
    
    <extension point="org.apache.geronimo.st.core.JAXBUtilsProvider">
-       <provider class="org.apache.geronimo.st.core.jaxb.JAXB21Utils" version="2.0,2.1,2.2"/>
+       <provider class="org.apache.geronimo.st.core.jaxb.JAXB21Utils" version="2.0,2.1,2.2,3.0"/>
    </extension>
  
 </plugin>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoRuntimeDelegate.java
Thu Apr  8 07:45:25 2010
@@ -103,22 +103,39 @@ abstract public class GeronimoRuntimeDel
         IPath runtimeLoc = getRuntime().getLocation();
 
         // check for server file structure
+        String version = getRuntime().getRuntimeType().getVersion();
         int count = 0;
-        count = runtimeLoc.append("bin/server.jar").toFile().exists() ? ++count : count;
-        count = runtimeLoc.append("bin/deployer.jar").toFile().exists() ? ++count : count;
-        count = runtimeLoc.append("lib").toFile().exists() ? ++count : count;
-        count = runtimeLoc.append("repository").toFile().exists() ? ++count : count;
-
+        int limit = 4;
+        if (version.startsWith("3")){
+        	//for version 3.0+
+        	
+	        count = runtimeLoc.append("lib").toFile().exists() ? ++count : count;
+	        count = runtimeLoc.append("repository").toFile().exists() ? ++count : count;
+	        
+	        limit = 2;
+	        
+        }else{
+        	//for version before 3.0
+	        count = runtimeLoc.append("bin/server.jar").toFile().exists() ? ++count : count;
+	        count = runtimeLoc.append("bin/deployer.jar").toFile().exists() ? ++count : count;
+	        count = runtimeLoc.append("lib").toFile().exists() ? ++count : count;
+	        count = runtimeLoc.append("repository").toFile().exists() ? ++count : count;
+	
+        }
+        
         if (count == 0) {
             return new Status(IStatus.ERROR, Activator.PLUGIN_ID, NO_IMAGE, "", null);
         }
-
-        if (count < 4) {
+        
+        if (count < limit) {
+        	
 			// part of a server image was found, don't let install happen
 			return new Status(IStatus.ERROR, Activator.PLUGIN_ID,
 					PARTIAL_IMAGE, Messages.bind(Messages.missingContent,
 							getRuntime().getName()), null);
-		}
+        }
+
+        
 
         String detectedVersion = detectVersion();
         if (detectedVersion == null) {

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java
Thu Apr  8 07:45:25 2010
@@ -378,9 +378,7 @@ abstract public class GeronimoServerBeha
 		stopUpdateServerStateTask();
 	}
 
-	public String getRuntimeClass() {
-		return "org.apache.geronimo.system.main.Daemon";
-	}
+	public abstract String getRuntimeClass();
 
 	public void setServerStarted() {
 		setServerState(IServer.STATE_STARTED);
@@ -770,8 +768,22 @@ abstract public class GeronimoServerBeha
 
 	protected void setupLaunchClasspath(ILaunchConfigurationWorkingCopy wc, IVMInstall vmInstall)
throws CoreException {
 		List<IRuntimeClasspathEntry> cp = new ArrayList<IRuntimeClasspathEntry>();
-		IPath serverJar = getServer().getRuntime().getLocation().append("/bin/server.jar");
-		cp.add(JavaRuntime.newArchiveRuntimeClasspathEntry(serverJar));
+		
+		String version = getServer().getRuntime().getRuntimeType().getVersion();
+		
+		if (version.startsWith("3")) {
+			//get required jar file
+			IPath libPath = getServer().getRuntime().getLocation().append("/lib");
+			for (String jarFile: libPath.toFile().list()){
+				IPath serverJar = libPath.append("/"+jarFile);
+				cp.add(JavaRuntime.newArchiveRuntimeClasspathEntry(serverJar));
+			}
+			
+		}else{
+		     //for 1.1,2.0,2.1,2.2 
+		     IPath serverJar = getServer().getRuntime().getLocation().append("/lib/server.jar");
+		     cp.add(JavaRuntime.newArchiveRuntimeClasspathEntry(serverJar));
+	    }
 		// merge existing classpath with server classpath
 		IRuntimeClasspathEntry[] existingCps = JavaRuntime.computeUnresolvedRuntimeClasspath(wc);
 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerRuntimeTargetHandler.java
Thu Apr  8 07:45:25 2010
@@ -142,17 +142,11 @@ public class GeronimoServerRuntimeTarget
             }if (version.startsWith("3.0")) {
 	           	 //TODO: review list here when server 3.0 is ready
 	           	 IPath javaMailSpec = runtime.getLocation().append("repository/org/apache/geronimo/javamail/geronimo-javamail_1.4_mail/");
-	           	 IPath jaxbApiSpec  = runtime.getLocation().append("repository/javax/xml/bind/jaxb-api/");
-	           	 IPath jabxImplSpec = runtime.getLocation().append("repository/com/sun/xml/bind/jaxb-impl/");
-	           	 IPath jaxwsApiSpec = runtime.getLocation().append("repository/org/apache/axis2/axis2-jaxws-api/");
-	           	 IPath jstlSpec     = runtime.getLocation().append("repository/jstl/jstl/");
+	           	 IPath jstlSpec     = runtime.getLocation().append("repository/org/apache/geronimo/bundles/jstl/");
 	           	 IPath myfacesSpec  = runtime.getLocation().append("repository/org/apache/myfaces/core/myfaces-api/");
 	           	 IPath myfacesImplSpec  = runtime.getLocation().append("repository/org/apache/myfaces/core/myfaces-impl/");
 	           	 IPath jdbcSpec     = runtime.getLocation().append("repository/org/apache/geronimo/framework/geronimo-jdbc/");
 	           	 addLibraryEntries(list, javaMailSpec.toFile(), true);
-	           	 addLibraryEntries(list, jaxbApiSpec.toFile(),  true);
-	           	 addLibraryEntries(list, jabxImplSpec.toFile(), true);
-	           	 addLibraryEntries(list, jaxwsApiSpec.toFile(), true);
 	           	 addLibraryEntries(list, jstlSpec.toFile(),     true);
 	           	 addLibraryEntries(list, myfacesSpec.toFile(),  true);
 	           	 addLibraryEntries(list, myfacesImplSpec.toFile(),  true);

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/plugin.xml Thu
Apr  8 07:45:25 2010
@@ -52,14 +52,16 @@
             typeIds="org.apache.geronimo.runtime.11,
             		 org.apache.geronimo.runtime.20,
                      org.apache.geronimo.runtime.21,
-                     org.apache.geronimo.runtime.22"/>
+                     org.apache.geronimo.runtime.22,
+                     org.apache.geronimo.runtime.30"/>
 
         <image id="org.apache.geronimo.server.image" 
             icon="icons/obj16/littleG.gif"
             typeIds="org.apache.geronimo.server.11,
             		 org.apache.geronimo.server.20,
                      org.apache.geronimo.server.21,
-                     org.apache.geronimo.server.22"/>
+                     org.apache.geronimo.server.22,
+                     org.apache.geronimo.server.30"/>
     </extension>
 
 
@@ -76,13 +78,15 @@
             typeIds="org.apache.geronimo.runtime.11,
             		 org.apache.geronimo.runtime.20,
                      org.apache.geronimo.runtime.21,
-                     org.apache.geronimo.runtime.22"
+                     org.apache.geronimo.runtime.22,
+                     org.apache.geronimo.runtime.30"
             class="org.apache.geronimo.st.ui.internal.GeronimoRuntimeWizardFragment"/>
         <fragment id="org.apache.geronimo.server.wizardFragment"
             typeIds="org.apache.geronimo.server.11,
             		 org.apache.geronimo.server.20,
                      org.apache.geronimo.server.21,
-                     org.apache.geronimo.server.22"
+                     org.apache.geronimo.server.22,
+                     org.apache.geronimo.server.30"
             class="org.apache.geronimo.st.ui.internal.GeronimoServerWizardFragment"/>
     </extension>
 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java
Thu Apr  8 07:45:25 2010
@@ -176,4 +176,9 @@ public class GeronimoServerBehaviour ext
          List list = dh.reorderModules(this.getServer(),modules, deltaKind);
          return list;
     }
+
+    @Override
+    public String getRuntimeClass() {
+        return "org.apache.geronimo.system.main.Daemon";
+    }
 }
\ No newline at end of file

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF
Thu Apr  8 07:45:25 2010
@@ -22,4 +22,3 @@ Export-Package: 
  org.apache.geronimo.st.v21.core.internal,
  org.apache.geronimo.st.v21.core.jaxb,
  org.apache.geronimo.st.v21.core.operations
-Import-Package: junit.framework;version="3.8.2"

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/.project
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/.project?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/.project
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/.project
Thu Apr  8 07:45:25 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.apache.geronimo.st.v21.core</name>
+	<name>org.apache.geronimo.st.v30.core</name>
 	<comment></comment>
 	<projects>
 	</projects>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF
Thu Apr  8 07:45:25 2010
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.apache.geronimo.st.v30.core;singleton:=true
 Bundle-Version: 3.0.0
-Bundle-Activator: org.apache.geronimo.st.v21.core.Activator
+Bundle-Activator: org.apache.geronimo.st.v30.core.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.jst.j2ee,
@@ -18,8 +18,7 @@ Require-Bundle: org.eclipse.jst.j2ee,
  org.eclipse.wst.common.modulecore
 Bundle-ActivationPolicy: lazy
 Export-Package: 
- org.apache.geronimo.st.v21.core,
- org.apache.geronimo.st.v21.core.internal,
- org.apache.geronimo.st.v21.core.jaxb,
- org.apache.geronimo.st.v21.core.operations
-Import-Package: junit.framework;version="3.8.2"
+ org.apache.geronimo.st.v30.core,
+ org.apache.geronimo.st.v30.core.internal,
+ org.apache.geronimo.st.v30.core.jaxb,
+ org.apache.geronimo.st.v30.core.operations

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/plugin.xml?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/plugin.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/plugin.xml
Thu Apr  8 07:45:25 2010
@@ -28,13 +28,13 @@
      | 
      -->
     <extension point="org.eclipse.wst.server.core.runtimeTypes">
-        <runtimeType id="org.apache.geronimo.runtime.21" version="2.1"
+        <runtimeType id="org.apache.geronimo.runtime.30" version="3.0"
             name="%runtimeTypeName"
             description="%runtimeTypeDescription"
             vendor="%runtimeTypeVendor"
-            class="org.apache.geronimo.st.v21.core.GeronimoRuntime">
-            <moduleType types="jst.web"       versions="2.2, 2.3, 2.4, 2.5"/>
-            <moduleType types="jst.ejb"       versions="1.1, 2.0, 2.1, 3.0"/>
+            class="org.apache.geronimo.st.v30.core.GeronimoRuntime">
+            <moduleType types="jst.web"       versions="2.2, 2.3, 2.4, 2.5, 3.0"/>
+            <moduleType types="jst.ejb"       versions="1.1, 2.0, 2.1, 3.0, 3.1"/>
             <moduleType types="jst.connector" versions="1.0, 1.5"/>
             <moduleType types="jst.ear"       versions="1.2, 1.3, 1.4, 5.0"/>
             <moduleType types="jst.utility"   versions="1.0"/>
@@ -50,19 +50,19 @@
     <!--                                                                             
           -->
     <!-- =======================================================================================
-->
     <extension point="org.eclipse.wst.server.core.serverTypes">
-        <serverType id="org.apache.geronimo.server.21"
+        <serverType id="org.apache.geronimo.server.30"
             name="%serverTypeName"
             description="%serverTypeDescription"
             runtime="true"
-            class="org.apache.geronimo.st.v21.core.GeronimoServer"
+            class="org.apache.geronimo.st.v30.core.GeronimoServer"
             initialState="stopped"
             supportsRemoteHosts="true"
             startTimeout="240000"
             stopTimeout="30000"
             startBeforePublish="true"
-            runtimeTypeId="org.apache.geronimo.runtime.21"
+            runtimeTypeId="org.apache.geronimo.runtime.30"
             launchConfigId="org.apache.geronimo.st.core.launchConfigurationType"
-            behaviourClass="org.apache.geronimo.st.v21.core.GeronimoServerBehaviour"
+            behaviourClass="org.apache.geronimo.st.v30.core.GeronimoServerBehaviour"
             hasConfiguration="false"
             launchModes="run,debug,profile">
         </serverType>
@@ -77,8 +77,8 @@
     <!-- =======================================================================================
-->
     <extension point="org.eclipse.jst.server.core.runtimeFacetMappings">
         <runtimeFacetMapping
-            runtimeTypeId="org.apache.geronimo.runtime.21"
-            runtime-component="org.apache.geronimo.runtime" version="2.1"/>
+            runtimeTypeId="org.apache.geronimo.runtime.30"
+            runtime-component="org.apache.geronimo.runtime" version="3.0"/>
     </extension>
     
 
@@ -90,10 +90,10 @@
      | 
      -->
     <extension point="org.eclipse.wst.common.project.facet.core.facets">
-        <project-facet-version facet="org.apache.geronimo.facet" version="1.2">
-            <action type="install" id="geronimo.plan.install.v21">
-                <delegate class="org.apache.geronimo.st.v21.core.operations.GeronimoV21FacetInstallDelegate"/>
-                <config-factory class="org.apache.geronimo.st.v21.core.DeploymentPlanInstallConfig$Factory"/>
+        <project-facet-version facet="org.apache.geronimo.facet" version="1.3">
+            <action type="install" id="geronimo.plan.install.v30">
+                <delegate class="org.apache.geronimo.st.v30.core.operations.GeronimoV30FacetInstallDelegate"/>
+                <config-factory class="org.apache.geronimo.st.v30.core.DeploymentPlanInstallConfig$Factory"/>
             </action>
             <constraint>
                 <or>
@@ -112,10 +112,12 @@
                     <requires facet="jst.ejb" version="2.0"/>
                     <requires facet="jst.ejb" version="2.1"/>
                     <requires facet="jst.ejb" version="3.0"/>
+                    <requires facet="jst.ejb" version="3.1"/>
                     <requires facet="jst.web" version="2.2"/>
                     <requires facet="jst.web" version="2.3"/>
                     <requires facet="jst.web" version="2.4"/>
                     <requires facet="jst.web" version="2.5"/>
+                    <requires facet="jst.web" version="3.0"/>
                     <requires facet="jst.utility" version="1.0"/>
                 </or>
             </constraint>
@@ -133,8 +135,8 @@
         id="org.apache.geronimo.defaultFacets"
         name="Geronimo Default Facets">
         <default-facets>
-            <runtime-component id="org.apache.geronimo.runtime" version="2.1"/>
-            <facet id="org.apache.geronimo.facet" version="1.2"/>
+            <runtime-component id="org.apache.geronimo.runtime" version="3.0"/>
+            <facet id="org.apache.geronimo.facet" version="1.3"/>
         </default-facets>
     </extension>
 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/Activator.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/Activator.java?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/Activator.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/Activator.java
Thu Apr  8 07:45:25 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.geronimo.st.v21.core;
+package org.apache.geronimo.st.v30.core;
 
 import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.BundleContext;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentPlanInstallConfig.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentPlanInstallConfig.java?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentPlanInstallConfig.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentPlanInstallConfig.java
Thu Apr  8 07:45:25 2010
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.geronimo.st.v21.core;
+package org.apache.geronimo.st.v30.core;
 
-import org.apache.geronimo.st.v21.core.internal.Trace;
+import org.apache.geronimo.st.v30.core.internal.Trace;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
 import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences;
 import org.eclipse.wst.common.project.facet.core.IActionConfigFactory;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoRuntime.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoRuntime.java?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoRuntime.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoRuntime.java
Thu Apr  8 07:45:25 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.geronimo.st.v21.core;
+package org.apache.geronimo.st.v30.core;
 
 import org.apache.geronimo.st.core.GeronimoRuntimeDelegate;
 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServer.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServer.java?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServer.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServer.java
Thu Apr  8 07:45:25 2010
@@ -14,9 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.geronimo.st.v21.core;
+package org.apache.geronimo.st.v30.core;
 
 import java.io.File;
+import java.text.MessageFormat;
+
 import javax.enterprise.deploy.spi.DeploymentManager;
 import javax.enterprise.deploy.spi.factories.DeploymentFactory;
 
@@ -54,7 +56,7 @@ public class GeronimoServer extends Gero
      * @see org.apache.geronimo.st.core.GenericGeronimoServer#getContextRoot(org.eclipse.wst.server.core.IModule)
      */
     public String getContextRoot(IModule module) throws Exception {
-        return GeronimoV21Utils.getContextRoot(module);
+        return GeronimoV30Utils.getContextRoot(module);
     }
 
     /*
@@ -110,9 +112,16 @@ public class GeronimoServer extends Gero
         String memoryOpts = "-Xms256m -Xmx512m -XX:MaxPermSize=128m";
 
         // Specify GERONIMO_BASE
-        String homeDirectory = "-Dorg.apache.geronimo.home.dir=\"" + runtimeLocation;
-
-        return javaagent + " " + javaExtDirs + " " + javaEndorsedDirs + " " + memoryOpts
+ " " + homeDirectory;
+        String homeDirectory = "-Dorg.apache.geronimo.home.dir=\"" + runtimeLocation + "\"";
+        
+        // Karaf arguments
+        String serverLocation = getServer().getRuntime().getLocation().toOSString();
+        String karafArgs = "-Dkaraf.startLocalConsole=true -Dkaraf.startRemoteShell=true
" + MessageFormat.format("-Dorg.apache.geronimo.home.dir=\"{0}\" -Dkaraf.home=\"{0}\" -Dkaraf.base=\"{0}\"
-Djava.util.logging.config.file={0}/etc/java.util.logging.properties", serverLocation);
+
+        StringBuilder vmArgs = new StringBuilder(javaagent);
+        vmArgs.append(" ").append(javaExtDirs).append(" ").append(javaEndorsedDirs).append("
").append(memoryOpts).append(" ").append(homeDirectory).append(" ").append(karafArgs);
+        
+        return vmArgs.toString();
     }
 
     /*
@@ -161,7 +170,7 @@ public class GeronimoServer extends Gero
      */
     public IGeronimoVersionHandler getVersionHandler() {
         if (versionHandler == null)
-            versionHandler = new GeronimoV21VersionHandler();
+            versionHandler = new GeronimoV30VersionHandler();
         return versionHandler;
     }
 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviour.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviour.java?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviour.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviour.java
Thu Apr  8 07:45:25 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.geronimo.st.v21.core;
+package org.apache.geronimo.st.v30.core;
 
 import java.net.URL;
 import java.util.List;
@@ -36,7 +36,7 @@ import org.apache.geronimo.kernel.reposi
 import org.apache.geronimo.st.core.Activator;
 import org.apache.geronimo.st.core.GeronimoServerBehaviourDelegate;
 import org.apache.geronimo.st.core.internal.DependencyHelper;
-import org.apache.geronimo.st.v21.core.internal.Trace;
+import org.apache.geronimo.st.v30.core.internal.Trace;
 import org.apache.geronimo.system.jmx.KernelDelegate;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerInfo.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerInfo.java?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerInfo.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerInfo.java
Thu Apr  8 07:45:25 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.geronimo.st.v21.core;
+package org.apache.geronimo.st.v30.core;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -41,7 +41,7 @@ import org.apache.geronimo.kernel.NoSuch
 import org.apache.geronimo.kernel.NoSuchOperationException;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.st.core.GeronimoServerBehaviourDelegate;
-import org.apache.geronimo.st.v21.core.internal.Trace;
+import org.apache.geronimo.st.v30.core.internal.Trace;
 import org.apache.geronimo.system.jmx.KernelDelegate;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Trace.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Trace.java?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Trace.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Trace.java
Thu Apr  8 07:45:25 2010
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.geronimo.st.v21.core.internal;
+package org.apache.geronimo.st.v30.core.internal;
 
-import org.apache.geronimo.st.v21.core.Activator;
+import org.apache.geronimo.st.v30.core.Activator;
 import org.eclipse.core.runtime.IStatus;
 
 /**

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBModelUtils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBModelUtils.java?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBModelUtils.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBModelUtils.java
Thu Apr  8 07:45:25 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.geronimo.st.v21.core.jaxb;
+package org.apache.geronimo.st.v30.core.jaxb;
 
 import java.util.List;
 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBObjectFactoryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBObjectFactoryImpl.java?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBObjectFactoryImpl.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBObjectFactoryImpl.java
Thu Apr  8 07:45:25 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.geronimo.st.v21.core.jaxb;
+package org.apache.geronimo.st.v30.core.jaxb;
 
 import org.apache.geronimo.st.core.jaxb.JAXBObjectFactory;
 import org.apache.geronimo.jee.application.ExtModule;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/operations/GeronimoServerPluginManager.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/operations/GeronimoServerPluginManager.java?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/operations/GeronimoServerPluginManager.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/operations/GeronimoServerPluginManager.java
Thu Apr  8 07:45:25 2010
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.geronimo.st.v21.core.operations;
+package org.apache.geronimo.st.v30.core.operations;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -56,7 +56,7 @@ import org.apache.geronimo.st.core.Commo
 import org.apache.geronimo.st.core.GeronimoConnectionFactory;
 import org.apache.geronimo.st.core.GeronimoServerBehaviourDelegate;
 import org.apache.geronimo.st.core.jaxb.JAXBUtils;
-import org.apache.geronimo.st.v21.core.internal.Trace;
+import org.apache.geronimo.st.v30.core.internal.Trace;
 import org.apache.geronimo.system.jmx.KernelDelegate;
 import org.apache.geronimo.system.plugin.PluginInstaller;
 import org.apache.geronimo.system.plugin.model.ArtifactType;

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/.project
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/.project?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/.project
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/.project
Thu Apr  8 07:45:25 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.apache.geronimo.st.v21.ui</name>
+	<name>org.apache.geronimo.st.v30.ui</name>
 	<comment></comment>
 	<projects>
 	</projects>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF
Thu Apr  8 07:45:25 2010
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Geronimo Server Tools V30 UI Plug-in
 Bundle-SymbolicName: org.apache.geronimo.st.v30.ui;singleton:=true
 Bundle-Version: 3.0.0
-Bundle-Activator: org.apache.geronimo.st.v21.ui.Activator
+Bundle-Activator: org.apache.geronimo.st.v30.ui.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.apache.geronimo.runtime.common,
  org.apache.geronimo.jee.v21.jaxbmodel,
@@ -21,9 +21,12 @@ Require-Bundle: org.apache.geronimo.runt
  org.eclipse.wst.server.ui
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Apache Software Foundation
-Export-Package: org.apache.geronimo.st.v21.ui,
- org.apache.geronimo.st.v21.ui.editors,
- org.apache.geronimo.st.v21.ui.internal,
- org.apache.geronimo.st.v21.ui.pages,
- org.apache.geronimo.st.v21.ui.sections,
- org.apache.geronimo.st.v21.ui.wizards
+Export-Package: org.apache.geronimo.st.v30.ui,
+ org.apache.geronimo.st.v30.ui.editors,
+ org.apache.geronimo.st.v30.ui.internal,
+ org.apache.geronimo.st.v30.ui.pages,
+ org.apache.geronimo.st.v30.ui.sections,
+ org.apache.geronimo.st.v30.ui.wizards
+Import-Package: org.apache.geronimo.st.v30.core,
+ org.apache.geronimo.st.v30.core.jaxb,
+ org.apache.geronimo.st.v30.core.operations

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml?rev=931822&r1=931821&r2=931822&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml
Thu Apr  8 07:45:25 2010
@@ -22,7 +22,7 @@
 <plugin>
 
     <extension point="org.apache.geronimo.st.ui.loader">
-           <loader class="org.apache.geronimo.st.v21.ui.editors.GeronimoFormContentLoader"
version="2.1"/>
+           <loader class="org.apache.geronimo.st.v30.ui.editors.GeronimoFormContentLoader"
version="3.0"/>
     </extension>
 
     <!-- 
@@ -31,24 +31,24 @@
      |
      -->
     <extension point="org.eclipse.wst.common.project.facet.ui.wizardPages">
-        <wizard-pages action="geronimo.plan.install.v21">
-            <page class="org.apache.geronimo.st.v21.ui.wizards.FacetInstallPage"/>
+        <wizard-pages action="geronimo.plan.install.v30">
+            <page class="org.apache.geronimo.st.v30.ui.wizards.FacetInstallPage"/>
         </wizard-pages>
     </extension>
 
     <extension point="org.eclipse.wst.server.ui.editorPages">
         <page id="org.eclipse.wst.server.editor.plugins" order="10"
               name="%serverEditorPluginPage"
-              typeIds="org.apache.geronimo.server.*"
+              typeIds="org.apache.geronimo.server.3*"
               insertionIds="org.eclipse.wst.server.editor.plugins"
-              class="org.apache.geronimo.st.v21.ui.pages.ServerPluginPage"/>
+              class="org.apache.geronimo.st.v30.ui.pages.ServerPluginPage"/>
     </extension>
     
     <extension point="org.eclipse.wst.server.ui.editorPageSections">
         <section id="org.apache.server.geronimo.plugins" order="10"
             insertionId="org.eclipse.wst.server.editor.plugins"
-            typeIds="org.apache.geronimo.server.*"
-            class="org.apache.geronimo.st.v21.ui.sections.ServerPluginSection">
+            typeIds="org.apache.geronimo.server.3*"
+            class="org.apache.geronimo.st.v30.ui.sections.ServerPluginSection">
         </section>
     </extension>
     <extension



Mime
View raw message