Author: rob.stryker(a)jboss.com Date: 2011-05-19 09:33:20 -0400 (Thu, 19 May 2011) New Revision: 31376 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/server/internal/v7/JBoss7ServerBehavior.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml Log: JBIDE-8959 - fixes for as7, 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 2011-05-19 13:21:28 UTC (rev 31375) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2011-05-19 13:33:20 UTC (rev 31376) @@ -43,7 +43,7 @@ import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities; -/**O +/** * Class suitable for parsing any properly formed servertools-api module */ public abstract class AbstractServerToolsPublisher implements IJBossServerPublisher { @@ -203,7 +203,7 @@ append(IJBossServerConstants.TEMP_DEPLOY).makeAbsolute(); try { - File temp = deployRoot.toFile().createTempFile(module.getName(), ".tmp", deployRoot.toFile()); //$NON-NLS-1$ + File temp = File.createTempFile(module.getName(), ".tmp", deployRoot.toFile()); //$NON-NLS-1$ IPath tempFile = new Path(temp.getAbsolutePath()); list.addAll(Arrays.asList(PublishUtil.packModuleIntoJar(moduleTree[moduleTree.length-1], tempFile))); String parentFolder = deployPath.removeLastSegments(1).toString(); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-05-19 13:21:28 UTC (rev 31375) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerBehavior.java 2011-05-19 13:33:20 UTC (rev 31376) @@ -94,7 +94,8 @@ @Override public void serverStarting() { - super.serverStarting(); + //super.serverStarting(); + setServerStarting(); pollServer(IServerStatePoller.SERVER_UP); } @@ -109,8 +110,10 @@ } private void disposeServerProcessListener() { - DebugPlugin.getDefault().removeDebugEventListener(serverProcessListener); - serverProcess = null; + if( serverProcessListener != null ) { + DebugPlugin.getDefault().removeDebugEventListener(serverProcessListener); + serverProcess = null; + } } @Override @@ -163,7 +166,8 @@ try { if (force) { - serverProcess.terminate(); + if( serverProcess != null ) + serverProcess.terminate(); } else { serverStopping(); // TODO: for now only local, implement for remote afterwards Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-05-19 13:21:28 UTC (rev 31375) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2011-05-19 13:33:20 UTC (rev 31376) @@ -699,6 +699,13 @@ supportsShutdown="true" supportsStartup="true"> </serverPoller> + <serverPoller + class="org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManagerServicePoller" + id="org.jboss.ide.eclipse.as.core.server.JBoss7ManagerServicePoller" + name="JBoss 7 Manager Service Poller" + supportsShutdown="true" + supportsStartup="true"> + </serverPoller> </extension> @@ -1102,24 +1109,10 @@ <extension point="org.jboss.ide.eclipse.as.core.publishers"> <publisher - class="org.jboss.ide.eclipse.as.core.publishers.UnifiedPublisher" + class="org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7JSTPublisher" priority="15" zipDelegate="false"> </publisher> - <!-- - <publisher - class="org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7JSTPublisher" - priority="6"> - </publisher> - <publisher - class="org.jboss.ide.eclipse.as.core.publishers.JstPublisher" - priority="5"> - </publisher> - <publisher - class="org.jboss.ide.eclipse.as.core.publishers.NullPublisher" - priority="0"> - </publisher> - --> </extension> <extension point="org.eclipse.jdt.core.classpathContainerInitializer">