Author: rob.stryker(a)jboss.com Date: 2008-05-29 02:58:32 -0400 (Thu, 29 May 2008) New Revision: 8414 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ArchivesBuildListener.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/DataSourceXmlDeployer.java Log: JBIDE-2267 - removing useless api's Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ArchivesBuildListener.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ArchivesBuildListener.java 2008-05-29 02:16:41 UTC (rev 8413) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ArchivesBuildListener.java 2008-05-29 06:58:32 UTC (rev 8414) @@ -23,22 +23,25 @@ import java.util.ArrayList; +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.Status; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.IServerWorkingCopy; import org.eclipse.wst.server.core.ServerCore; import org.eclipse.wst.server.core.internal.ModuleFactory; import org.eclipse.wst.server.core.internal.ServerPlugin; -import org.eclipse.wst.server.core.model.ServerBehaviourDelegate; import org.jboss.ide.eclipse.archives.core.model.ArchivesModel; import org.jboss.ide.eclipse.archives.core.model.IArchive; import org.jboss.ide.eclipse.archives.core.model.IArchiveBuildListener; import org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet; import org.jboss.ide.eclipse.archives.core.model.IArchiveModelListener; import org.jboss.ide.eclipse.archives.core.model.IArchiveNodeDelta; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.modules.PackageModuleFactory.PackagedModuleDelegate; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; @@ -92,10 +95,24 @@ DeployableServerBehavior[] serverBehaviors = ArchivesBuildListener.getServers(servers); if( serverBehaviors != null ) { for( int i = 0; i < serverBehaviors.length; i++ ) { - serverBehaviors[i].publishOneModule(publishType, module, ServerBehaviourDelegate.CHANGED, new NullProgressMonitor()); + publish(serverBehaviors[i].getServer(), publishType, module ); } } } + + protected static IStatus publish(IServer server, int publishType, IModule[] module ) { + try { + IServerWorkingCopy copy = server.createWorkingCopy(); + copy.modifyModules(module, new IModule[0], new NullProgressMonitor()); + IServer saved = copy.save(false, new NullProgressMonitor()); + saved.publish(IServer.PUBLISH_INCREMENTAL, new NullProgressMonitor()); + } catch( CoreException ce ) { + return new Status(Status.ERROR, JBossServerCorePlugin.PLUGIN_ID, + "Cannot deploy file " + module[0].getName(), ce); + } + return Status.OK_STATUS; + + } protected static IModule[] getModule(IArchive node) { ModuleFactory factory = ServerPlugin.findModuleFactory("org.jboss.ide.eclipse.as.core.PackageModuleFactory"); IModule mod = factory.findModule(PackageModuleFactory.getID(node), new NullProgressMonitor()); 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 2008-05-29 02:16:41 UTC (rev 8413) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2008-05-29 06:58:32 UTC (rev 8414) @@ -21,30 +21,13 @@ */ package org.jboss.ide.eclipse.as.core.server.internal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.MultiStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.wst.common.componentcore.ModuleCoreNature; import org.eclipse.wst.server.core.IModule; 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.internal.IModuleVisitor; -import org.eclipse.wst.server.core.internal.ProgressUtil; -import org.eclipse.wst.server.core.internal.Server; -import org.eclipse.wst.server.core.internal.ServerPlugin; -import org.eclipse.wst.server.core.model.PublishOperation; import org.eclipse.wst.server.core.model.ServerBehaviourDelegate; -import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.extensions.events.EventLogModel; import org.jboss.ide.eclipse.as.core.extensions.events.EventLogModel.EventLogTreeItem; import org.jboss.ide.eclipse.as.core.modules.PackageModuleFactory; @@ -180,99 +163,4 @@ public void setServerStopping() { setServerState(IServer.STATE_STOPPING); } - - - // Basically stolen from RunOnServerActionDelegate - @Deprecated - public IStatus publishOneModule(int kind, IModule[] module, int deltaKind, IProgressMonitor monitor) { - return publishOneModule(module, kind, deltaKind, true, monitor); - } - - /* - * hack for eclipse bug 169570 - */ - public IStatus publishOneModule(IModule[] module, int kind, int deltaKind, boolean recurse, IProgressMonitor monitor) { - try { - - // add it to the server first - if( module.length == 1 ) - addAndRemoveModules(module, deltaKind); - - ArrayList moduleList = new ArrayList(); - ArrayList deltaKindList = new ArrayList(); - fillPublishOneModuleLists(module, moduleList, deltaKindList, deltaKind, recurse); - - ((Server)getServer()).getServerPublishInfo().startCaching(); - - - PublishOperation[] tasks = getTasks(kind, moduleList, deltaKindList); - MultiStatus tempMulti = new MultiStatus(ServerPlugin.PLUGIN_ID, 0, "", null); - publishStart(ProgressUtil.getSubMonitorFor(monitor, 1000)); - performTasks(tasks, monitor); - publishServer(kind, ProgressUtil.getSubMonitorFor(monitor, 1000)); - publishModules(kind, moduleList, deltaKindList, tempMulti, monitor); - publishFinish(ProgressUtil.getSubMonitorFor(monitor, 500)); - - final List modules2 = new ArrayList(); - ((Server)getServer()).visit(new IModuleVisitor() { - public boolean visit(IModule[] module) { - if (((Server)getServer()).getModulePublishState(module) == IServer.PUBLISH_STATE_NONE) - ((Server)getServer()).getServerPublishInfo().fill(module); - - modules2.add(module); - return true; - } - }, monitor); - - ((Server)getServer()).getServerPublishInfo().removeDeletedModulePublishInfo(((Server)getServer()), modules2); - ((Server)getServer()).getServerPublishInfo().clearCache(); - ((Server)getServer()).getServerPublishInfo().save(); - - return Status.OK_STATUS; - - } catch( CoreException e ) { - IStatus s = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, - "Unexpected Exception publishing one module: ", e); - JBossServerCorePlugin.getDefault().getLog().log(s); - return s; - } - } - - protected void fillPublishOneModuleLists(IModule[] module, ArrayList moduleList, ArrayList deltaKindList, int deltaKind, boolean recurse) { - moduleList.add(module); - deltaKindList.add(new Integer(deltaKind)); - if( recurse ) { - ArrayList tmp = new ArrayList(); - IModule[] children = getServer().getChildModules(module, new NullProgressMonitor()); - if( children != null ) { - for( int i = 0; i < children.length; i++ ) { - tmp = new ArrayList(); - tmp.addAll(Arrays.asList(module)); - tmp.add(children[i]); - fillPublishOneModuleLists((IModule[]) tmp.toArray(new IModule[tmp.size()]), moduleList, deltaKindList, deltaKind, recurse); - } - } - } - - // if removing, we must remove child first - if( deltaKind == ServerBehaviourDelegate.REMOVED ) { - Collections.reverse(moduleList); - Collections.reverse(deltaKindList); - } - } - - protected void addAndRemoveModules(IModule[] module, int deltaKind) throws CoreException { - if( getServer() == null ) return; - boolean contains = ServerUtil.containsModule(getServer(), module[0], new NullProgressMonitor()); - - if( !contains && (deltaKind == ServerBehaviourDelegate.ADDED) || (deltaKind == ServerBehaviourDelegate.CHANGED)) { - IServerWorkingCopy wc = getServer().createWorkingCopy(); - ServerUtil.modifyModules(wc, module, new IModule[0], new NullProgressMonitor()); - wc.save(false, new NullProgressMonitor()); - } else if( contains && deltaKind == ServerBehaviourDelegate.REMOVED) { - IServerWorkingCopy wc = getServer().createWorkingCopy(); - ServerUtil.modifyModules(wc, new IModule[0], module, new NullProgressMonitor()); - wc.save(false, new NullProgressMonitor()); - } - } } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/DataSourceXmlDeployer.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/DataSourceXmlDeployer.java 2008-05-29 02:16:41 UTC (rev 8413) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/DataSourceXmlDeployer.java 2008-05-29 06:58:32 UTC (rev 8414) @@ -10,16 +10,21 @@ ******************************************************************************/ package org.jboss.tools.seam.internal.core.project.facet; +import java.util.ArrayList; + import org.eclipse.core.resources.IProject; +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.core.runtime.jobs.Job; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.model.ServerBehaviourDelegate; +import org.eclipse.wst.server.core.IServerWorkingCopy; +import org.eclipse.wst.server.core.IServer.IOperationListener; import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; import org.jboss.tools.seam.core.SeamCoreMessages; @@ -70,14 +75,17 @@ IPath append = projectPath.append(deploy); //$NON-NLS-1$ if (SingleDeployableFactory.makeDeployable(append)) { - - IModule module = SingleDeployableFactory.findModule(append); - - // custom API to deploy / publish only one module. - IStatus t = deployer.publishOneModule(IServer.PUBLISH_FULL, - new IModule[] { module }, ServerBehaviourDelegate.ADDED, - monitor); - return t; + try { + IModule module = SingleDeployableFactory.findModule(append); + IServerWorkingCopy copy = s.createWorkingCopy(); + copy.modifyModules(new IModule[]{module}, new IModule[0], new NullProgressMonitor()); + IServer saved = copy.save(false, new NullProgressMonitor()); + saved.publish(IServer.PUBLISH_INCREMENTAL, new NullProgressMonitor()); + } catch( CoreException ce ) { + return new Status(Status.WARNING, SeamCorePlugin.PLUGIN_ID, + SeamCoreMessages.DATA_SOURCE_XML_DEPLOYER_COULD_NOT_DEPLOY_DATASOURCE + append, ce); + } + return Status.OK_STATUS; } else { return new Status(Status.WARNING, SeamCorePlugin.PLUGIN_ID, SeamCoreMessages.DATA_SOURCE_XML_DEPLOYER_COULD_NOT_DEPLOY_DATASOURCE + append); //$NON-NLS-1$