You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jl...@apache.org on 2008/08/14 16:13:24 UTC
svn commit: r685907 - in /geronimo/sandbox/geronimo-netbeans-plugin:
nbproject/ src/org/apache/geronimo/netbeans/
src/org/apache/geronimo/netbeans/config/
src/org/apache/geronimo/netbeans/resources/
Author: jlaskowski
Date: Thu Aug 14 07:13:23 2008
New Revision: 685907
URL: http://svn.apache.org/viewvc?rev=685907&view=rev
Log:
Webapp deployment is almost done - 'client.url missing' exception is thrown, but it is because TargetModule.getWebURL() returns null (should be non-null value, but can't work on it now and hence the commit to save what's already done)
Added:
geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/config/GeronimoWebModuleConfiguration.java (with props)
Modified:
geronimo/sandbox/geronimo-netbeans-plugin/nbproject/project.xml
geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoDeploymentFactory.java
geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoDeploymentManager.java
geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoInstantiatingIterator.java
geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoOptionalDeploymentManagerFactory.java
geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoPluginUtils.java
geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/config/GeronimoModuleConfigurationFactory.java
geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/resources/layer.xml
geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/resources/nbdep.xml
Modified: geronimo/sandbox/geronimo-netbeans-plugin/nbproject/project.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/nbproject/project.xml?rev=685907&r1=685906&r2=685907&view=diff
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/nbproject/project.xml (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/nbproject/project.xml Thu Aug 14 07:13:23 2008
@@ -34,6 +34,15 @@
</run-dependency>
</dependency>
<dependency>
+ <code-name-base>org.netbeans.libs.commons_logging</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.7</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
<code-name-base>org.netbeans.modules.j2ee.dd</code-name-base>
<build-prerequisite/>
<compile-dependency/>
Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoDeploymentFactory.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoDeploymentFactory.java?rev=685907&r1=685906&r2=685907&view=diff
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoDeploymentFactory.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoDeploymentFactory.java Thu Aug 14 07:13:23 2008
@@ -16,9 +16,7 @@
*/
package org.apache.geronimo.netbeans;
-import java.net.URL;
import java.net.URLClassLoader;
-import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
@@ -40,7 +38,6 @@
java.util.logging.Logger.getLogger("org.apache.geronimo.deployment.plugin.factories").setLevel(java.util.logging.Level.FINEST);
}
public static final String URI_PREFIX = "deployer:geronimo";
- //private static final String DEPLOYMENT_FACTORY_CLASS_NAME = "org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl";
private static final String DEPLOYMENT_FACTORY_CLASS_NAME = "org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryBootstrapper";
private static final Logger LOGGER = Logger.getLogger(GeronimoDeploymentFactory.class.getName());
private static DeploymentFactory instance;
Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoDeploymentManager.java?rev=685907&r1=685906&r2=685907&view=diff
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoDeploymentManager.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoDeploymentManager.java Thu Aug 14 07:13:23 2008
@@ -35,6 +35,7 @@
import javax.enterprise.deploy.spi.exceptions.TargetException;
import javax.enterprise.deploy.spi.factories.DeploymentFactory;
import javax.enterprise.deploy.spi.status.ProgressObject;
+import javax.naming.Context;
import org.netbeans.modules.j2ee.deployment.plugins.api.InstanceProperties;
import org.openide.util.Exceptions;
@@ -53,7 +54,7 @@
private String username;
private String password;
private InstanceProperties instanceProperties;
- private static final Logger LOGGER = Logger.getLogger(GeronimoDeploymentFactory.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(GeronimoDeploymentManager.class.getName());
public GeronimoDeploymentManager(DeploymentFactory df, String uri, String username, String password, boolean connected) throws DeploymentManagerCreationException {
this.df = df;
@@ -81,11 +82,13 @@
private void openWrappedDeploymentFactory() throws DeploymentManagerCreationException {
assert df != null : "Wrapped deployment factory must not be null";
+ System.setProperty(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.rmi.registry.RegistryContextFactory");
LOGGER.log(Level.FINE, "About to create" + (connected ? "" : " disconnected") + " deployment manager");
if (dm == null) {
LOGGER.log(Level.FINE, "Creating" + (connected ? "" : " disconnected") + " deployment manager");
if (connected) {
// FIXME: A hack to handle jmx geronimo dm to contact the server when jmx url is in used (inVM is temporarily the default)
+ LOGGER.log(Level.FINE, " deployment manager with username=" + username + " and password=" + password);
dm = df.getDeploymentManager(GeronimoDeploymentFactory.URI_PREFIX + ":" + "jmx", this.username, this.password);
} else {
dm = df.getDisconnectedDeploymentManager(this.uri);
Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoInstantiatingIterator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoInstantiatingIterator.java?rev=685907&r1=685906&r2=685907&view=diff
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoInstantiatingIterator.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoInstantiatingIterator.java Thu Aug 14 07:13:23 2008
@@ -59,7 +59,7 @@
String port = "1099";
// FIXME: It relies on the defaults of JMX protocol hangling of BaseDeploymentFactory
// See framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/factories/BaseDeploymentFactory.java::parseURI
- String url = GeronimoDeploymentFactory.URI_PREFIX + ":" + "inVM";
+ String url = GeronimoDeploymentFactory.URI_PREFIX + ":" + "jmx://" + hostname + ":" + port;
try {
InstanceProperties ip = InstanceProperties.createInstanceProperties(url, username, password, displayName);
ip.setProperty(GeronimoPluginProperties.PROPERTY_SERVER_DIR, installLocation);
Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoOptionalDeploymentManagerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoOptionalDeploymentManagerFactory.java?rev=685907&r1=685906&r2=685907&view=diff
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoOptionalDeploymentManagerFactory.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoOptionalDeploymentManagerFactory.java Thu Aug 14 07:13:23 2008
@@ -30,26 +30,26 @@
*/
public class GeronimoOptionalDeploymentManagerFactory extends OptionalDeploymentManagerFactory {
- private static final Logger logger = Logger.getLogger(GeronimoOptionalDeploymentManagerFactory.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(GeronimoOptionalDeploymentManagerFactory.class.getName());
public StartServer getStartServer(DeploymentManager dm) {
- logger.log(Level.FINE, "getStartServer called " + dm);
+ LOGGER.log(Level.FINE, "getStartServer called " + dm);
return new GeronimoStartServer(dm);
}
public IncrementalDeployment getIncrementalDeployment(DeploymentManager dm) {
- logger.log(Level.FINE, "getIncrementalDeployment called");
+ LOGGER.log(Level.FINE, "getIncrementalDeployment called");
return null;
}
public FindJSPServlet getFindJSPServlet(DeploymentManager dm) {
- logger.log(Level.FINE, "getFindJSPServlet called");
+ LOGGER.log(Level.FINE, "getFindJSPServlet called");
return null;
}
@Override
public WizardDescriptor.InstantiatingIterator getAddInstanceIterator() {
- logger.log(Level.FINE, "getAddInstanceIterator called");
+ LOGGER.log(Level.FINE, "getAddInstanceIterator called");
return new GeronimoInstantiatingIterator();
}
}
Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoPluginUtils.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoPluginUtils.java?rev=685907&r1=685906&r2=685907&view=diff
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoPluginUtils.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/GeronimoPluginUtils.java Thu Aug 14 07:13:23 2008
@@ -63,6 +63,7 @@
serverRequirements.add("bin");
serverRequirements.add("lib");
serverRequirements.add("repository");
+ serverRequirements.add("repository");
serverRequirements.add("schema");
serverRequirements.add("var");
serverRequirements.add("bin/deployer.jar");
@@ -167,7 +168,7 @@
env.put(JMXConnector.CREDENTIALS, credentials);
// FIXME: Create the JMXServiceURL based on information provided by user - hostname and port
- JMXServiceURL address = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost/JMXConnector");
+ JMXServiceURL address = new JMXServiceURL("service:jmx:rmi://localhost/jndi/rmi://localhost:1099/JMXConnector");
JMXConnector jmxConnector = JMXConnectorFactory.connect(address, env);
rmiServer = jmxConnector.getMBeanServerConnection();
} finally {
@@ -183,38 +184,31 @@
}
URLClassLoader loader = null;
try {
- List<URL> urlList = new ArrayList<URL>();
-
-// urlList.add(new File(serverRoot + "/lib/geronimo-deploy-jsr88-bootstrapper-2.1.1.jar").toURI().toURL());
-// urlList.add(new File(serverRoot + "/lib/geronimo-kernel-2.1.1.jar").toURI().toURL());
-// urlList.add(new File(serverRoot + "/lib/asm-2.2.3.jar").toURI().toURL());
-// urlList.add(new File(serverRoot + "/lib/asm-commons-2.2.3.jar").toURI().toURL());
-// urlList.add(new File(serverRoot + "/lib/cglib-nodep-2.1_3.jar").toURI().toURL());
-// urlList.add(new File(serverRoot + "/lib/log4j-1.2.14.jar").toURI().toURL());
-// urlList.add(new File(serverRoot + "/lib/xpp3-1.1.3.4.O.jar").toURI().toURL());
-// urlList.add(new File(serverRoot + "/lib/xstream-1.2.2.jar").toURI().toURL());
-// // org.apache.commons.logging.LogConfigurationException: Invalid class loader hierarchy. You have more than one version of 'org.apache.commons.logging.Log' visible, which is not allowed.
-// urlList.add(new File(serverRoot + "/lib/commons-logging-1.0.4.jar").toURI().toURL());
- // Class-Path causes troubles due to commons-logging
- urlList.add(new File(serverRoot + "/lib/jsr88-deploymentfactory.jar").toURI().toURL());
-// urlList.add(new File(serverRoot + "/repository/org/apache/geronimo/specs/geronimo-stax-api_1.0_spec/1.0.1/geronimo-stax-api_1.0_spec-1.0.1.jar").toURI().toURL());
-// urlList.add(new File(serverRoot + "/repository/org/apache/geronimo/specs/geronimo-javaee-deployment_1.1MR3_spec/1.0/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar").toURI().toURL());
-// urlList.add(new File(serverRoot + "/lib/cglib-nodep-2.1_3.jar").toURI().toURL());
-// urlList.add(new File(serverRoot + "/lib/geronimo-transformer-2.1.1.jar").toURI().toURL());
-
+ // jacek: Don't really know what it does, but it has not caused any harm so far
System.setProperty("Xorg.apache.geronimo.gbean.NoProxy", "false");
+ List<URL> urlList = new ArrayList<URL>();
+// urlList.add(new File(serverRoot + "/repository/org/apache/geronimo/framework/geronimo-common/2.1.2/geronimo-common-2.1.2.jar").toURI().toURL());
+// urlList.add(new File(serverRoot + "/repository/org/apache/geronimo/framework/geronimo-crypto/2.1.2/geronimo-crypto-2.1.2.jar").toURI().toURL());
+// urlList.add(new File(serverRoot + "/repository/org/apache/geronimo/framework/geronimo-deploy-config/2.1.2/geronimo-deploy-config-2.1.2.jar").toURI().toURL());
+// urlList.add(new File(serverRoot + "/repository/org/apache/geronimo/framework/geronimo-deploy-jsr88/2.1.2/geronimo-deploy-jsr88-2.1.2.jar").toURI().toURL());
+// urlList.add(new File(serverRoot + "/repository/org/apache/geronimo/framework/geronimo-deployment/2.1.2/geronimo-deployment-2.1.2.jar").toURI().toURL());
+// urlList.add(new File(serverRoot + "/repository/org/apache/geronimo/modules/geronimo-j2ee-schema/2.1.2/geronimo-j2ee-schema-2.1.2.jar").toURI().toURL());
+// urlList.add(new File(serverRoot + "/repository/org/apache/geronimo/specs/geronimo-javaee-deployment_1.1MR3_spec/1.0/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar").toURI().toURL());
+// urlList.add(new File(serverRoot + "/lib/geronimo-kernel-2.1.2.jar").toURI().toURL());
+// urlList.add(new File(serverRoot + "/repository/org/apache/geronimo/framework/geronimo-plugin/2.1.2/geronimo-plugin-2.1.2.jar").toURI().toURL());
+// urlList.add(new File(serverRoot + "/repository/org/apache/geronimo/framework/geronimo-system/2.1.2/geronimo-system-2.1.2.jar").toURI().toURL());
+// urlList.add(new File(serverRoot + "/lib/plexus-archiver-1.0-alpha-7.jar").toURI().toURL());
+
+ urlList.add(new File(serverRoot + "/lib/jsr88-deploymentfactory.jar").toURI().toURL());
+
loader = new GeronimoClassLoader(urlList.toArray(new URL[urlList.size()]), GeronimoDeploymentFactory.class.getClassLoader());
- LOGGER.log(Level.FINE, "GeronimoClassLoader.getURLs()=" + Arrays.asList(loader.getURLs()));
} catch (Exception e) {
LOGGER.log(Level.WARNING, e.getLocalizedMessage(), e);
}
return loader;
}
- static class Empty {
- }
-
/**
* Borrowed from Geronimo Eclipse Plugin (GEP)
*
Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/config/GeronimoModuleConfigurationFactory.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/config/GeronimoModuleConfigurationFactory.java?rev=685907&r1=685906&r2=685907&view=diff
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/config/GeronimoModuleConfigurationFactory.java (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/config/GeronimoModuleConfigurationFactory.java Thu Aug 14 07:13:23 2008
@@ -16,6 +16,8 @@
*/
package org.apache.geronimo.netbeans.config;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
import org.netbeans.modules.j2ee.deployment.plugins.spi.config.ModuleConfiguration;
@@ -28,21 +30,28 @@
*/
public class GeronimoModuleConfigurationFactory implements ModuleConfigurationFactory {
- public ModuleConfiguration create(final J2eeModule j2eeModule) throws ConfigurationException {
- return new ModuleConfiguration() {
+ private static final Logger LOGGER = Logger.getLogger(GeronimoModuleConfigurationFactory.class.getName());
- public Lookup getLookup() {
- return Lookups.fixed(this);
- }
-
- public J2eeModule getJ2eeModule() {
- return j2eeModule;
- }
-
- public void dispose() {
- }
-
- };
+ public ModuleConfiguration create(final J2eeModule j2eeModule) throws ConfigurationException {
+ LOGGER.log(Level.FINE, "create(" + j2eeModule + ")");
+ if (J2eeModule.WAR == j2eeModule.getModuleType()) {
+ LOGGER.log(Level.FINE, "WAR module type is supported");
+ return new GeronimoWebModuleConfiguration(j2eeModule);
+ } else {
+ LOGGER.log(Level.FINE, "This module type is NOT supported yet");
+ return new ModuleConfiguration() {
+
+ public Lookup getLookup() {
+ return Lookups.fixed(this);
+ }
+
+ public J2eeModule getJ2eeModule() {
+ return j2eeModule;
+ }
+
+ public void dispose() {
+ }
+ };
+ }
}
-
}
Added: geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/config/GeronimoWebModuleConfiguration.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/config/GeronimoWebModuleConfiguration.java?rev=685907&view=auto
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/config/GeronimoWebModuleConfiguration.java (added)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/config/GeronimoWebModuleConfiguration.java Thu Aug 14 07:13:23 2008
@@ -0,0 +1,60 @@
+/**
+ * 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.netbeans.config;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.netbeans.modules.j2ee.deployment.common.api.ConfigurationException;
+import org.netbeans.modules.j2ee.deployment.devmodules.api.J2eeModule;
+import org.netbeans.modules.j2ee.deployment.plugins.spi.config.ContextRootConfiguration;
+import org.netbeans.modules.j2ee.deployment.plugins.spi.config.ModuleConfiguration;
+import org.openide.util.Lookup;
+import org.openide.util.lookup.Lookups;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class GeronimoWebModuleConfiguration implements ModuleConfiguration, ContextRootConfiguration {
+
+ private J2eeModule j2eeModule;
+ private String contextRoot;
+ private static final Logger LOGGER = Logger.getLogger(GeronimoWebModuleConfiguration.class.getName());
+
+ public GeronimoWebModuleConfiguration(J2eeModule j2eeModule) {
+ this.j2eeModule = j2eeModule;
+ }
+
+ public Lookup getLookup() {
+ return Lookups.fixed(this);
+ }
+
+ public J2eeModule getJ2eeModule() {
+ return this.j2eeModule;
+ }
+
+ public void dispose() {
+ }
+
+ public String getContextRoot() throws ConfigurationException {
+ return this.contextRoot;
+ }
+
+ public void setContextRoot(String contextRoot) throws ConfigurationException {
+ LOGGER.log(Level.FINE, "ContextRoot: " + contextRoot);
+ this.contextRoot = contextRoot;
+ }
+}
Propchange: geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/config/GeronimoWebModuleConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/config/GeronimoWebModuleConfiguration.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/config/GeronimoWebModuleConfiguration.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/config/GeronimoWebModuleConfiguration.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/resources/layer.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/resources/layer.xml?rev=685907&r1=685906&r2=685907&view=diff
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/resources/layer.xml (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/resources/layer.xml Thu Aug 14 07:13:23 2008
@@ -47,7 +47,7 @@
<attr name="instanceClass" stringvalue="org.apache.geronimo.netbeans.GeronimoOptionalDeploymentManagerFactory" />
<attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.OptionalDeploymentManagerFactory" />
</file>
- <file name="GeronimoModuleConfigurationFactory.instance">
+ <file name="ModuleConfigurationFactory.instance">
<attr name="instanceClass" stringvalue="org.apache.geronimo.netbeans.config.GeronimoModuleConfigurationFactory"/>
<attr name="instanceOf" stringvalue="org.netbeans.modules.j2ee.deployment.plugins.spi.config.ModuleConfigurationFactory"/>
</file>
Modified: geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/resources/nbdep.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/resources/nbdep.xml?rev=685907&r1=685906&r2=685907&view=diff
==============================================================================
--- geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/resources/nbdep.xml (original)
+++ geronimo/sandbox/geronimo-netbeans-plugin/src/org/apache/geronimo/netbeans/resources/nbdep.xml Thu Aug 14 07:13:23 2008
@@ -19,7 +19,7 @@
<!-- $Rev$ $Date$ -->
<netbeans-deployment>
- <disconnected-string>deployer:geronimo:inVM</disconnected-string>
+ <disconnected-string>deployer:geronimo:jmx</disconnected-string>
<web-context-root>
<xpath>/</xpath>
<prop-name>contextRoot</prop-name>