activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1433323 - in /activemq/trunk/activemq-spring: pom.xml src/main/java/org/apache/activemq/hooks/SpringOsgiContextHook.java src/main/java/org/apache/activemq/hooks/osgi/ src/main/java/org/apache/activemq/hooks/osgi/SpringOsgiContextHook.java
Date Tue, 15 Jan 2013 09:33:42 GMT
Author: davsclaus
Date: Tue Jan 15 09:33:41 2013
New Revision: 1433323

URL: http://svn.apache.org/viewvc?rev=1433323&view=rev
Log:
AMQ-4252: OSGi JARs in activemq-spring is provided and optional.

Added:
    activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/hooks/osgi/
    activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/hooks/osgi/SpringOsgiContextHook.java
      - copied, changed from r1433316, activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/hooks/SpringOsgiContextHook.java
Removed:
    activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/hooks/SpringOsgiContextHook.java
Modified:
    activemq/trunk/activemq-spring/pom.xml

Modified: activemq/trunk/activemq-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/pom.xml?rev=1433323&r1=1433322&r2=1433323&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/pom.xml (original)
+++ activemq/trunk/activemq-spring/pom.xml Tue Jan 15 09:33:41 2013
@@ -44,6 +44,7 @@
       org.apache.activemq.pool*;version=${project.version};-noimport:=;-split-package:=merge-last,
       org.apache.activemq.xbean*;version=${project.version};-noimport:=true;-split-package:=merge-last,
       org.apache.activemq.hooks*;version=${project.version};-noimport:=;-split-package:=merge-last
+      org.apache.activemq.hooks.osgi*;version=${project.version};-noimport:=;-split-package:=merge-last
     </activemq.osgi.export>
   </properties>
 
@@ -178,6 +179,8 @@
     <dependency>
         <groupId>org.springframework.osgi</groupId>
         <artifactId>spring-osgi-core</artifactId>
+        <scope>provided</scope>
+        <optional>true</optional>
         <exclusions>
             <exclusion>
                 <groupId>org.springframework</groupId>

Copied: activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/hooks/osgi/SpringOsgiContextHook.java
(from r1433316, activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/hooks/SpringOsgiContextHook.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/hooks/osgi/SpringOsgiContextHook.java?p2=activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/hooks/osgi/SpringOsgiContextHook.java&p1=activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/hooks/SpringOsgiContextHook.java&r1=1433316&r2=1433323&rev=1433323&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/hooks/SpringOsgiContextHook.java
(original)
+++ activemq/trunk/activemq-spring/src/main/java/org/apache/activemq/hooks/osgi/SpringOsgiContextHook.java
Tue Jan 15 09:33:41 2013
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.hooks;
+package org.apache.activemq.hooks.osgi;
 
 import org.osgi.framework.BundleException;
 import org.slf4j.Logger;



Mime
View raw message