JBoss Tools SVN: r20010 - in trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core: utils and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: Grid.Qian
Date: 2010-01-29 01:56:35 -0500 (Fri, 29 Jan 2010)
New Revision: 20010
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ServiceSampleCreationCommand.java
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java
Log:
JBIDE-5715: create a wizard for generating a sample web service class in a dynamic project
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java 2010-01-29 06:54:07 UTC (rev 20009)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ClientSampleCreationCommand.java 2010-01-29 06:56:35 UTC (rev 20010)
@@ -19,6 +19,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaProject;
@@ -51,7 +52,6 @@
.getProperty("line.separator"); //$NON-NLS-1$
private static final String PACAKAGE = ".*"; //$NON-NLS-1$
private static final String PACAKAGESPLIT = "\\."; //$NON-NLS-1$
- private static final String SRC = "src"; //$NON-NLS-1$
private ServiceModel model;
private int serviceNum = 1;
@@ -195,15 +195,18 @@
sb.append(" System.out.println(\"Server said: \" + "); //$NON-NLS-1$
sb.append("port").append(portNum).append("."); //$NON-NLS-1$ //$NON-NLS-2$
sb.append(method.getName()).append("("); //$NON-NLS-1$
-
+
boolean noNull = true;
for (int j = 0; j < method.parameters().size(); j++) {
- noNull = createWebServiceOperationParameters(method.parameters(),sb, j) && noNull;
+ noNull = createWebServiceOperationParameters(method
+ .parameters(), sb, j)
+ && noNull;
}
sb.append("));"); //$NON-NLS-1$
sb.append(LINE_SEPARATOR);
- if(!noNull){
- sb.append(" //Please input the parameters instead of 'null' for the upper method!"); //$NON-NLS-1$
+ if (!noNull) {
+ sb
+ .append(" //Please input the parameters instead of 'null' for the upper method!"); //$NON-NLS-1$
sb.append(LINE_SEPARATOR);
sb.append(LINE_SEPARATOR);
}
@@ -222,7 +225,8 @@
@SuppressWarnings("unchecked")
private boolean createWebServiceOperationParameters(List list,
StringBuffer sb, int j) {
- SingleVariableDeclaration para = (SingleVariableDeclaration)list.get(j);
+ SingleVariableDeclaration para = (SingleVariableDeclaration) list
+ .get(j);
if ("String".equals(para.getType().toString())) { //$NON-NLS-1$
sb.append("args[").append(argsNum).append("]"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -232,12 +236,12 @@
argsNum += 1;
return true;
}
-
- if(list.get(j) instanceof Object){
+
+ if (list.get(j) instanceof Object) {
sb.append("null"); //$NON-NLS-1$
if (j != list.size() - 1) {
sb.append(","); //$NON-NLS-1$
- }
+ }
return false;
}
return true;
@@ -320,11 +324,17 @@
*
* @param project
* @return
+ * @throws JavaModelException
*/
- private IPath addPackagetoPath(IJavaProject project) {
+ private IPath addPackagetoPath(IJavaProject project)
+ throws JavaModelException {
String packagename = model.getCustomPackage();
String[] names = packagename.split(PACAKAGESPLIT);
- IPath path = project.getPath().append(SRC);
+ IPath path = new Path(JBossWSCreationUtils
+ .getJavaProjectSrcLocation(project.getProject()));
+ path = project.getPath().append(
+ path.makeRelativeTo(project.getProject().getLocation()));
+
if (names != null && names.length > 0) {
for (String name : names) {
path = path.append(name);
@@ -347,8 +357,11 @@
String className, boolean isInterface, String interfaceName,
IJavaProject javaProject) {
try {
- IPath srcPath = javaProject.getProject().getFolder(SRC)
- .getFullPath();
+ IPath srcPath = new Path(JBossWSCreationUtils
+ .getJavaProjectSrcLocation(javaProject.getProject()));
+ srcPath = javaProject.getPath().append(
+ srcPath.makeRelativeTo(javaProject.getProject()
+ .getLocation()));
IPackageFragmentRoot root = javaProject
.findPackageFragmentRoot(srcPath);
if (packageName == null) {
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ServiceSampleCreationCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ServiceSampleCreationCommand.java 2010-01-29 06:54:07 UTC (rev 20009)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ServiceSampleCreationCommand.java 2010-01-29 06:56:35 UTC (rev 20010)
@@ -5,6 +5,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
import org.eclipse.jdt.core.ICompilationUnit;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IPackageFragment;
@@ -21,7 +22,6 @@
public class ServiceSampleCreationCommand extends AbstractDataModelOperation {
private ServiceModel model;
- private static final String SRC = "src"; //$NON-NLS-1$
public static final String LINE_SEPARATOR = System
.getProperty("line.separator"); //$NON-NLS-1$
@@ -51,7 +51,11 @@
private ICompilationUnit createJavaClass(String packageName,
String className, IJavaProject project) {
try {
- IPath srcPath = project.getProject().getFolder(SRC).getFullPath();
+ IPath srcPath = new Path(JBossWSCreationUtils
+ .getJavaProjectSrcLocation(project.getProject()));
+ srcPath = project.getPath().append(
+ srcPath.makeRelativeTo(project.getProject()
+ .getLocation()));
IPackageFragmentRoot root = project
.findPackageFragmentRoot(srcPath);
if (packageName == null) {
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2010-01-29 06:54:07 UTC (rev 20009)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/utils/JBossWSCreationUtils.java 2010-01-29 06:56:35 UTC (rev 20010)
@@ -43,7 +43,9 @@
import org.eclipse.jdt.core.IParent;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
+import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.ModuleCoreNature;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
@@ -71,6 +73,7 @@
"return", "short", "static", "strictfp", "super", "switch", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
"synchronized", "this", "throw", "throws", "transient", "true", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
"try", "void", "volatile", "while" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ static final String WEBINF = "WEB-INF"; //$NON-NLS-1$
public static boolean isJavaKeyword(String keyword) {
if (hasUpperCase(keyword)) {
@@ -111,11 +114,10 @@
public static String pathToWebProjectContainer(String project) {
IPath projectRoot = getProjectRoot(project);
- IPath currentDynamicWebProjectDir = J2EEUtils
- .getWebContentPath(getProjectByName(project));
- IPath currentDynamicWebProjectDirWithoutProjectRoot = J2EEUtils
- .getWebContentPath(getProjectByName(project))
- .removeFirstSegments(1).makeAbsolute();
+ IPath currentDynamicWebProjectDir = getWebContentRootPath(getProjectByName(project));
+ IPath currentDynamicWebProjectDirWithoutProjectRoot = getWebContentRootPath(
+ getProjectByName(project)).removeFirstSegments(1)
+ .makeAbsolute();
if (projectRoot.toOSString().contains(getWorkspace().toOSString())) {
return getWorkspace().append(currentDynamicWebProjectDir)
.toOSString();
@@ -128,10 +130,10 @@
public static String pathToWebProjectContainerWEBINF(String project) {
IPath projectRoot = getProjectRoot(project);
- IPath webContainerWEBINFDir = J2EEUtils
- .getWebInfPath(getProjectByName(project));
- IPath webContainerWEBINFDirWithoutProjectRoot = J2EEUtils
- .getWebInfPath(getProjectByName(project))
+ IPath webContainerWEBINFDir = getWebContentRootPath(
+ getProjectByName(project)).append(WEBINF);
+ IPath webContainerWEBINFDirWithoutProjectRoot = getWebContentRootPath(
+ getProjectByName(project)).append(WEBINF)
.removeFirstSegments(1).makeAbsolute();
if (projectRoot.toOSString().contains(getWorkspace().toOSString())) {
return getWorkspace().append(webContainerWEBINFDir).toOSString();
@@ -360,47 +362,55 @@
return ""; //$NON-NLS-1$
}
-
- public static boolean supportSOAP12(String projectName){
+
+ public static boolean supportSOAP12(String projectName) {
try {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- if(project == null){
+ IProject project = ResourcesPlugin.getWorkspace().getRoot()
+ .getProject(projectName);
+ if (project == null) {
return false;
}
-
+
IFacetedProject facetedPrj = ProjectFacetsManager.create(project);
- IProjectFacet jbossWSFacet = ProjectFacetsManager.getProjectFacet(JBossWSFacetInstallDataModelProvider.JBOSS_WS_FACET_ID);
- IProjectFacetVersion fpVersion = facetedPrj.getProjectFacetVersion(jbossWSFacet);
- if(fpVersion != null && fpVersion.getVersionString().compareTo("3.0") >= 0){ //$NON-NLS-1$
+ IProjectFacet jbossWSFacet = ProjectFacetsManager
+ .getProjectFacet(JBossWSFacetInstallDataModelProvider.JBOSS_WS_FACET_ID);
+ IProjectFacetVersion fpVersion = facetedPrj
+ .getProjectFacetVersion(jbossWSFacet);
+ if (fpVersion != null
+ && fpVersion.getVersionString().compareTo("3.0") >= 0) { //$NON-NLS-1$
return true;
}
-
-// if the project doesn't get JBossWS facet installed, check its primary target runtime
-// if the jboss runtime version is 5.0 or higher, return true
- org.eclipse.wst.common.project.facet.core.runtime.IRuntime targetRuntime = facetedPrj.getPrimaryRuntime();
- if(targetRuntime != null){
+
+ // if the project doesn't get JBossWS facet installed, check its
+ // primary target runtime
+ // if the jboss runtime version is 5.0 or higher, return true
+ org.eclipse.wst.common.project.facet.core.runtime.IRuntime targetRuntime = facetedPrj
+ .getPrimaryRuntime();
+ if (targetRuntime != null) {
IRuntime runtime = getRuntime(targetRuntime);
IRuntimeType rt = runtime.getRuntimeType();
- if(rt.getName().toUpperCase().indexOf("JBOSS") >= 0){ //$NON-NLS-1$
+ if (rt.getName().toUpperCase().indexOf("JBOSS") >= 0) { //$NON-NLS-1$
String runtimeVersion = rt.getVersion();
- if(runtimeVersion != null && runtimeVersion.compareTo("5.0") >= 0){ //$NON-NLS-1$
+ if (runtimeVersion != null
+ && runtimeVersion.compareTo("5.0") >= 0) { //$NON-NLS-1$
return true;
}
}
-
+
}
} catch (CoreException e) {
-// ignore
-// e.printStackTrace();
+ // ignore
+ // e.printStackTrace();
}
-
- //check the version of default jbossws runtime configured at the Web Service preference page
+
+ // check the version of default jbossws runtime configured at the Web
+ // Service preference page
JBossWSRuntime jbws = JBossWSRuntimeManager.getInstance()
- .getDefaultRuntime();
- if(jbws != null && "3.0".compareTo(jbws.getVersion()) <= 0){ //$NON-NLS-1$
+ .getDefaultRuntime();
+ if (jbws != null && "3.0".compareTo(jbws.getVersion()) <= 0) { //$NON-NLS-1$
return true;
}
-
+
return false;
}
@@ -424,7 +434,8 @@
return null;
}
- public static String getJavaProjectSrcLocation(IProject project) throws JavaModelException {
+ public static String getJavaProjectSrcLocation(IProject project)
+ throws JavaModelException {
IResource[] rs = getJavaSourceRoots(project);
String src = ""; //$NON-NLS-1$
if (rs == null || rs.length == 0)
@@ -438,7 +449,8 @@
return src;
}
- public static IResource[] getJavaSourceRoots(IProject project) throws JavaModelException {
+ public static IResource[] getJavaSourceRoots(IProject project)
+ throws JavaModelException {
IJavaProject javaProject = JavaCore.create(project);
if (javaProject == null)
return null;
@@ -456,4 +468,19 @@
return resources.toArray(new IResource[resources.size()]);
}
+ public static IPath getWebContentRootPath(IProject project) {
+ if (project == null)
+ return null;
+
+ if (!ModuleCoreNature.isFlexibleProject(project))
+ return null;
+
+ IPath path = null;
+ IVirtualComponent component = ComponentCore.createComponent(project);
+ if (component != null && component.exists()) {
+ path = component.getRootFolder().getWorkspaceRelativePath();
+ }
+ return path;
+ }
+
}
15 years, 1 month
JBoss Tools SVN: r20009 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal and 3 other directories.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-01-29 01:54:07 -0500 (Fri, 29 Jan 2010)
New Revision: 20009
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
JBIDE-5742 - execution environments added with some UI changes
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java 2010-01-29 06:17:39 UTC (rev 20008)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java 2010-01-29 06:54:07 UTC (rev 20009)
@@ -14,6 +14,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.jdt.launching.IVMInstall;
+import org.eclipse.jdt.launching.environments.IExecutionEnvironment;
import org.eclipse.wst.server.core.IRuntime;
/**
@@ -23,6 +24,7 @@
public interface IJBossServerRuntime {
public static String PROPERTY_VM_ID = "PROPERTY_VM_ID"; //$NON-NLS-1$
public static String PROPERTY_VM_TYPE_ID = "PROPERTY_VM_TYPE_ID"; //$NON-NLS-1$
+ public static String PROPERTY_EXECUTION_ENVIRONMENT = "PROPERTY_EXEC_ENVIRONMENT"; //$NON-NLS-1$
public static String PROPERTY_CONFIGURATION_NAME = "org.jboss.ide.eclipse.as.core.runtime.configurationName"; //$NON-NLS-1$
public static String PROPERTY_CONFIG_LOCATION="org.jboss.ide.eclipse.as.core.runtime.configurationLocation"; //$NON-NLS-1$
@@ -30,6 +32,8 @@
public IRuntime getRuntime();
public IVMInstall getVM();
public void setVM(IVMInstall install);
+ public IExecutionEnvironment getExecutionEnvironment();
+ public void setExecutionEnvironment(IExecutionEnvironment environment);
public String getJBossConfiguration();
public void setJBossConfiguration(String config);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2010-01-29 06:17:39 UTC (rev 20008)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServerBehavior.java 2010-01-29 06:54:07 UTC (rev 20009)
@@ -26,6 +26,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
import org.eclipse.debug.core.DebugEvent;
import org.eclipse.debug.core.DebugException;
@@ -33,6 +34,7 @@
import org.eclipse.debug.core.IDebugEventSetListener;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.core.model.IProcess;
+import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.Messages;
@@ -40,6 +42,7 @@
import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger;
import org.jboss.ide.eclipse.as.core.extensions.jmx.JBossServerConnectionProvider;
import org.jboss.ide.eclipse.as.core.extensions.jmx.JMXClassLoaderRepository;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration;
import org.jboss.ide.eclipse.as.core.server.internal.launch.StopLaunchConfiguration;
@@ -286,4 +289,36 @@
connection.invoke(objectName, methodName, new Object[] { }, new String[] {});
}
+
+ // Can start / stop / restart etc
+ public IStatus canStart(String launchMode) {
+ return canChangeState(launchMode);
+ }
+ public IStatus canRestart(String launchMode) {
+ return canChangeState(launchMode);
+ }
+ public IStatus canStop() {
+ return canChangeState(null);
+ }
+ public IStatus canStop(String launchMode) {
+ return canChangeState(launchMode);
+ }
+ protected IStatus canChangeState(String launchMode) {
+ if( getServer() != null && getServer().getRuntime() != null &&
+ getRuntime().getVM() != null )
+ return Status.OK_STATUS;
+ return new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
+ "This server does not have a valid runtime environment"); //$NON-NLS-1$
+ }
+
+ private IJBossServerRuntime getRuntime() {
+ IRuntime r = getServer().getRuntime();
+ IJBossServerRuntime ajbsrt = null;
+ if (r != null) {
+ ajbsrt = (IJBossServerRuntime) r
+ .loadAdapter(IJBossServerRuntime.class,
+ new NullProgressMonitor());
+ }
+ return ajbsrt;
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2010-01-29 06:17:39 UTC (rev 20008)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2010-01-29 06:54:07 UTC (rev 20009)
@@ -10,9 +10,7 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -20,11 +18,11 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.internal.launching.environments.EnvironmentsManager;
import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstall2;
import org.eclipse.jdt.launching.IVMInstallType;
import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.jdt.launching.environments.IExecutionEnvironment;
import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IRuntimeType;
@@ -37,10 +35,10 @@
import org.jboss.ide.eclipse.as.core.util.IConstants;
public class LocalJBossServerRuntime extends RuntimeDelegate implements IJBossServerRuntime {
-
public void setDefaults(IProgressMonitor monitor) {
getRuntimeWorkingCopy().setName(getNextRuntimeName());
setAttribute(IJBossServerRuntime.PROPERTY_CONFIGURATION_NAME, IJBossServerConstants.DEFAULT_CONFIGURATION);
+ setExecutionEnvironment(getDefaultExecutionEnvironment(getRuntime().getRuntimeType()));
setVM(null);
}
@@ -91,6 +89,13 @@
return vmInstalls[i];
}
}
+ if( getExecutionEnvironment() != null ) {
+ IVMInstall[] installs = getExecutionEnvironment().getCompatibleVMs();
+ if( getExecutionEnvironment().getDefaultVM() != null )
+ return getExecutionEnvironment().getDefaultVM();
+ if( installs != null && installs.length > 0 && installs[0] != null )
+ return installs[0];
+ }
// not found, return default vm
return getDefaultVMInstall();
}
@@ -173,55 +178,29 @@
}
protected IVMInstall getDefaultVMInstall() {
- IVMInstall install = JavaRuntime.getDefaultVMInstall();
- if( install instanceof IVMInstall2 ) {
- String version = ((IVMInstall2)install).getJavaVersion();
- if( isValidJREVersion(version, getRuntime().getRuntimeType()))
- return install;
- }
- ArrayList<IVMInstall> installs = getValidJREs(getRuntime().getRuntimeType());
- Iterator<IVMInstall> i = installs.iterator();
- while(i.hasNext()) {
- IVMInstall next = i.next();
- if( next instanceof IVMInstall2 ) {
- String version = ((IVMInstall2)next).getJavaVersion();
- if( isValidJREVersion(version, getRuntime().getRuntimeType()))
- return next;
- }
- }
- return null;
+ return getExecutionEnvironment().getDefaultVM();
}
- public static ArrayList<IVMInstall> getValidJREs(IRuntimeType type) {
- ArrayList<IVMInstall> valid = new ArrayList<IVMInstall>();
- IVMInstallType[] vmInstallTypes = JavaRuntime.getVMInstallTypes();
- int size = vmInstallTypes.length;
- for (int i = 0; i < size; i++) {
- IVMInstall[] vmInstalls = vmInstallTypes[i].getVMInstalls();
- int size2 = vmInstalls.length;
- for (int j = 0; j < size2; j++) {
- if( vmInstalls[j] instanceof IVMInstall2 ) {
- String version = ((IVMInstall2)vmInstalls[j]).getJavaVersion();
- if( isValidJREVersion(version, type))
- valid.add(vmInstalls[j]);
- }
- }
- }
- return valid;
+ public static IVMInstall[] getValidJREs(IRuntimeType type) {
+ return getDefaultExecutionEnvironment(type) == null ? new IVMInstall[0]
+ : getDefaultExecutionEnvironment(type).getCompatibleVMs();
}
- public static boolean isValidJREVersion(String jreVersion, IRuntimeType rtType) {
- // all servers require at least 1.3
- String id = rtType.getId();
- if( jreVersion.startsWith(JavaCore.VERSION_1_1)) return false;
- if( jreVersion.startsWith(JavaCore.VERSION_1_2)) return false;
-
- // requires java6
- if( id.equals(IConstants.EAP_50) || id.equals(IConstants.AS_60)) {
- if( jreVersion.startsWith(JavaCore.VERSION_1_3)) return false;
- if( jreVersion.startsWith(JavaCore.VERSION_1_4)) return false;
- if( jreVersion.startsWith(JavaCore.VERSION_1_5)) return false;
+ public IExecutionEnvironment getExecutionEnvironment() {
+ String id = getAttribute(PROPERTY_EXECUTION_ENVIRONMENT, (String)null);
+ return id == null ? getDefaultExecutionEnvironment(getRuntime().getRuntimeType()) :
+ EnvironmentsManager.getDefault().getEnvironment(id);
+ }
+
+ public static IExecutionEnvironment getDefaultExecutionEnvironment(IRuntimeType rtType) {
+ String typeId = rtType.getId();
+ if( typeId.equals(IConstants.EAP_50) || typeId.equals(IConstants.AS_60)) {
+ return EnvironmentsManager.getDefault().getEnvironment("JavaSE-1.6"); //$NON-NLS-1$
}
- return true;
+ return EnvironmentsManager.getDefault().getEnvironment("J2SE-1.4"); //$NON-NLS-1$
}
+
+ public void setExecutionEnvironment(IExecutionEnvironment environment) {
+ setAttribute(PROPERTY_EXECUTION_ENVIRONMENT, environment.getId());
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java 2010-01-29 06:17:39 UTC (rev 20008)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossLaunchConfigType.java 2010-01-29 06:54:07 UTC (rev 20009)
@@ -56,11 +56,11 @@
}
protected void preLaunch(ILaunchConfiguration configuration,
- String mode, ILaunch launch, IProgressMonitor monitor) {
+ String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
// override me
}
protected void postLaunch(ILaunchConfiguration configuration,
- String mode, ILaunch launch, IProgressMonitor monitor) {
+ String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
// override me
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2010-01-29 06:17:39 UTC (rev 20008)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2010-01-29 06:54:07 UTC (rev 20009)
@@ -124,7 +124,6 @@
IJBossServerRuntime runtime = (IJBossServerRuntime)
jbs.getServer().getRuntime().loadAdapter(IJBossServerRuntime.class, null);
- IVMInstall vmInstall = runtime.getVM();
String config = runtime.getJBossConfiguration();
args = ArgsUtil.setArg(args,
IJBossRuntimeConstants.STARTUP_ARG_CONFIG_SHORT,
@@ -179,7 +178,9 @@
List<String> cp = wc.getAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, new ArrayList<String>());
List<String> newCP = fixCP(cp, jbs);
- wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH, JavaRuntime.newJREContainerPath(vmInstall).toPortableString());
+ IVMInstall vmInstall = runtime.getVM();
+ if( vmInstall != null )
+ wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_JRE_CONTAINER_PATH, JavaRuntime.newJREContainerPath(vmInstall).toPortableString());
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, serverHome + Path.SEPARATOR + IJBossRuntimeResourceConstants.BIN);
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, args.trim());
wc.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, vmArgs.trim());
@@ -277,8 +278,15 @@
return null;
}
+ public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException {
+ JBossServerBehavior jbsBehavior = getServerBehavior(configuration);
+ if( !jbsBehavior.canStart(mode).isOK())
+ throw new CoreException(jbsBehavior.canStart(mode));
+ return true;
+ }
+
protected void preLaunch(ILaunchConfiguration configuration,
- String mode, ILaunch launch, IProgressMonitor monitor) {
+ String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
try {
JBossServerBehavior jbsBehavior = getServerBehavior(configuration);
jbsBehavior.setRunMode(mode);
@@ -289,7 +297,7 @@
}
public void postLaunch(ILaunchConfiguration configuration, String mode,
- ILaunch launch, IProgressMonitor monitor) {
+ ILaunch launch, IProgressMonitor monitor) throws CoreException {
try {
IProcess[] processes = launch.getProcesses();
JBossServerBehavior jbsBehavior = getServerBehavior(configuration);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java 2010-01-29 06:17:39 UTC (rev 20008)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java 2010-01-29 06:54:07 UTC (rev 20009)
@@ -21,32 +21,9 @@
*/
package org.jboss.ide.eclipse.as.ui.wizards;
-import java.util.ArrayList;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstall2;
-import org.eclipse.jdt.launching.IVMInstallType;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime;
-import org.jboss.ide.eclipse.as.ui.Messages;
-
+@Deprecated
public class JBossRuntimeJava6WizardFragment extends JBossRuntimeWizardFragment {
-
public JBossRuntimeJava6WizardFragment() {
}
-
- protected boolean shouldIncludeDefaultJRE() {
- return false;
- }
-
- protected ArrayList<IVMInstall> getValidJREs() {
- return LocalJBossServerRuntime.getValidJREs(getRuntimeType());
- }
-
- protected String getErrorString() {
- if( !shouldIncludeDefaultJRE() && getValidJREs().size() == 0 )
- return Messages.rwf_jre6NotFound;
- return super.getErrorString();
- }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2010-01-29 06:17:39 UTC (rev 20008)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2010-01-29 06:54:07 UTC (rev 20009)
@@ -22,7 +22,8 @@
package org.jboss.ide.eclipse.as.ui.wizards;
import java.io.File;
-import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
@@ -32,8 +33,6 @@
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Preferences;
import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMInstallType;
-import org.eclipse.jdt.launching.JavaRuntime;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.dialogs.MessageDialog;
@@ -80,6 +79,7 @@
import org.eclipse.wst.server.ui.wizard.WizardFragment;
import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.util.FileUtil;
import org.jboss.ide.eclipse.as.core.util.IConstants;
import org.jboss.ide.eclipse.as.core.util.JBossServerType;
@@ -118,7 +118,7 @@
private String configDirTextVal;
// jre fields
- protected ArrayList<IVMInstall> installedJREs;
+ protected List<IVMInstall> installedJREs;
protected String[] jreNames;
protected int defaultVMIndex;
private IVMInstall selectedVM;
@@ -195,7 +195,7 @@
configurations.setConfiguration(rt.getJBossConfiguration() == null
? IConstants.DEFAULT_CONFIGURATION : rt.getJBossConfiguration());
- if (rt.isUsingDefaultJRE() && shouldIncludeDefaultJRE()) {
+ if (rt.isUsingDefaultJRE()) {
jreCombo.select(0);
} else {
IVMInstall install = rt.getVM();
@@ -556,10 +556,7 @@
configurations.setConfiguration(IJBossServerConstants.DEFAULT_CONFIGURATION);
int sel = jreCombo.getSelectionIndex();
- int offset = 0;
- if( shouldIncludeDefaultJRE() ) {
- offset = -1;
- }
+ int offset = -1;
if( sel + offset >= 0 )
selectedVM = installedJREs.get(sel + offset);
else // if sel < 0 or sel == 0 and offset == -1
@@ -590,6 +587,13 @@
return Messages.rwf_NameInUse;
}
+ if( getValidJREs().size() == 0 ) {
+ String error = "No valid JREs found for execution environment \""
+ + getRuntime().getExecutionEnvironment().getId() + "\"";
+ return error;
+ }
+
+
if (!isHomeValid())
return Messages.rwf_homeMissingFiles;
@@ -685,36 +689,21 @@
installedJREs = getValidJREs();
// get names
int size = installedJREs.size();
- size = shouldIncludeDefaultJRE() ? size+1 : size;
+ size = size+1;
int index = 0;
jreNames = new String[size];
- if( shouldIncludeDefaultJRE())
- jreNames[index++] = "Default JRE"; //$NON-NLS-1$
+ jreNames[index++] = "Default JRE for " + getRuntime().getExecutionEnvironment().getId(); //$NON-NLS-1$
for (int i = 0; i < installedJREs.size(); i++) {
IVMInstall vmInstall = installedJREs.get(i);
jreNames[index++] = vmInstall.getName();
}
- defaultVMIndex = shouldIncludeDefaultJRE() ? 0 :
- jreNames.length > 0 ? 0 : -1;
+ defaultVMIndex = 0;
}
- protected boolean shouldIncludeDefaultJRE() {
- return true;
- }
- protected ArrayList<IVMInstall> getValidJREs() {
- ArrayList<IVMInstall> valid = new ArrayList<IVMInstall>();
- IVMInstallType[] vmInstallTypes = JavaRuntime.getVMInstallTypes();
- int size = vmInstallTypes.length;
- for (int i = 0; i < size; i++) {
- IVMInstall[] vmInstalls = vmInstallTypes[i].getVMInstalls();
- int size2 = vmInstalls.length;
- for (int j = 0; j < size2; j++) {
- valid.add(vmInstalls[j]);
- }
- }
- return valid;
+ protected List<IVMInstall> getValidJREs() {
+ return Arrays.asList(LocalJBossServerRuntime.getValidJREs(getRuntimeType()));
}
// WST API methods
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2010-01-29 06:17:39 UTC (rev 20008)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2010-01-29 06:54:07 UTC (rev 20009)
@@ -30,14 +30,9 @@
point="org.eclipse.wst.server.ui.wizardFragments">
<fragment
class="org.jboss.ide.eclipse.as.ui.wizards.JBossRuntimeWizardFragment"
- typeIds="org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.eap.43"
+ typeIds="org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50,org.jboss.ide.eclipse.as.runtime.60"
id="org.jboss.ide.eclipse.as.ui.JBossRuntimeWizardFragment"/>
- <!-- Fragment for runtimes that require java 6 -->
<fragment
- class="org.jboss.ide.eclipse.as.ui.wizards.JBossRuntimeJava6WizardFragment"
- typeIds="org.jboss.ide.eclipse.as.runtime.eap.50,org.jboss.ide.eclipse.as.runtime.60"
- id="org.jboss.ide.eclipse.as.ui.JBossRuntimeJava6WizardFragment"/>
- <fragment
class="org.jboss.ide.eclipse.as.ui.wizards.JBossServerWizardFragment"
id="org.jboss.ide.eclipse.as.ui.jbossServerWizardFragment"
typeIds="org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50"/>
15 years, 1 month
JBoss Tools SVN: r20008 - in trunk/bpel/plugins/org.jboss.tools.bpel.runtimes: META-INF and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dennyxu
Date: 2010-01-29 01:17:39 -0500 (Fri, 29 Jan 2010)
New Revision: 20008
Modified:
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml
Log:
JBDS-1070: move bpel project examples site definition to one the bpel plugins
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF 2010-01-29 06:14:59 UTC (rev 20007)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/META-INF/MANIFEST.MF 2010-01-29 06:17:39 UTC (rev 20008)
@@ -29,7 +29,8 @@
org.jboss.ide.eclipse.archives.webtools;resolution:=optional,
org.jboss.tools.jmx.core;resolution:=optional,
org.eclipse.wst.server.ui;resolution:=optional,
- org.eclipse.ui.navigator
+ org.eclipse.ui.navigator,
+ org.jboss.tools.project.examples;bundle-version="1.0.1"
Eclipse-LazyStart: true
Export-Package: org.jboss.tools.bpel.runtimes,
org.jboss.tools.bpel.runtimes.facets,
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties 2010-01-29 06:14:59 UTC (rev 20007)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.properties 2010-01-29 06:17:39 UTC (rev 20008)
@@ -22,3 +22,5 @@
NEW_BPEL_CATEGORY=BPEL 2.0
NEW_BPEL_PROJECT=BPEL Project
NEW_BPEL_PROJECT_DESCRIPTION=Create a new BPEL project.
+
+JBoss_Tools_Community_BPEL_Examples=JBoss Tools Community BPEL Examples
Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml
===================================================================
--- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml 2010-01-29 06:14:59 UTC (rev 20007)
+++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/plugin.xml 2010-01-29 06:17:39 UTC (rev 20008)
@@ -253,4 +253,14 @@
</includes>
</viewerContentBinding>
</extension>
+ <extension
+ name="%JBoss_Tools_Community_BPEL_Examples"
+ point="org.jboss.tools.project.examples.projectExamplesXml">
+ <url>
+ http://download.jboss.org/jbosstools/examples/project-examples-bpel-3.1.xml
+ </url>
+ <experimental>
+ false
+ </experimental>
+ </extension>
</plugin>
15 years, 1 month
JBoss Tools SVN: r20007 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui: console and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-01-29 01:14:59 -0500 (Fri, 29 Jan 2010)
New Revision: 20007
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/ShowConsoleServerStateListener.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
Log:
JBIDE-5739 - show in console on server startup (with a 3second delay)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2010-01-29 06:11:28 UTC (rev 20006)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2010-01-29 06:14:59 UTC (rev 20007)
@@ -30,11 +30,11 @@
import org.eclipse.ui.IDecoratorManager;
import org.eclipse.ui.IStartup;
import org.eclipse.ui.internal.WorkbenchPlugin;
-import org.eclipse.ui.internal.decorators.DecoratorDefinition;
import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.server.ui.internal.ServerUIPlugin;
import org.eclipse.wst.server.ui.internal.ServerUIPreferences;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.jboss.ide.eclipse.as.core.server.UnitedServerListenerManager;
+import org.jboss.ide.eclipse.as.ui.console.ShowConsoleServerStateListener;
import org.osgi.framework.BundleContext;
/**
@@ -78,14 +78,15 @@
new ServerUIPreferences().setShowOnActivity(false);
prefs.setValue(IPreferenceKeys.DISABLE_SHOW_SERVER_VIEW, true);
}
-
savePluginPreferences();
+ UnitedServerListenerManager.getDefault().addListener(ShowConsoleServerStateListener.getDefault());
}
/**
* This method is called when the plug-in is stopped
*/
public void stop(BundleContext context) throws Exception {
+ UnitedServerListenerManager.getDefault().removeListener(ShowConsoleServerStateListener.getDefault());
JBossServerUISharedImages.instance().cleanup();
super.stop(context);
}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/ShowConsoleServerStateListener.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/ShowConsoleServerStateListener.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/console/ShowConsoleServerStateListener.java 2010-01-29 06:14:59 UTC (rev 20007)
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.ui.console;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.ServerEvent;
+import org.eclipse.wst.server.ui.internal.view.servers.ShowInConsoleAction;
+import org.jboss.ide.eclipse.as.core.server.UnitedServerListener;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
+
+public class ShowConsoleServerStateListener extends UnitedServerListener {
+ private static ShowConsoleServerStateListener instance;
+ public static ShowConsoleServerStateListener getDefault() {
+ if( instance == null )
+ instance = new ShowConsoleServerStateListener();
+ return instance;
+ }
+ public void serverChanged(ServerEvent event) {
+ final IServer server = event.getServer();
+ JBossServer jbs = (JBossServer)server.loadAdapter(JBossServer.class, new NullProgressMonitor());
+ if( jbs != null ) {
+ int eventKind = event.getKind();
+ if ((eventKind & ServerEvent.SERVER_CHANGE) != 0) {
+ // server change event
+ if ((eventKind & ServerEvent.STATE_CHANGE) != 0) {
+ if( event.getServer().getServerState() == IServer.STATE_STARTING ) {
+ new Thread() {
+ public void run() {
+ try {
+ // delay to insure the server gets a chance to actually launch
+ Thread.sleep(3000);
+ } catch(InterruptedException ie) {}
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ new ShowInConsoleAction(getNullSelectionProvider()).perform(server);
+ }
+ });
+ }
+ }.start();
+ }
+ }
+ }
+ }
+ }
+
+ protected ISelectionProvider getNullSelectionProvider() {
+ return new ISelectionProvider() {
+ public void addSelectionChangedListener(
+ ISelectionChangedListener listener) {
+ }
+ public ISelection getSelection() {
+ return null;
+ }
+ public void removeSelectionChangedListener(
+ ISelectionChangedListener listener) {
+ }
+ public void setSelection(ISelection selection) {
+ }
+ };
+ }
+}
15 years, 1 month
JBoss Tools SVN: r20006 - workspace/examples.
by jbosstools-commits@lists.jboss.org
Author: dennyxu
Date: 2010-01-29 01:11:28 -0500 (Fri, 29 Jan 2010)
New Revision: 20006
Added:
workspace/examples/project-examples-bpel-3.1.xml
Removed:
workspace/examples/project-examples-3.1M4.xml
Log:
JBDS-1070: move bpel project examples site definition to one the bpel plugins
Deleted: workspace/examples/project-examples-3.1M4.xml
===================================================================
--- workspace/examples/project-examples-3.1M4.xml 2010-01-29 06:02:57 UTC (rev 20005)
+++ workspace/examples/project-examples-3.1M4.xml 2010-01-29 06:11:28 UTC (rev 20006)
@@ -1,5 +0,0 @@
-<projects>
-
-
-</projects>
-
Added: workspace/examples/project-examples-bpel-3.1.xml
===================================================================
--- workspace/examples/project-examples-bpel-3.1.xml (rev 0)
+++ workspace/examples/project-examples-bpel-3.1.xml 2010-01-29 06:11:28 UTC (rev 20006)
@@ -0,0 +1,24 @@
+<projects>
+<project>
+ <category>BPEL</category>
+ <name>HelloWorld</name>
+ <shortDescription>A simple BPEL example</shortDescription>
+ <description>This sample is to show a simple BPEL2.0 example.</description>
+ <size>10000</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/grid/esb-example/Hell...
+ </url>
+ </project>
+
+ <project>
+ <category>BPEL</category>
+ <name>Simple_Correlation</name>
+ <shortDescription>A correlation BPEL example</shortDescription>
+ <description>This sample is to show how to use the correlation in the BPEL2.0 example.</description>
+ <size>11000</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/grid/esb-example/Simp...
+ </url>
+ </project>
+</projects>
+
15 years, 1 month
JBoss Tools SVN: r20005 - workspace/examples.
by jbosstools-commits@lists.jboss.org
Author: dennyxu
Date: 2010-01-29 01:02:57 -0500 (Fri, 29 Jan 2010)
New Revision: 20005
Modified:
workspace/examples/project-examples-3.0.xml
Log:
Rollback changes for Add ESB project examples for soa-p5.0,
it should be added project-examples-jbds30.xml
Modified: workspace/examples/project-examples-3.0.xml
===================================================================
--- workspace/examples/project-examples-3.0.xml 2010-01-29 05:51:46 UTC (rev 20004)
+++ workspace/examples/project-examples-3.0.xml 2010-01-29 06:02:57 UTC (rev 20005)
@@ -440,246 +440,6 @@
</project>
<project>
- <category>ESB for SOA-P 5.0</category>
- <name>helloworld</name>
- <shortDescription>JBoss ESB HelloWorld Example - ESB</shortDescription>
- <description>NOTE: Before import this example, please make sure that there is a runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
- This example is to prove that the ESB is is properly configured and happy.
-As well as to demonstrate the needed minimal files to make a basic ESB component execute.</description>
- <size>59000</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
- </url>
- </project>
-
- <project>
- <category>ESB for SOA-P 5.0</category>
- <name>helloworld_testclient</name>
- <shortDescription>JBoss ESB HelloWorld Example - Client</shortDescription>
- <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
- This example is to demonstrate how to invoke the deployed HelloWorld ESB. It requires the helloworld project.</description>
- <size>1000000</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
- </url>
- </project>
-
- <project>
- <category>ESB for SOA-P 5.0</category>
- <name>helloworld_action</name>
- <shortDescription>JBoss ESB HelloWorld Action Example - ESB</shortDescription>
- <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
- This sample is to demonstrate the use of multiple action invocations from a single configuration. You can use
- a single Action class and make multiple method calls or use multiple Action
- classes.</description>
- <size>7100</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
- </url>
- </project>
-
- <project>
- <category>ESB for SOA-P 5.0</category>
- <name>helloworld_action_client</name>
- <shortDescription>JBoss ESB HelloWorld Action Example - Client</shortDescription>
- <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
- This sample is to test the deployed helloworld_action ESB. It requires the helloworld_action project</description>
- <size>18694</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
- </url>
- </project>
-
- <project>
- <category>ESB for SOA-P 5.0</category>
- <name>helloworld_file_action</name>
- <shortDescription>JBoss ESB HelloWorld File Action Example - ESB</shortDescription>
- <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
- This is a basic example of using the File gateway feature of the JBoss ESB.
- Files that are found in a particular directory with a particular extension
- are sent to a JMS queue with actions for processing. Before deploy the project, please change some properties according to the readme.txt file.</description>
- <size>7920</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
- </url>
- </project>
-
- <project>
- <category>ESB for SOA-P 5.0</category>
- <name>helloworld_file_action_client</name>
- <shortDescription>JBoss ESB HelloWorld File Action Example - Client</shortDescription>
- <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
- This sample is to test the deployed helloworld_file_action ESB. It requires the helloworld_file_action project.</description>
- <size>18694</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
- </url>
- </project>
- <project>
- <category>ESB for SOA-P 5.0</category>
- <name>webservice_consumer1</name>
- <shortDescription>JBoss ESB Web Service consumer1 Example</shortDescription>
- <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
- This example demonstrates how to consume a 181 Web Service in an ESB action.
- This ESB will make a webservice request that requires a single "toWhom" string parameter.
- The webservice will return a greeting response. The ESB simply dislays the response on the
- console.</description>
- <size>22500</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
- </url>
- </project>
-
- <project>
- <category>ESB for SOA-P 5.0</category>
- <name>webservice_consumer1_client</name>
- <shortDescription>JBoss ESB Web Service consumer1 Example - Client</shortDescription>
- <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
- This sample is to test the deployed a comsumer web service.It requires the webservice_consumer1 project.</description>
- <size>1000000</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
- </url>
- </project>
-
- <project>
- <category>ESB for SOA-P 5.0</category>
- <name>webservice_producer</name>
- <shortDescription>JBoss ESB Web Service producer Example</shortDescription>
- <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
- This sample demonstrates how to deploy a JSR181 Webservice endpoint on
- JBossESB using the SOAPProcessor action.</description>
- <size>53000</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
- </url>
- </project>
-
- <project>
- <category>ESB for SOA-P 5.0</category>
- <name>webservice_producer_client</name>
- <shortDescription>JBoss ESB Web Service producer Example - Client</shortDescription>
- <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
- This sample is to test the deployed a web service endpoint.It requires the webservice_producer project.</description>
- <size>14200</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
- </url>
- </project>
-
- <project>
- <category>ESB for SOA-P 5.0</category>
- <name>transform_CSV2XML</name>
- <shortDescription>JBoss ESB Smooks CSV->XML Example</shortDescription>
- <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
- This sample demonstrates how to transform a comma separated value (CSV) file to an xml.
- The tranformation is done by configuring Smooks and performing two transformation, one
- transformation from CSV to an intermediate xml format, and a second transformation from
- the intermediate xml format to the target xml.</description>
- <size>7200</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
- </url>
- </project>
-
- <project>
- <category>ESB for SOA-P 5.0</category>
- <name>transform_CSV2XML_client</name>
- <shortDescription>JBoss ESB Smooks CSV->XML Example - Client</shortDescription>
- <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
- This sample is to test the JBoss ESB smooks CSV->XML transformation.It requires the transform_CSV2XML project.</description>
- <size>16600</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
- </url>
- </project>
-
- <project>
- <category>ESB for SOA-P 5.0</category>
- <name>transform_XML2POJO</name>
- <shortDescription>JBoss ESB Smooks XML->POJO Example</shortDescription>
- <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
- The purpose of the simple_transformation sample is to illustrate the
-use of Smooks performing a simple transformation by converting a XML file into
-Java POJOs.</description>
- <size>26600</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
- </url>
- </project>
-
- <project>
- <category>ESB for SOA-P 5.0</category>
- <name>transform_XML2POJO_client</name>
- <shortDescription>JBoss ESB Smooks XML->POJO Example - Client</shortDescription>
- <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
- This sample is to test the JBoss ESB smooks XML->POJO transformation.It requires the transform_XML2POJO project.</description>
- <size>22400</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
- </url>
- </project>
-
- <project>
- <category>ESB for SOA-P 5.0</category>
- <name>transform_XML2XML_date_manipulation</name>
- <shortDescription>JBoss ESB Smooks XML->XML date-manipulation Example</shortDescription>
- <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
- This is another simple sample of how to manually define and apply a Message
- Transformation within JBoss ESB.
-
- This sample is an extension of the "transformation_XML2XML_simple"
- Quickstart, demonstrating how JBoss ESB Transformations can simplify your
- XSLT transformations by combining the power of XSLT with Java. In this
- Quickstart, we use Java to perform the ugly string manipulation on the
- SampleOrder date field (see OrderDate.java) and use XSLT for what it's good at
- i.e. Templating. Again, the transformed SampleOrder.xml message is just
- printed to the Java console (message before and after).</description>
- <size>13600</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
- </url>
- </project>
-
- <project>
- <category>ESB for SOA-P 5.0</category>
- <name>transform_XML2XML_date_manipulation_client</name>
- <shortDescription>JBoss ESB Smooks XML->XML date-manipulation Example - Client</shortDescription>
- <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
- This sample is to test the JBoss ESB XML->XML date-manipulation transformation.It requires the transform_XML2XML_date_manipulation project.</description>
- <size>18600</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
- </url>
- </project>
-
- <project>
- <category>ESB for SOA-P 5.0</category>
- <name>transform_XML2XML_simple</name>
- <shortDescription>JBoss ESB Smooks XML->XML Example</shortDescription>
- <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
- This is a very basic sample of how to manually define and apply a Message
- Transformation within JBoss ESB. It applies a very simple XSLT to a
- SampleOrder.xml message and prints the before and after XML to the console.</description>
- <size>6700</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
- </url>
- </project>
-
- <project>
- <category>ESB for SOA-P 5.0</category>
- <name>transform_XML2XML_simple_client</name>
- <shortDescription>JBoss ESB Smooks XML->XML Example - Client</shortDescription>
- <description>NOTE: Before import this example, please make sure that there is runtime named "jboss-soa-p.5.0 Runtime" in the workspace.
- This sample is to test the JBoss ESB XML->XML transformation.It requires the transform_XML2XML_simple project.</description>
- <size>17800</size>
- <url>
- http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
- </url>
- </project>
-
- <project>
<category>RESTEasy</category>
<name>simple</name>
<included-projects>
15 years, 1 month
JBoss Tools SVN: r20004 - trunk/bpel/releng.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-01-29 00:51:46 -0500 (Fri, 29 Jan 2010)
New Revision: 20004
Modified:
trunk/bpel/releng/build.properties
trunk/bpel/releng/build.properties.example.hudson.qa.jboss.com
trunk/bpel/releng/build.properties.example.linux
trunk/bpel/releng/build.properties.example.windows
Log:
enable cached repos for faster build time
Modified: trunk/bpel/releng/build.properties
===================================================================
--- trunk/bpel/releng/build.properties 2010-01-29 05:35:10 UTC (rev 20003)
+++ trunk/bpel/releng/build.properties 2010-01-29 05:51:46 UTC (rev 20004)
@@ -19,17 +19,16 @@
JAVA50_HOME=${JAVA_HOME}
JAVA60_HOME=${JAVA_HOME}
-# To make the build go faster, input a local update site zip (or use locally cached zips instead of galileo site)
-# jar:file:/tmp/build/downloads/JBossTools-Update-3.1.0.v200912081204N-H34-GA.zip!/,
+# To make the build go faster, use locally cached zips instead of galileo site
repositoryURLs=\
http://download.jboss.org/jbosstools/updates/nightly/trunk/,\
-http://download.eclipse.org/releases/galileo/
-#http://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-R-3.5.1-200909170800.zip,\
-#http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.1.zip,\
-#http://repository.jboss.org/eclipse/galileo/repos/dtp-Updates-1.7-20090908.zip,\
-#http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip,\
-#http://repository.jboss.org/eclipse/galileo/repos/jst-buildrepo-R-3.1.1-20090917225226.zip,\
-#http://repository.jboss.org/eclipse/galileo/repos/wst-buildrepo-R-3.1.1-20090917225226.zip
+http://download.eclipse.org/releases/galileo/,\
+http://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-R-3.5.1-200909170800.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.1.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/dtp-Updates-1.7-20090908.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/jst-buildrepo-R-3.1.1-20090917225226.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/wst-buildrepo-R-3.1.1-20090917225226.zip
# required if building bpel.compare.ui: org.eclipse.gmf.runtime.diagram.ui+org.eclipse.emf.compare.match+org.eclipse.emf.compare.diff+org.eclipse.emf.compare.ui+\
IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide+org.eclipse.core.net+org.eclipse.equinox.common+org.eclipse.core.runtime+org.eclipse.debug.core+org.eclipse.rcp.feature.group+\
Modified: trunk/bpel/releng/build.properties.example.hudson.qa.jboss.com
===================================================================
--- trunk/bpel/releng/build.properties.example.hudson.qa.jboss.com 2010-01-29 05:35:10 UTC (rev 20003)
+++ trunk/bpel/releng/build.properties.example.hudson.qa.jboss.com 2010-01-29 05:51:46 UTC (rev 20004)
@@ -13,23 +13,22 @@
testFeatureToBuildID=org.jboss.tools.bpel.tests.feature
# on windows or mac, use testLocal; on linux use test (requires Xvnc or Xvfb)
-build.steps=buildUpdate,buildTests,generateDigests,testLocal,publish,cleanup
+build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup
JAVA14_HOME=${JAVA_HOME}
JAVA50_HOME=${JAVA_HOME}
JAVA60_HOME=${JAVA_HOME}
-# To make the build go faster, input a local update site zip (or use locally cached zips instead of galileo site)
-# jar:file:/tmp/build/downloads/JBossTools-Update-3.1.0.v200912081204N-H34-GA.zip!/,
+# To make the build go faster, use locally cached zips instead of galileo site
repositoryURLs=\
http://download.jboss.org/jbosstools/updates/nightly/trunk/,\
-http://download.eclipse.org/releases/galileo/
-#http://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-R-3.5.1-200909170800.zip,\
-#http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.1.zip,\
-#http://repository.jboss.org/eclipse/galileo/repos/dtp-Updates-1.7-20090908.zip,\
-#http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip,\
-#http://repository.jboss.org/eclipse/galileo/repos/jst-buildrepo-R-3.1.1-20090917225226.zip,\
-#http://repository.jboss.org/eclipse/galileo/repos/wst-buildrepo-R-3.1.1-20090917225226.zip
+http://download.eclipse.org/releases/galileo/,\
+http://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-R-3.5.1-200909170800.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.1.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/dtp-Updates-1.7-20090908.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/jst-buildrepo-R-3.1.1-20090917225226.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/wst-buildrepo-R-3.1.1-20090917225226.zip
# required if building bpel.compare.ui: org.eclipse.gmf.runtime.diagram.ui+org.eclipse.emf.compare.match+org.eclipse.emf.compare.diff+org.eclipse.emf.compare.ui+\
IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide+org.eclipse.core.net+org.eclipse.equinox.common+org.eclipse.core.runtime+org.eclipse.debug.core+org.eclipse.rcp.feature.group+\
Modified: trunk/bpel/releng/build.properties.example.linux
===================================================================
--- trunk/bpel/releng/build.properties.example.linux 2010-01-29 05:35:10 UTC (rev 20003)
+++ trunk/bpel/releng/build.properties.example.linux 2010-01-29 05:51:46 UTC (rev 20004)
@@ -21,6 +21,13 @@
#org.jboss.tools.common -> /path/to/common/plugins/org.jboss.tools.common/
#org.jboss.tools.tests -> /path/to/tests/tests/org.jboss.tools.tests/
+# to (re)generate map and psfs, use these settings
+#build.steps=dir2svnmap,map2psf
+#dir2map.reporoot = http://anonsvn.jboss.org/repos
+#dir2map.repopath = jbosstools/trunk/bpel
+#dir2map.dir = /home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/bpel
+#dir2map.map = /home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/bpel/releng/maps/project.map
+
localSourceCheckoutDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/bpel
relengBuilderDir=/home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/bpel/releng
relengBaseBuilderDir=/home/nboldt/eclipse/workspace-jboss/org.eclipse.releng.basebuilder
@@ -31,17 +38,16 @@
JAVA50_HOME=/usr/lib/jvm/java
JAVA60_HOME=/usr/lib/jvm/java
-# To make the build go faster, input a local update site zip (or use locally cached zips instead of galileo site)
-# jar:file:/tmp/build/downloads/JBossTools-Update-3.1.0.v200912081204N-H34-GA.zip!/,
+# To make the build go faster, use locally cached zips instead of galileo site
repositoryURLs=\
http://download.jboss.org/jbosstools/updates/nightly/trunk/,\
-http://download.eclipse.org/releases/galileo/
-#http://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-R-3.5.1-200909170800.zip,\
-#http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.1.zip,\
-#http://repository.jboss.org/eclipse/galileo/repos/dtp-Updates-1.7-20090908.zip,\
-#http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip,\
-#http://repository.jboss.org/eclipse/galileo/repos/jst-buildrepo-R-3.1.1-20090917225226.zip,\
-#http://repository.jboss.org/eclipse/galileo/repos/wst-buildrepo-R-3.1.1-20090917225226.zip
+http://download.eclipse.org/releases/galileo/,\
+http://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-R-3.5.1-200909170800.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.1.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/dtp-Updates-1.7-20090908.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/jst-buildrepo-R-3.1.1-20090917225226.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/wst-buildrepo-R-3.1.1-20090917225226.zip
# required if building bpel.compare.ui: org.eclipse.gmf.runtime.diagram.ui+org.eclipse.emf.compare.match+org.eclipse.emf.compare.diff+org.eclipse.emf.compare.ui+\
IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide+org.eclipse.core.net+org.eclipse.equinox.common+org.eclipse.core.runtime+org.eclipse.debug.core+org.eclipse.rcp.feature.group+\
Modified: trunk/bpel/releng/build.properties.example.windows
===================================================================
--- trunk/bpel/releng/build.properties.example.windows 2010-01-29 05:35:10 UTC (rev 20003)
+++ trunk/bpel/releng/build.properties.example.windows 2010-01-29 05:51:46 UTC (rev 20004)
@@ -15,13 +15,6 @@
# on windows or mac, use testLocal; on linux use test (requires Xvnc or Xvfb)
build.steps=buildUpdate,buildTests,generateDigests,testLocal,publish,cleanup
-# to (re)generate map and psfs, use these settings
-#build.steps=dir2svnmap,map2psf
-#dir2map.reporoot = http://anonsvn.jboss.org/repos
-#dir2map.repopath = jbosstools/trunk/bpel
-#dir2map.dir = /home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/bpel
-#dir2map.map = /home/nboldt/eclipse/workspace-jboss/jbosstools-trunk/bpel/releng/maps/project.map
-
# Re-use local sources?
# note: to run tests locally, these plugins must be pre-checked out into the local source folder:
#org.jboss.tools.common.test -> /path/to/common/tests/org.jboss.tools.common.test/
@@ -40,25 +33,16 @@
JAVA50_HOME=C:/Progra~1/Java/jdk1.6.0_11
JAVA60_HOME=C:/Progra~1/Java/jdk1.6.0_11
-# To make the build go faster, input a local update site zip (or use locally cached zips instead of galileo site)
-# jar:file:/tmp/build/downloads/JBossTools-Update-3.1.0.v200912081204N-H34-GA.zip!/,
+# To make the build go faster, use locally cached zips instead of galileo site
repositoryURLs=\
http://download.jboss.org/jbosstools/updates/nightly/trunk/,\
-http://download.eclipse.org/releases/galileo/
-#http://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-R-3.5.1-200909170800.zip,\
-#http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.1.zip,\
-#http://repository.jboss.org/eclipse/galileo/repos/dtp-Updates-1.7-20090908.zip,\
-#http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip,\
-#http://repository.jboss.org/eclipse/galileo/repos/jst-buildrepo-R-3.1.1-20090917225226.zip,\
-#http://repository.jboss.org/eclipse/galileo/repos/wst-buildrepo-R-3.1.1-20090917225226.zip
-# Alt location for repos: mirror_id=581 = Amazon AWS mirror
-#http://www.eclipse.org/downloads/download.php?mirror_id=581&r=1&file=/athena/repos/eclipse-Update-R-3.5.1-200909170800.zip,\
-#http://www.eclipse.org/downloads/download.php?mirror_id=581&r=1&file=/athena/repos/GEF-Update-3.5.1.zip,\
-#http://www.eclipse.org/downloads/download.php?mirror_id=581&r=1&file=/athena/repos/dtp-Updates-1.7-20090908.zip,\
-#http://www.eclipse.org/downloads/download.php?mirror_id=581&r=1&file=/athena/repos/emf-xsd-Update-2.5.0.zip,\
-#http://www.eclipse.org/downloads/download.php?mirror_id=581&r=1&file=/athena/repos/jst-buildrepo-R-3.1.1-20090917225226.zip,\
-#http://www.eclipse.org/downloads/download.php?mirror_id=581&r=1&file=/athena/repos/wst-buildrepo-R-3.1.1-20090917225226.zip
-# alternative locations from which to fetch IUs
+http://download.eclipse.org/releases/galileo/,\
+http://repository.jboss.org/eclipse/galileo/repos/eclipse-Update-R-3.5.1-200909170800.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/GEF-Update-3.5.1.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/dtp-Updates-1.7-20090908.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/emf-xsd-Update-2.5.0.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/jst-buildrepo-R-3.1.1-20090917225226.zip,\
+http://repository.jboss.org/eclipse/galileo/repos/wst-buildrepo-R-3.1.1-20090917225226.zip
# required if building bpel.compare.ui: org.eclipse.gmf.runtime.diagram.ui+org.eclipse.emf.compare.match+org.eclipse.emf.compare.diff+org.eclipse.emf.compare.ui+\
IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide+org.eclipse.core.net+org.eclipse.equinox.common+org.eclipse.core.runtime+org.eclipse.debug.core+org.eclipse.rcp.feature.group+\
15 years, 1 month
JBoss Tools SVN: r20003 - trunk/bpel/releng.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-01-29 00:35:10 -0500 (Fri, 29 Jan 2010)
New Revision: 20003
Removed:
trunk/bpel/releng/custom-library.xml
Log:
moved into athena's common.releng/builder/tests/
Deleted: trunk/bpel/releng/custom-library.xml
===================================================================
--- trunk/bpel/releng/custom-library.xml 2010-01-29 05:34:22 UTC (rev 20002)
+++ trunk/bpel/releng/custom-library.xml 2010-01-29 05:35:10 UTC (rev 20003)
@@ -1,170 +0,0 @@
-<?xml version="1.0"?>
-<project name="Library" default="usage" basedir=".">
-
- <target name="usage">
- <echo message="Please refer to the testframework.html in org.eclipse.test for instructions on usage." />
- </target>
-
- <target name="init">
- <!--
- Parameters:
- (Mandatory)
- data-dir - the directory for Eclipse to write its data
- plugin-name - the name of the plugin to test
- classname - the name of the test class
-
- (Optional - overrides defaults set in script)
- vmargs - a string containing arguments to pass to the VM.
- extraVMargs - allows separate setting of VM args from separate caller.
- timeout - overrides default test timeout value (in milliseconds).
- test-output - overrides default output file produced from test run.
- plugin-path - path to root of plug-in
- useEclipseExe - property setting forces test to launch via eclipse executable.
- junit-report-output - output directory for junit reports produced for specified classname.
- -->
-
- <tstamp>
- <format property="TIMENOW" pattern="HHmmssSSSS"/>
- </tstamp>
- <!--property setting useEclipseExe launches tests using the eclipse executable-->
- <condition property="launchTarget" value="eclipse-test">
- <isset property="useEclipseExe" />
- </condition>
- <!--default launch target for launching tests-->
- <property name="launchTarget" value="java-test" />
- <property name="formatter" value="org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter"/>
-
- <!--default heap sizes when running performance tests-->
- <condition property="vmargs" value=" -Xms256M -Xmx512M">
- <equals arg1="${test.target}" arg2="performance" />
- </condition>
- <property name="extraVMargs" value=""/>
- <property name="plugin-path" value="" />
- <property name="timeout" value="7200000" />
- <property name="test-output" value="${eclipse-home}/${classname}.xml" />
- <property name="junit-report-output" value="${eclipse-home}/results" />
- <mkdir dir="${junit-report-output}"/>
- </target>
-
- <target name="core-test" description="Eclipse application used to launch HEADLESS plugin tests." depends="init">
- <antcall target="${launchTarget}">
- <param name="application" value="org.eclipse.test.coretestapplication"/>
- </antcall>
- </target>
-
- <target name="ui-test" description="Eclipse application used to launch UI plugin tests." depends="init">
- <antcall target="${launchTarget}">
- <param name="application" value="org.eclipse.test.uitestapplication"/>
- </antcall>
- </target>
-
- <target name="java-test">
- <!--default vm args-->
- <property name="vmargs" value=" -Xms40m -Xmx348m"/>
-
- <!--set default jvm to use for testing-->
- <property name="jvm" value="${java.home}/bin/java" />
-
- <echo message="Running ${classname}. Result file: ${junit-report-output}/${classname}.xml."/>
- <echo>vmargs=${vmargs}, extraVMargs=${extraVMargs}, Xflags=${Xflags}, Dflags=${Dflags}</echo>
- <java fork="true" dir="." timeout="${timeout}" jvm="${jvm}" logError="true"
- classname="org.eclipse.core.launcher.Main" output="${junit-report-output}/${classname}.txt">
- <classpath>
- <fileset dir="${eclipse-home}/plugins">
- <include name="org.eclipse.equinox.launcher_*.jar"/>
- </fileset>
- </classpath>
- <arg line="-application ${application}"/>
- <arg line="-data ${data-dir}"/>
- <arg line="formatter=${formatter},${test-output}"/>
- <arg line="-testPluginName ${plugin-name}"/>
- <arg line="-className ${classname}"/>
- <arg line="-os ${os}"/>
- <arg line="-ws ${ws}"/>
- <arg line="-arch ${arch}"/>
- <arg line="-consolelog"/>
- <arg line="-vmargs ${vmargs} ${extraVMargs} ${Xflags} ${Dflags} -DPLUGIN_PATH=${plugin-path}"/>
- <jvmarg line="${vmargs} ${extraVMargs} ${Xflags} ${Dflags} -DPLUGIN_PATH=${plugin-path}" />
- <sysproperty key="PLUGIN_PATH" value="${plugin-path}"/>
- </java>
- <antcall target="collect-results" />
- </target>
-
- <target name="eclipse-test" description="Runs the specified classname as a plug-in test.">
- <property name="vmargs" value="-Xms256m -Xmx512m"/>
-
- <!--use -consolelog if launching a headless test-->
- <condition property="consolelog" value="-consolelog">
- <equals arg1="${application}" arg2="org.eclipse.test.coretestapplication"/>
- </condition>
- <property name="consolelog" value="" />
-
- <!--
- vm selection priority:
- 1. user-specified java executable via outer Ant property setting of "jvm".
- 2. java executable on path.
- -->
- <condition property="test-vm" value="-vm ${jvm}">
- <isset property="jvm" />
- </condition>
- <property name="test-vm" value="" />
-
- <!--ensure executable has execute permission-->
- <chmod file="${eclipse-home}/eclipse" perm="ugo+rx"/>
-
-
- <echo message="Running ${classname}. Result file: ${junit-report-output}/${classname}.xml."/>
- <echo>vmargs=${vmargs}, extraVMargs=${extraVMargs}, Xflags=${Xflags}, Dflags=${Dflags}</echo>
- <exec executable="${eclipse-home}/eclipse" dir="${eclipse-home}" timeout="${timeout}" logError="true" failonerror="false" output="${junit-report-output}/${classname}.txt">
- <arg line="-data ${data-dir}"/>
- <arg line="${test-vm}"/>
- <arg line="-application ${application}"/>
- <arg line="formatter=${formatter},${test-output}"/>
- <arg line="-testPluginName ${plugin-name}"/>
- <arg line="-className ${classname}"/>
- <arg line="-nosplash"/>
- <arg line="--launcher.suppressErrors"/>
- <arg line="${consolelog}"/>
- <arg line="-vmargs ${vmargs} ${extraVMargs} ${Xflags} ${Dflags} -DPLUGIN_PATH=${plugin-path}"/>
- </exec>
- <antcall target="collect-results" />
- </target>
-
- <target name="collect-results">
- <dirname property="output-dir" file="${test-output}"/>
- <basename property="output-file-name" file="${test-output}"/>
- <junitreport todir="${junit-report-output}" tofile="${classname}.xml">
- <fileset dir="${output-dir}">
- <include name="${output-file-name}"/>
- </fileset>
- </junitreport>
-
- <xslt style="${eclipse-home}/dropins/eclipse/plugins/org.eclipse.test/JUNIT.XSL"
- basedir="${junit-report-output}"
- includes="${classname}.result.xml"
- destdir="${junit-report-output}" />
-
- <!--save .log content and *.log content from configuration directory-->
- <concat destfile="${junit-report-output}/${classname}.log">
- <fileset dir="${eclipse-home}" includes="${data-dir}/.metadata/*.log"/>
- <fileset dir="${eclipse-home}" includes="configuration/*.log"/>
- </concat>
- </target>
-
- <target name="collect">
- <!--
- This target can be used to aggragate test runs from multiple test suites into a single report.
-
- Parameters to this target:
- includes - the names of the files to include
- output-file - the name of the output file to produce
- -->
- <junitreport todir="." tofile="${output-file}">
- <fileset dir=".">
- <include name="${includes}"/>
- </fileset>
- </junitreport>
- </target>
-
-</project>
-
15 years, 1 month
JBoss Tools SVN: r20002 - trunk/bpel/releng.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-01-29 00:34:22 -0500 (Fri, 29 Jan 2010)
New Revision: 20002
Modified:
trunk/bpel/releng/testing.properties
Log:
simplify file - point at centralized custom-library.xml and only list flags and args
Modified: trunk/bpel/releng/testing.properties
===================================================================
--- trunk/bpel/releng/testing.properties 2010-01-29 05:33:06 UTC (rev 20001)
+++ trunk/bpel/releng/testing.properties 2010-01-29 05:34:22 UTC (rev 20002)
@@ -7,67 +7,21 @@
org.jboss.tools.bpel.ui.test.suite=org.jboss.tools.bpel.ui.test.BpelUIAllTests
# to use a different library-file than the default from org.eclipse.test/library.xml
-library-file=${relengBuilderDir}/custom-library.xml
+library-file=${relengCommonBuilderDir}/builder/tests/custom-library.xml
# to dump test properties into console log and separate file (for debugging purposes), set echotestproperties=true
-echotestproperties=true
+#echotestproperties=true
-################################################################################################
+# could also add things like: -Xbootclasspath/a:/path/to/emma.jar ?
+Xflags= -Xms512m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m
-#which (sub)project?
-project=${subprojectName}
+#############################################################
+# SHOULD NOT HAVE TO CHANGE OR OVERRIDE ANYTHING BELOW HERE #
+#############################################################
-#target to call in test.xml: runtests-local | runtests-remote
-testTarget=runtests-local
-
-#directory on test machine where automated testing framework will be installed
-# testBase=/tmp/build/N200911122249/testing
-# testDir=/tmp/build/N200911122249/testing/N200911122249
-testDir=${testBase}/${buildLabel}
-
-#name of zip file containing automated testing framework and JUnit test plug-ins
-testFramework=${zipPrefix}-Automated-Tests${incubation}-${buildAlias}.zip
-
-#directory where test scripts are launched
-# executionDir=/tmp/build/N200911122249/testing/N200911122249/testing
-executionDir=${testDir}/testing
-
-#name of Update & Master Zip or runtime/SDK/all-in-one to install and test
-updateZip=${zipPrefix}-Update${incubation}-${buildAlias}.zip
-MasterZip=${zipPrefix}-Master${incubation}-${buildAlias}.zip
-# backup if update zip does not exist
-SDKZip=${zipPrefix}-SDK${incubation}-${buildAlias}.zip
-
-#used by org.eclipse.build.tools/scripts/test.xml; must be set (but no longer used)
-runtime=${zipPrefix}-Update${incubation}-${buildAlias}.zip
-
-# path to java
-vmExecutable=${JAVA_HOME}/bin/java
-
-#hack to override unneeded function in releng.basebuilder/plugins/org.eclipse.build.tools/scripts/test.xml
-vmUrl=
-vmDest=/dev/null
-vmInstallExecutable=${vmExecutable}
-vmInstallCommand=-version
-
-#eclipse platforms: win32 | linux.motif | linux.gtk | aix.motif | hpux.motif |solaris.motif
-platform=${baseos}.${basews}
-
-#name of file that captures console output from running JUnit plug-in tests
-consolelog=${baseos}.${basews}_consolelog.txt
-
-#Works with IBM and Sun JDKs, 1.4+
-#name of script to execute
-testExecutable=bash
-
-Xflags= -Xms512m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m
#see bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=106396 for rationale for "-Dosgi.bundlefile.limit=100"
Dflags=-Dosgi.bundlefile.limit=100
#arguments to ${testExecutable} - .sh script + args
args=${executionDir}/${shell} -vmExecutable ${vmExecutable} -consolelog ${consolelog} ${Xflags} ${Dflags}
-# vmargs and extraVMargs are used by library.xml (or your own custom version)
-#vmargs= -Xms512m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m
-#extraVMargs= -Xms512m -Xmx1024m -XX:PermSize=128m -XX:MaxPermSize=256m
-# could also add things like: -Xbootclasspath/a:/path/to/emma.jar ?
15 years, 1 month
JBoss Tools SVN: r20001 - trunk/bpel/releng.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-01-29 00:33:06 -0500 (Fri, 29 Jan 2010)
New Revision: 20001
Modified:
trunk/bpel/releng/build.properties
trunk/bpel/releng/build.properties.example.hudson.qa.jboss.com
trunk/bpel/releng/build.properties.example.linux
trunk/bpel/releng/build.properties.example.windows
Log:
udpate comments
Modified: trunk/bpel/releng/build.properties
===================================================================
--- trunk/bpel/releng/build.properties 2010-01-29 05:18:59 UTC (rev 20000)
+++ trunk/bpel/releng/build.properties 2010-01-29 05:33:06 UTC (rev 20001)
@@ -12,7 +12,7 @@
mainFeatureToBuildID=org.jboss.tools.bpel.sdk.feature
testFeatureToBuildID=org.jboss.tools.bpel.tests.feature
-# on windows or mac, use testLocal; on linux can use test if Xvnc or Xvfb installed; use testLocal if run from Hudson job w/ Xvnc enabled
+# on windows or mac, use testLocal; on linux use test (requires Xvnc or Xvfb)
build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup
JAVA14_HOME=${JAVA_HOME}
Modified: trunk/bpel/releng/build.properties.example.hudson.qa.jboss.com
===================================================================
--- trunk/bpel/releng/build.properties.example.hudson.qa.jboss.com 2010-01-29 05:18:59 UTC (rev 20000)
+++ trunk/bpel/releng/build.properties.example.hudson.qa.jboss.com 2010-01-29 05:33:06 UTC (rev 20001)
@@ -12,7 +12,7 @@
mainFeatureToBuildID=org.jboss.tools.bpel.sdk.feature
testFeatureToBuildID=org.jboss.tools.bpel.tests.feature
-# on windows or mac, use testLocal; on linux can use test if Xvnc or Xvfb installed; use testLocal if run from Hudson job w/ Xvnc enabled
+# on windows or mac, use testLocal; on linux use test (requires Xvnc or Xvfb)
build.steps=buildUpdate,buildTests,generateDigests,testLocal,publish,cleanup
JAVA14_HOME=${JAVA_HOME}
Modified: trunk/bpel/releng/build.properties.example.linux
===================================================================
--- trunk/bpel/releng/build.properties.example.linux 2010-01-29 05:18:59 UTC (rev 20000)
+++ trunk/bpel/releng/build.properties.example.linux 2010-01-29 05:33:06 UTC (rev 20001)
@@ -12,8 +12,8 @@
mainFeatureToBuildID=org.jboss.tools.bpel.sdk.feature
testFeatureToBuildID=org.jboss.tools.bpel.tests.feature
-# on windows or mac, use testLocal; on linux can use test if Xvnc or Xvfb installed; use testLocal if run from Hudson job w/ Xvnc enabled
-build.steps=buildUpdate,buildTests,generateDigests,testLocal,publish,cleanup
+# on windows or mac, use testLocal; on linux use test (requires Xvnc or Xvfb)
+build.steps=buildUpdate,buildTests,generateDigests,test,publish,cleanup
# Re-use local sources?
# note: to run tests locally, these plugins must be pre-checked out into the local source folder:
Modified: trunk/bpel/releng/build.properties.example.windows
===================================================================
--- trunk/bpel/releng/build.properties.example.windows 2010-01-29 05:18:59 UTC (rev 20000)
+++ trunk/bpel/releng/build.properties.example.windows 2010-01-29 05:33:06 UTC (rev 20001)
@@ -12,7 +12,7 @@
mainFeatureToBuildID=org.jboss.tools.bpel.sdk.feature
testFeatureToBuildID=org.jboss.tools.bpel.tests.feature
-# on windows or mac, use testLocal; on linux can use test if Xvnc or Xvfb installed; use testLocal if run from Hudson job w/ Xvnc enabled
+# on windows or mac, use testLocal; on linux use test (requires Xvnc or Xvfb)
build.steps=buildUpdate,buildTests,generateDigests,testLocal,publish,cleanup
# to (re)generate map and psfs, use these settings
15 years, 1 month