svn commit: r1162575 - in /activemq/activemq-apollo/trunk: apollo-dto/pom.xml apollo-website/pom.xml

[chirino]

Author: chirino
Date: Sun Aug 28 19:13:11 2011
New Revision: 1162575

URL: http://svn.apache.org/viewvc?rev=1162575&view=rev
Log:
Generate the schema in the website module the same way as we do in the dto 
module.

Modified:
    activemq/activemq-apollo/trunk/apollo-dto/pom.xml
    activemq/activemq-apollo/trunk/apollo-website/pom.xml

Modified: activemq/activemq-apollo/trunk/apollo-dto/pom.xml
URL: 
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-dto/pom.xml?rev=1162575&r1=1162574&r2=1162575&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-dto/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-dto/pom.xml Sun Aug 28 19:13:11 2011
@@ -113,6 +113,7 @@
                   <classpath refid="maven.compile.classpath" />
                   <include name="**/package-info.java" />
                   <include name="**/*DTO.java" />
+                  <exclude name="apollo-openwire/**" />
                   <exclude name="apollo-hawtdb/**" />
                   <exclude name="apollo-cassandra/**" />
                   <exclude name="**/.git/**" />

Modified: activemq/activemq-apollo/trunk/apollo-website/pom.xml
URL: 
http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-website/pom.xml?rev=1162575&r1=1162574&r2=1162575&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-website/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-website/pom.xml Sun Aug 28 19:13:11 
2011
@@ -163,65 +163,30 @@
       </plugin>
       
       <plugin>
-        <groupId>com.sun.tools.jxc.maven2</groupId>
-        <artifactId>maven-jaxb-schemagen-plugin</artifactId>
-        <version>1.3-dev</version>
-        <dependencies>
-           <dependency>
-              <groupId>javax.xml.bind</groupId>
-              <artifactId>jaxb-api</artifactId>
-              <version>${jaxb-api-version}</version>
-           </dependency>
-           <dependency>
-              <groupId>com.sun.xml.bind</groupId>
-              <artifactId>jaxb-impl</artifactId>
-              <version>${jaxb-version}</version>
-           </dependency>
-           <dependency>
-              <groupId>com.sun.xml.bind</groupId>
-              <artifactId>jaxb-xjc</artifactId>
-              <version>${jaxb-version}</version>
-           </dependency>
-        </dependencies>
-        
-        <executions>
-          <execution>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-            <configuration>
-              <destdir>${basedir}/target/sitegen/documentation/schema</destdir>
-              <srcdir>${basedir}/..</srcdir>
-              <includes>
-                <include>**/package-info.java</include>
-                <include>**/*DTO.java</include>
-              </includes>
-              <excludes>
-                <exclude>apollo-hawtdb/**</exclude>
-                <exclude>apollo-cassandra/**</exclude>
-                <exclude>apollo-openwire/**</exclude>
-                <exclude>**/.git/**</exclude>
-                <exclude>**/.svn/**</exclude>
-              </excludes>
-              <schemas>
-                <schema>
-                  
<namespace>http://activemq.apache.org/schema/activemq/apollo</namespace>
-                  <file>apollo.xsd</file>
-                </schema>
-              </schemas>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <version>1.6</version>
         <executions>
           <execution>
-            <phase>compile</phase>
+            <phase>process-sources</phase>
             <configuration>
               <tasks>
+                <taskdef name="schemagen" 
classname="com.sun.tools.jxc.SchemaGenTask">
+                  <classpath refid="maven.compile.classpath" />
+                </taskdef>
+
+                <mkdir dir="${basedir}/target/sitegen/documentation/schema" />
+                <schemagen srcdir="${basedir}/.." 
destdir="${basedir}/target/sitegen/documentation/schema" 
includeantruntime="false">
+                  <schema 
namespace="http://activemq.apache.org/schema/activemq/apollo"; file="apollo.xsd" 
/>
+                  <classpath refid="maven.compile.classpath" />
+                  <include name="**/package-info.java" />
+                  <include name="**/*DTO.java" />
+                  <exclude name="apollo-openwire/**" />
+                  <exclude name="apollo-cassandra/**" />
+                  <exclude name="apollo-hawtdb/**" />
+                  <exclude name="**/.git/**" />
+                  <exclude name="**/.svn/**" />
+                </schemagen>
+
                 <replace token="&lt;xs:sequence&gt;" value="&lt;xs:choice 
minOccurs=&quot;0&quot; maxOccurs=&quot;unbounded&quot;&gt;&lt;xs:choice&gt;" 
dir="${basedir}/target/sitegen/documentation/schema">
                   <include name="**/*.xsd" />
                 </replace>
@@ -235,6 +200,23 @@
             </goals>
           </execution>
         </executions>
+        <dependencies>
+           <dependency>
+              <groupId>javax.xml.bind</groupId>
+              <artifactId>jaxb-api</artifactId>
+              <version>${jaxb-api-version}</version>
+           </dependency>
+           <dependency>
+              <groupId>com.sun.xml.bind</groupId>
+              <artifactId>jaxb-impl</artifactId>
+              <version>${jaxb-version}</version>
+           </dependency>
+           <dependency>
+              <groupId>com.sun.xml.bind</groupId>
+              <artifactId>jaxb-xjc</artifactId>
+              <version>${jaxb-version}</version>
+           </dependency>
+        </dependencies>      
       </plugin>
         
     </plugins>