https://issues.apache.org/jira/browse/AMQ-4034 - copy all neccessary resources to activemq-osgi bundle

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1437368 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2013-01-23 12:37:13 +00:00
parent 5ffb7a849a
commit 77c0cf9206
4 changed files with 44 additions and 112 deletions

View File

@ -1,36 +0,0 @@
## ---------------------------------------------------------------------------
## 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.
## ---------------------------------------------------------------------------
http\://activemq.org/config/1.0=activemq.xsd
http\://activemq.org/config/1.0/1.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.0.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.1.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.2.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.3.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.3.1.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.3.2.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.4.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.4.1.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.4.2.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.5.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.5.1.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.6.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.7.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.8.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.9.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.10.0.xsd=activemq.xsd

View File

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

View File

@ -1,36 +0,0 @@
## ---------------------------------------------------------------------------
## 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.
## ---------------------------------------------------------------------------
http\://activemq.org/config/1.0=activemq.xsd
http\://activemq.org/config/1.0/1.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.0.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.1.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.2.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.3.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.3.1.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.3.2.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.4.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.4.1.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.4.2.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.5.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.5.1.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.6.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.7.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.8.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.9.0.xsd=activemq.xsd
http\://activemq.apache.org/schema/core/activemq-core-5.10.0.xsd=activemq.xsd

View File

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