Author: rob.stryker(a)jboss.com
Date: 2009-02-25 03:42:53 -0500 (Wed, 25 Feb 2009)
New Revision: 13788
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspacePreferenceManager.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/project/ArchivesBuilder.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntArchivesCore.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IPreferenceManager.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java
Log:
JBIDE-3825 - publishing for galder. Changes noted in JIRA
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspacePreferenceManager.java
===================================================================
---
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspacePreferenceManager.java 2009-02-25
03:31:16 UTC (rev 13787)
+++
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/model/other/internal/WorkspacePreferenceManager.java 2009-02-25
08:42:53 UTC (rev 13788)
@@ -24,7 +24,6 @@
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.ArchivesCorePlugin;
-import org.jboss.ide.eclipse.archives.core.model.IArchivesLogger;
import org.jboss.ide.eclipse.archives.core.model.IPreferenceManager;
import org.osgi.service.prefs.BackingStoreException;
@@ -54,10 +53,14 @@
return null;
}
- public boolean isBuilderEnabled(IPath path) {
+
+ public boolean shouldBuild(IPath path) {
if( !ResourcesPlugin.getWorkspace().isAutoBuilding())
return false;
-
+ return isArchivesBuilderEnabled(path);
+ }
+
+ public boolean isArchivesBuilderEnabled(IPath path) {
QualifiedName name = new QualifiedName(ArchivesCorePlugin.PLUGIN_ID,
AUTOMATIC_BUILDER_ENABLED);
IResource res = getResource(path);
if( res != null && areProjectSpecificPrefsEnabled(res)) {
@@ -70,7 +73,7 @@
return new
InstanceScope().getNode(ArchivesCorePlugin.PLUGIN_ID).getBoolean(AUTOMATIC_BUILDER_ENABLED,
true);
}
- public void setBuilderEnabled(IPath path, boolean value) {
+ public void setArchivesBuilderEnabled(IPath path, boolean value) {
QualifiedName name = new QualifiedName(ArchivesCorePlugin.PLUGIN_ID,
AUTOMATIC_BUILDER_ENABLED);
IResource resource = getResource(path);
// if the resource is null or the resource has no preference val, use global val
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/project/ArchivesBuilder.java
===================================================================
---
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/project/ArchivesBuilder.java 2009-02-25
03:31:16 UTC (rev 13787)
+++
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/project/ArchivesBuilder.java 2009-02-25
08:42:53 UTC (rev 13788)
@@ -55,7 +55,7 @@
protected IProject[] build(int kind, Map args, IProgressMonitor monitor) throws
CoreException {
// if we're not to build, get out of here
- if(
!ArchivesCore.getInstance().getPreferenceManager().isBuilderEnabled(getProject().getLocation()))
+ if(
!ArchivesCore.getInstance().getPreferenceManager().isArchivesBuilderEnabled(getProject().getLocation()))
return new IProject[]{};
IProject[] interestingProjects = getInterestingProjectsInternal();
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntArchivesCore.java
===================================================================
---
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntArchivesCore.java 2009-02-25
03:31:16 UTC (rev 13787)
+++
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/ant/AntArchivesCore.java 2009-02-25
08:42:53 UTC (rev 13788)
@@ -123,16 +123,19 @@
public boolean areProjectSpecificPrefsEnabled(IPath path) {
return false;
}
+ public void setProjectSpecificPrefsEnabled(IPath path, boolean val) {
+ // not implemented
+ }
- public boolean isBuilderEnabled(IPath path) {
+ public boolean shouldBuild(IPath path) {
return true;
}
- public void setBuilderEnabled(IPath path, boolean val) {
- // not implemented
+ public boolean isArchivesBuilderEnabled(IPath path) {
+ return true;
}
- public void setProjectSpecificPrefsEnabled(IPath path, boolean val) {
+ public void setArchivesBuilderEnabled(IPath path, boolean val) {
// not implemented
}
}
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java
===================================================================
---
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java 2009-02-25
03:31:16 UTC (rev 13787)
+++
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ModelChangeListener.java 2009-02-25
08:42:53 UTC (rev 13788)
@@ -60,7 +60,8 @@
if (delta == null || delta.getPostNode() == null) {
return false;
}
- if(
!ArchivesCore.getInstance().getPreferenceManager().isBuilderEnabled(delta.getPostNode().getProjectPath()))
+ IPath projectPath = delta.getPostNode().getProjectPath();
+ if( !ArchivesCore.getInstance().getPreferenceManager().shouldBuild(projectPath))
return false;
return true;
}
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IPreferenceManager.java
===================================================================
---
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IPreferenceManager.java 2009-02-25
03:31:16 UTC (rev 13787)
+++
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IPreferenceManager.java 2009-02-25
08:42:53 UTC (rev 13788)
@@ -13,8 +13,9 @@
import org.eclipse.core.runtime.IPath;
public interface IPreferenceManager {
- public boolean isBuilderEnabled(IPath path);
- public void setBuilderEnabled(IPath path, boolean val);
+ public boolean shouldBuild(IPath path);
+ public boolean isArchivesBuilderEnabled(IPath path);
+ public void setArchivesBuilderEnabled(IPath path, boolean val);
public boolean areProjectSpecificPrefsEnabled(IPath path);
public void setProjectSpecificPrefsEnabled(IPath path, boolean val);
}
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java
===================================================================
---
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java 2009-02-25
03:31:16 UTC (rev 13787)
+++
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java 2009-02-25
08:42:53 UTC (rev 13788)
@@ -79,7 +79,7 @@
if( getResourceLocationIfExists() != null ) {
overrideButton.setSelection(getPrefManager().areProjectSpecificPrefsEnabled(getResourceLocationIfExists()));
}
- automaticBuilder.setSelection(getPrefManager().isBuilderEnabled(getResourceLocationIfExists()));
+ automaticBuilder.setSelection(getPrefManager().isArchivesBuilderEnabled(getResourceLocationIfExists()));
showErrorDialog.setSelection(PrefsInitializer.getBoolean(PrefsInitializer.PREF_SHOW_BUILD_ERROR_DIALOG,
getElement(), true));
showAllProjects.setSelection(
PrefsInitializer.getBoolean(PrefsInitializer.PREF_SHOW_ALL_PROJECTS, getElement(),
false));
@@ -210,7 +210,7 @@
if( getResourceLocationIfExists() != null ) {
getPrefManager().setProjectSpecificPrefsEnabled(getResourceLocationIfExists(),
overrideButton.getSelection());
}
- getPrefManager().setBuilderEnabled(getResourceLocationIfExists(),
automaticBuilder.getSelection());
+ getPrefManager().setArchivesBuilderEnabled(getResourceLocationIfExists(),
automaticBuilder.getSelection());
PrefsInitializer.setBoolean(PrefsInitializer.PREF_SHOW_BUILD_ERROR_DIALOG,
showErrorDialog.getSelection(), getElement());
PrefsInitializer.setBoolean(PrefsInitializer.PREF_SHOW_PACKAGE_OUTPUT_PATH,
showPackageOutputPath.getSelection(), getElement());
PrefsInitializer.setBoolean(PrefsInitializer.PREF_SHOW_FULL_FILESET_ROOT_DIR,
showFullFilesetRootDir.getSelection(), getElement());
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2009-02-25
03:31:16 UTC (rev 13787)
+++
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2009-02-25
08:42:53 UTC (rev 13788)
@@ -27,6 +27,7 @@
import org.eclipse.wst.server.core.model.IModuleFolder;
import org.eclipse.wst.server.core.model.IModuleResource;
import org.eclipse.wst.server.core.model.IModuleResourceDelta;
+import org.jboss.ide.eclipse.archives.core.build.ArchiveBuildDelegate;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
import org.jboss.ide.eclipse.archives.core.util.PathUtils;
import org.jboss.ide.eclipse.archives.webtools.IntegrationPlugin;
@@ -75,6 +76,8 @@
if( publishType == REMOVE_PUBLISH ) {
removeModule(module2, monitor);
} else if( publishType == FULL_PUBLISH ) {
+ IArchive pack = getPackage(module2);
+ new ArchiveBuildDelegate().fullArchiveBuild(pack, monitor);
publishModule(module2, false, monitor);
} else if( publishType == INCREMENTAL_PUBLISH ) {
publishModule(module2, true, monitor);