[jbosstools-commits] JBoss Tools SVN: r42683 - in trunk/as/plugins: org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules and 1 other directories.

Author: rob.stryker(a)jboss.com Date: 2012-07-24 00:09:04 -0400 (Tue, 24 Jul 2012) New Revision: 42683 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/WorkspaceFilesetVirtualComponent.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java 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/util/DeploymentPreferenceLoader.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/ServerCreationUtils.java Log: trivial change to liberalize parameter from IServer to superinterface IServerAttributes Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/WorkspaceFilesetVirtualComponent.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/WorkspaceFilesetVirtualComponent.java 2012-07-24 04:04:40 UTC (rev 42682) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/WorkspaceFilesetVirtualComponent.java 2012-07-24 04:09:04 UTC (rev 42683) @@ -10,6 +10,10 @@ ******************************************************************************/ package org.jboss.ide.eclipse.archives.webtools.filesets.vcf; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; + import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -19,8 +23,8 @@ import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory; +import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory.DirectoryScannerExtension; import org.jboss.ide.eclipse.archives.core.model.IArchiveModelRootNode; -import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory.DirectoryScannerExtension; import org.jboss.ide.eclipse.as.wtp.core.util.ResourceFilter; import org.jboss.ide.eclipse.as.wtp.core.util.ResourceListVirtualFolder; import org.jboss.ide.eclipse.as.wtp.core.vcf.AbstractFilesetVirtualComponent; @@ -96,12 +100,33 @@ scanner = DirectoryScannerFactory.createDirectoryScanner( rootFolderPath, new Path(""), //$NON-NLS-1$ includes, excludes, getProject().getName(), true, - IArchiveModelRootNode.DESCRIPTOR_VERSION_1_3, false); + IArchiveModelRootNode.DESCRIPTOR_VERSION_1_3, true); } public boolean accepts(IResource resource) { - boolean b = scanner.couldBeIncluded(resource.getFullPath().toString(), true); - return b; + String absolutePath = resource.getLocation().toFile().getAbsolutePath(); + ArrayList<DirectoryScannerExtension.FileWrapper> sum = getAllMatches(absolutePath); + if( sum.size() > 0 ) { + DirectoryScannerExtension.FileWrapper tmp; + Iterator<DirectoryScannerExtension.FileWrapper> i = sum.iterator(); + while(i.hasNext()) { + tmp = i.next(); + if( tmp.getWrapperPath().equals(resource.getFullPath())) + return true; + } + } + return false; } + private ArrayList<DirectoryScannerExtension.FileWrapper> getAllMatches(String absolutePath) { + HashMap<String, ArrayList<DirectoryScannerExtension.FileWrapper>> matchedFiles = scanner.getMatchedMap(); + HashMap<String, ArrayList<DirectoryScannerExtension.FileWrapper>> requiredFolders = scanner.getRequiredFolderMap(); + ArrayList<DirectoryScannerExtension.FileWrapper> sum = new ArrayList<DirectoryScannerExtension.FileWrapper>(); + + if( matchedFiles.get(absolutePath) != null ) + sum.addAll(matchedFiles.get(absolutePath)); + if( requiredFolders.get(absolutePath) != null ) + sum.addAll(requiredFolders.get(absolutePath)); + return sum; + } } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java 2012-07-24 04:04:40 UTC (rev 42682) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/AltMethodZippedJSTPublisher.java 2012-07-24 04:09:04 UTC (rev 42683) @@ -86,7 +86,8 @@ String name = sourcePath.lastSegment(); IStatus result = null; - DeploymentMarkerUtils.removeDeployFailedMarker(method, server, destination, monitor); + if( DeploymentMarkerUtils.supportsJBoss7MarkerDeployment(server) ) + DeploymentMarkerUtils.removeDeployFailedMarker(method, server, destination, monitor); if(publishType == IJBossServerPublisher.REMOVE_PUBLISH) { result = removeRemoteDeployment(sourcePath, destination.removeLastSegments(1), name, monitor); @@ -127,7 +128,7 @@ // Locally zip it up into the remote tmp folder IStatus result = super.publishModule(method, server, module, publishType, delta, monitor); - if( result.isOK() ) { + if( result.isOK() && requiresTransfer()) { // It seems the superclass already transfers it upstream for as7 :| result = remoteFullPublish(sourcePath, destination.removeLastSegments(1), name, AbstractServerToolsPublisher.getSubMon(monitor, 150)); } 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-07-24 04:04:40 UTC (rev 42682) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2012-07-24 04:09:04 UTC (rev 42683) @@ -36,6 +36,7 @@ public class WTPZippedPublisher implements IJBossServerPublisher { private int moduleState = IServer.PUBLISH_STATE_NONE; + private boolean requiresTransfer = true; public boolean accepts(String method, IServer server, IModule[] module) { IDeployableServer ds = ServerConverter.getDeployableServer(server); @@ -45,6 +46,9 @@ public int getPublishState() { return moduleState; } + public boolean requiresTransfer() { + return requiresTransfer; + } protected String getDeployRoot(IModule[] module, IDeployableServer ds) { return PublishUtil.getDeployRootFolder( @@ -65,9 +69,11 @@ return null; if( DeploymentMarkerUtils.supportsJBoss7MarkerDeployment(server)) { + requiresTransfer = false; status = handleJBoss7Deployment(method, server, module, publishType, delta, monitor); } else { Trace.trace(Trace.STRING_FINER, "Using as<=6 publishModule logic in WTPZippedPublisher for module " + module[module.length-1].getName() ); //$NON-NLS-1$ + requiresTransfer = true; IDeployableServer ds = ServerConverter.getDeployableServer(server); String deployRoot = getDeployRoot(module, ds); LocalZippedPublisherUtil util = new LocalZippedPublisherUtil(); 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-07-24 04:04:40 UTC (rev 42682) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/DeploymentPreferenceLoader.java 2012-07-24 04:09:04 UTC (rev 42683) @@ -79,7 +79,7 @@ return null; } - public static DeploymentPreferences loadPreferencesFromServer(IServer server) { + public static DeploymentPreferences loadPreferencesFromServer(IServerAttributes server) { String xml = ((Server)server).getAttribute(DEPLOYMENT_PREFERENCES_KEY, (String)null); ByteArrayInputStream bis = null; if( xml != null ) { @@ -188,17 +188,23 @@ } public DeploymentModulePrefs getModulePrefs(IModule module) { - return children.get(module.getId()); + return getModulePrefs(module.getId()); } + public DeploymentModulePrefs getModulePrefs(String id) { + return children.get(id); + } public DeploymentModulePrefs getOrCreateModulePrefs(IModule module) { - if( children.get(module.getId()) == null ) { + return getOrCreateModulePrefs(module.getId()); + } + public DeploymentModulePrefs getOrCreateModulePrefs(String id) { + if( children.get(id) == null ) { IMemento childMemento = memento.createChild("module"); //$NON-NLS-1$ - childMemento.putString("id", module.getId()); //$NON-NLS-1$ - children.put(module.getId(), - new DeploymentModulePrefs(module.getId(), + childMemento.putString("id", id); //$NON-NLS-1$ + children.put(id, + new DeploymentModulePrefs(id, childMemento)); } - return children.get(module.getId()); + return children.get(id); } public String getProperty(String key) { 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-07-24 04:04:40 UTC (rev 42682) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerConverter.java 2012-07-24 04:09:04 UTC (rev 42683) @@ -104,7 +104,7 @@ return jbServer; } - public static IDeployableServer getDeployableServer(IServer server) { + public static IDeployableServer getDeployableServer(IServerAttributes server) { if (server == null) { return null; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java 2012-07-24 04:04:40 UTC (rev 42682) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/ServerCreationUtils.java 2012-07-24 04:09:04 UTC (rev 42683) @@ -23,6 +23,7 @@ import org.eclipse.wst.server.core.ServerCore; import org.eclipse.wst.server.core.ServerUtil; import org.eclipse.wst.server.core.internal.RuntimeWorkingCopy; +import org.eclipse.wst.server.core.internal.Server; import org.eclipse.wst.server.core.internal.ServerWorkingCopy; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; @@ -42,6 +43,7 @@ swc.setRuntime(runtime); swc.setAttribute(DeployableServer.DEPLOY_DIRECTORY, deployLocation); swc.setAttribute(DeployableServer.TEMP_DEPLOY_DIRECTORY, tempDeployLocation); + swc.setAttribute(Server.PROP_AUTO_PUBLISH_SETTING, Server.AUTO_PUBLISH_DISABLE); IServer server = swc.save(true, null); return server; }