You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2010/07/07 05:41:33 UTC

svn commit: r961069 [2/2] - in /activemq/sandbox/activemq-apollo-actor: ./ activemq-broker/ activemq-broker/src/main/java/org/apache/activemq/apollo/broker/ activemq-broker/src/main/scala/org/apache/activemq/apollo/broker/ activemq-broker/src/test/scal...

Modified: activemq/sandbox/activemq-apollo-actor/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/pom.xml Wed Jul  7 03:41:30 2010
@@ -24,10 +24,11 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.activemq</groupId>
-  <artifactId>activemq-parent</artifactId>
+  <artifactId>activemq-project</artifactId>
   <version>6.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <name>ActiveMQ POM</name>
+
+  <name>ActiveMQ Project</name>
   <inceptionYear>2005</inceptionYear>
 
   <properties>
@@ -87,7 +88,8 @@
     <xstream-version>1.3.1</xstream-version>
     <xbean-version>3.4</xbean-version>
     <felix-version>1.0.0</felix-version>
-    
+
+    <activemq-protobuf-version>1.1-SNAPSHOT</activemq-protobuf-version>
     <hawtdispatch-version>1.0-SNAPSHOT</hawtdispatch-version>
     <hawtdb-version>1.1-SNAPSHOT</hawtdb-version>
 
@@ -134,6 +136,7 @@
     <module>activemq-hawtdb</module>
     <module>activemq-jaxb</module>
     <module>activemq-scala</module>
+    <module>activemq-stomp</module>
   </modules>
 
   <scm>
@@ -167,127 +170,9 @@
 
   <dependencyManagement>
     <dependencies>
-      <!-- =============================== -->
-      <!-- Internal ActiveMQ Dependencies -->
-      <!-- =============================== -->
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-all</artifactId>
-        <version>${activemq-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-queue</artifactId>
-        <version>${activemq-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-selector</artifactId>
-        <version>${activemq-version}</version>
-      </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>
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-client</artifactId>
-        <version>${activemq-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>kahadb</artifactId>
-        <version>${activemq-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-bio</artifactId>
-        <version>${activemq-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-broker</artifactId>
-        <version>${activemq-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-broker</artifactId>
-        <version>${activemq-version}</version>
-        <type>test-jar</type>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-dispatcher</artifactId>
-        <version>${activemq-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-flow</artifactId>
-        <version>${activemq-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-kaha</artifactId>
-        <version>${activemq-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-openwire</artifactId>
-        <version>${activemq-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-stomp</artifactId>
-        <version>${activemq-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-store</artifactId>
-        <version>${activemq-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-transport</artifactId>
-        <version>${activemq-version}</version>
-      </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>
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-jmx</artifactId>
-        <version>${activemq-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-spring</artifactId>
-        <version>${activemq-version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.activemq.protobuf</groupId>
-        <artifactId>activemq-protobuf</artifactId>
-        <version>1.1-SNAPSHOT</version>
-      </dependency>
 
       <!-- =============================== -->
-      <!-- Required dependencies -->
+      <!-- Setup default exclusions -->
       <!-- =============================== -->
       <dependency>
         <groupId>commons-logging</groupId>
@@ -312,519 +197,20 @@
           </exclusion>
         </exclusions>
       </dependency>
-      <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging-api</artifactId>
-        <version>${commons-logging-version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jms_1.1_spec</artifactId>
-        <version>1.1.1</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-        <version>1.0.1</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
-        <version>1.0</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jacc_1.1_spec</artifactId>
-        <version>1.0.1</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-        <version>2.0.0</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jsp_2.1_spec</artifactId>
-        <version>1.0.1</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-servlet_2.5_spec</artifactId>
-        <version>1.2</version>
-      </dependency>
-
-
-      <!-- =============================== -->
-      <!-- Optional dependencies -->
-      <!-- =============================== -->
-
-      <!--<dependency>-->
-        <!--<groupId>org.apache.camel</groupId>-->
-        <!--<artifactId>camel-core</artifactId>-->
-        <!--<version>${camel-version}</version>-->
-      <!--</dependency>-->
-      <!--<dependency>-->
-        <!--<groupId>org.apache.camel</groupId>-->
-        <!--<artifactId>camel-spring</artifactId>-->
-        <!--<version>${camel-version}</version>-->
-      <!--</dependency>-->
-      <!--<dependency>-->
-        <!--<groupId>org.apache.camel</groupId>-->
-        <!--<artifactId>camel-jetty</artifactId>-->
-        <!--<version>${camel-version}</version>-->
-      <!--</dependency>-->
-      <!--<dependency>-->
-        <!--<groupId>org.apache.camel</groupId>-->
-        <!--<artifactId>camel-jms</artifactId>-->
-        <!--<version>${camel-version}</version>-->
-      <!--</dependency>-->
-      <!--<dependency>-->
-        <!--<groupId>org.apache.camel</groupId>-->
-        <!--<artifactId>camel-web</artifactId>-->
-        <!--<version>${camel-version}</version>-->
-        <!--<type>war</type>-->
-      <!--</dependency>-->
-
-      <dependency>
-        <groupId>org.apache.hadoop.zookeeper</groupId>
-        <artifactId>zookeeper</artifactId>
-        <version>3.0.0</version>
-        <optional>true</optional>
-      </dependency>
-
-      <!-- for the XML parsing -->
-      <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
-        <version>${jaxb-api-version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>javax.xml</groupId>
-            <artifactId>jsr173</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>
-      <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-xjc</artifactId>
-        <version>${xjc-version}</version>
-      </dependency>
-
-      <!-- camel testing -->
-      <!--<dependency>-->
-        <!--<groupId>org.apache.camel</groupId>-->
-        <!--<artifactId>camel-core</artifactId>-->
-        <!--<version>${camel-version}</version>-->
-        <!--<type>test-jar</type>-->
-        <!--<scope>test</scope>-->
-      <!--</dependency>-->
-      <!--<dependency>-->
-        <!--<groupId>org.apache.camel</groupId>-->
-        <!--<artifactId>camel-spring</artifactId>-->
-        <!--<version>${camel-version}</version>-->
-        <!--<type>test-jar</type>-->
-        <!--<scope>test</scope>-->
-      <!--</dependency>-->
-
-
-      <!--  for custom XML parsing -->
-      <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-spring</artifactId>
-        <version>${xbean-version}</version>
-        <optional>true</optional>
-        <exclusions>
-          <exclusion>
-            <groupId>qdox</groupId>
-            <artifactId>qdox</artifactId>
-          </exclusion>
-        </exclusions>
-
-      </dependency>
-
-      <!-- Used to configure the activemq logs -->
-      <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>${log4j-version}</version>
-        <scope>runtime</scope>
-      </dependency>
-
-      <!-- used to support optional transport configuration via URI query strings -->
-
-      <dependency>
-        <groupId>commons-beanutils</groupId>
-        <artifactId>commons-beanutils</artifactId>
-        <version>${commons-beanutils-version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>commons-collections</groupId>
-        <artifactId>commons-collections</artifactId>
-        <version>${commons-collections-version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.openjpa</groupId>
-        <artifactId>openjpa-persistence-jdbc</artifactId>
-        <version>${openjpa-version}</version>
-      </dependency>
-
-      <!-- Optional Spring Support -->
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-aop</artifactId>
-        <version>${spring-version}</version>
-        <optional>true</optional>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-beans</artifactId>
-        <version>${spring-version}</version>
-        <optional>true</optional>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-context</artifactId>
-        <version>${spring-version}</version>
-        <optional>true</optional>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-core</artifactId>
-        <version>${spring-version}</version>
-        <optional>true</optional>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-jms</artifactId>
-        <version>${spring-version}</version>
-        <optional>true</optional>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-tx</artifactId>
-        <version>${spring-version}</version>
-        <optional>true</optional>
-      </dependency>
-
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-webmvc</artifactId>
-        <version>${spring-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-web</artifactId>
-        <version>${spring-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-test</artifactId>
-        <version>${spring-version}</version>
-      </dependency>
-
-      <!-- Optional Derby support-->
-      <dependency>
-        <groupId>org.apache.derby</groupId>
-        <artifactId>derby</artifactId>
-        <version>${org-apache-derby-version}</version>
-        <optional>true</optional>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.derby</groupId>
-        <artifactId>derbynet</artifactId>
-        <version>${org-apache-derby-version}</version>
-        <optional>true</optional>
-      </dependency>
-
-      <!-- Optional Axion support -->
-      <dependency>
-        <groupId>axion</groupId>
-        <artifactId>axion</artifactId>
-        <version>${axion-version}</version>
-        <optional>true</optional>
-      </dependency>
-
-      <dependency>
-        <groupId>commons-primitives</groupId>
-        <artifactId>commons-primitives</artifactId>
-        <version>${commons-primitives-version}</version>
-        <optional>true</optional>
-      </dependency>
-
-      <dependency>
-        <groupId>regexp</groupId>
-        <artifactId>regexp</artifactId>
-        <version>${regexp-version}</version>
-        <optional>true</optional>
-      </dependency>
-
-      <dependency>
-        <groupId>commons-dbcp</groupId>
-        <artifactId>commons-dbcp</artifactId>
-        <version>${commons-dbcp-version}</version>
-        <optional>true</optional>
-      </dependency>
-
-      <dependency>
-        <groupId>commons-pool</groupId>
-        <artifactId>commons-pool</artifactId>
-        <version>${commons-pool-version}</version>
-        <optional>true</optional>
-      </dependency>
-
-      <!-- Optional Jabber support -->
-      <!--<dependency>-->
-        <!--<groupId>activemq</groupId>-->
-        <!--<artifactId>smack</artifactId>-->
-        <!--<version>1.5.0</version>-->
-        <!--<optional>true</optional>-->
-      <!--</dependency>-->
-
-      <!--<dependency>-->
-        <!--<groupId>activemq</groupId>-->
-        <!--<artifactId>smackx</artifactId>-->
-        <!--<version>1.5.0</version>-->
-        <!--<optional>true</optional>-->
-      <!--</dependency>-->
-
-      <!-- =============================== -->
-      <!-- XML processing dependencies -->
-      <!-- =============================== -->
-      <!-- For XMLBeans -->
-      <dependency>
-        <groupId>xmlbeans</groupId>
-        <artifactId>xbean</artifactId>
-        <version>${xmlbeans-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>xmlbeans</groupId>
-        <artifactId>xmlpublic</artifactId>
-        <version>${xmlbeans-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>xmlbeans</groupId>
-        <artifactId>xbean_xpath</artifactId>
-        <version>${xmlbeans-version}</version>
-      </dependency>
-
-      <!-- For Stax -->
-      <dependency>
-        <groupId>stax</groupId>
-        <artifactId>stax-api</artifactId>
-        <version>${stax-api-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>stax</groupId>
-        <artifactId>stax</artifactId>
-        <version>${stax-version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>xalan</groupId>
-        <artifactId>xalan</artifactId>
-        <version>2.6.0</version>
-      </dependency>
-
+      
       <dependency>
         <groupId>com.thoughtworks.xstream</groupId>
         <artifactId>xstream</artifactId>
         <version>${xstream-version}</version>
         <exclusions>
           <exclusion>
-            <!-- xom is an optional dependency of xstream. Its also 
-              LGPL, so its really not ASF compatible. -->
+            <!-- xom is an optional dependency of xstream and not ASF compatible. -->
             <groupId>xom</groupId>
             <artifactId>xom</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
 
-      <dependency>
-        <groupId>xmlpull</groupId>
-        <artifactId>xmlpull</artifactId>
-        <version>${xmlpull-version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jsp-2.1</artifactId>
-        <version>${jetty-version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty-util</artifactId>
-        <version>${jetty-version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty-xbean</artifactId>
-        <version>${jetty-version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty</artifactId>
-        <version>${jetty-version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>axis</groupId>
-        <artifactId>axis</artifactId>
-        <version>${axis-version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>commons-httpclient</groupId>
-        <artifactId>commons-httpclient</artifactId>
-        <version>${commons-httpclient-version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>aopalliance</groupId>
-        <artifactId>aopalliance</artifactId>
-        <version>${aopalliance-version}</version>
-      </dependency>
-
-      <!-- testing dependencies -->
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>${junit-version}</version>
-        <scope>test</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>jmock</groupId>
-        <artifactId>jmock</artifactId>
-        <version>${jmock-version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>jmock</groupId>
-        <artifactId>jmock-cglib</artifactId>
-        <version>${jmock-version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>cglib</groupId>
-        <artifactId>cglib-full</artifactId>
-        <version>${cglib-version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-all</artifactId>
-        <version>1.1</version>
-        <scope>test</scope>
-      </dependency>
-
-      <dependency>
-        <groupId>annogen</groupId>
-        <artifactId>annogen</artifactId>
-        <version>${annogen-version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>ant</groupId>
-        <artifactId>ant</artifactId>
-        <version>${ant-version}</version>
-      </dependency>
-
-      <!-- ACTIVEMQ-WEB Specific Dependencies -->
-      <dependency>
-        <groupId>rome</groupId>
-        <artifactId>rome</artifactId>
-        <version>${rome-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>jdom</groupId>
-        <artifactId>jdom</artifactId>
-        <version>${jdom-version}</version>
-      </dependency>
-
-      <!--<dependency>-->
-        <!--<groupId>p2psockets</groupId>-->
-        <!--<artifactId>p2psockets-core</artifactId>-->
-        <!--<version>${p2psockets-version}</version>-->
-      <!--</dependency>-->
-      <!--<dependency>-->
-        <!--<groupId>jxta</groupId>-->
-        <!--<artifactId>jxta</artifactId>-->
-        <!--<version>${jxta-version}</version>-->
-      <!--</dependency>-->
-
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <version>${slf4j-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-jcl</artifactId>
-        <version>${slf4j-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
-        <version>${slf4j-version}</version>
-      </dependency>
-      <dependency>
-        <groupId>opensymphony</groupId>
-        <artifactId>sitemesh</artifactId>
-        <version>2.2.1</version>
-      </dependency>
-      <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>jstl</artifactId>
-        <version>1.0</version>
-      </dependency>
-      <dependency>
-        <groupId>taglibs</groupId>
-        <artifactId>standard</artifactId>
-        <version>1.1.2</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.geronimo.components</groupId>
-        <artifactId>geronimo-transaction</artifactId>
-        <version>2.1</version>
-      </dependency>
-
-
-      <!--<dependency>-->
-        <!--<groupId>org.apache.servicemix.kernel</groupId>-->
-        <!--<artifactId>apache-servicemix-kernel</artifactId>-->
-        <!--<version>${servicemix.kernel.version}</version>-->
-        <!--<type>zip</type>-->
-      <!--</dependency>-->
-      <!--<dependency>-->
-        <!--<groupId>org.apache.servicemix.kernel</groupId>-->
-        <!--<artifactId>apache-servicemix-kernel</artifactId>-->
-        <!--<version>${servicemix.kernel.version}</version>-->
-        <!--<type>tar.gz</type>-->
-      <!--</dependency>-->
 
     </dependencies>
   </dependencyManagement>
@@ -1180,4 +566,4 @@
 
   </profiles>
 
-</project>
\ No newline at end of file
+</project>

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-all/pom.xml Wed Jul  7 03:41:30 2010
@@ -20,7 +20,7 @@
 
   <parent>
     <groupId>org.apache.activemq</groupId>
-    <artifactId>activemq-parent</artifactId>
+    <artifactId>activemq-project</artifactId>
     <version>6.0-SNAPSHOT</version>
   </parent>
 

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp-generator/pom.xml Wed Jul  7 03:41:30 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><project>
   <parent>
-    <artifactId>activemq-parent</artifactId>
+    <artifactId>activemq-project</artifactId>
     <groupId>org.apache.activemq</groupId>
     <version>6.0-SNAPSHOT</version>
   </parent>
@@ -46,4 +46,4 @@
     	<scope>runtime</scope>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-amqp/pom.xml Wed Jul  7 03:41:30 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><project>
   <parent>
-    <artifactId>activemq-parent</artifactId>
+    <artifactId>activemq-project</artifactId>
     <groupId>org.apache.activemq</groupId>
     <version>6.0-SNAPSHOT</version>
   </parent>
@@ -64,4 +64,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-client/pom.xml Wed Jul  7 03:41:30 2010
@@ -20,7 +20,7 @@
 
   <parent>
     <groupId>org.apache.activemq</groupId>
-    <artifactId>activemq-parent</artifactId>
+    <artifactId>activemq-project</artifactId>
     <version>6.0-SNAPSHOT</version>
   </parent>
 

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-dispatcher/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-dispatcher/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-dispatcher/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-dispatcher/pom.xml Wed Jul  7 03:41:30 2010
@@ -20,7 +20,7 @@
 
   <parent>
     <groupId>org.apache.activemq</groupId>
-    <artifactId>activemq-parent</artifactId>
+    <artifactId>activemq-project</artifactId>
     <version>6.0-SNAPSHOT</version>
   </parent>
 

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-flow/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-flow/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-flow/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-flow/pom.xml Wed Jul  7 03:41:30 2010
@@ -20,7 +20,7 @@
 
   <parent>
     <groupId>org.apache.activemq</groupId>
-    <artifactId>activemq-parent</artifactId>
+    <artifactId>activemq-project</artifactId>
     <version>6.0-SNAPSHOT</version>
   </parent>
 

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-jmx/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-jmx/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-jmx/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-jmx/pom.xml Wed Jul  7 03:41:30 2010
@@ -20,7 +20,7 @@
 
   <parent>
     <groupId>org.apache.activemq</groupId>
-    <artifactId>activemq-parent</artifactId>
+    <artifactId>activemq-project</artifactId>
     <version>6.0-SNAPSHOT</version>
   </parent>
 

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-network/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-network/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-network/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-network/pom.xml Wed Jul  7 03:41:30 2010
@@ -20,7 +20,7 @@
 
   <parent>
     <groupId>org.apache.activemq</groupId>
-    <artifactId>activemq-parent</artifactId>
+    <artifactId>activemq-project</artifactId>
     <version>6.0-SNAPSHOT</version>
   </parent>
 

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-openwire/pom.xml Wed Jul  7 03:41:30 2010
@@ -20,7 +20,7 @@
 
   <parent>
     <groupId>org.apache.activemq</groupId>
-    <artifactId>activemq-parent</artifactId>
+    <artifactId>activemq-project</artifactId>
     <version>6.0-SNAPSHOT</version>
   </parent>
 

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-queue/pom.xml Wed Jul  7 03:41:30 2010
@@ -20,7 +20,7 @@
 
   <parent>
     <groupId>org.apache.activemq</groupId>
-    <artifactId>activemq-parent</artifactId>
+    <artifactId>activemq-project</artifactId>
     <version>6.0-SNAPSHOT</version>
   </parent>
 

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-spring/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-spring/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-spring/pom.xml Wed Jul  7 03:41:30 2010
@@ -20,7 +20,7 @@
 
   <parent>
     <groupId>org.apache.activemq</groupId>
-    <artifactId>activemq-parent</artifactId>
+    <artifactId>activemq-project</artifactId>
     <version>6.0-SNAPSHOT</version>
   </parent>
 

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/activemq-syscall/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/activemq-syscall/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/activemq-syscall/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/activemq-syscall/pom.xml Wed Jul  7 03:41:30 2010
@@ -19,7 +19,7 @@
 
   <parent>
     <groupId>org.apache.activemq</groupId>
-    <artifactId>activemq-parent</artifactId>
+    <artifactId>activemq-project</artifactId>
     <version>6.0-SNAPSHOT</version>
   </parent>
 

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/distribution/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/distribution/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/distribution/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/distribution/pom.xml Wed Jul  7 03:41:30 2010
@@ -18,7 +18,7 @@
   
   <parent>
     <groupId>org.apache.activemq</groupId>
-    <artifactId>activemq-parent</artifactId>
+    <artifactId>activemq-project</artifactId>
     <version>6.0-SNAPSHOT</version>
   </parent>
   

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/pom.xml Wed Jul  7 03:41:30 2010
@@ -19,7 +19,7 @@
 
   <parent>
     <groupId>org.apache.activemq</groupId>
-    <artifactId>activemq-parent</artifactId>
+    <artifactId>activemq-project</artifactId>
     <version>6.0-SNAPSHOT</version>
   </parent>
 

Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/hawtdb/pom.xml
            ('svn:executable' removed)

Modified: activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/pom.xml?rev=961069&r1=961068&r2=961069&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/pom.xml Wed Jul  7 03:41:30 2010
@@ -19,7 +19,7 @@
 
   <parent>
     <groupId>org.apache.activemq</groupId>
-    <artifactId>activemq-parent</artifactId>
+    <artifactId>activemq-project</artifactId>
     <version>6.0-SNAPSHOT</version>
   </parent>
 

Propchange: activemq/sandbox/activemq-apollo-actor/sandbox/kahadb/pom.xml
            ('svn:executable' removed)