November 2010 - jbosstools-commits

JBoss Tools SVN: r26868 - trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test.

by jbosstools-commits＠lists.jboss.org

Author: vpakan(a)redhat.com Date: 2010-11-24 03:37:08 -0500 (Wed, 24 Nov 2010) New Revision: 26868 Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java Log: Remove previously added timeout. It didn't help. Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java =================================================================== --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java 2010-11-24 07:18:49 UTC (rev 26867) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/DroolsAllBotTests.java 2010-11-24 08:37:08 UTC (rev 26868) @@ -26,7 +26,6 @@ import org.jboss.tools.drools.ui.bot.test.smoke.RuleFlowTest; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.SWTUtilExt; -import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.jboss.tools.ui.bot.ext.types.PerspectiveType; import org.junit.AfterClass; @@ -114,7 +113,6 @@ } catch (WidgetNotFoundException wnfe){ // Do nothing ignore this error } - bot.sleep(Timing.time5S()); eclipse.openPerspective(PerspectiveType.JAVA); eclipse.maximizeActiveShell(); }

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r26867 - in trunk/as: tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test and 3 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2010-11-24 02:18:49 -0500 (Wed, 24 Nov 2010) New Revision: 26867 Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/jdt/ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/jdt/JREUtils.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTest.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/StartupShutdownTest.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java Log: JBIDE-7725 - as test suite cleanup Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2010-11-24 00:56:43 UTC (rev 26866) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2010-11-24 07:18:49 UTC (rev 26867) @@ -105,13 +105,10 @@ * @return */ protected IPath getDeployPath(IModule[] moduleTree, IDeployableServer server) { - String defaultFolder = publishMethod.getPublishDefaultRootFolder(server.getServer()); - String folder = PublishUtil.getDeployRootFolder( - moduleTree, server, defaultFolder, - IJBossToolingConstants.LOCAL_DEPLOYMENT_LOC); - return PublishUtil.getDeployPath(moduleTree, folder); + return PublishUtil.getDeployPath(publishMethod, moduleTree, server); } + /** * Finish up the publishing. This may be moving a final zipped entity into the proper * folder or sending it over the wire to a remote machine. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2010-11-24 00:56:43 UTC (rev 26866) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2010-11-24 07:18:49 UTC (rev 26867) @@ -37,6 +37,7 @@ import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants; +import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod; import org.jboss.ide.eclipse.as.core.server.xpl.ModulePackager; import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader; import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader.DeploymentModulePrefs; @@ -191,7 +192,14 @@ return ModuleCoreNature.isFlexibleProject(lastmod.getProject()); } - + public static IPath getDeployPath(IJBossServerPublishMethod method, IModule[] moduleTree, IDeployableServer server) { + String defaultFolder = method.getPublishDefaultRootFolder(server.getServer()); + String folder = PublishUtil.getDeployRootFolder( + moduleTree, server, defaultFolder, + IJBossToolingConstants.LOCAL_DEPLOYMENT_LOC); + return PublishUtil.getDeployPath(moduleTree, folder); + } + private static String getSuffix(String type) { // TODO // VirtualReferenceUtilities.INSTANCE. has utility methods to help!! Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTest.java 2010-11-24 00:56:43 UTC (rev 26866) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTest.java 2010-11-24 07:18:49 UTC (rev 26867) @@ -83,6 +83,9 @@ public static final String JBOSS_AS_50_HOME = System.getProperty("jbosstools.test.jboss.home.5.0", "C:\\apps\\jboss\\jboss-5.0.0.GA\\"); public static final String JBOSS_AS_51_HOME = System.getProperty("jbosstools.test.jboss.home.5.1", "C:\\apps\\jboss\\jboss-5.1.0.GA\\"); public static final String JBOSS_AS_52_HOME = System.getProperty("jbosstools.test.jboss.home.5.2", "C:\\apps\\jboss\\jboss-5.2.0.GA\\"); + public static final String JRE_14_HOME = System.getProperty("jbosstools.test.jre.1.4", "C:\\apps\\jboss\\jboss-5.2.0.GA\\"); + public static final String JRE_5_HOME = System.getProperty("jbosstools.test.jre.5", "C:\\apps\\jboss\\jboss-5.2.0.GA\\"); + public static final String JRE_6_HOME = System.getProperty("jbosstools.test.jre.6", "C:\\apps\\jboss\\jboss-5.2.0.GA\\"); public static final String JBOSS_AS_HOME = System.getProperty("jbosstools.test.jboss.home", JBOSS_AS_42_HOME); Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/StartupShutdownTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/StartupShutdownTest.java 2010-11-24 00:56:43 UTC (rev 26866) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/StartupShutdownTest.java 2010-11-24 07:18:49 UTC (rev 26867) @@ -21,26 +21,8 @@ */ package org.jboss.ide.eclipse.as.test.server; -import java.util.ArrayList; -import java.util.Date; - -import junit.framework.AssertionFailedError; - import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.debug.core.ILaunchManager; -import org.eclipse.debug.core.IStreamListener; -import org.eclipse.debug.core.model.IStreamMonitor; -import org.eclipse.swt.SWTException; -import org.eclipse.swt.widgets.Display; import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.IServer.IOperationListener; -import org.eclipse.wst.server.core.IServerListener; -import org.eclipse.wst.server.core.ServerEvent; -import org.jboss.ide.eclipse.as.core.extensions.polling.ProcessTerminatedPoller.IProcessProvider; -import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; -import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; -import org.jboss.ide.eclipse.as.test.ASTest; import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils; /** @@ -53,217 +35,69 @@ */ public class StartupShutdownTest extends ServerRuntimeUtils { - public static final int DEFAULT_STARTUP_TIME = 150000; - public static final int DEFAULT_SHUTDOWN_TIME = 90000; protected IServer currentServer; - protected ServerStateListener stateListener; public void setUp() { - try { - if( getName().equals("test32")) - currentServer = createServer(IJBossToolingConstants.AS_32, IJBossToolingConstants.SERVER_AS_32, ASTest.JBOSS_AS_32_HOME, DEFAULT_CONFIG); - else if( getName().equals("test40")) - currentServer = createServer(IJBossToolingConstants.AS_40, IJBossToolingConstants.SERVER_AS_40, ASTest.JBOSS_AS_40_HOME, DEFAULT_CONFIG); - else if( getName().equals("test42")) - currentServer = createServer(IJBossToolingConstants.AS_42, IJBossToolingConstants.SERVER_AS_42, ASTest.JBOSS_AS_42_HOME, DEFAULT_CONFIG); - else if( getName().equals("test50")) - currentServer = createServer(IJBossToolingConstants.AS_50, IJBossToolingConstants.SERVER_AS_50, ASTest.JBOSS_AS_50_HOME, DEFAULT_CONFIG); - else if( getName().equals("test51")) - currentServer = createServer(IJBossToolingConstants.AS_51, IJBossToolingConstants.SERVER_AS_51, ASTest.JBOSS_AS_51_HOME, DEFAULT_CONFIG); - - // first thing's first. Let's add a server state listener - stateListener = new ServerStateListener(); - currentServer.addServerListener(stateListener); - - } catch( CoreException ce ) { - fail("Failed during setUp for " + getName() + ": " + ce.getMessage()); - } } public void tearDown() { - System.out.println("tearing down " + getName()); try { - currentServer.removeServerListener(stateListener); - currentServer.delete(); + if( currentServer != null ) + currentServer.delete(); } catch( CoreException ce ) { // report } } - - - - public class StatusWrapper { - protected IStatus status; - public IStatus getStatus() { return this.status; } - public void setStatus(IStatus s) { this.status = s; } - } - public void test32() { - startup(); - shutdown(); + try { + currentServer = create32Server(); + startup(currentServer); + shutdown(currentServer); + } catch( CoreException ce ) { + fail("Failed during setUp for " + getName() + ": " + ce.getMessage()); + } } -// -// public void test40() { -// startup(); -// shutdown(); -// } -// -// public void test42() { -// startup(); -// shutdown(); -// } -// -// public void test50() { -// startup(); -// shutdown(); -// } -// -// public void test51() { -// startup(); -// shutdown(); -// } - - protected class ServerStateListener implements IServerListener { - private ArrayList stateChanges; - public ServerStateListener() { - this.stateChanges = new ArrayList(); + + public void test40() { + try { + currentServer = create40Server(); + startup(currentServer); + shutdown(currentServer); + } catch( CoreException ce ) { + fail("Failed during setUp for " + getName() + ": " + ce.getMessage()); } - public ArrayList getStateChanges() { - return stateChanges; - } - public void serverChanged(ServerEvent event) { - if((event.getKind() & ServerEvent.SERVER_CHANGE) != 0) { - if((event.getKind() & ServerEvent.STATE_CHANGE) != 0) { - if( event.getState() != IServer.STATE_STOPPED) - stateChanges.add(new Integer(event.getState())); - } - } - } } - protected class ErrorStreamListener implements IStreamListener { - protected boolean errorFound = false; - String entireLog = ""; - public void streamAppended(String text, IStreamMonitor monitor) { - entireLog += text; - } - - // will need to be fixed or decided how to figure out errors - public boolean hasError() { - return errorFound; + public void test42() { + try { + currentServer = create42Server(); + startup(currentServer); + shutdown(currentServer); + } catch( CoreException ce ) { + fail("Failed during setUp for " + getName() + ": " + ce.getMessage()); } } - protected void startup() { startup(DEFAULT_STARTUP_TIME); } - protected void startup(int maxWait) { - long finishTime = new Date().getTime() + maxWait; - - // operation listener, which is only alerted when the startup is *done* - final StatusWrapper opWrapper = new StatusWrapper(); - final IOperationListener listener = new IOperationListener() { - public void done(IStatus result) { - opWrapper.setStatus(result); - } }; - - - // a stream listener to listen for errors - ErrorStreamListener streamListener = new ErrorStreamListener(); - - // the thread to actually start the server - Thread startThread = new Thread() { - public void run() { - currentServer.start(ILaunchManager.RUN_MODE, listener); - } - }; - - startThread.start(); - - boolean addedStream = false; - while( finishTime > new Date().getTime() && opWrapper.getStatus() == null) { - // we're waiting for startup to finish - if( !addedStream ) { - IStreamMonitor mon = getStreamMonitor(); - if( mon != null ) { - mon.addListener(streamListener); - addedStream = true; - } - } - try { - Display.getDefault().readAndDispatch(); - } catch( SWTException swte ) {} - } - + public void test50() { try { - assertTrue("Startup has taken longer than what is expected for a default startup", finishTime >= new Date().getTime()); - assertNotNull("Startup never finished", opWrapper.getStatus()); - assertFalse("Startup failed", opWrapper.getStatus().getSeverity() == IStatus.ERROR); - assertFalse("Startup had System.error output", streamListener.hasError()); - } catch( AssertionFailedError afe ) { - // cleanup - currentServer.stop(true); - // rethrow - throw afe; + currentServer = create50Server(); + startup(currentServer); + shutdown(currentServer); + } catch( CoreException ce ) { + fail("Failed during setUp for " + getName() + ": " + ce.getMessage()); } - if( getStreamMonitor() != null ) - getStreamMonitor().removeListener(streamListener); } - - protected void shutdown() { shutdown(DEFAULT_SHUTDOWN_TIME); } - protected void shutdown(int maxWait) { - long finishTime = new Date().getTime() + maxWait; - - // operation listener, which is only alerted when the startup is *done* - final StatusWrapper opWrapper = new StatusWrapper(); - final IOperationListener listener = new IOperationListener() { - public void done(IStatus result) { - opWrapper.setStatus(result); - } }; - - - // a stream listener to listen for errors - ErrorStreamListener streamListener = new ErrorStreamListener(); - if( getStreamMonitor() != null ) - getStreamMonitor().addListener(streamListener); - - // the thread to actually start the server - Thread stopThread = new Thread() { - public void run() { - currentServer.stop(false, listener); - } - }; - - stopThread.start(); - - while( finishTime > new Date().getTime() && opWrapper.getStatus() == null) { - // we're waiting for startup to finish - try { - Display.getDefault().readAndDispatch(); - } catch( SWTException swte ) {} - } - + public void test51() { try { - assertTrue("Startup has taken longer than what is expected for a default startup", finishTime >= new Date().getTime()); - assertNotNull("Startup never finished", opWrapper.getStatus()); - assertFalse("Startup had System.error output", streamListener.hasError()); - } catch( AssertionFailedError afe ) { - // cleanup - currentServer.stop(true); - // rethrow - throw afe; + currentServer = create51Server(); + startup(currentServer); + shutdown(currentServer); + } catch( CoreException ce ) { + fail("Failed during setUp for " + getName() + ": " + ce.getMessage()); } } - - protected IStreamMonitor getStreamMonitor() { - JBossServerBehavior behavior = - (JBossServerBehavior)currentServer.loadAdapter(JBossServerBehavior.class, null); - if( behavior != null ) { - if( ((IProcessProvider)behavior.getDelegate()).getProcess() != null ) { - return ((IProcessProvider)behavior.getDelegate()).getProcess().getStreamsProxy().getOutputStreamMonitor(); - } - } - return null; - } + } Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java 2010-11-24 00:56:43 UTC (rev 26866) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/ServerRuntimeUtils.java 2010-11-24 07:18:49 UTC (rev 26867) @@ -3,8 +3,10 @@ import java.io.File; import java.io.IOException; import java.net.URL; +import java.util.Date; import java.util.HashMap; +import junit.framework.AssertionFailedError; import junit.framework.TestCase; import org.eclipse.core.runtime.CoreException; @@ -15,22 +17,31 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; +import org.eclipse.debug.core.ILaunchManager; +import org.eclipse.debug.core.IStreamListener; +import org.eclipse.debug.core.model.IStreamMonitor; import org.eclipse.jdt.launching.IVMInstall; import org.eclipse.jdt.launching.JavaRuntime; +import org.eclipse.jdt.launching.environments.IExecutionEnvironment; +import org.eclipse.swt.SWTException; +import org.eclipse.swt.widgets.Display; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IRuntimeType; import org.eclipse.wst.server.core.IRuntimeWorkingCopy; import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.IServer.IOperationListener; import org.eclipse.wst.server.core.IServerType; import org.eclipse.wst.server.core.IServerWorkingCopy; import org.eclipse.wst.server.core.ServerCore; import org.eclipse.wst.server.core.ServerUtil; import org.eclipse.wst.server.core.internal.RuntimeWorkingCopy; import org.eclipse.wst.server.core.internal.ServerWorkingCopy; +import org.jboss.ide.eclipse.as.core.extensions.polling.ProcessTerminatedPoller.IProcessProvider; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer; +import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; import org.jboss.ide.eclipse.as.core.util.FileUtil; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; @@ -104,7 +115,6 @@ return server; } - public static IServer createMockServerWithRuntime(String serverType, String name, String config) { try { IPath serverDir = createMockServerDirectory(name, twiddleMap.get(serverType), config); @@ -114,13 +124,39 @@ return null; } + public static IServer create32Server() throws CoreException { + return createServer(IJBossToolingConstants.AS_32, IJBossToolingConstants.SERVER_AS_32, ASTest.JBOSS_AS_32_HOME, DEFAULT_CONFIG); + } + public static IServer create40Server() throws CoreException { + return createServer(IJBossToolingConstants.AS_40, IJBossToolingConstants.SERVER_AS_40, ASTest.JBOSS_AS_40_HOME, DEFAULT_CONFIG); + } + public static IServer create42Server() throws CoreException { + return createServer(IJBossToolingConstants.AS_42, IJBossToolingConstants.SERVER_AS_42, ASTest.JBOSS_AS_42_HOME, DEFAULT_CONFIG); + } + public static IServer create50Server() throws CoreException { + return createServer(IJBossToolingConstants.AS_50, IJBossToolingConstants.SERVER_AS_50, ASTest.JBOSS_AS_50_HOME, DEFAULT_CONFIG); + } + + public static IServer create51Server() throws CoreException { + return createServer(IJBossToolingConstants.AS_51, IJBossToolingConstants.SERVER_AS_51, ASTest.JBOSS_AS_51_HOME, DEFAULT_CONFIG); + } + +// public static IServer create60Server() throws CoreException { +// } + public static IServer createServer(String runtimeID, String serverID, String location, String configuration) throws CoreException { - // if file doesnt exist, abort immediately. - assertTrue("path \"" + location + "\" does not exist", new Path(location).toFile().exists()); - + IRuntime currentRuntime = createRuntime(runtimeID, location,configuration); + return createServer2(currentRuntime, serverID); + } + public static IServer createServer(String runtimeID, String serverID, + String location, String configuration, IVMInstall install) throws CoreException { IRuntime currentRuntime = createRuntime(runtimeID, location, - configuration); + configuration, install); + return createServer2(currentRuntime, serverID); + } + + private static IServer createServer2(IRuntime currentRuntime, String serverID) throws CoreException { IServerType serverType = ServerCore.findServerType(serverID); IServerWorkingCopy serverWC = serverType.createServer(null, null, new NullProgressMonitor()); @@ -129,11 +165,17 @@ serverWC.setServerConfiguration(null); return serverWC.save(true, new NullProgressMonitor()); } + public static IRuntime createRuntime(String runtimeId, String homeDir, String config) throws CoreException { - IRuntimeType[] runtimeTypes = ServerUtil.getRuntimeTypes(null, null, - runtimeId); + return createRuntime(runtimeId, homeDir, config, VM_INSTALL); + } + + public static IRuntime createRuntime(String runtimeId, String homeDir, + String config, IVMInstall install) throws CoreException { + assertTrue("path \"" + homeDir + "\" does not exist", new Path(homeDir).toFile().exists()); + IRuntimeType[] runtimeTypes = ServerUtil.getRuntimeTypes(null, null,runtimeId); assertEquals("expects only one runtime type", runtimeTypes.length, 1); IRuntimeType runtimeType = runtimeTypes[0]; IRuntimeWorkingCopy runtimeWC = runtimeType.createRuntime(null, @@ -141,9 +183,9 @@ runtimeWC.setName(runtimeId); runtimeWC.setLocation(new Path(homeDir)); ((RuntimeWorkingCopy) runtimeWC).setAttribute( - IJBossServerRuntime.PROPERTY_VM_ID, VM_INSTALL.getId()); + IJBossServerRuntime.PROPERTY_VM_ID, install.getId()); ((RuntimeWorkingCopy) runtimeWC).setAttribute( - IJBossServerRuntime.PROPERTY_VM_TYPE_ID, VM_INSTALL + IJBossServerRuntime.PROPERTY_VM_TYPE_ID, install .getVMInstallType().getId()); ((RuntimeWorkingCopy) runtimeWC).setAttribute( IJBossServerRuntime.PROPERTY_CONFIGURATION_NAME, config); @@ -151,7 +193,26 @@ IRuntime savedRuntime = runtimeWC.save(true, new NullProgressMonitor()); return savedRuntime; } - + + public static IRuntime createRuntime(String runtimeId, String homeDir, + String config, IExecutionEnvironment environment) throws CoreException { + assertTrue("path \"" + homeDir + "\" does not exist", new Path(homeDir).toFile().exists()); + IRuntimeType[] runtimeTypes = ServerUtil.getRuntimeTypes(null, null,runtimeId); + assertEquals("expects only one runtime type", runtimeTypes.length, 1); + IRuntimeType runtimeType = runtimeTypes[0]; + IRuntimeWorkingCopy runtimeWC = runtimeType.createRuntime(null, + new NullProgressMonitor()); + runtimeWC.setName(runtimeId); + runtimeWC.setLocation(new Path(homeDir)); + ((RuntimeWorkingCopy) runtimeWC).setAttribute( + IJBossServerRuntime.PROPERTY_EXECUTION_ENVIRONMENT, environment.getId()); + ((RuntimeWorkingCopy) runtimeWC).setAttribute( + IJBossServerRuntime.PROPERTY_CONFIGURATION_NAME, config); + + IRuntime savedRuntime = runtimeWC.save(true, new NullProgressMonitor()); + return savedRuntime; + } + public static void deleteAllServers() throws CoreException { IServer[] servers = ServerCore.getServers(); for( int i = 0; i < servers.length; i++ ) { @@ -246,5 +307,139 @@ return ServerRuntimeUtils.setServerAttribute(server, IDeployableServer.ZIP_DEPLOYMENTS_PREF, val); } + public static final int DEFAULT_STARTUP_TIME = 150000; + public static final int DEFAULT_SHUTDOWN_TIME = 90000; + public static void startup(IServer server) { startup(server, DEFAULT_STARTUP_TIME); } + public static void startup(final IServer currentServer, int maxWait) { + long finishTime = new Date().getTime() + maxWait; + + // operation listener, which is only alerted when the startup is *done* + final StatusWrapper opWrapper = new StatusWrapper(); + final IOperationListener listener = new IOperationListener() { + public void done(IStatus result) { + opWrapper.setStatus(result); + } }; + + + // a stream listener to listen for errors + ErrorStreamListener streamListener = new ErrorStreamListener(); + + // the thread to actually start the server + Thread startThread = new Thread() { + public void run() { + currentServer.start(ILaunchManager.RUN_MODE, listener); + } + }; + + startThread.start(); + + boolean addedStream = false; + while( finishTime > new Date().getTime() && opWrapper.getStatus() == null) { + // we're waiting for startup to finish + if( !addedStream ) { + IStreamMonitor mon = getStreamMonitor(currentServer); + if( mon != null ) { + mon.addListener(streamListener); + addedStream = true; + } + } + try { + Display.getDefault().readAndDispatch(); + } catch( SWTException swte ) {} + } + + try { + assertTrue("Startup has taken longer than what is expected for a default startup", finishTime >= new Date().getTime()); + assertNotNull("Startup never finished", opWrapper.getStatus()); + assertFalse("Startup failed", opWrapper.getStatus().getSeverity() == IStatus.ERROR); + assertFalse("Startup had System.error output", streamListener.hasError()); + } catch( AssertionFailedError afe ) { + // cleanup + currentServer.stop(true); + // rethrow + throw afe; + } + if( getStreamMonitor(currentServer) != null ) + getStreamMonitor(currentServer).removeListener(streamListener); + } + + public static void shutdown(IServer currentServer) { shutdown(currentServer, DEFAULT_SHUTDOWN_TIME); } + public static void shutdown(final IServer currentServer, int maxWait) { + long finishTime = new Date().getTime() + maxWait; + + // operation listener, which is only alerted when the startup is *done* + final StatusWrapper opWrapper = new StatusWrapper(); + final IOperationListener listener = new IOperationListener() { + public void done(IStatus result) { + opWrapper.setStatus(result); + } }; + + + // a stream listener to listen for errors + ErrorStreamListener streamListener = new ErrorStreamListener(); + if( getStreamMonitor(currentServer) != null ) + getStreamMonitor(currentServer).addListener(streamListener); + + // the thread to actually start the server + Thread stopThread = new Thread() { + public void run() { + currentServer.stop(false, listener); + } + }; + + stopThread.start(); + + while( finishTime > new Date().getTime() && opWrapper.getStatus() == null) { + // we're waiting for startup to finish + try { + Display.getDefault().readAndDispatch(); + } catch( SWTException swte ) {} + } + + try { + assertTrue("Startup has taken longer than what is expected for a default startup", finishTime >= new Date().getTime()); + assertNotNull("Startup never finished", opWrapper.getStatus()); + assertFalse("Startup had System.error output", streamListener.hasError()); + } catch( AssertionFailedError afe ) { + // cleanup + currentServer.stop(true); + // rethrow + throw afe; + } + } + + protected static class ErrorStreamListener implements IStreamListener { + protected boolean errorFound = false; + String entireLog = ""; + public void streamAppended(String text, IStreamMonitor monitor) { + entireLog += text; + } + + // will need to be fixed or decided how to figure out errors + public boolean hasError() { + return errorFound; + } + } + + + protected static IStreamMonitor getStreamMonitor(IServer server) { + JBossServerBehavior behavior = + (JBossServerBehavior)server.loadAdapter(JBossServerBehavior.class, null); + if( behavior != null ) { + if( ((IProcessProvider)behavior.getDelegate()).getProcess() != null ) { + return ((IProcessProvider)behavior.getDelegate()).getProcess().getStreamsProxy().getOutputStreamMonitor(); + } + } + return null; + } + + public static class StatusWrapper { + protected IStatus status; + public IStatus getStatus() { return this.status; } + public void setStatus(IStatus s) { this.status = s; } + } + + + } Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/jdt/JREUtils.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/jdt/JREUtils.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/util/jdt/JREUtils.java 2010-11-24 07:18:49 UTC (rev 26867) @@ -0,0 +1,128 @@ +/******************************************************************************* + * Copyright (c) 2000, 2007 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package org.jboss.ide.eclipse.as.test.util.jdt; + +import java.util.ArrayList; +import java.util.Arrays; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Path; +import org.eclipse.jdt.internal.launching.VMDefinitionsContainer; +import org.eclipse.jdt.launching.IVMInstall; +import org.eclipse.jdt.launching.IVMInstallType; +import org.eclipse.jdt.launching.JavaRuntime; +import org.eclipse.jdt.launching.LibraryLocation; +import org.eclipse.jdt.launching.VMStandin; +import org.jboss.ide.eclipse.as.test.ASTest; + +/** + * Processes add/removed/changed VMs. + */ +public class JREUtils { + + /** + * Contstructs a new VM updater to update VM install settings. + */ + public JREUtils() { + } + + public static IVMInstall createJRE() { + return createJRE(new Path(ASTest.JRE_5_HOME)); + } + + /* + * This method does *NOT* work and I can't figure out why ;) + */ + public static void removeJRE(IVMInstall install) { + ArrayList<IVMInstall> vms = new ArrayList<IVMInstall>(); + IVMInstallType[] types = JavaRuntime.getVMInstallTypes(); + for( int i = 0; i < types.length; i++ ) { + vms.addAll(Arrays.asList(types[i].getVMInstalls())); + } + vms.remove(install); + IVMInstall[] allInstalls = vms.toArray(new IVMInstall[vms.size()]); + updateJRESettings(allInstalls, JavaRuntime.getDefaultVMInstall()); + } + + public static int countJREs() { + int count = 0; + IVMInstallType[] types = JavaRuntime.getVMInstallTypes(); + for( int i = 0; i < types.length; i++ ) { + IVMInstall[] installs = types[i].getVMInstalls(); + count+=installs.length; + } + return count; + } + + public static IVMInstall createJRE(IPath jreBaseDir) { + IVMInstallType[] types = JavaRuntime.getVMInstallTypes(); + IVMInstallType t = null; + System.out.println(types.length); + for( int i = 0; i < types.length; i++ ) { + if( types[i].getId().equals("org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType")) { + t = types[i]; + } + } + + String id = null; + do { + id = String.valueOf(System.currentTimeMillis()); + } while (t.findVMInstall(id) != null); + + VMStandin standin = new VMStandin(t, id); + standin.setInstallLocation(jreBaseDir.toFile()); + standin.setName(jreBaseDir.lastSegment()); + LibraryLocation[] libraryLocations = JavaRuntime.getLibraryLocations(standin); + standin.setLibraryLocations(libraryLocations); + + return standin.convertToRealVM(); + } + + + + /** + * Updates VM settings and returns whether the update was successful. + * + * @param jres new installed JREs + * @param defaultJRE new default VM + * @return whether the update was successful + */ + public static boolean updateJRESettings(IVMInstall[] jres, IVMInstall defaultJRE) { + + // Create a VM definition container + VMDefinitionsContainer vmContainer = new VMDefinitionsContainer(); + + // Set the default VM Id on the container + String defaultVMId = JavaRuntime.getCompositeIdFromVM(defaultJRE); + vmContainer.setDefaultVMInstallCompositeID(defaultVMId); + + // Set the VMs on the container + for (int i = 0; i < jres.length; i++) { + vmContainer.addVM(jres[i]); + } + + + // Generate XML for the VM defs and save it as the new value of the VM preference + saveVMDefinitions(vmContainer); + + return true; + } + + private static void saveVMDefinitions(final VMDefinitionsContainer container) { + try { + String vmDefXML = container.getAsXML(); + JavaRuntime.getPreferences().setValue(JavaRuntime.PREF_VM_XML, vmDefXML); + JavaRuntime.savePreferences(); + } catch( CoreException ce) { + } + } +}

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r26866 - trunk/build/reports/emma-coverage.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-11-23 19:56:43 -0500 (Tue, 23 Nov 2010) New Revision: 26866 Modified: trunk/build/reports/emma-coverage/pom.xml Log: https://jira.jboss.org/browse/JBIDE-7440 Between build #79 and #80, 874 tests disappeared fix to restore coverage report, it actually moves coverage reports in es files to report target folder to avoid reporting es files that might left from previous build Modified: trunk/build/reports/emma-coverage/pom.xml =================================================================== --- trunk/build/reports/emma-coverage/pom.xml 2010-11-23 23:51:46 UTC (rev 26865) +++ trunk/build/reports/emma-coverage/pom.xml 2010-11-24 00:56:43 UTC (rev 26866) @@ -41,16 +41,21 @@ <tasks> <taskdef resource="emma_ant.properties" /> <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> - + <move todir="${project.build.directory}/emma"> + <fileset dir="${basedir}/../../.." includes="*/tests/*/target/emma/*.es" /> + </move> <if> - <not> - <isset property="maven.test.skip"/> - </not> + <and> + <not> + <isset property="maven.test.skip"/> + </not> + <available type="dir" file="${project.build.directory}/emma" /> + </and> <then> <echo>Process emma report...</echo> <emma enabled="true"> <report> - <infileset dir="${basedir}/../../.." includes="*/tests/*/target/emma/*.es" /> + <infileset dir="${project.build.directory}/emma" includes="*/tests/*/target/emma/*.es" /> <txt outfile="${project.build.directory}/coverage.txt" /> <xml outfile="${project.build.directory}/coverage.xml" /> <html outfile="${project.build.directory}/coverage.html" /> @@ -61,6 +66,9 @@ failonerror="false" /> <echo>${emma.txt}</echo> </then> + <else> + <echo>No emma session files were found</echo> + </else> </if> </tasks> </configuration>

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r26865 - in branches/jbosstools-3.2.0.Beta2: build and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2010-11-23 18:51:46 -0500 (Tue, 23 Nov 2010) New Revision: 26865 Modified: branches/jbosstools-3.2.0.Beta2/build/pom.xml branches/jbosstools-3.2.0.Beta2/pom.xml Log: https://jira.jboss.org/browse/JBIDE-7440 Between build #79 and #80, 874 tests disappeared merge revision 26828 from trunk to fix tests execution on hudson in 3.2.0.Beta2 branch Modified: branches/jbosstools-3.2.0.Beta2/build/pom.xml =================================================================== --- branches/jbosstools-3.2.0.Beta2/build/pom.xml 2010-11-23 23:15:51 UTC (rev 26864) +++ branches/jbosstools-3.2.0.Beta2/build/pom.xml 2010-11-23 23:51:46 UTC (rev 26865) @@ -13,10 +13,8 @@ <profile> <id>libs</id> <activation> - <property> - <name>coverage</name> - </property> - </activation> + <activeByDefault>true</activeByDefault> + </activation> <modules> <module>libs</module> </modules> @@ -614,6 +612,16 @@ </modules> </profile> + <profile> + <id>aggregate-coverage</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>reports/emma-coverage</module> + </modules> + </profile> + </profiles> </project> Modified: branches/jbosstools-3.2.0.Beta2/pom.xml =================================================================== --- branches/jbosstools-3.2.0.Beta2/pom.xml 2010-11-23 23:15:51 UTC (rev 26864) +++ branches/jbosstools-3.2.0.Beta2/pom.xml 2010-11-23 23:51:46 UTC (rev 26865) @@ -8,9 +8,7 @@ <packaging>pom</packaging> <modules> <module>build/parent</module> -  <module>build</module> - <module>build/reports/emma-coverage</module> </modules> </project>

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r26864 - in trunk/bpel: features and 17 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-11-23 18:15:51 -0500 (Tue, 23 Nov 2010) New Revision: 26864 Modified: trunk/bpel/features/org.jboss.tools.bpel.feature/pom.xml trunk/bpel/features/org.jboss.tools.bpel.tests.feature/pom.xml trunk/bpel/features/pom.xml trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/pom.xml trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml trunk/bpel/plugins/org.eclipse.bpel.common.model/pom.xml trunk/bpel/plugins/org.eclipse.bpel.common.ui/pom.xml trunk/bpel/plugins/org.eclipse.bpel.model/pom.xml trunk/bpel/plugins/org.eclipse.bpel.ui/pom.xml trunk/bpel/plugins/org.eclipse.bpel.validator/pom.xml trunk/bpel/plugins/org.eclipse.bpel.wsil.model/pom.xml trunk/bpel/plugins/org.eclipse.bpel.xpath10/pom.xml trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/pom.xml trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/pom.xml trunk/bpel/plugins/pom.xml trunk/bpel/pom.xml trunk/bpel/site/pom.xml trunk/bpel/tests/org.jboss.tools.bpel.ui.test/pom.xml trunk/bpel/tests/pom.xml Log: use FQDNs and updated GAVs; reorder reactor Modified: trunk/bpel/features/org.jboss.tools.bpel.feature/pom.xml =================================================================== --- trunk/bpel/features/org.jboss.tools.bpel.feature/pom.xml 2010-11-23 22:43:30 UTC (rev 26863) +++ trunk/bpel/features/org.jboss.tools.bpel.feature/pom.xml 2010-11-23 23:15:51 UTC (rev 26864) @@ -1,12 +1,12 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.bpel.features</groupId> + <groupId>org.jboss.tools.bpel</groupId> <artifactId>org.jboss.tools.bpel.feature</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> Modified: trunk/bpel/features/org.jboss.tools.bpel.tests.feature/pom.xml =================================================================== --- trunk/bpel/features/org.jboss.tools.bpel.tests.feature/pom.xml 2010-11-23 22:43:30 UTC (rev 26863) +++ trunk/bpel/features/org.jboss.tools.bpel.tests.feature/pom.xml 2010-11-23 23:15:51 UTC (rev 26864) @@ -1,12 +1,12 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.bpel.features</groupId> + <groupId>org.jboss.tools.bpel</groupId> <artifactId>org.jboss.tools.bpel.tests.feature</artifactId> <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> Modified: trunk/bpel/features/pom.xml =================================================================== --- trunk/bpel/features/pom.xml 2010-11-23 22:43:30 UTC (rev 26863) +++ trunk/bpel/features/pom.xml 2010-11-23 23:15:51 UTC (rev 26864) @@ -2,8 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.tools.bpel</groupId> - <artifactId>features</artifactId> - <name>bpel.features</name> + <artifactId>org.jboss.tools.bpel.features</artifactId> + <name>org.jboss.tools.bpel.features</name> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/pom.xml =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/pom.xml 2010-11-23 22:43:30 UTC (rev 26863) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/pom.xml 2010-11-23 23:15:51 UTC (rev 26864) @@ -1,12 +1,12 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.bpel.plugins</groupId> + <groupId>org.jboss.tools.bpel</groupId> <artifactId>org.eclipse.bpel.apache.ode.deploy.model</artifactId> <version>0.5.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml 2010-11-23 22:43:30 UTC (rev 26863) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml 2010-11-23 23:15:51 UTC (rev 26864) @@ -1,12 +1,12 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.bpel.plugins</groupId> + <groupId>org.jboss.tools.bpel</groupId> <artifactId>org.eclipse.bpel.apache.ode.deploy.ui</artifactId> <version>0.6.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/bpel/plugins/org.eclipse.bpel.common.model/pom.xml =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.common.model/pom.xml 2010-11-23 22:43:30 UTC (rev 26863) +++ trunk/bpel/plugins/org.eclipse.bpel.common.model/pom.xml 2010-11-23 23:15:51 UTC (rev 26864) @@ -1,12 +1,12 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.bpel.plugins</groupId> + <groupId>org.jboss.tools.bpel</groupId> <artifactId>org.eclipse.bpel.common.model</artifactId> <version>0.5.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/bpel/plugins/org.eclipse.bpel.common.ui/pom.xml =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.common.ui/pom.xml 2010-11-23 22:43:30 UTC (rev 26863) +++ trunk/bpel/plugins/org.eclipse.bpel.common.ui/pom.xml 2010-11-23 23:15:51 UTC (rev 26864) @@ -1,12 +1,12 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.bpel.plugins</groupId> + <groupId>org.jboss.tools.bpel</groupId> <artifactId>org.eclipse.bpel.common.ui</artifactId> <version>0.5.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/bpel/plugins/org.eclipse.bpel.model/pom.xml =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.model/pom.xml 2010-11-23 22:43:30 UTC (rev 26863) +++ trunk/bpel/plugins/org.eclipse.bpel.model/pom.xml 2010-11-23 23:15:51 UTC (rev 26864) @@ -1,12 +1,12 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.bpel.plugins</groupId> + <groupId>org.jboss.tools.bpel</groupId> <artifactId>org.eclipse.bpel.model</artifactId> <version>0.6.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/pom.xml =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/pom.xml 2010-11-23 22:43:30 UTC (rev 26863) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/pom.xml 2010-11-23 23:15:51 UTC (rev 26864) @@ -1,12 +1,12 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.bpel.plugins</groupId> + <groupId>org.jboss.tools.bpel</groupId> <artifactId>org.eclipse.bpel.ui</artifactId> <version>0.6.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/pom.xml =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.validator/pom.xml 2010-11-23 22:43:30 UTC (rev 26863) +++ trunk/bpel/plugins/org.eclipse.bpel.validator/pom.xml 2010-11-23 23:15:51 UTC (rev 26864) @@ -1,12 +1,12 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.bpel.plugins</groupId> + <groupId>org.jboss.tools.bpel</groupId> <artifactId>org.eclipse.bpel.validator</artifactId> <version>0.6.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/bpel/plugins/org.eclipse.bpel.wsil.model/pom.xml =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.wsil.model/pom.xml 2010-11-23 22:43:30 UTC (rev 26863) +++ trunk/bpel/plugins/org.eclipse.bpel.wsil.model/pom.xml 2010-11-23 23:15:51 UTC (rev 26864) @@ -1,12 +1,12 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.bpel.plugins</groupId> + <groupId>org.jboss.tools.bpel</groupId> <artifactId>org.eclipse.bpel.wsil.model</artifactId> <version>0.5.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/bpel/plugins/org.eclipse.bpel.xpath10/pom.xml =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.xpath10/pom.xml 2010-11-23 22:43:30 UTC (rev 26863) +++ trunk/bpel/plugins/org.eclipse.bpel.xpath10/pom.xml 2010-11-23 23:15:51 UTC (rev 26864) @@ -1,12 +1,12 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.bpel.plugins</groupId> + <groupId>org.jboss.tools.bpel</groupId> <artifactId>org.eclipse.bpel.xpath10</artifactId> <version>0.5.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/pom.xml =================================================================== --- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/pom.xml 2010-11-23 22:43:30 UTC (rev 26863) +++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/pom.xml 2010-11-23 23:15:51 UTC (rev 26864) @@ -1,12 +1,12 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.bpel.plugins</groupId> + <groupId>org.jboss.tools.bpel</groupId> <artifactId>org.jboss.tools.bpel.cheatsheet</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/pom.xml =================================================================== --- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/pom.xml 2010-11-23 22:43:30 UTC (rev 26863) +++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/pom.xml 2010-11-23 23:15:51 UTC (rev 26864) @@ -1,12 +1,12 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.bpel.plugins</groupId> + <groupId>org.jboss.tools.bpel</groupId> <artifactId>org.jboss.tools.bpel.runtimes</artifactId> <version>0.4.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/bpel/plugins/pom.xml =================================================================== --- trunk/bpel/plugins/pom.xml 2010-11-23 22:43:30 UTC (rev 26863) +++ trunk/bpel/plugins/pom.xml 2010-11-23 23:15:51 UTC (rev 26864) @@ -2,8 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.tools.bpel</groupId> - <artifactId>plugins</artifactId> - <name>bpel.plugins</name> + <artifactId>org.jboss.tools.bpel.plugins</artifactId> + <name>org.jboss.tools.bpel.plugins</name> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> Modified: trunk/bpel/pom.xml =================================================================== --- trunk/bpel/pom.xml 2010-11-23 22:43:30 UTC (rev 26863) +++ trunk/bpel/pom.xml 2010-11-23 23:15:51 UTC (rev 26864) @@ -2,15 +2,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.tools</groupId> - <artifactId>bpel</artifactId> - <name>bpel.all</name> + <artifactId>org.jboss.tools.bpel.all</artifactId> + <name>org.jboss.tools.bpel.all</name> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> + <module>plugins</module> <module>features</module> - <module>plugins</module> + <module>site</module> <module>tests</module> - <module>site</module> </modules> </project> Modified: trunk/bpel/site/pom.xml =================================================================== --- trunk/bpel/site/pom.xml 2010-11-23 22:43:30 UTC (rev 26863) +++ trunk/bpel/site/pom.xml 2010-11-23 23:15:51 UTC (rev 26864) @@ -1,14 +1,14 @@ -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.bpel</groupId> - <artifactId>bpel.site</artifactId> - <name>bpel.site</name> + <artifactId>org.jboss.tools.bpel.site</artifactId> + <name>org.jboss.tools.bpel.site</name> <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> </project> Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.test/pom.xml =================================================================== --- trunk/bpel/tests/org.jboss.tools.bpel.ui.test/pom.xml 2010-11-23 22:43:30 UTC (rev 26863) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.test/pom.xml 2010-11-23 23:15:51 UTC (rev 26864) @@ -1,12 +1,12 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.bpel.tests</groupId> + <groupId>org.jboss.tools.bpel</groupId> <artifactId>org.jboss.tools.bpel.ui.test</artifactId> <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> @@ -16,4 +16,5 @@ <emma.instrument.bundles>org.eclipse.bpel.ui,org.eclipse.bpel.common.ui,org.eclipse.bpel.common.model,org.eclipse.bpel.model</emma.instrument.bundles> </properties> + </project> Modified: trunk/bpel/tests/pom.xml =================================================================== --- trunk/bpel/tests/pom.xml 2010-11-23 22:43:30 UTC (rev 26863) +++ trunk/bpel/tests/pom.xml 2010-11-23 23:15:51 UTC (rev 26864) @@ -2,8 +2,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.tools.bpel</groupId> - <artifactId>tests</artifactId> - <name>bpel.tests</name> + <artifactId>org.jboss.tools.bpel.tests</artifactId> + <name>org.jboss.tools.bpel.tests</name> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules>

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r26863 - in trunk/drools: plugins and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-11-23 17:43:30 -0500 (Tue, 23 Nov 2010) New Revision: 26863 Modified: trunk/drools/features/pom.xml trunk/drools/plugins/pom.xml trunk/drools/site/pom.xml trunk/drools/tests/pom.xml Log: use FQDN for poms Modified: trunk/drools/features/pom.xml =================================================================== --- trunk/drools/features/pom.xml 2010-11-23 22:34:42 UTC (rev 26862) +++ trunk/drools/features/pom.xml 2010-11-23 22:43:30 UTC (rev 26863) @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.tools.drools</groupId> <artifactId>org.jboss.tools.drools.features</artifactId> - <name>drools.features</name> + <name>org.jboss.tools.drools.features</name> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> Modified: trunk/drools/plugins/pom.xml =================================================================== --- trunk/drools/plugins/pom.xml 2010-11-23 22:34:42 UTC (rev 26862) +++ trunk/drools/plugins/pom.xml 2010-11-23 22:43:30 UTC (rev 26863) @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.tools.drools</groupId> <artifactId>org.jboss.tools.drools.plugins</artifactId> - <name>drools.plugins</name> + <name>org.jboss.tools.drools.plugins</name> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules> Modified: trunk/drools/site/pom.xml =================================================================== --- trunk/drools/site/pom.xml 2010-11-23 22:34:42 UTC (rev 26862) +++ trunk/drools/site/pom.xml 2010-11-23 22:43:30 UTC (rev 26863) @@ -2,14 +2,13 @@ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.drools</groupId> - <artifactId>org.jboss.tools.drools.drools.site</artifactId> - <name>drools.site</name> + <artifactId>org.jboss.tools.drools.site</artifactId> + <name>org.jboss.tools.drools.site</name> <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> </project> Modified: trunk/drools/tests/pom.xml =================================================================== --- trunk/drools/tests/pom.xml 2010-11-23 22:34:42 UTC (rev 26862) +++ trunk/drools/tests/pom.xml 2010-11-23 22:43:30 UTC (rev 26863) @@ -9,7 +9,7 @@ </parent> <groupId>org.jboss.tools.drools</groupId> <artifactId>org.jboss.tools.drools.tests</artifactId> - <name>drools.tests</name> + <name>org.jboss.tools.drools.tests</name> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> <modules>

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r26862 - in trunk/drools: features/org.drools.eclipse.feature and 11 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-11-23 17:34:42 -0500 (Tue, 23 Nov 2010) New Revision: 26862 Modified: trunk/drools/features/org.drools.eclipse.feature/pom.xml trunk/drools/features/org.drools.eclipse.task.feature/pom.xml trunk/drools/features/org.guvnor.tools.feature/pom.xml trunk/drools/features/pom.xml trunk/drools/plugins/org.drools.eclipse.task/pom.xml trunk/drools/plugins/org.drools.eclipse/pom.xml trunk/drools/plugins/org.eclipse.webdav/pom.xml trunk/drools/plugins/org.guvnor.tools/pom.xml trunk/drools/plugins/org.jboss.tools.flow.ruleflow/pom.xml trunk/drools/plugins/pom.xml trunk/drools/site/pom.xml trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/pom.xml trunk/drools/tests/pom.xml Log: automatically updated GAVs using GAV plugin Modified: trunk/drools/features/org.drools.eclipse.feature/pom.xml =================================================================== --- trunk/drools/features/org.drools.eclipse.feature/pom.xml 2010-11-23 21:29:31 UTC (rev 26861) +++ trunk/drools/features/org.drools.eclipse.feature/pom.xml 2010-11-23 22:34:42 UTC (rev 26862) @@ -1,5 +1,5 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.drools.features</groupId> + <groupId>org.jboss.tools.drools</groupId> <artifactId>org.drools.eclipse.feature</artifactId> <version>5.2.0.SNAPSHOT</version> <packaging>eclipse-feature</packaging> Modified: trunk/drools/features/org.drools.eclipse.task.feature/pom.xml =================================================================== --- trunk/drools/features/org.drools.eclipse.task.feature/pom.xml 2010-11-23 21:29:31 UTC (rev 26861) +++ trunk/drools/features/org.drools.eclipse.task.feature/pom.xml 2010-11-23 22:34:42 UTC (rev 26862) @@ -1,5 +1,5 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.drools.features</groupId> + <groupId>org.jboss.tools.drools</groupId> <artifactId>org.drools.eclipse.task.feature</artifactId> <version>5.2.0.SNAPSHOT</version> <packaging>eclipse-feature</packaging> Modified: trunk/drools/features/org.guvnor.tools.feature/pom.xml =================================================================== --- trunk/drools/features/org.guvnor.tools.feature/pom.xml 2010-11-23 21:29:31 UTC (rev 26861) +++ trunk/drools/features/org.guvnor.tools.feature/pom.xml 2010-11-23 22:34:42 UTC (rev 26862) @@ -1,5 +1,5 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.drools.features</groupId> + <groupId>org.jboss.tools.drools</groupId> <artifactId>org.guvnor.tools.feature</artifactId> <version>5.2.0.SNAPSHOT</version> <packaging>eclipse-feature</packaging> Modified: trunk/drools/features/pom.xml =================================================================== --- trunk/drools/features/pom.xml 2010-11-23 21:29:31 UTC (rev 26861) +++ trunk/drools/features/pom.xml 2010-11-23 22:34:42 UTC (rev 26862) @@ -1,8 +1,8 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.tools.drools</groupId> - <artifactId>features</artifactId> + <artifactId>org.jboss.tools.drools.features</artifactId> <name>drools.features</name> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> @@ -12,4 +12,3 @@ <module>org.guvnor.tools.feature</module> </modules> </project> - Modified: trunk/drools/plugins/org.drools.eclipse/pom.xml =================================================================== --- trunk/drools/plugins/org.drools.eclipse/pom.xml 2010-11-23 21:29:31 UTC (rev 26861) +++ trunk/drools/plugins/org.drools.eclipse/pom.xml 2010-11-23 22:34:42 UTC (rev 26862) @@ -1,5 +1,5 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.drools.plugins</groupId> + <groupId>org.jboss.tools.drools</groupId> <artifactId>org.drools.eclipse</artifactId> <version>5.2.0.SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/drools/plugins/org.drools.eclipse.task/pom.xml =================================================================== --- trunk/drools/plugins/org.drools.eclipse.task/pom.xml 2010-11-23 21:29:31 UTC (rev 26861) +++ trunk/drools/plugins/org.drools.eclipse.task/pom.xml 2010-11-23 22:34:42 UTC (rev 26862) @@ -1,5 +1,5 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.drools.plugins</groupId> + <groupId>org.jboss.tools.drools</groupId> <artifactId>org.drools.eclipse.task</artifactId> <version>5.2.0.SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/drools/plugins/org.eclipse.webdav/pom.xml =================================================================== --- trunk/drools/plugins/org.eclipse.webdav/pom.xml 2010-11-23 21:29:31 UTC (rev 26861) +++ trunk/drools/plugins/org.eclipse.webdav/pom.xml 2010-11-23 22:34:42 UTC (rev 26862) @@ -1,5 +1,5 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.drools.plugins</groupId> + <groupId>org.jboss.tools.drools</groupId> <artifactId>org.eclipse.webdav</artifactId> <version>3.0.101</version> <packaging>eclipse-plugin</packaging> Modified: trunk/drools/plugins/org.guvnor.tools/pom.xml =================================================================== --- trunk/drools/plugins/org.guvnor.tools/pom.xml 2010-11-23 21:29:31 UTC (rev 26861) +++ trunk/drools/plugins/org.guvnor.tools/pom.xml 2010-11-23 22:34:42 UTC (rev 26862) @@ -1,5 +1,5 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.drools.plugins</groupId> + <groupId>org.jboss.tools.drools</groupId> <artifactId>org.guvnor.tools</artifactId> <version>5.2.0.SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/pom.xml =================================================================== --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/pom.xml 2010-11-23 21:29:31 UTC (rev 26861) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/pom.xml 2010-11-23 22:34:42 UTC (rev 26862) @@ -1,12 +1,12 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.drools.plugins</groupId> + <groupId>org.jboss.tools.drools</groupId> <artifactId>org.jboss.tools.flow.ruleflow</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> Modified: trunk/drools/plugins/pom.xml =================================================================== --- trunk/drools/plugins/pom.xml 2010-11-23 21:29:31 UTC (rev 26861) +++ trunk/drools/plugins/pom.xml 2010-11-23 22:34:42 UTC (rev 26862) @@ -1,8 +1,8 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.tools.drools</groupId> - <artifactId>plugins</artifactId> + <artifactId>org.jboss.tools.drools.plugins</artifactId> <name>drools.plugins</name> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> @@ -14,4 +14,3 @@ <module>org.jboss.tools.flow.ruleflow</module> </modules> </project> - Modified: trunk/drools/site/pom.xml =================================================================== --- trunk/drools/site/pom.xml 2010-11-23 21:29:31 UTC (rev 26861) +++ trunk/drools/site/pom.xml 2010-11-23 22:34:42 UTC (rev 26862) @@ -1,4 +1,5 @@ -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<project + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -7,7 +8,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.drools</groupId> - <artifactId>drools.site</artifactId> + <artifactId>org.jboss.tools.drools.drools.site</artifactId> <name>drools.site</name> <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/pom.xml =================================================================== --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/pom.xml 2010-11-23 21:29:31 UTC (rev 26861) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/pom.xml 2010-11-23 22:34:42 UTC (rev 26862) @@ -1,5 +1,5 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -7,7 +7,7 @@ <artifactId>org.jboss.tools.parent.pom</artifactId> <version>0.0.1-SNAPSHOT</version> </parent> - <groupId>org.jboss.tools.drools.tests</groupId> + <groupId>org.jboss.tools.drools</groupId> <artifactId>org.jboss.tools.drools.ui.bot.test</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> Modified: trunk/drools/tests/pom.xml =================================================================== --- trunk/drools/tests/pom.xml 2010-11-23 21:29:31 UTC (rev 26861) +++ trunk/drools/tests/pom.xml 2010-11-23 22:34:42 UTC (rev 26862) @@ -1,5 +1,5 @@ <project -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -8,7 +8,7 @@ <version>0.0.1-SNAPSHOT</version> </parent> <groupId>org.jboss.tools.drools</groupId> - <artifactId>tests</artifactId> + <artifactId>org.jboss.tools.drools.tests</artifactId> <name>drools.tests</name> <version>0.0.1-SNAPSHOT</version> <packaging>pom</packaging> @@ -16,4 +16,3 @@ <module>org.jboss.tools.drools.ui.bot.test</module> </modules> </project> -

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r26861 - trunk/build/aggregate/site.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-11-23 16:29:31 -0500 (Tue, 23 Nov 2010) New Revision: 26861 Modified: trunk/build/aggregate/site/pom.xml Log: fix path of new composiite site Modified: trunk/build/aggregate/site/pom.xml =================================================================== --- trunk/build/aggregate/site/pom.xml 2010-11-23 20:08:09 UTC (rev 26860) +++ trunk/build/aggregate/site/pom.xml 2010-11-23 21:29:31 UTC (rev 26861) @@ -94,13 +94,21 @@ can be referred to in Ant script later --> <repository> <id>inputRepo1</id> + <url>${inputRepo1}</url> + <layout>p2</layout> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + <!-- <repository> + <id>inputRepo1</id> <url>${inputRepo1}/all/repo/</url> <layout>p2</layout> <snapshots> <enabled>true</enabled> </snapshots> </repository> - <!-- <repository> + <repository> <id>inputRepo2</id> <url>${inputRepo2}/all/repo/</url> <layout>p2</layout>

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r26860 - in trunk/hibernatetools/tests/org.hibernate.eclipse.console.test: src/org/hibernate/eclipse/console/test and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2010-11-23 15:08:09 -0500 (Tue, 23 Nov 2010) New Revision: 26860 Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_external.launch trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_internal.launch Removed: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg.launch Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/LaunchConfigTestProject2.java Log: https://jira.jboss.org/browse/JBIDE-7709 - partially fixed, junit test for JBIDE-7723 Deleted: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg.launch =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg.launch 2010-11-23 20:06:18 UTC (rev 26859) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg.launch 2010-11-23 20:08:09 UTC (rev 26860) @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.hibernate.eclipse.launch.CodeGenerationLaunchConfigurationType"> -<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> -<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/> -<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="\LaunchConfigTestProject2\build_2794024212908788293xml"/> -<stringAttribute key="org.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/> -<booleanAttribute key="org.hibernate.tools.ejb3" value="false"/> -<listAttribute key="org.hibernate.tools.exporters"> -<listEntry value="org.hibernate.tools.hbm2java"/> -<listEntry value="org.hibernate.tools.hbm2hbmxml"/> -<listEntry value="org.hibernate.tools.hbm2dao"/> -<listEntry value="org.hibernate.tools.hbmtemplate"/> -<listEntry value="org.hibernate.tools.hbm2cfgxml"/> -<listEntry value="org.hibernate.tools.hbm2doc"/> -<listEntry value="org.hibernate.tools.hbm2ddl"/> -<listEntry value="org.hibernate.tools.query"/> -</listAttribute> -<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml" value="false"/> -<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.extension_id" value="org.hibernate.tools.hbm2cfgxml"/> -<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao" value="false"/> -<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.extension_id" value="org.hibernate.tools.hbm2dao"/> -<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl" value="false"/> -<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.extension_id" value="org.hibernate.tools.hbm2ddl"/> -<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc" value="true"/> -<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.extension_id" value="org.hibernate.tools.hbm2doc"/> -<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml" value="false"/> -<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.extension_id" value="org.hibernate.tools.hbm2hbmxml"/> -<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java" value="false"/> -<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java.extension_id" value="org.hibernate.tools.hbm2java"/> -<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate" value="false"/> -<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.extension_id" value="org.hibernate.tools.hbmtemplate"/> -<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query" value="false"/> -<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.extension_id" value="org.hibernate.tools.query"/> -<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.properties"> -<mapEntry key="outputFileName" value="asdf.txt"/> -<mapEntry key="outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder"/> -<mapEntry key="query_string" value="from org.jboss.seam.example.booking.Booking"/> -</mapAttribute> -<booleanAttribute key="org.hibernate.tools.jdk5" value="false"/> -<stringAttribute key="org.hibernate.tools.outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder"/> -<stringAttribute key="org.hibernate.tools.package" value="hsql"/> -<booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/> -<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/> -<booleanAttribute key="org.hibernate.tools.reveng.detect_one_to_one" value="true"/> -<booleanAttribute key="org.hibernate.tools.reveng.detect_optimistc_lock" value="true"/> -<booleanAttribute key="org.hibernate.tools.schema2hbm" value="false"/> -<booleanAttribute key="org.hibernate.tools.useExternalProcess" value="true"/> -<booleanAttribute key="org.hibernate.tools.useOwnTemplates" value="false"/> -<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> -</launchConfiguration> Copied: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_external.launch (from rev 26844, trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg.launch) =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_external.launch (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_external.launch 2010-11-23 20:08:09 UTC (rev 26860) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.hibernate.eclipse.launch.CodeGenerationLaunchConfigurationType"> +<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> +<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="\LaunchConfigTestProject2\build_2794024212908788293xml"/> +<stringAttribute key="org.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/> +<booleanAttribute key="org.hibernate.tools.ejb3" value="false"/> +<listAttribute key="org.hibernate.tools.exporters"> +<listEntry value="org.hibernate.tools.hbm2java"/> +<listEntry value="org.hibernate.tools.hbm2hbmxml"/> +<listEntry value="org.hibernate.tools.hbm2dao"/> +<listEntry value="org.hibernate.tools.hbmtemplate"/> +<listEntry value="org.hibernate.tools.hbm2cfgxml"/> +<listEntry value="org.hibernate.tools.hbm2doc"/> +<listEntry value="org.hibernate.tools.hbm2ddl"/> +<listEntry value="org.hibernate.tools.query"/> +</listAttribute> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.extension_id" value="org.hibernate.tools.hbm2cfgxml"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.extension_id" value="org.hibernate.tools.hbm2dao"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.extension_id" value="org.hibernate.tools.hbm2ddl"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc" value="true"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.extension_id" value="org.hibernate.tools.hbm2doc"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.extension_id" value="org.hibernate.tools.hbm2hbmxml"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java.extension_id" value="org.hibernate.tools.hbm2java"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.extension_id" value="org.hibernate.tools.hbmtemplate"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.extension_id" value="org.hibernate.tools.query"/> +<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.properties"> +<mapEntry key="outputFileName" value="asdf.txt"/> +<mapEntry key="outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder"/> +<mapEntry key="query_string" value="from org.jboss.seam.example.booking.Booking"/> +</mapAttribute> +<booleanAttribute key="org.hibernate.tools.jdk5" value="false"/> +<stringAttribute key="org.hibernate.tools.outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder"/> +<stringAttribute key="org.hibernate.tools.package" value="hsql"/> +<booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_one_to_one" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_optimistc_lock" value="true"/> +<booleanAttribute key="org.hibernate.tools.schema2hbm" value="false"/> +<booleanAttribute key="org.hibernate.tools.useExternalProcess" value="true"/> +<booleanAttribute key="org.hibernate.tools.useOwnTemplates" value="false"/> +<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> +</launchConfiguration> Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_internal.launch =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_internal.launch (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/res/project2/testLaunchCfg_internal.launch 2010-11-23 20:08:09 UTC (rev 26860) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.hibernate.eclipse.launch.CodeGenerationLaunchConfigurationType"> +<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/> +<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/> +<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="\LaunchConfigTestProject2\build_2794024212908788293xml"/> +<stringAttribute key="org.hibernate.tools.configurationname" value="LaunchConfigTestProject2"/> +<booleanAttribute key="org.hibernate.tools.ejb3" value="false"/> +<listAttribute key="org.hibernate.tools.exporters"> +<listEntry value="org.hibernate.tools.hbm2java"/> +<listEntry value="org.hibernate.tools.hbm2hbmxml"/> +<listEntry value="org.hibernate.tools.hbm2dao"/> +<listEntry value="org.hibernate.tools.hbmtemplate"/> +<listEntry value="org.hibernate.tools.hbm2cfgxml"/> +<listEntry value="org.hibernate.tools.hbm2doc"/> +<listEntry value="org.hibernate.tools.hbm2ddl"/> +<listEntry value="org.hibernate.tools.query"/> +</listAttribute> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2cfgxml.extension_id" value="org.hibernate.tools.hbm2cfgxml"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2dao.extension_id" value="org.hibernate.tools.hbm2dao"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2ddl.extension_id" value="org.hibernate.tools.hbm2ddl"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc" value="true"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2doc.extension_id" value="org.hibernate.tools.hbm2doc"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2hbmxml.extension_id" value="org.hibernate.tools.hbm2hbmxml"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbm2java.extension_id" value="org.hibernate.tools.hbm2java"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.hbmtemplate.extension_id" value="org.hibernate.tools.hbmtemplate"/> +<booleanAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query" value="false"/> +<stringAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.extension_id" value="org.hibernate.tools.query"/> +<mapAttribute key="org.hibernate.tools.exporters.org.hibernate.tools.query.properties"> +<mapEntry key="outputFileName" value="asdf.txt"/> +<mapEntry key="outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder"/> +<mapEntry key="query_string" value="from org.jboss.seam.example.booking.Booking"/> +</mapAttribute> +<booleanAttribute key="org.hibernate.tools.jdk5" value="false"/> +<stringAttribute key="org.hibernate.tools.outputdir" value="\LaunchConfigTestProject2\temp_test_out_folder"/> +<stringAttribute key="org.hibernate.tools.package" value="hsql"/> +<booleanAttribute key="org.hibernate.tools.prefercompositeids" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_many_to_many" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_one_to_one" value="true"/> +<booleanAttribute key="org.hibernate.tools.reveng.detect_optimistc_lock" value="true"/> +<booleanAttribute key="org.hibernate.tools.schema2hbm" value="false"/> +<booleanAttribute key="org.hibernate.tools.useExternalProcess" value="false"/> +<booleanAttribute key="org.hibernate.tools.useOwnTemplates" value="false"/> +<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/> +</launchConfiguration> Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java 2010-11-23 20:06:18 UTC (rev 26859) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenExternalProcessExecutionTest.java 2010-11-23 20:08:09 UTC (rev 26860) @@ -59,11 +59,27 @@ } protected void tearDown() throws Exception { - this.project.deleteIProject(); - this.project = null; - + consoleCfg.reset(); KnownConfigurations.getInstance().removeAllConfigurations(); consoleCfg = null; + // + Exception ex = null; + for (int i = 0; i < 4; i++) { + ex = null; + try { + this.project.deleteIProject(); + i = 4; + } catch (Exception e) { + ex = e; + if (i < 3) { + Thread.sleep(3000); + } + } + } + if (ex != null) { + throw ex; + } + this.project = null; } public void testExecuteExternalLaunchConfig() { @@ -74,9 +90,12 @@ } catch (CoreException e) { } assertEquals(0, nTest); - final String fileNameCodeGen = LaunchConfigTestProject2.LAUNCH_CODE_GEN_TEST_FILE; - ILaunchConfiguration launchConfig = loadLaunchConfigFromFile(fileNameCodeGen); + ILaunchConfiguration launchConfig = null; ILaunchConfigurationWorkingCopy launchConfigWC = null; + // + final String fileNameCodeGenExtern = LaunchConfigTestProject2.LAUNCH_CODE_GEN_TEST_FILE_EXTERN; + launchConfig = loadLaunchConfigFromFile(fileNameCodeGenExtern); + launchConfigWC = null; try { launchConfigWC = launchConfig.getWorkingCopy(); } catch (CoreException e) { @@ -89,6 +108,24 @@ nTest = testFolder.members().length; } catch (CoreException e) { } + // TODO: uncomment when JBIDE-7441 be fixed + //assertTrue(nTest > 0); + // + final String fileNameCodeGenIntern = LaunchConfigTestProject2.LAUNCH_CODE_GEN_TEST_FILE_INTERN; + launchConfig = loadLaunchConfigFromFile(fileNameCodeGenIntern); + launchConfigWC = null; + try { + launchConfigWC = launchConfig.getWorkingCopy(); + } catch (CoreException e) { + } + assertNotNull(launchConfigWC); + launchConfigWC.setAttribute(IExternalToolConstants.ATTR_LAUNCH_IN_BACKGROUND, false); + DebugUIPlugin.launchInForeground(launchConfigWC, ILaunchManager.RUN_MODE); + nTest = -1; + try { + nTest = testFolder.members().length; + } catch (CoreException e) { + } assertTrue(nTest > 0); } Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/LaunchConfigTestProject2.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/LaunchConfigTestProject2.java 2010-11-23 20:06:18 UTC (rev 26859) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/project/LaunchConfigTestProject2.java 2010-11-23 20:08:09 UTC (rev 26860) @@ -46,7 +46,8 @@ public static final String RESOURCE_LIB_PATH = "res/project2/lib/".replaceAll("//", File.separator); //$NON-NLS-1$ //$NON-NLS-2$ public static final String HIBERNATE_PLUGIN_LIB_PATH = "lib"; //$NON-NLS-1$ - public static final String LAUNCH_CODE_GEN_TEST_FILE = "testLaunchCfg.launch"; //$NON-NLS-1$ + public static final String LAUNCH_CODE_GEN_TEST_FILE_EXTERN = "testLaunchCfg_external.launch"; //$NON-NLS-1$ + public static final String LAUNCH_CODE_GEN_TEST_FILE_INTERN = "testLaunchCfg_internal.launch"; //$NON-NLS-1$ public static final String LAUNCH_CONSOLE_CONFIG_TEST_FILE = "LaunchConfigTestProject2.launch"; //$NON-NLS-1$ public static final String HIBERNATE_CONSOLE_PROPERTIES_FILE = "hibernate-console.properties"; //$NON-NLS-1$ public static final String PERSISTENCE_XML_FILE = "persistence.xml"; //$NON-NLS-1$ @@ -77,7 +78,8 @@ IPackageFragmentRoot tst = createFolder(TEST_TMP_OUT_FOLDER); tst.getResource().refreshLocal(IResource.DEPTH_INFINITE, null); // - importFileToProject(LAUNCH_CODE_GEN_TEST_FILE); + importFileToProject(LAUNCH_CODE_GEN_TEST_FILE_EXTERN); + importFileToProject(LAUNCH_CODE_GEN_TEST_FILE_INTERN); importFileToProject(LAUNCH_CONSOLE_CONFIG_TEST_FILE); importFileToProject(HIBERNATE_CONSOLE_PROPERTIES_FILE); long startCopyFiles = System.currentTimeMillis();

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r26859 - branches/jbosstools-3.2.0.Beta2/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs.

by jbosstools-commits＠lists.jboss.org

Author: bbrodt Date: 2010-11-23 15:06:18 -0500 (Tue, 23 Nov 2010) New Revision: 26859 Modified: branches/jbosstools-3.2.0.Beta2/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java Log: https://jira.jboss.org/browse/JBIDE-7107 Fix a mysterious treeviewer collapse in Message type selector dialog when "From Project" is enabled. Modified: branches/jbosstools-3.2.0.Beta2/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java =================================================================== --- branches/jbosstools-3.2.0.Beta2/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java 2010-11-23 20:04:51 UTC (rev 26858) +++ branches/jbosstools-3.2.0.Beta2/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/dialogs/BrowseSelectorDialog.java 2010-11-23 20:06:18 UTC (rev 26859) @@ -505,7 +505,7 @@ public void widgetSelected(SelectionEvent arg0) { // https://jira.jboss.org/browse/JBIDE-7107 // update "OK" button enablement - refresh(); + updateOkState(); } });

13 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits November 2010