activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1439680 [1/4] - in /activemq/trunk: activemq-amqp/ activemq-blueprint/ activemq-broker/ activemq-camel/ activemq-client/ activemq-console/ activemq-core/ activemq-fileserver/ activemq-http/ activemq-itests-spring31/ activemq-jaas/ activemq...
Date Mon, 28 Jan 2013 22:44:26 GMT
Author: tabish
Date: Mon Jan 28 22:44:25 2013
New Revision: 1439680

URL: http://svn.apache.org/viewvc?rev=1439680&view=rev
Log:
Scrub the pom files and remove old cruft and leftovers from the recent refactoring

Modified:
    activemq/trunk/activemq-amqp/pom.xml
    activemq/trunk/activemq-blueprint/pom.xml
    activemq/trunk/activemq-broker/pom.xml
    activemq/trunk/activemq-camel/pom.xml
    activemq/trunk/activemq-client/pom.xml
    activemq/trunk/activemq-console/pom.xml
    activemq/trunk/activemq-core/pom.xml
    activemq/trunk/activemq-fileserver/pom.xml
    activemq/trunk/activemq-http/pom.xml
    activemq/trunk/activemq-itests-spring31/pom.xml
    activemq/trunk/activemq-jaas/pom.xml
    activemq/trunk/activemq-jdbc-store/pom.xml
    activemq/trunk/activemq-kahadb-store/pom.xml
    activemq/trunk/activemq-karaf-itest/pom.xml
    activemq/trunk/activemq-karaf/pom.xml
    activemq/trunk/activemq-leveldb-store/pom.xml
    activemq/trunk/activemq-log4j-appender/pom.xml
    activemq/trunk/activemq-mqtt/pom.xml
    activemq/trunk/activemq-openwire-generator/pom.xml
    activemq/trunk/activemq-openwire-legacy/pom.xml
    activemq/trunk/activemq-osgi/pom.xml
    activemq/trunk/activemq-pool/pom.xml
    activemq/trunk/activemq-ra/pom.xml
    activemq/trunk/activemq-rar/pom.xml
    activemq/trunk/activemq-run/pom.xml
    activemq/trunk/activemq-spring/pom.xml
    activemq/trunk/activemq-stomp/pom.xml
    activemq/trunk/activemq-tooling/activemq-maven-plugin/pom.xml
    activemq/trunk/activemq-tooling/activemq-memtest-maven-plugin/pom.xml
    activemq/trunk/activemq-tooling/activemq-perf-maven-plugin/pom.xml
    activemq/trunk/activemq-tooling/pom.xml
    activemq/trunk/activemq-web-console/pom.xml
    activemq/trunk/activemq-web-demo/pom.xml
    activemq/trunk/activemq-web/pom.xml
    activemq/trunk/activemq-xmpp/pom.xml
    activemq/trunk/assembly/pom.xml

Modified: activemq/trunk/activemq-amqp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-amqp/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-amqp/pom.xml (original)
+++ activemq/trunk/activemq-amqp/pom.xml Mon Jan 28 22:44:25 2013
@@ -32,7 +32,6 @@
   <description>ActiveMQ implementaiton of AMQP messaging protocol</description>
 
   <dependencies>
-
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-broker</artifactId>
@@ -41,13 +40,11 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.apache.qpid</groupId>
       <artifactId>proton-jms</artifactId>
       <version>${qpid-proton-version}</version>
     </dependency>
-
     <dependency>
       <groupId>org.fusesource.hawtbuf</groupId>
       <artifactId>hawtbuf</artifactId>
@@ -75,7 +72,6 @@
       <artifactId>jetty-all-server</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-broker</artifactId>
@@ -87,12 +83,6 @@
       <artifactId>activemq-spring</artifactId>
       <scope>test</scope>
     </dependency>
-    <!--<dependency>-->
-      <!--<groupId>org.apache.activemq</groupId>-->
-      <!--<artifactId>activemq-console</artifactId>-->
-      <!--<scope>test</scope>-->
-    <!--</dependency>-->
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -103,9 +93,8 @@
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
-  
+
   <profiles>
     <profile>
       <!-- profile which is activated is the swiftmq-client-home prop is defined.
@@ -155,5 +144,4 @@
       </build>
     </profile>
   </profiles>
-
 </project>

Modified: activemq/trunk/activemq-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-blueprint/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-blueprint/pom.xml (original)
+++ activemq/trunk/activemq-blueprint/pom.xml Mon Jan 28 22:44:25 2013
@@ -15,7 +15,8 @@
   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">
+<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>
 
@@ -31,24 +32,24 @@
 
   <properties>
     <activemq.osgi.import.pkg>
-        org.apache.xbean*;version="[3.12,4)",
-        org.apache.aries.blueprint.*;version="[1.0,2)",
-          *
+      org.apache.xbean*;version="[3.12,4)",
+      org.apache.aries.blueprint.*;version="[1.0,2)",
+      *
     </activemq.osgi.import.pkg>
   </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint</artifactId>
-            <version>${aries-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.xbean</groupId>
-            <artifactId>xbean-blueprint</artifactId>
-            <version>${xbean-version}</version>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.aries.blueprint</groupId>
+      <artifactId>org.apache.aries.blueprint</artifactId>
+      <version>${aries-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.xbean</groupId>
+      <artifactId>xbean-blueprint</artifactId>
+      <version>${xbean-version}</version>
+    </dependency>
+  </dependencies>
 
   <build>
     <plugins>
@@ -57,18 +58,17 @@
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
           <instructions>
-            <!--Fragment-Host>org.apache.activemq.activemq-core;version=[$(version;==;${activemq.osgi.version}),$(version;=+;${activemq.osgi.version}))</Fragment-Host-->
+            <!--Fragment-Host>org.apache.activemq.activemq-core;version=[$(version;==;${activemq.osgi.version}),$(version;=+;${activemq.osgi.version}))</Fragment-Host
-->
             <Fragment-Host>org.apache.activemq.activemq-core</Fragment-Host>
           </instructions>
         </configuration>
       </plugin>
-    <plugin>
-      <artifactId>maven-resources-plugin</artifactId>
-    </plugin>
-    <plugin>
-      <artifactId>maven-install-plugin</artifactId>
-    </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <artifactId>maven-install-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
-
 </project>

Modified: activemq/trunk/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-broker/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-broker/pom.xml (original)
+++ activemq/trunk/activemq-broker/pom.xml Mon Jan 28 22:44:25 2013
@@ -15,7 +15,8 @@
   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">
+<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>
 
@@ -48,7 +49,7 @@
     </dependency>
 
     <!-- =============================== -->
-    <!-- Optional Dependencies           -->
+    <!-- Optional Dependencies -->
     <!-- =============================== -->
 
     <dependency>
@@ -62,10 +63,6 @@
       <artifactId>activemq-jaas</artifactId>
       <optional>true</optional>
     </dependency>
-    <!--<dependency>-->
-      <!--<groupId>org.springframework</groupId>-->
-      <!--<artifactId>spring-context</artifactId>-->
-    <!--</dependency>-->
 
     <!-- to support XPath based Selectors -->
     <dependency>
@@ -75,7 +72,7 @@
     </dependency>
 
     <!-- =============================== -->
-    <!-- Testing Dependencies            -->
+    <!-- Testing Dependencies -->
     <!-- =============================== -->
     <dependency>
       <groupId>junit</groupId>
@@ -181,27 +178,21 @@
           <forkMode>always</forkMode>
           <argLine>${surefire.argLine}</argLine>
           <runOrder>alphabetical</runOrder>
-
-           <systemProperties>
+          <systemProperties>
             <property>
               <name>org.apache.activemq.default.directory.prefix</name>
               <value>target/</value>
             </property>
-            <!-- Uncomment the following if you want to configure custom logging (using
src/test/resources/log4j.properties)
-                 while running mvn:test
-                 Note: if you want to see log messages on the console window remove
-                       "redirectTestOutputToFile" from the parent pom
-            -->
-            <!--
-            <property>
-              <name>log4j.configuration</name>
-              <value>file:target/test-classes/log4j.properties</value>
-            </property>
-            -->
-           </systemProperties>
-           <includes>
-             <include>**/*Test.*</include>
-           </includes>
+            <!-- Uncomment the following if you want to configure custom logging
+              (using src/test/resources/log4j.properties) while running mvn:test Note: if
you want
+              to see log messages on the console window remove "redirectTestOutputToFile"
from
+              the parent pom -->
+            <!-- <property> <name>log4j.configuration</name> <value>file:target/test-classes/log4j.properties</value>
+              </property> -->
+          </systemProperties>
+          <includes>
+            <include>**/*Test.*</include>
+          </includes>
         </configuration>
       </plugin>
       <plugin>

Modified: activemq/trunk/activemq-camel/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/pom.xml (original)
+++ activemq/trunk/activemq-camel/pom.xml Mon Jan 28 22:44:25 2013
@@ -15,7 +15,8 @@
   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">
+<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>
 

Modified: activemq/trunk/activemq-client/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-client/pom.xml (original)
+++ activemq/trunk/activemq-client/pom.xml Mon Jan 28 22:44:25 2013
@@ -15,7 +15,8 @@
   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">
+<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>
 
@@ -72,7 +73,7 @@
     </dependency>
 
     <!-- =============================== -->
-    <!-- Testing Dependencies            -->
+    <!-- Testing Dependencies -->
     <!-- =============================== -->
     <dependency>
       <groupId>junit</groupId>
@@ -86,14 +87,13 @@
     </dependency>
 
     <!-- =============================== -->
-    <!-- Plugin Dependencies            -->
+    <!-- Plugin Dependencies -->
     <!-- =============================== -->
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-openwire-generator</artifactId>
       <optional>true</optional>
     </dependency>
-    
   </dependencies>
 
   <reporting>
@@ -198,34 +198,27 @@
     </resources>
 
     <plugins>
-
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <forkMode>always</forkMode>
           <argLine>${surefire.argLine}</argLine>
           <runOrder>alphabetical</runOrder>
-
-           <systemProperties>
+          <systemProperties>
             <property>
               <name>org.apache.activemq.default.directory.prefix</name>
               <value>target/</value>
             </property>
-            <!-- Uncomment the following if you want to configure custom logging (using
src/test/resources/log4j.properties)
-                 while running mvn:test
-                 Note: if you want to see log messages on the console window remove
-                       "redirectTestOutputToFile" from the parent pom
-            -->
-            <!--
-            <property>
-              <name>log4j.configuration</name>
-              <value>file:target/test-classes/log4j.properties</value>
-            </property>
-            -->
-           </systemProperties>
-           <includes>
-             <include>**/*Test.*</include>
-           </includes>
+            <!-- Uncomment the following if you want to configure custom logging
+              (using src/test/resources/log4j.properties) while running mvn:test Note: if
you want
+              to see log messages on the console window remove "redirectTestOutputToFile"
from
+              the parent pom -->
+            <!-- <property> <name>log4j.configuration</name> <value>file:target/test-classes/log4j.properties</value>
+              </property> -->
+          </systemProperties>
+          <includes>
+            <include>**/*Test.*</include>
+          </includes>
         </configuration>
       </plugin>
 
@@ -279,8 +272,11 @@
             <configuration>
               <tasks>
                 <echo>Running OpenWire Generator</echo>
-                <taskdef name="generate" classname="org.apache.activemq.openwire.tool.JavaGeneratorTask"
classpathref="maven.compile.classpath" />
-                <generate version="9" basedir="${basedir}" generateTests="false"/>
+                <taskdef name="generate"
+                  classname="org.apache.activemq.openwire.tool.JavaGeneratorTask"
+                  classpathref="maven.compile.classpath" />
+                <generate version="9" basedir="${basedir}"
+                  generateTests="false" />
               </tasks>
             </configuration>
           </plugin>

Modified: activemq/trunk/activemq-console/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-console/pom.xml?rev=1439680&r1=1439679&r2=1439680&view=diff
==============================================================================
--- activemq/trunk/activemq-console/pom.xml (original)
+++ activemq/trunk/activemq-console/pom.xml Mon Jan 28 22:44:25 2013
@@ -6,17 +6,18 @@
   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">
-  
+<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>
@@ -43,17 +44,8 @@
       org.apache.activemq.console*;version=${project.version};-noimport:=true,
     </activemq.osgi.export>
   </properties>
-  
+
   <dependencies>
-    <!-- activemq related dependencies -->
-    <!--<dependency>-->
-      <!--<groupId>${project.groupId}</groupId>-->
-      <!--<artifactId>activemq-spring</artifactId>-->
-    <!--</dependency>-->
-    <!--<dependency>-->
-      <!--<groupId>${project.groupId}</groupId>-->
-      <!--<artifactId>activemq-amq-store</artifactId>-->
-    <!--</dependency>-->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-kahadb-store</artifactId>
@@ -68,17 +60,14 @@
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jms_1.1_spec</artifactId>
     </dependency>
-
     <dependency>
       <groupId>commons-pool</groupId>
       <artifactId>commons-pool</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-spring</artifactId>
     </dependency>
-
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -100,8 +89,6 @@
       <artifactId>jackson-mapper-asl</artifactId>
       <version>${jackson-version}</version>
     </dependency>
-
-
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-broker</artifactId>
@@ -114,7 +101,7 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
       <scope>test</scope>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
@@ -130,13 +117,11 @@
       <artifactId>derby</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.apache.velocity</groupId>
       <artifactId>velocity</artifactId>
@@ -158,16 +143,13 @@
       <groupId>org.jasypt</groupId>
       <artifactId>jasypt</artifactId>
     </dependency>
-    
     <dependency>
       <groupId>commons-daemon</groupId>
       <artifactId>commons-daemon</artifactId>
-    </dependency> 
-
+    </dependency>
   </dependencies>
 
   <build>
-
     <plugins>
       <!-- Configure which tests are included/excuded -->
       <plugin>
@@ -175,31 +157,24 @@
         <configuration>
           <forkMode>pertest</forkMode>
           <childDelegation>false</childDelegation>
-          <useFile>true</useFile>          
-           <systemProperties>
+          <useFile>true</useFile>
+          <systemProperties>
             <property>
               <name>org.apache.activemq.default.directory.prefix</name>
               <value>target/</value>
             </property>
             <!-- Uncomment the following if you want to configure custom logging (using
src/test/resources/log4j.properties)
-                 while running mvn:test
-                 Note: if you want to see log messages on the console window remove
-                       "redirectTestOutputToFile" from the parent pom
-            -->
-            <!--           
-            <property>
-              <name>log4j.configuration</name>
-              <value>file:target/test-classes/log4j.properties</value>
-            </property>
-            -->
+              while running mvn:test Note: if you want to see log messages on the console
window remove "redirectTestOutputToFile"
+              from the parent pom -->
+            <!-- <property> <name>log4j.configuration</name> <value>file:target/test-classes/log4j.properties</value>
+              </property> -->
           </systemProperties>
-
           <includes>
             <include>**/*Test*</include>
           </includes>
         </configuration>
       </plugin>
-      
+
       <plugin>
         <groupId>org.fusesource.hawtbuf</groupId>
         <artifactId>hawtbuf-protoc</artifactId>
@@ -207,7 +182,7 @@
         <configuration>
           <type>alt</type>
         </configuration>
-         <executions>
+        <executions>
           <execution>
             <goals>
               <goal>compile</goal>



Mime
View raw message