From: Robert S. <ra...@gm...> - 2006-07-10 15:42:35
|
User: rawb Date: 06/07/10 11:42:32 Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client NullLaunchable.java VerifyPublishClient.java DoNothingClient.java TwiddleLauncher.java Log: These are deactivated mostly until next release. Revision Changes Path 1.2 +3 -0 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/NullLaunchable.java (In the diff below, changes in quantity of whitespace are not shown.) Index: NullLaunchable.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/NullLaunchable.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- NullLaunchable.java 9 Jun 2006 16:58:24 -0000 1.1 +++ NullLaunchable.java 10 Jul 2006 15:42:32 -0000 1.2 @@ -1,5 +1,8 @@ package org.jboss.ide.eclipse.as.core.client; +/* + * Used for pre-packaged jst stuff. Just as a label + */ public class NullLaunchable { } 1.3 +15 -11 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/VerifyPublishClient.java (In the diff below, changes in quantity of whitespace are not shown.) Index: VerifyPublishClient.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/VerifyPublishClient.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- VerifyPublishClient.java 2 Jun 2006 16:47:55 -0000 1.2 +++ VerifyPublishClient.java 10 Jul 2006 15:42:32 -0000 1.3 @@ -28,7 +28,9 @@ import org.eclipse.wst.server.core.model.ClientDelegate; import org.jboss.ide.eclipse.as.core.JBossServerCore; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.JBossServerCorePreferences; import org.jboss.ide.eclipse.as.core.client.verifiers.IJbossDeploymentVerifier; +import org.jboss.ide.eclipse.as.core.server.JBossServer; import org.jboss.ide.eclipse.as.core.util.ASDebug; public class VerifyPublishClient extends ClientDelegate { @@ -38,23 +40,25 @@ } public boolean supports(IServer server, Object launchable, String launchMode) { - if( launchable instanceof IJbossDeploymentVerifier) { - return ((IJbossDeploymentVerifier)launchable).supportsVerify(server, launchMode); - } + if( JBossServerCore.getServer(server) == null ) return false; + if( JBossServerCorePreferences.getDefault(). + getModuleClientAction(null) != JBossServerCorePreferences.VERIFY_CLIENT_ACTION ) { return false; } + return true; + } + public IStatus launch(IServer server, Object launchable, String launchMode, ILaunch launch) { - if( launchable instanceof IJbossDeploymentVerifier) { - IJbossDeploymentVerifier verifier = ((IJbossDeploymentVerifier)launchable); - return verifier.verifyDeployed(JBossServerCore.getServer(server), launchMode, launch); + ASDebug.p("I'm supposed to verify now", this); + if( launchable instanceof IJbossDeploymentVerifier ) { + JBossServer jbServer = JBossServerCore.getServer(server); + if( jbServer != null ) + return ((IJbossDeploymentVerifier)launchable).verifyDeployed(jbServer, launchMode, launch); } - - return new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, 0, "Could not verify deployment", - new Exception("Could not verify deployment in " + getClass().getName())); + new Exception("Could not verify deployment")); } - } 1.2 +9 -5 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/DoNothingClient.java (In the diff below, changes in quantity of whitespace are not shown.) Index: DoNothingClient.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/DoNothingClient.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- DoNothingClient.java 9 Jun 2006 16:58:24 -0000 1.1 +++ DoNothingClient.java 10 Jul 2006 15:42:32 -0000 1.2 @@ -28,6 +28,7 @@ import org.eclipse.wst.server.core.internal.ServerPlugin; import org.eclipse.wst.server.core.model.ClientDelegate; import org.jboss.ide.eclipse.as.core.JBossServerCore; +import org.jboss.ide.eclipse.as.core.JBossServerCorePreferences; import org.jboss.ide.eclipse.as.core.util.ASDebug; /** @@ -49,17 +50,20 @@ } public boolean supports(IServer server, Object launchable, String launchMode) { - if( JBossServerCore.getServer(server) != null ) - return true; + if( JBossServerCore.getServer(server) == null ) return false; + if( JBossServerCorePreferences.getDefault(). + getModuleClientAction(null) != JBossServerCorePreferences.NO_CLIENT_ACTION ) { return false; } + return true; + } + public IStatus launch(IServer server, Object launchable, String launchMode, ILaunch launch) { // Do nothing - - ASDebug.p("Published content!", this); + ASDebug.p("Here, I do nothing", this); return new Status(IStatus.OK, ServerPlugin.PLUGIN_ID, 0, "A-OK", null); } 1.4 +48 -29 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/TwiddleLauncher.java (In the diff below, changes in quantity of whitespace are not shown.) Index: TwiddleLauncher.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/TwiddleLauncher.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- TwiddleLauncher.java 19 Jun 2006 14:16:50 -0000 1.3 +++ TwiddleLauncher.java 10 Jul 2006 15:42:32 -0000 1.4 @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Properties; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; @@ -78,7 +79,6 @@ ArrayList list = new ArrayList(); for( int i = 0; i < twiddleArgs.length; i++ ) { try { - System.out.println("[Twiddle Args] " + twiddleArgs[i]); wc = createTwiddleLaunch(jbServer, twiddleArgs[i], seed); ILaunch launch = wc.launch(ILaunchManager.RUN_MODE, new NullProgressMonitor(), false, false); list.addAll(Arrays.asList(launch.getProcesses())); @@ -123,7 +123,7 @@ workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, ""); workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_CLASSPATH, classpath); workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_DEFAULT_CLASSPATH, false); - workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, runtimeDelegate.getTwiddleMainType(jbServer)); + workingCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, runtimeDelegate.getTwiddleMainType()); workingCopy.setAttribute(Server.ATTR_SERVER_ID, jbServer.getServer().getId()); workingCopy.setAttribute(JBossServerBehavior.ATTR_ACTION, JBossServerBehavior.ACTION_TWIDDLE); @@ -132,7 +132,7 @@ workingCopy.setAttribute( IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, - jbServer.getRuntimeConfiguration().getServerHome() + Path.SEPARATOR + "bin"); + jbServer.getAttributeHelper().getServerHome() + Path.SEPARATOR + "bin"); @@ -204,26 +204,10 @@ private TwiddleLogEvent createTwiddleEvents(String args, boolean allTerminated) { // If there's only one process, we dont need to do all the rest if( processDatas.length == 1 ) { - TwiddleLogEvent e = new TwiddleLogEvent("Twiddle Launch: " + args, - ProcessLogEvent.TWIDDLE, processDatas[0]); -// ProcessLogEvent e = new ProcessLogEvent("Twiddle Launch: " + args, ProcessLogEvent.TWIDDLE); -// if( !processDatas[0].getOut().equals("")) { -// String out = processDatas[0].getOut(); -// String[] outArray = out.split("\r\n|\r|\n"); -// for( int i = 0; i < outArray.length; i++ ) { -// e.addChild(outArray[i], ProcessLogEvent.STDOUT); -// } -// } -// if( !processDatas[0].getErr().equals("")) { -// String err = processDatas[0].getErr(); -// String[] errArray = err.split("\r\n|\r|\n"); -// for( int i = 0; i < errArray.length; i++ ) { -// e.addChild(errArray[i], ProcessLogEvent.STDOUT); -// } -// } + TwiddleLogEvent e = new TwiddleLogEvent(args, processDatas[0], current); return e; } - return new TwiddleLogEvent("Error in TwiddleLauncher (unexpected response)", ProcessLogEvent.ERROR, null); + return new TwiddleLogEvent(TwiddleLogEvent.ERROR, args, null, current); } public int getDuration() { @@ -249,25 +233,60 @@ public static class TwiddleLogEvent extends ProcessLogEvent { - private String out; - private String err; + public static final String OUT = "_OUT_"; + public static final String ERR = "_ERR_"; + public static final String ARGS = "_ARGS_"; + public static final String TIME = "_TIME_"; - public TwiddleLogEvent(String text, int eventType, ProcessData data) { - super(text, eventType); + public static final int TWIDDLE = 0; + public static final int ERROR = 1; + + + + public TwiddleLogEvent(String args1, ProcessData data, int time) { + this(TWIDDLE, args1, data, time); + } + + public TwiddleLogEvent(int type, String args1, ProcessData data, int time) { + super(type); + setProperty(ARGS, args1); + setProperty(TIME, time); if( data != null ) { - this.out = data.getOut(); - this.err = data.getErr(); + setProperty(OUT, data.getOut()); + setProperty(ERR, data.getErr()); } } public String getOut() { - return out; + return (String)getProperty(OUT); } public String getErr() { - return err; + return (String)getProperty(ERR); + } + public String getArgs() { + return (String)getProperty(ARGS); + } + public int getTime() { + return ((Integer)getProperty(TIME)).intValue(); } public boolean isException() { return false; } + public Object[] getAvailableProperties() { + return new Object[] { ARGS, TIME}; + } + public Properties outputAsProperties() { + Properties p = new Properties(); + String[] perLine = getOut().split("\r\n|\r|\n"); + for( int i = 0; i < perLine.length; i++ ) { + if( perLine[i].contains("=")) { + try { + int index = perLine[i].indexOf("="); + p.put(perLine[i].substring(0, index), perLine[i].substring(index+1)); + } catch( Exception e ) {} + } + } + return p; + } } } |