JBoss Tools SVN: r35722 - in trunk/runtime/plugins/org.jboss.tools.runtime.core: schema and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-10-17 10:09:16 -0400 (Mon, 17 Oct 2011)
New Revision: 35722
Added:
trunk/runtime/plugins/org.jboss.tools.runtime.core/schema/downloadruntimes.exsd
Removed:
trunk/runtime/plugins/org.jboss.tools.runtime.core/schema/downloadJBossRuntimes.exsd
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime.core/plugin.xml
trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/RuntimeCoreActivator.java
Log:
JBIDE-6369 Should support auto download of new container for Tools
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/plugin.xml
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.core/plugin.xml 2011-10-17 14:04:06 UTC (rev 35721)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.core/plugin.xml 2011-10-17 14:09:16 UTC (rev 35722)
@@ -2,10 +2,10 @@
<?eclipse version="3.4"?>
<plugin>
<extension-point id="runtimeDetectors" name="Runtime Detectors" schema="schema/runtimeDetectors.exsd"/>
- <extension-point id="downloadJBossRuntimes" name="%DownloadJBossRuntimes" schema="schema/downloadJBossRuntimes.exsd"/>
+ <extension-point id="downloadruntimes" name="Download Runtimes" schema="schema/downloadruntimes.exsd"/>
<extension
- point="org.jboss.tools.runtime.core.downloadJBossRuntimes">
+ point="org.jboss.tools.runtime.core.downloadruntimes">
<runtime
id="org.jboss.tools.runtime.core.as.701"
name="JBoss AS 7.0.1 Everything (NOT Java EE6 Certified)"
Deleted: trunk/runtime/plugins/org.jboss.tools.runtime.core/schema/downloadJBossRuntimes.exsd
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.core/schema/downloadJBossRuntimes.exsd 2011-10-17 14:04:06 UTC (rev 35721)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.core/schema/downloadJBossRuntimes.exsd 2011-10-17 14:09:16 UTC (rev 35722)
@@ -1,138 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.jboss.tools.central" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
- <appinfo>
- <meta.schema plugin="org.jboss.tools.central" id="downloadJBossRuntimes" name="Download JBoss Runtimes"/>
- </appinfo>
- <documentation>
- Downloads a new JBoss Runtime
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <appinfo>
- <meta.element />
- </appinfo>
- </annotation>
- <complexType>
- <sequence>
- <element ref="runtime" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- <appinfo>
- <meta.attribute translatable="true"/>
- </appinfo>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="runtime">
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="version" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="url" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- <attribute name="size" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appinfo>
- <meta.section type="since"/>
- </appinfo>
- <documentation>
- 3.0.0
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="examples"/>
- </appinfo>
- <documentation>
- <extension
- point="org.jboss.tools.central.downloadJBossRuntimes">
-
-</extension>
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="apiinfo"/>
- </appinfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="implementation"/>
- </appinfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appinfo>
- <meta.section type="copyright"/>
- </appinfo>
- <documentation>
- JBoss by Red Hat
- </documentation>
- </annotation>
-
-</schema>
Copied: trunk/runtime/plugins/org.jboss.tools.runtime.core/schema/downloadruntimes.exsd (from rev 34859, trunk/runtime/plugins/org.jboss.tools.runtime.core/schema/downloadJBossRuntimes.exsd)
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.core/schema/downloadruntimes.exsd (rev 0)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.core/schema/downloadruntimes.exsd 2011-10-17 14:09:16 UTC (rev 35722)
@@ -0,0 +1,138 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.jboss.tools.central" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+ <appinfo>
+ <meta.schema plugin="org.jboss.tools.central" id="downloadruntimes" name="Download Runtimes"/>
+ </appinfo>
+ <documentation>
+ Downloads a new Runtime
+ </documentation>
+ </annotation>
+
+ <element name="extension">
+ <annotation>
+ <appinfo>
+ <meta.element />
+ </appinfo>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="runtime" minOccurs="1" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="point" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="id" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appinfo>
+ <meta.attribute translatable="true"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="runtime">
+ <complexType>
+ <attribute name="id" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="version" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="url" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="size" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="since"/>
+ </appinfo>
+ <documentation>
+ 3.0.0
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="examples"/>
+ </appinfo>
+ <documentation>
+ <extension
+ point="org.jboss.tools.central.downloadruntimes">
+
+</extension>
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="apiinfo"/>
+ </appinfo>
+ <documentation>
+ [Enter API information here.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="implementation"/>
+ </appinfo>
+ <documentation>
+ [Enter information about supplied implementation of this extension point.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="copyright"/>
+ </appinfo>
+ <documentation>
+ JBoss by Red Hat
+ </documentation>
+ </annotation>
+
+</schema>
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/RuntimeCoreActivator.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/RuntimeCoreActivator.java 2011-10-17 14:04:06 UTC (rev 35721)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.core/src/org/jboss/tools/runtime/core/RuntimeCoreActivator.java 2011-10-17 14:09:16 UTC (rev 35722)
@@ -49,7 +49,7 @@
private static final String RUNTIME_DETECTOR_EXTENSION_ID = "org.jboss.tools.runtime.core.runtimeDetectors";
- public static final String DOWNLOAD_JBOSS_RUNTIMES_EXTENSION_ID = "org.jboss.tools.runtime.core.downloadJBossRuntimes";
+ public static final String DOWNLOAD_RUNTIMES_EXTENSION_ID = "org.jboss.tools.runtime.core.downloadruntimes";
private static final String NAME = "name";
@@ -237,12 +237,12 @@
return esbDetector;
}
- public Map<String, DownloadRuntime> getDownloadJBossRuntimes() {
+ public Map<String, DownloadRuntime> getDownloadRuntimes() {
if (downloadRuntimes == null) {
downloadRuntimes = new HashMap<String, DownloadRuntime>();
IExtensionRegistry registry = Platform.getExtensionRegistry();
IExtensionPoint extensionPoint = registry
- .getExtensionPoint(DOWNLOAD_JBOSS_RUNTIMES_EXTENSION_ID);
+ .getExtensionPoint(DOWNLOAD_RUNTIMES_EXTENSION_ID);
IExtension[] extensions = extensionPoint.getExtensions();
for (int i = 0; i < extensions.length; i++) {
IExtension extension = extensions[i];
13 years, 2 months
JBoss Tools SVN: r35721 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-17 10:04:06 -0400 (Mon, 17 Oct 2011)
New Revision: 35721
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java
Log:
[JBIDE-9889] catching auth exception
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java 2011-10-17 13:54:56 UTC (rev 35720)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java 2011-10-17 14:04:06 UTC (rev 35721)
@@ -52,28 +52,34 @@
@Override
protected IStatus run(IProgressMonitor monitor) {
+ IStatus status = Status.OK_STATUS;
try {
File repositoryFile = model.cloneRepository(monitor);
model.importProject(repositoryFile, monitor);
- return Status.OK_STATUS;
} catch (OpenshiftException e) {
- return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
+ status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
"An exception occurred while creating local git repository.", e);
} catch (URISyntaxException e) {
- return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
+ status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
"The url of the remote git repository is not valid", e);
- } catch(InvocationTargetException e) {
+ } catch (InvocationTargetException e) {
if (e.getTargetException() instanceof JGitInternalException) {
- return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
- "Could not clone the repository. Authentication failed.", e.getTargetException());
- } else {
- return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
+ status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
+ "Could not clone the repository. Authentication failed.", e
+ .getTargetException());
+ } else {
+ status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
"An exception occurred while creating local git repository.", e);
}
} catch (Exception e) {
- return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
+ status = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
"An exception occurred while creating local git repository.", e);
}
+
+ if (!status.isOK()) {
+ OpenshiftUIActivator.log(status);
+ }
+ return status;
}
}, getContainer());
return true;
13 years, 2 months
JBoss Tools SVN: r35720 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-17 09:54:56 -0400 (Mon, 17 Oct 2011)
New Revision: 35720
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java
Log:
[JBIDE-9889] catching auth exception
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java 2011-10-17 13:47:58 UTC (rev 35719)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizard.java 2011-10-17 13:54:56 UTC (rev 35720)
@@ -11,6 +11,7 @@
package org.jboss.tools.openshift.express.internal.ui.wizard;
import java.io.File;
+import java.lang.reflect.InvocationTargetException;
import java.net.URISyntaxException;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -20,6 +21,7 @@
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jgit.api.errors.JGitInternalException;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
import org.jboss.tools.common.ui.WizardUtils;
@@ -60,6 +62,14 @@
} catch (URISyntaxException e) {
return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
"The url of the remote git repository is not valid", e);
+ } catch(InvocationTargetException e) {
+ if (e.getTargetException() instanceof JGitInternalException) {
+ return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
+ "Could not clone the repository. Authentication failed.", e.getTargetException());
+ } else {
+ return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
+ "An exception occurred while creating local git repository.", e);
+ }
} catch (Exception e) {
return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
"An exception occurred while creating local git repository.", e);
13 years, 2 months
JBoss Tools SVN: r35719 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-17 09:47:58 -0400 (Mon, 17 Oct 2011)
New Revision: 35719
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
Log:
added author
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2011-10-17 13:47:28 UTC (rev 35718)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2011-10-17 13:47:58 UTC (rev 35719)
@@ -19,6 +19,7 @@
* stored inside a server object, as well as the utility methods
* used to get and set them for a server.
*
+ * @author Rob Stryker
*/
public class ExpressServerUtils {
public static final String ATTRIBUTE_EXPRESS_MODE = "org.jboss.tools.openshift.express.internal.core.behaviour.ExpressMode";
13 years, 2 months
JBoss Tools SVN: r35718 - in trunk/as/plugins/org.jboss.tools.openshift.express.ui: src/org/jboss/tools/openshift/express/internal/ui/wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-17 09:47:28 -0400 (Mon, 17 Oct 2011)
New Revision: 35718
Modified:
trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
Log:
[JBIDE-9793] now correcting the web context root to "/" (was: project name)
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-17 13:45:31 UTC (rev 35717)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/META-INF/MANIFEST.MF 2011-10-17 13:47:28 UTC (rev 35718)
@@ -24,7 +24,8 @@
org.jboss.ide.eclipse.as.ui;bundle-version="[2.3.0,3.0.0)",
org.eclipse.wst.server.ui;bundle-version="[1.1.3,2.0.0)",
org.eclipse.ui.ide;bundle-version="3.7.0",
- org.eclipse.m2e.core.ui;bundle-version="1.0.0"
+ org.eclipse.m2e.core.ui;bundle-version="1.0.0",
+ org.eclipse.wst.common.modulecore;bundle-version="1.2.101"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.jboss.tools.common.databinding,
Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-10-17 13:45:31 UTC (rev 35717)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-10-17 13:47:28 UTC (rev 35718)
@@ -35,6 +35,7 @@
import org.eclipse.jgit.transport.JschConfigSessionFactory;
import org.eclipse.jgit.transport.URIish;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
@@ -230,17 +231,28 @@
Boolean b = (Boolean)getProperty(AdapterWizardPageModel.CREATE_SERVER);
if( b != null && b.booleanValue() ) {
try {
+ renameWebContextRoot(importedProjects);
IServer server = createServerAdapter();
addModules(getModules(importedProjects), server, monitor);
} catch(CoreException ce) {
OpenshiftUIActivator.getDefault().getLog().log(ce.getStatus());
- } catch( OpenshiftException ose) {
+ } catch(OpenshiftException ose) {
IStatus s = new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID, "Cannot create openshift server adapter", ose);
OpenshiftUIActivator.getDefault().getLog().log(s);
}
}
}
+ private void renameWebContextRoot(List<IProject> importedProjects) {
+ for (IProject project : importedProjects) {
+ renameWebContextRoot(project);
+ }
+ }
+
+ private void renameWebContextRoot(IProject project) {
+ ComponentUtilities.setServerContextRoot(project, "/");
+ }
+
private IServer createServerAdapter() throws CoreException,
OpenshiftException {
IServerType type = (IServerType)getProperty(AdapterWizardPageModel.SERVER_TYPE);
@@ -250,7 +262,7 @@
IServer server = ExpressServerUtils.createServer(rt, type, "Openshift Server1");
ExpressServerUtils.fillServerWithOpenshiftDetails(server, getApplication().getApplicationUrl(),
getUser().getRhlogin(), getUser().getPassword(),
- getUser().getDomain().getRhcDomain(), getApplication().getName(), mode);
+ getUser().getDomain().getNamespace(), getApplication().getName(), mode);
return server;
}
13 years, 2 months
JBoss Tools SVN: r35717 - in trunk/runtime/plugins: org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-10-17 09:45:31 -0400 (Mon, 17 Oct 2011)
New Revision: 35717
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java
Log:
JBIDE-9913 NPE on start and publish of servers
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java 2011-10-17 13:28:50 UTC (rev 35716)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java 2011-10-17 13:45:31 UTC (rev 35717)
@@ -42,11 +42,9 @@
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.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
-import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.bean.JBossServerType;
import org.jboss.ide.eclipse.as.core.server.bean.ServerBean;
import org.jboss.ide.eclipse.as.core.server.bean.ServerBeanLoader;
@@ -69,31 +67,9 @@
private static final String ESB = "ESB"; //$NON-NLS-1$
public void initializeRuntimes(List<ServerDefinition> serverDefinitions) {
- //createInitialJBossServer();
createJBossServerFromDefinitions(serverDefinitions);
}
-
-// public static void createInitialJBossServer(){
-// try {
-// String pluginLocation = FileLocator.resolve(Activator.getDefault().getBundle().getEntry("/")).getPath(); //$NON-NLS-1$
-// File jbossASDir = new File(pluginLocation, JBOSS_EAP_HOME);
-// if (!jbossASDir.isDirectory()) {
-// Location configLocation = Platform.getConfigurationLocation();
-// URL configURL = configLocation.getURL();
-// String configuration = FileLocator.resolve(configURL).getPath();
-// jbossASDir = new File(configuration, JBOSS_EAP_HOME_CONFIGURATION).getCanonicalFile();
-// } else {
-// jbossASDir = jbossASDir.getCanonicalFile();
-// }
-// if (jbossASDir.isDirectory()) {
-// int index = getJBossASVersion(jbossASDir);
-// createJBossServer(jbossASDir,index, "jboss-eap", "jboss-eap " + RUNTIME); //$NON-NLS-1$ //$NON-NLS-2$
-// }
-// } catch (IOException e) {
-// Activator.log(e,Messages.JBossRuntimeStartup_Cannot_create_new_JBoss_Server);
-// }
-// }
-
+
private static File getLocation(ServerDefinition serverDefinition) {
String type = serverDefinition.getType();
if (SOA_P.equals(type) || EAP.equals(type) || EPP.equals(type)) {
@@ -214,23 +190,6 @@
RuntimeAsActivator.log(e,Messages.JBossRuntimeStartup_Cannott_create_new_DTP_Connection_Profile);
}
}
- /**
- * Creates new JBoss AS Runtime, Server and hsqldb driver
- * @param jbossASLocation location of JBoss Server
- * @param progressMonitor to report progress
- * @return server working copy
- * @throws CoreException
- * @throws ConnectionProfileException
- */
-// public static IServerWorkingCopy initJBossAS(String jbossASLocation, IProgressMonitor progressMonitor) throws CoreException, ConnectionProfileException {
-// IRuntime runtime = createRuntime(null, jbossASLocation, progressMonitor, 2);
-// IServerWorkingCopy server = null;
-// if (runtime != null) {
-// server = createServer(progressMonitor, runtime, 2, null);
-// }
-// createDriver(jbossASLocation);
-// return server;
-// }
/**
* Creates new JBoss AS Runtime
@@ -252,16 +211,6 @@
if(runtimeName!=null) {
runtime.setName(runtimeName);
}
-// to fix https://jira.jboss.org/jira/browse/JBDS-852 VM attributes initialization below was commented
-// IVMInstall defaultVM = JavaRuntime.getDefaultVMInstall();
- // IJBossServerRuntime.PROPERTY_VM_ID
-// ((RuntimeWorkingCopy) runtime).setAttribute("PROPERTY_VM_ID", defaultVM.getId()); //$NON-NLS-1$
- // IJBossServerRuntime.PROPERTY_VM_TYPE_ID
-// ((RuntimeWorkingCopy) runtime).setAttribute("PROPERTY_VM_TYPE_ID", defaultVM.getVMInstallType().getId()); //$NON-NLS-1$
- // IJBossServerRuntime.PROPERTY_CONFIGURATION_NAME
- // JBIDE-9643
- // ((RuntimeWorkingCopy) runtime).setAttribute("org.jboss.ide.eclipse.as.core.runtime.configurationName", JBOSS_AS_DEFAULT_CONFIGURATION_NAME); //$NON-NLS-1$
-
return runtime.save(false, progressMonitor);
}
return runtime;
@@ -274,45 +223,18 @@
* @return server working copy
* @throws CoreException
*/
- private static IServerWorkingCopy createServer(IProgressMonitor progressMonitor, IRuntime runtime, int index, String name) throws CoreException {
+ private static void createServer(IProgressMonitor progressMonitor, IRuntime runtime, int index, String name) throws CoreException {
if (name == null) {
name = JBOSS_AS_NAME[index];
}
IServer[] servers = ServerCore.getServers();
for (IServer server:servers) {
if (name.equals(server.getName()) ) {
- return null;
+ return;
}
}
IServerType serverType = ServerCore.findServerType(JBOSS_AS_TYPE_ID[index]);
-
- //IServer server = ServerCreationUtils.createServer2(runtime, serverType, name, LocalPublishMethod.LOCAL_PUBLISH_METHOD);
- IServerWorkingCopy server = serverType.createServer(null, null, runtime, progressMonitor);
-
- server.setRuntime(runtime);
- server.setHost(JBOSS_AS_HOST);
- server.setName(name);
- server.setServerConfiguration(null);
- server.setAttribute(IDeployableServer.SERVER_MODE, LocalPublishMethod.LOCAL_PUBLISH_METHOD);
-
- if (index != JBOSS_AS7_INDEX) {
- // JBossServer.DEPLOY_DIRECTORY
- // JBIDE-7822
- //String deployVal = runtime.getLocation().append("server").append(JBOSS_AS_DEFAULT_CONFIGURATION_NAME).append("deploy").toOSString(); //$NON-NLS-1$ //$NON-NLS-2$
- //((ServerWorkingCopy) server).setAttribute("org.jboss.ide.eclipse.as.core.server.deployDirectory", deployVal); //$NON-NLS-1$
- // JBIDE-9643
- // ((ServerWorkingCopy) server).setAttribute(IDeployableServer.DEPLOY_DIRECTORY_TYPE, IDeployableServer.DEPLOY_SERVER);
-
- // IDeployableServer.TEMP_DEPLOY_DIRECTORY
- // String deployTmpFolderVal = runtime.getLocation().append("server").append(JBOSS_AS_DEFAULT_CONFIGURATION_NAME).append("tmp").append("jbosstoolsTemp").toOSString(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- // ((ServerWorkingCopy) server).setAttribute("org.jboss.ide.eclipse.as.core.server.tempDeployDirectory", deployTmpFolderVal); //$NON-NLS-1$
-
- // If we'd need to set up a username / pw for JMX, do it here.
-// ((ServerWorkingCopy)serverWC).setAttribute(JBossServer.SERVER_USERNAME, authUser);
-// ((ServerWorkingCopy)serverWC).setAttribute(JBossServer.SERVER_PASSWORD, authPass);
- }
- server.save(false, progressMonitor);
- return server;
+ ServerCreationUtils.createServer2(runtime, serverType, name, LocalPublishMethod.LOCAL_PUBLISH_METHOD);
}
/**
@@ -551,5 +473,4 @@
calculateIncludedServerDefinition(serverDefinition, new NullProgressMonitor());
}
-
}
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java 2011-10-17 13:28:50 UTC (rev 35716)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java 2011-10-17 13:45:31 UTC (rev 35717)
@@ -269,6 +269,9 @@
@Override
protected void finishedRun() {
+ if (getShell() == null || getShell().isDisposed()) {
+ return;
+ }
decrementNestingDepth();
getShell().setCursor(null);
int count = getServerDefinitions(true).size();
13 years, 2 months
JBoss Tools SVN: r35716 - trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/actions.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-10-17 09:28:50 -0400 (Mon, 17 Oct 2011)
New Revision: 35716
Modified:
trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/actions/FavoriteAtEclipseMarketplaceHandler.java
Log:
JBIDE-9922 fixed link to Eclipse marketplace
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/actions/FavoriteAtEclipseMarketplaceHandler.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/actions/FavoriteAtEclipseMarketplaceHandler.java 2011-10-17 13:25:53 UTC (rev 35715)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/actions/FavoriteAtEclipseMarketplaceHandler.java 2011-10-17 13:28:50 UTC (rev 35716)
@@ -20,7 +20,7 @@
@Override
public String getLocation() {
- return "http://marketplace.eclipse.org/node/15557";
+ return "http://marketplace.eclipse.org/node/121986";
}
}
13 years, 2 months
JBoss Tools SVN: r35715 - trunk/modeshape/plugins/org.jboss.tools.modeshape.rest.
by jbosstools-commits＠lists.jboss.org
Author: elvisisking
Date: 2011-10-17 09:25:53 -0400 (Mon, 17 Oct 2011)
New Revision: 35715
Modified:
trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/modeshape-client.jar
Log:
JBDS-1875 The Teiid and ModeShape jar's, required by JBDS, need to be committed to JBT/JBDS for inclusion. Checked in MS ER 5 jars to ModeShape Tools 3.2.x and trunk, and in Teiid Designer 7.4.2. Per Barry Teiid Designer 7.5 and 7.6 branches do not need the ER 5 jars. Barry updated the Teiid ER 5 jars into Teiid Designer branches.
Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/modeshape-client.jar
===================================================================
(Binary files differ)
13 years, 2 months
JBoss Tools SVN: r35714 - trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-10-17 08:42:20 -0400 (Mon, 17 Oct 2011)
New Revision: 35714
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EGitUtils.java
Log:
[JBIDE-9793] pushing the whole repo (skipping ref specs since those seem not to work)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EGitUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EGitUtils.java 2011-10-17 11:26:01 UTC (rev 35713)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/src/org/jboss/ide/eclipse/as/egit/core/EGitUtils.java 2011-10-17 12:42:20 UTC (rev 35714)
@@ -104,7 +104,8 @@
throw new CoreException(createStatus(null, "Repository \"{0}\" has no remote repository configured",
repository.toString()));
}
- createPushOperation(remoteConfig, repository).run(monitor);
+ PushOperation pushOperation = createPushOperation(remoteConfig, repository);
+ pushOperation.run(monitor);
} catch (CoreException e) {
throw e;
} catch (Exception e) {
@@ -153,11 +154,14 @@
throws CoreException {
PushOperationSpecification spec = new PushOperationSpecification();
- List<URIish> urisToPush = getPushURIs(remoteConfig);
+ List<URIish> pushToUris = getPushURIs(remoteConfig);
List<RefSpec> pushRefSpecs = getPushRefSpecs(remoteConfig);
- addURIRefToPushSpecification(urisToPush, pushRefSpecs, repository, spec);
+ addURIRefToPushSpecification(pushToUris, pushRefSpecs, repository, spec);
- return new PushOperation(repository, spec, false, PUSH_TIMEOUT);
+ // return new PushOperation(repository, spec, false, PUSH_TIMEOUT);
+ // TODO: fix pushoperation to really use the spec (currently seems like
+ // it does not work so we push everything to the remote)
+ return new PushOperation(repository, remoteConfig.getName(), false, PUSH_TIMEOUT);
}
/**
13 years, 2 months
JBoss Tools SVN: r35713 - trunk/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-10-17 07:26:01 -0400 (Mon, 17 Oct 2011)
New Revision: 35713
Modified:
trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml
Log:
Added multi-module javaee6 archetype
Modified: trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml 2011-10-17 11:10:24 UTC (rev 35712)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-maven-3.3.xml 2011-10-17 11:26:01 UTC (rev 35713)
@@ -300,5 +300,54 @@
</properties>
</mavenArchetype>
</project>
-
+ <project>
+ <category>Java EE 6 Quickstarts</category>
+ <name>multi-javaee6-archetype</name>
+ <included-projects>multi-javaee6-archetype</included-projects>
+ <shortDescription>Java EE 6 example (Maven archetype)</shortDescription>
+ <description>Simple multi module project</description>
+ <size>8192</size>
+ <url/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70</property>
+ <property name="description">This project example requires JBoss AS 7.0</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.701</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,1.2.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.maven.ide.eclipse.wtp</property>
+ <property name="versions">[0.13.1,0.15.0)</property>
+ <property name="description">This project example requires m2eclipse-wtp >= 0.13.1.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,1.4.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature</property>
+ </fix>
+ </fixes>
+ <importType>mavenArchetype</importType>
+ <importTypeDescription>The project example requires the m2e, m2eclipse-wtp and JBoss Maven Integration feature.</importTypeDescription>
+ <mavenArchetype>
+ <archetypeGroupId>org.openarchetypes</archetypeGroupId>
+ <archetypeArtifactId>multi-javaee6-archetype</archetypeArtifactId>
+ <archetypeVersion>0.0.1-SNAPSHOT</archetypeVersion>
+ <archetypeRepository> http://open-archetypes.github.com/maven-repo/snapshots/</archetypeRepository>
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>multi-javaee6</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <javaPackage></javaPackage>
+ <properties>
+ <property name="name" value="Java EE 6 multi module project"/>
+ </properties>
+ </mavenArchetype>
+ <!--targetProjectFacet facet="jst.ear" version="6.0"/-->
+ </project>
</projects>
13 years, 2 months