JBoss Tools SVN: r27609 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2010-12-20 06:12:25 -0500 (Mon, 20 Dec 2010)
New Revision: 27609
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java
Log:
https://issues.jboss.org/browse/JBIDE-7951 Committed a temporary fix to get rid of the blocker.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java
========================================…
[View More]===========================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java 2010-12-20 10:59:49 UTC (rev 27608)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java 2010-12-20 11:12:25 UTC (rev 27609)
@@ -189,9 +189,11 @@
if(result == null || t.equals(result.getSignature())) {
String sts = bounds.length > 0 ? bounds[0] : "";
if(sts.length() > 0) {
- ParametedType st = getParametedType(contextType, sts);
- if(st != null) {
- result = new TypeDeclaration(st, 0, 0);
+ if(context!=contextType) {
+ ParametedType st = getParametedType(contextType, sts);
+ if(st != null) {
+ result = new TypeDeclaration(st, 0, 0);
+ }
}
} else if(result != null) {
result.setSignature(t);
[View Less]
14 years, 1 month
JBoss Tools SVN: r27608 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2010-12-20 05:59:49 -0500 (Mon, 20 Dec 2010)
New Revision: 27608
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIProjectSet.java
Log:
https://issues.jboss.org/browse/JBIDE-7946
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIProjectSet.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/…
[View More]src/org/jboss/tools/cdi/internal/core/validation/CDIProjectSet.java 2010-12-20 10:13:37 UTC (rev 27607)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIProjectSet.java 2010-12-20 10:59:49 UTC (rev 27608)
@@ -35,6 +35,7 @@
*/
public CDIProjectSet(IProject project) {
allProjects = new ArrayList<IProject>();
+ allProjects.add(project);
CDICoreNature sp = CDICorePlugin.getCDI(project, false);
if(sp!=null) {
addIncludedProjects(sp);
[View Less]
14 years, 1 month
JBoss Tools SVN: r27607 - in trunk: as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF and 4 other directories.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-12-20 05:13:37 -0500 (Mon, 20 Dec 2010)
New Revision: 27607
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateRSEFromInstanceJob.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/…
[View More]CreateServerFromRSEJob.java
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/ServerUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/META-INF/MANIFEST.MF
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
Log:
"JBIDE-7889 deltacloud integration stuff" support for deploy only server, or hard-coded server details added
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 2010-12-20 09:54:21 UTC (rev 27606)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossToolingConstants.java 2010-12-20 10:13:37 UTC (rev 27607)
@@ -35,6 +35,8 @@
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$
+ public static final String DEPLOY_ONLY_RUNTIME = "org.jboss.ide.eclipse.as.runtime.stripped"; //$NON-NLS-1$
+ public static final String DEPLOY_ONLY_SERVER = "org.jboss.ide.eclipse.as.systemCopyServer"; //$NON-NLS-1$
/* Version Strings */
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java 2010-12-20 10:13:37 UTC (rev 27607)
@@ -0,0 +1,132 @@
+package org.jboss.ide.eclipse.as.core.util;
+
+import java.util.HashMap;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.launching.IVMInstall;
+import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.jdt.launching.environments.IExecutionEnvironment;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IRuntimeType;
+import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IServerType;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
+import org.eclipse.wst.server.core.ServerCore;
+import org.eclipse.wst.server.core.ServerUtil;
+import org.eclipse.wst.server.core.internal.RuntimeWorkingCopy;
+import org.eclipse.wst.server.core.internal.ServerWorkingCopy;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer;
+
+public class ServerCreationUtils {
+
+ public static HashMap<String, String> runtimeServerTypeMap =
+ new HashMap<String, String>();
+ static {
+ runtimeServerTypeMap.put(IJBossToolingConstants.AS_32, IJBossToolingConstants.SERVER_AS_32);
+ runtimeServerTypeMap.put(IJBossToolingConstants.AS_40, IJBossToolingConstants.SERVER_AS_40);
+ runtimeServerTypeMap.put(IJBossToolingConstants.AS_42, IJBossToolingConstants.SERVER_AS_42);
+ runtimeServerTypeMap.put(IJBossToolingConstants.AS_50, IJBossToolingConstants.SERVER_AS_50);
+ runtimeServerTypeMap.put(IJBossToolingConstants.AS_51, IJBossToolingConstants.SERVER_AS_51);
+ runtimeServerTypeMap.put(IJBossToolingConstants.AS_60, IJBossToolingConstants.SERVER_AS_60);
+ runtimeServerTypeMap.put(IJBossToolingConstants.EAP_43, IJBossToolingConstants.SERVER_EAP_43);
+ runtimeServerTypeMap.put(IJBossToolingConstants.EAP_50, IJBossToolingConstants.SERVER_EAP_50);
+ }
+
+
+ public static IServer createDeployOnlyServer(String deployLocation, String tempDeployLocation,
+ String rtName, String serverName) throws CoreException {
+ IRuntimeType rt = ServerCore.findRuntimeType("org.jboss.ide.eclipse.as.runtime.stripped"); //$NON-NLS-1$
+ IRuntimeWorkingCopy wc = rt.createRuntime(rtName, null);
+ IRuntime runtime = wc.save(true, null);
+ IServerType st = ServerCore.findServerType("org.jboss.ide.eclipse.as.systemCopyServer"); //$NON-NLS-1$
+ ServerWorkingCopy swc = (ServerWorkingCopy) st.createServer(serverName, null, null);
+ swc.setServerConfiguration(null);
+ swc.setName(serverName);
+ swc.setRuntime(runtime);
+ swc.setAttribute(DeployableServer.DEPLOY_DIRECTORY, deployLocation);
+ swc.setAttribute(DeployableServer.TEMP_DEPLOY_DIRECTORY, tempDeployLocation);
+ IServer server = swc.save(true, null);
+ return server;
+ }
+
+ public static IServer createServer(String runtimeID, String serverID,
+ String location, String configuration) throws CoreException {
+ IRuntime currentRuntime = createRuntime(runtimeID, location,configuration);
+ return createServer2(currentRuntime, serverID);
+ }
+ public static IServer createServer(String runtimeID, String serverID,
+ String location, String configuration, IVMInstall install) throws CoreException {
+ IRuntime currentRuntime = createRuntime(runtimeID, location,
+ configuration, install);
+ return createServer2(currentRuntime, serverID);
+ }
+
+ public static IServer createServer2(String name, IRuntime currentRuntime) throws CoreException {
+ return createServer2(currentRuntime, runtimeServerTypeMap.get(currentRuntime.getRuntimeType().getId()), name);
+ }
+
+ public static IServer createServer2(IRuntime currentRuntime, String serverID) throws CoreException {
+ return createServer2(currentRuntime, serverID, serverID);
+ }
+
+ public static IServer createServer2(IRuntime currentRuntime, String serverID, String serverName) throws CoreException {
+ IServerType serverType = ServerCore.findServerType(serverID);
+ IServerWorkingCopy serverWC = serverType.createServer(null, null,
+ new NullProgressMonitor());
+ serverWC.setRuntime(currentRuntime);
+ serverWC.setName(serverName);
+ serverWC.setServerConfiguration(null);
+ return serverWC.save(true, new NullProgressMonitor());
+ }
+
+ public static IRuntime createRuntime(String runtimeId, String homeDir,
+ String config) throws CoreException {
+ return createRuntime(runtimeId, homeDir, config, getDefaultVMInstall());
+ }
+
+ public static IVMInstall getDefaultVMInstall() {
+ return JavaRuntime.getDefaultVMInstall();
+ }
+
+ public static IRuntime createRuntime(String runtimeId, String homeDir,
+ String config, IVMInstall install) throws CoreException {
+ IRuntimeType[] runtimeTypes = ServerUtil.getRuntimeTypes(null, null,runtimeId);
+ IRuntimeType runtimeType = runtimeTypes[0];
+ IRuntimeWorkingCopy runtimeWC = runtimeType.createRuntime(null,
+ new NullProgressMonitor());
+ runtimeWC.setName(runtimeId);
+ runtimeWC.setLocation(new Path(homeDir));
+ ((RuntimeWorkingCopy) runtimeWC).setAttribute(
+ IJBossServerRuntime.PROPERTY_VM_ID, install.getId());
+ ((RuntimeWorkingCopy) runtimeWC).setAttribute(
+ IJBossServerRuntime.PROPERTY_VM_TYPE_ID, install
+ .getVMInstallType().getId());
+ ((RuntimeWorkingCopy) runtimeWC).setAttribute(
+ IJBossServerRuntime.PROPERTY_CONFIGURATION_NAME, config);
+
+ IRuntime savedRuntime = runtimeWC.save(true, new NullProgressMonitor());
+ return savedRuntime;
+ }
+
+ public static IRuntime createRuntime(String runtimeId, String homeDir,
+ String config, IExecutionEnvironment environment) throws CoreException {
+ IRuntimeType[] runtimeTypes = ServerUtil.getRuntimeTypes(null, null,runtimeId);
+ IRuntimeType runtimeType = runtimeTypes[0];
+ IRuntimeWorkingCopy runtimeWC = runtimeType.createRuntime(null,
+ new NullProgressMonitor());
+ runtimeWC.setName(runtimeId);
+ runtimeWC.setLocation(new Path(homeDir));
+ ((RuntimeWorkingCopy) runtimeWC).setAttribute(
+ IJBossServerRuntime.PROPERTY_EXECUTION_ENVIRONMENT, environment.getId());
+ ((RuntimeWorkingCopy) runtimeWC).setAttribute(
+ IJBossServerRuntime.PROPERTY_CONFIGURATION_NAME, config);
+
+ IRuntime savedRuntime = runtimeWC.save(true, new NullProgressMonitor());
+ return savedRuntime;
+ }
+
+}
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 2010-12-20 09:54:21 UTC (rev 27606)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2010-12-20 10:13:37 UTC (rev 27607)
@@ -129,5 +129,6 @@
return NLS.bind(Messages.serverCountName, base, i);
}
+
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF 2010-12-20 09:54:21 UTC (rev 27606)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/META-INF/MANIFEST.MF 2010-12-20 10:13:37 UTC (rev 27607)
@@ -12,6 +12,7 @@
org.eclipse.rse.services.files.ftp,
org.eclipse.rse.services.local,
org.eclipse.rse.services.ssh,
+ org.eclipse.rse.subsystems.shells.core,
org.jboss.ide.eclipse.as.core,
org.jboss.ide.eclipse.as.wtp.core,
org.eclipse.wst.server.core,
@@ -22,8 +23,7 @@
org.eclipse.jem.util,
org.jboss.ide.eclipse.archives.webtools,
org.eclipse.debug.core,
- org.eclipse.jdt.launching,
- org.eclipse.rse.subsystems.shells.core;bundle-version="3.1.100"
+ org.eclipse.jdt.launching
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: org.jboss.ide.eclipse.as.rse.core
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2010-12-20 09:54:21 UTC (rev 27606)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2010-12-20 10:13:37 UTC (rev 27607)
@@ -13,12 +13,14 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.model.IHost;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerAttributes;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
@@ -37,6 +39,7 @@
public static final String RSE_SERVER_HOME_DIR = "org.jboss.ide.eclipse.as.rse.core.RSEServerHomeDir"; //$NON-NLS-1$
public static final String RSE_SERVER_HOST = "org.jboss.ide.eclipse.as.rse.core.ServerHost"; //$NON-NLS-1$
public static final String RSE_SERVER_DEFAULT_HOST = "Local"; //$NON-NLS-1$
+ public static final String RSE_MODE = "rse";
public static String getRSEConnectionName(IServer server) {
return server.getAttribute(RSEUtils.RSE_SERVER_HOST, RSE_SERVER_DEFAULT_HOST);
@@ -116,4 +119,27 @@
}
}
+ public static IServer setServerToRSEMode(IServer server, IHost newHost) throws CoreException {
+ IServerWorkingCopy wc = server.createWorkingCopy();
+ wc.setAttribute(IDeployableServer.SERVER_MODE, RSE_MODE);
+ wc.setAttribute(RSE_SERVER_HOST, newHost.getAliasName());
+ wc.setAttribute("hostname", newHost.getHostName());
+ return wc.save(false, new NullProgressMonitor());
+ }
+
+ public static IServer setServerToRSEMode(IServer server, IHost newHost,
+ String jbossHome, String config) throws CoreException {
+ IServerWorkingCopy wc = server.createWorkingCopy();
+ wc.setAttribute(IDeployableServer.SERVER_MODE, RSE_MODE);
+ wc.setAttribute(RSE_SERVER_CONFIG, config);
+ wc.setAttribute(RSE_SERVER_HOME_DIR, jbossHome);
+ wc.setAttribute(RSE_SERVER_HOST, newHost.getAliasName());
+ wc.setAttribute("hostname", newHost.getHostName());
+ wc.setAttribute(IDeployableServer.DEPLOY_DIRECTORY_TYPE,
+ IDeployableServer.DEPLOY_SERVER);
+ return wc.save(false, new NullProgressMonitor());
+ }
+
+
+
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java 2010-12-20 09:54:21 UTC (rev 27606)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java 2010-12-20 10:13:37 UTC (rev 27607)
@@ -46,6 +46,7 @@
import org.jboss.ide.eclipse.as.core.util.FileUtil;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+import org.jboss.ide.eclipse.as.core.util.ServerCreationUtils;
import org.jboss.ide.eclipse.as.test.ASTest;
import org.jboss.ide.eclipse.as.test.publishing.AbstractDeploymentTest;
import org.osgi.framework.Bundle;
@@ -101,18 +102,7 @@
}
public static IServer createMockDeployOnlyServer(String deployLocation, String tempDeployLocation,
String rtName, String serverName) throws CoreException {
- IRuntimeType rt = ServerCore.findRuntimeType("org.jboss.ide.eclipse.as.runtime.stripped");
- IRuntimeWorkingCopy wc = rt.createRuntime(rtName, null);
- IRuntime runtime = wc.save(true, null);
- IServerType st = ServerCore.findServerType("org.jboss.ide.eclipse.as.systemCopyServer");
- ServerWorkingCopy swc = (ServerWorkingCopy) st.createServer(serverName, null, null);
- swc.setServerConfiguration(null);
- swc.setName(serverName);
- swc.setRuntime(runtime);
- swc.setAttribute(DeployableServer.DEPLOY_DIRECTORY, deployLocation);
- swc.setAttribute(DeployableServer.TEMP_DEPLOY_DIRECTORY, tempDeployLocation);
- IServer server = swc.save(true, null);
- return server;
+ return ServerCreationUtils.createDeployOnlyServer(deployLocation, tempDeployLocation, rtName, serverName);
}
public static IServer createMockServerWithRuntime(String serverType, String name, String config) {
@@ -146,71 +136,31 @@
public static IServer createServer(String runtimeID, String serverID,
String location, String configuration) throws CoreException {
- IRuntime currentRuntime = createRuntime(runtimeID, location,configuration);
- return createServer2(currentRuntime, serverID);
+ IRuntime currentRuntime = ServerCreationUtils.createRuntime(runtimeID, location,configuration);
+ return ServerCreationUtils.createServer2(currentRuntime, serverID);
}
public static IServer createServer(String runtimeID, String serverID,
String location, String configuration, IVMInstall install) throws CoreException {
- IRuntime currentRuntime = createRuntime(runtimeID, location,
+ IRuntime currentRuntime = ServerCreationUtils.createRuntime(runtimeID, location,
configuration, install);
- return createServer2(currentRuntime, serverID);
+ return ServerCreationUtils.createServer2(currentRuntime, serverID);
}
-
- private static IServer createServer2(IRuntime currentRuntime, String serverID) throws CoreException {
- IServerType serverType = ServerCore.findServerType(serverID);
- IServerWorkingCopy serverWC = serverType.createServer(null, null,
- new NullProgressMonitor());
- serverWC.setRuntime(currentRuntime);
- serverWC.setName(serverID);
- serverWC.setServerConfiguration(null);
- return serverWC.save(true, new NullProgressMonitor());
- }
-
public static IRuntime createRuntime(String runtimeId, String homeDir,
String config) throws CoreException {
- return createRuntime(runtimeId, homeDir, config, VM_INSTALL);
+ return ServerCreationUtils.createRuntime(runtimeId, homeDir, config, VM_INSTALL);
}
public static IRuntime createRuntime(String runtimeId, String homeDir,
String config, IVMInstall install) throws CoreException {
assertTrue("path \"" + homeDir + "\" does not exist", new Path(homeDir).toFile().exists());
- IRuntimeType[] runtimeTypes = ServerUtil.getRuntimeTypes(null, null,runtimeId);
- assertEquals("expects only one runtime type", runtimeTypes.length, 1);
- IRuntimeType runtimeType = runtimeTypes[0];
- IRuntimeWorkingCopy runtimeWC = runtimeType.createRuntime(null,
- new NullProgressMonitor());
- runtimeWC.setName(runtimeId);
- runtimeWC.setLocation(new Path(homeDir));
- ((RuntimeWorkingCopy) runtimeWC).setAttribute(
- IJBossServerRuntime.PROPERTY_VM_ID, install.getId());
- ((RuntimeWorkingCopy) runtimeWC).setAttribute(
- IJBossServerRuntime.PROPERTY_VM_TYPE_ID, install
- .getVMInstallType().getId());
- ((RuntimeWorkingCopy) runtimeWC).setAttribute(
- IJBossServerRuntime.PROPERTY_CONFIGURATION_NAME, config);
-
- IRuntime savedRuntime = runtimeWC.save(true, new NullProgressMonitor());
- return savedRuntime;
+ return ServerCreationUtils.createRuntime(runtimeId, homeDir, config, install);
}
public static IRuntime createRuntime(String runtimeId, String homeDir,
String config, IExecutionEnvironment environment) throws CoreException {
assertTrue("path \"" + homeDir + "\" does not exist", new Path(homeDir).toFile().exists());
- IRuntimeType[] runtimeTypes = ServerUtil.getRuntimeTypes(null, null,runtimeId);
- assertEquals("expects only one runtime type", runtimeTypes.length, 1);
- IRuntimeType runtimeType = runtimeTypes[0];
- IRuntimeWorkingCopy runtimeWC = runtimeType.createRuntime(null,
- new NullProgressMonitor());
- runtimeWC.setName(runtimeId);
- runtimeWC.setLocation(new Path(homeDir));
- ((RuntimeWorkingCopy) runtimeWC).setAttribute(
- IJBossServerRuntime.PROPERTY_EXECUTION_ENVIRONMENT, environment.getId());
- ((RuntimeWorkingCopy) runtimeWC).setAttribute(
- IJBossServerRuntime.PROPERTY_CONFIGURATION_NAME, config);
-
- IRuntime savedRuntime = runtimeWC.save(true, new NullProgressMonitor());
- return savedRuntime;
+ return ServerCreationUtils.createRuntime(runtimeId, homeDir, config);
}
public static void deleteAllServers() throws CoreException {
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/META-INF/MANIFEST.MF
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/META-INF/MANIFEST.MF 2010-12-20 09:54:21 UTC (rev 27606)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/META-INF/MANIFEST.MF 2010-12-20 10:13:37 UTC (rev 27607)
@@ -13,4 +13,8 @@
org.eclipse.ui,
org.jboss.tools.deltacloud.core,
org.jboss.tools.deltacloud.ui,
- org.jboss.ide.eclipse.as.core
+ org.jboss.ide.eclipse.as.core,
+ org.eclipse.wst.server.core;bundle-version="1.1.302",
+ org.eclipse.core.resources;bundle-version="3.6.0",
+ org.jboss.ide.eclipse.as.rse.core;bundle-version="0.9.0",
+ org.eclipse.wst.server.ui;bundle-version="1.1.305"
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateRSEFromInstanceJob.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateRSEFromInstanceJob.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateRSEFromInstanceJob.java 2010-12-20 10:13:37 UTC (rev 27607)
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * 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
+ *******************************************************************************/
+package org.jboss.tools.deltacloud.integration.wizard;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.core.runtime.preferences.InstanceScope;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.rse.core.model.IHost;
+import org.eclipse.swt.widgets.Display;
+import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
+import org.jboss.tools.deltacloud.core.job.AbstractInstanceJob;
+import org.jboss.tools.deltacloud.integration.Messages;
+import org.jboss.tools.deltacloud.integration.rse.util.RSEUtils;
+import org.jboss.tools.deltacloud.ui.Activator;
+import org.jboss.tools.deltacloud.ui.ErrorUtils;
+import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants;
+import org.osgi.service.prefs.Preferences;
+
+public class CreateRSEFromInstanceJob extends AbstractInstanceJob {
+ private Job nextJob2 = null;
+ public CreateRSEFromInstanceJob(DeltaCloudInstance instance, String family) {
+ super("Create RSE Host from DeltaCloud Instance", instance, family);
+ }
+ public IStatus doRun(IProgressMonitor monitor) {
+ return runRSEJob(getInstance(), monitor);
+ }
+
+ public void setNextJob(Job job) {
+ super.setNextJob(job);
+ this.nextJob2 = job;
+ }
+
+ private IStatus runRSEJob(DeltaCloudInstance instance, IProgressMonitor monitor) {
+ String hostname = RSEUtils.createHostName(instance);
+ if (hostname != null && hostname.length() > 0 && isAutoconnect()) {
+ try {
+ String connectionName = RSEUtils.createConnectionName(instance);
+ IHost host = RSEUtils.createHost(connectionName,
+ RSEUtils.createHostName(instance),
+ RSEUtils.getSSHOnlySystemType(),
+ RSEUtils.getSystemRegistry());
+ if( nextJob2 != null && nextJob2 instanceof CreateServerFromRSEJob) {
+ ((CreateServerFromRSEJob)nextJob2).setHost(host);
+ }
+ RSEUtils.connect(connectionName, RSEUtils.getConnectorService(host));
+ } catch (Exception e) {
+ return ErrorUtils.handleError(Messages.ERROR,
+ NLS.bind(Messages.COULD_NOT_LAUNCH_RSE_EXPLORER2, instance.getName()),
+ e, Display.getDefault().getActiveShell());
+ }
+ }
+ return Status.OK_STATUS;
+ }
+ private boolean isAutoconnect() {
+ Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID);
+ boolean autoConnect = prefs.getBoolean(IDeltaCloudPreferenceConstants.AUTO_CONNECT_INSTANCE, true);
+ return autoConnect;
+ }
+}
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/CreateServerFromRSEJob.java 2010-12-20 10:13:37 UTC (rev 27607)
@@ -0,0 +1,110 @@
+/*******************************************************************************
+ * 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
+ *******************************************************************************/
+package org.jboss.tools.deltacloud.integration.wizard;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.rse.core.model.IHost;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IRuntimeType;
+import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IServerType;
+import org.eclipse.wst.server.core.ServerCore;
+import org.eclipse.wst.server.core.internal.ServerWorkingCopy;
+import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer;
+import org.jboss.ide.eclipse.as.core.util.ServerCreationUtils;
+import org.jboss.ide.eclipse.as.rse.core.RSEUtils;
+import org.jboss.tools.common.jobs.ChainedJob;
+
+public class CreateServerFromRSEJob extends ChainedJob {
+ public static final String CREATE_DEPLOY_ONLY_SERVER = "CREATE_DEPLOY_ONLY_SERVER";
+ public static final String CHECK_SERVER_FOR_DETAILS = "CHECK_SERVER_FOR_DETAILS";
+ public static final String SET_DETAILS_NOW = "SET_DETAILS_NOW";
+
+ private String type;
+ private String name;
+ private String[] data;
+ private IHost host;
+ public CreateServerFromRSEJob(String type, String[] data, String name) {
+ super("Create Server From RSE Host");
+ this.data = data;
+ this.type = type;
+ this.name = name;
+ }
+
+ public void setHost(IHost host) {
+ this.host = host;
+ }
+
+ protected IStatus run(IProgressMonitor monitor) {
+ try {
+ IServer result = null;
+ if( type.equals(CREATE_DEPLOY_ONLY_SERVER) ) {
+ result = createDeployOnlyServer();
+ } else if( type.equals(CHECK_SERVER_FOR_DETAILS )) {
+ result = createServerCheckRemoteDetails();
+ } else if( type.equals(SET_DETAILS_NOW)) {
+ result = createServerSetDetailsNow();
+ }
+ } catch(CoreException ce) {
+ return ce.getStatus();
+ }
+ return Status.OK_STATUS;
+ }
+ protected IServer createDeployOnlyServer() throws CoreException {
+ IServer server = createDeployOnlyServerWithRuntime(data[0], data[0], name);
+ server = RSEUtils.setServerToRSEMode(server, host);
+ return server;
+ }
+ protected IServer createServerCheckRemoteDetails() {
+ return null;
+ }
+ protected IServer createServerSetDetailsNow() throws CoreException {
+ String home = data[0];
+ String config = data[1];
+ String rtId = data[2];
+ IRuntime runtime = ServerCore.findRuntime(rtId);
+ IServer newServer = ServerCreationUtils.createServer2(name, runtime);
+ newServer = RSEUtils.setServerToRSEMode(newServer, host, home, config);
+ return newServer;
+ }
+
+ private static IRuntime findOrCreateStubDeployOnlyRuntime() throws CoreException {
+ IRuntime[] rts = ServerCore.getRuntimes();
+ for( int i = 0; i < rts.length; i++ ) {
+ if( rts[i].getRuntimeType().getId().equals("org.jboss.ide.eclipse.as.runtime.stripped")) {
+ return rts[i];
+ }
+ }
+ IRuntimeType rt = ServerCore.findRuntimeType("org.jboss.ide.eclipse.as.runtime.stripped");
+ IRuntimeWorkingCopy wc = rt.createRuntime("Deploy Only Runtime", null);
+ IRuntime runtime = wc.save(true, null);
+ return runtime;
+ }
+
+ private static IServer createDeployOnlyServerWithRuntime(String deployLocation, String tempDeployLocation,
+ String serverName) throws CoreException {
+ IRuntime rt = findOrCreateStubDeployOnlyRuntime();
+ IServerType st = ServerCore.findServerType("org.jboss.ide.eclipse.as.systemCopyServer");
+ ServerWorkingCopy swc = (ServerWorkingCopy) st.createServer(serverName, null, null);
+ swc.setServerConfiguration(null);
+ swc.setName(serverName);
+ swc.setRuntime(rt);
+ swc.setAttribute(DeployableServer.DEPLOY_DIRECTORY, deployLocation);
+ swc.setAttribute(DeployableServer.TEMP_DEPLOY_DIRECTORY, tempDeployLocation);
+ IServer server = swc.save(true, null);
+ return server;
+ }
+
+}
\ No newline at end of file
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2010-12-20 09:54:21 UTC (rev 27606)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2010-12-20 10:13:37 UTC (rev 27607)
@@ -10,41 +10,45 @@
*******************************************************************************/
package org.jboss.tools.deltacloud.integration.wizard;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
+import java.util.ArrayList;
+
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.rse.core.model.IHost;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.layout.FormLayout;
import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.Widget;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.ServerCore;
+import org.eclipse.wst.server.ui.ServerUIUtil;
+import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
import org.jboss.tools.deltacloud.core.job.AbstractInstanceJob;
import org.jboss.tools.deltacloud.integration.DeltaCloudIntegrationPlugin;
-import org.jboss.tools.deltacloud.integration.Messages;
-import org.jboss.tools.deltacloud.integration.rse.util.RSEUtils;
-import org.jboss.tools.deltacloud.ui.Activator;
-import org.jboss.tools.deltacloud.ui.ErrorUtils;
-import org.jboss.tools.deltacloud.ui.IDeltaCloudPreferenceConstants;
import org.jboss.tools.deltacloud.ui.INewInstanceWizardPage;
import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils;
import org.osgi.service.prefs.BackingStoreException;
-import org.osgi.service.prefs.Preferences;
/**
* @author Rob Stryker
*/
public class RSEandASWizardPage extends WizardPage implements INewInstanceWizardPage {
- private Button createRSE;
- private Button createServer;
+ private Button createRSE, createServer;
+ private Group serverDetailsGroup;
+ private Button autoScanCheck, hardCodeServerDetails, deployOnlyRadio, addLocalRuntimeButton;
+ private Text remoteDetailsLoc, serverHomeText, serverConfigText, deployFolderText;
+ private Label serverHome, serverConfig, localRuntimeLabel, deployFolder;
+ private Combo localRuntimeCombo;
+
private final static String CREATE_RSE_PREF_KEY = "org.jboss.tools.deltacloud.integration.wizard.RSEandASWizard.CREATE_RSE_PREF_KEY";
private final static String CREATE_SERVER_PREF_KEY = "org.jboss.tools.deltacloud.integration.wizard.RSEandASWizard.CREATE_SERVER_PREF_KEY";
@@ -64,6 +68,72 @@
createServer.setText("Create Server Adapter");
createServer.setLayoutData(UIUtils.createFormData(createRSE, 5, null, 0, 0, 5, 100, -5));
+ Group g = new Group(c2, SWT.SHADOW_IN);
+ serverDetailsGroup = g;
+ g.setLayout(new FormLayout());
+ g.setLayoutData(UIUtils.createFormData(createServer,5,null,0,0,5,100,-5));
+ g.setText("Server Details");
+
+ final int INDENTATION = 40;
+
+ autoScanCheck = new Button(g, SWT.RADIO);
+ autoScanCheck.setText("Determine server details from this remote file:");
+ autoScanCheck.setLayoutData(UIUtils.createFormData(0,5,null,0,0,5,null,0));
+
+ remoteDetailsLoc = new Text(g, SWT.BORDER);
+ remoteDetailsLoc.setLayoutData(UIUtils.createFormData(autoScanCheck,5,null,0,0,INDENTATION,100,-5));
+ remoteDetailsLoc.setText("/etc/sysconfig/jboss-eap");
+
+
+ hardCodeServerDetails = new Button(g, SWT.RADIO);
+ hardCodeServerDetails.setText("Set remote server details manually");
+ hardCodeServerDetails.setLayoutData(UIUtils.createFormData(remoteDetailsLoc,5,null,0,0,5,null,0));
+
+ serverHome = new Label(g, SWT.NONE);
+ serverHome.setText("JBoss Server Home: ");
+ serverHome.setLayoutData(UIUtils.createFormData(hardCodeServerDetails, 7, null, 0, 0, INDENTATION, null, 0 ));
+ serverHomeText = new Text(g, SWT.BORDER);
+ serverHomeText.setLayoutData(UIUtils.createFormData(hardCodeServerDetails, 5, null, 0, serverHome, 5, 100, -5));
+ serverHomeText.setText("/etc/jboss/jboss-as");
+
+ serverConfig = new Label(g, SWT.NONE);
+ serverConfig.setText("Configuration: ");
+ serverConfig.setLayoutData(UIUtils.createFormData(serverHomeText, 7, null, 0, 0, INDENTATION, null, 0 ));
+ serverConfigText = new Text(g, SWT.BORDER);
+ serverConfigText.setLayoutData(UIUtils.createFormData(serverHomeText, 5, null, 0, serverHome, 5, 100, -5));
+ serverConfigText.setText("default");
+
+ localRuntimeLabel = new Label(g, SWT.NONE);
+ localRuntimeLabel.setText("Local Runtime: ");
+ localRuntimeLabel.setLayoutData(UIUtils.createFormData(serverConfigText, 7, null, 0, 0, INDENTATION, null, 0 ));
+
+ addLocalRuntimeButton = new Button(g, SWT.DEFAULT);
+ addLocalRuntimeButton.setText("Configure Runtimes...");
+ addLocalRuntimeButton.setLayoutData(UIUtils.createFormData(serverConfigText, 7, null, 0, null, 0, 100, -5));
+ addLocalRuntimeButton.addSelectionListener(new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ configureRuntimesPressed();
+ }
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+ });
+ localRuntimeCombo = new Combo(g, SWT.NONE);
+ localRuntimeCombo.setLayoutData(UIUtils.createFormData(serverConfigText, 5, null, 0, serverHome, 5, addLocalRuntimeButton, -5));
+
+
+ deployOnlyRadio = new Button(g, SWT.RADIO);
+ deployOnlyRadio.setText("Use a deploy-only server adapter");
+ deployOnlyRadio.setLayoutData(UIUtils.createFormData(localRuntimeCombo,5,null,0,0,5,null,0));
+
+ deployFolder = new Label(g, SWT.NONE);
+ deployFolder.setText("Deploy Folder: ");
+ deployFolder.setLayoutData(UIUtils.createFormData(deployOnlyRadio, 7, null, 0, 0, INDENTATION, null, 0 ));
+ deployFolderText = new Text(g, SWT.BORDER);
+ deployFolderText.setText("/path/to/deploy");
+ deployFolderText.setLayoutData(UIUtils.createFormData(deployOnlyRadio, 5, null, 0, deployFolder, 5, 100, -5));
+ deployOnlyRadio.setSelection(true);
+
+
IEclipsePreferences prefs = new InstanceScope().getNode(DeltaCloudIntegrationPlugin.PLUGIN_ID);
boolean initRSE, initServer;
initRSE = prefs.getBoolean(CREATE_RSE_PREF_KEY, true);
@@ -80,25 +150,67 @@
handleSelection(e.widget);
}
};
-
+
+ fillRuntimeTypeCombo();
+ refreshServerWidgets();
createRSE.addSelectionListener(listener);
createServer.addSelectionListener(listener);
setControl(c2);
}
+ private ArrayList<IRuntime> localRuntimes = new ArrayList<IRuntime>();
+ private void fillRuntimeTypeCombo() {
+ localRuntimes.clear();
+ IRuntime[] rts = ServerCore.getRuntimes();
+ ArrayList<String> names = new ArrayList<String>();
+ for( int i = 0; i < rts.length; i++ ) {
+ if( rts[i].getRuntimeType().getId().startsWith("org.jboss.")
+ && !rts[i].getRuntimeType().getId().equals(IJBossToolingConstants.DEPLOY_ONLY_RUNTIME)) {
+ localRuntimes.add(rts[i]);
+ names.add(rts[i].getName());
+ }
+ }
+ localRuntimeCombo.setItems((String[]) names.toArray(new String[names.size()]));
+ }
+
+ protected void configureRuntimesPressed() {
+ ServerUIUtil.showNewRuntimeWizard(addLocalRuntimeButton.getShell(), null, null);
+ fillRuntimeTypeCombo();
+ }
+
private void handleSelection(Widget w) {
if (w == createRSE) {
if (!createRSE.getSelection()) {
createServer.setEnabled(false);
createServer.setSelection(false);
+ refreshServerWidgets();
} else {
createServer.setEnabled(true);
}
}
+ if( w == createServer ) {
+ refreshServerWidgets();
+ }
}
+ private void refreshServerWidgets() {
+ boolean enabled = createServer.getSelection();
+ boolean enabled2 = false;
+ serverDetailsGroup.setEnabled(enabled);
+ autoScanCheck.setEnabled(enabled2);
+ remoteDetailsLoc.setEnabled(enabled2);
+ hardCodeServerDetails.setEnabled(enabled);
+ serverHomeText.setEnabled(enabled);
+ serverConfigText.setEnabled(enabled);
+ serverHome.setEnabled(enabled);
+ serverConfig.setEnabled(enabled);
+ deployFolder.setEnabled(enabled);
+ deployFolderText.setEnabled(enabled);
+ deployOnlyRadio.setEnabled(enabled);
+ System.out.println(deployFolderText.getEditable());
+ }
+
public AbstractInstanceJob getPerformFinishJob(final DeltaCloudInstance instance) {
- System.out.println(instance.getHostName());
IEclipsePreferences prefs = new InstanceScope().getNode(DeltaCloudIntegrationPlugin.PLUGIN_ID);
prefs.putBoolean(CREATE_RSE_PREF_KEY, createRSE.getSelection());
prefs.putBoolean(CREATE_SERVER_PREF_KEY, createServer.getSelection());
@@ -108,38 +220,30 @@
// ignore
}
- AbstractInstanceJob j = new AbstractInstanceJob(
- "Register RSE Connection", instance, INewInstanceWizardPage.NEW_INSTANCE_FAMILY) {
- public IStatus doRun(IProgressMonitor monitor) {
- return runJob(instance, monitor);
- }
- };
- return j;
- }
+ CreateRSEFromInstanceJob j =
+ new CreateRSEFromInstanceJob(instance, INewInstanceWizardPage.NEW_INSTANCE_FAMILY);
- private IStatus runJob(DeltaCloudInstance instance, IProgressMonitor monitor) {
- String hostname = RSEUtils.createHostName(instance);
- if (hostname != null && hostname.length() > 0 && isAutoconnect()) {
- try {
- String connectionName = RSEUtils.createConnectionName(instance);
- IHost host = RSEUtils.createHost(connectionName,
- RSEUtils.createHostName(instance),
- RSEUtils.getSSHOnlySystemType(),
- RSEUtils.getSystemRegistry());
- RSEUtils.connect(connectionName, RSEUtils.getConnectorService(host));
- } catch (Exception e) {
- return ErrorUtils.handleError(Messages.ERROR,
- NLS.bind(Messages.COULD_NOT_LAUNCH_RSE_EXPLORER2, instance.getName()),
- e, getShell());
+ if( createServer.getSelection()) {
+ String[] data = null;
+ String type = null;
+ if( deployOnlyRadio.getSelection()) {
+ type = CreateServerFromRSEJob.CREATE_DEPLOY_ONLY_SERVER;
+ data = new String[]{deployFolderText.getText()};
+ } else if( autoScanCheck.getSelection()) {
+ type = CreateServerFromRSEJob.CHECK_SERVER_FOR_DETAILS;
+ data = new String[]{remoteDetailsLoc.getText()};
+ } else if( hardCodeServerDetails.getSelection()) {
+ type = CreateServerFromRSEJob.SET_DETAILS_NOW;
+ int index = localRuntimeCombo.getSelectionIndex();
+ String rtId = localRuntimes.get(index).getId();
+ data = new String[]{serverHomeText.getText(), serverConfigText.getText(), rtId};
}
+ if( type != null && data != null ) {
+ CreateServerFromRSEJob job2 = new CreateServerFromRSEJob(type, data, instance.getImageId());
+ j.setNextJob(job2);
+ }
}
- return Status.OK_STATUS;
+ return j;
}
-
- private boolean isAutoconnect() {
- Preferences prefs = new InstanceScope().getNode(Activator.PLUGIN_ID);
- boolean autoConnect = prefs.getBoolean(IDeltaCloudPreferenceConstants.AUTO_CONNECT_INSTANCE, true);
- return autoConnect;
- }
-
+
}
[View Less]
14 years, 1 month
JBoss Tools SVN: r27606 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits@lists.jboss.org
Author: jpeterka
Date: 2010-12-20 04:54:21 -0500 (Mon, 20 Dec 2010)
New Revision: 27606
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java
Log:
method closeReportUsageWindowIfOpened improved
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/…
[View More]ext/SWTJBTExt.java 2010-12-20 04:30:23 UTC (rev 27605)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTJBTExt.java 2010-12-20 09:54:21 UTC (rev 27606)
@@ -496,36 +496,28 @@
}
- /**
- * Closes RH Report Usage Dialog if found
- * @param cancel selecte if ok or cancel button is used
- */
-public void closeReportUsageWindowIfOpened(boolean cancel) {
- boolean usageWindowAppeared = false;
- // Check Usage Reporting For JBT
- try {
- bot.shell("JBoss Tools Usage").activate();
- bot.button(
- cancel ? IDELabel.Button.CANCEL
- : IDELabel.Button.OK).click();
- log.info("Report usage window closed");
- usageWindowAppeared = true;
- } catch (WidgetNotFoundException wnfe) {
- // do nothing continue to try to close JBDS Usage Report Dialog
+ /**
+ * Closes RH Report Usage Dialog if found
+ *
+ * @param cancel
+ * select if ok or cancel button is used
+ */
+ public void closeReportUsageWindowIfOpened(boolean cancel) {
+
+ String title;
+ if (isJBDSRun()) {
+ title = "JBoss Developer Studio Usage";
+ } else {
+ title = "JBoss Tools Usage";
+ }
+ try {
+
+ bot.shell(title).activate();
+ bot.button(cancel ? IDELabel.Button.CANCEL : IDELabel.Button.OK)
+ .click();
+ log.info("Report usage window closed");
+ } catch (WidgetNotFoundException wnfe) {
+ log.info("Report usage window didn't appear");
+ }
}
- // Check Usage Reporting For JBDS
- if (!usageWindowAppeared){
- try {
- bot.shell("JBoss Developer Studio Usage").activate();
- bot.button(
- cancel ? IDELabel.Button.CANCEL
- : IDELabel.Button.OK).click();
- log.info("Report usage window closed");
- usageWindowAppeared = true;
- } catch (WidgetNotFoundException wnfe) {
- log.info("Report usage window didn't appear");
- }
- }
-
}
-}
[View Less]
14 years, 1 month
JBoss Tools SVN: r27605 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-12-19 23:30:23 -0500 (Sun, 19 Dec 2010)
New Revision: 27605
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF
Log:
JBIDE-7921 - re-adding .tm plugins
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF 2010-12-20 00:37:34 UTC (rev 27604)
+++ trunk/as/…
[View More]plugins/org.jboss.ide.eclipse.as.rse.ui/META-INF/MANIFEST.MF 2010-12-20 04:30:23 UTC (rev 27605)
@@ -15,6 +15,10 @@
org.eclipse.rse.services.ssh,
org.jboss.ide.eclipse.as.core,
org.jboss.ide.eclipse.as.wtp.core,
+ org.eclipse.tm.terminal,
+ org.eclipse.tm.terminal.view,
+ org.eclipse.tm.terminal.telnet,
+ org.eclipse.tm.terminal.ssh,
org.eclipse.wst.server.core,
org.eclipse.wst.common.project.facet.core,
org.eclipse.core.resources,
[View Less]
14 years, 1 month
JBoss Tools SVN: r27604 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2010-12-19 19:37:34 -0500 (Sun, 19 Dec 2010)
New Revision: 27604
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
Log:
https://issues.jboss.org/browse/JBIDE-7952 Fixed NPE
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.…
[View More]tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-12-19 22:47:26 UTC (rev 27603)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-12-20 00:37:34 UTC (rev 27604)
@@ -998,7 +998,7 @@
String bindedErrorMessage = NLS.bind(errorMessage, new String[]{method.getMethod().getElementName(), bean.getBeanClass().getElementName()});
addError(bindedErrorMessage, preferencesKey, declaration, bean.getResource(), id);
}
- } else if (iMethod != method.getMethod()) {
+ } else if (iMethod != method.getMethod() && !iMethod.isBinary()) {
getValidationContext().addLinkedCoreResource(bean.getSourcePath().toOSString(), iMethod.getResource().getFullPath(), false);
}
}
@@ -1172,7 +1172,7 @@
String bindedErrorMessage = NLS.bind(CDIValidationMessages.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN, new String[]{producerMethod.getMethod().getElementName(), producer.getBeanClass().getElementName()});
addError(bindedErrorMessage, CDIPreferences.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN, producer.getProducesAnnotation(), producer.getResource(), ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN_ID);
saveAllSuperTypesAsLinkedResources(classBean);
- } else if (method != producerMethod.getMethod()) {
+ } else if (method != producerMethod.getMethod() && !method.isReadOnly()) {
getValidationContext().addLinkedCoreResource(classBean.getSourcePath().toOSString(), method.getResource().getFullPath(), false);
}
}
@@ -1334,104 +1334,106 @@
addError(CDIValidationMessages.AMBIGUOUS_INJECTION_POINTS, CDIPreferences.AMBIGUOUS_INJECTION_POINTS, reference, injection.getResource());
} else if(beans.size()==1) {
IBean bean = beans.iterator().next();
- getValidationContext().addLinkedCoreResource(injection.getSourcePath().toOSString(), bean.getResource().getFullPath(), false);
- /*
- * 5.2.4. Primitive types and null values
- * - injection point of primitive type resolves to a bean that may have null values, such as a producer method with a non-primitive return type or a producer field with a non-primitive type
- */
- if(bean.isNullable() && injection.getType()!=null && injection.getType().isPrimitive()) {
- addError(CDIValidationMessages.INJECT_RESOLVES_TO_NULLABLE_BEAN, CDIPreferences.INJECT_RESOLVES_TO_NULLABLE_BEAN, reference, injection.getResource());
- }
- /*
- * 5.1.4. Inter-module injection
- * - a decorator can not be injected
- * - an interceptor can not be injected
- */
- if(bean instanceof IDecorator) {
- addError(CDIValidationMessages.INJECTED_DECORATOR, CDIPreferences.INJECTED_DECORATOR, reference, injection.getResource());
- } else if(bean instanceof IInterceptor) {
- addError(CDIValidationMessages.INJECTED_INTERCEPTOR, CDIPreferences.INJECTED_INTERCEPTOR, reference, injection.getResource());
- }
- /*
- * 5.4.1. Unproxyable bean types
- * - If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope,
- * the container automatically detects the problem and treats it as a deployment problem.
- */
- if(bean.getScope().isNorlmalScope() && injection.getType()!=null) {
- // - Array types cannot be proxied by the container.
- String typeSignature = injection.getType().getSignature();
- int kind = Signature.getTypeSignatureKind(typeSignature);
- if(kind == Signature.ARRAY_TYPE_SIGNATURE) {
- addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_ARRAY_TYPE, injection.getType().getSimpleName(), bean.getSimpleJavaName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource());
- } else if(injection.getType().isPrimitive()) {
- // - Primitive types cannot be proxied by the container.
- addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, injection.getType().getSimpleName(), bean.getSimpleJavaName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource());
- } else if(bean instanceof IClassBean) {
- try {
- if(Flags.isFinal(bean.getBeanClass().getFlags())) {
- // - Classes which are declared final cannot be proxied by the container.
- addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_FINAL_TYPE, injection.getType().getSimpleName(), bean.getSimpleJavaName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource());
- } else {
- IMethod[] methods = bean.getBeanClass().getMethods();
- boolean hasDefaultConstructor = false;
- for (IMethod method : methods) {
- hasDefaultConstructor = hasDefaultConstructor || (method.isConstructor() && !Flags.isPrivate(method.getFlags()) && method.getParameterNames().length==0);
- if(Flags.isFinal(method.getFlags())) {
- // - Classes which have final methods cannot be proxied by the container.
- addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE_WITH_FM, injection.getType().getSimpleName(), bean.getSimpleJavaName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource());
- hasDefaultConstructor = true;
- break;
+ if(!bean.getBeanClass().isReadOnly()) {
+ getValidationContext().addLinkedCoreResource(injection.getSourcePath().toOSString(), bean.getResource().getFullPath(), false);
+ /*
+ * 5.2.4. Primitive types and null values
+ * - injection point of primitive type resolves to a bean that may have null values, such as a producer method with a non-primitive return type or a producer field with a non-primitive type
+ */
+ if(bean.isNullable() && injection.getType()!=null && injection.getType().isPrimitive()) {
+ addError(CDIValidationMessages.INJECT_RESOLVES_TO_NULLABLE_BEAN, CDIPreferences.INJECT_RESOLVES_TO_NULLABLE_BEAN, reference, injection.getResource());
+ }
+ /*
+ * 5.1.4. Inter-module injection
+ * - a decorator can not be injected
+ * - an interceptor can not be injected
+ */
+ if(bean instanceof IDecorator) {
+ addError(CDIValidationMessages.INJECTED_DECORATOR, CDIPreferences.INJECTED_DECORATOR, reference, injection.getResource());
+ } else if(bean instanceof IInterceptor) {
+ addError(CDIValidationMessages.INJECTED_INTERCEPTOR, CDIPreferences.INJECTED_INTERCEPTOR, reference, injection.getResource());
+ }
+ /*
+ * 5.4.1. Unproxyable bean types
+ * - If an injection point whose declared type cannot be proxied by the container resolves to a bean with a normal scope,
+ * the container automatically detects the problem and treats it as a deployment problem.
+ */
+ if(bean.getScope().isNorlmalScope() && injection.getType()!=null) {
+ // - Array types cannot be proxied by the container.
+ String typeSignature = injection.getType().getSignature();
+ int kind = Signature.getTypeSignatureKind(typeSignature);
+ if(kind == Signature.ARRAY_TYPE_SIGNATURE) {
+ addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_ARRAY_TYPE, injection.getType().getSimpleName(), bean.getSimpleJavaName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource());
+ } else if(injection.getType().isPrimitive()) {
+ // - Primitive types cannot be proxied by the container.
+ addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_PRIMITIVE_TYPE, injection.getType().getSimpleName(), bean.getSimpleJavaName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource());
+ } else if(bean instanceof IClassBean) {
+ try {
+ if(Flags.isFinal(bean.getBeanClass().getFlags())) {
+ // - Classes which are declared final cannot be proxied by the container.
+ addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_FINAL_TYPE, injection.getType().getSimpleName(), bean.getSimpleJavaName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource());
+ } else {
+ IMethod[] methods = bean.getBeanClass().getMethods();
+ boolean hasDefaultConstructor = false;
+ for (IMethod method : methods) {
+ hasDefaultConstructor = hasDefaultConstructor || (method.isConstructor() && !Flags.isPrivate(method.getFlags()) && method.getParameterNames().length==0);
+ if(Flags.isFinal(method.getFlags())) {
+ // - Classes which have final methods cannot be proxied by the container.
+ addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE_WITH_FM, injection.getType().getSimpleName(), bean.getSimpleJavaName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource());
+ hasDefaultConstructor = true;
+ break;
+ }
}
+ if(!hasDefaultConstructor) {
+ // - Classes which don't have a non-private constructor with no parameters cannot be proxied by the container.
+ addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE_WITH_NPC, injection.getType().getSimpleName(), bean.getSimpleJavaName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource());
+ }
}
- if(!hasDefaultConstructor) {
- // - Classes which don't have a non-private constructor with no parameters cannot be proxied by the container.
- addError(MessageFormat.format(CDIValidationMessages.UNPROXYABLE_BEAN_TYPE_WITH_NPC, injection.getType().getSimpleName(), bean.getSimpleJavaName()), CDIPreferences.UNPROXYABLE_BEAN_TYPE, reference, injection.getResource());
- }
+ } catch (JavaModelException e) {
+ CDICorePlugin.getDefault().logError(e);
}
- } catch (JavaModelException e) {
- CDICorePlugin.getDefault().logError(e);
}
}
- }
- if(injection.getClassBean() instanceof IDecorator && injection.isDelegate() && bean instanceof IClassBean) {
- try {
- IType beanClass = bean.getBeanClass();
- if(Flags.isFinal(beanClass.getFlags())) {
- // 8.3. Decorator resolution
- // - If a decorator matches a managed bean, and the managed bean class is declared final, the container automatically detects
- // the problem and treats it as a deployment problem.
- addError(MessageFormat.format(CDIValidationMessages.DECORATOR_RESOLVES_TO_FINAL_CLASS, bean.getSimpleJavaName()), CDIPreferences.DECORATOR_RESOLVES_TO_FINAL_BEAN, reference, injection.getResource());
- } else {
- // 8.3. Decorator resolution
- // - If a decorator matches a managed bean with a non-static, non-private, final method, and the decorator also implements that method,
- // the container automatically detects the problem and treats it as a deployment problem.
- IType decoratorClass = injection.getClassBean().getBeanClass();
- IMethod[] methods = decoratorClass.getMethods();
- boolean reported = false;
- if(methods!=null) {
- for (IMethod method : methods) {
- if(!Flags.isPrivate(method.getFlags()) && !Flags.isStatic(method.getFlags())) {
- IMethod[] beanMethods = beanClass.findMethods(method);
- if(beanMethods!=null) {
- for (IMethod beanMethod : beanMethods) {
- int flags = beanMethod.getFlags();
- if(!Flags.isPrivate(flags) && !Flags.isStatic(flags) && Flags.isFinal(flags)) {
- String methodName = Signature.toString(beanMethod.getSignature(), beanMethod.getElementName(), beanMethod.getParameterNames(), false, false);
- addError(MessageFormat.format(CDIValidationMessages.DECORATOR_RESOLVES_TO_FINAL_METHOD, bean.getSimpleJavaName(), methodName), CDIPreferences.DECORATOR_RESOLVES_TO_FINAL_BEAN, reference, injection.getResource());
- reported = true;
+ if(injection.getClassBean() instanceof IDecorator && injection.isDelegate() && bean instanceof IClassBean) {
+ try {
+ IType beanClass = bean.getBeanClass();
+ if(Flags.isFinal(beanClass.getFlags())) {
+ // 8.3. Decorator resolution
+ // - If a decorator matches a managed bean, and the managed bean class is declared final, the container automatically detects
+ // the problem and treats it as a deployment problem.
+ addError(MessageFormat.format(CDIValidationMessages.DECORATOR_RESOLVES_TO_FINAL_CLASS, bean.getSimpleJavaName()), CDIPreferences.DECORATOR_RESOLVES_TO_FINAL_BEAN, reference, injection.getResource());
+ } else {
+ // 8.3. Decorator resolution
+ // - If a decorator matches a managed bean with a non-static, non-private, final method, and the decorator also implements that method,
+ // the container automatically detects the problem and treats it as a deployment problem.
+ IType decoratorClass = injection.getClassBean().getBeanClass();
+ IMethod[] methods = decoratorClass.getMethods();
+ boolean reported = false;
+ if(methods!=null) {
+ for (IMethod method : methods) {
+ if(!Flags.isPrivate(method.getFlags()) && !Flags.isStatic(method.getFlags())) {
+ IMethod[] beanMethods = beanClass.findMethods(method);
+ if(beanMethods!=null) {
+ for (IMethod beanMethod : beanMethods) {
+ int flags = beanMethod.getFlags();
+ if(!Flags.isPrivate(flags) && !Flags.isStatic(flags) && Flags.isFinal(flags)) {
+ String methodName = Signature.toString(beanMethod.getSignature(), beanMethod.getElementName(), beanMethod.getParameterNames(), false, false);
+ addError(MessageFormat.format(CDIValidationMessages.DECORATOR_RESOLVES_TO_FINAL_METHOD, bean.getSimpleJavaName(), methodName), CDIPreferences.DECORATOR_RESOLVES_TO_FINAL_BEAN, reference, injection.getResource());
+ reported = true;
+ break;
+ }
+ }
+ if(reported) {
break;
}
}
- if(reported) {
- break;
- }
}
}
}
}
+ } catch (JavaModelException e) {
+ CDICorePlugin.getDefault().logError(e);
}
- } catch (JavaModelException e) {
- CDICorePlugin.getDefault().logError(e);
}
}
}
[View Less]
14 years, 1 month
JBoss Tools SVN: r27603 - in workspace/snjeza/runtime-update: features and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2010-12-19 17:47:26 -0500 (Sun, 19 Dec 2010)
New Revision: 27603
Added:
workspace/snjeza/runtime-update/features/org.jboss.tools.runtime.core.feature_1.0.0.201012192345.jar
workspace/snjeza/runtime-update/features/org.jboss.tools.runtime.feature_1.2.0.201012192345.jar
workspace/snjeza/runtime-update/plugins/org.jboss.tools.runtime.core_1.0.0.201012192345.jar
workspace/snjeza/runtime-update/plugins/org.jboss.tools.runtime.ui_1.0.0.201012192345.jar
workspace/…
[View More]snjeza/runtime-update/plugins/org.jboss.tools.runtime_1.2.0.201012192345.jar
Removed:
workspace/snjeza/runtime-update/features/org.jboss.tools.runtime.core.feature_1.0.0.201012141134.jar
workspace/snjeza/runtime-update/features/org.jboss.tools.runtime.feature_1.2.0.201012141134.jar
workspace/snjeza/runtime-update/plugins/org.jboss.tools.runtime.core_1.0.0.201012141134.jar
workspace/snjeza/runtime-update/plugins/org.jboss.tools.runtime.ui_1.0.0.201012141134.jar
workspace/snjeza/runtime-update/plugins/org.jboss.tools.runtime_1.2.0.201012141134.jar
Modified:
workspace/snjeza/runtime-update/artifacts.jar
workspace/snjeza/runtime-update/content.jar
workspace/snjeza/runtime-update/site.xml
Log:
JBIDE-7527 JBoss Runtime Detection update site
Modified: workspace/snjeza/runtime-update/artifacts.jar
===================================================================
(Binary files differ)
Modified: workspace/snjeza/runtime-update/content.jar
===================================================================
(Binary files differ)
Deleted: workspace/snjeza/runtime-update/features/org.jboss.tools.runtime.core.feature_1.0.0.201012141134.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/runtime-update/features/org.jboss.tools.runtime.core.feature_1.0.0.201012192345.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/runtime-update/features/org.jboss.tools.runtime.core.feature_1.0.0.201012192345.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: workspace/snjeza/runtime-update/features/org.jboss.tools.runtime.feature_1.2.0.201012141134.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/runtime-update/features/org.jboss.tools.runtime.feature_1.2.0.201012192345.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/runtime-update/features/org.jboss.tools.runtime.feature_1.2.0.201012192345.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: workspace/snjeza/runtime-update/plugins/org.jboss.tools.runtime.core_1.0.0.201012141134.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/runtime-update/plugins/org.jboss.tools.runtime.core_1.0.0.201012192345.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/runtime-update/plugins/org.jboss.tools.runtime.core_1.0.0.201012192345.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: workspace/snjeza/runtime-update/plugins/org.jboss.tools.runtime.ui_1.0.0.201012141134.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/runtime-update/plugins/org.jboss.tools.runtime.ui_1.0.0.201012192345.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/runtime-update/plugins/org.jboss.tools.runtime.ui_1.0.0.201012192345.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: workspace/snjeza/runtime-update/plugins/org.jboss.tools.runtime_1.2.0.201012141134.jar
===================================================================
(Binary files differ)
Added: workspace/snjeza/runtime-update/plugins/org.jboss.tools.runtime_1.2.0.201012192345.jar
===================================================================
(Binary files differ)
Property changes on: workspace/snjeza/runtime-update/plugins/org.jboss.tools.runtime_1.2.0.201012192345.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: workspace/snjeza/runtime-update/site.xml
===================================================================
--- workspace/snjeza/runtime-update/site.xml 2010-12-18 07:31:11 UTC (rev 27602)
+++ workspace/snjeza/runtime-update/site.xml 2010-12-19 22:47:26 UTC (rev 27603)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.jboss.tools.runtime.core.feature_1.0.0.201012141134.jar" id="org.jboss.tools.runtime.core.feature" version="1.0.0.201012141134">
+ <feature url="features/org.jboss.tools.runtime.core.feature_1.0.0.201012192345.jar" id="org.jboss.tools.runtime.core.feature" version="1.0.0.201012192345">
<category name="org.jboss.tools.runtime.category"/>
</feature>
- <feature url="features/org.jboss.tools.runtime.feature_1.2.0.201012141134.jar" id="org.jboss.tools.runtime.feature" version="1.2.0.201012141134">
+ <feature url="features/org.jboss.tools.runtime.feature_1.2.0.201012192345.jar" id="org.jboss.tools.runtime.feature" version="1.2.0.201012192345">
<category name="org.jboss.tools.runtime.category"/>
</feature>
<category-def name="org.jboss.tools.runtime.category" label="JBoss Runtime Detection"/>
[View Less]
14 years, 1 month
JBoss Tools SVN: r27602 - trunk/site.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-12-18 02:31:11 -0500 (Sat, 18 Dec 2010)
New Revision: 27602
Modified:
trunk/site/site.xml
Log:
remove freemarker, jst, portlet, smooks
Modified: trunk/site/site.xml
===================================================================
--- trunk/site/site.xml 2010-12-18 07:23:56 UTC (rev 27601)
+++ trunk/site/site.xml 2010-12-18 07:31:11 UTC (rev 27602)
@@ -18,20 +18,12 @@
<category name="AllTools" />
<category name="WebTools" />
</feature&…
[View More]gt;
- <feature url="features/org.jboss.ide.eclipse.archives.feature_0.0.0.jar" id="org.jboss.ide.eclipse.archives.feature" version="0.0.0">
- <category name="AllTools" />
- <category name="GeneralTools" />
- </feature>
<feature url="features/org.hibernate.eclipse.feature_0.0.0.jar" id="org.hibernate.eclipse.feature" version="0.0.0">
<category name="AllTools" />
<category name="WebTools" />
<category name="DataTools" />
<category name="GeneralTools" />
</feature>
- <feature url="features/org.jboss.ide.eclipse.freemarker.feature_0.0.0.jar" id="org.jboss.ide.eclipse.freemarker.feature" version="0.0.0">
- <category name="AllTools" />
- <category name="GeneralTools" />
- </feature>
<feature url="features/org.jboss.tools.struts.feature_0.0.0.jar" id="org.jboss.tools.struts.feature" version="0.0.0">
<category name="AllTools" />
<category name="WebTools" />
@@ -40,24 +32,11 @@
<category name="AllTools" />
<category name="SOATools" />
</feature>
- <feature url="features/org.jboss.tools.portlet.feature_0.0.0.jar" id="org.jboss.tools.portlet.feature" version="0.0.0">
- <category name="AllTools" />
- <category name="WebTools" />
- </feature>
<feature url="features/org.jboss.tools.tptp.feature_0.0.0.jar" id="org.jboss.tools.tptp.feature" version="0.0.0">
<category name="TestPerfTools" />
</feature>
- <feature url="features/org.jboss.tools.smooks.feature_0.0.0.jar" id="org.jboss.tools.smooks.feature" version="0.0.0">
- <category name="AllTools" />
- <category name="SOATools" />
- <category name="DataTools" />
- <category name="GeneralTools" />
- </feature>
<!-- only in JBT -->
- <feature url="features/org.jboss.tools.birt.feature_0.0.0.jar" id="org.jboss.tools.birt.feature" version="0.0.0">
- <category name="ReportTools" />
- </feature>
<feature url="features/org.jboss.tools.maven.feature_0.0.0.jar" id="org.jboss.tools.maven.feature" version="0.0.0">
<category name="MavenTools" />
</feature>
@@ -67,15 +46,9 @@
<feature url="features/org.jboss.tools.maven.jsf.feature_0.0.0.jar" id="org.jboss.tools.maven.jsf.feature" version="0.0.0">
<category name="MavenTools" />
</feature>
- <feature url="features/org.jboss.tools.maven.cdi.feature_0.0.0.jar" id="org.jboss.tools.maven.cdi.feature" version="0.0.0">
- <category name="MavenTools" />
- </feature>
<feature url="features/org.jboss.tools.maven.hibernate.feature_0.0.0.jar" id="org.jboss.tools.maven.hibernate.feature" version="0.0.0">
<category name="MavenTools" />
</feature>
- <feature url="features/org.jboss.tools.maven.portlet.feature_0.0.0.jar" id="org.jboss.tools.maven.portlet.feature" version="0.0.0">
- <category name="MavenTools" />
- </feature>
<feature url="features/org.jboss.tools.runtime.feature_0.0.0.jar" id="org.jboss.tools.runtime.feature" version="0.0.0">
<category name="AllTools" />
[View Less]
14 years, 1 month
JBoss Tools SVN: r27601 - trunk/as/site.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-12-18 02:23:56 -0500 (Sat, 18 Dec 2010)
New Revision: 27601
Modified:
trunk/as/site/site.xml
Log:
add org.jboss.ide.eclipse.as.test.feature to update site
Modified: trunk/as/site/site.xml
===================================================================
--- trunk/as/site/site.xml 2010-12-18 07:16:16 UTC (rev 27600)
+++ trunk/as/site/site.xml 2010-12-18 07:23:56 UTC (rev 27601)
@@ -8,5 +8,7 @@
<feature url="features/org.jboss.ide.eclipse.as.feature_0.0.0.…
[View More]jar" id="org.jboss.ide.eclipse.as.feature" version="0.0.0">
<category name="JBoss Tools as Nightly Build Update Site"/>
</feature>
-
+ <feature url="features/org.jboss.ide.eclipse.as.test.feature_0.0.0.jar" id="org.jboss.ide.eclipse.as.test.feature" version="0.0.0">
+ <category name="JBoss Tools as Nightly Build Update Site"/>
+ </feature>
</site>
[View Less]
14 years, 1 month
JBoss Tools SVN: r27600 - trunk/build.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-12-18 02:16:16 -0500 (Sat, 18 Dec 2010)
New Revision: 27600
Modified:
trunk/build/pom-disabled-components.xml
Log:
remove freemarker, jst, portlet, smooks
Modified: trunk/build/pom-disabled-components.xml
===================================================================
--- trunk/build/pom-disabled-components.xml 2010-12-18 07:16:00 UTC (rev 27599)
+++ trunk/build/pom-disabled-components.xml 2010-12-18 07:16:16 UTC (rev 27600)
@@ -60,25 +60,6 @@
</…
[View More]profile>
<profile>
- <id>jst</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../jst</module>
- </modules>
- </profile>
-
- <profile>
- <id>jst-bootstrap</id>
- <modules>
- <module>../common</module>
- <module>../jst</module>
- </modules>
- </profile>
-
-
- <profile>
<id>vpe</id>
<activation>
<activeByDefault>true</activeByDefault>
@@ -92,7 +73,6 @@
<id>vpe-bootstrap</id>
<modules>
<module>../common</module>
- <module>../jst</module>
<module>../vpe</module>
</modules>
</profile>
@@ -111,30 +91,12 @@
<id>jsf-bootstrap</id>
<modules>
<module>../common</module>
- <module>../jst</module>
<module>../vpe</module>
<module>../jsf</module>
</modules>
</profile>
<profile>
- <id>freemarker</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../freemarker</module>
- </modules>
- </profile>
-
- <profile>
- <id>freemarker-bootstrap</id>
- <modules>
- <module>../freemarker</module>
- </modules>
- </profile>
-
- <profile>
<id>hibernatetools</id>
<activation>
<activeByDefault>true</activeByDefault>
@@ -147,29 +109,11 @@
<profile>
<id>hibernatetools-bootstrap</id>
<modules>
- <module>../freemarker</module>
<module>../hibernatetools</module>
</modules>
</profile>
<profile>
- <id>portlet</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../portlet</module>
- </modules>
- </profile>
-
- <profile>
- <id>portlet-bootstrap</id>
- <modules>
- <module>../portlet</module>
- </modules>
- </profile>
-
- <profile>
<id>struts</id>
<activation>
<activeByDefault>true</activeByDefault>
@@ -183,7 +127,6 @@
<id>struts-bootstrap</id>
<modules>
<module>../common</module>
- <module>../jst</module>
<module>../vpe</module>
<module>../struts</module>
</modules>
@@ -207,23 +150,6 @@
</profile>
<profile>
- <id>smooks</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>../smooks</module>
- </modules>
- </profile>
-
- <profile>
- <id>smooks-bootstrap</id>
- <modules>
- <module>../smooks</module>
- </modules>
- </profile>
-
- <profile>
<id>seam</id>
<activation>
<activeByDefault>true</activeByDefault>
@@ -239,7 +165,6 @@
<module>../as</module>
<module>../hibernatetools</module>
<module>../common</module>
- <module>../jst</module>
<module>../vpe</module>
<module>../jsf</module>
<module>../seam</module>
[View Less]
14 years, 1 month