6:41 a.m.
Author: rob.stryker(a)jboss.com
Date: 2011-11-25 07:41:44 -0500 (Fri, 25 Nov 2011)
New Revision: 36659
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.71.default.ports.properties
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/BehaviourModel.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/IJBoss7ManagerService.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7DeploymentState.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerServiceProxy.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManangerConnectException.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManangerException.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/JBoss7ManagerService.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties
Log:
JBIDE-10224
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2011-11-25
12:35:34 UTC (rev 36658)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2011-11-25
12:41:44 UTC (rev 36659)
@@ -267,6 +267,7 @@
rtToPortsFile.put(IConstants.AS_51,
properties.append(IJBossToolingConstants.DEFAULT_PROPS_51));
rtToPortsFile.put(IConstants.AS_60,
properties.append(IJBossToolingConstants.DEFAULT_PROPS_60));
rtToPortsFile.put(IConstants.AS_70,
properties.append(IJBossToolingConstants.DEFAULT_PROPS_70));
+ rtToPortsFile.put(IConstants.AS_71,
properties.append(IJBossToolingConstants.DEFAULT_PROPS_71));
rtToPortsFile.put(IConstants.EAP_43,
properties.append(IJBossToolingConstants.DEFAULT_PROPS_EAP_43));
rtToPortsFile.put(IConstants.EAP_50,
properties.append(IJBossToolingConstants.DEFAULT_PROPS_EAP_50));
rtToPortsFile.put(IConstants.EAP_60,
properties.append(IJBossToolingConstants.DEFAULT_PROPS_70));
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/BehaviourModel.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/BehaviourModel.java 2011-11-25
12:35:34 UTC (rev 36658)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/BehaviourModel.java 2011-11-25
12:41:44 UTC (rev 36659)
@@ -48,7 +48,7 @@
ArrayList<IJBossLaunchDelegate> list = new
ArrayList<IJBossLaunchDelegate>();
BehaviourImpl[] impls = beh.getImplementations();
for( int i = 0; i < impls.length; i++ ) {
- list.add(impls[i].getLaunchDelegate());
+ list.add(impls[i].createLaunchDelegate());
}
return list;
}
@@ -58,7 +58,7 @@
*/
public IJBossLaunchDelegate getLaunchDelegate(IServer server, String mode) {
Behaviour beh = map.get(server.getServerType().getId());
- return beh.getImpl(mode).getLaunchDelegate();
+ return beh.getImpl(mode).createLaunchDelegate();
}
protected void loadModel() {
@@ -126,9 +126,7 @@
private String name;
private String typeId;
private IConfigurationElement element;
- private IJBossLaunchDelegate launchDelegate;
private String supportedServers;
- private IJBossBehaviourDelegate behaviourDelegate = null;
public BehaviourImpl(IConfigurationElement element) {
this.element = element;
@@ -161,25 +159,18 @@
return null;
}
- public IJBossLaunchDelegate getLaunchDelegate() {
- if( launchDelegate != null)
- return launchDelegate;
-
+ public IJBossLaunchDelegate createLaunchDelegate() {
try {
- launchDelegate = (IJBossLaunchDelegate)
element.createExecutableExtension("launchDelegate"); //$NON-NLS-1$
- return launchDelegate;
+ return (IJBossLaunchDelegate)
element.createExecutableExtension("launchDelegate"); //$NON-NLS-1$
} catch( CoreException ce ) {
JBossServerCorePlugin.getInstance().getLog().log(ce.getStatus());
}
return null;
}
- public IJBossBehaviourDelegate getBehaviourDelegate() {
- if( behaviourDelegate != null )
- return behaviourDelegate;
+ public IJBossBehaviourDelegate createBehaviourDelegate() {
try {
- behaviourDelegate =
(IJBossBehaviourDelegate)element.createExecutableExtension("behaviourDelegate");
//$NON-NLS-1$
- return behaviourDelegate;
+ return
(IJBossBehaviourDelegate)element.createExecutableExtension("behaviourDelegate");
//$NON-NLS-1$
} catch(CoreException ce) {
JBossServerCorePlugin.getInstance().getLog().log(ce.getStatus());
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-11-25
12:35:34 UTC (rev 36658)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-11-25
12:41:44 UTC (rev 36659)
@@ -55,7 +55,7 @@
return delegate;
BehaviourImpl impl =
BehaviourModel.getModel().getBehaviour(getServer().getServerType().getId()).getImpl(id);
- IJBossBehaviourDelegate d = impl.getBehaviourDelegate();
+ IJBossBehaviourDelegate d = impl.createBehaviourDelegate();
d.setActualBehaviour(this);
lastModeId = id;
delegate = d;
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/IJBoss7ManagerService.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/IJBoss7ManagerService.java 2011-11-25
12:35:34 UTC (rev 36658)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/IJBoss7ManagerService.java 2011-11-25
12:41:44 UTC (rev 36659)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2011 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -7,7 +7,7 @@
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.v7.management;
import java.io.File;
@@ -19,7 +19,7 @@
public static final String AS_VERSION_PROPERTY = "as.version"; //$NON-NLS-1$
public static final String AS_VERSION_700 = "700"; //$NON-NLS-1$
-
+ public static final String AS_VERSION_710_Beta = "710.beta1"; //$NON-NLS-1$
public static final int MGMT_PORT = 9999;
/**
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7DeploymentState.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7DeploymentState.java 2011-11-25
12:35:34 UTC (rev 36658)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7DeploymentState.java 2011-11-25
12:41:44 UTC (rev 36659)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2011 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerServiceProxy.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerServiceProxy.java 2011-11-25
12:35:34 UTC (rev 36658)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerServiceProxy.java 2011-11-25
12:41:44 UTC (rev 36659)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2011 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -7,7 +7,7 @@
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.v7.management;
import java.io.File;
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java 2011-11-25
12:35:34 UTC (rev 36658)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManagerUtil.java 2011-11-25
12:41:44 UTC (rev 36659)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2011 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
@@ -7,7 +7,7 @@
*
* Contributors:
* Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.v7.management;
import org.eclipse.wst.server.core.IServer;
@@ -18,21 +18,50 @@
public class JBoss7ManagerUtil {
private static final String JBOSS7_RUNTIME =
"org.jboss.ide.eclipse.as.runtime.70"; //$NON-NLS-1$
+ private static final String JBOSS71_RUNTIME =
"org.jboss.ide.eclipse.as.runtime.71"; //$NON-NLS-1$
private static final String EAP6_RUNTIME =
"org.jboss.ide.eclipse.as.runtime.eap.60"; //$NON-NLS-1$
public static IJBoss7ManagerService getService(IServer server) throws
InvalidSyntaxException {
BundleContext context = JBossServerCorePlugin.getContext();
+ skipLazyInit();
JBoss7ManagerServiceProxy proxy = new JBoss7ManagerServiceProxy(context,
getRequiredVersion(server));
proxy.open();
return proxy;
}
+ private static boolean initialized = false;
+ /* HUUUUUUUUGE HACK */
+ private synchronized static void skipLazyInit() {
+ if( !initialized ) {
+ // Testing to see if forcing the proxy open will
+ BundleContext context = JBossServerCorePlugin.getContext();
+ JBoss7ManagerServiceProxy proxy = null;
+ try {
+ proxy = new JBoss7ManagerServiceProxy(context,
IJBoss7ManagerService.AS_VERSION_710_Beta);
+ proxy.open();
+ proxy.getServerState("localhost", 9999); //$NON-NLS-1$
+ } catch( Exception e ) {
+ e.printStackTrace();
+ }
+ try {
+ proxy = new JBoss7ManagerServiceProxy(context,
IJBoss7ManagerService.AS_VERSION_700);
+ proxy.open();
+ proxy.getServerState("localhost", 9999); //$NON-NLS-1$
+ } catch(Exception e ) {
+ e.printStackTrace();
+ }
+ initialized = true;
+ }
+ }
+
private static String getRequiredVersion(IServer server) {
String id = server.getRuntime().getRuntimeType().getId();
if (JBOSS7_RUNTIME.equals(id)
|| EAP6_RUNTIME.equals(id)) {
return IJBoss7ManagerService.AS_VERSION_700;
}
+ if( JBOSS71_RUNTIME.equals(id))
+ return IJBoss7ManagerService.AS_VERSION_710_Beta;
return null;
}
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManangerConnectException.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManangerConnectException.java 2011-11-25
12:35:34 UTC (rev 36658)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManangerConnectException.java 2011-11-25
12:41:44 UTC (rev 36659)
@@ -1,13 +1,13 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat Inc..
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat Incorporated - initial API and implementation
- *******************************************************************************/
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.v7.management;
/**
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManangerException.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManangerException.java 2011-11-25
12:35:34 UTC (rev 36658)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/JBoss7ManangerException.java 2011-11-25
12:41:44 UTC (rev 36659)
@@ -1,13 +1,13 @@
-/*******************************************************************************
- * Copyright (c) 2010 Red Hat Inc..
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat Incorporated - initial API and implementation
- *******************************************************************************/
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.v7.management;
/**
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-11-25
12:35:34 UTC (rev 36658)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2011-11-25
12:41:44 UTC (rev 36659)
@@ -24,6 +24,7 @@
public static final String AS_51 = "org.jboss.ide.eclipse.as.runtime.51";
//$NON-NLS-1$
public static final String AS_60 = "org.jboss.ide.eclipse.as.runtime.60";
//$NON-NLS-1$
public static final String AS_70 = "org.jboss.ide.eclipse.as.runtime.70";
//$NON-NLS-1$
+ public static final String AS_71 = "org.jboss.ide.eclipse.as.runtime.71";
//$NON-NLS-1$
public static final String EAP_RUNTIME_PREFIX =
"org.jboss.ide.eclipse.as.runtime.eap."; //$NON-NLS-1$
public static final String EAP_43 = "org.jboss.ide.eclipse.as.runtime.eap.43";
//$NON-NLS-1$
public static final String EAP_50 = "org.jboss.ide.eclipse.as.runtime.eap.50";
//$NON-NLS-1$
@@ -36,6 +37,7 @@
public static final String SERVER_AS_51 = "org.jboss.ide.eclipse.as.51";
//$NON-NLS-1$
public static final String SERVER_AS_60 = "org.jboss.ide.eclipse.as.60";
//$NON-NLS-1$
public static final String SERVER_AS_70 = "org.jboss.ide.eclipse.as.70";
//$NON-NLS-1$
+ public static final String SERVER_AS_71 = "org.jboss.ide.eclipse.as.71";
//$NON-NLS-1$
public static final String EAP_SERVER_PREFIX =
"org.jboss.ide.eclipse.as.eap."; //$NON-NLS-1$
public static final String SERVER_EAP_43 = "org.jboss.ide.eclipse.as.eap.43";
//$NON-NLS-1$
public static final String SERVER_EAP_50 = "org.jboss.ide.eclipse.as.eap.50";
//$NON-NLS-1$
@@ -79,8 +81,10 @@
public static final String DEFAULT_PROPS_51 =
"jboss.51.default.ports.properties"; //$NON-NLS-1$
public static final String DEFAULT_PROPS_60 =
"jboss.60.default.ports.properties"; //$NON-NLS-1$
public static final String DEFAULT_PROPS_70 =
"jboss.70.default.ports.properties"; //$NON-NLS-1$
+ public static final String DEFAULT_PROPS_71 =
"jboss.71.default.ports.properties"; //$NON-NLS-1$
public static final String DEFAULT_PROPS_EAP_43 =
"jboss.eap.43.default.ports.properties"; //$NON-NLS-1$
public static final String DEFAULT_PROPS_EAP_50 =
"jboss.eap.50.default.ports.properties"; //$NON-NLS-1$
+ public static final String DEFAULT_PROPS_EAP_60 =
"jboss.eap.60.default.ports.properties"; //$NON-NLS-1$
// Poller constants
public static final String DEFAULT_STARTUP_POLLER = WebPortPoller.WEB_POLLER_ID;
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-11-25
12:35:34 UTC (rev 36658)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2011-11-25
12:41:44 UTC (rev 36659)
@@ -101,6 +101,7 @@
public static boolean isJBoss7(IServerType type) {
return type.getId().equals(IJBossToolingConstants.SERVER_AS_70)
+ || type.getId().equals(IJBossToolingConstants.SERVER_AS_71)
|| type.getId().equals(IJBossToolingConstants.SERVER_EAP_60);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2011-11-25 12:35:34
UTC (rev 36658)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.properties 2011-11-25 12:41:44
UTC (rev 36659)
@@ -30,10 +30,14 @@
jboss.version.60.description=JBoss Application Server 6.x
jboss.version.60.runtime.name=JBoss 6.x Runtime
-jboss.version.70.name=JBoss AS 7.x
-jboss.version.70.description=JBoss Application Server 7.x
-jboss.version.70.runtime.name=JBoss 7.x Runtime
+jboss.version.70.name=JBoss AS 7.0
+jboss.version.70.description=JBoss Application Server 7.0
+jboss.version.70.runtime.name=JBoss 7.0 Runtime
+jboss.version.71.name=JBoss AS 7.1
+jboss.version.71.description=JBoss Application Server 7.1
+jboss.version.71.runtime.name=JBoss 7.1 Runtime
+
jboss.eap.version.43.name=JBoss Enterprise Application Platform 4.3
jboss.eap.version.43.description=JBoss Enterprise Application Platform (EAP) 4.3
jboss.eap.version.43.runtime.name=JBoss Enterprise Application Platform 4.3 Runtime
@@ -52,9 +56,11 @@
deploy.server.name=Deploy Only
deploy.server.description=A server which only provides a deploy folder for publishing.
-AllJBossRuntimeTypes=org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.60,org.jboss.ide.eclipse.as.runtime.70,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50,org.jboss.ide.eclipse.as.runtime.eap.60
-AllJBossServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.eap.60,
-AllJBTServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.eap.60,org.jboss.ide.eclipse.as.systemCopyServer
-ServerTypesJBoss6OrHigher=org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.60
+AllJBossRuntimeTypes=org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.60,org.jboss.ide.eclipse.as.runtime.70,org.jboss.ide.eclipse.as.runtime.71,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50,org.jboss.ide.eclipse.as.runtime.eap.60
+AllJBossServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.71,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.eap.60,
+AllJBTServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.71,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.eap.60,org.jboss.ide.eclipse.as.systemCopyServer
ServerTypesJBoss6OrLower=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50
-ServerTypesJBoss7=org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.60
\ No newline at end of file
+RuntimeTypesJBoss6OrLower=org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.60,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50
+ServerTypesJBoss6OrHigher=org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.71,org.jboss.ide.eclipse.as.eap.60
+ServerTypesJBoss7=org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.71,org.jboss.ide.eclipse.as.eap.60
+RuntimeTypesJBoss7=org.jboss.ide.eclipse.as.runtime.70,org.jboss.ide.eclipse.as.runtime.71,org.jboss.ide.eclipse.as.runtime.eap.60
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-11-25 12:35:34 UTC (rev
36658)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-11-25 12:41:44 UTC (rev
36659)
@@ -131,6 +131,23 @@
supportsRemoteHosts="true"/>
<serverType
+
behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.v7.DelegatingJBoss7ServerBehavior"
+
class="org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server"
+ description="%jboss.version.71.description"
+ hasConfiguration="false"
+ id="org.jboss.ide.eclipse.as.71"
+ initialState="stopped"
+
launchConfigId="org.jboss.ide.eclipse.as.core.server.JBoss7StartupConfiguration"
+ launchModes="run,debug,profile"
+ name="%jboss.version.71.name"
+ runtime="true"
+ runtimeTypeId="org.jboss.ide.eclipse.as.runtime.71"
+ startBeforePublish="false"
+ startTimeout="450000"
+ stopTimeout="450000"
+ supportsRemoteHosts="true"/>
+
+ <serverType
behaviourClass="org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior"
class="org.jboss.ide.eclipse.as.core.server.internal.JBossServer"
description="%jboss.eap.version.43.description"
@@ -342,7 +359,30 @@
<moduleType types="jboss.osgi" versions="1.0"/>
</runtimeType>
+ <runtimeType
+ vendor="%providerName"
+
class="org.jboss.ide.eclipse.as.core.server.internal.v7.LocalJBoss7ServerRuntime"
+ description="%jboss.version.71.description"
+ name="%jboss.version.71.runtime.name"
+ id="org.jboss.ide.eclipse.as.runtime.71"
+ version="7.1">
+ <moduleType types="jst.appclient" versions="5.0,
6.0"/>
+ <moduleType types="wst.web"
versions="1.0,1.2,1.3,1.4"/>
+ <moduleType types="jst.web" versions="2.2, 2.3, 2.4, 2.5,
3.0"/>
+ <moduleType types="jst.ejb" versions="1.0, 1.1, 2.0, 2.1,
3.0, 3.1"/>
+ <moduleType types="jst.ear" versions="1.2, 1.3, 1.4, 5.0,
6.0"/>
+ <moduleType types="jst.connector" versions="1.0, 1.5,
1.6"/>
+ <moduleType types="jst.utility" versions="1.0"/>
+ <moduleType types="jboss.package" versions="1.0"/>
+ <moduleType types="jboss.singlefile"
versions="1.0"/>
+ <moduleType types="jst.jboss.esb"
versions="4.2,4.3,4.4,4.5,4.6,4.7,4.9"/>
+ <moduleType types="jst.jboss.sar" versions="1.0"/>
+ <moduleType types="jbt.bpel.module" versions="1.1,
2.0"/>
+ <moduleType types="bpel.module" versions="1.1,
2.0"/>
+ <moduleType types="jboss.osgi" versions="1.0"/>
+ </runtimeType>
+
<runtimeType
vendor="%enterpriseProviderName"
class="org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime"
@@ -560,7 +600,7 @@
class="org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManagerServicePoller"
id="org.jboss.ide.eclipse.as.core.server.JBoss7ManagerServicePoller"
name="JBoss 7 Manager Service"
- serverTypes="org.jboss.ide.eclipse.as.70,
org.jboss.ide.eclipse.as.eap.60"
+
serverTypes="org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.71,org.jboss.ide.eclipse.as.eap.60"
supportsShutdown="true"
supportsStartup="true">
</serverPoller>
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.71.default.ports.properties
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.71.default.ports.properties
(rev 0)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.71.default.ports.properties 2011-11-25
12:41:44 UTC (rev 36659)
@@ -0,0 +1,6 @@
+JBoss_Web=//*[@name="standard-sockets"]/*[@name="http"]
+JBoss_Web_FILE=standalone/configuration/standalone.xml
+JBoss_Web_ATTRIBUTE=port
+JBoss_Management=//*[local-name()="socket-binding-group"]/*[local-name()="socket-binding"][@name="management-native"]
+JBoss_Management_ATTRIBUTE=port
+JBoss_Management_FILE=standalone/configuration/standalone.xml
\ No newline at end of file
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java 2011-11-25
12:35:34 UTC (rev 36658)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/AS7Manager.java 2011-11-25
12:41:44 UTC (rev 36659)
@@ -65,6 +65,9 @@
public AS7Manager(String host, int port) throws UnknownHostException {
this.client = ModelControllerClient.Factory.create(host, port);
this.manager = ServerDeploymentManager.Factory.create(client);
+ System.out.println("70 client class: " + client.getClass());
+ System.out.println("70 manager class: " + manager.getClass());
+
}
public IJBoss7DeploymentResult undeploySync(String name, IProgressMonitor monitor)
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/JBoss7ManagerService.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/JBoss7ManagerService.java 2011-11-25
12:35:34 UTC (rev 36658)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/src/org/jboss/ide/eclipse/as/internal/management/as7/JBoss7ManagerService.java 2011-11-25
12:41:44 UTC (rev 36659)
@@ -17,49 +17,64 @@
import org.jboss.ide.eclipse.as.core.server.v7.management.IJBoss7ManagerService;
import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7DeploymentState;
import org.jboss.ide.eclipse.as.core.server.v7.management.JBoss7ServerState;
+import org.jboss.ide.eclipse.as.internal.management.as7.AS7Manager;
/**
* @author Rob Stryker
*/
public class JBoss7ManagerService implements IJBoss7ManagerService {
-
public IJBoss7DeploymentResult deployAsync(String host, int port, String
deploymentName,
File file, IProgressMonitor monitor) throws Exception {
AS7Manager manager = new AS7Manager(host, port);
- IJBoss7DeploymentResult result = manager.deploy(deploymentName, file);
- manager.dispose();
- return result;
+ try {
+ IJBoss7DeploymentResult result = manager.deploy(deploymentName, file);
+ return result;
+ } finally {
+ manager.dispose();
+ }
}
public IJBoss7DeploymentResult deploySync(String host, int port, String deploymentName,
File file, IProgressMonitor monitor) throws Exception {
AS7Manager manager = new AS7Manager(host, port);
- IJBoss7DeploymentResult result = manager.deploySync(deploymentName, file, monitor);
- manager.dispose();
- return result;
+ try {
+ IJBoss7DeploymentResult result = manager.deploySync(deploymentName, file, monitor);
+ return result;
+ } finally {
+ manager.dispose();
+ }
}
public IJBoss7DeploymentResult undeployAsync(String host, int port, String
deploymentName,
boolean removeFile, IProgressMonitor monitor) throws Exception {
AS7Manager manager = new AS7Manager(host, port);
- IJBoss7DeploymentResult result = manager.undeploy(deploymentName);
- manager.dispose();
- return result;
+ try {
+ IJBoss7DeploymentResult result = manager.undeploy(deploymentName);
+ return result;
+ } finally {
+ manager.dispose();
+ }
}
public IJBoss7DeploymentResult syncUndeploy(String host, int port, String
deploymentName,
boolean removeFile, IProgressMonitor monitor) throws Exception {
AS7Manager manager = new AS7Manager(host, port);
- IJBoss7DeploymentResult result = manager.undeploySync(deploymentName, monitor);
- manager.dispose();
- return result;
+ try {
+ IJBoss7DeploymentResult result = manager.undeploySync(deploymentName, monitor);
+ return result;
+ } finally {
+ manager.dispose();
+ }
}
public JBoss7DeploymentState getDeploymentState(String host, int port, String
deploymentName) throws Exception {
AS7Manager manager = new AS7Manager(host, port);
- JBoss7DeploymentState result = manager.getDeploymentStateSafe(deploymentName);
- manager.dispose();
- return result;
+ try {
+ JBoss7DeploymentState result = manager.getDeploymentStateSafe(deploymentName);
+ return result;
+ } finally {
+ manager.dispose();
+ }
}
@Deprecated
@@ -69,16 +84,22 @@
public JBoss7ServerState getServerState(String host, int port) throws Exception {
AS7Manager manager = new AS7Manager(host, port);
- JBoss7ServerState state = manager.getServerState();
- manager.dispose();
- return state;
+ try {
+ JBoss7ServerState state = manager.getServerState();
+ return state;
+ } finally {
+ manager.dispose();
+ }
}
public boolean isRunning(String host, int port) throws Exception {
AS7Manager manager = new AS7Manager(host, port);
- boolean ret = manager.isRunning();
- manager.dispose();
- return ret;
+ try {
+ boolean ret = manager.isRunning();
+ return ret;
+ } finally {
+ manager.dispose();
+ }
}
@Deprecated
@@ -88,8 +109,11 @@
public void stop(String host, int port) throws Exception {
AS7Manager manager = new AS7Manager(host, port);
- manager.stopServer();
- manager.dispose();
+ try {
+ manager.stopServer();
+ } finally {
+ manager.dispose();
+ }
}
@Override
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties 2011-11-25 12:35:34 UTC
(rev 36658)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties 2011-11-25 12:41:44 UTC
(rev 36659)
@@ -23,11 +23,11 @@
NavigatorContent_XMLConfiguration=XML Configuration
NavigatorContent_JMX=JMX
-AllJBossRuntimeTypes=org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.60,org.jboss.ide.eclipse.as.runtime.70,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50,org.jboss.ide.eclipse.as.runtime.eap.60
-AllJBossServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.eap.60
-AllJBTServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.eap.60,org.jboss.ide.eclipse.as.systemCopyServer
+AllJBossRuntimeTypes=org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.60,org.jboss.ide.eclipse.as.runtime.70,org.jboss.ide.eclipse.as.runtime.71,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50,org.jboss.ide.eclipse.as.runtime.eap.60
+AllJBossServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.71,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.eap.60,
+AllJBTServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.71,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.eap.60,org.jboss.ide.eclipse.as.systemCopyServer
+ServerTypesJBoss6OrLower=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50
RuntimeTypesJBoss6OrLower=org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.60,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50
-ServerTypesJBoss6OrLower=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50
-ServerTypesJBoss6OrHigher=org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70
-ServerTypesJBoss7=org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.60
-RuntimeTypesJBoss7=org.jboss.ide.eclipse.as.runtime.70,org.jboss.ide.eclipse.as.runtime.eap.60
\ No newline at end of file
+ServerTypesJBoss6OrHigher=org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.71,org.jboss.ide.eclipse.as.eap.60
+ServerTypesJBoss7=org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.71,org.jboss.ide.eclipse.as.eap.60
+RuntimeTypesJBoss7=org.jboss.ide.eclipse.as.runtime.70,org.jboss.ide.eclipse.as.runtime.71,org.jboss.ide.eclipse.as.runtime.eap.60
\ No newline at end of file