[jbosstools-commits] JBoss Tools SVN: r23513 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers.
Author: dgolovin
Date: 2010-07-16 19:38:36 -0400 (Fri, 16 Jul 2010)
New Revision: 23513
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java
Log:
https://jira.jboss.org/browse/JBIDE-6596 New Seam WAR project has incorrect deployment
artifact structure
isBinaryObject(moduleTree) replaced to module.isBinary()
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2010-07-16
23:37:21 UTC (rev 23512)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2010-07-16
23:38:36 UTC (rev 23513)
@@ -117,12 +117,12 @@
if( !(new Path(module.getName()).segmentCount() > 1 ) && delete)
list.addAll(Arrays.asList(localSafeDelete(deployPath)));
- if( !deployPackaged(moduleTree) && !isBinaryObject(moduleTree)) {
+ if( !deployPackaged(moduleTree) && !j2eeModule.isBinary()) {
LocalCopyCallback handler = new LocalCopyCallback(server.getServer(), deployPath,
tempDeployPath);
PublishCopyUtil util = new PublishCopyUtil(handler);
list.addAll(Arrays.asList(util.publishFull(members, monitor)));
}
- else if( isBinaryObject(moduleTree))
+ else if(j2eeModule.isBinary())
list.addAll(Arrays.asList(copyBinaryModule(moduleTree)));
else
list.addAll(Arrays.asList(packModuleIntoJar(moduleTree[moduleTree.length-1],
deployPath)));
@@ -152,12 +152,13 @@
IStatus[] results = new IStatus[] {};
IPath deployPath = getDeployPath(moduleTree, server);
IPath tempDeployPath = getTempDeployFolder(moduleTree, server);
+ IJ2EEModule j2eeModule = (IJ2EEModule) module.loadAdapter(IJ2EEModule.class, null);
LocalCopyCallback handler = null;
- if( !deployPackaged(moduleTree) && !isBinaryObject(moduleTree)) {
+ if( !deployPackaged(moduleTree) && !j2eeModule.isBinary()) {
handler = new LocalCopyCallback(server.getServer(), deployPath, tempDeployPath);
results = new PublishCopyUtil(handler).publishDelta(delta, monitor);
} else if( delta.length > 0 ) {
- if( isBinaryObject(moduleTree))
+ if( j2eeModule.isBinary())
results = copyBinaryModule(moduleTree);
else
results = packModuleIntoJar(moduleTree[moduleTree.length-1], deployPath);
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 2010-07-16
23:37:21 UTC (rev 23512)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2010-07-16
23:38:36 UTC (rev 23513)
@@ -129,9 +129,6 @@
String type, modName, name, uri, suffixedName;
for( int i = 0; i < moduleTree.length; i++ ) {
IJ2EEModule j2eeModule = (IJ2EEModule) moduleTree[i].loadAdapter(IJ2EEModule.class,
null);
- if (j2eeModule != null && j2eeModule.isBinary()) {
- continue;
- }
type = moduleTree[i].getModuleType().getId();
modName = moduleTree[i].getName();
name = new Path(modName).lastSegment();