Index: org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/SaveArchivesJob.java =================================================================== --- org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/SaveArchivesJob.java (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/build/SaveArchivesJob.java (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -43,7 +43,7 @@ } } try { - ArchivesModel.instance().save(projectPath, new NullProgressMonitor()); + ArchivesModel.instance().getRoot(projectPath).save(new NullProgressMonitor()); } catch( ArchivesModelException ame ) { IStatus status = new Status(IStatus.ERROR, ArchivesCorePlugin.PLUGIN_ID, ArchivesCoreMessages.ErrorUpdatingModel, ame); return status; Index: org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java =================================================================== --- org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/build/ArchiveBuildDelegate.java (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -343,7 +343,7 @@ } IStatus[] errors2 = ModelTruezipBridge.copyFiles(matchingFilesets[j], matchingFilesets[j].getMatches(globalPath), - new NullProgressMonitor(), true); + new NullProgressMonitor(), true, true); errors.addAll(Arrays.asList(errors2)); } EventManager.fileUpdated(path, matchingFilesets); Index: org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveModel.java =================================================================== --- org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveModel.java (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveModel.java (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -25,8 +25,6 @@ public static final String DEFAULT_PACKAGES_FILE = ".packages"; //$NON-NLS-1$ public boolean isProjectRegistered(IPath projectPath); - public void save(IPath projectPath, IProgressMonitor monitor) throws ArchivesModelException; - public void save(IArchiveModelRootNode modelNode, IProgressMonitor monitor) throws ArchivesModelException; public IArchiveModelRootNode registerProject(IPath projectPath, IProgressMonitor monitor) throws ArchivesModelException; public IArchiveModelRootNode registerProject(IPath projectPath, String file, IProgressMonitor monitor) throws ArchivesModelException; public void registerProject(IArchiveModelRootNode modelNode, IProgressMonitor monitor); Index: org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModel.java =================================================================== --- org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModel.java (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModel.java (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -23,8 +23,8 @@ import org.jboss.ide.eclipse.archives.core.ArchivesCoreMessages; import org.jboss.ide.eclipse.archives.core.model.internal.ArchiveModelNode; import org.jboss.ide.eclipse.archives.core.model.internal.xb.XMLBinding; +import org.jboss.ide.eclipse.archives.core.model.internal.xb.XMLBinding.XbException; import org.jboss.ide.eclipse.archives.core.model.internal.xb.XbPackages; -import org.jboss.ide.eclipse.archives.core.model.internal.xb.XMLBinding.XbException; import org.jboss.ide.eclipse.archives.core.util.ModelUtil; /** @@ -135,16 +135,6 @@ return (archivesRoot.get(project)); } - @Deprecated - public void save(IPath projectPath, IProgressMonitor monitor) throws ArchivesModelException { - save(getRoot(projectPath), monitor); - } - - @Deprecated - public void save(IArchiveModelRootNode modelNode, IProgressMonitor monitor) throws ArchivesModelException { - modelNode.save(monitor); - } - public boolean isProjectRegistered(IPath projectPath) { return projectPath != null && archivesRoot.containsKey(projectPath); } Index: org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbFileSet.java =================================================================== --- org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbFileSet.java (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbFileSet.java (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -14,7 +14,7 @@ private String dir, includes, excludes; private boolean inWorkspace; - private boolean flattened = false; + private boolean flatten = false; public XbFileSet () { super("fileset"); //$NON-NLS-1$ @@ -31,7 +31,7 @@ this.includes = fileset.includes == null ? null : new String(fileset.includes); this.excludes = fileset.excludes == null ? null : new String(fileset.excludes); this.inWorkspace = fileset.inWorkspace; - this.flattened = fileset.flattened; + this.flatten = fileset.flatten; } protected Object clone() throws CloneNotSupportedException { @@ -71,10 +71,18 @@ } public boolean isFlattened() { - return flattened; + return flatten; } public void setFlattened(boolean flatten) { - this.flattened = flatten; + this.flatten = flatten; } + + public boolean isFlatten() { + return flatten; + } + + public void setFlatten(boolean flatten) { + this.flatten = flatten; + } } Index: org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/xpl/StringSubstitutionEngineClone.java =================================================================== --- org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/xpl/StringSubstitutionEngineClone.java (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/xpl/StringSubstitutionEngineClone.java (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -10,11 +10,7 @@ *******************************************************************************/ package org.jboss.ide.eclipse.archives.core.xpl; -import java.util.ArrayList; -import java.util.EmptyStackException; import java.util.HashSet; -import java.util.Iterator; -import java.util.List; import java.util.Stack; import org.eclipse.core.runtime.CoreException; Index: org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java =================================================================== --- org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -60,7 +60,7 @@ } public static FileWrapperStatusPair fullFilesetBuild(final IArchiveFileSet fileset, IProgressMonitor monitor, boolean sync) { FileWrapper[] files = fileset.findMatchingPaths(); - IStatus[] s = copyFiles(fileset, files, monitor, false); + IStatus[] s = copyFiles(fileset, files, monitor, false, false); if( sync ) TrueZipUtil.sync(); return new FileWrapperStatusPair( files, s ); @@ -130,14 +130,14 @@ return new FileWrapperStatusPair( files2, errorsArr); } - public static IStatus[] copyFiles(IArchiveFileSet fileset, final FileWrapper[] files, IProgressMonitor monitor, boolean sync) { + public static IStatus[] copyFiles(IArchiveFileSet fileset, final FileWrapper[] files, IProgressMonitor monitor, boolean updateTimestamps, boolean sync) { monitor.beginTask(ArchivesCore.bind(ArchivesCoreMessages.CopyingCountFiles, new Integer(files.length).toString()), files.length * 100); boolean b = true; ArrayList list = new ArrayList(); final File[] destFiles = getFiles(files, fileset); for( int i = 0; i < files.length; i++ ) { - b = TrueZipUtil.copyFile(files[i].getAbsolutePath(), destFiles[i]); + b = TrueZipUtil.copyFile(files[i].getAbsolutePath(), destFiles[i], updateTimestamps); if( b == false ) { list.add(new Status(IStatus.ERROR, ArchivesCore.PLUGIN_ID, ArchivesCore.bind(ArchivesCoreMessages.FileCopyFailed, Index: org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java =================================================================== --- org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/TrueZipUtil.java (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -52,13 +52,13 @@ public static boolean copyFile(String source, IPath dest) throws IOException { - return copyFile(source, getFile(dest)); + return copyFile(source, getFile(dest), true); } - public static boolean copyFile(String source, de.schlichtherle.io.File file) { + public static boolean copyFile(String source, de.schlichtherle.io.File file, boolean updateTimestamps) { file.getParentFile().mkdirs(); boolean b = new de.schlichtherle.io.File(source, ArchiveDetector.NULL).archiveCopyAllTo(file); - return b && updateParentTimestamps(file); + return b && (updateTimestamps ? updateParentTimestamps(file) : true); } public static boolean touchFile(IPath path) { Index: org.jboss.ide.eclipse.archives.core/pom.xml =================================================================== --- org.jboss.ide.eclipse.archives.core/pom.xml (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ org.jboss.ide.eclipse.archives.core/pom.xml (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -1,13 +1,12 @@ - + + 4.0.0 - org.jboss.tools - org.jboss.tools.parent.pom - 0.0.1-SNAPSHOT + org.jboss.tools.archives + plugins + 3.2.1-SNAPSHOT org.jboss.tools.archives.plugins org.jboss.ide.eclipse.archives.core - 3.2.1-SNAPSHOT eclipse-plugin Index: org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF =================================================================== --- org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ org.jboss.ide.eclipse.archives.core/META-INF/MANIFEST.MF (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -6,14 +6,15 @@ Bundle-Activator: org.jboss.ide.eclipse.archives.core.ArchivesCorePlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin -Require-Bundle: org.apache.ant, - org.eclipse.core.commands, - org.eclipse.core.filesystem, - org.eclipse.core.resources, - org.eclipse.core.runtime;bundle-version="[3.6.0,3.7.0)", - org.eclipse.core.variables, - org.jboss.tools.usage;resolution:=optional +Require-Bundle: org.apache.ant;bundle-version="1.7.1", + org.eclipse.core.commands;bundle-version="3.6.0", + org.eclipse.core.filesystem;bundle-version="1.3.100", + org.eclipse.core.resources;bundle-version="3.7.100", + org.eclipse.core.runtime;bundle-version="3.7.0", + org.eclipse.core.variables;bundle-version="3.2.500", + org.jboss.tools.usage;resolution:=optional;x-installation:=greedy Bundle-ActivationPolicy: lazy +Eclipse-BundleShape: dir Bundle-ClassPath: archivescore.jar, archivescore-eclipse.jar, lib/concurrent-1.3.4.jar, Index: org.jboss.ide.eclipse.archives.core/.gitignore =================================================================== --- org.jboss.ide.eclipse.archives.core/.gitignore (.../jbosstools-3.2.x/archives/plugins) (revision 0) +++ org.jboss.ide.eclipse.archives.core/.gitignore (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -0,0 +1 @@ +archivescore*.jar Index: org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/AbstractArchiveWizard.java =================================================================== --- org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/AbstractArchiveWizard.java (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/AbstractArchiveWizard.java (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -114,7 +114,7 @@ try { if( create ) parent.addChild(pkg); - ArchivesModel.instance().save(project.getLocation(), monitor); + ArchivesModel.instance().getRoot(project.getLocation()).save( monitor); } catch( ArchivesModelException ame ) { IStatus status = new Status(IStatus.ERROR, PackagesUIPlugin.PLUGIN_ID, ArchivesUIMessages.ErrorCompletingWizard, ame); PackagesUIPlugin.getDefault().getLog().log(status); Index: org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/FilesetWizard.java =================================================================== --- org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/FilesetWizard.java (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/FilesetWizard.java (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -55,7 +55,7 @@ if (createFileset) parentNode.addChild(fileset); try { - ArchivesModel.instance().save(fileset.getProjectPath(), monitor); + ArchivesModel.instance().getRoot(fileset.getProjectPath()).save( monitor); } catch( ArchivesModelException ame ) { IStatus status = new Status(IStatus.ERROR, PackagesUIPlugin.PLUGIN_ID, ArchivesUIMessages.ErrorCompletingWizard, ame); PackagesUIPlugin.getDefault().getLog().log(status); Index: org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties =================================================================== --- org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -11,8 +11,8 @@ Workspace=Workspace... Variables=Variables... RelativeTo=Relative to: -Workspace2=Workspace relative -Filesystem2=Filesystem relative +Workspace2=Workspace Relative +Filesystem2=Filesystem Relative PathDoesNotExistInFilesystem={0} does not exist in the filesystem ErrorConvertingPaths=Unable to convert workspace path into global path: {0} ErrorStringSubstitution=Error during string substitution: {0} Index: org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java =================================================================== --- org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -115,7 +115,7 @@ filesystemButton.setText(ArchivesUIMessages.Filesystem); workspaceButton.setText(ArchivesUIMessages.Workspace); variablesButton.setText(ArchivesUIMessages.Variables); - wsRadioButton.setText(ArchivesUIMessages.Workspace2); + wsRadioButton.setText(ArchivesUIMessages.Workspace2 ); fsRadioButton.setText(ArchivesUIMessages.Filesystem2); relativeTo.setText(ArchivesUIMessages.RelativeTo); pathImage.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER)); Index: org.jboss.ide.eclipse.archives.ui/plugin.properties =================================================================== --- org.jboss.ide.eclipse.archives.ui/plugin.properties (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ org.jboss.ide.eclipse.archives.ui/plugin.properties (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -1,6 +1,6 @@ PreferencePage_ProjectArchives=Project Archives ProjectPropertiesPage_ProjectArchives=Project Archives -ViewName_ProjectArchives=Project archives +ViewName_ProjectArchives=Project Archives ViewCategory_JBossTools=JBoss Tools Bundle-Vendor.0 = JBoss by Red Hat Bundle-Name.0 = JBoss Archives Tools Index: org.jboss.ide.eclipse.archives.ui/pom.xml =================================================================== --- org.jboss.ide.eclipse.archives.ui/pom.xml (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ org.jboss.ide.eclipse.archives.ui/pom.xml (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -1,13 +1,12 @@ - + + 4.0.0 - org.jboss.tools - org.jboss.tools.parent.pom - 0.0.1-SNAPSHOT + org.jboss.tools.archives + plugins + 3.2.1-SNAPSHOT org.jboss.tools.archives.plugins org.jboss.ide.eclipse.archives.ui - 3.2.0-SNAPSHOT eclipse-plugin Index: org.jboss.ide.eclipse.archives.ui/about_pt_BR.properties =================================================================== --- org.jboss.ide.eclipse.archives.ui/about_pt_BR.properties (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ org.jboss.ide.eclipse.archives.ui/about_pt_BR.properties (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -1 +1 @@ -blurb=Ferramentas dos Arquivos JBoss\n\nVers\u00E3o\: {featureVersion}\n\n(c) Copyright JBoss by Red Hat, contributors and others 2004 - 2009. All rights reserved.\nVisit http\://jboss.org/tools +blurb=Ferramentas dos Arquivos JBoss\n\nVers\u00E3o\: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2009. All rights reserved.\nVisit http\://jboss.org/tools Index: org.jboss.ide.eclipse.archives.ui/about_fr.properties =================================================================== --- org.jboss.ide.eclipse.archives.ui/about_fr.properties (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ org.jboss.ide.eclipse.archives.ui/about_fr.properties (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -1 +1 @@ -blurb=Outils d'archives JBoss\n\nVersion \: {featureVersion}\n\n(c) Copyright JBoss by Red Hat, contributors and others 2004 - 2009. Tous droits r\u00E9serv\u00E9s.\nVisitez http\://jboss.org/tools +blurb=Outils d'archives JBoss\n\nVersion \: {featureVersion}\n\n(c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2009. Tous droits r\u00E9serv\u00E9s.\nVisitez http\://jboss.org/tools Index: org.jboss.ide.eclipse.archives.ui/META-INF/MANIFEST.MF =================================================================== --- org.jboss.ide.eclipse.archives.ui/META-INF/MANIFEST.MF (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ org.jboss.ide.eclipse.archives.ui/META-INF/MANIFEST.MF (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -2,17 +2,18 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.ide.eclipse.archives.ui;singleton:=true -Bundle-Version: 3.2.0.qualifier +Bundle-Version: 3.2.1.qualifier Bundle-Activator: org.jboss.ide.eclipse.archives.ui.PackagesUIPlugin Bundle-Localization: plugin -Require-Bundle: org.eclipse.ui, - org.eclipse.ui.ide, - org.eclipse.core.runtime, - org.eclipse.core.resources, +Require-Bundle: org.eclipse.ui;bundle-version="3.7.0", + org.eclipse.ui.ide;bundle-version="3.7.0", + org.eclipse.core.runtime;bundle-version="3.7.0", + org.eclipse.core.resources;bundle-version="3.7.100", org.jboss.ide.eclipse.archives.core, - org.eclipse.debug.ui, - org.eclipse.core.variables, - org.eclipse.ui.navigator + org.eclipse.debug.ui;bundle-version="3.7.0", + org.eclipse.core.variables;bundle-version="3.2.500", + org.eclipse.ui.navigator;bundle-version="3.5.0", + org.eclipse.ui.views;bundle-version="3.6.0" Bundle-ActivationPolicy: lazy Export-Package: org.jboss.ide.eclipse.archives.ui, org.jboss.ide.eclipse.archives.ui.actions, Index: org.jboss.ide.eclipse.archives.ui/about.properties =================================================================== --- org.jboss.ide.eclipse.archives.ui/about.properties (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ org.jboss.ide.eclipse.archives.ui/about.properties (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -1 +1 @@ -blurb=JBoss Archives Tools\n \n Version\: {featureVersion}\n \n (c) Copyright JBoss by Red Hat, contributors and others 2004 - 2010. All rights reserved.\n Visit http\://jboss.org/tools \ No newline at end of file +blurb=JBoss Archives Tools\n \n Version\: {featureVersion}\n \n (c) Copyright (c) Red Hat, Inc., contributors and others 2004 - 2012. All rights reserved.\n Visit http\://jboss.org/tools \ No newline at end of file Index: pom.xml =================================================================== --- pom.xml (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ pom.xml (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -1,9 +1,13 @@ 4.0.0 + + org.jboss.tools + archives + 3.2.1-SNAPSHOT + org.jboss.tools.archives plugins - 0.0.1-SNAPSHOT archives.plugins pom Index: org.jboss.ide.eclipse.archives.jdt.integration/META-INF/MANIFEST.MF =================================================================== --- org.jboss.ide.eclipse.archives.jdt.integration/META-INF/MANIFEST.MF (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ org.jboss.ide.eclipse.archives.jdt.integration/META-INF/MANIFEST.MF (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -2,16 +2,16 @@ Bundle-ManifestVersion: 2 Bundle-Name: Archives JDT Integration Plug-in Bundle-SymbolicName: org.jboss.ide.eclipse.archives.jdt.integration;singleton:=true -Bundle-Version: 3.2.0.qualifier +Bundle-Version: 3.2.1.qualifier Bundle-Activator: org.jboss.ide.eclipse.archives.jdt.integration.ArchiveJDTIntegrationPlugin -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.jdt.core, - org.eclipse.jdt.ui, - org.eclipse.core.resources, +Require-Bundle: org.eclipse.ui;bundle-version="3.7.0", + org.eclipse.core.runtime;bundle-version="3.7.0", + org.eclipse.jdt.core;bundle-version="3.7.0", + org.eclipse.jdt.ui;bundle-version="3.7.0", + org.eclipse.core.resources;bundle-version="3.7.100", org.jboss.ide.eclipse.archives.core, org.jboss.ide.eclipse.archives.ui, - org.eclipse.ui.navigator + org.eclipse.ui.navigator;bundle-version="3.5.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.jboss.ide.eclipse.archives.jdt.integration.model, Index: org.jboss.ide.eclipse.archives.jdt.integration/src/org/jboss/ide/eclipse/archives/jdt/integration/ui/LibFilesetWizard.java =================================================================== --- org.jboss.ide.eclipse.archives.jdt.integration/src/org/jboss/ide/eclipse/archives/jdt/integration/ui/LibFilesetWizard.java (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ org.jboss.ide.eclipse.archives.jdt.integration/src/org/jboss/ide/eclipse/archives/jdt/integration/ui/LibFilesetWizard.java (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -54,7 +54,7 @@ if (createFileset) parentNode.addChild(fileset); try { - ArchivesModel.instance().save(fileset.getProjectPath(), monitor); + ArchivesModel.instance().getRoot(fileset.getProjectPath()).save(monitor); } catch( ArchivesModelException ame ) { IStatus status = new Status(IStatus.ERROR, PackagesUIPlugin.PLUGIN_ID, ArchivesUIMessages.ErrorCompletingWizard, ame); PackagesUIPlugin.getDefault().getLog().log(status); Index: org.jboss.ide.eclipse.archives.jdt.integration/pom.xml =================================================================== --- org.jboss.ide.eclipse.archives.jdt.integration/pom.xml (.../jbosstools-3.2.x/archives/plugins) (revision 42168) +++ org.jboss.ide.eclipse.archives.jdt.integration/pom.xml (.../jbosstools-3.3.x/archives/plugins) (revision 42168) @@ -1,13 +1,12 @@ - + + 4.0.0 - org.jboss.tools - org.jboss.tools.parent.pom - 0.0.1-SNAPSHOT + org.jboss.tools.archives + plugins + 3.2.1-SNAPSHOT org.jboss.tools.archives.plugins org.jboss.ide.eclipse.archives.jdt.integration - 3.2.0-SNAPSHOT eclipse-plugin