You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2009/06/17 17:51:57 UTC
svn commit: r785689 - in /activemq/sandbox/activemq-flow/activemq-broker:
pom.xml src/main/java/org/apache/activemq/apollo/jaxb/VirtualHostXml.java
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;