Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added an embedded jetty server to host the web-console in the default activemq.xml for AMQ-1194 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@517713 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
James Strachan 2007-03-13 14:48:44 +00:00
parent a7344588c9
commit 3028a2faa1
6 changed files with 187 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
assembly/pom.xml
View File

@ -282,17 +282,6 @@
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<forkMode>pertest</forkMode> <forkMode>pertest</forkMode>
<excludes>
<!-- These tests run too slow to execute as part of the unit tests -->
<exclude implementation="java.lang.String">**/DefaultStoreBrokerTest.*</exclude>
<exclude implementation="java.lang.String">**/ActiveIOTransportBrokerTest.*</exclude>
<!-- These tests fails -->
<exclude implementation="java.lang.String">**/SpringTest.*</exclude>
<exclude implementation="java.lang.String">**/*QuickJournalRecoveryBrokerTest.*</exclude>
</excludes>
<includes>
<include implementation="java.lang.String">**/*RetroactiveConsumerTestWithDestinationBasedBufferTest.*</include>
</includes>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>

124
assembly/src/main/descriptors/unix-bin.xml
View File

@ -98,6 +98,23 @@
<include>run.jar</include> <include>run.jar</include>
</includes> </includes>
</fileSet> </fileSet>
<!-- lets copy the portions of the web app we need - as we can't exclude stuff from the WAR -->
<fileSet>
<directory>../activemq-web-console/src/main/webapp</directory>
<outputDirectory>/webapps/admin</outputDirectory>
<excludes>
<exclude>**/activemq.xml</exclude>
<exclude>**/applicationContext.xml</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>../activemq-web-console/target/classes</directory>
<outputDirectory>/webapps/admin/WEB-INF/classes</outputDirectory>
<includes>
<include>**/*.class</include>
</includes>
</fileSet>
</fileSets> </fileSets>
<dependencySets> <dependencySets>
<dependencySet> <dependencySet>
@ -105,17 +122,17 @@
<unpack>false</unpack> <unpack>false</unpack>
<scope>runtime</scope> <scope>runtime</scope>
<includes> <includes>
<include>backport-util-concurrent:backport-util-concurrent</include> <include>backport-util-concurrent:backport-util-concurrent</include>
<include>commons-logging:commons-logging</include> <include>commons-logging:commons-logging</include>
<include>geronimo-jms_1.1_spec:geronimo-jms_1.1_spec</include> <include>geronimo-jms_1.1_spec:geronimo-jms_1.1_spec</include>
<include>${pom.groupId}:activemq-core</include> <include>${pom.groupId}:activemq-core</include>
<include>${pom.groupId}:activeio-core</include> <include>${pom.groupId}:activeio-core</include>
<include>${pom.groupId}:activemq-console</include> <include>${pom.groupId}:activemq-console</include>
<include>${pom.groupId}:activemq-jaas</include> <include>${pom.groupId}:activemq-jaas</include>
<include>mx4j:mx4j</include> <include>mx4j:mx4j</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include> <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include> <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
<include>${pom.groupId}:activemq-web</include> <include>${pom.groupId}:activemq-web</include>
</includes> </includes>
</dependencySet> </dependencySet>
<dependencySet> <dependencySet>
@ -123,26 +140,26 @@
<unpack>false</unpack> <unpack>false</unpack>
<scope>runtime</scope> <scope>runtime</scope>
<includes> <includes>
<include>${pom.groupId}:activemq-rar</include> <include>${pom.groupId}:activemq-rar</include>
<include>${pom.groupId}:activemq-optional</include> <include>${pom.groupId}:activemq-optional</include>
<include>${pom.groupId}:activemq-xmpp</include> <include>${pom.groupId}:activemq-xmpp</include>
<include>${pom.groupId}:activecluster</include> <include>${pom.groupId}:activecluster</include>
<include>commons-beanutils:commons-beanutils</include> <include>commons-beanutils:commons-beanutils</include>
<include>commons-collections:commons-collections</include> <include>commons-collections:commons-collections</include>
<include>commons-httpclient:commons-httpclient</include> <include>commons-httpclient:commons-httpclient</include>
<include>commons-dbcp:commons-dbcp</include> <include>commons-dbcp:commons-dbcp</include>
<include>commons-pool:commons-pool</include> <include>commons-pool:commons-pool</include>
<include>log4j:log4j</include> <include>log4j:log4j</include>
<include>mx4j:mx4j-remote</include> <include>mx4j:mx4j-remote</include>
<include>mx4j:mx4j-tools</include> <include>mx4j:mx4j-tools</include>
<include>org.apache.derby:derby</include> <include>org.apache.derby:derby</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include> <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include> <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
<include>org.apache.xbean:xbean-spring</include> <include>org.apache.xbean:xbean-spring</include>
<include>org.springframework:spring</include> <include>org.springframework:spring</include>
<include>xstream:xstream</include> <include>xstream:xstream</include>
<include>xmlpull:xmlpull</include> <include>xmlpull:xmlpull</include>
<include>activemq:jmdns</include> <include>activemq:jmdns</include>
</includes> </includes>
</dependencySet> </dependencySet>
<dependencySet> <dependencySet>
@ -150,23 +167,42 @@
<unpack>false</unpack> <unpack>false</unpack>
<scope>runtime</scope> <scope>runtime</scope>
<includes> <includes>
<include>org.mortbay.jetty:jetty</include> <include>org.mortbay.jetty:jetty</include>
<include>org.mortbay.jetty:jetty-util</include> <include>org.mortbay.jetty:jetty-util</include>
<include>org.mortbay.jetty:jetty-xbean</include> <include>org.mortbay.jetty:jetty-xbean</include>
<include>org.mortbay.jetty:servlet-api-2.5</include> <include>org.mortbay.jetty:servlet-api-2.5</include>
<include>org.slf4j:slf4j-jcl</include> <include>org.slf4j:slf4j-jcl</include>
<!-- JSP support --> <!-- JSP support -->
<include>org.mortbay.jetty:jsp-2.1</include> <include>org.mortbay.jetty:jsp-2.1</include>
<include>org.mortbay.jetty:jsp-api-2.1</include> <include>org.mortbay.jetty:jsp-api-2.1</include>
<include>org.eclipse.jdt:core</include> <include>org.eclipse.jdt:core</include>
<include>ant:ant</include> <include>ant:ant</include>
<!-- JSTL and other web stuff --> <!-- JSTL and other web stuff -->
<include>opensymphony:sitemesh</include> <include>opensymphony:sitemesh</include>
<include>javax.servlet:jstl</include> <include>javax.servlet:jstl</include>
<include>taglibs:standard</include> <include>taglibs:standard</include>
<!-- Atom/RSS support -->
<include>rome:rome</include>
<include>jdom:jdom</include>
</includes> </includes>
</dependencySet> </dependencySet>
</dependencySets>
<!-- we cannot exclude stuff from inside the war...
<dependencySet>
<outputDirectory>/webapps/admin</outputDirectory>
<unpack>true</unpack>
<scope>runtime</scope>
<includes>
<include>${pom.groupId}:activemq-web-console</include>
</includes>
<excludes>
<exclude>**/*.jar</exclude>
</excludes>
</dependencySet>
-->
</dependencySets>
</assembly> </assembly>

116
assembly/src/main/descriptors/windows-bin.xml
View File

@ -102,24 +102,42 @@
<include>run.jar</include> <include>run.jar</include>
</includes> </includes>
</fileSet> </fileSet>
<!-- lets copy the portions of the web app we need - as we can't exclude stuff from the WAR -->
<fileSet>
<directory>../activemq-web-console/src/main/webapp</directory>
<outputDirectory>/webapps/admin</outputDirectory>
<excludes>
<exclude>**/activemq.xml</exclude>
<exclude>**/applicationContext.xml</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>../activemq-web-console/target/classes</directory>
<outputDirectory>/webapps/admin/WEB-INF/classes</outputDirectory>
<includes>
<include>**/*.class</include>
</includes>
</fileSet>
</fileSets> </fileSets>
<dependencySets> <dependencySets>
<dependencySet> <dependencySet>
<outputDirectory>/lib</outputDirectory> <outputDirectory>/lib</outputDirectory>
<unpack>false</unpack> <unpack>false</unpack>
<scope>runtime</scope> <scope>runtime</scope>
<includes> <includes>
<include>backport-util-concurrent:backport-util-concurrent</include> <include>backport-util-concurrent:backport-util-concurrent</include>
<include>commons-logging:commons-logging</include> <include>commons-logging:commons-logging</include>
<include>geronimo-jms_1.1_spec:geronimo-jms_1.1_spec</include> <include>geronimo-jms_1.1_spec:geronimo-jms_1.1_spec</include>
<include>${pom.groupId}:activemq-core</include> <include>${pom.groupId}:activemq-core</include>
<include>${pom.groupId}:activeio-core</include> <include>${pom.groupId}:activeio-core</include>
<include>${pom.groupId}:activemq-console</include> <include>${pom.groupId}:activemq-console</include>
<include>${pom.groupId}:activemq-jaas</include> <include>${pom.groupId}:activemq-jaas</include>
<include>mx4j:mx4j</include> <include>mx4j:mx4j</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include> <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include> <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
<include>${pom.groupId}:activemq-web</include> <include>${pom.groupId}:activemq-web</include>
</includes> </includes>
</dependencySet> </dependencySet>
<dependencySet> <dependencySet>
@ -127,29 +145,29 @@
<unpack>false</unpack> <unpack>false</unpack>
<scope>runtime</scope> <scope>runtime</scope>
<includes> <includes>
<include>${pom.groupId}:activemq-rar</include> <include>${pom.groupId}:activemq-rar</include>
<include>${pom.groupId}:activemq-optional</include> <include>${pom.groupId}:activemq-optional</include>
<include>${pom.groupId}:activemq-xmpp</include> <include>${pom.groupId}:activemq-xmpp</include>
<include>${pom.groupId}:activecluster</include> <include>${pom.groupId}:activecluster</include>
<include>commons-beanutils:commons-beanutils</include> <include>commons-beanutils:commons-beanutils</include>
<include>commons-collections:commons-collections</include> <include>commons-collections:commons-collections</include>
<include>commons-httpclient:commons-httpclient</include> <include>commons-httpclient:commons-httpclient</include>
<include>commons-dbcp:commons-dbcp</include> <include>commons-dbcp:commons-dbcp</include>
<include>commons-pool:commons-pool</include> <include>commons-pool:commons-pool</include>
<include>org.mortbay.jetty:jetty</include> <include>org.mortbay.jetty:jetty</include>
<include>org.mortbay.jetty:jetty-util</include> <include>org.mortbay.jetty:jetty-util</include>
<include>org.mortbay.jetty:servlet-api-2.5</include> <include>org.mortbay.jetty:servlet-api-2.5</include>
<include>log4j:log4j</include> <include>log4j:log4j</include>
<include>mx4j:mx4j-remote</include> <include>mx4j:mx4j-remote</include>
<include>mx4j:mx4j-tools</include> <include>mx4j:mx4j-tools</include>
<include>org.apache.derby:derby</include> <include>org.apache.derby:derby</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include> <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
<include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include> <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
<include>org.apache.xbean:xbean-spring</include> <include>org.apache.xbean:xbean-spring</include>
<include>org.springframework:spring</include> <include>org.springframework:spring</include>
<include>xstream:xstream</include> <include>xstream:xstream</include>
<include>xmlpull:xmlpull</include> <include>xmlpull:xmlpull</include>
<include>activemq:jmdns</include> <include>activemq:jmdns</include>
</includes> </includes>
</dependencySet> </dependencySet>
<dependencySet> <dependencySet>
@ -157,23 +175,27 @@
<unpack>false</unpack> <unpack>false</unpack>
<scope>runtime</scope> <scope>runtime</scope>
<includes> <includes>
<include>org.mortbay.jetty:jetty</include> <include>org.mortbay.jetty:jetty</include>
<include>org.mortbay.jetty:jetty-util</include> <include>org.mortbay.jetty:jetty-util</include>
<include>org.mortbay.jetty:jetty-xbean</include> <include>org.mortbay.jetty:jetty-xbean</include>
<include>org.mortbay.jetty:servlet-api-2.5</include> <include>org.mortbay.jetty:servlet-api-2.5</include>
<include>org.slf4j:slf4j-jcl</include> <include>org.slf4j:slf4j-jcl</include>
<!-- JSP support --> <!-- JSP support -->
<include>org.mortbay.jetty:jsp-2.1</include> <include>org.mortbay.jetty:jsp-2.1</include>
<include>org.mortbay.jetty:jsp-api-2.1</include> <include>org.mortbay.jetty:jsp-api-2.1</include>
<include>org.eclipse.jdt:core</include> <include>org.eclipse.jdt:core</include>
<include>ant:ant</include> <include>ant:ant</include>
<!-- JSTL and other web stuff --> <!-- JSTL and other web stuff -->
<include>opensymphony:sitemesh</include> <include>opensymphony:sitemesh</include>
<include>javax.servlet:jstl</include> <include>javax.servlet:jstl</include>
<include>taglibs:standard</include> <include>taglibs:standard</include>
<!-- Atom/RSS support -->
<include>rome:rome</include>
<include>jdom:jdom</include>
</includes> </includes>
</dependencySet> </dependencySet>
</dependencySets> </dependencySets>
</assembly> </assembly>

2
assembly/src/release/conf/activemq.xml
View File

@ -98,7 +98,7 @@
</connectors> </connectors>
<handlers> <handlers>
<webAppContext contextPath="/admin" resourceBase="webapps" parentLoaderPriority="false" /> <webAppContext contextPath="/admin" resourceBase="webapps/admin" parentLoaderPriority="false" />
</handlers> </handlers>
</jetty> </jetty>

32
assembly/src/release/webapps/admin/WEB-INF/applicationContext.xml Normal file
View File

@ -0,0 +1,32 @@
<?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.
-->
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
<bean id="placeholderConfig" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
<bean id="sessionPool" class="org.apache.activemq.web.SessionPool"/>
<!-- use the following bean for a local in-JVM broker -->
<bean id="brokerQuery" class="org.apache.activemq.web.SingletonBrokerFacade" autowire='constructor' singleton="false"/>
<bean id="queueBrowser" class="org.apache.activemq.web.QueueBrowseQuery" autowire='constructor' singleton="false"/>
<bean id="messageQuery" class="org.apache.activemq.web.MessageQuery" autowire='constructor' singleton="false"/>
</beans>

5
assembly/src/release/webapps/index.html Normal file
View File

@ -0,0 +1,5 @@
<html>
<body>
<h1>Welcome to Apache ActiveMQ!</h1>
</body>
</html>