Author: dejanb
Date: Mon Feb 4 16:12:21 2013
New Revision: 1442162
URL: http://svn.apache.org/viewvc?rev=1442162&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-4034 - web console osgi itest improvements
Modified:
activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java
activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdWebConsoleFeatureTest.java
activemq/trunk/activemq-karaf/src/main/resources/features.xml
activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/WebConsoleStarter.java
activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/web.xml
Modified: activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java?rev=1442162&r1=1442161&r2=1442162&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java
(original)
+++ activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/AbstractFeatureTest.java
Mon Feb 4 16:12:21 2013
@@ -191,7 +191,7 @@ public abstract class AbstractFeatureTes
// 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;
Modified: activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdWebConsoleFeatureTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdWebConsoleFeatureTest.java?rev=1442162&r1=1442161&r2=1442162&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdWebConsoleFeatureTest.java
(original)
+++ activemq/trunk/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ActiveMQBrokerNdWebConsoleFeatureTest.java
Mon Feb 4 16:12:21 2013
@@ -40,7 +40,7 @@ public class ActiveMQBrokerNdWebConsoleF
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
Modified: activemq/trunk/activemq-karaf/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/resources/features.xml?rev=1442162&r1=1442161&r2=1442162&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Mon Feb 4 16:12:21 2013
@@ -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>
Modified: activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/WebConsoleStarter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/WebConsoleStarter.java?rev=1442162&r1=1442161&r2=1442162&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/WebConsoleStarter.java
(original)
+++ activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/WebConsoleStarter.java
Mon Feb 4 16:12:21 2013
@@ -81,6 +81,7 @@ public class WebConsoleStarter implement
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) {
Modified: activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/web.xml?rev=1442162&r1=1442161&r2=1442162&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/web.xml (original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/web.xml Mon Feb 4 16:12:21
2013
@@ -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>
|