Author: rob.stryker(a)jboss.com Date: 2009-04-10 07:06:48 -0400 (Fri, 10 Apr 2009) New Revision: 14667 Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModel.java trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveModelRootNode.java trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/PathUtils.java Log: JBIDE-122 - Bumping descriptor version Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModel.java =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModel.java 2009-04-10 11:05:09 UTC (rev 14666) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/ArchivesModel.java 2009-04-10 11:06:48 UTC (rev 14667) @@ -186,7 +186,7 @@ } } else { packages = new XbPackages(); - packages.setVersion(1.2); + packages.setVersion(IArchiveModelRootNode.DESCRIPTOR_VERSION_LATEST); } // Fill the model Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveModelRootNode.java =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveModelRootNode.java 2009-04-10 11:05:09 UTC (rev 14666) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/IArchiveModelRootNode.java 2009-04-10 11:06:48 UTC (rev 14667) @@ -25,7 +25,8 @@ public interface IArchiveModelRootNode extends IArchiveNode { public static final double DESCRIPTOR_VERSION_1_0 = 1.0; public static final double DESCRIPTOR_VERSION_1_2 = 1.2; - public static final double DESCRIPTOR_VERSION_LATEST = DESCRIPTOR_VERSION_1_2; + public static final double DESCRIPTOR_VERSION_1_3 = 1.3; + public static final double DESCRIPTOR_VERSION_LATEST = DESCRIPTOR_VERSION_1_3; public void setModel(IArchiveModel model); public IArchiveModel getModel(); Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/PathUtils.java =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/PathUtils.java 2009-04-10 11:05:09 UTC (rev 14666) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/PathUtils.java 2009-04-10 11:06:48 UTC (rev 14667) @@ -15,6 +15,7 @@ import org.eclipse.core.runtime.Path; import org.jboss.ide.eclipse.archives.core.ArchivesCore; import org.jboss.ide.eclipse.archives.core.model.IArchive; +import org.jboss.ide.eclipse.archives.core.model.IArchiveModelRootNode; import org.jboss.ide.eclipse.archives.core.model.IArchiveStandardFileSet; import org.jboss.ide.eclipse.archives.core.model.IArchiveNode; @@ -73,7 +74,7 @@ String translated = ArchivesCore.getInstance().getVFS(). performStringSubstitution(expression, projectName, true); if( inWorkspace ) { - if( version >= 1.2) { + if( version >= IArchiveModelRootNode.DESCRIPTOR_VERSION_1_2) { IPath p = new Path(translated); if( !p.isAbsolute() ) p = new Path(projectName).append(p).makeAbsolute();