geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r940156 - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.st.v30.core/plugin.xml org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServer.java org.apache.geronimo.st.v30.ui/plugin.xml
Date Sun, 02 May 2010 03:42:31 GMT
Author: mcconne
Date: Sun May  2 03:42:30 2010
New Revision: 940156

URL: http://svn.apache.org/viewvc?rev=940156&view=rev
Log:
Enable starting 3.0 version of the Geronimo server

Modified:
    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/GeronimoServer.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml

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=940156&r1=940155&r2=940156&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
Sun May  2 03:42:30 2010
@@ -24,8 +24,8 @@
     <!-- 
      ###################################################################################################################
      ##                                                                                 
                             ##
-     ## Geronimo Runtime Type - Define a 3.0 version of the Geronimo runtime-type along with
the list of module types ##
-     ##                         that it supports                                        
                             ##
+     ## Server Runtime Environments - Define a 3.0 version of the Geronimo runtime type along
with the list of module ##
+     ##                               types that it supports                            
                             ##
      ##                                                                                 
                             ##
      ###################################################################################################################
      -->
@@ -52,11 +52,7 @@
     <!-- 
      ###################################################################################################################
      ##                                                                                 
                             ##
-     ## Geronimo Server Type - Define a Geronimo server-type for the Geronimo runtime-type
defined above. In this     ##
-     ##                        case the Geronimo server is simply an instance of the Geronimo
runtime. The two are    ##
-     ##                        associated by the runtimeTypeid in the server, and the id
of the runtime type. The     ##
-     ##                        runtime-type could also have been a GenericServerRuntime,
but we have implemented our  ##
-     ##                        own.                                                     
                             ##
+     ## Server Configuration - Define a Geronimo server type for the Geronimo runtime type
                           ##
      ##                                                                                 
                             ##
      ###################################################################################################################
      -->
@@ -84,9 +80,9 @@
     <!-- 
      ###################################################################################################################
      ##                                                                                 
                             ##
-     ## Geronimo Runtime Target Handler - Define a runtime target handler for the Geronimo
runtime-type defined       ##
-     ##                                   above. This class will provide the libraries required
for the development   ##
-     ##                                   of a Web project targeted for the Geronimo runtime
type.                    ##
+     ## Runtime Target Handler - Define a runtime target handler for the Geronimo runtime
type. This class will       ##
+     ##                          provide the libraries required for the development of a
Web project targeted for the ##
+     ##                          Geronimo runtime type.                                 
                             ##
      ##                                                                                 
                             ##
      ###################################################################################################################
      -->
@@ -101,7 +97,7 @@
     <!-- 
      ###################################################################################################################
      ##                                                                                 
                             ##
-     ## Geronimo Runtime Component - Define a Java EE runtime-component and the facets it
supports                    ##
+     ## JEE Runtime Component - Define a Java EE runtime component and the facets it supports
                        ##
      ##                                                                                 
                             ##
      ###################################################################################################################
      -->
@@ -132,7 +128,7 @@
     <!-- 
      ###################################################################################################################
      ##                                                                                 
                             ##
-     ## Geronimo Runtime Component - Define a OSGi runtime-component and the facets it supports
                      ##
+     ## OSGi Runtime Component - Define a OSGi runtime component and the facets it supports
                          ##
      ##                                                                                 
                             ##
      ###################################################################################################################
      -->
@@ -159,8 +155,7 @@
     <!-- 
      ###################################################################################################################
      ##                                                                                 
                             ##
-     ## Geronimo Runtime Facet Mapping - Map the runtime-component defined above with the
Geronimo runtime-type also  ##
-     ##                                  defined above                                  
                             ##
+     ## Runtime Facet Mapping - Map the JEE and OSGi runtime components with the Geronimo
runtime type                ##
      ##                                                                                 
                             ##
      ###################################################################################################################
      -->
@@ -180,13 +175,13 @@
     <!-- 
      ###################################################################################################################
      ##                                                                                 
                             ##
-     ## Geronimo Default Facets - Map the runtime-component defined above to a specific version
of the "Geronimo      ##
-     ##                           Java EE Deployment" project facet                     
                             ##
+     ## Default Facets - Map the JEE runtime component to a specific version of the "Geronimo
Java EE Deployment"     ##
+     ##                  project facet                                                  
                             ##
      ##                                                                                 
                             ##
      ## Note(s) - This will force the selection of this facet without explicit input from
the user                    ##
      ##                                                                                 
                             ##
-     ##         - Multiple entries are required to prevent the Geronimo Java EE Deployment
facet from being the       ##
-     ##           default for OSGi projects                                             
                             ##
+     ##         - Multiple entries are required to prevent the "Geronimo Java EE Deployment"
project facet from being ##
+     ##           the default for OSGi projects                                         
                             ##
      ##                                                                                 
                             ##
      ###################################################################################################################
      -->
@@ -262,10 +257,10 @@
     <!-- 
      ###################################################################################################################
      ##                                                                                 
                             ##
-     ## Geronimo Facets - Declare the 1.3 version of the "Geronimo Java EE Deployment" project-facet
and the action   ##
-     ##                   that the user can perform on the facet (i.e., install, uninstall,
version-change). This     ##
-     ##                   will invoke the FacetInstallPage wizard to configure the Geronimo
Deployment Plan for the   ##
-     ##                   Java EE project when it is created.                           
                             ##
+     ## Project Facets - Declare the 1.3 version of the "Geronimo Java EE Deployment" project-facet
and the action    ##
+     ##                  that the user can perform on the facet (i.e., install, uninstall,
version-change). This      ##
+     ##                  will invoke the FacetInstallPage wizard to configure the Geronimo
Deployment Plan for the    ##
+     ##                  Java EE project when it is created.                            
                             ##
      ##                                                                                 
                             ##
      ## Note(s) - The id associated with that action must be unique across all plugins because
the wizardPages        ##
      ##           extension point will reference this action by the id (in the corrsponding
ui plugin)                ##
@@ -322,7 +317,7 @@
     <!-- 
      ###################################################################################################################
      ##                                                                                 
                             ##
-     ## Geronimo Server Source Path                                                     
                             ##
+     ## Server Source Path                                                              
                             ##
      ##                                                                                 
                             ##
      ###################################################################################################################
      -->
@@ -349,7 +344,7 @@
     <!-- 
      ###################################################################################################################
      ##                                                                                 
                             ##
-     ## Geronimo Server Launch Test                                                     
                             ##
+     ## Server Launch Test                                                              
                             ##
      ##                                                                                 
                             ##
      ###################################################################################################################
      -->

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=940156&r1=940155&r2=940156&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
Sun May  2 03:42:30 2010
@@ -37,6 +37,9 @@ import org.eclipse.wst.server.core.IModu
 import org.eclipse.wst.server.core.util.SocketUtil;
 
 /**
+ * <b>GeronimoServer</b> is the implementation of the Geronimo Server Configuration
defined in the
+ * org.apache.geronimo.st.v30.core plugin
+ * 
  * @version $Rev$ $Date$
  */
 public class GeronimoServer extends GeronimoServerDelegate {
@@ -116,7 +119,7 @@ public class GeronimoServer extends Gero
         
         // 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);
+        String karafArgs = "-Dkaraf.startLocalConsole=false -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);

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=940156&r1=940155&r2=940156&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
Sun May  2 03:42:30 2010
@@ -63,8 +63,8 @@
     <!-- 
      ###################################################################################################################
      ##                                                                                 
                             ##
-     ## Geronimo Facets - Map the action defined for the "Geronimo Java EE Deployment" project-facet
to a specific    ##
-     ##                   wizard class. The action must have been defined in the corresponding
core plugin.           ## 
+     ## Project Facets - Map the action defined for the "Geronimo Java EE Deployment" project-facet
to a specific     ##
+     ##                  wizard class. The action must have been defined in the corresponding
core plugin.            ## 
      ##                                                                                 
                             ##
      ###################################################################################################################
      -->
@@ -79,8 +79,8 @@
     <!-- 
      ###################################################################################################################
      ##                                                                                 
                             ##
-     ## Geronimo Facets - Define the icon for the Geronimo Jave EE and OSGi facets. The runtime
component must have   ##
-     ##                   been defined in the corresponding core plugin.                
                             ##
+     ## Project Facets - Define the icon for the Geronimo Java EE and OSGi facets. The runtime
component must have    ##
+     ##                  been defined in the corresponding core plugin.                 
                             ##
      ##                                                                                 
                             ##
      ###################################################################################################################
      -->
@@ -178,8 +178,8 @@
     <!-- 
      ###################################################################################################################
      ##                                                                                 
                             ##
-     ## Geronimo Server Launch Configuration Tabs - Displays when the users selects "Open
launch configuration" from  ##
-     ##                                             the ServerEditorTestEnvSection defined
above                      ##
+     ## Launch Configuration Properties - Displays when the users selects "Open launch configuration"
from the        ##
+     ##                                   the ServerEditorTestEnvSection defined above  
                             ##
      ##                                                                                 
                             ##
      ###################################################################################################################
      -->
@@ -204,8 +204,8 @@
     <!-- 
      ###################################################################################################################
      ##                                                                                 
                             ##
-     ## Geronimo Server - Define the schemas for the LaunchGeronimoConsoleAction and LaunchGeronimoSupportAction
menu ##
-     ##                   actions from the Server view when right clicking              
                             ##
+     ## Popup Menu - Define the schemas for the LaunchGeronimoConsoleAction and LaunchGeronimoSupportAction
menu      ##
+     ##              actions for the popup menu when right clicking on the server in the
Server View                  ##
      ##                                                                                 
                             ##
      ###################################################################################################################
      -->
@@ -220,14 +220,14 @@
     <extension point="org.eclipse.ui.popupMenus">
         <objectContribution
                 adaptable="true"
-                id="org.apache.geronimo.ui.serveractions"
+                id="org.apache.geronimo.ui.serveractions.30"
                 objectClass="org.eclipse.wst.server.core.IServer">
             <enablement>
                 <test forcePluginActivation="true"
                     property="org.eclipse.wst.server.ui.serverType"
                     value="org.apache.geronimo.server.3*" />
             </enablement>
-            <action id="org.apache.geronimo.ui.launchSupport"
+            <action id="org.apache.geronimo.ui.launchSupport.30"
                 label="%PopupMenus.launchSupport" icon="icons/obj16/littleG.gif"
                 class="org.apache.geronimo.st.v30.ui.actions.LaunchGeronimoSupportAction"
                 enablesFor="1">
@@ -238,14 +238,14 @@
     <extension point="org.eclipse.ui.popupMenus">
         <objectContribution
                 adaptable="true"
-                id="org.apache.geronimo.ui.serveractions"
+                id="org.apache.geronimo.ui.serveractions.30"
                 objectClass="org.eclipse.wst.server.core.IServer">
             <enablement>
                 <test forcePluginActivation="true"
                     property="org.eclipse.wst.server.ui.serverType"
                     value="org.apache.geronimo.server.3*" />
             </enablement>
-            <action id="org.apache.geronimo.ui.launchconsole"
+            <action id="org.apache.geronimo.ui.launchconsole.30"
                 label="%PopupMenus.launchconsole" icon="icons/obj16/littleG.gif"
                 class="org.apache.geronimo.st.v30.ui.actions.LaunchGeronimoConsoleAction"
                 enablesFor="1">



Mime
View raw message