Author: rob.stryker(a)jboss.com Date: 2012-02-01 02:10:22 -0500 (Wed, 01 Feb 2012) New Revision: 38358 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IPublishCopyCallbackHandler.java Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/ILaunchConfigConfigurator.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.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/JSTPublisherXMLToucher.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/LocalPublishMethod.java 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/internal/DelegatingServerBehavior.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/DeploymentMarkerUtils.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.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.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/RSELaunchConfigurator.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.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigTests.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java Log: JBIDE-10769 - moved an inner-class interface out to its own class. Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2012-02-01 06:57:47 UTC (rev 38357) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2012-02-01 07:10:22 UTC (rev 38358) @@ -28,8 +28,8 @@ 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.IPublishCopyCallbackHandler; import org.jboss.ide.eclipse.as.core.server.internal.v7.DeploymentMarkerUtils; -import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; 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/publishers/AbstractServerToolsPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2012-02-01 06:57:47 UTC (rev 38357) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/AbstractServerToolsPublisher.java 2012-02-01 07:10:22 UTC (rev 38358) @@ -40,9 +40,9 @@ 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.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.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JSTPublisherXMLToucher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JSTPublisherXMLToucher.java 2012-02-01 06:57:47 UTC (rev 38357) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JSTPublisherXMLToucher.java 2012-02-01 07:10:22 UTC (rev 38358) @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.wst.server.core.IModule; -import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler; +import org.jboss.ide.eclipse.as.core.server.IPublishCopyCallbackHandler; import org.jboss.ide.eclipse.as.core.util.FileUtil; import org.jboss.ide.eclipse.as.core.util.IConstants; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/LocalPublishMethod.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/LocalPublishMethod.java 2012-02-01 06:57:47 UTC (rev 38357) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/LocalPublishMethod.java 2012-02-01 07:10:22 UTC (rev 38358) @@ -14,8 +14,8 @@ import org.eclipse.core.runtime.Path; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; +import org.jboss.ide.eclipse.as.core.server.IPublishCopyCallbackHandler; import org.jboss.ide.eclipse.as.core.server.xpl.LocalCopyCallback; -import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler; 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/IJBossServerPublishMethod.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublishMethod.java 2012-02-01 06:57:47 UTC (rev 38357) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublishMethod.java 2012-02-01 07:10:22 UTC (rev 38358) @@ -16,7 +16,6 @@ import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; -import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler; public interface IJBossServerPublishMethod { // public IJBossServerPublishMethodType getPublishMethodType(); Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IPublishCopyCallbackHandler.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IPublishCopyCallbackHandler.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IPublishCopyCallbackHandler.java 2012-02-01 07:10:22 UTC (rev 38358) @@ -0,0 +1,70 @@ +package org.jboss.ide.eclipse.as.core.server; + +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.wst.server.core.model.IModuleFile; + +public interface IPublishCopyCallbackHandler { + /** + * Copy the file (mf) to a file related to the relative path (path). + * + * For example if this path is "/someFolder/file.txt" you may want to + * copy the file to /home/someone/deployfolder/project.war/someFolder/file.txt + * + * @param mf + * @param path + * @param monitor + * @return a list of error status objects. + * @throws CoreException + */ + public IStatus[] copyFile(IModuleFile mf, IPath path, IProgressMonitor monitor) throws CoreException; + + /** + * Delete a directory for this path relative to where the module belongs. + * For example if this path is "/someFolder" you may want to + * delete the folder /home/someone/deployfolder/project.war/someFolder + * + * @param dir + * @param monitor + * @return a list of error status objects. + */ + public IStatus[] deleteResource(IPath path, IProgressMonitor monitor) throws CoreException ; + + + /** + * Return true if the given path exists and is a file. + * Return false if hte given path does not exist, or, is a folder. + * + * @param path + * @param monitor + * @return + * @throws CoreException + */ + public boolean isFile(IPath path, IProgressMonitor monitor) throws CoreException; + + /** + * Make a directory for this path relative to where the module belongs. + * For example if this path is "/someFolder" you may want to + * make the folder /home/someone/deployfolder/project.war/someFolder + * + * @param dir + * @param monitor + * @return a list of error status objects. + */ + public IStatus[] makeDirectoryIfRequired(IPath dir, IProgressMonitor monitor) throws CoreException; + + /** + * Verify whether any changes made require a module restart + * @return + */ + public boolean shouldRestartModule(); + + /** + * For touching / updating timestamp + * @param path + * @return + */ + public IStatus[] touchResource(IPath path); +} \ No newline at end of file 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-02-01 06:57:47 UTC (rev 38357) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DelegatingServerBehavior.java 2012-02-01 07:10:22 UTC (rev 38358) @@ -29,10 +29,10 @@ 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.IPublishCopyCallbackHandler; 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.launch.DelegatingStartLaunchConfiguration; -import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler; import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities; 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-02-01 06:57:47 UTC (rev 38357) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/AbstractLaunchConfigurator.java 2012-02-01 07:10:22 UTC (rev 38358) @@ -16,6 +16,7 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.wst.server.core.IServer; 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; import org.jboss.ide.eclipse.as.core.util.ServerConverter; Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/ILaunchConfigConfigurator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/ILaunchConfigConfigurator.java 2012-02-01 06:57:47 UTC (rev 38357) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/configuration/ILaunchConfigConfigurator.java 2012-02-01 07:10:22 UTC (rev 38358) @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.internal.launch.configuration; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; - -/** - * @author André Dietisheim - */ -public interface ILaunchConfigConfigurator { - - public abstract void configure(ILaunchConfigurationWorkingCopy launchConfig) throws CoreException; - -} \ No newline at end of file Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java 2012-02-01 06:57:47 UTC (rev 38357) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/DeploymentMarkerUtils.java 2012-02-01 07:10:22 UTC (rev 38358) @@ -33,7 +33,7 @@ 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.IJBossServerPublishMethod; -import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler; +import org.jboss.ide.eclipse.as.core.server.IPublishCopyCallbackHandler; 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/internal/v7/JBoss7JSTPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java 2012-02-01 06:57:47 UTC (rev 38357) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7JSTPublisher.java 2012-02-01 07:10:22 UTC (rev 38358) @@ -24,7 +24,7 @@ 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.xpl.PublishCopyUtil.IPublishCopyCallbackHandler; +import org.jboss.ide.eclipse.as.core.server.IPublishCopyCallbackHandler; import org.jboss.ide.eclipse.as.core.util.ServerConverter; public class JBoss7JSTPublisher extends AbstractServerToolsPublisher { 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-02-01 06:57:47 UTC (rev 38357) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/LocalCopyCallback.java 2012-02-01 07:10:22 UTC (rev 38358) @@ -25,8 +25,8 @@ 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.IPublishCopyCallbackHandler; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; -import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler; import org.jboss.ide.eclipse.as.core.util.FileUtil; import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.core.util.StreamUtils; 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-02-01 06:57:47 UTC (rev 38357) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java 2012-02-01 07:10:22 UTC (rev 38358) @@ -33,6 +33,7 @@ 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; /** * Utility class with an assortment of useful file methods. * <p> @@ -48,69 +49,6 @@ * @since 2.0 */ public final class PublishCopyUtil { - public interface IPublishCopyCallbackHandler { - /** - * Copy the file (mf) to a file related to the relative path (path). - * - * For example if this path is "/someFolder/file.txt" you may want to - * copy the file to /home/someone/deployfolder/project.war/someFolder/file.txt - * - * @param mf - * @param path - * @param monitor - * @return a list of error status objects. - * @throws CoreException - */ - public IStatus[] copyFile(IModuleFile mf, IPath path, IProgressMonitor monitor) throws CoreException; - - /** - * Delete a directory for this path relative to where the module belongs. - * For example if this path is "/someFolder" you may want to - * delete the folder /home/someone/deployfolder/project.war/someFolder - * - * @param dir - * @param monitor - * @return a list of error status objects. - */ - public IStatus[] deleteResource(IPath path, IProgressMonitor monitor) throws CoreException ; - - - /** - * Return true if the given path exists and is a file. - * Return false if hte given path does not exist, or, is a folder. - * - * @param path - * @param monitor - * @return - * @throws CoreException - */ - public boolean isFile(IPath path, IProgressMonitor monitor) throws CoreException; - - /** - * Make a directory for this path relative to where the module belongs. - * For example if this path is "/someFolder" you may want to - * make the folder /home/someone/deployfolder/project.war/someFolder - * - * @param dir - * @param monitor - * @return a list of error status objects. - */ - public IStatus[] makeDirectoryIfRequired(IPath dir, IProgressMonitor monitor) throws CoreException; - - /** - * Verify whether any changes made require a module restart - * @return - */ - public boolean shouldRestartModule(); - - /** - * For touching / updating timestamp - * @param path - * @return - */ - public IStatus[] touchResource(IPath path); - } - private static final IStatus[] EMPTY_STATUS = new IStatus[0]; private IPublishCopyCallbackHandler handler; public PublishCopyUtil(IPublishCopyCallbackHandler handler) { 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-02-01 06:57:47 UTC (rev 38357) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java 2012-02-01 07:10:22 UTC (rev 38358) @@ -16,8 +16,8 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.wst.server.core.IServer; 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; -import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.ILaunchConfigConfigurator; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants; import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants; import org.jboss.ide.eclipse.as.core.util.ServerConverter; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigurator.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigurator.java 2012-02-01 06:57:47 UTC (rev 38357) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchConfigurator.java 2012-02-01 07:10:22 UTC (rev 38358) @@ -12,7 +12,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; -import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.ILaunchConfigConfigurator; +import org.jboss.ide.eclipse.as.core.server.ILaunchConfigConfigurator; /** * @author André Dietisheim 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-02-01 06:57:47 UTC (rev 38357) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2012-02-01 07:10:22 UTC (rev 38358) @@ -30,10 +30,10 @@ import org.jboss.ide.eclipse.as.core.publishers.AbstractPublishMethod; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; 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; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; -import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler; 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; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java 2012-02-01 06:57:47 UTC (rev 38357) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSERemotePublishHandler.java 2012-02-01 07:10:22 UTC (rev 38358) @@ -29,9 +29,9 @@ 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.PublishUtil; +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.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler; import org.jboss.ide.eclipse.as.core.util.ServerConverter; public class RSERemotePublishHandler implements IPublishCopyCallbackHandler { Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigTests.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigTests.java 2012-02-01 06:57:47 UTC (rev 38357) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/launch/LaunchConfigTests.java 2012-02-01 07:10:22 UTC (rev 38358) @@ -18,9 +18,9 @@ import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.wst.server.core.IServer; 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; import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.AbstractStartLaunchConfigurator; -import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.ILaunchConfigConfigurator; import org.jboss.ide.eclipse.as.core.server.internal.launch.configuration.JBossLaunchConfigProperties; import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils; Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java 2012-02-01 06:57:47 UTC (rev 38357) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/MockPublishMethod.java 2012-02-01 07:10:22 UTC (rev 38358) @@ -22,7 +22,7 @@ import org.eclipse.wst.server.core.model.IModuleFile; import org.jboss.ide.eclipse.as.core.publishers.AbstractPublishMethod; import org.jboss.ide.eclipse.as.core.publishers.PublishUtil; -import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler; +import org.jboss.ide.eclipse.as.core.server.IPublishCopyCallbackHandler; public class MockPublishMethod extends AbstractPublishMethod {