Return-Path: 
 <commits-return-11134-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 21341 invoked from network); 17 Jun 2009 15:52:11 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 17 Jun 2009 15:52:11 -0000
Received: (qmail 19376 invoked by uid 500); 17 Jun 2009 15:52:22 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 19337 invoked by uid 500); 17 Jun 2009 15:52:22 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 19328 invoked by uid 99); 17 Jun 2009 15:52:22 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jun 2009 15:52:22 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jun 2009 15:52:18 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id C70BC238888C; Wed, 17 Jun 2009 15:51:57 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r785689 - in
 /activemq/sandbox/activemq-flow/activemq-broker:
 pom.xml src/main/java/org/apache/activemq/apollo/jaxb/VirtualHostXml.java
Date: Wed, 17 Jun 2009 15:51:57 -0000
To: commits@activemq.apache.org
From: dejanb@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090617155157.C70BC238888C@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dejanb
Date: Wed Jun 17 15:51:57 2009
New Revision: 785689

URL: http://svn.apache.org/viewvc?rev=785689&view=rev
Log:
initial jaxb schema generation work

Modified:
    activemq/sandbox/activemq-flow/activemq-broker/pom.xml
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/jaxb/VirtualHostXml.java

Modified: activemq/sandbox/activemq-flow/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/pom.xml?rev=785689&r1=785688&r2=785689&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/pom.xml (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/pom.xml Wed Jun 17 15:51:57 2009
@@ -142,10 +142,13 @@
         <artifactId>maven-jaxb-schemagen-plugin</artifactId>
         <executions>
           <execution>
-            <phase>compile</phase>
+            <phase>process-sources</phase>
             <configuration>
               <destdir>${project.build.directory}/schema</destdir>
-              <srcdir>${project.build.directory}/schema-src</srcdir>
+              <includes>
+                <include>**/jaxb/package-info.java</include>
+                <include>**/jaxb/*Xml.java</include>
+              </includes>
               <schemas>
                 <schema>
                   <namespace>http://activemq.apache.org/schema/activemq/apollo</namespace>
@@ -154,6 +157,9 @@
               </schemas>
               <!--<verbose>false</verbose>-->
             </configuration>
+            <goals>
+              <goal>generate</goal>
+            </goals> 
           </execution>
         </executions>
       </plugin>  

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/jaxb/VirtualHostXml.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/jaxb/VirtualHostXml.java?rev=785689&r1=785688&r2=785689&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/jaxb/VirtualHostXml.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/jaxb/VirtualHostXml.java Wed Jun 17 15:51:57 2009
@@ -23,6 +23,7 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
@@ -55,13 +56,7 @@
 		VirtualHost rc = new VirtualHost();
 		rc.setHostNames(hostNames);
 		
-//		if( !store.isEmpty() ) {
-//			if( store.size() > 1 )  {
-//				throw new Exception("Only one store is allowed.");
-//			}
-//			rc.setStore(store.get(0).createStore());
-//		}
-		if( store!=null ) {
+		if( store != null ) {
 			rc.setStore(store.createStore());
 		}
 		return rc;