activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1437368 - in /activemq/trunk: activemq-karaf/src/main/resources/META-INF/spring.schemas activemq-osgi/pom.xml activemq-osgi/src/main/resources/META-INF/spring.schemas pom.xml
Date Wed, 23 Jan 2013 12:37:14 GMT
Author: dejanb
Date: Wed Jan 23 12:37:13 2013
New Revision: 1437368

URL: http://svn.apache.org/viewvc?rev=1437368&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-4034 - copy all neccessary resources to activemq-osgi
bundle

Removed:
    activemq/trunk/activemq-karaf/src/main/resources/META-INF/spring.schemas
    activemq/trunk/activemq-osgi/src/main/resources/META-INF/spring.schemas
Modified:
    activemq/trunk/activemq-osgi/pom.xml
    activemq/trunk/pom.xml

Modified: activemq/trunk/activemq-osgi/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-osgi/pom.xml?rev=1437368&r1=1437367&r2=1437368&view=diff
==============================================================================
--- activemq/trunk/activemq-osgi/pom.xml (original)
+++ activemq/trunk/activemq-osgi/pom.xml Wed Jan 23 12:37:13 2013
@@ -130,45 +130,49 @@
 
   <build>
     <plugins>
-        <plugin>
-          <groupId>org.apache.xbean</groupId>
-          <artifactId>maven-xbean-plugin</artifactId>
-          <version>3.12</version>
-          <executions>
-            <execution>
-            <phase>process-classes</phase>
-              <configuration>
-                <includes>
-                  <include>${basedir}/../activemq-client/src/main/java</include>
-                  <include>${basedir}/../activemq-broker/src/main/java</include>
-                  <include>${basedir}/../activemq-leveldb-store/src/main/java</include>
-                  <include>${basedir}/../activemq-jdbc-store/src/main/java</include>
-                  <include>${basedir}/../activemq-amq-store/src/main/java</include>
-                  <include>${basedir}/../activemq-kahadb-store/src/main/java</include>
-                  <include>${basedir}/../activemq-mqtt/src/main/java</include>
-                  <include>${basedir}/../activemq-stomp/src/main/java</include>
-                  <include>${basedir}/../activemq-spring/src/main/java</include>
-                </includes>
-                <strictXsdOrder>false</strictXsdOrder>
-                <namespace>http://activemq.apache.org/schema/core</namespace>
-                <schema>${basedir}/target/classes/activemq.xsd</schema>
-                <outputDir>${basedir}/target/classes</outputDir>
-                <generateSpringSchemasFile>false</generateSpringSchemasFile>
-                <excludedClasses>org.apache.activemq.broker.jmx.AnnotatedMBean,org.apache.activemq.broker.jmx.DestinationViewMBean</excludedClasses>
-              </configuration>
-              <goals>
-                <goal>mapping</goal>
-              </goals>
-            </execution>
-          </executions>
-          <dependencies>
-            <dependency>
-              <groupId>com.thoughtworks.qdox</groupId>
-              <artifactId>qdox</artifactId>
-              <version>1.12</version>
-            </dependency>
-          </dependencies>
-        </plugin>
+      <!-- Copy all necessary resources from other modules, like spring schema mapping,
xbean resources, etc. -->
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-xbean</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${basedir}/target/classes/</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${basedir}/../activemq-spring/target/classes/</directory>
+                  <includes>
+                    <include>activemq.xsd*</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-spring</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${basedir}/target/classes/META-INF</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${basedir}/../activemq-spring/target/classes/META-INF</directory>
+                  <includes>
+                    <include>spring.*</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
 
       <plugin>
         <groupId>org.apache.felix</groupId>

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1437368&r1=1437367&r2=1437368&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Wed Jan 23 12:37:13 2013
@@ -226,7 +226,6 @@
     <module>activemq-console</module>
     <module>activemq-fileserver</module>
     <module>activemq-jaas</module>
-    <module>activemq-osgi</module>
     <module>activemq-blueprint</module>
     <module>activemq-karaf</module>
     <module>activemq-karaf-itest</module>
@@ -236,6 +235,7 @@
     <module>activemq-rar</module>
     <module>activemq-run</module>
     <module>activemq-spring</module>
+    <module>activemq-osgi</module>
     <module>activemq-tooling</module>
     <module>activemq-web</module>
     <module>activemq-web-demo</module>



Mime
View raw message