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

https://issues.apache.org/jira/browse/AMQ-4034 - web console osgi itest improvements 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1442162 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2013-02-04 16:12:21 +00:00
parent a34970a959
commit 0d529af312
5 changed files with 5 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java
View File

@ -191,7 +191,7 @@ public abstract class AbstractFeatureTest {
// override the config.properties (to fix pax-exam bug)
replaceConfigurationFile("etc/config.properties", new File(basedir+"/src/test/resources/org/apache/activemq/karaf/itest/config.properties")),
replaceConfigurationFile("etc/custom.properties", new File(basedir+"/src/test/resources/org/apache/activemq/karaf/itest/custom.properties")),
replaceConfigurationFile("etc/org.ops4j.pax.logging.cfg", new File(basedir+"/src/test/resources/org/apache/activemq/karaf/itest/org.ops4j.pax.logging.cfg")),
//replaceConfigurationFile("etc/org.ops4j.pax.logging.cfg", new File(basedir+"/src/test/resources/org/apache/activemq/karaf/itest/org.ops4j.pax.logging.cfg")),
scanFeatures(getActiveMQKarafFeatureUrl(), f.toArray(new String[f.size()]))};
return options;

2
activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdWebConsoleFeatureTest.java
View File

@ -40,7 +40,7 @@ public class ActiveMQBrokerNdWebConsoleFeatureTest extends ActiveMQBrokerFeature
public static Option[] configure() {
return append(CoreOptions.mavenBundle("commons-codec", "commons-codec").versionAsInProject(),
append(CoreOptions.mavenBundle("commons-httpclient", "commons-httpclient").versionAsInProject(),
configureBrokerStart(configure("activemq-broker", "activemq-web-console"))));
configureBrokerStart(configure("activemq-broker"))));
}
@Override

4
activemq-karaf/src/main/resources/features.xml
View File

@ -92,8 +92,8 @@
</feature>
<feature name="activemq-web-console" version="${project.version}" resolver="(obr)" start-level="50">
<feature>war</feature>
<feature>eventadmin</feature>
<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/${project.version}/cfg/activemq-webconsole</configfile>
<bundle>mvn:org.apache.activemq/activemq-web-console/${project.version}/war</bundle>
</feature>

1
activemq-web-console/src/main/java/org/apache/activemq/web/WebConsoleStarter.java
View File

@ -81,6 +81,7 @@ public class WebConsoleStarter implements ServletContextListener {
private void initializeWebClient(ServletContext servletContext, WebApplicationContext context) {
ConnectionFactory connectionFactory = (ConnectionFactory)context.getBean("connectionFactory");
servletContext.setAttribute(WebClient.CONNECTION_FACTORY_ATTRIBUTE, connectionFactory);
WebClient.initContext(servletContext);
}
public void contextDestroyed(ServletContextEvent event) {

35
activemq-web-console/src/main/webapp/WEB-INF/web.xml
View File

@ -53,41 +53,6 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<!-- ActiveMQ servlets -->
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<!-- the subscription REST servlet -->
<servlet>
<servlet-name>AjaxServlet</servlet-name>
<servlet-class>org.apache.activemq.web.AjaxServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>AjaxServlet</servlet-name>
<url-pattern>/ajax/*</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>SendServlet</servlet-name>
<servlet-class>org.apache.activemq.web.MessageServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>SendServlet</servlet-name>
<url-pattern>/send/*</url-pattern>
</servlet-mapping>
<!-- the queue browse servlet -->
<servlet>
<servlet-name>QueueBrowseServlet</servlet-name>
<servlet-class>org.apache.activemq.web.QueueBrowseServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>QueueBrowseServlet</servlet-name>
<url-pattern>/queueBrowse/*</url-pattern>
</servlet-mapping>
<!-- track the session usage for web JMS clients -->
<filter>
<filter-name>session</filter-name>