AMQ-2762: Support for blueprint as a custom namespace handler

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@950728 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Guillaume Nodet 2010-06-02 19:10:57 +00:00
parent 651a5fecd1
commit f0a446f395
4 changed files with 149 additions and 21 deletions

View File

@ -0,0 +1,76 @@
<?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.4-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)",
*
</activemq.osgi.import.pkg>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint</artifactId>
<version>0.1-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-blueprint</artifactId>
<version>3.8-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<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</Fragment-Host>
</instructions>
</configuration>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.3</version>
</plugin>
<plugin>
<artifactId>maven-install-plugin</artifactId>
<version>2.2</version>
</plugin>
</plugins>
</build>
</project>

View File

@ -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>

View File

@ -1,50 +1,51 @@
<features>
<repository>mvn:org.apache.felix.karaf/apache-felix-karaf/1.1.0-SNAPSHOT/xml/features</repository>
<repository>mvn:org.apache.felix.karaf/apache-felix-karaf/1.6.0/xml/features</repository>
<repository>mvn:org.ops4j.pax.web/features/0.7.2/xml/features</repository>
<feature name="transaction" version="1.0.0">
<bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/2.0.0</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.howl/1.0.1-1_1</bundle>
<bundle>mvn:org.apache.geronimo.components/geronimo-transaction/2.2-r634076</bundle>
<bundle>mvn:org.springframework/spring-tx/2.5.6</bundle>
<bundle>mvn:org.apache.servicemix.transaction/org.apache.servicemix.transaction/1.0.0</bundle>
<bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/0.1-incubating</bundle>
</feature>
<feature name="connector" version="4.0.0">
<feature version="1.0.0">transaction</feature>
<bundle>mvn:org.apache.geronimo.components/geronimo-connector/2.2-r634076</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jencks/2.1_1</bundle>
</feature>
<feature name="spring" version="${spring-version}">
<bundle>mvn:org.springframework/spring-core/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-beans/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-aop/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-context/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-context-support/${spring-version}</bundle>
<bundle>mvn:org.springframework/spring-tx/${spring-version}</bundle>
</feature>
<feature name="activemq" version="${activemq-version}">
<feature version="1.1.1">servlet-2.5</feature>
<feature version="${spring-version}">spring</feature>
<feature version="1.2.0">spring-dm</feature>
<feature version="4.0.0">connector</feature>
<bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
<bundle>mvn:commons-pool/commons-pool/${commons-pool-version}</bundle>
<bundle>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/2.4_3</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/2.0.8_3</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.6.2_3</bundle>
<bundle>mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-core/${activemq-version}</bundle>
<bundle>mvn:org.apache.activemq/kahadb/${activemq-version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-ra/${activemq-version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-console/${activemq-version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-pool/${activemq-version}</bundle>
<bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.commands/4.1.0-SNAPSHOT</bundle>
</feature>
<feature name="activemq-spring" version="${activemq-version}">
<feature version="${spring-version}">spring</feature>
<feature version="1.2.0">spring-dm</feature>
<feature version="${activemq-version}">activemq</feature>
<bundle>mvn:org.apache.xbean/xbean-spring/${xbean-version}</bundle>
</feature>
<feature name="activemq-blueprint" version="${activemq-version}">
<feature version="${activemq-version}">activemq</feature>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.scripting-api-1.0/1.5.0</bundle>
<bundle>mvn:org.apache.commons/commons-jexl/2.0.1</bundle>
<bundle>mvn:org.apache.xbean/xbean-blueprint/${xbean-version}</bundle>
<bundle>mvn:org.apache.activemq/activemq-blueprint/${activemq-version}</bundle>
</feature>
<!-- do "features:install pax-web" before installing this one -->
<feature name="activemq-web-console" version="${activemq-version}">

20
pom.xml
View File

@ -80,9 +80,9 @@
<xmlbeans-version>2.0.0-beta1</xmlbeans-version>
<xmlpull-version>1.1.3.4d_b4_min</xmlpull-version>
<xstream-version>1.3.1</xstream-version>
<xbean-version>3.6</xbean-version>
<xbean-version>3.7</xbean-version>
<velocity-version>1.6.2</velocity-version>
<maven-bundle-plugin-version>2.0.1</maven-bundle-plugin-version>
<maven-bundle-plugin-version>2.1.0</maven-bundle-plugin-version>
<maven-surefire-plugin-version>2.5</maven-surefire-plugin-version>
<commons-net-version>2.0</commons-net-version>
<ftpserver-version>1.0.0</ftpserver-version>
@ -137,6 +137,7 @@
<module>activemq-core</module>
<module>activemq-fileserver</module>
<module>activemq-jaas</module>
<module>activemq-blueprint</module>
<module>activemq-karaf</module>
<module>activemq-openwire-generator</module>
<module>activemq-optional</module>
@ -1096,6 +1097,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<inherited>true</inherited>
<configuration>
<instructions>
<Bundle-Name>${project.artifactId}</Bundle-Name>
@ -1112,6 +1114,20 @@
<_failok>${servicemix.osgi.failok}</_failok>
</instructions>
</configuration>
<executions>
<execution>
<id>cleanVersions</id>
<phase>generate-sources</phase>
<goals>
<goal>cleanVersions</goal>
</goals>
<configuration>
<versions>
<activemq.osgi.version>${project.version}</activemq.osgi.version>
</versions>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>