geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1227941 - in /geronimo/server/trunk: framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo...
Date Fri, 06 Jan 2012 02:39:08 GMT
Author: djencks
Date: Fri Jan  6 02:39:08 2012
New Revision: 1227941

URL: http://svn.apache.org/viewvc?rev=1227941&view=rev
Log:
GERONIMO-6251 work on geronimo-maven-plugin. Use jmxrmi connector from karaf, add DeployerGBean
in (slightly inappropriate) j2ee-deployer

Added:
    geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeployerGBean.java
  (with props)
Modified:
    geronimo/server/trunk/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ServerProxy.java
    geronimo/server/trunk/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
    geronimo/server/trunk/framework/configs/j2ee-security/pom.xml
    geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml
    geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/BaseDeploymentFactory.java
    geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StopServer.java
    geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/ServerProxy.java
    geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml

Modified: geronimo/server/trunk/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ServerProxy.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ServerProxy.java?rev=1227941&r1=1227940&r2=1227941&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ServerProxy.java
(original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ServerProxy.java
Fri Jan  6 02:39:08 2012
@@ -74,7 +74,7 @@ public class ServerProxy
     }
 
     public ServerProxy(final String hostname, final int port, final String username, final
String password) throws Exception {
-        this("service:jmx:rmi://" + hostname + "/jndi/rmi://" + hostname + ":" + port + "/JMXConnector",
username, password);
+        this("service:jmx:rmi://" + hostname + "/jndi/rmi://" + hostname + ":" + port + "/jmxrmi",
username, password);
     }
 
     public ServerProxy(final String url, final String username, final String password) throws
Exception {

Modified: geronimo/server/trunk/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java?rev=1227941&r1=1227940&r2=1227941&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
(original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
Fri Jan  6 02:39:08 2012
@@ -174,7 +174,7 @@ public class StartServerMojo
 
         // Setup the JVM to start the server with
         final Java java = (Java)createTask("java");
-        java.setClassname("org.apache.geronimo.cli.daemon.DaemonCLI");
+        java.setClassname("org.apache.karaf.main.Main");
         Path path = java.createClasspath();
         File libDir = new File(geronimoHome, "lib");
         FileSet fileSet = new FileSet();

Modified: geronimo/server/trunk/framework/configs/j2ee-security/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/pom.xml?rev=1227941&r1=1227940&r2=1227941&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-security/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-security/pom.xml Fri Jan  6 02:39:08 2012
@@ -106,7 +106,7 @@
                                     <attribute name="protocol">rmi</attribute>
                                     <attribute name="host">#{ServerHostname}</attribute>
                                     <attribute name="port">#{JMXPort + PortOffset}</attribute>
-                                    <attribute name="urlPath">/jndi/rmi://#{ServerHostname}:#{NamingPort
+ PortOffset}/JMXConnector</attribute>
+                                    <attribute name="urlPath">/jndi/rmi://#{ServerHostname}:#{NamingPort
+ PortOffset}/jmxrmi</attribute>
                                 </gbean>
                              </config-xml-content>
                             <config-substitution key="JMXPort">9999</config-substitution>

Modified: geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml?rev=1227941&r1=1227940&r2=1227941&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml Fri Jan 
6 02:39:08 2012
@@ -40,7 +40,7 @@
         <attribute name="protocol">rmi</attribute>
         <attribute name="host">${planServerHostname}</attribute>
         <attribute name="port">${planJMXPort}</attribute>
-        <attribute name="urlPath">/jndi/rmi://${planServerHostname}:${planNamingPort}/JMXConnector</attribute>
+        <attribute name="urlPath">/jndi/rmi://${planServerHostname}:${planNamingPort}/jmxrmi</attribute>
         <attribute name="applicationConfigName">geronimo-admin</attribute>
         <reference name="MBeanServerReference">
             <name>MBeanServerReference</name>

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/BaseDeploymentFactory.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/BaseDeploymentFactory.java?rev=1227941&r1=1227940&r2=1227941&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/BaseDeploymentFactory.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/BaseDeploymentFactory.java
Fri Jan  6 02:39:08 2012
@@ -167,7 +167,7 @@ public class BaseDeploymentFactory imple
         String[] credentials = new String[]{username, password};
         environment.put(JMXConnector.CREDENTIALS, credentials);
         environment.put(JMXConnectorFactory.DEFAULT_CLASS_LOADER, BaseDeploymentFactory.class.getClassLoader());
-        String connectorName = "/JMXConnector";
+        String connectorName = "/jmxrmi";
         if (params.isSecure()) {
             connectorName = "/JMXSecureConnector";
             SslRMIClientSocketFactory csf = new SslRMIClientSocketFactory();

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StopServer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StopServer.java?rev=1227941&r1=1227940&r2=1227941&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StopServer.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-tool/src/main/java/org/apache/geronimo/deployment/cli/StopServer.java
Fri Jan  6 02:39:08 2012
@@ -144,7 +144,7 @@ public class StopServer implements Main 
     public MBeanServerConnection getMBeanServerConnection() throws Exception {
         Map<String, Object> map = new HashMap<String, Object>();
         map.put(JMXConnector.CREDENTIALS, new String[] { user, password });
-        String connectorName = "/JMXConnector";
+        String connectorName = "/jmxrmi";
         if (secure) {
             connectorName = "/JMXSecureConnector";
             SslRMIClientSocketFactory csf = new SslRMIClientSocketFactory();

Added: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeployerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeployerGBean.java?rev=1227941&view=auto
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeployerGBean.java
(added)
+++ geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeployerGBean.java
Fri Jan  6 02:39:08 2012
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+
+package org.apache.geronimo.deployment;
+
+import java.io.File;
+import java.util.List;
+
+import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.gbean.annotation.GBean;
+import org.apache.geronimo.gbean.annotation.ParamSpecial;
+import org.apache.geronimo.gbean.annotation.SpecialAttributeType;
+import org.apache.geronimo.gbean.wrapper.AbstractServiceWrapper;
+import org.osgi.framework.Bundle;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+@GBean
+public class DeployerGBean extends AbstractServiceWrapper<Deployer> implements Deployer
{
+
+    public DeployerGBean(@ParamSpecial(type = SpecialAttributeType.bundle)final Bundle bundle)
{
+        super(bundle, Deployer.class);
+    }
+
+    @Override
+    public List<String> deploy(boolean inPlace, File moduleFile, File planFile) throws
DeploymentException {
+        return get().deploy(inPlace, moduleFile, planFile);
+    }
+
+    @Override
+    public List<String> deploy(boolean inPlace, File moduleFile, File planFile, String
targetConfigStore) throws DeploymentException {
+        return get().deploy(inPlace,  moduleFile, planFile, targetConfigStore);
+    }
+
+    @Override
+    public String getRemoteDeployUploadURL() {
+        return get().getRemoteDeployUploadURL();
+    }
+
+    @Override
+    public List<String> deploy(boolean inPlace, File moduleFile, File planFile, File
targetFile, boolean install, String mainClass, String mainGBean, String mainMethod, String
manifestConfigurations, String classPath, String endorsedDirs, String extensionDirs, String
targetConfigurationStore) throws DeploymentException {
+        return get().deploy(inPlace, moduleFile, planFile, targetFile, install, mainClass,
mainGBean, mainMethod, manifestConfigurations, classPath, endorsedDirs, extensionDirs, targetConfigurationStore);
+    }
+}

Propchange: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeployerGBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeployerGBean.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/DeployerGBean.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/ServerProxy.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/ServerProxy.java?rev=1227941&r1=1227940&r2=1227941&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/ServerProxy.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-base/src/main/java/org/apache/geronimo/shell/geronimo/ServerProxy.java
Fri Jan  6 02:39:08 2012
@@ -109,7 +109,7 @@ public class ServerProxy
     }
     
     private static String createJMXServiceURL(String hostname, int port, boolean secure)
{
-        String connectorName = (secure) ? "/JMXSecureConnector" : "/JMXConnector";
+        String connectorName = (secure) ? "/JMXSecureConnector" : "/jmxrmi";
         return "service:jmx:rmi://" + hostname + "/jndi/rmi://" + hostname + ":" + port +
connectorName;
     }
     

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml?rev=1227941&r1=1227940&r2=1227941&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-deployer/src/main/plan/plan.xml Fri Jan  6 02:39:08
2012
@@ -20,6 +20,8 @@
 
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
 
+    <gbean name="Deployer" class="org.apache.geronimo.deployment.DeployerGBean"/>
+
     <gbean name="EARBuilder" class="org.apache.geronimo.j2ee.deployment.EARConfigBuilder">
         <attribute name="transactionManagerAbstractName">?name=TransactionManager</attribute>
         <attribute name="connectionTrackerAbstractName">?name=ConnectionTracker</attribute>



Mime
View raw message