activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r807482 - in /activemq/sandbox/activemq-flow: ./ activemq-broker/ activemq-broker/src/main/java/org/apache/activemq/apollo/broker/ activemq-jaxb/ activemq-jaxb/src/ activemq-jaxb/src/main/ activemq-jaxb/src/main/java/ activemq-jaxb/src/main...
Date Tue, 25 Aug 2009 05:19:32 GMT
Author: chirino
Date: Tue Aug 25 05:19:32 2009
New Revision: 807482

URL: http://svn.apache.org/viewvc?rev=807482&view=rev
Log:
creating module to hold jaxb integration bits.

Added:
    activemq/sandbox/activemq-flow/activemq-jaxb/
    activemq/sandbox/activemq-flow/activemq-jaxb/pom.xml
    activemq/sandbox/activemq-flow/activemq-jaxb/src/
    activemq/sandbox/activemq-flow/activemq-jaxb/src/main/
    activemq/sandbox/activemq-flow/activemq-jaxb/src/main/java/
    activemq/sandbox/activemq-flow/activemq-jaxb/src/main/resources/
    activemq/sandbox/activemq-flow/activemq-jaxb/src/test/
    activemq/sandbox/activemq-flow/activemq-jaxb/src/test/java/
    activemq/sandbox/activemq-flow/activemq-jaxb/src/test/resources/
Modified:
    activemq/sandbox/activemq-flow/activemq-broker/pom.xml
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerFactory.java
    activemq/sandbox/activemq-flow/pom.xml

Modified: activemq/sandbox/activemq-flow/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/pom.xml?rev=807482&r1=807481&r2=807482&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/pom.xml (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/pom.xml Tue Aug 25 05:19:32 2009
@@ -86,7 +86,6 @@
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-transport</artifactId>
-      <version>${activemq-version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerFactory.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerFactory.java?rev=807482&r1=807481&r2=807482&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerFactory.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/BrokerFactory.java
Tue Aug 25 05:19:32 2009
@@ -58,7 +58,7 @@
      * 
      * @param brokerURI the URI scheme to configure the broker
      * @param startBroker whether or not the broker should have its
-     *                {@link BrokerService#start()} method called after
+     *                {@link Broker#start()} method called after
      *                construction
      * @throws Exception
      */
@@ -89,7 +89,7 @@
      * 
      * @param brokerURI the URI scheme to configure the broker
      * @param startBroker whether or not the broker should have its
-     *                {@link BrokerService#start()} method called after
+     *                {@link Broker#start()} method called after
      *                construction
      * @throws Exception
      */

Added: activemq/sandbox/activemq-flow/activemq-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-jaxb/pom.xml?rev=807482&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-jaxb/pom.xml (added)
+++ activemq/sandbox/activemq-flow/activemq-jaxb/pom.xml Tue Aug 25 05:19:32 2009
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="UTF-8"?>
+  <!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements. See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version
+    2.0 (the "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+    applicable law or agreed to in writing, software distributed under
+    the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+    OR CONDITIONS OF ANY KIND, either express or implied. See the
+    License for the specific language governing permissions and
+    limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.activemq</groupId>
+    <artifactId>activemq-parent</artifactId>
+    <version>6.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.apache.activemq</groupId>
+  <artifactId>activemq-jaxb</artifactId>
+  <packaging>jar</packaging>
+  <version>6.0-SNAPSHOT</version>
+
+  <name>ActiveMQ :: JAXB</name>
+  
+  <repositories>
+    <repository>
+      <id>maven2-repository.dev.java.net</id>
+      <name>Java.net Maven  Repository </name>
+      <url>http://download.java.net/maven/2</url>
+    </repository>
+    <!--<repository>-->
+      <!--<id>codehaus</id>-->
+      <!--<name>Codehaus Maven 2 Repository</name>-->
+      <!--<url>http://repository.codehaus.org/</url>-->
+    <!--</repository>-->
+  </repositories>
+    
+  <pluginRepositories>
+  	<!-- For the schemagen plugin -->
+    <pluginRepository>
+      <id>open.iona.m2</id>
+      <name>IONA Open Source Community Release Repository</name>
+      <url>http://repo.open.iona.com/maven2</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </pluginRepository>
+  </pluginRepositories>
+  
+  <dependencies>
+  
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-broker</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.woodstox</groupId>
+      <artifactId>wstx-asl</artifactId>
+      <version>4.0.0</version>
+    </dependency>
+
+    <!-- Testing Dependencies -->    
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <scope>test</scope>
+      <classifier>jdk15</classifier>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+  
+    <resources>
+      <resource>
+        <directory>target/schema</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>**/*</include>
+        </includes>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+      
+    <plugins>
+
+<!--
+
+    jaxb schemagen plugin does not work quite well for our use case (classpath problems),
+    so we're using it as an ant task (see below)
+    try to switch back to this in some future version
+
+-->
+<!--
+       <plugin>
+        <groupId>com.sun.tools.jxc.maven2</groupId>
+        <artifactId>maven-jaxb-schemagen-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>process-sources</phase>
+            <configuration>
+              <destdir>${project.build.directory}/schema</destdir>
+              <includes>
+                <include>**/jaxb/package-info.java</include>
+                <include>**/jaxb/*Xml.java</include>
+              </includes>
+              <schemas>
+                <schema>
+                  <namespace>http://activemq.apache.org/schema/activemq/apollo</namespace>
+                  <file>activemq-apollo.xsd</file>
+                </schema>
+              </schemas>
+            </configuration>
+            <goals>
+              <goal>generate</goal>
+            </goals> 
+          </execution>
+        </executions>
+      </plugin>  
+-->
+       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>generate schema</id>
+            <phase>process-sources</phase>
+            <configuration>
+                <tasks>        
+                <taskdef name="schemagen" classname="com.sun.tools.jxc.SchemaGenTask">
+                    <classpath refid="maven.compile.classpath"/>
+                </taskdef>
+                <mkdir dir="${project.build.directory}/schema"/>
+                <schemagen srcdir="${project.build.sourceDirectory}" destdir="${project.build.directory}/schema">
+                    <schema namespace="http://activemq.apache.org/schema/activemq/apollo"
file="activemq-apollo.xsd" />
+                    <classpath refid="maven.compile.classpath"/>
+                    <include name="**/jaxb/package-info.java"/>
+                    <include name="**/jaxb/*Xml.java"/>
+                </schemagen>
+                </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+        
+        <dependencies>
+          <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-xjc</artifactId>
+            <version>${xjc-version}</version>
+            <exclusions>
+              <exclusion>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+              </exclusion>
+            </exclusions>            
+          </dependency>  
+          <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>${jaxb-version}</version>
+            <exclusions>
+              <exclusion>
+                <groupId>javax.jws</groupId>
+                <artifactId>jsr181-api</artifactId>
+              </exclusion>
+            </exclusions>
+          </dependency>
+        </dependencies>
+      </plugin>
+
+    </plugins>
+  </build>
+  
+  <profiles>
+    <profile>
+      <id>jdk-1.5</id>
+      <activation>
+        <jdk>1.5</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>com.sun.xml.bind</groupId>
+          <artifactId>jaxb-impl</artifactId>
+        </dependency>
+      </dependencies>
+    </profile>
+    
+   <profile>
+      <id>ibmjdk</id>
+      <activation>
+        <file>
+          <exists>${java.home}/../lib/tools.jar</exists>
+        </file>
+      </activation>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-antrun-plugin</artifactId>
+              <dependencies>
+                <dependency>
+                  <groupId>com.sun</groupId>
+                  <artifactId>tools</artifactId>
+                  <!--the real JDK version could be 1.5 or 1.6-->
+                  <version>1.5.0</version>
+                  <scope>system</scope>
+                  <optional>true</optional>
+                  <systemPath>${java.home}/../lib/tools.jar</systemPath>
+                </dependency>
+              </dependencies>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
+  </profiles>
+
+</project>

Modified: activemq/sandbox/activemq-flow/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/pom.xml?rev=807482&r1=807481&r2=807482&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/pom.xml (original)
+++ activemq/sandbox/activemq-flow/pom.xml Tue Aug 25 05:19:32 2009
@@ -118,6 +118,7 @@
   <modules>
     <module>activemq-bio</module>
     <module>activemq-broker</module>
+    <module>activemq-jaxb</module>
     <module>activemq-dispatcher</module>
     <module>activemq-flow</module>
     <module>activemq-kaha</module>
@@ -183,6 +184,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-jaxb</artifactId>
+        <version>${activemq-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-network</artifactId>
         <version>${activemq-version}</version>
       </dependency>
@@ -243,6 +249,13 @@
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-transport</artifactId>
+        <version>${activemq-version}</version>
+        <type>test-jar</type>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-util</artifactId>
         <version>${activemq-version}</version>
       </dependency>



Mime
View raw message