[jboss-cvs] JBossAS SVN: r87140 - in projects/jboss-deployers/trunk: deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/support and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2009-04-10 15:25:50 -0400 (Fri, 10 Apr 2009)
New Revision: 87140

Modified:
   projects/jboss-deployers/trunk/build/pom.xml
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/support/ConnectorMetaData.java
Log:
Add missing @XmlType.propOrder.
Exclude dist from plain build.

Modified: projects/jboss-deployers/trunk/build/pom.xml
===================================================================
--- projects/jboss-deployers/trunk/build/pom.xml	2009-04-10 19:24:08 UTC (rev 87139)
+++ projects/jboss-deployers/trunk/build/pom.xml	2009-04-10 19:25:50 UTC (rev 87140)
@@ -12,32 +12,37 @@
   <url>http://www.jboss.com/products/jbossmc</url>
   <description> The JBoss Deployment Distribution Build. </description>
   
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-2</version>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>attached</goal>
-            </goals>
-            <configuration>
-              <finalName>jboss-deployers-${project.version}</finalName>
-              <descriptors>
-                <descriptor>src/assembly/dist.xml</descriptor>
-                <descriptor>src/assembly/dist-with-deps.xml</descriptor>
-                <descriptor>src/assembly/src.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+  <profiles>
+    <profile>
+      <id>dist</id>
+	  <build>
+	    <plugins>
+	      <plugin>
+		<groupId>org.apache.maven.plugins</groupId>
+		<artifactId>maven-assembly-plugin</artifactId>
+		<version>2.2-beta-2</version>
+		<executions>
+		  <execution>
+		    <id>make-assembly</id>
+		    <phase>package</phase>
+		    <goals>
+		      <goal>attached</goal>
+		    </goals>
+		    <configuration>
+		      <finalName>jboss-deployers-${project.version}</finalName>
+		      <descriptors>
+			<descriptor>src/assembly/dist.xml</descriptor>
+			<descriptor>src/assembly/dist-with-deps.xml</descriptor>
+			<descriptor>src/assembly/src.xml</descriptor>
+		      </descriptors>
+		    </configuration>
+		  </execution>
+		</executions>
+	      </plugin>
+	    </plugins>
+	  </build>
+    </profile>
+  </profiles>
   
   <dependencies>
     <dependency>

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/support/ConnectorMetaData.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/support/ConnectorMetaData.java	2009-04-10 19:24:08 UTC (rev 87139)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/merge/support/ConnectorMetaData.java	2009-04-10 19:25:50 UTC (rev 87140)
@@ -24,10 +24,12 @@
 import java.io.Serializable;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
 
 /**
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
+ at XmlType(propOrder = {"description", "elt"})
 public class ConnectorMetaData implements Serializable
 {
    public static final long serialVersionUID = 1l;