[jbosstools-commits] JBoss Tools SVN: r43683 - in trunk: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers and 7 other directories.

Author: rob.stryker(a)jboss.com Date: 2012-09-14 04:23:17 -0400 (Fri, 14 Sep 2012) New Revision: 43683 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.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/server/internal/DeployableServerBehavior.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/LocalCopyCallback.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.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/src/org/jboss/tools/maven/sourcelookup/containers/JBossSourceContainer.java trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.ui/src/org/jboss/tools/maven/sourcelookup/ui/browsers/JBossSourceContainerDialog.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 prep work Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java 2012-09-14 08:15:04 UTC (rev 43682) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/events/IEventCodes.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.core.extensions.events; -import org.eclipse.core.runtime.IStatus; public interface IEventCodes { 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-14 08:15:04 UTC (rev 43682) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -24,7 +24,6 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.osgi.util.NLS; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; @@ -45,6 +44,7 @@ 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; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities; @@ -80,19 +80,8 @@ this.publishState = state; } - public static class CustomSubProgress extends SubProgressMonitor { - public CustomSubProgress(IProgressMonitor monitor, int ticks, int style) { - super(monitor, ticks, style); - } - public void beginTask(String name, int totalWork) { - super.beginTask(null, totalWork); - setTaskName(name); - } - } - public static IProgressMonitor getSubMon(IProgressMonitor parent, int ticks) { - IProgressMonitor subMon = new CustomSubProgress(parent, ticks, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK); - return subMon; + return ProgressMonitorUtil.getSubMon(parent, ticks); } public IStatus publishModule(IJBossServerPublishMethod method, 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-14 08:15:04 UTC (rev 43682) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -75,7 +75,7 @@ */ public static String getDeployRootFolder(IModule[] moduleTree, IDeployableServer server, String defaultFolder, String moduleProperty) { - return getDeployRootFolder(moduleTree, LocalPublishMethod.LOCAL_PUBLISH_METHOD, + return getDeployRootFolder(moduleTree, "local", //$NON-NLS-1$ server, defaultFolder, moduleProperty); } 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-14 08:15:04 UTC (rev 43682) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -31,6 +31,7 @@ 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; @@ -41,7 +42,8 @@ /** * @author Rob Stryker */ -public class DeployableServerBehavior extends ServerBehaviourDelegate { +public class DeployableServerBehavior extends ServerBehaviourDelegate + implements IDeployableServerBehaviour { public DeployableServerBehavior() { } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2012-09-14 08:15:04 UTC (rev 43682) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -45,6 +45,7 @@ import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathQuery; 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.IJBossServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossExtendedProperties; import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.ServerExtendedProperties; @@ -60,7 +61,7 @@ * */ public class JBossServer extends DeployableServer - implements IDeployableServer, IURLProvider { + implements IJBossServer, IURLProvider { public static final String AUTOMATICALLY_UPDATE_LAUNCH = "org.jboss.ide.eclipse.as.core.server.internal.AUTOMATICALLY_UPDATE_LAUNCH"; //$NON-NLS-1$ Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/LocalCopyCallback.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/LocalCopyCallback.java 2012-09-14 08:15:04 UTC (rev 43682) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/LocalCopyCallback.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -23,11 +23,12 @@ import org.eclipse.wst.server.core.internal.ServerPlugin; import org.eclipse.wst.server.core.model.IModuleFile; import org.jboss.ide.eclipse.as.core.extensions.events.IEventCodes; -import org.jboss.ide.eclipse.as.core.publishers.AbstractServerToolsPublisher; 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.IPublishCopyCallbackHandler; -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.ProgressMonitorUtil; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.core.util.StreamUtils; @@ -54,8 +55,8 @@ public IStatus[] copyFile(IModuleFile mf, IPath relativePath, IProgressMonitor monitor) throws CoreException { monitor.beginTask("Copying " + relativePath.toString(), 100); //$NON-NLS-1$ File file = PublishUtil.getFile(mf); - DeployableServerBehavior beh = ServerConverter.getDeployableServerBehavior(server); - shouldRestartModule |= beh.changedFileRequiresModuleRestart(mf); + IDeployableServerBehaviour beh = ServerConverter.getDeployableServerBehavior(server); + shouldRestartModule |= beh != null && beh.changedFileRequiresModuleRestart(mf); if( file != null ) { if( !file.exists()) { return new IStatus[] {new Status(IStatus.ERROR, ServerPlugin.PLUGIN_ID, IEventCodes.JST_PUB_FAIL, @@ -215,12 +216,15 @@ File f = null; if( tmpDeployRootFolder != null ) { f = tmpDeployRootFolder.toFile(); - } else if( server != null ){ - String path = ServerConverter.getDeployableServer(server).getTempDeployFolder(); - f = new File(path); - } else { + } else if( server == null ) { return tempDir; + } + IDeployableServer ds = ServerConverter.getDeployableServer(server); + if( ds == null ) { + return tempDir; } + String path = ds.getTempDeployFolder(); + f = new File(path); if( !f.exists() ) f.mkdirs(); return f; @@ -274,7 +278,7 @@ } else if (current.isDirectory()) { monitor.subTask(NLS.bind(Messages.deletingTask, new String[] {current.getAbsolutePath()})); IStatus[] stat = deleteDirectory(current, - AbstractServerToolsPublisher.getSubMon(monitor, 10)); + ProgressMonitorUtil.getSubMon(monitor, 10)); if (stat != null && stat.length > 0) { deleteCurrent = false; PublishCopyUtil.addArrayToList(status, stat); 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-14 08:15:04 UTC (rev 43682) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -22,7 +22,6 @@ import org.eclipse.core.runtime.Status; import org.eclipse.osgi.util.NLS; import org.eclipse.wst.server.core.internal.Messages; -import org.eclipse.wst.server.core.internal.ProgressUtil; import org.eclipse.wst.server.core.internal.ServerPlugin; import org.eclipse.wst.server.core.model.IModuleFile; import org.eclipse.wst.server.core.model.IModuleFolder; @@ -31,9 +30,9 @@ 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.AbstractServerToolsPublisher; import org.jboss.ide.eclipse.as.core.publishers.patterns.IModulePathFilter; import org.jboss.ide.eclipse.as.core.server.IPublishCopyCallbackHandler; +import org.jboss.ide.eclipse.as.core.util.ProgressMonitorUtil; /** * Utility class with an assortment of useful file methods. * <p> @@ -92,7 +91,7 @@ if (delta == null) return EMPTY_STATUS; - monitor = ProgressUtil.getMonitorFor(monitor); + monitor = ProgressMonitorUtil.getMonitorFor(monitor); List<IStatus> status = new ArrayList<IStatus>(2); int size2 = delta.length; @@ -192,11 +191,11 @@ */ public IStatus[] initFullPublish(IModuleResource[] resources, IModulePathFilter filter, IProgressMonitor monitor) throws CoreException { int count = ResourceModuleResourceUtil.countMembers(resources); - monitor = ProgressUtil.getMonitorFor(monitor); + monitor = ProgressMonitorUtil.getMonitorFor(monitor); monitor.beginTask("Publishing " + count + " resources", //$NON-NLS-1$ //$NON-NLS-2$ (100 * (count)) + 200); handler.makeDirectoryIfRequired(new Path("/"), //$NON-NLS-1$ - AbstractServerToolsPublisher.getSubMon(monitor, 100)); + ProgressMonitorUtil.getSubMon(monitor, 100)); if( monitor.isCanceled()) return canceledStatus(); IStatus[] results = publishFull(resources, new Path("/"), filter, monitor); //$NON-NLS-1$ @@ -222,7 +221,6 @@ } - @Deprecated protected IStatus[] publishFull(IModuleResource[] resources, IPath relative, IProgressMonitor monitor) throws CoreException { return publishFull(resources, relative, null, monitor); @@ -237,7 +235,7 @@ IModuleResource[] children = folder.members(); if( children.length == 0 ) handler.makeDirectoryIfRequired(folder.getModuleRelativePath().append(folder.getName()), - AbstractServerToolsPublisher.getSubMon(monitor, 5)); + ProgressMonitorUtil.getSubMon(monitor, 5)); else { IStatus[] stat = publishFull(children, path, filter, monitor); addArrayToList(status, stat); @@ -250,7 +248,7 @@ if( stats != null && stats.length > 0 && !stats[0].isOK()) addArrayToList(status, stats); addArrayToList(status, handler.copyFile(mf, path, - AbstractServerToolsPublisher.getSubMon(monitor, 100))); + ProgressMonitorUtil.getSubMon(monitor, 100))); } } return status.toArray(new IStatus[status.size()]); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2012-09-14 08:15:04 UTC (rev 43682) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -13,7 +13,6 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -29,7 +28,6 @@ import org.eclipse.wst.server.core.IServerWorkingCopy; import org.eclipse.wst.server.core.internal.Server; 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.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethodType; import org.jboss.ide.eclipse.as.core.server.internal.BehaviourModel; @@ -65,20 +63,6 @@ return server.getAttribute(IDeployableServer.SERVER_MODE, defaultType); } - @Deprecated - public static DeploymentPreferences loadPreferencesFromFile(IServer server) { - File f = getFile(server); - if( f.exists()) { - try { - InputStream is = new FileInputStream(f); - return new DeploymentPreferences(is); - } catch(IOException ioe) { - // Intentionally fall through and return null - } - } - return null; - } - public static DeploymentPreferences loadPreferencesFromServer(IServerAttributes server) { String xml = ((Server)server).getAttribute(DEPLOYMENT_PREFERENCES_KEY, (String)null); ByteArrayInputStream bis = null; @@ -88,21 +72,10 @@ return new DeploymentPreferences(bis); } - @Deprecated - public static void savePreferences(IServer server, DeploymentPreferences prefs) throws IOException { - File f = getFile(server); - prefs.getMemento().saveToFile(f.getAbsolutePath()); - } - public static void savePreferences(OutputStream os, DeploymentPreferences prefs) throws IOException { prefs.getMemento().save(os); } - protected static File getFile(IServer server) { - IPath loc = ServerUtil.getServerStateLocation(server); - return loc.append("deploymentPreferences.xml").toFile(); //$NON-NLS-1$ - } - public static class DeploymentPreferences { private HashMap<String, DeploymentTypePrefs> children; private XMLMemento memento; @@ -125,8 +98,10 @@ } // prefs are all in "local" now, even for rse stuff. + public static final String LOCAL_PUBLISH_METHOD = "local"; //$NON-NLS-1$ + public DeploymentTypePrefs getOrCreatePreferences() { - return getOrCreatePreferences(LocalPublishMethod.LOCAL_PUBLISH_METHOD); + return getOrCreatePreferences(LOCAL_PUBLISH_METHOD); } public DeploymentTypePrefs getOrCreatePreferences(String deploymentType) { Modified: trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java 2012-09-14 08:15:04 UTC (rev 43682) +++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -21,7 +21,6 @@ import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.internal.core.JavaProject; import org.eclipse.jdt.launching.IVMInstall; import org.eclipse.jdt.launching.JavaRuntime; import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; @@ -46,10 +45,9 @@ import org.eclipse.wst.server.core.internal.ServerPlugin; import org.eclipse.wst.server.core.internal.ServerWorkingCopy; import org.eclipse.wst.server.core.model.IModuleResource; +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.DeployableServer; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; -import org.jboss.tools.test.util.TestProjectProvider; import org.jboss.tools.esb.core.ESBProjectConstant; import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties; import org.jboss.tools.esb.core.facet.JBossClassPathCommand; @@ -57,6 +55,7 @@ import org.jboss.tools.esb.core.runtime.JBossESBRuntime; import org.jboss.tools.esb.core.runtime.JBossRuntimeClassPathInitializer; import org.jboss.tools.esb.core.runtime.JBossRuntimeManager; +import org.jboss.tools.test.util.TestProjectProvider; public class ESBProjectDeploymentTest extends TestCase { private static final String SOAP_HOME_5_0_PROP_NAME = "jbosstools.test.soap.home.5.0"; @@ -365,7 +364,7 @@ IPath path = new Path(location).append("server").append("default") .append("deploy"); ((ServerWorkingCopy) serverWC).setAttribute( - DeployableServer.DEPLOY_DIRECTORY, path.toOSString()); + IDeployableServer.DEPLOY_DIRECTORY, path.toOSString()); currentServer = serverWC.save(true, new NullProgressMonitor()); } Modified: trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/src/org/jboss/tools/maven/sourcelookup/containers/JBossSourceContainer.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/src/org/jboss/tools/maven/sourcelookup/containers/JBossSourceContainer.java 2012-09-14 08:15:04 UTC (rev 43682) +++ trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.core/src/org/jboss/tools/maven/sourcelookup/containers/JBossSourceContainer.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -43,7 +43,7 @@ import org.jboss.ide.eclipse.as.core.server.bean.JBossServerType; import org.jboss.ide.eclipse.as.core.server.bean.ServerBean; import org.jboss.ide.eclipse.as.core.server.bean.ServerBeanLoader; -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.IJBossRuntimeResourceConstants; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; import org.jboss.ide.eclipse.as.core.util.ServerConverter; @@ -80,7 +80,7 @@ throws CoreException { IServer server = ServerUtil.getServer(configuration); if (server != null) { - JBossServer jbossServer = ServerConverter + IJBossServer jbossServer = ServerConverter .checkedGetJBossServer(server); if (jbossServer != null) { IJBossServerRuntime runtime = jbossServer.getRuntime(); Modified: trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.ui/src/org/jboss/tools/maven/sourcelookup/ui/browsers/JBossSourceContainerDialog.java =================================================================== --- trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.ui/src/org/jboss/tools/maven/sourcelookup/ui/browsers/JBossSourceContainerDialog.java 2012-09-14 08:15:04 UTC (rev 43682) +++ trunk/maven/plugins/org.jboss.tools.maven.sourcelookup.ui/src/org/jboss/tools/maven/sourcelookup/ui/browsers/JBossSourceContainerDialog.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -40,7 +40,7 @@ import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.ServerCore; 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.IJBossServer; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.tools.maven.sourcelookup.ui.SourceLookupUIActivator; @@ -68,7 +68,7 @@ List<IJBossServerRuntime> runtimes = new ArrayList<IJBossServerRuntime>(); if (servers != null) { for (IServer server : servers) { - JBossServer jbossServer = null; + IJBossServer jbossServer = null; try { jbossServer = ServerConverter.checkedGetJBossServer(server); } catch (CoreException e) { 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-14 08:15:04 UTC (rev 43682) +++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/src/org/jboss/tools/ws/creation/core/test/command/AbstractJBossWSGenerationTest.java 2012-09-14 08:23:17 UTC (rev 43683) @@ -20,6 +20,7 @@ import org.eclipse.wst.server.core.IServer; 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.util.IJBossToolingConstants; import org.jboss.ide.eclipse.as.test.ASTest; @@ -149,7 +150,7 @@ protected void undeployWebProject() throws CoreException { IModule[] modules = ServerUtil.getModules(currentServer.getServerType() .getRuntimeType().getModuleTypes()); - JBossServer ds = (JBossServer)currentServer.loadAdapter(JBossServer.class, new NullProgressMonitor()); + ServerDelegate ds = (ServerDelegate)currentServer.loadAdapter(ServerDelegate.class, new NullProgressMonitor()); IServerWorkingCopy serverWC = ds.getServerWorkingCopy(); serverWC.modifyModules(null, modules, null); serverWC.save(true, null).publish(IServer.PUBLISH_FULL, null);