|
From: Robert S. <ra...@gm...> - 2006-07-10 15:42:59
|
User: rawb
Date: 06/07/10 11:42:56
Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers
EjbDeploymentVerifier.java
AbstractDeploymentVerifier.java
WarDeploymentVerifier.java
EarDeploymentVerifier.java
Added: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers
ArchiveVerifier.java
Log:
These are deactivated mostly until next release.
Revision Changes Path
1.4 +8 -4 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers/EjbDeploymentVerifier.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EjbDeploymentVerifier.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers/EjbDeploymentVerifier.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- EjbDeploymentVerifier.java 9 Jun 2006 16:58:24 -0000 1.3
+++ EjbDeploymentVerifier.java 10 Jul 2006 15:42:56 -0000 1.4
@@ -24,10 +24,7 @@
import org.eclipse.debug.core.DebugEvent;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.JBossServerCore;
-import org.jboss.ide.eclipse.as.core.client.TwiddleLauncher;
-import org.jboss.ide.eclipse.as.core.model.ServerProcessLog.ProcessLogEvent;
import org.jboss.ide.eclipse.as.core.module.factory.JBossModuleDelegate;
-import org.jboss.ide.eclipse.as.core.module.factory.EjbModuleFactory.EjbModuleDelegate;
import org.jboss.ide.eclipse.as.core.server.JBossServer;
public class EjbDeploymentVerifier extends AbstractDeploymentVerifier {
@@ -44,6 +41,7 @@
}
public String[] createTwiddleArgs(JBossServer server, JBossModuleDelegate delegate1) {
+ /*
if( !(delegate1 instanceof EjbModuleDelegate) ) {
return new String[] { };
}
@@ -51,7 +49,7 @@
EjbModuleDelegate delegate = (EjbModuleDelegate)delegate1;
int jndiPort = server.getDescriptorModel().getJNDIPort();
- String host = server.getRuntimeConfiguration().getHost();
+ String host = server.getServer().getHost();
String filename = delegate.getResourceName();
@@ -67,6 +65,8 @@
//String final2 = argsFront + service + " StateString Name";
return allArgs;
+ */
+ return new String[0];
}
private String createModuleArgs(String front, String filename) {
@@ -74,6 +74,7 @@
"StateString Name";
}
+ /*
private String[] createBeanArgs(String front, EjbModuleDelegate delegate) {
String[] names = delegate.getBeanJNDINames();
String[] args = new String[names.length];
@@ -83,6 +84,7 @@
}
return args;
}
+ */
protected String formatConsoleOutput() {
return "";
@@ -101,6 +103,7 @@
}
protected void runVerifier() {
+ /*
String[] twiddleArgs = createTwiddleArgs(jbServer, (EjbModuleDelegate)delegate);
for( int i = 0; i < twiddleArgs.length; i++ ) {
ProcessLogEvent event =
@@ -108,6 +111,7 @@
logEvent.addChild(event);
logEvent.getRoot().branchChanged();
}
+ */
}
protected void threadTerminated(DebugEvent[] events) {
1.3 +7 -8 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers/AbstractDeploymentVerifier.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AbstractDeploymentVerifier.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers/AbstractDeploymentVerifier.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- AbstractDeploymentVerifier.java 2 Jun 2006 16:47:56 -0000 1.2
+++ AbstractDeploymentVerifier.java 10 Jul 2006 15:42:56 -0000 1.3
@@ -96,7 +96,6 @@
-
protected abstract void initialize();
protected abstract void cleanup();
@@ -106,12 +105,12 @@
model.addSPListener(this);
DebugPlugin.getDefault().addDebugEventListener(this);
- logEvent = new ProcessLogEvent("Verifying deployment of "
- + delegate.getResourceName(), ProcessLogEvent.SERVER_VERIFY);
-
- String id = jbServer.getServer().getId();
- ServerProcessModelEntity ent = ServerProcessModel.getDefault().getModel(id);
- ent.getEventLog().addChild(logEvent, ProcessLogEvent.ADD_BEGINNING);
+// logEvent = new ProcessLogEvent("Verifying deployment of "
+// + delegate.getResourceName(), ProcessLogEvent.SERVER_VERIFY);
+//
+// String id = jbServer.getServer().getId();
+// ServerProcessModelEntity ent = ServerProcessModel.getDefault().getModel(id);
+// ent.getEventLog().addChild(logEvent, ProcessLogEvent.ADD_BEGINNING);
}
@@ -165,7 +164,7 @@
/**
* Tell the server process model to start listening right away to
- * these procecsses as they start. Their standard out and error
+ * these procecsses as they start. Their standard OUT and error
* will then be available for us to analyze or document.
*/
public void ServerProcessEventFired(ServerProcessEvent event) {
1.5 +1 -1 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers/WarDeploymentVerifier.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WarDeploymentVerifier.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers/WarDeploymentVerifier.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- WarDeploymentVerifier.java 19 Jun 2006 14:16:50 -0000 1.4
+++ WarDeploymentVerifier.java 10 Jul 2006 15:42:56 -0000 1.5
@@ -58,7 +58,7 @@
protected void initialize() {
int jndiPort = jbServer.getDescriptorModel().getJNDIPort();
- String host = jbServer.getRuntimeConfiguration().getHost();
+ String host = jbServer.getServer().getHost();
argsStart = "-s " + host + ":" + jndiPort + " -a jmx/rmi/RMIAdaptor ";
}
1.5 +1 -1 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers/EarDeploymentVerifier.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EarDeploymentVerifier.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers/EarDeploymentVerifier.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- EarDeploymentVerifier.java 19 Jun 2006 14:16:50 -0000 1.4
+++ EarDeploymentVerifier.java 10 Jul 2006 15:42:56 -0000 1.5
@@ -58,7 +58,7 @@
protected void initialize() {
int jndiPort = jbServer.getDescriptorModel().getJNDIPort();
- String host = jbServer.getRuntimeConfiguration().getHost();
+ String host = jbServer.getServer().getHost();
argsStart = "-s " + host + ":" + jndiPort + " -a jmx/rmi/RMIAdaptor ";
}
1.1 date: 2006/07/10 15:42:56; author: rawb; state: Exp;jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers/ArchiveVerifier.java
Index: ArchiveVerifier.java
===================================================================
package org.jboss.ide.eclipse.as.core.client.verifiers;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.module.factory.JBossModuleDelegate;
import org.jboss.ide.eclipse.as.core.server.JBossServer;
public class ArchiveVerifier implements IJbossDeploymentVerifier {
public ArchiveVerifier(JBossModuleDelegate delegate) {
}
public boolean supportsVerify(IServer server, String launchMode) {
return true;
}
public IStatus verifyDeployed(JBossServer server, String launchmode,
ILaunch launch) {
// Delegate to some other verifier.
return new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID, 0, "Well Done", null);
}
}
|