JBoss Tools SVN: r43748 - in trunk/documentation/whatsnew/openshift: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-09-17 10:40:42 -0400 (Mon, 17 Sep 2012)
New Revision: 43748
Added:
trunk/documentation/whatsnew/openshift/images/clone-destination-error.png
trunk/documentation/whatsnew/openshift/images/refresh-applications.png
trunk/documentation/whatsnew/openshift/openshift-news-2.4.0.Alpha1.html
Log:
added N&N for OpenShift/Alpha1
Added: trunk/documentation/whatsnew/openshift/images/clone-destination-error.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/openshift/images/clone-destination-error.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/openshift/images/refresh-applications.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/openshift/images/refresh-applications.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/openshift/openshift-news-2.4.0.Alpha1.html
===================================================================
--- trunk/documentation/whatsnew/openshift/openshift-news-2.4.0.Alpha1.html (rev 0)
+++ trunk/documentation/whatsnew/openshift/openshift-news-2.4.0.Alpha1.html 2012-09-17 14:40:42 UTC (rev 43748)
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css" />
+<title>OpenShift Tools 2.4.0.Alpha1 What's New</title>
+<script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-17645367-5']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+</script></head>
+<body>
+<h1>OpenShift 2.4.0.Alpha1 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a
+ href="../as/as-news-4.0.0.Alpha1.html">Server Tools
+ ></a></p>
+ <table border="0" cellpadding="10" cellspacing="0"
+ width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>General</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <a name="itemname3" id="itemname3"></a>
+ <b>Support for Eclipse Juno</b>
+ </td>
+ <td valign="top">
+ JBoss Tools for OpenShift is now able to run in Eclipse 4.2/Juno. We migrated our plugins to this new platform.
+ <p>
+ <small>
+ <a href="https://issues.jboss.org/browse/JBIDE-12240 ">Related Jira</a>
+ </small>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>OpenShift import wizard</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <b>Refreshing available applications</b>
+ </td>
+ <td valign="top" align="left">
+ If you had started JBoss Tools for OpenShift into a blank account, that had no domain nor applications, the tooling
+ could not discover the domain and applications you had created outside Eclipse (in the OpenShift WebUI or with the rhc command line tooling).<br/>
+ We added a refresh button in the wizard, that allows you to discover and import applications that you created outside Eclipse.
+ <p>
+ <img src="images/refresh-applications.png" alt="refresh applications" />
+ </p>
+ <p>
+ <small>
+ <a href="https://issues.jboss.org/browse/JBIDE-12380">Related Jira</a>, <a href="https://issues.jboss.org/browse/JBIDE-12242">Related Jira</a>
+ </small>
+ </p>
+
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <b>Revalidating wizard settings going back and forth</b>
+ </td>
+ <td valign="top" align="left">
+ When creating/importing an OpenShift application to your workspace, you have to provide a destination-folder that the wizard would clone to.
+ If the destination folder already has a project with the very same name, the wizard would not let you finishing it.
+ Moving/removing the conflicting folder outside Eclipse did not help since the wizard did not check the location again, the error kept popping up.
+ You had to close the wizard and restart your operation. <br />
+ We fixed this in Alpha1, the wizard will now check the folder once you switch pages back and forth.
+ <p>
+ <img src="images/clone-destination-error.png" alt="conflicting git destination" />
+ </p>
+ <p>
+ <small>
+ <a href="https://issues.jboss.org/browse/JBIDE-12241">Related Jira</a>
+ </small>
+ </p>
+
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>OpenShift Server</h3>
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Publishing DIY applications</b></td>
+ <td valign="top">
+ <p>
+ Before Alpha1 publishing local changes to DIY applications errored with an NPE. We now fixed this nastyness.
+ </p>
+ <p><small><a href="https://issues.jboss.org/browse/JBIDE-12079">Related Jira</a></small></p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <a name="itemname3" id="itemname3"></a>
+ <b>Publishing by Drag'n Dropping</b>
+ </td>
+ <td valign="top">
+ <p>
+ Previously, when a user performed a drag-and-drop action to publish a project it was ignored.
+ In Alpha1 you'll now be able to publishing your project to your OpenShift cloud by drag and dropping your
+ project to the OpenShift server adapter.
+ </p>
+ <p><small><a href="https://issues.jboss.org/browse/JBIDE-12071">Related Jira</a></small></p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>OpenShift Express REST client</h3>
+ <hr/>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <a name="itemname3" id="itemname3"></a><b>REST Client published to maven central</b>
+ </td>
+ <td valign="top">
+ In JBoss tools, we developed a java client library for the OpenShift REST service. The client is hosted at github, you'll find it at
+ <a href="https://github.com/openshift/openshift-java-client">https://github.com/openshift/openshift-java-client</a>.<br/>
+ Since Alpha1 we now also provide the client library as maven artifact from Maven central. <br/>
+ To add it to your maven project, you will simply add the following to your maven pom:
+ <pre>
+<dependency>
+ <groupId>com.openshift</groupId>
+ <artifactId>openshift-java-client</artifactId>
+ <version>2.0.0</version>
+</dependency>
+ </pre>
+ If you want to learn how to use our client library, you will want to read our blog and check the code examples at <a href="https://community.jboss.org/en/tools/blog/2012/08/24/show-domain-info-ope...">show-domain-info: openshift-java-client in a nutshell</a>
+ <p><small><a href="https://issues.jboss.org/browse/JBIDE-12187">Related Jira</a></small></p>
+ </td>
+ </tr>
+ </table>
+ </body>
+
+</html>
+
+
Property changes on: trunk/documentation/whatsnew/openshift/openshift-news-2.4.0.Alpha1.html
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r43747 - in trunk/ws/plugins: org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/preferences and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-09-17 09:39:31 -0400 (Mon, 17 Sep 2012)
New Revision: 43747
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsApplicationValidatorDelegate.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/preferences/JaxrsValidatorConfigurationBlockDescriptionProvider.java
Log:
Fixed - JBIDE-12576 Improve the structure of JAX-RS Validator
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsApplicationValidatorDelegate.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsApplicationValidatorDelegate.java 2012-09-17 13:26:38 UTC (rev 43746)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/validation/JaxrsApplicationValidatorDelegate.java 2012-09-17 13:39:31 UTC (rev 43747)
@@ -3,9 +3,6 @@
import org.eclipse.core.runtime.CoreException;
import org.jboss.tools.common.validation.TempMarkerManager;
import org.jboss.tools.ws.jaxrs.core.internal.metamodel.domain.JaxrsJavaApplication;
-import org.jboss.tools.ws.jaxrs.core.internal.metamodel.domain.JaxrsResource;
-import org.jboss.tools.ws.jaxrs.core.internal.metamodel.domain.JaxrsResourceMethod;
-import org.jboss.tools.ws.jaxrs.core.metamodel.IJaxrsResourceMethod;
public class JaxrsApplicationValidatorDelegate extends AbstractJaxrsElementValidatorDelegate<JaxrsJavaApplication> {
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/preferences/JaxrsValidatorConfigurationBlockDescriptionProvider.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/preferences/JaxrsValidatorConfigurationBlockDescriptionProvider.java 2012-09-17 13:26:38 UTC (rev 43746)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/preferences/JaxrsValidatorConfigurationBlockDescriptionProvider.java 2012-09-17 13:39:31 UTC (rev 43747)
@@ -35,7 +35,7 @@
}
private SectionDescription SECTION_ACTIVATORS = new SectionDescription(
- JaxrsPreferencesMessages.JaxrsValidatorConfigurationBlock_section_httpMethods,
+ JaxrsPreferencesMessages.JaxrsValidatorConfigurationBlock_section_applications,
new String[][]{
{JaxrsPreferences.APPLICATION_NO_OCCURRENCE_FOUND, JaxrsPreferencesMessages.JaxrsValidatorConfigurationBlock_pb_applicationNoOccurrenceFound_label},
{JaxrsPreferences.APPLICATION_TOO_MANY_OCCURRENCES, JaxrsPreferencesMessages.JaxrsValidatorConfigurationBlock_pb_applicationTooManyOccurrencesFound_label}
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r43746 - trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: jpeterka
Date: 2012-09-17 09:26:38 -0400 (Mon, 17 Sep 2012)
New Revision: 43746
Modified:
trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml
Log:
Profile activation on dummy test reverted (maven activation issue)
Modified: trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml
===================================================================
--- trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml 2012-09-17 11:46:48 UTC (rev 43745)
+++ trunk/tests/tests/org.jboss.tools.dummy.ui.bot.test/pom.xml 2012-09-17 13:26:38 UTC (rev 43746)
@@ -72,12 +72,13 @@
<profiles>
<profile>
<id>mac17</id>
+ <!--
<activation>
<os>
<family>mac</family>
</os>
<jdk>1.7</jdk>
- </activation>
+ </activation> -->
<properties>
<systemProperties>-Dawt.toolkit=sun.lwawt.macosx.LWCToolkit</systemProperties>
</properties>
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r43745 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-09-17 07:46:48 -0400 (Mon, 17 Sep 2012)
New Revision: 43745
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/Logger.java
Log:
corrected class header
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/Logger.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/Logger.java 2012-09-17 08:24:14 UTC (rev 43744)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/Logger.java 2012-09-17 11:46:48 UTC (rev 43745)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008 Red Hat, Inc.
+ * Copyright (c) 2011 Red Hat, Inc.
* Distributed under license by Red Hat, Inc. All rights reserved.
* This program is made available under the terms of the
* Eclipse Public License v1.0 which accompanies this distribution,
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r43744 - trunk/openshift/plugins/org.jboss.tools.openshift.express.client.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-09-17 04:24:14 -0400 (Mon, 17 Sep 2012)
New Revision: 43744
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
Log:
[JBIDE-12628]
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r43743 - in trunk: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-09-17 03:34:46 -0400 (Mon, 17 Sep 2012)
New Revision: 43743
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractPublishMethod.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServerBehaviour.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublishMethod.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBinaryPublishMethod.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
Log:
JBIDE-12613 publish method interface is using concrete classes
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractPublishMethod.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractPublishMethod.java 2012-09-17 06:58:50 UTC (rev 43742)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractPublishMethod.java 2012-09-17 07:34:46 UTC (rev 43743)
@@ -20,19 +20,19 @@
import org.jboss.ide.eclipse.as.core.ExtensionManager;
import org.jboss.ide.eclipse.as.core.Trace;
import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServerBehaviour;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
-import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
public abstract class AbstractPublishMethod implements IJBossServerPublishMethod {
public abstract String getPublishMethodId();
- public void publishStart(DeployableServerBehavior behaviour,
+ public void publishStart(IDeployableServerBehaviour behaviour,
IProgressMonitor monitor) throws CoreException {
Trace.trace(Trace.STRING_FINER, "Publish start in " + getClass().getName()); //$NON-NLS-1$
}
- public int publishFinish(DeployableServerBehavior behaviour,
+ public int publishFinish(IDeployableServerBehaviour behaviour,
IProgressMonitor monitor) throws CoreException {
Trace.trace(Trace.STRING_FINER, "Beginning publishFinish in " + getClass().getName()); //$NON-NLS-1$
int result = getServerPublishState(behaviour);
@@ -40,7 +40,7 @@
return result;
}
- public int getServerPublishState(DeployableServerBehavior behaviour) {
+ public int getServerPublishState(IDeployableServerBehaviour behaviour) {
IModule[] modules = behaviour.getServer().getModules();
boolean allpublished= true;
for (int i = 0; i < modules.length; i++) {
@@ -52,7 +52,7 @@
return IServer.PUBLISH_STATE_INCREMENTAL;
}
- public int publishModule(DeployableServerBehavior behaviour, int kind,
+ public int publishModule(IDeployableServerBehaviour behaviour, int kind,
int deltaKind, IModule[] module, IProgressMonitor monitor)
throws CoreException {
Trace.trace(Trace.STRING_FINER, "Beginning to publish module " + module[module.length-1].getName()); //$NON-NLS-1$
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServerBehaviour.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServerBehaviour.java 2012-09-17 06:58:50 UTC (rev 43742)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServerBehaviour.java 2012-09-17 07:34:46 UTC (rev 43743)
@@ -3,9 +3,12 @@
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.model.IModuleFile;
+import org.eclipse.wst.server.core.model.IModuleResourceDelta;
public interface IDeployableServerBehaviour {
public IServer getServer();
public boolean changedFileRequiresModuleRestart(IModuleFile mf);
public IModulePathFilter getPathFilter(IModule[] moduleTree);
+ public IModuleResourceDelta[] getPublishedResourceDelta(IModule[] module);
+ public int getPublishType(int kind, int deltaKind, int modulePublishState);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublishMethod.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublishMethod.java 2012-09-17 06:58:50 UTC (rev 43742)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublishMethod.java 2012-09-17 07:34:46 UTC (rev 43743)
@@ -15,12 +15,11 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
-import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
public interface IJBossServerPublishMethod {
// public IJBossServerPublishMethodType getPublishMethodType();
- public void publishStart(DeployableServerBehavior behaviour, IProgressMonitor monitor) throws CoreException;
- public int publishFinish(DeployableServerBehavior behaviour, IProgressMonitor monitor) throws CoreException;
+ public void publishStart(IDeployableServerBehaviour behaviour, IProgressMonitor monitor) throws CoreException;
+ public int publishFinish(IDeployableServerBehaviour behaviour, IProgressMonitor monitor) throws CoreException;
/**
* Publish this module
@@ -32,7 +31,7 @@
* @return An IServer.STATE_XXX constant, or -1 if the behaviour should not change server state
* @throws CoreException
*/
- public int publishModule(DeployableServerBehavior behaviour, int kind, int deltaKind, IModule[] module, IProgressMonitor monitor) throws CoreException;
+ public int publishModule(IDeployableServerBehaviour behaviour, int kind, int deltaKind, IModule[] module, IProgressMonitor monitor) throws CoreException;
/**
* Create a callback handler with the given deploy path and server.
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBinaryPublishMethod.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBinaryPublishMethod.java 2012-09-17 06:58:50 UTC (rev 43742)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBinaryPublishMethod.java 2012-09-17 07:34:46 UTC (rev 43743)
@@ -24,13 +24,13 @@
import org.jboss.ide.eclipse.archives.webtools.modules.LocalZippedPublisherUtil;
import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
-import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServerBehaviour;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
public class ExpressBinaryPublishMethod extends ExpressPublishMethod {
@Override
- public int publishFinish(DeployableServerBehavior behaviour,
+ public int publishFinish(IDeployableServerBehaviour behaviour,
IProgressMonitor monitor) throws CoreException {
String outProject = ExpressServerUtils.getExpressDeployProject(behaviour.getServer());
@@ -46,7 +46,7 @@
}
@Override
- public int publishModule(DeployableServerBehavior behaviour, int kind,
+ public int publishModule(IDeployableServerBehaviour behaviour, int kind,
int deltaKind, IModule[] module, IProgressMonitor monitor)
throws CoreException {
if( module.length > 1 )
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2012-09-17 06:58:50 UTC (rev 43742)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2012-09-17 07:34:46 UTC (rev 43743)
@@ -10,13 +10,11 @@
*******************************************************************************/
package org.jboss.tools.openshift.express.internal.core.behaviour;
-import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -26,6 +24,7 @@
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.egit.core.op.AddToIndexOperation;
import org.eclipse.egit.core.op.PushOperationResult;
+import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.osgi.util.NLS;
@@ -39,9 +38,9 @@
import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
import org.jboss.ide.eclipse.archives.webtools.modules.LocalZippedPublisherUtil;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServerBehaviour;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IPublishCopyCallbackHandler;
-import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.tools.openshift.egit.core.EGitUtils;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
@@ -54,7 +53,7 @@
}
@Override
- public void publishStart(DeployableServerBehavior behaviour,
+ public void publishStart(IDeployableServerBehaviour behaviour,
IProgressMonitor monitor) throws CoreException {
String destProjName = ExpressServerUtils.getExpressDeployProject(behaviour.getServer());
IProject magicProject = destProjName == null ? null : ResourcesPlugin.getWorkspace().getRoot().getProject(destProjName);
@@ -66,7 +65,7 @@
}
@Override
- public int publishFinish(DeployableServerBehavior behaviour,
+ public int publishFinish(IDeployableServerBehaviour behaviour,
IProgressMonitor monitor) throws CoreException {
String destProjName = ExpressServerUtils.getExpressDeployProject(behaviour.getServer());
@@ -85,7 +84,7 @@
return allSubModulesPublished ? IServer.PUBLISH_STATE_NONE : IServer.PUBLISH_STATE_INCREMENTAL;
}
- protected boolean areAllPublished(DeployableServerBehavior behaviour) {
+ protected boolean areAllPublished(IDeployableServerBehaviour behaviour) {
IModule[] modules = behaviour.getServer().getModules();
boolean allpublished= true;
for (int i = 0; i < modules.length; i++) {
@@ -96,7 +95,7 @@
}
@Override
- public int publishModule(DeployableServerBehavior behaviour, int kind,
+ public int publishModule(IDeployableServerBehaviour behaviour, int kind,
int deltaKind, IModule[] module, IProgressMonitor monitor)
throws CoreException {
@@ -180,7 +179,7 @@
}
protected PushOperationResult commitAndPushProject(IProject p,
- DeployableServerBehavior behaviour, IProgressMonitor monitor) throws CoreException {
+ IDeployableServerBehaviour behaviour, IProgressMonitor monitor) throws CoreException {
int changed = 0;
try {
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r43742 - in trunk: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling and 15 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-09-17 02:58:50 -0400 (Mon, 17 Sep 2012)
New Revision: 43742
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ModuleResourceUtil.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB3ClasspathContainer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractLaunchConfigurator.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7DeploymentScannerAdditions.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/AS7ManagementDetails.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchConfigUtils.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ProgressMonitorUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java
trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/SecurityFailureHandler.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/UserPassCredentialProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/AbstractOpenBrowserServerAction.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInJMXConsoleActionProvider.java
trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/utiltests/ConfigNameResolverTest.java
trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectCorePlugin.java
trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSGenerationTest.java
Log:
JBIDE-12613 introduction of ijbossserver interface
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB3ClasspathContainer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB3ClasspathContainer.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/src/org/jboss/ide/eclipse/as/classpath/core/ejb3/EJB3ClasspathContainer.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -18,7 +18,6 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.QualifiedName;
import org.eclipse.core.runtime.Status;
@@ -30,8 +29,8 @@
import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.classpath.core.ClasspathCorePlugin;
import org.jboss.ide.eclipse.as.classpath.core.Messages;
+import org.jboss.ide.eclipse.as.core.server.IJBossServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
-import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
/**
@@ -47,7 +46,7 @@
"org.jboss.ide.eclipse.ejb3.wizards.core.classpath", "jboss-ejb3-configuration"); //$NON-NLS-1$ //$NON-NLS-2$
protected IJavaProject javaProject;
- protected JBossServer jbossServer;
+ protected IJBossServer jbossServer;
protected IPath path;
protected IPath configPath = new Path(""); //$NON-NLS-1$
@@ -106,11 +105,11 @@
return Messages.EJB3ClasspathContainer_ejb30_description;
}
- public JBossServer getJBossServer() {
+ public IJBossServer getJBossServer() {
return jbossServer;
}
- public void setJBossServer(JBossServer jbossServer) {
+ public void setJBossServer(IJBossServer jbossServer) {
this.jbossServer = jbossServer;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/WebPortPoller.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -26,9 +26,9 @@
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.Messages;
+import org.jboss.ide.eclipse.as.core.server.IJBossServer;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2;
import org.jboss.ide.eclipse.as.core.server.IServerStatePollerType;
-import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
@@ -78,7 +78,7 @@
// v6_safe
String host2 = ServerUtil.formatPossibleIpv6Address(server.getHost());
String url = "http://"+host2; //$NON-NLS-1$
- JBossServer jbs = ServerConverter.getJBossServer(server);
+ IJBossServer jbs = ServerConverter.getJBossServer(server);
int port = jbs.getJBossWebPort();
url += ":" + port; //$NON-NLS-1$
return url;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -12,26 +12,16 @@
import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.server.core.IEnterpriseApplication;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.project.facet.core.util.internal.ProgressMonitorUtil;
import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.internal.DeletedModule;
-import org.eclipse.wst.server.core.model.IModuleFile;
import org.eclipse.wst.server.core.model.IModuleFolder;
import org.eclipse.wst.server.core.model.IModuleResource;
-import org.eclipse.wst.server.core.model.IModuleResourceDelta;
-import org.eclipse.wst.server.core.model.ModuleDelegate;
import org.eclipse.wst.server.core.util.ProjectModule;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
@@ -45,22 +35,9 @@
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader.DeploymentTypePrefs;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.IWTPConstants;
+import org.jboss.ide.eclipse.as.core.util.ModuleResourceUtil;
-public class PublishUtil {
- public static int countChanges(IModuleResourceDelta[] deltas) {
- IModuleResource res;
- int count = 0;
- if( deltas == null ) return 0;
- for( int i = 0; i < deltas.length; i++ ) {
- res = deltas[i].getModuleResource();
- if( res != null && res instanceof IModuleFile)
- count++;
- count += countChanges(deltas[i].getAffectedChildren());
- }
- return count;
- }
-
-
+public class PublishUtil extends ModuleResourceUtil {
/**
* All preferences are stored in the "local" setting as it was decided
* having to replicate deploy paths for each publish method was not good
@@ -159,50 +136,6 @@
return root;
}
- /*
- * This method is deprecated. Please use the following:
- * @see getDeployPath(IModule[] module, String folder, IDeployableServer server)
- * @param moduleTree
- * @param deployFolder
- * @return
- */
- // @Deprecated
- //public static IPath getDeployPath(IModule[] moduleTree, String deployFolder);
-
- private static String getParentRelativeURI(IModule[] tree, int index, String defaultName) {
- if( index != 0 ) {
- IEnterpriseApplication parent = (IEnterpriseApplication)tree[index-1].loadAdapter(IEnterpriseApplication.class, null);
- if( parent != null ) {
- String uri = parent.getURI(tree[index]);
- if(uri != null )
- return uri;
- }
- // TODO if we make our own "enterprise app" interface, do that here
- }
- // return name with extension
- return defaultName;
-
- }
-
- private static ArrayList<String> moduleCoreFactories = new ArrayList<String>();
- static {
- moduleCoreFactories.add("org.eclipse.jst.j2ee.server"); //$NON-NLS-1$
- moduleCoreFactories.add("org.eclipse.jst.jee.server"); //$NON-NLS-1$
- }
- public static void addModuleCoreFactory(String s) {
- if( !moduleCoreFactories.contains(s))
- moduleCoreFactories.add(s);
- }
- public static boolean isModuleCoreProject(IModule[] module) {
- IModule lastmod = module[module.length-1];
- if( lastmod.getProject() == null && lastmod instanceof DeletedModule) {
- int colon = lastmod.getId().indexOf(':');
- String factory = lastmod.getId().substring(0,colon == -1 ? lastmod.getId().length() : colon);
- return moduleCoreFactories.contains(factory);
- }
- return ModuleCoreNature.isFlexibleProject(lastmod.getProject());
- }
-
public static IPath getDeployPath(IJBossServerPublishMethod method, IModule[] moduleTree, IDeployableServer server) {
String defaultFolder = method.getPublishDefaultRootFolder(server.getServer());
String folder = PublishUtil.getDeployRootFolder(
@@ -247,32 +180,7 @@
return suffix;
}
- public static IModuleResource[] getResources(IModule module, IProgressMonitor monitor) throws CoreException {
- monitor.beginTask("Fetching Module Resources", 100); //$NON-NLS-1$
- ModuleDelegate md = (ModuleDelegate)module.loadAdapter(ModuleDelegate.class, ProgressMonitorUtil.submon(monitor, 100));
- if( md == null ) {
- // Deleted Module, TODO handle this differently!
- return new IModuleResource[]{};
- }
- IModuleResource[] members = md.members();
- monitor.done();
- return members;
- }
- public static IModuleResource[] getResources(IModule[] tree) throws CoreException {
- return getResources(tree[tree.length-1], new NullProgressMonitor());
- }
-
- public static File getFile(IModuleResource resource) {
- File source = (File)resource.getAdapter(File.class);
- if( source == null ) {
- IFile ifile = (IFile)resource.getAdapter(IFile.class);
- if( ifile != null )
- source = ifile.getLocation().toFile();
- }
- return source;
- }
-
public static boolean deployPackaged(IModule[] moduleTree) {
String moduleTypeId = moduleTree[moduleTree.length-1].getModuleType().getId();
if( moduleTypeId.equals(IWTPConstants.FACET_UTILITY)) {
@@ -289,13 +197,6 @@
}
return false;
}
- public static java.io.File getFile(IModuleFile mf) {
- return (IFile)mf.getAdapter(IFile.class) != null ?
- ((IFile)mf.getAdapter(IFile.class)).getLocation().toFile() :
- (java.io.File)mf.getAdapter(java.io.File.class);
- }
-
-
/*
* Just package into a jar raw. Don't think about it, just do it
*/
@@ -374,12 +275,4 @@
}
}
}
-
- public static IModule[] combine(IModule[] module, IModule newMod) {
- IModule[] retval = new IModule[module.length + 1];
- for( int i = 0; i < module.length; i++ )
- retval[i]=module[i];
- retval[retval.length-1] = newMod;
- return retval;
- }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServer.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServer.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -1,5 +1,10 @@
package org.jboss.ide.eclipse.as.core.server;
public interface IJBossServer extends IDeployableServer {
+ public String getHost();
+ public String getUsername();
+ public String getPassword();
+ public int getJNDIPort();
+ public int getJBossWebPort();
public IJBossServerRuntime getRuntime();
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractLaunchConfigurator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractLaunchConfigurator.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractLaunchConfigurator.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -15,6 +15,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.server.IJBossServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.ILaunchConfigConfigurator;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
@@ -27,7 +28,7 @@
private static final String DEFAULTS_SET = "DEFAULTS_SET"; //$NON-NLS-1$
- private JBossServer jbossServer;
+ private IJBossServer jbossServer;
private IJBossServerRuntime jbossRuntime;
public AbstractLaunchConfigurator(IServer server) throws CoreException {
@@ -38,11 +39,11 @@
@Override
public void configure(ILaunchConfigurationWorkingCopy launchConfig) throws CoreException {
if (!areDefaultsSet(launchConfig)) {
- doConfigure(launchConfig, jbossServer, jbossRuntime);
+ doConfigure(launchConfig, (JBossServer)jbossServer, jbossRuntime);
setDefaultsSet(launchConfig);
}
if( shouldUpdateLaunch(launchConfig)){
- doOverrides(launchConfig, jbossServer, jbossRuntime);
+ doOverrides(launchConfig, (JBossServer)jbossServer, jbossRuntime);
}
}
@@ -67,7 +68,7 @@
return false;
}
- protected JBossServer getJbossServer() {
+ protected IJBossServer getJbossServer() {
return jbossServer;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7DeploymentScannerAdditions.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7DeploymentScannerAdditions.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7DeploymentScannerAdditions.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -25,6 +25,7 @@
import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.Trace;
import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
+import org.jboss.ide.eclipse.as.core.server.IJBossServer;
import org.jboss.ide.eclipse.as.core.server.UnitedServerListener;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.ServerExtendedProperties;
@@ -141,7 +142,7 @@
}
protected String[] getDeployLocationFolders(IServer server) {
- JBossServer ds = ServerConverter.getJBossServer(server);
+ JBossServer ds = (JBossServer)ServerConverter.getJBossServer(server);
ArrayList<String> folders = new ArrayList<String>();
// add the server folder deploy loc. first
String insideServer = ds.getDeployFolder(JBossServer.DEPLOY_SERVER);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/AS7ManagementDetails.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/AS7ManagementDetails.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/v7/management/AS7ManagementDetails.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -16,8 +16,8 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.server.IJBossServer;
import org.jboss.ide.eclipse.as.core.server.IServerProvider;
-import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7Server;
import org.jboss.ide.eclipse.as.core.util.PollThreadUtils;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
@@ -52,7 +52,7 @@
public String[] handleCallbacks(String[] prompts) throws UnsupportedOperationException {
ArrayList<String> requiredProperties = new ArrayList<String>();
requiredProperties.addAll(Arrays.asList(prompts));
- JBossServer jbs = ServerConverter.getJBossServer(server);
+ IJBossServer jbs = ServerConverter.getJBossServer(server);
boolean emptyCreds =
(jbs.getUsername() == null || jbs.getUsername().equals("")) //$NON-NLS-1$
&& (jbs.getPassword() == null || jbs.getPassword().equals("")); //$NON-NLS-1$
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchConfigUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchConfigUtils.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/LaunchConfigUtils.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -160,7 +160,6 @@
public static IServer checkedGetServer(ILaunchConfiguration launchConfig) throws CoreException {
String serverId = new JBossLaunchConfigProperties().getServerId(launchConfig);
- JBossServer server = ServerConverter.checkedFindJBossServer(serverId);
- return server.getServer();
+ return ServerConverter.findServer(serverId);
}
}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ModuleResourceUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ModuleResourceUtil.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ModuleResourceUtil.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -0,0 +1,87 @@
+package org.jboss.ide.eclipse.as.core.util;
+
+import java.io.File;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jst.server.core.IEnterpriseApplication;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.model.IModuleFile;
+import org.eclipse.wst.server.core.model.IModuleResource;
+import org.eclipse.wst.server.core.model.IModuleResourceDelta;
+import org.eclipse.wst.server.core.model.ModuleDelegate;
+
+public class ModuleResourceUtil {
+ public static int countChanges(IModuleResourceDelta[] deltas) {
+ IModuleResource res;
+ int count = 0;
+ if( deltas == null ) return 0;
+ for( int i = 0; i < deltas.length; i++ ) {
+ res = deltas[i].getModuleResource();
+ if( res != null && res instanceof IModuleFile)
+ count++;
+ count += countChanges(deltas[i].getAffectedChildren());
+ }
+ return count;
+ }
+
+ public static String getParentRelativeURI(IModule[] tree, int index, String defaultName) {
+ if( index != 0 ) {
+ IEnterpriseApplication parent = (IEnterpriseApplication)tree[index-1].loadAdapter(IEnterpriseApplication.class, null);
+ if( parent != null ) {
+ String uri = parent.getURI(tree[index]);
+ if(uri != null )
+ return uri;
+ }
+ // TODO if we make our own "enterprise app" interface, do that here
+ }
+ // return name with extension
+ return defaultName;
+
+ }
+
+
+ public static IModuleResource[] getResources(IModule module, IProgressMonitor monitor) throws CoreException {
+ monitor.beginTask("Fetching Module Resources", 100); //$NON-NLS-1$
+ ModuleDelegate md = (ModuleDelegate)module.loadAdapter(ModuleDelegate.class,
+ ProgressMonitorUtil.submon(monitor, 100));
+ if( md == null ) {
+ // Deleted Module, TODO handle this differently!
+ return new IModuleResource[]{};
+ }
+ IModuleResource[] members = md.members();
+ monitor.done();
+ return members;
+ }
+
+ public static IModuleResource[] getResources(IModule[] tree) throws CoreException {
+ return getResources(tree[tree.length-1], new NullProgressMonitor());
+ }
+
+ public static File getFile(IModuleResource resource) {
+ File source = (File)resource.getAdapter(File.class);
+ if( source == null ) {
+ IFile ifile = (IFile)resource.getAdapter(IFile.class);
+ if( ifile != null )
+ source = ifile.getLocation().toFile();
+ }
+ return source;
+ }
+
+ public static java.io.File getFile(IModuleFile mf) {
+ return (IFile)mf.getAdapter(IFile.class) != null ?
+ ((IFile)mf.getAdapter(IFile.class)).getLocation().toFile() :
+ (java.io.File)mf.getAdapter(java.io.File.class);
+ }
+
+
+ public static IModule[] combine(IModule[] module, IModule newMod) {
+ IModule[] retval = new IModule[module.length + 1];
+ for( int i = 0; i < module.length; i++ )
+ retval[i]=module[i];
+ retval[retval.length-1] = newMod;
+ return retval;
+ }
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -19,6 +19,7 @@
import org.jboss.ide.eclipse.as.core.Trace;
import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller;
import org.jboss.ide.eclipse.as.core.server.IDelegatingServerBehavior;
+import org.jboss.ide.eclipse.as.core.server.IJBossServer;
import org.jboss.ide.eclipse.as.core.server.INeedCredentials;
import org.jboss.ide.eclipse.as.core.server.IPollResultListener;
import org.jboss.ide.eclipse.as.core.server.IProvideCredentials;
@@ -26,7 +27,6 @@
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2;
import org.jboss.ide.eclipse.as.core.server.IServerStatePollerType;
-import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
@@ -45,7 +45,7 @@
* @return
*/
public static String getPollerId(boolean expectedState, IServer server) {
- JBossServer s = ServerConverter.getJBossServer(server);
+ IJBossServer s = ServerConverter.getJBossServer(server);
ServerAttributeHelper helper = s.getAttributeHelper();
String key = expectedState == IServerStatePoller.SERVER_UP ?
IJBossToolingConstants.STARTUP_POLLER_KEY
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ProgressMonitorUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ProgressMonitorUtil.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ProgressMonitorUtil.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -26,4 +26,29 @@
return new NullProgressMonitor();
return monitor;
}
-}
+
+
+ public static IProgressMonitor submon( final IProgressMonitor parent,
+ final int ticks ) {
+ return submon( parent, ticks, SubProgressMonitor.SUPPRESS_SUBTASK_LABEL );
+ }
+
+ public static IProgressMonitor submon( final IProgressMonitor parent,
+ final int ticks, final int style ) {
+ return ( parent == null ? new NullProgressMonitor() : new SubProgressMonitor( parent, ticks, style ) );
+ }
+
+ public static void subTask( final IProgressMonitor monitor,
+ final String taskName ) {
+ if( monitor != null ) {
+ monitor.subTask( taskName );
+ }
+ }
+
+ public static void checkIfCanceled( final IProgressMonitor monitor )
+ throws InterruptedException {
+ if( monitor != null && monitor.isCanceled() ) {
+ throw new InterruptedException();
+ }
+ }
+}
\ No newline at end of file
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -26,6 +26,7 @@
import org.jboss.ide.eclipse.as.core.server.IDelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IDeployableServerBehaviour;
+import org.jboss.ide.eclipse.as.core.server.IJBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.v7.DelegatingJBoss7ServerBehavior;
@@ -36,9 +37,15 @@
*/
public class ServerConverter {
- public static JBossServer findJBossServer(String serverId) throws CoreException {
+ public static IServer findServer(String serverId) {
if (serverId == null)
return null;
+ return ServerCore.findServer(serverId);
+ }
+
+ public static IJBossServer findJBossServer(String serverId) throws CoreException {
+ if (serverId == null)
+ return null;
IServer s = ServerCore.findServer(serverId);
if (s == null)
@@ -46,8 +53,8 @@
return getJBossServer(s);
}
- public static JBossServer checkedFindJBossServer(String serverId) throws CoreException {
- JBossServer server = findJBossServer(serverId);
+ public static IJBossServer checkedFindJBossServer(String serverId) throws CoreException {
+ IJBossServer server = findJBossServer(serverId);
if (server == null) {
throw new CoreException(
new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
@@ -80,15 +87,15 @@
return adaptedServer;
}
- public static JBossServer getJBossServer(IServer server) {
+ public static IJBossServer getJBossServer(IServer server) {
return convertServer(server, JBossServer.class);
}
- public static JBossServer checkedGetJBossServer(IServer server) throws CoreException {
+ public static IJBossServer checkedGetJBossServer(IServer server) throws CoreException {
return checkedConvertServer(server, JBossServer.class);
}
- public static JBossServer getJBossServer(IServerWorkingCopy server) {
+ public static IJBossServer getJBossServer(IServerWorkingCopy server) {
return convertServer(server, JBossServer.class);
}
@@ -113,7 +120,7 @@
* @return
*/
public static JBossServer[] getAllJBossServers() {
- ArrayList<JBossServer> servers = new ArrayList<JBossServer>();
+ ArrayList<IJBossServer> servers = new ArrayList<IJBossServer>();
IServer[] iservers = ServerCore.getServers();
for (int i = 0; i < iservers.length; i++) {
if (getJBossServer(iservers[i]) != null) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXUtil.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXUtil.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -17,8 +17,8 @@
import java.util.Properties;
import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.server.IJBossServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
-import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
/**
@@ -105,7 +105,7 @@
}
public static Properties getDefaultProperties(IServer server) {
- JBossServer jbs = ServerConverter.getJBossServer(server);
+ IJBossServer jbs = ServerConverter.getJBossServer(server);
Properties props = new Properties();
if( jbs != null ) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/SecurityFailureHandler.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/SecurityFailureHandler.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/SecurityFailureHandler.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -13,9 +13,9 @@
import java.util.List;
import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.server.IJBossServer;
import org.jboss.ide.eclipse.as.core.server.IProvideCredentials;
import org.jboss.ide.eclipse.as.core.server.IServerProvider;
-import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.ui.launch.UserPassCredentialProvider;
@@ -32,7 +32,7 @@
if( requiredProperties.size() > 2)
return false;
IServer s = serverProvider.getServer();
- JBossServer jbs = ServerConverter.getJBossServer(s);
+ IJBossServer jbs = ServerConverter.getJBossServer(s);
if( jbs != null && jbs.hasJMXProvider())
return true;
return false;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -17,6 +17,7 @@
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerType;
import org.eclipse.wst.server.core.internal.Base;
+import org.jboss.ide.eclipse.as.core.server.IJBossServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.ILaunchConfigConfigurator;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
@@ -34,7 +35,7 @@
*/
public class RSEJBoss7LaunchConfigurator implements ILaunchConfigConfigurator {
- private JBossServer jbossServer;
+ private IJBossServer jbossServer;
private IJBossServerRuntime jbossRuntime;
public RSEJBoss7LaunchConfigurator(IServer server) throws CoreException {
@@ -47,7 +48,7 @@
boolean detectStartupCommand = RSELaunchConfigProperties.isDetectStartupCommand(launchConfig, true);
String currentStartupCmd = RSELaunchConfigProperties.getStartupCommand(launchConfig);
- String defaultStartup = getLaunchCommand(jbossServer, jbossRuntime);
+ String defaultStartup = getLaunchCommand((JBossServer)jbossServer, jbossRuntime);
if( detectStartupCommand || !isSet(currentStartupCmd)) {
RSELaunchConfigProperties.setStartupCommand(defaultStartup, launchConfig);
}
@@ -55,7 +56,7 @@
boolean detectShutdownCommand = RSELaunchConfigProperties.isDetectShutdownCommand(launchConfig, true);
String currentShutdownCmd = RSELaunchConfigProperties.getShutdownCommand(launchConfig);
- String defaultShutdownCommand = getShutdownCommand(jbossServer, jbossRuntime);
+ String defaultShutdownCommand = getShutdownCommand((JBossServer)jbossServer, jbossRuntime);
if( detectShutdownCommand || !isSet(currentShutdownCmd)) {
RSELaunchConfigProperties.setShutdownCommand(defaultShutdownCommand, launchConfig);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -24,8 +24,8 @@
import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller;
import org.jboss.ide.eclipse.as.core.server.IDelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.IJBossBehaviourDelegate;
+import org.jboss.ide.eclipse.as.core.server.IJBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
-import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties;
import org.jboss.ide.eclipse.as.core.util.ArgsUtil;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
@@ -99,7 +99,7 @@
private String getDefaultLaunchCommand(ILaunchConfiguration config) throws CoreException {
String serverId = new JBossLaunchConfigProperties().getServerId(config);
- JBossServer jbossServer = ServerConverter.checkedFindJBossServer(serverId);
+ IJBossServer jbossServer = ServerConverter.checkedFindJBossServer(serverId);
String rseHome = jbossServer.getServer().getAttribute(RSEUtils.RSE_SERVER_HOME_DIR, "");
// initialize startup command to something reasonable
String currentArgs = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, ""); //$NON-NLS-1$
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -64,9 +64,9 @@
import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller;
import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.core.server.IJBossServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
-import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.v7.JBoss7ManagerServicePoller;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
@@ -135,7 +135,7 @@
RSEDeploymentPreferenceComposite composite = null;
IServerWorkingCopy cServer = callback.getServer();
- JBossServer jbs = cServer.getOriginal() == null ?
+ IJBossServer jbs = cServer.getOriginal() == null ?
ServerConverter.getJBossServer(cServer) :
ServerConverter.getJBossServer(cServer.getOriginal());
if( jbs == null )
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/DeploymentModuleOptionCompositeAssistant.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -64,9 +64,9 @@
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.core.server.IJBossServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
-import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.ServerExtendedProperties;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader.DeploymentModulePrefs;
@@ -454,7 +454,7 @@
if(showTempAndDeployTexts()) {
- JBossServer jbs = ServerConverter.getJBossServer(page.getServer().getOriginal());
+ IJBossServer jbs = ServerConverter.getJBossServer(page.getServer().getOriginal());
String newDir = getHelper().getAttribute(IDeployableServer.DEPLOY_DIRECTORY,
jbs == null ? "" : jbs.getDeployFolder()); //$NON-NLS-1$
String newTemp = getHelper().getAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY,
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerPasswordSection.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -132,7 +132,7 @@
* @param monitor the progress monitor for the save operation.
*/
public void doSave(IProgressMonitor monitor) {
- JBossServer jbs = ServerConverter.getJBossServer(server.getOriginal());
+ JBossServer jbs = (JBossServer)ServerConverter.getJBossServer(server.getOriginal());
jbs.setPassword(passwordString);
monitor.worked(100);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/UserPassCredentialProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/UserPassCredentialProvider.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/UserPassCredentialProvider.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -19,6 +19,7 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerWorkingCopy;
+import org.jboss.ide.eclipse.as.core.server.IJBossServer;
import org.jboss.ide.eclipse.as.core.server.INeedCredentials;
import org.jboss.ide.eclipse.as.core.server.IProvideCredentials;
import org.jboss.ide.eclipse.as.core.server.IServerProvider;
@@ -40,7 +41,7 @@
if( requiredProperties.size() > 2)
return false;
IServer s = serverProvider.getServer();
- JBossServer jbs = ServerConverter.getJBossServer(s);
+ IJBossServer jbs = ServerConverter.getJBossServer(s);
if( jbs != null && !jbs.hasJMXProvider())
return true;
return false;
@@ -57,7 +58,7 @@
public void run() {
IServer server = inNeed.getServer();
IServerWorkingCopy copy = server.createWorkingCopy();
- JBossServer jbs = ServerConverter.getJBossServer(copy);
+ JBossServer jbs = (JBossServer)ServerConverter.getJBossServer(copy);
String initialUser = jbs.getUsername();
String initialPass = jbs.getPassword();
RequiredCredentialsDialog d = new RequiredCredentialsDialog(
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/AbstractOpenBrowserServerAction.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/AbstractOpenBrowserServerAction.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/AbstractOpenBrowserServerAction.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -25,7 +25,6 @@
import org.eclipse.ui.navigator.ICommonViewerWorkbenchSite;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.ui.internal.view.servers.AbstractServerAction;
-import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.ui.JBossServerUIPlugin;
import org.jboss.ide.eclipse.as.ui.Messages;
@@ -54,12 +53,7 @@
protected boolean shouldAddForSelection(IStructuredSelection sel) {
IServer server = getSingleServer(sel);
- if( server != null ) {
- JBossServer jbs = ServerConverter.getJBossServer(server);
- if( jbs != null )
- return true;
- }
- return false;
+ return server != null && ServerConverter.getJBossServer(server) != null;
}
protected IServer getSingleServer(IStructuredSelection sel) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInJMXConsoleActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInJMXConsoleActionProvider.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInJMXConsoleActionProvider.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -13,6 +13,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.server.IJBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
@@ -28,7 +29,7 @@
protected boolean shouldAddForSelection(IStructuredSelection sel) {
IServer server = getSingleServer(sel);
if( server != null ) {
- JBossServer jbs = ServerConverter.getJBossServer(server);
+ IJBossServer jbs = ServerConverter.getJBossServer(server);
if( jbs != null ) {
// TODO fix this so anything BELOW 7 works
// need new util methods
Modified: trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/utiltests/ConfigNameResolverTest.java
===================================================================
--- trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/utiltests/ConfigNameResolverTest.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/utiltests/ConfigNameResolverTest.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -7,7 +7,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.resolvers.ConfigNameResolver;
-import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
+import org.jboss.ide.eclipse.as.core.server.IJBossServer;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
import org.jboss.tools.as.test.core.internal.utils.ServerCreationTestUtils;
@@ -55,7 +55,7 @@
for( int i = 0; i < vars.length; i++ ) {
String var = ConfigNameResolver.getVariablePattern(vars[i]);
String result = new ConfigNameResolver().performSubstitutions(var, server.getName());
- JBossServer jbs = ServerConverter.getJBossServer(server);
+ IJBossServer jbs = ServerConverter.getJBossServer(server);
if( jbs == null ) {
assertEquals("", result);
} else if( vars[i].equals(ConfigNameResolver.JBOSS_CONFIG))
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectCorePlugin.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectCorePlugin.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/ESBProjectCorePlugin.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -17,7 +17,6 @@
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.wst.common.componentcore.internal.util.VirtualReferenceUtilities;
-import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
import org.jboss.tools.esb.core.runtime.JBossRuntimeManager;
import org.osgi.framework.BundleContext;
@@ -47,7 +46,6 @@
super.start(context);
plugin = this;
JBossRuntimeManager.loadParsers();
- PublishUtil.addModuleCoreFactory("org.jboss.tools.esb.project.core.moduleFactory");
Job job = new Job("ESB Facet Framework Initialization") { //$NON-NLS-1$
protected IStatus run(IProgressMonitor monitor) {
VirtualReferenceUtilities.INSTANCE.addDefaultExtension(ESBProjectConstant.ESB_PROJECT_FACET, ESBProjectConstant.ESB_EXTENSION);
Modified: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSGenerationTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSGenerationTest.java 2012-09-17 05:10:25 UTC (rev 43741)
+++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSGenerationTest.java 2012-09-17 06:58:50 UTC (rev 43742)
@@ -21,7 +21,7 @@
import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.core.ServerUtil;
import org.eclipse.wst.server.core.model.ServerDelegate;
-import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.test.ASTest;
import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils;
@@ -97,11 +97,11 @@
public IStatus publishWebProject(IProject project) throws CoreException {
IModule mod = ServerUtil.getModule(project);
- JBossServer ds = (JBossServer)currentServer.loadAdapter(JBossServer.class, new NullProgressMonitor());
+ IDeployableServer ds = (IDeployableServer)currentServer.loadAdapter(IDeployableServer.class, new NullProgressMonitor());
IServerWorkingCopy copy = currentServer.createWorkingCopy();
copy.modifyModules(new IModule[]{mod}, new IModule[0], new NullProgressMonitor());
currentServer = copy.save(true, new NullProgressMonitor());
- ds = (JBossServer)currentServer.loadAdapter(JBossServer.class, new NullProgressMonitor());
+ ds = (IDeployableServer)currentServer.loadAdapter(IDeployableServer.class, new NullProgressMonitor());
ds.setDeployLocationType("server");
IStatus status = ServerRuntimeUtils.publish(IServer.PUBLISH_INCREMENTAL,currentServer);
return status;
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r43741 - in trunk: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-09-17 01:10:25 -0400 (Mon, 17 Sep 2012)
New Revision: 43741
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossLaunchDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DelegatingStartLaunchConfiguration.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressLaunchDelegate.java
Log:
JBIDE-12613 cleanup on launch interfaces
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossLaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossLaunchDelegate.java 2012-09-17 04:57:13 UTC (rev 43740)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossLaunchDelegate.java 2012-09-17 05:10:25 UTC (rev 43741)
@@ -5,11 +5,11 @@
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.core.model.LaunchConfigurationDelegate;
import org.eclipse.wst.server.core.IServer;
-import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration;
public interface IJBossLaunchDelegate {
- public void actualLaunch(DelegatingStartLaunchConfiguration launchConfig, ILaunchConfiguration configuration,
+ public void actualLaunch(LaunchConfigurationDelegate launchConfig, ILaunchConfiguration configuration,
String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException;
public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DelegatingStartLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DelegatingStartLaunchConfiguration.java 2012-09-17 04:57:13 UTC (rev 43740)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DelegatingStartLaunchConfiguration.java 2012-09-17 05:10:25 UTC (rev 43741)
@@ -44,7 +44,7 @@
}
}
- protected IJBossLaunchDelegate getDelegate(ILaunchConfiguration configuration) throws CoreException {
+ public IJBossLaunchDelegate getDelegate(ILaunchConfiguration configuration) throws CoreException {
IServer server = ServerUtil.getServer(configuration);
IDeployableServerBehaviour beh = ServerConverter.getDeployableServerBehavior(server);
String currentMode = DeploymentPreferenceLoader.getCurrentDeploymentMethodTypeId(beh.getServer(), LocalPublishMethod.LOCAL_PUBLISH_METHOD);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java 2012-09-17 04:57:13 UTC (rev 43740)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java 2012-09-17 05:10:25 UTC (rev 43741)
@@ -19,6 +19,7 @@
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.core.model.IProcess;
+import org.eclipse.debug.core.model.LaunchConfigurationDelegate;
import org.eclipse.jdt.launching.IRuntimeClasspathEntry;
import org.eclipse.jdt.launching.IVMInstall;
import org.eclipse.jdt.launching.StandardClasspathProvider;
@@ -50,7 +51,7 @@
* Actual instance methods
*/
public void actualLaunch(
- DelegatingStartLaunchConfiguration launchConfig,
+ LaunchConfigurationDelegate launchConfig,
ILaunchConfiguration configuration, String mode, ILaunch launch,
IProgressMonitor monitor) throws CoreException {
actualLaunch(configuration, mode, launch, monitor);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java 2012-09-17 04:57:13 UTC (rev 43740)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java 2012-09-17 05:10:25 UTC (rev 43741)
@@ -17,17 +17,17 @@
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.core.model.LaunchConfigurationDelegate;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.server.IDelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
-import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration;
import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils;
import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
public class RSEJBoss7StartLaunchDelegate extends AbstractRSELaunchDelegate {
@Override
- public void actualLaunch(DelegatingStartLaunchConfiguration launchConfig,
+ public void actualLaunch(LaunchConfigurationDelegate launchConfig,
ILaunchConfiguration configuration, String mode, ILaunch launch,
IProgressMonitor monitor) throws CoreException {
IDelegatingServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java 2012-09-17 04:57:13 UTC (rev 43740)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java 2012-09-17 05:10:25 UTC (rev 43741)
@@ -18,6 +18,7 @@
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.core.model.LaunchConfigurationDelegate;
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller;
@@ -25,7 +26,6 @@
import org.jboss.ide.eclipse.as.core.server.IJBossBehaviourDelegate;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
-import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration;
import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties;
import org.jboss.ide.eclipse.as.core.util.ArgsUtil;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
@@ -38,7 +38,7 @@
@Override
public void actualLaunch(
- DelegatingStartLaunchConfiguration launchConfig,
+ LaunchConfigurationDelegate launchConfig,
ILaunchConfiguration configuration, String mode, ILaunch launch,
IProgressMonitor monitor) throws CoreException {
IDelegatingServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressLaunchDelegate.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressLaunchDelegate.java 2012-09-17 04:57:13 UTC (rev 43740)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressLaunchDelegate.java 2012-09-17 05:10:25 UTC (rev 43741)
@@ -16,11 +16,12 @@
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
+import org.eclipse.debug.core.model.LaunchConfigurationDelegate;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.Trace;
+import org.jboss.ide.eclipse.as.core.server.IDelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.IJBossLaunchDelegate;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
-import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration;
import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils;
import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
@@ -31,7 +32,7 @@
}
@Override
- public void actualLaunch(DelegatingStartLaunchConfiguration launchConfig,
+ public void actualLaunch(LaunchConfigurationDelegate launchConfig,
ILaunchConfiguration configuration, String mode, ILaunch launch,
IProgressMonitor monitor) throws CoreException {
// TODO Auto-generated method stub
@@ -41,7 +42,7 @@
@Override
public boolean preLaunchCheck(ILaunchConfiguration configuration,
String mode, IProgressMonitor monitor) throws CoreException {
- DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
+ IDelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
IStatus s = jbsBehavior.canStart(mode);
Trace.trace(Trace.STRING_FINEST, "Ensuring Server can start: " + s.getMessage()); //$NON-NLS-1$
@@ -49,8 +50,8 @@
throw new CoreException(jbsBehavior.canStart(mode));
if (LaunchCommandPreferences.isIgnoreLaunchCommand(jbsBehavior.getServer())) {
Trace.trace(Trace.STRING_FINEST, "Server is marked as ignore Launch. Marking as started."); //$NON-NLS-1$
- jbsBehavior.setServerStarting();
- jbsBehavior.setServerStarted();
+ ((DelegatingServerBehavior)jbsBehavior).setServerStarting();
+ ((DelegatingServerBehavior)jbsBehavior).setServerStarted();
return false;
}
return true;
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r43740 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling and 8 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-09-17 00:57:13 -0400 (Mon, 17 Sep 2012)
New Revision: 43740
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDelegatingServerBehavior.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java
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/IDeployableServerBehaviour.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossBehaviourDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractBehaviourDelegate.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/launch/AbstractJBossStartLaunchConfiguration.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DelegatingStartLaunchConfiguration.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBossServerBehaviorUtils.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSELaunchDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
Log:
JBIDE-12613 cleanup on behavior interfaces
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java 2012-09-17 04:12:10 UTC (rev 43739)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java 2012-09-17 04:57:13 UTC (rev 43740)
@@ -39,6 +39,7 @@
import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServerBehaviour;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
import org.jboss.ide.eclipse.as.core.server.IModulePathFilter;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
@@ -249,7 +250,7 @@
TrueZipUtil.createArchive(path);
de.schlichtherle.io.File root = TrueZipUtil.getFile(path, TrueZipUtil.getJarArchiveDetector());
IModuleResource[] resources = getResources(module);
- DeployableServerBehavior beh = ServerConverter.getDeployableServerBehavior(server);
+ IDeployableServerBehaviour beh = ServerConverter.getDeployableServerBehavior(server);
IModulePathFilter filter = beh.getPathFilter(module);
IModuleResource[] resources2 = filter == null ? resources : filter.getFilteredMembers();
IStatus[] copyResults = copy(root, resources2);
@@ -284,7 +285,7 @@
IPath path = getOutputFilePath(module);
de.schlichtherle.io.File root = TrueZipUtil.getFile(path, TrueZipUtil.getJarArchiveDetector());
IModuleResourceDelta[] deltas = ((Server)server).getPublishedResourceDelta(module);
- DeployableServerBehavior beh = ServerConverter.getDeployableServerBehavior(server);
+ IDeployableServerBehaviour beh = ServerConverter.getDeployableServerBehavior(server);
IModulePathFilter filter = beh.getPathFilter(module);
return publishChanges(server, deltas, root, filter);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java 2012-09-17 04:12:10 UTC (rev 43739)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/polling/ProcessTerminatedPoller.java 2012-09-17 04:57:13 UTC (rev 43740)
@@ -15,10 +15,10 @@
import org.eclipse.debug.core.model.IProcess;
import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.server.IDelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.IProcessProvider;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.IServerStatePollerType;
-import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
/**
* Essentially does nothing because the process already has a listener
@@ -57,7 +57,7 @@
public boolean isComplete() throws PollingException {
if( server.getServerState() == IServer.STATE_STOPPED)
return true;
- DelegatingServerBehavior beh = (DelegatingServerBehavior) server.getAdapter(DelegatingServerBehavior.class);
+ IDelegatingServerBehavior beh = (IDelegatingServerBehavior) server.getAdapter(IDelegatingServerBehavior.class);
if(beh != null && beh.getDelegate() != null && beh.getDelegate() instanceof IProcessProvider) {
IProcess p = ((IProcessProvider)beh.getDelegate()).getProcess();
if( p == null || p.isTerminated())
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 2012-09-17 04:12:10 UTC (rev 43739)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2012-09-17 04:57:13 UTC (rev 43740)
@@ -37,11 +37,11 @@
import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
import org.jboss.ide.eclipse.as.core.modules.ResourceModuleResourceUtil;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServerBehaviour;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
import org.jboss.ide.eclipse.as.core.server.IModulePathFilter;
import org.jboss.ide.eclipse.as.core.server.IPublishCopyCallbackHandler;
-import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.ProgressMonitorUtil;
@@ -280,7 +280,7 @@
* @since 2.3
*/
protected IModulePathFilter getPathFilter(IModule[] moduleTree) {
- DeployableServerBehavior beh = ServerConverter.getDeployableServerBehavior(server.getServer());
+ IDeployableServerBehaviour beh = ServerConverter.getDeployableServerBehavior(server.getServer());
return beh.getPathFilter(moduleTree);
}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDelegatingServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDelegatingServerBehavior.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDelegatingServerBehavior.java 2012-09-17 04:57:13 UTC (rev 43740)
@@ -0,0 +1,14 @@
+package org.jboss.ide.eclipse.as.core.server;
+
+import org.eclipse.core.runtime.IStatus;
+
+public interface IDelegatingServerBehavior extends IDeployableServerBehaviour {
+ public IJBossBehaviourDelegate getDelegate();
+ public IStatus canStart(String launchMode);
+ public IStatus canStop(String launchMode);
+ public IStatus canRestart(String launchMode);
+ public void setServerStopping();
+ public void setServerStopped();
+ public void setServerStarting();
+ public void setServerStarted();
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServerBehaviour.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServerBehaviour.java 2012-09-17 04:12:10 UTC (rev 43739)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IDeployableServerBehaviour.java 2012-09-17 04:57:13 UTC (rev 43740)
@@ -1,7 +1,11 @@
package org.jboss.ide.eclipse.as.core.server;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.model.IModuleFile;
public interface IDeployableServerBehaviour {
+ public IServer getServer();
public boolean changedFileRequiresModuleRestart(IModuleFile mf);
+ public IModulePathFilter getPathFilter(IModule[] moduleTree);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossBehaviourDelegate.java 2012-09-17 04:12:10 UTC (rev 43739)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossBehaviourDelegate.java 2012-09-17 04:57:13 UTC (rev 43740)
@@ -15,13 +15,12 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.wst.server.core.IModule;
-import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
public interface IJBossBehaviourDelegate {
public String getBehaviourTypeId();
- public void setActualBehaviour(DelegatingServerBehavior actualBehaviour);
+ public void setActualBehaviour(IDelegatingServerBehavior actualBehaviour);
public void stop(boolean force);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractBehaviourDelegate.java 2012-09-17 04:12:10 UTC (rev 43739)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractBehaviourDelegate.java 2012-09-17 04:57:13 UTC (rev 43740)
@@ -16,6 +16,7 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.wst.server.core.IModule;
import org.jboss.ide.eclipse.as.core.modules.ResourceModuleResourceUtil;
+import org.jboss.ide.eclipse.as.core.server.IDelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.IJBossBehaviourDelegate;
import org.jboss.ide.eclipse.as.core.server.IModulePathFilter;
@@ -24,10 +25,10 @@
*/
public abstract class AbstractBehaviourDelegate implements IJBossBehaviourDelegate {
- protected DelegatingServerBehavior actualBehavior;
+ protected IDelegatingServerBehavior actualBehavior;
@Override
- public void setActualBehaviour(DelegatingServerBehavior actualBehaviour) {
+ public void setActualBehaviour(IDelegatingServerBehavior actualBehaviour) {
this.actualBehavior = actualBehaviour;
}
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 2012-09-17 04:12:10 UTC (rev 43739)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2012-09-17 04:57:13 UTC (rev 43740)
@@ -25,6 +25,7 @@
import org.jboss.ide.eclipse.as.core.publishers.JSTPublisherXMLToucher;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
+import org.jboss.ide.eclipse.as.core.server.IDelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossBehaviourDelegate;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
@@ -43,7 +44,7 @@
* @author Rob Stryker
*
*/
-public class DelegatingServerBehavior extends DeployableServerBehavior {
+public class DelegatingServerBehavior extends DeployableServerBehavior implements IDelegatingServerBehavior {
private IJBossBehaviourDelegate delegate;
private String lastModeId;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java 2012-09-17 04:12:10 UTC (rev 43739)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/AbstractJBossStartLaunchConfiguration.java 2012-09-17 04:57:13 UTC (rev 43740)
@@ -31,10 +31,8 @@
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.Trace;
-import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller;
+import org.jboss.ide.eclipse.as.core.server.IDelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.IServerAlreadyStartedHandler;
-import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
-import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.ExtendedServerPropertiesAdapterFactory;
import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossExtendedProperties;
@@ -51,7 +49,7 @@
@Override
public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor)
throws CoreException {
- DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
+ IDelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
IStatus s = jbsBehavior.canStart(mode);
Trace.trace(Trace.STRING_FINEST, "Ensuring Server can start: " + s.getMessage()); //$NON-NLS-1$
@@ -59,15 +57,15 @@
throw new CoreException(jbsBehavior.canStart(mode));
if (LaunchCommandPreferences.isIgnoreLaunchCommand(jbsBehavior.getServer())) {
Trace.trace(Trace.STRING_FINEST, "Server is marked as ignore Launch. Marking as started."); //$NON-NLS-1$
- jbsBehavior.setServerStarting();
- jbsBehavior.setServerStarted();
+ ((DelegatingServerBehavior)jbsBehavior).setServerStarting();
+ ((DelegatingServerBehavior)jbsBehavior).setServerStarted();
return false;
}
JBossExtendedProperties props = ExtendedServerPropertiesAdapterFactory.getJBossExtendedProperties(jbsBehavior.getServer());
IStatus status = props.verifyServerStructure();
if( !status.isOK() ) {
- jbsBehavior.setServerStopped();
+ ((DelegatingServerBehavior)jbsBehavior).setServerStopped();
throw new CoreException(status);
}
@@ -88,11 +86,11 @@
* Should ideally use the poller that the server says is its poller,
* but some pollers such as timeout poller
*/
- protected IStatus isServerStarted(DelegatingServerBehavior jbsBehavior) {
+ protected IStatus isServerStarted(IDelegatingServerBehavior jbsBehavior) {
return PollThreadUtils.isServerStarted(jbsBehavior);
}
- protected boolean handleAlreadyStartedScenario( DelegatingServerBehavior jbsBehavior, IStatus startedStatus) {
+ protected boolean handleAlreadyStartedScenario( IDelegatingServerBehavior jbsBehavior, IStatus startedStatus) {
IServerAlreadyStartedHandler handler = ExtensionManager.getDefault().getAlreadyStartedHandler(jbsBehavior.getServer());
if( handler != null ) {
int handlerResult = handler.promptForBehaviour(jbsBehavior.getServer(), startedStatus);
@@ -105,7 +103,7 @@
}
Trace.trace(Trace.STRING_FINEST, "There is no handler available to prompt the user. The server will be set to started automatically. "); //$NON-NLS-1$
// force server to started mode
- jbsBehavior.setServerStarted();
+ ((DelegatingServerBehavior)jbsBehavior).setServerStarted();
return false;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DelegatingStartLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DelegatingStartLaunchConfiguration.java 2012-09-17 04:12:10 UTC (rev 43739)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DelegatingStartLaunchConfiguration.java 2012-09-17 04:57:13 UTC (rev 43740)
@@ -24,9 +24,9 @@
import org.eclipse.wst.server.core.ServerUtil;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServerBehaviour;
import org.jboss.ide.eclipse.as.core.server.IJBossLaunchDelegate;
import org.jboss.ide.eclipse.as.core.server.internal.BehaviourModel;
-import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
@@ -46,7 +46,7 @@
protected IJBossLaunchDelegate getDelegate(ILaunchConfiguration configuration) throws CoreException {
IServer server = ServerUtil.getServer(configuration);
- DeployableServerBehavior beh = ServerConverter.getDeployableServerBehavior(server);
+ IDeployableServerBehaviour beh = ServerConverter.getDeployableServerBehavior(server);
String currentMode = DeploymentPreferenceLoader.getCurrentDeploymentMethodTypeId(beh.getServer(), LocalPublishMethod.LOCAL_PUBLISH_METHOD);
if( currentMode == null )
throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, "Server's mode (local/rse/etc) is unset or missing.")); //$NON-NLS-1$
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java 2012-09-17 04:12:10 UTC (rev 43739)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossStartLaunchDelegate.java 2012-09-17 04:57:13 UTC (rev 43740)
@@ -12,7 +12,6 @@
import java.util.ArrayList;
-import org.apache.tools.ant.property.GetProperty;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
@@ -26,6 +25,7 @@
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
+import org.jboss.ide.eclipse.as.core.server.IDelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.IJBossLaunchDelegate;
import org.jboss.ide.eclipse.as.core.server.internal.AbstractLocalJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
@@ -58,17 +58,17 @@
public void preLaunch(ILaunchConfiguration configuration,
String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
- DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
+ IDelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
if( jbsBehavior != null ) {
- jbsBehavior.setRunMode(mode);
- jbsBehavior.setServerStarting();
+ ((DelegatingServerBehavior)jbsBehavior).setRunMode(mode);
+ ((DelegatingServerBehavior)jbsBehavior).setServerStarting();
}
}
public void postLaunch(ILaunchConfiguration configuration, String mode,
ILaunch launch, IProgressMonitor monitor) throws CoreException {
IProcess[] processes = launch.getProcesses();
- DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
+ IDelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
if( jbsBehavior != null )
((LocalJBossBehaviorDelegate) (jbsBehavior.getDelegate())).setProcess(processes[0]);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java 2012-09-17 04:12:10 UTC (rev 43739)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/StopLaunchConfiguration.java 2012-09-17 04:57:13 UTC (rev 43740)
@@ -13,6 +13,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.debug.core.ILaunchConfiguration;
+import org.jboss.ide.eclipse.as.core.server.IDelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils;
import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
@@ -22,15 +23,15 @@
@Override
public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor)
throws CoreException {
- DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
+ IDelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
if (!jbsBehavior.canStop(mode).isOK())
throw new CoreException(jbsBehavior.canStart(mode));
if (LaunchCommandPreferences.isIgnoreLaunchCommand(jbsBehavior.getServer())) {
- jbsBehavior.setServerStopping();
- jbsBehavior.setServerStopped();
+ ((DelegatingServerBehavior)jbsBehavior).setServerStopping();
+ ((DelegatingServerBehavior)jbsBehavior).setServerStopped();
return false;
}
- jbsBehavior.setServerStopping();
+ ((DelegatingServerBehavior)jbsBehavior).setServerStopping();
return true;
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java 2012-09-17 04:12:10 UTC (rev 43739)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7StartLaunchDelegate.java 2012-09-17 04:57:13 UTC (rev 43740)
@@ -17,8 +17,9 @@
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.debug.core.model.IProcess;
import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.ServerUtil;
+import org.jboss.ide.eclipse.as.core.server.IDelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.IJBossLaunchDelegate;
-import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate;
import org.jboss.ide.eclipse.as.core.server.internal.launch.LocalJBossStartLaunchDelegate;
import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils;
@@ -40,16 +41,22 @@
public void preLaunch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor)
throws CoreException {
- DelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
+ IServer server = ServerUtil.getServer(configuration);
+ DelegatingJBoss7ServerBehavior beh =
+ (DelegatingJBoss7ServerBehavior) server.getAdapter(DelegatingJBoss7ServerBehavior.class);
+
+ IDelegatingServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration);
if( jbsBehavior != null ) {
- jbsBehavior.setRunMode(mode);
- jbsBehavior.setServerStarting();
+ beh.setRunMode(mode);
+ beh.setServerStarting();
}
}
public void postLaunch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor)
throws CoreException {
- DelegatingJBoss7ServerBehavior behavior = JBossServerBehaviorUtils.getJBoss7ServerBehavior(configuration);
+ IServer server = ServerUtil.getServer(configuration);
+ DelegatingJBoss7ServerBehavior behavior =
+ (DelegatingJBoss7ServerBehavior) server.getAdapter(DelegatingJBoss7ServerBehavior.class);
if( behavior != null ) {
IProcess[] processes = launch.getProcesses();
if (processes != null && processes.length >= 1) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBossServerBehaviorUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBossServerBehaviorUtils.java 2012-09-17 04:12:10 UTC (rev 43739)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/JBossServerBehaviorUtils.java 2012-09-17 04:57:13 UTC (rev 43740)
@@ -14,7 +14,7 @@
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.ServerUtil;
-import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
+import org.jboss.ide.eclipse.as.core.server.IDelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.v7.DelegatingJBoss7ServerBehavior;
/**
@@ -27,10 +27,10 @@
* @param configuration
* @return
*/
- public static DelegatingServerBehavior getServerBehavior(ILaunchConfiguration configuration) {
+ public static IDelegatingServerBehavior getServerBehavior(ILaunchConfiguration configuration) {
try {
IServer server = ServerUtil.getServer(configuration);
- return (DelegatingServerBehavior) server.getAdapter(DelegatingServerBehavior.class);
+ return (IDelegatingServerBehavior) server.getAdapter(IDelegatingServerBehavior.class);
} catch(CoreException ce ) {
return null;
}
@@ -39,7 +39,10 @@
* Return a DelegatingJBoss7ServerBehavior or null
* @param configuration
* @return
+ *
+ * // TODO delete this method
*/
+ @Deprecated
public static DelegatingJBoss7ServerBehavior getJBoss7ServerBehavior(ILaunchConfiguration configuration) {
try {
IServer server = ServerUtil.getServer(configuration);
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java 2012-09-17 04:12:10 UTC (rev 43739)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PollThreadUtils.java 2012-09-17 04:57:13 UTC (rev 43740)
@@ -18,6 +18,7 @@
import org.jboss.ide.eclipse.as.core.ExtensionManager;
import org.jboss.ide.eclipse.as.core.Trace;
import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller;
+import org.jboss.ide.eclipse.as.core.server.IDelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.INeedCredentials;
import org.jboss.ide.eclipse.as.core.server.IPollResultListener;
import org.jboss.ide.eclipse.as.core.server.IProvideCredentials;
@@ -25,7 +26,6 @@
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2;
import org.jboss.ide.eclipse.as.core.server.IServerStatePollerType;
-import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.server.internal.PollThread;
import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
@@ -201,7 +201,7 @@
}
}
- public static IStatus isServerStarted(DelegatingServerBehavior jbsBehavior) {
+ public static IStatus isServerStarted(IDelegatingServerBehavior jbsBehavior) {
IServerStatePoller poller = PollThreadUtils.getPoller(IServerStatePoller.SERVER_UP, jbsBehavior.getServer());
return isServerStarted(jbsBehavior.getServer(), poller);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2012-09-17 04:12:10 UTC (rev 43739)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2012-09-17 04:57:13 UTC (rev 43740)
@@ -23,11 +23,10 @@
import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.Messages;
+import org.jboss.ide.eclipse.as.core.server.IDelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
-import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
-import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServerBehaviour;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
-import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.v7.DelegatingJBoss7ServerBehavior;
/**
@@ -57,12 +56,12 @@
return server;
}
- @SuppressWarnings("unchecked")
public static <SERVER> SERVER checkedGetJBossServer(IServer server, Class<SERVER> serverClass) throws CoreException {
- if (server == null) {
- return null;
- }
- SERVER adaptedServer = (SERVER) server.loadAdapter(serverClass, new NullProgressMonitor());
+ return checkedConvertServer(server, serverClass);
+ }
+
+ public static <SERVER> SERVER checkedConvertServer(IServerAttributes server, Class<SERVER> serverClass) throws CoreException {
+ SERVER adaptedServer = convertServer(server, serverClass);
if (adaptedServer == null) {
throw new CoreException(
new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
@@ -71,68 +70,41 @@
}
return adaptedServer;
}
-
- public static JBossServer getJBossServer(IServer server) {
+
+ @SuppressWarnings("unchecked")
+ public static <SERVER> SERVER convertServer(IServerAttributes server, Class<SERVER> serverClass) {
if (server == null) {
return null;
}
- JBossServer jbServer = (JBossServer) server.getAdapter(JBossServer.class);
- if (jbServer == null) {
- jbServer = (JBossServer) server.loadAdapter(JBossServer.class, new NullProgressMonitor());
- }
- return jbServer;
+ SERVER adaptedServer = (SERVER) server.loadAdapter(serverClass, new NullProgressMonitor());
+ return adaptedServer;
}
+
+ public static JBossServer getJBossServer(IServer server) {
+ return convertServer(server, JBossServer.class);
+ }
public static JBossServer checkedGetJBossServer(IServer server) throws CoreException {
- JBossServer jBossServer = getJBossServer(server);
- if (jBossServer == null) {
- throw new CoreException(
- new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
- NLS.bind(Messages.CannotSetUpImproperServer, server.getName())));
- }
- return jBossServer;
+ return checkedConvertServer(server, JBossServer.class);
}
public static JBossServer getJBossServer(IServerWorkingCopy server) {
- if (server == null) {
- return null;
- }
- JBossServer jbServer = (JBossServer) server.getAdapter(JBossServer.class);
- if (jbServer == null) {
- jbServer = (JBossServer) server.loadAdapter(JBossServer.class, new NullProgressMonitor());
- }
- return jbServer;
+ return convertServer(server, JBossServer.class);
}
public static IDeployableServer getDeployableServer(IServerAttributes server) {
- if (server == null) {
- return null;
- }
- IDeployableServer dep = (IDeployableServer) server.getAdapter(IDeployableServer.class);
- if (dep == null) {
- dep = (IDeployableServer) server.loadAdapter(IDeployableServer.class, new NullProgressMonitor());
- }
- return dep;
+ return convertServer(server, IDeployableServer.class);
}
- public static DeployableServerBehavior getDeployableServerBehavior(IServer server) {
- if (server == null)
- return null;
- return (DeployableServerBehavior) server.loadAdapter(
- DeployableServerBehavior.class, new NullProgressMonitor());
+ public static IDeployableServerBehaviour getDeployableServerBehavior(IServer server) {
+ return convertServer(server, IDeployableServerBehaviour.class);
}
public static DelegatingJBoss7ServerBehavior getJBoss7ServerBehavior(IServer server) {
- if (server == null)
- return null;
- return (DelegatingJBoss7ServerBehavior) server.loadAdapter(
- DelegatingJBoss7ServerBehavior.class, new NullProgressMonitor());
+ return convertServer(server, DelegatingJBoss7ServerBehavior.class);
}
- public static DelegatingServerBehavior getJBossServerBehavior(IServer server) {
- if (server == null)
- return null;
- return (DelegatingServerBehavior) server.loadAdapter(
- DelegatingServerBehavior.class, new NullProgressMonitor());
+ public static IDelegatingServerBehavior getJBossServerBehavior(IServer server) {
+ return convertServer(server, IDelegatingServerBehavior.class);
}
/**
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2012-09-17 04:12:10 UTC (rev 43739)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerUtil.java 2012-09-17 04:57:13 UTC (rev 43740)
@@ -33,9 +33,9 @@
import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.Messages;
+import org.jboss.ide.eclipse.as.core.server.IDelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.IJBossBehaviourDelegate;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
-import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
public class ServerUtil {
@@ -66,7 +66,7 @@
}
public static IJBossBehaviourDelegate checkedGetBehaviorDelegate(IServer server) throws CoreException {
- return checkedGetServerAdapter(server, DelegatingServerBehavior.class).getDelegate();
+ return checkedGetServerAdapter(server, IDelegatingServerBehavior.class).getDelegate();
}
public static IPath makeRelative(IRuntime rt, IPath p) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSELaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSELaunchDelegate.java 2012-09-17 04:12:10 UTC (rev 43739)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSELaunchDelegate.java 2012-09-17 04:57:13 UTC (rev 43740)
@@ -23,6 +23,8 @@
import org.eclipse.rse.services.shells.IHostShell;
import org.eclipse.rse.services.shells.IHostShellChangeEvent;
import org.eclipse.rse.services.shells.IHostShellOutputListener;
+import org.jboss.ide.eclipse.as.core.server.IDelegatingServerBehavior;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServerBehaviour;
import org.jboss.ide.eclipse.as.core.server.IJBossBehaviourDelegate;
import org.jboss.ide.eclipse.as.core.server.IJBossLaunchDelegate;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
@@ -36,7 +38,7 @@
public static final String DELIMETER = ":";
public static final String ECHO_KEY_DISCOVER_PID = "JBTOOLS_SERVER_START_CMD";
- protected void executeRemoteCommand(String command, DelegatingServerBehavior behavior)
+ protected void executeRemoteCommand(String command, IDelegatingServerBehavior behavior)
throws CoreException {
try {
ServerShellModel model = RSEHostShellModel.getInstance().getModel(behavior.getServer());
@@ -46,14 +48,15 @@
shell.writeToShell(getPidCommand);
} catch (SystemMessageException sme) {
// could not connect to remote system
- behavior.setServerStopped();
+ ((DelegatingServerBehavior)behavior).setServerStopped();
throw new CoreException(new Status(IStatus.ERROR,
org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID,
MessageFormat.format("Could not execute command on remote server {0}. Please ensure the server is reachable.", behavior.getServer().getName()), sme));
}
}
- private void addShellOutputListener(final IHostShell shell, final DelegatingServerBehavior behavior) {
+ private void addShellOutputListener(final IHostShell shell,
+ final IDelegatingServerBehavior behavior) {
if( shell == null )
return; // No listener needed for a null shell.
IHostShellOutputListener listener = null;
@@ -76,9 +79,9 @@
shell.addOutputListener(listener);
}
- protected void launchPingThread(DeployableServerBehavior beh) {
+ protected void launchPingThread(IDeployableServerBehaviour beh) {
// TODO do it properly here
ThreadUtils.sleepFor(30000);
- beh.setServerStarted();
+ ((DeployableServerBehavior)beh).setServerStarted();
}
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java 2012-09-17 04:12:10 UTC (rev 43739)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7StartLaunchDelegate.java 2012-09-17 04:57:13 UTC (rev 43740)
@@ -18,6 +18,7 @@
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
import org.eclipse.wst.server.core.IServer;
+import org.jboss.ide.eclipse.as.core.server.IDelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration;
import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils;
@@ -29,12 +30,13 @@
public void actualLaunch(DelegatingStartLaunchConfiguration launchConfig,
ILaunchConfiguration configuration, String mode, ILaunch launch,
IProgressMonitor monitor) throws CoreException {
- DelegatingServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration);
- beh.setServerStarting();
+ IDelegatingServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration);
if (LaunchCommandPreferences.isIgnoreLaunchCommand(beh.getServer())) {
- beh.setServerStarted();
+ ((DelegatingServerBehavior)beh).setServerStarting();
+ ((DelegatingServerBehavior)beh).setServerStarted();
return;
}
+ ((DelegatingServerBehavior)beh).setServerStarting();
String command = RSELaunchConfigProperties.getStartupCommand(configuration);
executeRemoteCommand(command, beh);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java 2012-09-17 04:12:10 UTC (rev 43739)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBossStartLaunchDelegate.java 2012-09-17 04:57:13 UTC (rev 43740)
@@ -21,6 +21,7 @@
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller;
+import org.jboss.ide.eclipse.as.core.server.IDelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.IJBossBehaviourDelegate;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
@@ -40,8 +41,8 @@
DelegatingStartLaunchConfiguration launchConfig,
ILaunchConfiguration configuration, String mode, ILaunch launch,
IProgressMonitor monitor) throws CoreException {
- DelegatingServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration);
- beh.setServerStarting();
+ IDelegatingServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration);
+ ((DelegatingServerBehavior)beh).setServerStarting();
String command = RSELaunchConfigProperties.getStartupCommand(configuration);
executeRemoteCommand(command, beh);
launchPingThread(beh);
@@ -52,12 +53,12 @@
public boolean preLaunchCheck(ILaunchConfiguration configuration,
String mode, IProgressMonitor monitor) throws CoreException {
// ping if up
- final DelegatingServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration);
- // TODO: use configured polelr
+ final IDelegatingServerBehavior beh = JBossServerBehaviorUtils.getServerBehavior(configuration);
+ // TODO: use configured poller
boolean started = WebPortPoller.onePing(beh.getServer());
if (started) {
- beh.setServerStarting();
- beh.setServerStarted();
+ ((DelegatingServerBehavior)beh).setServerStarting();
+ ((DelegatingServerBehavior)beh).setServerStarted();
return false;
}
return true;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2012-09-17 04:12:10 UTC (rev 43739)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2012-09-17 04:57:13 UTC (rev 43740)
@@ -25,7 +25,6 @@
import org.eclipse.rse.core.subsystems.ISubSystem;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
import org.eclipse.rse.services.files.IFileService;
-import org.eclipse.rse.services.files.IHostFile;
import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystem;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.Trace;
@@ -34,6 +33,7 @@
import org.jboss.ide.eclipse.as.core.publishers.AbstractPublishMethod;
import org.jboss.ide.eclipse.as.core.publishers.AbstractServerToolsPublisher;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServerBehaviour;
import org.jboss.ide.eclipse.as.core.server.IJBoss6Server;
import org.jboss.ide.eclipse.as.core.server.IPublishCopyCallbackHandler;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
@@ -49,18 +49,18 @@
public static final String RSE_ID = "rse"; //$NON-NLS-1$
- private DeployableServerBehavior behaviour;
+ private IDeployableServerBehaviour behaviour;
@Override
public String getPublishMethodId() {
return RSE_ID;
}
- public void setBehaviour(DeployableServerBehavior beh) {
+ public void setBehaviour(IDeployableServerBehaviour beh) {
this.behaviour = beh;
}
- public DeployableServerBehavior getBehaviour() {
+ public IDeployableServerBehaviour getBehaviour() {
return this.behaviour;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2012-09-17 04:12:10 UTC (rev 43739)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2012-09-17 04:57:13 UTC (rev 43740)
@@ -33,10 +33,10 @@
import org.eclipse.wst.server.ui.internal.command.ServerCommand;
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.IDeployableServerBehaviour;
import org.jboss.ide.eclipse.as.core.server.internal.BehaviourModel;
import org.jboss.ide.eclipse.as.core.server.internal.BehaviourModel.Behaviour;
import org.jboss.ide.eclipse.as.core.server.internal.BehaviourModel.BehaviourImpl;
-import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossExtendedProperties;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
@@ -131,7 +131,7 @@
nameList[i] = deployAdditions.get(i).behaviourName;
}
deployTypeCombo.setItems(nameList);
- DeployableServerBehavior ds = ServerConverter.getDeployableServerBehavior(callback.getServer().getOriginal());
+ IDeployableServerBehaviour ds = ServerConverter.getDeployableServerBehavior(callback.getServer().getOriginal());
String current = null;
if( ds != null ) {
Behaviour b = BehaviourModel.getModel().getBehaviour(callback.getServer().getOriginal().getServerType().getId());
13 years, 6 months
- 1
- 0
JBoss Tools SVN: r43739 - in trunk/as: plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules and 10 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-09-17 00:12:10 -0400 (Mon, 17 Sep 2012)
New Revision: 43739
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IModulePathFilter.java
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/patterns/IModulePathFilter.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java
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/PublishUtil.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/patterns/ModuleDirectoryScannerPathFilter.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossBehaviourDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractBehaviourDelegate.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/DeployableServerBehavior.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.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java
trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/ZippedFilterTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/Mock2BehaviourDelegate.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/Mock2FilterTest.java
trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/PublishingFilterTest.java
trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/polling/AbstractTestInternalPoller.java
trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/polling/DummyYesOrNoPoller.java
Log:
JBIDE-12613 creation of IServerStatePollerType, movement if IModulePathFilter into api folder
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java 2012-09-17 04:00:02 UTC (rev 43738)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java 2012-09-17 04:12:10 UTC (rev 43739)
@@ -38,9 +38,9 @@
import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
-import org.jboss.ide.eclipse.as.core.publishers.patterns.IModulePathFilter;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
+import org.jboss.ide.eclipse.as.core.server.IModulePathFilter;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.util.FileUtil;
import org.jboss.ide.eclipse.as.core.util.FileUtil.IFileUtilListener;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java 2012-09-17 04:00:02 UTC (rev 43738)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ResourceModuleResourceUtil.java 2012-09-17 04:12:10 UTC (rev 43739)
@@ -32,8 +32,8 @@
import org.eclipse.wst.server.core.util.ModuleFile;
import org.eclipse.wst.server.core.util.ModuleFolder;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
-import org.jboss.ide.eclipse.as.core.publishers.patterns.IModulePathFilter;
import org.jboss.ide.eclipse.as.core.publishers.patterns.ModuleDirectoryScannerPathFilter;
+import org.jboss.ide.eclipse.as.core.server.IModulePathFilter;
import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities;
public class ResourceModuleResourceUtil {
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 2012-09-17 04:00:02 UTC (rev 43738)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2012-09-17 04:12:10 UTC (rev 43739)
@@ -36,10 +36,10 @@
import org.jboss.ide.eclipse.as.core.Trace;
import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
import org.jboss.ide.eclipse.as.core.modules.ResourceModuleResourceUtil;
-import org.jboss.ide.eclipse.as.core.publishers.patterns.IModulePathFilter;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
+import org.jboss.ide.eclipse.as.core.server.IModulePathFilter;
import org.jboss.ide.eclipse.as.core.server.IPublishCopyCallbackHandler;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2012-09-17 04:00:02 UTC (rev 43738)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2012-09-17 04:12:10 UTC (rev 43739)
@@ -35,9 +35,9 @@
import org.eclipse.wst.server.core.util.ProjectModule;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
-import org.jboss.ide.eclipse.as.core.publishers.patterns.IModulePathFilter;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
+import org.jboss.ide.eclipse.as.core.server.IModulePathFilter;
import org.jboss.ide.eclipse.as.core.server.xpl.ModulePackager;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader.DeploymentModulePrefs;
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/patterns/IModulePathFilter.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/patterns/IModulePathFilter.java 2012-09-17 04:00:02 UTC (rev 43738)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/patterns/IModulePathFilter.java 2012-09-17 04:12:10 UTC (rev 43739)
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.ide.eclipse.as.core.publishers.patterns;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.server.core.model.IModuleResource;
-
-/**
- * @since 2.3
- */
-public interface IModulePathFilter {
- /**
- * This method should be used for incremental checks on a
- * particular resource, such as during incremental publishing
- * through deltas.
- *
- * It *can* be used throughout the entire tree without a substantial
- * performance hit, however, the suggested API to use for that is
- * getFilteredResources(IModuleResource[] original)
- *
- * @param moduleResource The resource to check
- * @return
- */
- public boolean shouldInclude(IModuleResource moduleResource);
-
- /**
- * The easiest way to get a new clean pre-filtered list of members
- * that actually need to be published
- *
- * @return the filtered list of members
- */
- public IModuleResource[] getFilteredMembers() throws CoreException;
-}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/patterns/ModuleDirectoryScannerPathFilter.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/patterns/ModuleDirectoryScannerPathFilter.java 2012-09-17 04:00:02 UTC (rev 43738)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/patterns/ModuleDirectoryScannerPathFilter.java 2012-09-17 04:12:10 UTC (rev 43739)
@@ -11,6 +11,7 @@
package org.jboss.ide.eclipse.as.core.publishers.patterns;
import org.eclipse.wst.server.core.model.IModuleResource;
+import org.jboss.ide.eclipse.as.core.server.IModulePathFilter;
/**
* @since 2.3
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossBehaviourDelegate.java 2012-09-17 04:00:02 UTC (rev 43738)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossBehaviourDelegate.java 2012-09-17 04:12:10 UTC (rev 43739)
@@ -15,7 +15,6 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.wst.server.core.IModule;
-import org.jboss.ide.eclipse.as.core.publishers.patterns.IModulePathFilter;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
public interface IJBossBehaviourDelegate {
Copied: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IModulePathFilter.java (from rev 43737, trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/patterns/IModulePathFilter.java)
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IModulePathFilter.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IModulePathFilter.java 2012-09-17 04:12:10 UTC (rev 43739)
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.core.server;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.wst.server.core.model.IModuleResource;
+
+/**
+ * @since 2.3
+ */
+public interface IModulePathFilter {
+ /**
+ * This method should be used for incremental checks on a
+ * particular resource, such as during incremental publishing
+ * through deltas.
+ *
+ * It *can* be used throughout the entire tree without a substantial
+ * performance hit, however, the suggested API to use for that is
+ * getFilteredResources(IModuleResource[] original)
+ *
+ * @param moduleResource The resource to check
+ * @return
+ */
+ public boolean shouldInclude(IModuleResource moduleResource);
+
+ /**
+ * The easiest way to get a new clean pre-filtered list of members
+ * that actually need to be published
+ *
+ * @return the filtered list of members
+ */
+ public IModuleResource[] getFilteredMembers() throws CoreException;
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractBehaviourDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractBehaviourDelegate.java 2012-09-17 04:00:02 UTC (rev 43738)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractBehaviourDelegate.java 2012-09-17 04:12:10 UTC (rev 43739)
@@ -16,8 +16,8 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.wst.server.core.IModule;
import org.jboss.ide.eclipse.as.core.modules.ResourceModuleResourceUtil;
-import org.jboss.ide.eclipse.as.core.publishers.patterns.IModulePathFilter;
import org.jboss.ide.eclipse.as.core.server.IJBossBehaviourDelegate;
+import org.jboss.ide.eclipse.as.core.server.IModulePathFilter;
/**
* A complete stub implementation of the interface
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 2012-09-17 04:00:02 UTC (rev 43738)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2012-09-17 04:12:10 UTC (rev 43739)
@@ -25,11 +25,11 @@
import org.jboss.ide.eclipse.as.core.publishers.JSTPublisherXMLToucher;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
-import org.jboss.ide.eclipse.as.core.publishers.patterns.IModulePathFilter;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossBehaviourDelegate;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType;
+import org.jboss.ide.eclipse.as.core.server.IModulePathFilter;
import org.jboss.ide.eclipse.as.core.server.IPublishCopyCallbackHandler;
import org.jboss.ide.eclipse.as.core.server.internal.BehaviourModel.Behaviour;
import org.jboss.ide.eclipse.as.core.server.internal.BehaviourModel.BehaviourImpl;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2012-09-17 04:00:02 UTC (rev 43738)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2012-09-17 04:12:10 UTC (rev 43739)
@@ -29,12 +29,12 @@
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.Trace;
import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod;
-import org.jboss.ide.eclipse.as.core.publishers.patterns.IModulePathFilter;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IDeployableServerBehaviour;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
+import org.jboss.ide.eclipse.as.core.server.IModulePathFilter;
import org.jboss.ide.eclipse.as.core.server.internal.launch.DeployableLaunchConfiguration;
import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
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 2012-09-17 04:00:02 UTC (rev 43738)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java 2012-09-17 04:12:10 UTC (rev 43739)
@@ -30,7 +30,7 @@
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
import org.jboss.ide.eclipse.as.core.modules.ResourceModuleResourceUtil;
-import org.jboss.ide.eclipse.as.core.publishers.patterns.IModulePathFilter;
+import org.jboss.ide.eclipse.as.core.server.IModulePathFilter;
import org.jboss.ide.eclipse.as.core.server.IPublishCopyCallbackHandler;
import org.jboss.ide.eclipse.as.core.util.ProgressMonitorUtil;
/**
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java 2012-09-17 04:00:02 UTC (rev 43738)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JMXPoller.java 2012-09-17 04:12:10 UTC (rev 43739)
@@ -31,7 +31,7 @@
import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes;
import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2;
-import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
+import org.jboss.ide.eclipse.as.core.server.IServerStatePollerType;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
import org.jboss.tools.jmx.core.IJMXRunnable;
@@ -60,7 +60,7 @@
private IServer server;
- private ServerStatePollerType type;
+ private IServerStatePollerType type;
private PollingException pollingException = null;
private RequiresInfoException requiresInfoException = null;
private Properties requiredPropertiesReturned = null;
@@ -229,11 +229,11 @@
return list;
}
- public ServerStatePollerType getPollerType() {
+ public IServerStatePollerType getPollerType() {
return type;
}
- public void setPollerType(ServerStatePollerType type) {
+ public void setPollerType(IServerStatePollerType type) {
this.type = type;
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java 2012-09-17 04:00:02 UTC (rev 43738)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PollerSection.java 2012-09-17 04:12:10 UTC (rev 43739)
@@ -32,8 +32,8 @@
import org.eclipse.wst.server.ui.internal.command.ServerCommand;
import org.jboss.ide.eclipse.as.core.ExtensionManager;
import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
+import org.jboss.ide.eclipse.as.core.server.IServerStatePollerType;
import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
-import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.ui.Messages;
@@ -46,7 +46,7 @@
private Combo startPollerCombo, stopPollerCombo;
private Composite pollers;
private String[] startupTypesStrings, shutdownTypesStrings;
- private ServerStatePollerType[] startupTypes, shutdownTypes;
+ private IServerStatePollerType[] startupTypes, shutdownTypes;
private ModifyListener startPollerListener;
private ModifyListener stopPollerListener;
protected ServerAttributeHelper helper;
@@ -157,11 +157,11 @@
private String preChange;
private String attributeKey;
private String defaultValue;
- private ServerStatePollerType[] pollerArray;
+ private IServerStatePollerType[] pollerArray;
private Combo combo;
private ModifyListener listener;
public SetPollerCommand(IServerWorkingCopy server, String name,
- String attributeKey, String defaultValue, ServerStatePollerType[] pollerArray,
+ String attributeKey, String defaultValue, IServerStatePollerType[] pollerArray,
Combo pollerCombo, ModifyListener listener) {
super(server, name);
this.attributeKey = attributeKey;
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/ZippedFilterTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/ZippedFilterTest.java 2012-09-17 04:00:02 UTC (rev 43738)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/ZippedFilterTest.java 2012-09-17 04:12:10 UTC (rev 43739)
@@ -22,8 +22,8 @@
import org.eclipse.wst.server.core.model.IModuleFile;
import org.eclipse.wst.server.core.model.IModuleResource;
import org.eclipse.wst.server.core.model.ModuleDelegate;
-import org.jboss.ide.eclipse.as.core.publishers.patterns.IModulePathFilter;
import org.jboss.ide.eclipse.as.core.publishers.patterns.PublishFilterDirectoryScanner;
+import org.jboss.ide.eclipse.as.core.server.IModulePathFilter;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.test.ASTest;
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/Mock2BehaviourDelegate.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/Mock2BehaviourDelegate.java 2012-09-17 04:00:02 UTC (rev 43738)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/Mock2BehaviourDelegate.java 2012-09-17 04:12:10 UTC (rev 43739)
@@ -1,7 +1,7 @@
package org.jboss.ide.eclipse.as.test.publishing.v2;
import org.eclipse.wst.server.core.IModule;
-import org.jboss.ide.eclipse.as.core.publishers.patterns.IModulePathFilter;
+import org.jboss.ide.eclipse.as.core.server.IModulePathFilter;
import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossBehaviorDelegate;
public class Mock2BehaviourDelegate extends LocalJBossBehaviorDelegate {
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/Mock2FilterTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/Mock2FilterTest.java 2012-09-17 04:00:02 UTC (rev 43738)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/Mock2FilterTest.java 2012-09-17 04:12:10 UTC (rev 43739)
@@ -10,7 +10,7 @@
import org.eclipse.wst.server.core.ServerUtil;
import org.eclipse.wst.server.core.internal.ServerPreferences;
import org.eclipse.wst.server.core.model.IModuleResource;
-import org.jboss.ide.eclipse.as.core.publishers.patterns.IModulePathFilter;
+import org.jboss.ide.eclipse.as.core.server.IModulePathFilter;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.test.util.IOUtil;
Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/PublishingFilterTest.java
===================================================================
--- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/PublishingFilterTest.java 2012-09-17 04:00:02 UTC (rev 43738)
+++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/PublishingFilterTest.java 2012-09-17 04:12:10 UTC (rev 43739)
@@ -22,8 +22,8 @@
import org.eclipse.wst.server.core.model.IModuleResource;
import org.eclipse.wst.server.core.model.ModuleDelegate;
import org.jboss.ide.eclipse.as.core.modules.ResourceModuleResourceUtil;
-import org.jboss.ide.eclipse.as.core.publishers.patterns.IModulePathFilter;
import org.jboss.ide.eclipse.as.core.publishers.patterns.PublishFilterDirectoryScanner;
+import org.jboss.ide.eclipse.as.core.server.IModulePathFilter;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.test.ASTest;
Modified: trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/polling/AbstractTestInternalPoller.java
===================================================================
--- trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/polling/AbstractTestInternalPoller.java 2012-09-17 04:00:02 UTC (rev 43738)
+++ trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/polling/AbstractTestInternalPoller.java 2012-09-17 04:12:10 UTC (rev 43739)
@@ -7,18 +7,18 @@
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2;
-import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
+import org.jboss.ide.eclipse.as.core.server.IServerStatePollerType;
public class AbstractTestInternalPoller implements IServerStatePoller2 {
- private ServerStatePollerType type;
+ private IServerStatePollerType type;
private IServer server;
public AbstractTestInternalPoller() {
}
- public ServerStatePollerType getPollerType() {
+ public IServerStatePollerType getPollerType() {
return type;
}
- public void setPollerType(ServerStatePollerType type) {
+ public void setPollerType(IServerStatePollerType type) {
this.type = type;
}
public void beginPolling(IServer server, boolean expectedState)
Modified: trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/polling/DummyYesOrNoPoller.java
===================================================================
--- trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/polling/DummyYesOrNoPoller.java 2012-09-17 04:00:02 UTC (rev 43738)
+++ trunk/as/tests/org.jboss.tools.as.test.core/src/org/jboss/tools/as/test/core/polling/DummyYesOrNoPoller.java 2012-09-17 04:12:10 UTC (rev 43739)
@@ -6,18 +6,18 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.server.IServerStatePoller2;
-import org.jboss.ide.eclipse.as.core.server.internal.ServerStatePollerType;
+import org.jboss.ide.eclipse.as.core.server.IServerStatePollerType;
public class DummyYesOrNoPoller implements IServerStatePoller2 {
- private ServerStatePollerType type;
- public ServerStatePollerType getPollerType() {
+ private IServerStatePollerType type;
+ public IServerStatePollerType getPollerType() {
return type;
}
public IStatus getCurrentStateSynchronous(IServer server) {
// TODO Auto-generated method stub
return null;
}
- public void setPollerType(ServerStatePollerType type) {
+ public void setPollerType(IServerStatePollerType type) {
this.type = type;
}
public void beginPolling(IServer server, boolean expectedState)
13 years, 6 months
- 1
- 0