[jboss-cvs] JBossAS SVN: r97081 - in projects/profileservice/trunk/core/src: main/java/org/jboss/profileservice/profile/metadata and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Nov 27 07:24:48 EST 2009


Author: emuckenhuber
Date: 2009-11-27 07:24:48 -0500 (Fri, 27 Nov 2009)
New Revision: 97081

Modified:
   projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/bootstrap/BootstrapProfileContextFactory.java
   projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/BasicProfileDeploymentMetaData.java
   projects/profileservice/trunk/core/src/test/resources/bootstrap/basic.profile
   projects/profileservice/trunk/core/src/test/resources/bootstrap/bootstrap.profile
   projects/profileservice/trunk/core/src/test/resources/metadata/profiles/clustering.profile
   projects/profileservice/trunk/core/src/test/resources/metadata/profiles/default.profile
   projects/profileservice/trunk/core/src/test/resources/metadata/profiles/ejb3.profile
   projects/profileservice/trunk/core/src/test/resources/metadata/profiles/jboss-web.profile
   projects/profileservice/trunk/core/src/test/resources/metadata/profiles/jmx.profile
   projects/profileservice/trunk/core/src/test/resources/metadata/profiles/metadata-deployers.profile
   projects/profileservice/trunk/core/src/test/resources/metadata/profiles/seam.profile
Log:
[JBPROFILE-4] update deployment meta data

Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/bootstrap/BootstrapProfileContextFactory.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/bootstrap/BootstrapProfileContextFactory.java	2009-11-27 12:22:41 UTC (rev 97080)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/bootstrap/BootstrapProfileContextFactory.java	2009-11-27 12:24:48 UTC (rev 97081)
@@ -80,7 +80,7 @@
       {
          for(BasicProfileDeploymentMetaData deployment : metaData.getDeployments())
          {
-            deploymentNames.add(deployment.getName());
+            deploymentNames.add(deployment.getPath());
          }
       }
       return deploymentNames;

Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/BasicProfileDeploymentMetaData.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/BasicProfileDeploymentMetaData.java	2009-11-27 12:22:41 UTC (rev 97080)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/BasicProfileDeploymentMetaData.java	2009-11-27 12:24:48 UTC (rev 97081)
@@ -21,8 +21,9 @@
  */ 
 package org.jboss.profileservice.profile.metadata;
 
-import javax.xml.bind.annotation.XmlValue;
+import javax.xml.bind.annotation.XmlAttribute;
 
+import org.jboss.profileservice.repository.artifact.file.FileArtifactId;
 import org.jboss.profileservice.spi.metadata.ProfileDeploymentMetaData;
 import org.jboss.profileservice.spi.metadata.ProfileMetaDataVisitor;
 
@@ -32,22 +33,16 @@
  * @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
  * @version $Revision$
  */
-public class BasicProfileDeploymentMetaData implements ProfileDeploymentMetaData
+public class BasicProfileDeploymentMetaData extends FileArtifactId implements ProfileDeploymentMetaData
 {
-
-   /** The deployment name. */
-   private String name;
    
-   @XmlValue
-   public String getName()
+   @Override
+   @XmlAttribute(name = "name")
+   public String getPath()
    {
-      return this.name;
+      // FIXME getPath
+      return super.getPath();
    }
-   
-   public void setName(String name)
-   {
-      this.name = name;
-   }
 
    public void visit(ProfileMetaDataVisitor visitor)
    {

Modified: projects/profileservice/trunk/core/src/test/resources/bootstrap/basic.profile
===================================================================
--- projects/profileservice/trunk/core/src/test/resources/bootstrap/basic.profile	2009-11-27 12:22:41 UTC (rev 97080)
+++ projects/profileservice/trunk/core/src/test/resources/bootstrap/basic.profile	2009-11-27 12:24:48 UTC (rev 97081)
@@ -2,7 +2,7 @@
 <profiles xmlns="urn:jboss:profileservice:profiles:1.0" name="bootstrap">
 
 	<profile name="test-profile">
-		<deployment>basic.profile</deployment>
+		<deployment name="basic.profile" />
 	</profile>
 
 </profiles>
\ No newline at end of file

Modified: projects/profileservice/trunk/core/src/test/resources/bootstrap/bootstrap.profile
===================================================================
--- projects/profileservice/trunk/core/src/test/resources/bootstrap/bootstrap.profile	2009-11-27 12:22:41 UTC (rev 97080)
+++ projects/profileservice/trunk/core/src/test/resources/bootstrap/bootstrap.profile	2009-11-27 12:24:48 UTC (rev 97081)
@@ -5,7 +5,7 @@
 		<profile-source>
 			<source>${jboss.common.deployments.url}</source>	
 		</profile-source>
-		<deployment>profile.xml</deployment>
+		<deployment name="profile.xml" />
 	</bootstrap-profile>
 
 </profiles>
\ No newline at end of file

Modified: projects/profileservice/trunk/core/src/test/resources/metadata/profiles/clustering.profile
===================================================================
--- projects/profileservice/trunk/core/src/test/resources/metadata/profiles/clustering.profile	2009-11-27 12:22:41 UTC (rev 97080)
+++ projects/profileservice/trunk/core/src/test/resources/metadata/profiles/clustering.profile	2009-11-27 12:24:48 UTC (rev 97081)
@@ -7,14 +7,14 @@
 		<profile-source>
 			<source>${jboss.server.base.url}deployers</source>
 		</profile-source>
-		<deployment>clustering-deployer-jboss-beans.xml</deployment>
+		<deployment name="clustering-deployer-jboss-beans.xml" />
 	</profile>
 
 	<profile name="clustering-runtime">
 		<profile-source>
 			<source>${jboss.server.base.url}deploy</source>
 		</profile-source>
-		<deployment>httpha-invoker.sar</deployment>
+		<deployment name="httpha-invoker.sar" />
 	</profile>
 
 </profiles>
\ No newline at end of file

Modified: projects/profileservice/trunk/core/src/test/resources/metadata/profiles/default.profile
===================================================================
--- projects/profileservice/trunk/core/src/test/resources/metadata/profiles/default.profile	2009-11-27 12:22:41 UTC (rev 97080)
+++ projects/profileservice/trunk/core/src/test/resources/metadata/profiles/default.profile	2009-11-27 12:24:48 UTC (rev 97081)
@@ -5,7 +5,7 @@
 		<profile-source>
 			<source>${jboss.server.base.url}conf</source>	
 		</profile-source>
-		<deployment>someDeployment</deployment>
+		<deployment name="someDeployment" />
 	</profile>
 
 	<profile name="default">

Modified: projects/profileservice/trunk/core/src/test/resources/metadata/profiles/ejb3.profile
===================================================================
--- projects/profileservice/trunk/core/src/test/resources/metadata/profiles/ejb3.profile	2009-11-27 12:22:41 UTC (rev 97080)
+++ projects/profileservice/trunk/core/src/test/resources/metadata/profiles/ejb3.profile	2009-11-27 12:24:48 UTC (rev 97081)
@@ -8,16 +8,16 @@
 			<source>${jboss.server.base.url}deployers</source>
 		</profile-source>
 		<requires name="metadata-deployers" />
-		<deployment>ejb3.deployer</deployment>
+		<deployment name="ejb3.deployer" />
 	</profile>
 
 	<profile name="ejb3-runtime">
 		<profile-source>
 			<source>${jboss.server.base.url}deploy</source>
 		</profile-source>
-		<deployment>ejb3-container-jboss-beans.xml</deployment>
-		<deployment>ejb3-interceptors-aop.xml</deployment>
-		<deployment>ejb3-timer-service.xml</deployment>
+		<deployment name="ejb3-container-jboss-beans.xml" />
+		<deployment name="ejb3-interceptors-aop.xml" />
+		<deployment name="ejb3-timer-service.xml" />
 	</profile>
 
 </profiles>
\ No newline at end of file

Modified: projects/profileservice/trunk/core/src/test/resources/metadata/profiles/jboss-web.profile
===================================================================
--- projects/profileservice/trunk/core/src/test/resources/metadata/profiles/jboss-web.profile	2009-11-27 12:22:41 UTC (rev 97080)
+++ projects/profileservice/trunk/core/src/test/resources/metadata/profiles/jboss-web.profile	2009-11-27 12:24:48 UTC (rev 97081)
@@ -8,14 +8,14 @@
 			<source>${jboss.server.base.url}deployers</source>
 		</profile-source>
 		<requires name="metadata-deployers" />
-		<deployment>jbossweb.deployer</deployment>
+		<deployment name="jbossweb.deployer" />
 	</profile>
 	
 	<profile name="jboss-web-runtime">
 		<profile-source>
 			<source>${jboss.server.base.url}deploy</source>
 		</profile-source>
-		<deployment>jbossweb.sar</deployment>
+		<deployment name="jbossweb.sar" />
 	</profile>
 
 </profiles>
\ No newline at end of file

Modified: projects/profileservice/trunk/core/src/test/resources/metadata/profiles/jmx.profile
===================================================================
--- projects/profileservice/trunk/core/src/test/resources/metadata/profiles/jmx.profile	2009-11-27 12:22:41 UTC (rev 97080)
+++ projects/profileservice/trunk/core/src/test/resources/metadata/profiles/jmx.profile	2009-11-27 12:24:48 UTC (rev 97081)
@@ -7,7 +7,7 @@
 		<profile-source>
 			<source>${jboss.server.base.url}conf</source>
 		</profile-source>
-		<deployment>jboss-service.xml</deployment>
+		<deployment name="jboss-service.xml" />
 	</profile>
 
 </profiles>
\ No newline at end of file

Modified: projects/profileservice/trunk/core/src/test/resources/metadata/profiles/metadata-deployers.profile
===================================================================
--- projects/profileservice/trunk/core/src/test/resources/metadata/profiles/metadata-deployers.profile	2009-11-27 12:22:41 UTC (rev 97080)
+++ projects/profileservice/trunk/core/src/test/resources/metadata/profiles/metadata-deployers.profile	2009-11-27 12:24:48 UTC (rev 97081)
@@ -7,7 +7,7 @@
 		<profile-source>
 			<source>${jboss.server.base.url}deployers</source>
 		</profile-source>
-		<deployment>metadata-deployer-jboss-beans.xml</deployment>
+		<deployment name="metadata-deployer-jboss-beans.xml" />
 	</profile>
 
 </profiles>
\ No newline at end of file

Modified: projects/profileservice/trunk/core/src/test/resources/metadata/profiles/seam.profile
===================================================================
--- projects/profileservice/trunk/core/src/test/resources/metadata/profiles/seam.profile	2009-11-27 12:22:41 UTC (rev 97080)
+++ projects/profileservice/trunk/core/src/test/resources/metadata/profiles/seam.profile	2009-11-27 12:24:48 UTC (rev 97081)
@@ -8,7 +8,7 @@
 			<source>${jboss.server.base.url}deployers</source>
 		</profile-source>
 		<requires name="ejb3" />
-		<deployment>seam.deployer</deployment>
+		<deployment name="seam.deployer" />
 	</profile>
 
 </profiles>
\ No newline at end of file




More information about the jboss-cvs-commits mailing list