From activemq-commits-return-114-apmail-geronimo-activemq-commits-archive=geronimo.apache.org@geronimo.apache.org Thu Dec 22 05:44:05 2005
Return-Path: <activemq-commits-return-114-apmail-geronimo-activemq-commits-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org
Received: (qmail 97981 invoked from network); 22 Dec 2005 05:44:05 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 22 Dec 2005 05:44:05 -0000
Received: (qmail 539 invoked by uid 500); 22 Dec 2005 05:44:05 -0000
Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org
Received: (qmail 521 invoked by uid 500); 22 Dec 2005 05:44:04 -0000
Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:activemq-commits-help@geronimo.apache.org>
List-Unsubscribe: <mailto:activemq-commits-unsubscribe@geronimo.apache.org>
List-Post: <mailto:activemq-commits@geronimo.apache.org>
List-Id: <activemq-commits.geronimo.apache.org>
Reply-To: activemq-dev@geronimo.apache.org
Delivered-To: mailing list activemq-commits@geronimo.apache.org
Received: (qmail 512 invoked by uid 99); 22 Dec 2005 05:44:04 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Dec 2005 21:44:04 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Wed, 21 Dec 2005 21:44:03 -0800
Received: (qmail 97833 invoked by uid 65534); 22 Dec 2005 05:43:43 -0000
Message-ID: <20051222054343.97832.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r358505 - /incubator/activemq/trunk/activemq-core/pom.xml
Date: Thu, 22 Dec 2005 05:43:43 -0000
To: activemq-commits@geronimo.apache.org
From: chirino@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: chirino
Date: Wed Dec 21 21:43:38 2005
New Revision: 358505

URL: http://svn.apache.org/viewcvs?rev=358505&view=rev
Log:
Enhanced the pom so that it generates the xbean metadata and uses javacc to build the selectors

Modified:
    incubator/activemq/trunk/activemq-core/pom.xml

Modified: incubator/activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/pom.xml?rev=358505&r1=358504&r2=358505&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/pom.xml (original)
+++ incubator/activemq/trunk/activemq-core/pom.xml Wed Dec 21 21:43:38 2005
@@ -19,7 +19,11 @@
       <!-- Configure which tests are included/excuded -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
+<!--
+        <version>2.1.2-SNAPSHOT</version>
+-->
         <configuration>
+          <forkMode>pertest</forkMode>
           <excludes>
             <!-- These tests run too slow to execute as part of the unit tests -->
             <exclude implementation="java.lang.String">**/DefaultStoreBrokerTest.*</exclude>
@@ -45,18 +49,59 @@
         </executions>
       </plugin>
 
-<!--
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javacc-plugin</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <phase>generate-sources</phase>
-        <configuration>
-          <sourceDirectory>src/main/grammar</sourceDirectory>
-          <outputDirectory>src/main/java</outputDirectory>
-        </configuration>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <configuration>
+              <tasks>
+
+                <mkdir dir="${basedir}/target/generated"/>
+                <taskdef name="xsdGenerate" classname="org.xbean.spring.generator.MappingGeneratorTask"/>
+                <xsdGenerate 
+                    destFile="${basedir}/target/activemq-${version}.xsd" 
+                    namespace="http://activemq.org/config/1.0"
+                    srcdir="${basedir}/src/main/java"  
+                    metaInfDir="${basedir}/target/generated/"/>
+            
+                <copy file="${basedir}/target/activemq-${version}.xsd" todir="${basedir}/../xdocs"/>
+                <copy file="${basedir}/target/activemq-${version}.xsd.html" todir="${basedir}/../xdocs"/>
+
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>xbean</groupId>
+            <artifactId>xbean-spring</artifactId>
+            <version>2.0</version>
+          </dependency>
+        </dependencies>
       </plugin>
--->
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>javacc-maven-plugin</artifactId>
+        <version>0.6.1-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <phase>generate-sources</phase>
+            <configuration>
+              <sourceDirectory>src/main/grammar</sourceDirectory>
+              <outputDirectory>src/main/java/org/activemq/selector</outputDirectory>
+            </configuration>
+            <goals>
+              <goal>javacc</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
   </build>