SM-2303 ActiveMQ web console not installable after upgrade to 5.9.1
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/61b3dcd4 Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/61b3dcd4 Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/61b3dcd4 Branch: refs/heads/master Commit: 61b3dcd4ce5b98c498f26af71bd18a340fc13b9f Parents: 8ca299c Author: Krzysztof Sobkowiak <[email protected]> Authored: Thu May 22 22:40:31 2014 +0200 Committer: Krzysztof Sobkowiak <[email protected]> Committed: Thu May 22 22:40:31 2014 +0200 ---------------------------------------------------------------------- activemq/activemq-web/.gitignore | 2 + activemq/activemq-web/pom.xml | 109 +++++++++++++++++++ activemq/pom.xml | 1 + .../src/main/filtered-resources/internal.xml | 8 ++ parent/pom.xml | 6 + 5 files changed, 126 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/servicemix/blob/61b3dcd4/activemq/activemq-web/.gitignore ---------------------------------------------------------------------- diff --git a/activemq/activemq-web/.gitignore b/activemq/activemq-web/.gitignore new file mode 100644 index 0000000..c1eab3c --- /dev/null +++ b/activemq/activemq-web/.gitignore @@ -0,0 +1,2 @@ +overlays/ +dependency-reduced-pom.xml http://git-wip-us.apache.org/repos/asf/servicemix/blob/61b3dcd4/activemq/activemq-web/pom.xml ---------------------------------------------------------------------- diff --git a/activemq/activemq-web/pom.xml b/activemq/activemq-web/pom.xml new file mode 100644 index 0000000..871ce9b --- /dev/null +++ b/activemq/activemq-web/pom.xml @@ -0,0 +1,109 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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/xsd/maven-4.0.0.xsd";> + + <!-- + 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. + --> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <artifactId>activemq</artifactId> + <groupId>org.apache.servicemix</groupId> + <version>6.0.0-SNAPSHOT</version> + </parent> + + + <groupId>org.apache.servicemix.activemq</groupId> + <artifactId>org.apache.servicemix.activemq.web</artifactId> + <packaging>war</packaging> + <name>Apache ServiceMix :: ActiveMQ :: Web Console</name> + + <dependencies> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-web-console</artifactId> + <type>war</type> + <scope>runtime</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <outputFileNameMapping>@{artifactId}@-@{baseVersion}@@{dashClassifier?}@.@{extension}@</outputFileNameMapping> + <packagingExcludes> + WEB-INF/lib/jetty*.jar, + WEB-INF/lib/servlet*.jar + </packagingExcludes> + <archive> + <manifestFile>target/war/work/org.apache.activemq/activemq-web-console/META-INF/MANIFEST.MF</manifestFile> + </archive> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <executions> + <execution> + <id>cleanVersions</id> + <phase>generate-sources</phase> + <goals> + <goal>cleanVersions</goal> + </goals> + <configuration> + <versions> + <servicemix.osgi.version>${project.version}</servicemix.osgi.version> + </versions> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>2.3</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> + <manifestEntries> + <Bundle-Name>Apache ServiceMix :: ActiveMQ :: Web Console</Bundle-Name> + <Bundle-Version>${servicemix.osgi.version}</Bundle-Version> + <Bundle-Description>Web Console for ServiceMix</Bundle-Description> + <Bundle-SymbolicName>org.apache.servicemix.activemq.web</Bundle-SymbolicName> + <DynamicImport-Package>*</DynamicImport-Package> + </manifestEntries> + </transformer> + </transformers> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> http://git-wip-us.apache.org/repos/asf/servicemix/blob/61b3dcd4/activemq/pom.xml ---------------------------------------------------------------------- diff --git a/activemq/pom.xml b/activemq/pom.xml index 9afa3e0..da1337a 100644 --- a/activemq/pom.xml +++ b/activemq/pom.xml @@ -35,6 +35,7 @@ <modules> <module>activemq-service</module> <module>activemq-camel</module> + <module>activemq-web</module> </modules> </project> http://git-wip-us.apache.org/repos/asf/servicemix/blob/61b3dcd4/assembly/src/main/filtered-resources/internal.xml ---------------------------------------------------------------------- diff --git a/assembly/src/main/filtered-resources/internal.xml b/assembly/src/main/filtered-resources/internal.xml index 7fe188b..7134dd4 100644 --- a/assembly/src/main/filtered-resources/internal.xml +++ b/assembly/src/main/filtered-resources/internal.xml @@ -32,4 +32,12 @@ <bundle start-level='10'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${jodatime.bundle.version}</bundle> </feature> + <!-- workaround for SM-2303 --> + <feature name="amq-web-console" version="${version}" resolver="(obr)" start-level="50"> + <feature start-level="10">war</feature> + <feature start-level="10">eventadmin</feature> + <configfile finalname="/etc/org.apache.activemq.webconsole.cfg">mvn:org.apache.activemq/activemq-karaf/${activemq.version}/cfg/activemq-webconsole</configfile> + <bundle>mvn:org.apache.servicemix.activemq/org.apache.servicemix.activemq.web/${version}/war</bundle> + </feature> + </features> http://git-wip-us.apache.org/repos/asf/servicemix/blob/61b3dcd4/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index c3102c0..165770b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -108,6 +108,12 @@ <artifactId>activemq-camel</artifactId> <version>${activemq.version}</version> </dependency> + <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-web-console</artifactId> + <version>${activemq.version}</version> + <type>war</type> + </dependency> <!-- Activiti--> <dependency> <groupId>org.activiti</groupId>
