You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2013/03/15 16:42:36 UTC
svn commit: r1456991 - in /activemq/trunk: activemq-blueprint/pom.xml
activemq-blueprint/src/main/resources/OSGI-INF/blueprint/activemq-blueprint.xml
activemq-karaf/src/main/resources/features.xml pom.xml
Author: dejanb
Date: Fri Mar 15 15:42:36 2013
New Revision: 1456991
URL: http://svn.apache.org/r1456991
Log:
https://issues.apache.org/jira/browse/AMQ-4377 - bring back activemq-blueprint module
Added:
activemq/trunk/activemq-blueprint/pom.xml
activemq/trunk/activemq-blueprint/src/main/resources/OSGI-INF/blueprint/activemq-blueprint.xml
Modified:
activemq/trunk/activemq-karaf/src/main/resources/features.xml
activemq/trunk/pom.xml
Added: activemq/trunk/activemq-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-blueprint/pom.xml?rev=1456991&view=auto
==============================================================================
--- activemq/trunk/activemq-blueprint/pom.xml (added)
+++ activemq/trunk/activemq-blueprint/pom.xml Fri Mar 15 15:42:36 2013
@@ -0,0 +1,74 @@
+<?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>5.9-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>activemq-blueprint</artifactId>
+ <packaging>bundle</packaging>
+ <name>ActiveMQ :: Blueprint</name>
+ <description>The ActiveMQ Message Broker and Client implementations</description>
+
+ <properties>
+ <activemq.osgi.import.pkg>
+ org.apache.xbean*;version="[3.7,4)",
+ org.apache.aries.blueprint.*;version="[0.3,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>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Fragment-Host>org.apache.activemq.activemq-osgi</Fragment-Host>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-install-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: activemq/trunk/activemq-blueprint/src/main/resources/OSGI-INF/blueprint/activemq-blueprint.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-blueprint/src/main/resources/OSGI-INF/blueprint/activemq-blueprint.xml?rev=1456991&view=auto
==============================================================================
--- activemq/trunk/activemq-blueprint/src/main/resources/OSGI-INF/blueprint/activemq-blueprint.xml (added)
+++ activemq/trunk/activemq-blueprint/src/main/resources/OSGI-INF/blueprint/activemq-blueprint.xml Fri Mar 15 15:42:36 2013
@@ -0,0 +1,35 @@
+<?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.
+-->
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+
+ <service id="ActiveMQXBeanNamespaceHandler"
+ interface="org.apache.aries.blueprint.NamespaceHandler">
+ <service-properties>
+ <entry key="osgi.service.blueprint.namespace" value="http://activemq.apache.org/schema/core"/>
+ </service-properties>
+ <bean class="org.apache.xbean.blueprint.context.impl.XBeanNamespaceHandler">
+ <argument value="http://activemq.apache.org/schema/core"/>
+ <argument value="activemq.xsd"/>
+ <argument ref="blueprintBundle"/>
+ <argument value="META-INF/services/org/apache/xbean/spring/http/activemq.apache.org/schema/core"/>
+ </bean>
+ </service>
+
+</blueprint>
Modified: activemq/trunk/activemq-karaf/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/resources/features.xml?rev=1456991&r1=1456990&r2=1456991&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Fri Mar 15 15:42:36 2013
@@ -81,5 +81,13 @@
<bundle>mvn:org.apache.activemq/activemq-web-console/${project.version}/war</bundle>
</feature>
+ <feature name="activemq-blueprint" version="${project.version}" resolver="(obr)" start-level="50">
+ <feature version="${project.version}">activemq</feature>
+ <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/${servicemix.specs.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.commons/commons-jexl/2.0.1</bundle>
+ <bundle dependency="true">mvn:org.apache.xbean/xbean-blueprint/${xbean-version}</bundle>
+ <bundle>mvn:org.apache.activemq/activemq-blueprint/${project.version}</bundle>
+ </feature>
+
</features>
Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1456991&r1=1456990&r2=1456991&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Fri Mar 15 15:42:36 2013
@@ -235,6 +235,7 @@
<module>activemq-run</module>
<module>activemq-spring</module>
<module>activemq-osgi</module>
+ <module>activemq-blueprint</module>
<module>activemq-tooling</module>
<module>activemq-web</module>
<module>activemq-web-demo</module>