[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server ...
Robert Stryker
rawblem at gmail.com
Fri Aug 25 22:33:20 EDT 2006
User: rawb
Date: 06/08/25 22:33:20
Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server
ServerAttributeHelper.java ServerStateChecker.java
Log:
Added infrastructure for facet runtime support
Revision Changes Path
1.8 +2 -1 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerAttributeHelper.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ServerAttributeHelper.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerAttributeHelper.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ServerAttributeHelper.java 10 Aug 2006 19:06:38 -0000 1.7
+++ ServerAttributeHelper.java 26 Aug 2006 02:33:20 -0000 1.8
@@ -45,7 +45,8 @@
public String getServerHome() {
- return server.getAttribute(JBOSS_SERVER_HOME, (String)null);
+ return server.getRuntime().getLocation().toOSString();
+ //return server.getAttribute(JBOSS_SERVER_HOME, (String)null);
}
public String getJbossConfiguration() {
return server.getAttribute(JBOSS_CONFIG, JBOSS_CONFIG_DEFAULT);
1.13 +3 -2 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerStateChecker.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ServerStateChecker.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerStateChecker.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- ServerStateChecker.java 9 Aug 2006 19:27:13 -0000 1.12
+++ ServerStateChecker.java 26 Aug 2006 02:33:20 -0000 1.13
@@ -100,8 +100,8 @@
if( ServerProcessModel.allProcessesTerminated(ent.getProcesses(ServerProcessModel.START_PROCESSES))) {
// this thread may have started early, before the other thread was launched.
- // Give it 15 seconds
- if( current > 15000 ) {
+ // Give it 5 seconds
+ if( current > 5000 ) {
ASDebug.p("canceled - processes terminated", this);
canceled = true;
}
@@ -164,6 +164,7 @@
eventLog.setComplete();
ent.getEventLog().branchChanged();
ent.removeSPListener(this);
+ behavior.setServerState(expectedState, !expectedState);
}
private void dieTimeoutFailure() {
More information about the jboss-cvs-commits
mailing list