JBoss Tools SVN: r32890 - in trunk/as/plugins: org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-13 09:24:03 -0400 (Wed, 13 Jul 2011)
New Revision: 32890
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java
Log:
[JBIDE-9337] corrected private constructors to public
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-07-13 13:22:59 UTC (rev 32889)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-07-13 13:24:03 UTC (rev 32890)
@@ -27,7 +27,7 @@
private IJBoss7ManagerService service;
- private LocalJBoss7BehaviorDelegate() throws Exception {
+ public LocalJBoss7BehaviorDelegate() throws Exception {
this.service = JBoss7ManagerUtil.getService(getServer());
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-07-13 13:22:59 UTC (rev 32889)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-07-13 13:24:03 UTC (rev 32890)
@@ -33,7 +33,7 @@
private IJBoss7ManagerService service;
- private RSEJBoss7BehaviourDelegate() throws Exception {
+ public RSEJBoss7BehaviourDelegate() throws Exception {
this.service = JBoss7ManagerUtil.getService(getServer());
}
14 years, 9 months
JBoss Tools SVN: r32889 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-13 09:22:59 -0400 (Wed, 13 Jul 2011)
New Revision: 32889
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java
Log:
[JBIDE-9054] cleaned imports
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2011-07-13 12:03:17 UTC (rev 32888)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2011-07-13 13:22:59 UTC (rev 32889)
@@ -28,6 +28,7 @@
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType;
+import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
import org.jboss.ide.eclipse.as.core.util.internal.IMemento;
import org.jboss.ide.eclipse.as.core.util.internal.XMLMemento;
@@ -41,7 +42,7 @@
* is currently stored in a server's deployment preferences.
*
* To get a more accurate version (with a default) please use
- * DeployableServerBehavior.createPublishMethod().getPublishMethodType()
+ * {@link DeployableServerBehavior#createPublishMethod()#getPublishMethodType()}
*
* @param server
* @return
14 years, 9 months
JBoss Tools SVN: r32888 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-13 08:03:17 -0400 (Wed, 13 Jul 2011)
New Revision: 32888
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java
Log:
[JBIDE-9054] reformatted to get better readability
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-13 12:02:21 UTC (rev 32887)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-13 12:03:17 UTC (rev 32888)
@@ -42,20 +42,23 @@
public class DelegatingServerBehavior extends DeployableServerBehavior {
private static HashMap<String, Class> delegateClassMap;
+
static {
delegateClassMap = new HashMap<String, Class>();
delegateClassMap.put(LocalPublishMethod.LOCAL_PUBLISH_METHOD, LocalJBossBehaviorDelegate.class);
}
+
public static void addDelegateMapping(String s, Class c) {
delegateClassMap.put(s, c);
}
+ private IJBossBehaviourDelegate delegate;
+ private String lastModeId;
+
public DelegatingServerBehavior() {
super();
}
- private IJBossBehaviourDelegate delegate;
- private String lastModeId;
public IJBossBehaviourDelegate getDelegate() {
IJBossServerPublishMethodType type = DeploymentPreferenceLoader.getCurrentDeploymentMethodType(getServer());
String id = type == null ? LocalPublishMethod.LOCAL_PUBLISH_METHOD : type.getId();
14 years, 9 months
JBoss Tools SVN: r32887 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-13 08:02:21 -0400 (Wed, 13 Jul 2011)
New Revision: 32887
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java
Log:
[JBIDE-9054] cleaned imports
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-13 12:01:47 UTC (rev 32886)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-13 12:02:21 UTC (rev 32887)
@@ -17,7 +17,6 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
14 years, 9 months
JBoss Tools SVN: r32886 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7 and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-13 08:01:47 -0400 (Wed, 13 Jul 2011)
New Revision: 32886
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java
Log:
[JBIDE-9337] proper service creation & disposal added to RSEJBoss7BehaviourDelegate and LocalJBoss7BehaviourDelegate
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-13 11:35:28 UTC (rev 32885)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-13 12:01:47 UTC (rev 32886)
@@ -122,4 +122,8 @@
actualBehavior.setServerStarting();
}
+ @Override
+ public void dispose() {
+ // do nothing
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-13 11:35:28 UTC (rev 32885)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2011-07-13 12:01:47 UTC (rev 32886)
@@ -178,4 +178,9 @@
JSTPublisherXMLToucher.getInstance().touch(depPath, module[0], callback);
}
}
+
+ @Override
+ public void dispose() {
+ getDelegate().dispose();
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java 2011-07-13 11:35:28 UTC (rev 32885)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IJBossBehaviourDelegate.java 2011-07-13 12:01:47 UTC (rev 32886)
@@ -33,5 +33,7 @@
public IStatus canChangeState(String launchMode);
- public String getDefaultStopArguments() throws CoreException;
+ public String getDefaultStopArguments() throws CoreException;
+
+ public void dispose();
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java 2011-07-13 11:35:28 UTC (rev 32885)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerUtil.java 2011-07-13 12:01:47 UTC (rev 32886)
@@ -33,4 +33,10 @@
}
return null;
}
+
+ public static void dispose(IJBoss7ManagerService service) {
+ if (service != null) {
+ service.dispose();
+ }
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-07-13 11:35:28 UTC (rev 32885)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-07-13 12:01:47 UTC (rev 32886)
@@ -25,6 +25,12 @@
public class LocalJBoss7BehaviorDelegate extends LocalJBossBehaviorDelegate {
+ private IJBoss7ManagerService service;
+
+ private LocalJBoss7BehaviorDelegate() throws Exception {
+ this.service = JBoss7ManagerUtil.getService(getServer());
+ }
+
public IStatus canChangeState(String launchMode) {
return Status.OK_STATUS;
}
@@ -44,8 +50,9 @@
@Override
protected IStatus gracefullStop() {
IServer server = getServer();
+ IJBoss7ManagerService service = null;
try {
- IJBoss7ManagerService service = JBoss7ManagerUtil.getService(server);
+ service = JBoss7ManagerUtil.getService(server);
JBoss7Server jbossServer = ServerConverter.checkedGetJBossServer(server, JBoss7Server.class);
service.stop(jbossServer.getHost(), jbossServer.getManagementPort());
return Status.OK_STATUS;
@@ -53,6 +60,8 @@
return new Status(
IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
MessageFormat.format(Messages.JBoss7ServerBehavior_could_not_stop, server.getName()), e);
+ } finally {
+ JBoss7ManagerUtil.dispose(service);
}
}
@@ -69,4 +78,9 @@
super.pollServer(expectedState);
}
}
+
+ @Override
+ public void dispose() {
+ JBoss7ManagerUtil.dispose(service);
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-07-13 11:35:28 UTC (rev 32885)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7BehaviourDelegate.java 2011-07-13 12:01:47 UTC (rev 32886)
@@ -31,6 +31,12 @@
public class RSEJBoss7BehaviourDelegate extends AbstractRSEBehaviourDelegate {
+ private IJBoss7ManagerService service;
+
+ private RSEJBoss7BehaviourDelegate() throws Exception {
+ this.service = JBoss7ManagerUtil.getService(getServer());
+ }
+
@Override
protected String getShutdownCommand(IServer server) throws CoreException {
String defaultCommand = ServerUtil.checkedGetBehaviorDelegate(server).getDefaultStopArguments();
@@ -52,7 +58,6 @@
protected IStatus gracefullStop() {
IServer server = getServer();
try {
- IJBoss7ManagerService service = JBoss7ManagerUtil.getService(server);
JBoss7Server jbossServer = ServerConverter.checkedGetJBossServer(server, JBoss7Server.class);
service.stop(jbossServer.getHost(), jbossServer.getManagementPort());
return Status.OK_STATUS;
@@ -62,5 +67,8 @@
MessageFormat.format(Messages.JBoss7ServerBehavior_could_not_stop, server.getName()), e);
}
}
-
+
+ public void dispose() {
+ JBoss7ManagerUtil.dispose(service);
+ }
}
14 years, 9 months
JBoss Tools SVN: r32885 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server: internal and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-13 07:35:28 -0400 (Wed, 13 Jul 2011)
New Revision: 32885
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
Log:
[JBIDE-9337] proper service creation & disposal added to JBoss7ManagerServicePoller
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java 2011-07-13 10:15:41 UTC (rev 32884)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerStatePoller.java 2011-07-13 11:35:28 UTC (rev 32885)
@@ -52,11 +52,17 @@
public ServerStatePollerType getPollerType();
public void setPollerType(ServerStatePollerType type);
- public void beginPolling(IServer server, boolean expectedState, PollThread pt); // expected to launch own thread
+ /*
+ * expected to launch own thread
+ */
+ public void beginPolling(IServer server, boolean expectedState, PollThread pt) throws Exception;
public IServer getServer();
public boolean isComplete() throws PollingException, RequiresInfoException;
public boolean getState() throws PollingException, RequiresInfoException;
- public void cleanup(); // clean up any resources / processes. Will ALWAYS be called
+ /*
+ * clean up any resources / processes. Will ALWAYS be called
+ */
+ public void cleanup();
public List<String> getRequiredProperties();
public void failureHandled(Properties properties);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2011-07-13 10:15:41 UTC (rev 32884)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2011-07-13 11:35:28 UTC (rev 32885)
@@ -98,39 +98,43 @@
long startTime = new Date().getTime();
boolean done = false;
- poller.beginPolling(getServer(), expectedState, this);
-
- // begin the loop; ask the poller every so often
- while (!stateStartedOrStopped && !abort && !done
- && (new Date().getTime() < startTime + maxWait) || maxWait < 0) {
- try {
- Thread.sleep(100);
- } catch (InterruptedException ie) {
- }
-
- try {
- done = poller.isComplete();
- } catch (PollingException e) {
- // abort and put the message in event log
- poller.cancel(IServerStatePoller.CANCEL);
- poller.cleanup();
- alertEventLogPollerException(e);
- alertBehavior(!expectedState, false);
- return;
- } catch (RequiresInfoException rie) {
- // This way each request for new info is checked only once.
- if (!rie.getChecked()) {
- rie.setChecked();
- String action = expectedState == IServerStatePoller.SERVER_UP ? SERVER_STARTING
- : SERVER_STOPPING;
- IPollerFailureHandler handler = ExtensionManager
- .getDefault().getFirstPollFailureHandler(poller,
- action, poller.getRequiredProperties());
- handler.handle(poller, action, poller
- .getRequiredProperties());
+ try {
+ poller.beginPolling(getServer(), expectedState, this);
+
+ // begin the loop; ask the poller every so often
+ while (!stateStartedOrStopped && !abort && !done
+ && (new Date().getTime() < startTime + maxWait) || maxWait < 0) {
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException ie) {
}
+
+ try {
+ done = poller.isComplete();
+ } catch (PollingException e) {
+ // abort and put the message in event log
+ poller.cancel(IServerStatePoller.CANCEL);
+ poller.cleanup();
+ alertEventLogPollerException(e);
+ alertBehavior(!expectedState, false);
+ return;
+ } catch (RequiresInfoException rie) {
+ // This way each request for new info is checked only once.
+ if (!rie.getChecked()) {
+ rie.setChecked();
+ String action = expectedState == IServerStatePoller.SERVER_UP ? SERVER_STARTING
+ : SERVER_STOPPING;
+ IPollerFailureHandler handler = ExtensionManager
+ .getDefault().getFirstPollFailureHandler(poller,
+ action, poller.getRequiredProperties());
+ handler.handle(poller, action, poller
+ .getRequiredProperties());
+ }
+ }
+ stateStartedOrStopped = checkServerState();
}
- stateStartedOrStopped = checkServerState();
+ } catch(Exception e) {
+ abort = true;
}
// we stopped. Did we abort?
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-07-13 10:15:41 UTC (rev 32884)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ManagerServicePoller.java 2011-07-13 11:35:28 UTC (rev 32885)
@@ -31,8 +31,10 @@
private IServer server;
private ServerStatePollerType type;
private boolean expectedState;
+ private IJBoss7ManagerService service;
- public void beginPolling(IServer server, boolean expectedState, PollThread pollTread) {
+ public void beginPolling(IServer server, boolean expectedState, PollThread pollTread) throws Exception {
+ this.service = JBoss7ManagerUtil.getService(server);
this.server = server;
this.expectedState = expectedState;
}
@@ -61,7 +63,6 @@
public boolean isComplete() throws PollingException, RequiresInfoException {
IJBoss7ManagerService service = null;
try {
- service = JBoss7ManagerUtil.getService(server);
if (expectedState == SERVER_DOWN) {
return awaitShutdown(service);
} else {
@@ -121,6 +122,7 @@
}
public void cleanup() {
+ service.dispose();
}
public List<String> getRequiredProperties() {
14 years, 9 months
JBoss Tools SVN: r32884 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-13 06:15:41 -0400 (Wed, 13 Jul 2011)
New Revision: 32884
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
Log:
[JBIDE-9054] replaced usage of deprecated constants class
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2011-07-13 10:09:13 UTC (rev 32883)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2011-07-13 10:15:41 UTC (rev 32884)
@@ -78,13 +78,13 @@
import org.eclipse.wst.server.core.TaskModel;
import org.eclipse.wst.server.ui.wizard.IWizardHandle;
import org.eclipse.wst.server.ui.wizard.WizardFragment;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.bean.JBossServerType;
import org.jboss.ide.eclipse.as.core.server.bean.ServerBeanLoader;
import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.util.FileUtil;
import org.jboss.ide.eclipse.as.core.util.IConstants;
+import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
import org.jboss.ide.eclipse.as.core.util.RuntimeUtils;
import org.jboss.ide.eclipse.as.ui.IPreferenceKeys;
import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
@@ -582,7 +582,7 @@
configurations.setFolder(folder);
File f = new File(folder);
configurations.getControl().setEnabled(f.exists() && f.isDirectory());
- configurations.setConfiguration(IJBossServerConstants.DEFAULT_CONFIGURATION);
+ configurations.setConfiguration(IJBossRuntimeResourceConstants.DEFAULT_CONFIGURATION);
int sel = jreCombo.getSelectionIndex();
int offset = -1;
14 years, 9 months
JBoss Tools SVN: r32883 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-13 06:09:13 -0400 (Wed, 13 Jul 2011)
New Revision: 32883
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
Log:
[JBIDE-9215] deprecated LocalJBossServerRuntime#isEAP(IRuntime) (static) by LocalJBossServerRuntime#isEAP() and RuntimeUtils#isEAP(IRuntime)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2011-07-13 10:08:59 UTC (rev 32882)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2011-07-13 10:09:13 UTC (rev 32883)
@@ -85,6 +85,7 @@
import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.util.FileUtil;
import org.jboss.ide.eclipse.as.core.util.IConstants;
+import org.jboss.ide.eclipse.as.core.util.RuntimeUtils;
import org.jboss.ide.eclipse.as.ui.IPreferenceKeys;
import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
@@ -169,9 +170,10 @@
createConfigurationComposite(main);
}
+
protected boolean isEAP() {
IRuntime rt = (IRuntime) getTaskModel().getObject(TaskModel.TASK_RUNTIME);
- return LocalJBossServerRuntime.isEAP(rt);
+ return RuntimeUtils.isEAP(rt);
}
protected ImageDescriptor getImageDescriptor() {
14 years, 9 months
JBoss Tools SVN: r32882 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core: server/internal and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-07-13 06:08:59 -0400 (Wed, 13 Jul 2011)
New Revision: 32882
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/RuntimeUtils.java
Log:
[JBIDE-9215] deprecated LocalJBossServerRuntime#isEAP(IRuntime) (static) by LocalJBossServerRuntime#isEAP() and RuntimeUtils#isEAP(IRuntime)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java 2011-07-13 08:49:20 UTC (rev 32881)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerRuntime.java 2011-07-13 10:08:59 UTC (rev 32882)
@@ -72,4 +72,5 @@
public String getDefaultRunVMArgs();
public HashMap<String, String> getDefaultRunEnvVars();
public boolean isUsingDefaultJRE();
+ public boolean isEAP();
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2011-07-13 08:49:20 UTC (rev 32881)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossServerRuntime.java 2011-07-13 10:08:59 UTC (rev 32882)
@@ -52,6 +52,7 @@
import org.jboss.ide.eclipse.as.core.server.bean.ServerBeanLoader;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
+import org.jboss.ide.eclipse.as.core.util.RuntimeUtils;
public class LocalJBossServerRuntime extends AbstractLocalJBossServerRuntime implements IJBossServerRuntime {
@@ -65,7 +66,7 @@
protected String getNextRuntimeName() {
String rtVersion = getRuntime().getRuntimeType().getVersion();
String prefix = Messages.jboss;
- if( isEAP(getRuntime())) {
+ if( isEAP()) {
prefix = Messages.jboss + " EAP "; //$NON-NLS-1$
if( rtVersion.equals(IJBossToolingConstants.V5_0)) {
rtVersion = "5.x"; //$NON-NLS-1$
@@ -77,10 +78,21 @@
return getNextRuntimeName(base);
}
+ /**
+ * @deprecated replaced by {@link #isEAP()} and {@link RuntimeUtils#isEAP(IRuntime)}
+ */
+ @Deprecated
public static boolean isEAP(IRuntime rt) {
- return rt.getRuntimeType().getId().startsWith(IJBossToolingConstants.EAP_RUNTIME_PREFIX);
+ return rt.getRuntimeType().getId().startsWith("org.jboss.ide.eclipse.as.runtime.eap."); //$NON-NLS-1$
}
+ public boolean isEAP() {
+ return getRuntime() != null
+ && getRuntime().getRuntimeType() != null
+ && getRuntime().getRuntimeType().getId() != null
+ && getRuntime().getRuntimeType().getId().startsWith(IJBossToolingConstants.EAP_RUNTIME_PREFIX);
+ }
+
@Override
public IStatus validate() {
IStatus s = super.validate();
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/RuntimeUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/RuntimeUtils.java 2011-07-13 08:49:20 UTC (rev 32881)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/RuntimeUtils.java 2011-07-13 10:08:59 UTC (rev 32882)
@@ -13,13 +13,14 @@
import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
import org.eclipse.wst.server.core.IServerAttributes;
import org.eclipse.wst.server.core.ServerUtil;
+import org.eclipse.wst.server.core.TaskModel;
import org.eclipse.wst.server.core.internal.RuntimeWorkingCopy;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
public class RuntimeUtils {
-
+
public static IJBossServerRuntime getJBossServerRuntime(IServerAttributes server) {
IRuntime rt = null;
if (server != null) {
@@ -39,6 +40,27 @@
return jbrt;
}
+ public static IJBossServerRuntime getJBossServerRuntime(IRuntime runtime) {
+ return (IJBossServerRuntime) runtime.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor());
+ }
+
+ public static boolean isEAP(IRuntime runtime) {
+ IJBossServerRuntime jbossRuntime = getJBossServerRuntime(runtime);
+ if (jbossRuntime == null) {
+ return false;
+ }
+ return jbossRuntime.isEAP();
+
+ }
+
+ public static IJBossServerRuntime checkedGetJBossServerRuntime(IRuntime runtime) throws CoreException {
+ IJBossServerRuntime jbossRuntime = getJBossServerRuntime(runtime);
+ if (jbossRuntime == null)
+ throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
+ NLS.bind(Messages.ServerRuntimeNotFound, runtime.getName())));
+ return jbossRuntime;
+ }
+
public static IRuntime createRuntime(String runtimeId, String homeDir,
String config, IVMInstall install) throws CoreException {
IRuntimeType[] runtimeTypes = ServerUtil.getRuntimeTypes(null, null,runtimeId);
14 years, 9 months
JBoss Tools SVN: r32881 - in trunk/as: plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-07-13 04:49:20 -0400 (Wed, 13 Jul 2011)
New Revision: 32881
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/xpl/PublishCopyUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java
Log:
JBIDE-9112 - force a full publish attempt after such a property change.
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-07-13 08:14:54 UTC (rev 32880)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2011-07-13 08:49:20 UTC (rev 32881)
@@ -61,7 +61,8 @@
IDeployableServer ds = ServerConverter.getDeployableServer(server);
if( ds == null )
return false;
- if( ServerModelUtilities.isBinaryModule(module[module.length-1]))
+ // If this is a root module (not nested) and is binary, let this publisher handle it
+ if( module.length == 1 && ServerModelUtilities.isBinaryModule(module[module.length-1]))
return true;
return !ds.zipsWTPDeployments();
}
@@ -208,30 +209,7 @@
} else if( isBinaryObject )
list.addAll(Arrays.asList(copyBinaryModule(moduleTree, getSubMon(monitor, 700))));
else {
- // A child that must be zipped, forceZip is true
- IPath deployRoot = JBossServerCorePlugin.getServerStateLocation(server.getServer()).
- append(IJBossToolingConstants.TEMP_DEPLOY).makeAbsolute();
-
- try {
- // Make local jar copy
- 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)));
-
- // TODO !!!!! Transfer it
- IPath deployPathInner = getParentDeployPath(moduleTree, server).removeLastSegments(1);
- IPublishCopyCallbackHandler handler = getCallbackHandler(getRootPath(deployPathInner).append(deployPathInner));
- IPath filePath = deployPath.removeFirstSegments(deployPathInner.segments().length);
- IPath parentFolderPath = filePath.removeLastSegments(1);
- handler.makeDirectoryIfRequired(parentFolderPath, getSubMon(monitor, 200));
- ModuleFile mf = new ModuleFile(tempFile.toFile(), tempFile.lastSegment(), tempFile);
- handler.copyFile(mf, filePath, getSubMon(monitor, 500));
-
- // Cleanup
- tempFile.toFile().delete();
- } catch( IOException ioe) {
- list.add(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, ioe.getMessage(), ioe));
- }
+ list.addAll(Arrays.asList(transferForceZippedChild(deployPath, module, moduleTree, monitor)));
}
monitor.done();
@@ -243,7 +221,36 @@
NLS.bind(Messages.ModulePublished, module.getName()), null);
return status;
}
+
+ protected IStatus[] transferForceZippedChild(IPath deployPath, IModule module, IModule[] moduleTree, IProgressMonitor monitor) throws CoreException {
+ // A child that must be zipped, forceZip is true
+ ArrayList<IStatus> list = new ArrayList<IStatus>();
+ IPath deployRoot = JBossServerCorePlugin.getServerStateLocation(server.getServer()).
+ append(IJBossToolingConstants.TEMP_DEPLOY).makeAbsolute();
+ try {
+ // Make local jar copy
+ 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)));
+
+ // TODO !!!!! Transfer it
+ IPath deployPathInner = getParentDeployPath(moduleTree, server).removeLastSegments(1);
+ IPublishCopyCallbackHandler handler = getCallbackHandler(getRootPath(deployPathInner).append(deployPathInner));
+ IPath filePath = deployPath.removeFirstSegments(deployPathInner.segments().length);
+ IPath parentFolderPath = filePath.removeLastSegments(1);
+ handler.makeDirectoryIfRequired(parentFolderPath, getSubMon(monitor, 200));
+ ModuleFile mf = new ModuleFile(tempFile.toFile(), tempFile.lastSegment(), tempFile);
+ handler.copyFile(mf, filePath, getSubMon(monitor, 500));
+
+ // Cleanup
+ tempFile.toFile().delete();
+ } catch( IOException ioe) {
+ list.add( new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, ioe.getMessage(), ioe));
+ }
+ return list.toArray(new IStatus[list.size()]);
+ }
+
// TODO consider moving to utility class?
public static Path getRootPath(IPath deployPath) {
String root = (deployPath.getDevice() == null ? "" : deployPath.getDevice()) + "/"; //$NON-NLS-1$//$NON-NLS-2$
@@ -252,10 +259,17 @@
protected IStatus incrementalPublish(IModule[] moduleTree, IModule module, IProgressMonitor monitor) throws CoreException {
- monitor.beginTask("Incremental Publish: " + moduleTree[moduleTree.length-1].getName(), 100); //$NON-NLS-1$
IStatus[] results = new IStatus[] {};
IPath deployPath = getDeployPath(moduleTree, server);
+ IPublishCopyCallbackHandler h1 = getCallbackHandler(deployPath);
+ // quick switch to full publish for JBIDE-9112, recent switch from zip to unzipped requires full publish
+ if( h1.isFile(new Path("/"), new NullProgressMonitor())) { //$NON-NLS-1$
+ return fullPublish(moduleTree, module, monitor);
+ }
+
+
boolean isBinaryObject = ServerModelUtilities.isBinaryModule(module);
+ monitor.beginTask("Incremental Publish: " + moduleTree[moduleTree.length-1].getName(), 100); //$NON-NLS-1$
boolean forceZip = forceZipModule(moduleTree);
IPublishCopyCallbackHandler handler = null;
if( !forceZip && !isBinaryObject) {
@@ -266,21 +280,7 @@
results = copyBinaryModule(moduleTree, getSubMon(monitor, 100));
else {
// forceZip a child module
- IPath localDeployRoot = JBossServerCorePlugin.getServerStateLocation(server.getServer()).
- append(IJBossToolingConstants.TEMP_DEPLOY).makeAbsolute();
- try {
- File temp = File.createTempFile(module.getName(), ".tmp", localDeployRoot.toFile()); //$NON-NLS-1$
- IPath tempFile = new Path(temp.getAbsolutePath());
- PublishUtil.packModuleIntoJar(moduleTree[moduleTree.length-1], tempFile);
- handler = getCallbackHandler(getRootPath(deployPath));
- String parentFolder = deployPath.removeLastSegments(1).toString();
- handler.makeDirectoryIfRequired(new Path(parentFolder), getSubMon(monitor, 50));
- ModuleFile mf = new ModuleFile(tempFile.toFile(), tempFile.lastSegment(), tempFile);
- handler.copyFile(mf, deployPath, getSubMon(monitor, 50));
- } catch( IOException ioe) {
- IStatus s = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, ioe.getMessage(), ioe);
- results = new IStatus[] { s };
- }
+ results = transferForceZippedChild(deployPath, module, moduleTree, monitor);
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java 2011-07-13 08:14:54 UTC (rev 32880)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java 2011-07-13 08:49:20 UTC (rev 32881)
@@ -74,7 +74,6 @@
*/
public IStatus[] copyFile(IModuleFile mf, IPath path, IProgressMonitor monitor) throws CoreException;
-
/**
* Delete a directory for this path relative to where the module belongs.
* For example if this path is "/someFolder" you may want to
@@ -86,7 +85,19 @@
*/
public IStatus[] deleteResource(IPath path, IProgressMonitor monitor) throws CoreException ;
+
/**
+ * Return true if the given path exists and is a file.
+ * Return false if hte given path does not exist, or, is a folder.
+ *
+ * @param path
+ * @param monitor
+ * @return
+ * @throws CoreException
+ */
+ public boolean isFile(IPath path, IProgressMonitor monitor) throws CoreException;
+
+ /**
* Make a directory for this path relative to where the module belongs.
* For example if this path is "/someFolder" you may want to
* make the folder /home/someone/deployfolder/project.war/someFolder
@@ -414,6 +425,12 @@
tmp.setLastModified(new Date().getTime());
return null;
}
+
+ public boolean isFile(IPath path, IProgressMonitor monitor)
+ throws CoreException {
+ File tmp = deployRootFolder.append(path).toFile();
+ return tmp.exists() && tmp.isFile();
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java 2011-07-13 08:14:54 UTC (rev 32880)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java 2011-07-13 08:49:20 UTC (rev 32881)
@@ -113,5 +113,18 @@
}
return new IStatus[]{};
}
+
+ public boolean isFile(IPath path, IProgressMonitor monitor)
+ throws CoreException {
+ IPath file = root.append(path);
+ try {
+ IRemoteFile rf = method.getFileServiceSubSystem().getRemoteFileObject(file.toString(), new NullProgressMonitor());
+ return rf.exists() && rf.isFile();
+ } catch(SystemMessageException sme) {
+ IStatus s = new Status(IStatus.ERROR, RSECorePlugin.PLUGIN_ID, IEventCodes.JST_PUB_FAIL,
+ "failed to touch remote resource " + file.toString(), sme);
+ throw new CoreException(s);
+ }
+ }
}
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java 2011-07-13 08:14:54 UTC (rev 32880)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java 2011-07-13 08:49:20 UTC (rev 32881)
@@ -108,5 +108,11 @@
changed.add(path2.makeRelative());
return new IStatus[]{};
}
+
+ public boolean isFile(IPath path, IProgressMonitor monitor)
+ throws CoreException {
+ IPath path2 = root.append(path);
+ return path2.toFile().exists() && path2.toFile().isFile();
+ }
}
}
14 years, 9 months