[jboss-cvs] JBossAS SVN: r93067 - in projects/profileservice/trunk: core/src/main/java/org/jboss/profileservice/deployers and 15 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 1 06:38:43 EDT 2009
Author: emuckenhuber
Date: 2009-09-01 06:38:43 -0400 (Tue, 01 Sep 2009)
New Revision: 93067
Added:
projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/metadata/support/VirtualRepositoryMetaData.java
projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/metadata/support/package-info.java
Removed:
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/virtual/
projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/ClassPathLocation.java
projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/MetaDataLocation.java
Modified:
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/dependency/AbstractProfileCapability.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/dependency/AbstractProfileRequirement.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/deployers/VDFDeploymentBuilder.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/VirtualProfileDeploymentMetaData.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/package-info.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/BasicProfileDeployment.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/ProfileDeploymentFactory.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/AbstractArtifact.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/AbstractArtifactRepository.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/DelegatingArtifactRepository.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/file/FileArtifact.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/file/LocalFileArtifactRepository.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/maven/AbstractMavenArtifactRepository.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/maven/LocalMavenArtifactRepository.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/maven/MavenArtifact.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/maven/MavenArtifactId.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/maven/MavenArtifactReference.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/maven/MavenArtifactRepositoryMetaData.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/maven/package-info.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/Version.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/VersionComparator.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/VersionComparatorRegistry.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/VersionRange.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/NameAndVersionRangeSupport.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/NameAndVersionSupport.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/VersionMetaMapper.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/VersionRangeSupport.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/VersionSupport.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/VersionValueAdapter.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/AbstractVirtualAssemblyContext.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/AbstractVirtualDeploymentAssembly.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/BasicVirtualAssemblyContext.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/ImmutableAssemblyContext.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/StructureMetaDataBuilder.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/AbstractVirtualDeployment.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/AbstractVirtualDeploymentRequirement.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/AbstractVirtualFileArtifact.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/AntMatchRestriction.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/ClassPathLocationMetaData.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/MetaDataLocationMetaData.java
projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/VirtualMavenArtifactMetaData.java
projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/repository/test/ArtifactRepositoryUnitTestCase.java
projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/AbstractVirtualAssemblyTestCase.java
projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/StructureMetaDataUnitTestCase.java
projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/VirtualDeploymentAssemblyUnitTestCase.java
projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/repository/ArtifactId.java
projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/repository/ArtifactRepository.java
projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/repository/Identifyable.java
projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/PathRestriction.java
projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/VirtualArtifactMetaData.java
projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/VirtualDeployment.java
projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/assembly/VirtualAssemblyContext.java
projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/assembly/VirtualDeploymentAssemblyContext.java
Log:
remove not needed classes, cleanup the references to artifacts
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/dependency/AbstractProfileCapability.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/dependency/AbstractProfileCapability.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/dependency/AbstractProfileCapability.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -29,7 +29,7 @@
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
public abstract class AbstractProfileCapability extends NameAndVersionSupport implements ProfileCapability
{
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/dependency/AbstractProfileCapability.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/dependency/AbstractProfileRequirement.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/dependency/AbstractProfileRequirement.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/dependency/AbstractProfileRequirement.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -32,7 +32,7 @@
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
public class AbstractProfileRequirement extends NameAndVersionRangeSupport implements ProfileRequirement
{
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/dependency/AbstractProfileRequirement.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/deployers/VDFDeploymentBuilder.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/VirtualProfileDeploymentMetaData.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/VirtualProfileDeploymentMetaData.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/VirtualProfileDeploymentMetaData.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -35,8 +35,7 @@
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
- at XmlType(propOrder = {"name", "path", "metaDataLocations", "classPathLocations",
- "requires", "children" })
+ at XmlType(propOrder = {"name", "path", "artifacts", "requires", "children" })
public class VirtualProfileDeploymentMetaData extends AbstractVirtualDeployment
implements ProfileDeploymentMetaData
{
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/VirtualProfileDeploymentMetaData.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/BasicProfileDeployment.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/ProfileDeploymentFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/AbstractArtifact.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/AbstractArtifactRepository.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/DelegatingArtifactRepository.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/file/FileArtifact.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/file/LocalFileArtifactRepository.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/maven/AbstractMavenArtifactRepository.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/maven/LocalMavenArtifactRepository.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/maven/MavenArtifact.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/maven/MavenArtifactId.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/maven/MavenArtifactReference.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/maven/MavenArtifactRepositoryMetaData.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/artifact/maven/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/Version.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/Version.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/Version.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -36,7 +36,7 @@
*
* @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
* @author <a href="adrian at jboss.org">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
@MetaMapping(VersionMetaMapper.class)
@XmlType(propOrder = {})
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/Version.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/VersionComparator.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/VersionComparatorRegistry.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/VersionRange.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/VersionRange.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/VersionRange.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -27,7 +27,7 @@
* VersionRange.
*
* @author <a href="adrian at jboss.org">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
public class VersionRange implements Serializable
{
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/VersionRange.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/NameAndVersionRangeSupport.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/NameAndVersionRangeSupport.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/NameAndVersionRangeSupport.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -24,20 +24,17 @@
import java.io.Serializable;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
import org.jboss.metatype.api.annotations.CompositeKey;
-import org.jboss.metatype.api.annotations.CompositeValue;
-import org.jboss.profileservice.version.Version;
import org.jboss.profileservice.version.VersionRange;
/**
* NameAndVersionRangeSupport.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
-public class NameAndVersionRangeSupport implements Serializable
+public class NameAndVersionRangeSupport extends VersionRangeSupport implements Serializable
{
/** The serialVersionUID */
private static final long serialVersionUID = 3318997559330427708L;
@@ -45,9 +42,6 @@
/** The name */
private String name = "<unknown>";
- /** The version range */
- private VersionRange versionRange = VersionRange.ALL_VERSIONS;
-
/**
* Create a new NameAndVersionRangeSupport
*/
@@ -75,13 +69,11 @@
*/
public NameAndVersionRangeSupport(String name, VersionRange versionRange)
{
+ super(versionRange);
if (name == null)
throw new IllegalArgumentException("Null name");
- if (versionRange == null)
- versionRange = VersionRange.ALL_VERSIONS;
this.name = name;
- this.versionRange = versionRange;
}
/**
@@ -107,191 +99,7 @@
throw new IllegalArgumentException("Null name");
this.name = name;
}
-
- /**
- * Get the versionRange.
- *
- * @return the versionRange.
- */
- public VersionRange getVersionRange()
- {
- return versionRange;
- }
-
- /**
- * Set the versionRange.
- *
- * @param versionRange the versionRange.
- */
- @CompositeValue(ignore=true)
- @XmlTransient
- public void setVersionRange(VersionRange versionRange)
- {
- if (versionRange == null)
- versionRange = VersionRange.ALL_VERSIONS;
- this.versionRange = versionRange;
- }
-
- /**
- * Get the fromVersion.
- *
- * @return the fromVersion.
- */
- public Object getFrom()
- {
- return versionRange.getLow();
- }
-
- /**
- * Set the fromVersion.
- *
- * @param fromVersion the fromVersion.
- */
- @CompositeValue(ignore=true)
- @XmlTransient
- public void setFrom(Object fromVersion)
- {
- versionRange = new VersionRange(fromVersion, versionRange.isLowInclusive(), versionRange.getHigh(), versionRange.isHighInclusive());
- }
-
- /**
- * Get the fromVersion.
- *
- * @return the fromVersion.
- */
- public Version getFromVersion()
- {
- Object from = getFrom();
- if (from == null)
- return null;
- if (from instanceof Version)
- return (Version) from;
- if (from instanceof String)
- return Version.parseVersion((String) from);
- throw new IllegalStateException(from + " is not an instance of version");
- }
-
- /**
- * Set the fromVersion.
- *
- * @param fromVersion the fromVersion.
- */
- @CompositeKey
- @CompositeValue(name="from")
- @XmlAttribute(name="from")
- public void setFromVersion(Version fromVersion)
- {
- setFrom(fromVersion);
- }
-
- /**
- * Get the fromVersionInclusive.
- *
- * @return the fromVersionInclusive.
- */
- public boolean isFromVersionInclusive()
- {
- return versionRange.isLowInclusive();
- }
-
- /**
- * Set the fromVersionInclusive.
- *
- * @param fromVersionInclusive the fromVersionInclusive.
- */
- @CompositeKey
- @XmlAttribute(name="from-inclusive")
- public void setFromVersionInclusive(boolean fromVersionInclusive)
- {
- versionRange = new VersionRange(versionRange.getLow(), fromVersionInclusive, versionRange.getHigh(), versionRange.isHighInclusive());
- }
-
- /**
- * Get the toVersion.
- *
- * @return the toVersion.
- */
- public Object getTo()
- {
- return versionRange.getHigh();
- }
-
- /**
- * Set the toVersion.
- *
- * @param toVersion the toVersion.
- */
- @CompositeValue(ignore=true)
- @XmlTransient
- public void setTo(Object toVersion)
- {
- versionRange = new VersionRange(versionRange.getLow(), versionRange.isLowInclusive(), toVersion, versionRange.isHighInclusive());
- }
-
- /**
- * Get the toVersion.
- *
- * @return the toVersion.
- */
- public Version getToVersion()
- {
- Object to = getTo();
- if (to == null)
- return null;
- if (to instanceof Version)
- return (Version) to;
- if (to instanceof String)
- return Version.parseVersion((String) to);
- throw new IllegalStateException(to + " is not an instance of version");
- }
-
- /**
- * Set the toVersion.
- *
- * @param toVersion the toVersion.
- */
- @CompositeKey
- @CompositeValue(name="to")
- @XmlAttribute(name="to")
- public void setToVersion(Version toVersion)
- {
- setTo(toVersion);
- }
-
- /**
- * Get the toVersionInclusive.
- *
- * @return the toVersionInclusive.
- */
- public boolean isToVersionInclusive()
- {
- return versionRange.isHighInclusive();
- }
-
- /**
- * Set the toVersionInclusive.
- *
- * @param toVersionInclusive the toVersionInclusive.
- */
- @CompositeKey
- @XmlAttribute(name="to-inclusive")
- public void setToVersionInclusive(boolean toVersionInclusive)
- {
- versionRange = new VersionRange(versionRange.getLow(), versionRange.isLowInclusive(), versionRange.getHigh(), toVersionInclusive);
- }
-
- /**
- * Set a single version as the version range
- *
- * @param version the version
- */
- @CompositeValue(ignore=true)
- @XmlAttribute(name="version")
- public void setVersion(Version version)
- {
- versionRange = new VersionRange(version, true, version, true);
- }
-
+
@Override
public boolean equals(Object obj)
{
@@ -302,7 +110,7 @@
NameAndVersionRangeSupport other = (NameAndVersionRangeSupport) obj;
if (getName().equals(other.getName()) == false)
return false;
- return getVersionRange().equals(other.getVersionRange());
+ return super.equals(other);
}
@Override
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/NameAndVersionRangeSupport.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/NameAndVersionSupport.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/NameAndVersionSupport.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/NameAndVersionSupport.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -24,30 +24,24 @@
import java.io.Serializable;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlTransient;
import org.jboss.managed.api.annotation.ManagementProperty;
import org.jboss.metatype.api.annotations.CompositeKey;
-import org.jboss.metatype.api.annotations.CompositeValue;
-import org.jboss.profileservice.version.Version;
import org.jboss.profileservice.version.VersionComparatorRegistry;
/**
* NameAndVersionSupport.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
-public class NameAndVersionSupport implements Serializable, Cloneable
+public class NameAndVersionSupport extends VersionSupport implements Serializable, Cloneable
{
/** The serialVersionUID */
private static final long serialVersionUID = 6943685422194480909L;
/** The name */
private String name = "<unknown>";
-
- /** The version */
- private Object version = Version.DEFAULT_VERSION;
/**
* Create a new NameAndVersionSupport with the default version
@@ -76,12 +70,10 @@
*/
public NameAndVersionSupport(String name, Object version)
{
+ super(version);
if (name == null)
throw new IllegalArgumentException("Null name");
- if (version == null)
- version = Version.DEFAULT_VERSION;
this.name = name;
- this.version = version;
}
/**
@@ -109,59 +101,6 @@
this.name = name;
}
- /**
- * Get the version.
- *
- * @return the version.
- */
- public Object getVersion()
- {
- return version;
- }
-
- /**
- * Set the version.
- *
- * @param version the version.
- */
- @CompositeValue(ignore=true)
- @XmlTransient
- public void setVersion(Object version)
- {
- if (version == null)
- version = Version.DEFAULT_VERSION;
- this.version = version;
- }
-
- /**
- * Get the version.
- *
- * @return the version.
- */
- public Version getTheVersion()
- {
- Object version = getVersion();
- if (version instanceof Version)
- return (Version) version;
- if (version instanceof String)
- return Version.parseVersion((String) version);
- throw new IllegalStateException(version + " is not an instanceof version");
- }
-
- /**
- * Set the version.
- *
- * @param version the version.
- */
- @CompositeKey
- @CompositeValue(name="version")
- @ManagementProperty(name="version")
- @XmlAttribute(name="version")
- public void setTheVersion(Version version)
- {
- setVersion(version);
- }
-
@Override
public boolean equals(Object obj)
{
@@ -190,14 +129,6 @@
@Override
public NameAndVersionSupport clone()
{
- try
- {
- NameAndVersionSupport clone = (NameAndVersionSupport) super.clone();
- return clone;
- }
- catch (CloneNotSupportedException e)
- {
- throw new RuntimeException("Unexpected", e);
- }
+ return (NameAndVersionSupport) super.clone();
}
}
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/NameAndVersionSupport.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/VersionMetaMapper.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/VersionMetaMapper.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/VersionMetaMapper.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -35,7 +35,7 @@
* VersionMetaMapper.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
public class VersionMetaMapper extends MetaMapper<Version>
{
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/VersionMetaMapper.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/VersionRangeSupport.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/VersionRangeSupport.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/VersionRangeSupport.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -32,10 +32,10 @@
import org.jboss.profileservice.version.VersionRange;
/**
- * NameAndVersionRangeSupport.
+ * VersionRangeSupport.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
public class VersionRangeSupport implements Serializable
{
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/VersionRangeSupport.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/VersionSupport.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/VersionSupport.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/VersionSupport.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -36,7 +36,7 @@
* NameAndVersionSupport.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
public class VersionSupport implements Serializable, Cloneable
{
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/VersionSupport.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/VersionValueAdapter.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/VersionValueAdapter.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/VersionValueAdapter.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -28,7 +28,7 @@
* VersionXmlJavaTypeAdapter.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
public class VersionValueAdapter implements ValueAdapter
{
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/version/helpers/VersionValueAdapter.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/AbstractVirtualAssemblyContext.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/AbstractVirtualDeploymentAssembly.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/AbstractVirtualDeploymentAssembly.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/AbstractVirtualDeploymentAssembly.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -26,8 +26,7 @@
import org.jboss.profileservice.spi.repository.ArtifactId;
import org.jboss.profileservice.spi.repository.ArtifactRepository;
-import org.jboss.profileservice.spi.virtual.ClassPathLocation;
-import org.jboss.profileservice.spi.virtual.MetaDataLocation;
+import org.jboss.profileservice.spi.virtual.VirtualArtifactMetaData;
import org.jboss.profileservice.spi.virtual.VirtualDeployment;
import org.jboss.profileservice.spi.virtual.assembly.VirtualDeploymentAssemblyContext;
import org.jboss.virtual.AssembledDirectory;
@@ -93,16 +92,11 @@
*/
protected void assemble(VirtualDeploymentAssemblyContext ctx, VirtualDeployment deployment) throws IOException
{
- if(deployment.getMetaDataLocations() != null && deployment.getMetaDataLocations().isEmpty() == false)
+ if(deployment.getArtifacts() != null && deployment.getArtifacts().isEmpty() == false)
{
- for(MetaDataLocation location : deployment.getMetaDataLocations())
- ctx.addMetaDataLocation(location);
+ for(VirtualArtifactMetaData artifact : deployment.getArtifacts())
+ ctx.addArtifact(artifact);
}
- if(deployment.getClassPathLocations() != null && deployment.getClassPathLocations().isEmpty() == false)
- {
- for(ClassPathLocation location : deployment.getClassPathLocations())
- ctx.addClassPathLocation(location);
- }
if(deployment.getChildren() != null && deployment.getChildren().isEmpty() == false)
{
for(VirtualDeployment child : deployment.getChildren())
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/AbstractVirtualDeploymentAssembly.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/BasicVirtualAssemblyContext.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/BasicVirtualAssemblyContext.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/BasicVirtualAssemblyContext.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -27,8 +27,6 @@
import java.util.List;
import org.jboss.logging.Logger;
-import org.jboss.profileservice.spi.virtual.ClassPathLocation;
-import org.jboss.profileservice.spi.virtual.MetaDataLocation;
import org.jboss.profileservice.spi.virtual.PathRestriction;
import org.jboss.profileservice.spi.virtual.VirtualArtifactMetaData;
import org.jboss.profileservice.spi.virtual.VirtualDeployment;
@@ -132,25 +130,19 @@
}
@Override
- public void addClassPathLocation(ClassPathLocation location) throws IOException
+ public void addArtifact(VirtualArtifactMetaData artifact) throws IOException
{
- if(location == null)
+ if(artifact == null)
{
- throw new IllegalArgumentException("null class path location");
+ throw new IllegalArgumentException("null artifact");
}
- VirtualFile vf = createPath(location);
- getClassPathLocations().addAll(addVirtualPath(vf, location));
- }
-
- @Override
- public void addMetaDataLocation(MetaDataLocation location) throws IOException
- {
- if(location == null)
- {
- throw new IllegalArgumentException("null meta data location");
- }
- VirtualFile vf = createPath(location);
- getMetaDataLocations().addAll(addVirtualPath(vf, location));
+ VirtualFile vf = createPath(artifact);
+ Collection<String> paths = addVirtualPath(vf, artifact);
+ // TODO
+ if(artifact.isMetaDataPath())
+ getMetaDataLocations().addAll(paths);
+ else
+ getClassPathLocations().addAll(paths);
}
protected VirtualFile createPath(VirtualArtifactMetaData path) throws IOException
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/BasicVirtualAssemblyContext.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/ImmutableAssemblyContext.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/ImmutableAssemblyContext.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/ImmutableAssemblyContext.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -23,8 +23,7 @@
import java.io.IOException;
-import org.jboss.profileservice.spi.virtual.ClassPathLocation;
-import org.jboss.profileservice.spi.virtual.MetaDataLocation;
+import org.jboss.profileservice.spi.virtual.VirtualArtifactMetaData;
import org.jboss.profileservice.spi.virtual.VirtualDeployment;
import org.jboss.profileservice.spi.virtual.assembly.VirtualDeploymentAssemblyContext;
import org.jboss.virtual.VirtualFile;
@@ -61,26 +60,12 @@
}
@Override
- public void addClassPathLocation(ClassPathLocation location) throws IOException
+ public void addArtifact(VirtualArtifactMetaData artifact) throws IOException
{
- if(location == null)
- {
- throw new IllegalArgumentException("null class path location");
- }
- // addClassPathEntry(location.getPath());
+ throw new IllegalStateException("TODO");
}
-
+
@Override
- public void addMetaDataLocation(MetaDataLocation location) throws IOException
- {
- if(location == null)
- {
- throw new IllegalArgumentException("null meta data location");
- }
- // addMetaDataLocation(location.getPath());
- }
-
- @Override
public void addChild(VirtualFile vf) throws IOException
{
throw new IllegalStateException("cannot add a virtual file to a non-assembled context");
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/ImmutableAssemblyContext.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/assembly/StructureMetaDataBuilder.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/AbstractVirtualDeployment.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/AbstractVirtualDeployment.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/AbstractVirtualDeployment.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -30,8 +30,6 @@
import org.jboss.profileservice.dependency.AbstractProfileCapability;
import org.jboss.profileservice.dependency.AbstractProfileRequirement;
import org.jboss.profileservice.spi.dependency.ProfileRequirement;
-import org.jboss.profileservice.spi.virtual.ClassPathLocation;
-import org.jboss.profileservice.spi.virtual.MetaDataLocation;
import org.jboss.profileservice.spi.virtual.VirtualArtifactMetaData;
import org.jboss.profileservice.spi.virtual.VirtualDeployment;
import org.jboss.profileservice.version.Version;
@@ -42,8 +40,7 @@
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
- at XmlType(propOrder = {"name", "path", "metaDataLocations", "classPathLocations",
- "requires", "children" })
+ at XmlType(propOrder = {"name", "path", "artifacts", "requires", "children" })
public class AbstractVirtualDeployment extends AbstractProfileCapability implements VirtualDeployment
{
@@ -53,11 +50,8 @@
/** The artifact id. */
private VirtualArtifactMetaData path;
- /** The meta data locations. */
- private List<MetaDataLocation> metaDataLocations;
-
- /** The class path locations. */
- private List<ClassPathLocation> classPathLocations;
+ /** The artifacts. */
+ private List<VirtualArtifactMetaData> artifacts;
/** The child deployments. */
private List<VirtualDeployment> children;
@@ -110,48 +104,28 @@
}
/**
- * Get the metaDataLocations.
+ * Get the virtual deployment artifacts.
*
- * @return the metaDataLocations.
+ * @return the artifacts
*/
- @XmlElement(name = "meta-inf", type = MetaDataLocationMetaData.class)
- public List<MetaDataLocation> getMetaDataLocations()
- {
- return metaDataLocations;
- }
-
- /**
- * Set the metaDataLocations.
- *
- * @param metaDataLocations The metaDataLocations to set.
- */
- public void setMetaDataLocations(List<MetaDataLocation> metaDataLocations)
- {
- this.metaDataLocations = metaDataLocations;
- }
-
- /**
- * Get the classPathLocations.
- *
- * @return the classPathLocations.
- */
@XmlElements({
+ @XmlElement(name = "meta-inf", type = MetaDataLocationMetaData.class),
@XmlElement(name = "classpath", type = ClassPathLocationMetaData.class),
@XmlElement(name = "artifact", type = VirtualMavenArtifactMetaData.class)
})
- public List<ClassPathLocation> getClassPathLocations()
+ public List<VirtualArtifactMetaData> getArtifacts()
{
- return classPathLocations;
+ return this.artifacts;
}
-
+
/**
- * Set the classPathLocations.
+ * Set the virtual deployment artifacts.
*
- * @param classPathLocations The classPathLocations to set.
+ * @param artifacts the artifacts
*/
- public void setClassPathLocations(List<ClassPathLocation> classPathLocations)
+ public void setArtifacts(List<VirtualArtifactMetaData> artifacts)
{
- this.classPathLocations = classPathLocations;
+ this.artifacts = artifacts;
}
/**
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/AbstractVirtualDeployment.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/AbstractVirtualDeploymentRequirement.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/AbstractVirtualFileArtifact.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/AbstractVirtualFileArtifact.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/AbstractVirtualFileArtifact.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -94,6 +94,12 @@
}
@Override
+ public boolean isMetaDataPath()
+ {
+ return false;
+ }
+
+ @Override
public String toString()
{
StringBuffer buffer = new StringBuffer();
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/AbstractVirtualFileArtifact.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/AntMatchRestriction.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/ClassPathLocationMetaData.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/ClassPathLocationMetaData.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/ClassPathLocationMetaData.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -21,7 +21,6 @@
*/
package org.jboss.profileservice.virtual.deployment;
-import org.jboss.profileservice.spi.virtual.ClassPathLocation;
/**
* The class path location meta data.
@@ -29,7 +28,7 @@
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class ClassPathLocationMetaData extends AbstractVirtualFileArtifact implements ClassPathLocation
+public class ClassPathLocationMetaData extends AbstractVirtualFileArtifact
{
public ClassPathLocationMetaData()
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/ClassPathLocationMetaData.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/MetaDataLocationMetaData.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/MetaDataLocationMetaData.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/MetaDataLocationMetaData.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -21,7 +21,7 @@
*/
package org.jboss.profileservice.virtual.deployment;
-import org.jboss.profileservice.spi.virtual.MetaDataLocation;
+import org.jboss.profileservice.spi.virtual.VirtualArtifactMetaData;
/**
* The meta data location meta data.
@@ -29,8 +29,14 @@
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class MetaDataLocationMetaData extends AbstractVirtualFileArtifact implements MetaDataLocation
+public class MetaDataLocationMetaData extends AbstractVirtualFileArtifact implements VirtualArtifactMetaData
{
+ @Override
+ public boolean isMetaDataPath()
+ {
+ return true;
+ }
+
}
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/MetaDataLocationMetaData.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/VirtualMavenArtifactMetaData.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/VirtualMavenArtifactMetaData.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/VirtualMavenArtifactMetaData.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -27,15 +27,15 @@
import javax.xml.bind.annotation.XmlType;
import org.jboss.profileservice.repository.artifact.maven.MavenArtifactReference;
-import org.jboss.profileservice.spi.virtual.ClassPathLocation;
import org.jboss.profileservice.spi.virtual.PathRestriction;
+import org.jboss.profileservice.spi.virtual.VirtualArtifactMetaData;
/**
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
@XmlType(propOrder = {"includes", "excludes"})
-public class VirtualMavenArtifactMetaData extends MavenArtifactReference implements ClassPathLocation
+public class VirtualMavenArtifactMetaData extends MavenArtifactReference implements VirtualArtifactMetaData
{
/** The serialVersionUID */
@@ -89,5 +89,11 @@
this.excludes = excludes;
}
+ @Override
+ public boolean isMetaDataPath()
+ {
+ return false;
+ }
+
}
Property changes on: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/virtual/deployment/VirtualMavenArtifactMetaData.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Copied: projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/metadata/support/VirtualRepositoryMetaData.java (from rev 92959, projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/virtual/VirtualRepositoryMetaData.java)
===================================================================
--- projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/metadata/support/VirtualRepositoryMetaData.java (rev 0)
+++ projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/metadata/support/VirtualRepositoryMetaData.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.profileservice.metadata.support;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.profileservice.spi.virtual.VirtualDeployment;
+import org.jboss.profileservice.virtual.deployment.AbstractVirtualDeployment;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
+ * @version $Revision$
+ */
+ at XmlRootElement(name = "virtual-repository")
+ at JBossXmlSchema(ignoreUnresolvedFieldOrClass=false,
+ namespace= "urn:jboss:profileservice:virtual:repository:1.0",
+ elementFormDefault=XmlNsForm.QUALIFIED,
+ normalizeSpace=true)
+ at XmlType(name = "virtualRepositoryType", propOrder = "deployments")
+public class VirtualRepositoryMetaData
+{
+
+ /** The deployments. */
+ private List<VirtualDeployment> deployments;
+
+ @XmlElement(name = "virtual-deployment", type = AbstractVirtualDeployment.class)
+ public List<VirtualDeployment> getDeployments()
+ {
+ return deployments;
+ }
+
+ public void setDeployments(List<VirtualDeployment> deployments)
+ {
+ this.deployments = deployments;
+ }
+
+}
+
Property changes on: projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/metadata/support/VirtualRepositoryMetaData.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Copied: projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/metadata/support/package-info.java (from rev 92959, projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/repository/virtual/package-info.java)
===================================================================
--- projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/metadata/support/package-info.java (rev 0)
+++ projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/metadata/support/package-info.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -0,0 +1,32 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2009, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+ at JBossXmlAdaptedTypes
+({
+ @JBossXmlAdaptedType(type=Version.class, valueAdapter=VersionValueAdapter.class)
+})
+package org.jboss.test.profileservice.metadata.support;
+
+import org.jboss.profileservice.version.Version;
+import org.jboss.profileservice.version.helpers.VersionValueAdapter;
+import org.jboss.xb.annotations.JBossXmlAdaptedType;
+import org.jboss.xb.annotations.JBossXmlAdaptedTypes;
+
Property changes on: projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/metadata/support/package-info.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/repository/test/ArtifactRepositoryUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/AbstractVirtualAssemblyTestCase.java
===================================================================
--- projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/AbstractVirtualAssemblyTestCase.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/AbstractVirtualAssemblyTestCase.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -27,11 +27,11 @@
import java.util.Map;
import org.jboss.profileservice.repository.artifact.file.LocalFileArtifactRepository;
-import org.jboss.profileservice.repository.virtual.VirtualRepositoryMetaData;
import org.jboss.profileservice.spi.repository.ArtifactId;
import org.jboss.profileservice.spi.repository.ArtifactRepository;
import org.jboss.profileservice.spi.virtual.VirtualDeployment;
import org.jboss.test.profileservice.ProfileServiceTestBase;
+import org.jboss.test.profileservice.metadata.support.VirtualRepositoryMetaData;
import org.jboss.virtual.VirtualFile;
/**
Property changes on: projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/AbstractVirtualAssemblyTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/StructureMetaDataUnitTestCase.java
===================================================================
--- projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/StructureMetaDataUnitTestCase.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/StructureMetaDataUnitTestCase.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -32,9 +32,9 @@
import org.jboss.deployers.spi.structure.StructureMetaData;
import org.jboss.profileservice.deployers.VDFDeploymentBuilder;
import org.jboss.profileservice.repository.ProfileDeploymentFactory;
-import org.jboss.profileservice.repository.virtual.VirtualRepositoryMetaData;
import org.jboss.profileservice.spi.ProfileDeployment;
import org.jboss.profileservice.spi.virtual.VirtualDeployment;
+import org.jboss.test.profileservice.metadata.support.VirtualRepositoryMetaData;
/**
* Test StructureMetaData creation.
Property changes on: projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/StructureMetaDataUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/VirtualDeploymentAssemblyUnitTestCase.java
===================================================================
--- projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/VirtualDeploymentAssemblyUnitTestCase.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/VirtualDeploymentAssemblyUnitTestCase.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -24,12 +24,12 @@
import java.util.Map;
import org.jboss.profileservice.repository.ProfileDeploymentFactory;
-import org.jboss.profileservice.repository.virtual.VirtualRepositoryMetaData;
import org.jboss.profileservice.spi.ProfileDeployment;
import org.jboss.profileservice.spi.virtual.VirtualDeployment;
import org.jboss.profileservice.version.helpers.NameAndVersionRangeSupport;
import org.jboss.profileservice.virtual.deployment.AbstractVirtualDeployment;
import org.jboss.profileservice.virtual.deployment.AbstractVirtualDeploymentRequirement;
+import org.jboss.test.profileservice.metadata.support.VirtualRepositoryMetaData;
import org.jboss.virtual.AssembledDirectory;
import org.jboss.virtual.VirtualFile;
Property changes on: projects/profileservice/trunk/core/src/test/java/org/jboss/test/profileservice/virtual/test/VirtualDeploymentAssemblyUnitTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/repository/ArtifactId.java
===================================================================
--- projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/repository/ArtifactId.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/repository/ArtifactId.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -22,12 +22,19 @@
package org.jboss.profileservice.spi.repository;
/**
+ * The artifact identifier.
+ *
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
public interface ArtifactId extends Identifyable
{
+ /**
+ * Get the artifact type.
+ *
+ * @return the artifact type
+ */
String getType();
}
Property changes on: projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/repository/ArtifactId.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/repository/ArtifactRepository.java
===================================================================
--- projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/repository/ArtifactRepository.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/repository/ArtifactRepository.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -33,7 +33,7 @@
{
/**
- * Checks wheter this repository provides the specified
+ * Checks whether this repository provides the specified
* artifact.
*
* @param artifact the artifact to resolve
Property changes on: projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/repository/ArtifactRepository.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/repository/Identifyable.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Deleted: projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/ClassPathLocation.java
===================================================================
--- projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/ClassPathLocation.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/ClassPathLocation.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.profileservice.spi.virtual;
-
-/**
- * A classpath location.
- *
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public interface ClassPathLocation extends VirtualArtifactMetaData
-{
-
-}
-
Deleted: projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/MetaDataLocation.java
===================================================================
--- projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/MetaDataLocation.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/MetaDataLocation.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.profileservice.spi.virtual;
-
-/**
- * A meta data location.
- *
- * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
- * @version $Revision$
- */
-public interface MetaDataLocation extends VirtualArtifactMetaData
-{
-
-}
-
Property changes on: projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/PathRestriction.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/VirtualArtifactMetaData.java
===================================================================
--- projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/VirtualArtifactMetaData.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/VirtualArtifactMetaData.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -47,6 +47,13 @@
* @return the excludes
*/
List<PathRestriction> getExcludes();
-
+
+ /**
+ * Is this a meta data location.
+ * TODO this should not be here
+ *
+ * @return true if this is a meta data location, false otherwise
+ */
+ boolean isMetaDataPath();
}
Property changes on: projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/VirtualArtifactMetaData.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/VirtualDeployment.java
===================================================================
--- projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/VirtualDeployment.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/VirtualDeployment.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -25,9 +25,8 @@
import org.jboss.profileservice.spi.repository.ArtifactId;
-
/**
- * The virtual deployment.
+ * The virtual deployment meta data.
*
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
@@ -50,20 +49,13 @@
ArtifactId getPath();
/**
- * Get the deployment's meta data locations.
+ * Get the deployment artifacts.
*
- * @return the meta data locations
+ * @return the artifacts
*/
- List<MetaDataLocation> getMetaDataLocations();
+ List<VirtualArtifactMetaData> getArtifacts();
/**
- * Get the deployment's classpath locations.
- *
- * @return the classpath locations
- */
- List<ClassPathLocation> getClassPathLocations();
-
- /**
* Get the children.
*
* @return the children
Property changes on: projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/VirtualDeployment.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Property changes on: projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/assembly/VirtualAssemblyContext.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
Modified: projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/assembly/VirtualDeploymentAssemblyContext.java
===================================================================
--- projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/assembly/VirtualDeploymentAssemblyContext.java 2009-09-01 10:19:24 UTC (rev 93066)
+++ projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/assembly/VirtualDeploymentAssemblyContext.java 2009-09-01 10:38:43 UTC (rev 93067)
@@ -23,8 +23,7 @@
import java.io.IOException;
-import org.jboss.profileservice.spi.virtual.ClassPathLocation;
-import org.jboss.profileservice.spi.virtual.MetaDataLocation;
+import org.jboss.profileservice.spi.virtual.VirtualArtifactMetaData;
import org.jboss.profileservice.spi.virtual.VirtualDeployment;
/**
@@ -37,21 +36,14 @@
{
/**
- * Add a class path location.
+ * Add a virtual artifact.
*
- * @param location the class path location
+ * @param artifact the artifact
+ * @throws IOException
*/
- void addClassPathLocation(ClassPathLocation location) throws IOException;
+ void addArtifact(VirtualArtifactMetaData artifact) throws IOException;
/**
- * Add meta data location.
- *
- * @param location the meta data location.
- */
- void addMetaDataLocation(MetaDataLocation location) throws IOException;
-
-
- /**
* Add a child deployment context.
*
* @param child the virtual deployment child
Property changes on: projects/profileservice/trunk/spi/src/main/java/org/jboss/profileservice/spi/virtual/assembly/VirtualDeploymentAssemblyContext.java
___________________________________________________________________
Name: svn:keywords
+ Id Date Revision
More information about the jboss-cvs-commits
mailing list