mirror of https://github.com/apache/activemq.git
Merge rev 1181860 from trunk: AMQ-3491 - Investigate and resolve LGPL dependency via camel-web. Removing camel-web dependency due to its downstream lgpl dep. We can bring it back in if/when it is cleaned up.
git-svn-id: https://svn.apache.org/repos/asf/activemq/branches/activemq-5.4@1182365 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino
parent
df779fb914
commit
67da9f58a5
|
|
@ -83,7 +83,6 @@
|
|||
<p>What do you want to do next?</p>
|
||||
<ul class="alternate" type="square">
|
||||
<li><a title="Manage ActiveMQ broker" href="/admin/">Manage ActiveMQ broker</a></li>
|
||||
<li><a title="Manage Camel instance" href="/camel/">Manage Camel instance</a></li>
|
||||
<li><a title="See some Web demos" href="/demo/">See some Web demos</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -84,7 +84,6 @@
|
|||
<p>What do you want to do next?</p>
|
||||
<ul class="alternate" type="square">
|
||||
<li><a title="Manage ActiveMQ broker" href="/admin/">Manage ActiveMQ broker</a></li>
|
||||
<li><a title="Manage Camel instance" href="/camel/">Manage Camel instance</a></li>
|
||||
<li><a title="See some Web demos" href="/demo/">See some Web demos</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -30,15 +30,6 @@
|
|||
<name>ActiveMQ :: Assembly</name>
|
||||
<description>Puts together the ActiveMQ distribution</description>
|
||||
|
||||
<repositories>
|
||||
<!-- for camel-web's jersey dependencies -->
|
||||
<repository>
|
||||
<id>java.net.maven2</id>
|
||||
<name>java.net Maven 2 Repo</name>
|
||||
<url>http://download.java.net/maven/2</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
<dependencies>
|
||||
|
||||
<!-- activemq -->
|
||||
|
|
@ -134,11 +125,6 @@
|
|||
<groupId>org.apache.camel</groupId>
|
||||
<artifactId>camel-jetty</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.camel</groupId>
|
||||
<artifactId>camel-web</artifactId>
|
||||
<type>war</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.camel</groupId>
|
||||
<artifactId>camel-jms</artifactId>
|
||||
|
|
|
|||
|
|
@ -93,46 +93,6 @@
|
|||
</includes>
|
||||
</dependencySet>
|
||||
|
||||
<dependencySet>
|
||||
<outputDirectory>/webapps/camel</outputDirectory>
|
||||
<unpack>true</unpack>
|
||||
<unpackOptions>
|
||||
<excludes>
|
||||
<exclude>**/applicationContext.xml</exclude>
|
||||
<!-- ignore jars already in distro -->
|
||||
<exclude>**/act*.jar</exclude>
|
||||
<exclude>**/ant*.jar</exclude>
|
||||
<exclude>**/aop*.jar</exclude>
|
||||
<!--
|
||||
<exclude>**/asm*.jar</exclude>
|
||||
-->
|
||||
<exclude>**/camel-*.jar</exclude>
|
||||
<exclude>**/commons*.jar</exclude>
|
||||
<exclude>**/groovy*.jar</exclude>
|
||||
<exclude>**/jackson*.jar</exclude>
|
||||
<exclude>**/jaxb*.jar</exclude>
|
||||
<exclude>**/jdom*.jar</exclude>
|
||||
<exclude>**/jettison*.jar</exclude>
|
||||
<exclude>**/jruby*.jar</exclude>
|
||||
<exclude>**/jstl*.jar</exclude>
|
||||
<exclude>**/rome*.jar</exclude>
|
||||
<exclude>**/sitemesh*.jar</exclude>
|
||||
<exclude>**/slf4j-*.jar</exclude>
|
||||
<exclude>**/spring-*.jar</exclude>
|
||||
<exclude>**/standard*.jar</exclude>
|
||||
<exclude>**/stax*.jar</exclude>
|
||||
<!-- exclude unused javascript -->
|
||||
<exclude>**/bespin/</exclude>
|
||||
<exclude>**/dijit/</exclude>
|
||||
<exclude>**/dojo/</exclude>
|
||||
<exclude>**/dojox/</exclude>
|
||||
</excludes>
|
||||
</unpackOptions>
|
||||
<includes>
|
||||
<include>org.apache.camel:camel-web:war</include>
|
||||
</includes>
|
||||
</dependencySet>
|
||||
|
||||
<dependencySet>
|
||||
<outputDirectory>/</outputDirectory>
|
||||
<unpack>false</unpack>
|
||||
|
|
|
|||
|
|
@ -127,7 +127,6 @@
|
|||
|
||||
<!--
|
||||
Enable web consoles, REST and Ajax APIs and demos
|
||||
It also includes Camel (with its web console), see ${ACTIVEMQ_HOME}/conf/camel.xml for more info
|
||||
|
||||
Take a look at ${ACTIVEMQ_HOME}/conf/jetty.xml for more details
|
||||
-->
|
||||
|
|
|
|||
|
|
@ -25,11 +25,6 @@
|
|||
|
||||
e.g. <import resource="camel.xml"/>
|
||||
|
||||
Note: this configuration is already included in a default configuration via Camel Web Console.
|
||||
See ${ACTIVEMQ_HOME}/conf/jetty.xml for more info on how to disable it, in case you want to do so.
|
||||
Also check ${ACTIVEMQ_HOME}/webapps/camel/WEB-INF/application-context.xml to see how this config is included in Camel Web Console
|
||||
|
||||
|
||||
-->
|
||||
<beans
|
||||
xmlns="http://www.springframework.org/schema/beans"
|
||||
|
|
|
|||
|
|
@ -53,11 +53,6 @@
|
|||
<property name="resourceBase" value="${activemq.home}/webapps/admin" />
|
||||
<property name="logUrlOnStart" value="true" />
|
||||
</bean>
|
||||
<bean class="org.eclipse.jetty.webapp.WebAppContext">
|
||||
<property name="contextPath" value="/camel" />
|
||||
<property name="resourceBase" value="${activemq.home}/webapps/camel" />
|
||||
<property name="logUrlOnStart" value="true" />
|
||||
</bean>
|
||||
<bean class="org.eclipse.jetty.webapp.WebAppContext">
|
||||
<property name="contextPath" value="/demo" />
|
||||
<property name="resourceBase" value="${activemq.home}/webapps/demo" />
|
||||
|
|
|
|||
|
|
@ -1,37 +0,0 @@
|
|||
<?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.
|
||||
-->
|
||||
<beans xmlns="http://www.springframework.org/schema/beans"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns:context="http://www.springframework.org/schema/context"
|
||||
xsi:schemaLocation="
|
||||
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
|
||||
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
|
||||
http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
|
||||
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
|
||||
">
|
||||
|
||||
<!-- Allows us to use system properties as variables in this configuration file -->
|
||||
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
|
||||
<property name="locations">
|
||||
<value>file:${activemq.base}/conf/credentials.properties</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<import resource="file:${activemq.base}/conf/camel.xml"/>
|
||||
|
||||
</beans>
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -91,7 +91,6 @@
|
|||
<p>What do you want to do next?</p>
|
||||
<ul class="alternate" type="square">
|
||||
<li><a title="Manage ActiveMQ broker" href="/admin/">Manage ActiveMQ broker</a></li>
|
||||
<li><a title="Manage Camel instance" href="/camel/">Manage Camel instance</a></li>
|
||||
<li><a title="See some Web demos" href="/demo/">See some Web demos</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
|||
7
pom.xml
7
pom.xml
|
|
@ -435,12 +435,6 @@
|
|||
<artifactId>camel-jms</artifactId>
|
||||
<version>${camel-version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.camel</groupId>
|
||||
<artifactId>camel-web</artifactId>
|
||||
<version>${camel-version}</version>
|
||||
<type>war</type>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.osgi</groupId>
|
||||
|
|
@ -1173,7 +1167,6 @@
|
|||
<!-- activemq-xmpp schemas -->
|
||||
<exclude>**/resources/*.xsd</exclude>
|
||||
<!-- web, web-console, web-demo files -->
|
||||
<exclude>**/webapps/camel/js/dojo/dojo.js</exclude>
|
||||
<exclude>**/webapp/js/dojo.js</exclude>
|
||||
<exclude>**/webapp/js/jquery-*.js</exclude>
|
||||
<exclude>**/webapp/js/prototype.js</exclude>
|
||||
|
|
|
|||
Loading…
Reference in New Issue