mirror of https://github.com/apache/activemq.git
updated to the latest/greatest jetty & sl4j along with patching the web console so it works again :)
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@646334 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
James Strachan
parent
f65484408e
commit
508128e3e6
|
|
@ -18,7 +18,7 @@
|
|||
-->
|
||||
|
||||
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
|
@ -39,16 +39,16 @@
|
|||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-war-plugin</artifactId>
|
||||
<configuration>
|
||||
<warSourceExcludes>
|
||||
WEB-INF/lib/activation*.jar,
|
||||
WEB-INF/lib/activeio*.jar,
|
||||
WEB-INF/lib/activemq-console*.jar,
|
||||
WEB-INF/lib/activemq-core*.jar,
|
||||
WEB-INF/lib/activemq-xmpp*.jar,
|
||||
WEB-INF/lib/geronimo*.jar,
|
||||
WEB-INF/lib/xml-apis*.jar,
|
||||
WEB-INF/lib/xerces*.jar
|
||||
</warSourceExcludes>
|
||||
<warSourceExcludes>
|
||||
WEB-INF/lib/activation*.jar,
|
||||
WEB-INF/lib/activeio*.jar,
|
||||
WEB-INF/lib/activemq-console*.jar,
|
||||
WEB-INF/lib/activemq-core*.jar,
|
||||
WEB-INF/lib/activemq-xmpp*.jar,
|
||||
WEB-INF/lib/geronimo*.jar,
|
||||
WEB-INF/lib/xml-apis*.jar,
|
||||
WEB-INF/lib/xerces*.jar
|
||||
</warSourceExcludes>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
|
|
@ -74,27 +74,27 @@
|
|||
<value></value>
|
||||
</systemProperty>
|
||||
|
||||
<!-- Start an own broker -->
|
||||
<!-- Start an own broker -->
|
||||
<systemProperty>
|
||||
<name>webconsole.type</name>
|
||||
<value>embedded</value>
|
||||
</systemProperty>
|
||||
|
||||
<!--
|
||||
Use the following configuration to connect to a remote broker using JMX
|
||||
<systemProperty>
|
||||
<name>webconsole.type</name>
|
||||
<value>properties</value>
|
||||
</systemProperty>
|
||||
<systemProperty>
|
||||
<name>webconsole.jms.url</name>
|
||||
<value>tcp://localhost:61616</value>
|
||||
</systemProperty>
|
||||
<systemProperty>
|
||||
<name>webconsole.jmx.url</name>
|
||||
<value>service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi</value>
|
||||
</systemProperty>
|
||||
-->
|
||||
<!--
|
||||
Use the following configuration to connect to a remote broker using JMX
|
||||
<systemProperty>
|
||||
<name>webconsole.type</name>
|
||||
<value>properties</value>
|
||||
</systemProperty>
|
||||
<systemProperty>
|
||||
<name>webconsole.jms.url</name>
|
||||
<value>tcp://localhost:61616</value>
|
||||
</systemProperty>
|
||||
<systemProperty>
|
||||
<name>webconsole.jmx.url</name>
|
||||
<value>service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi</value>
|
||||
</systemProperty>
|
||||
-->
|
||||
</systemProperties>
|
||||
<scanIntervalSeconds>10</scanIntervalSeconds>
|
||||
</configuration>
|
||||
|
|
@ -191,10 +191,28 @@
|
|||
</dependency>
|
||||
|
||||
<!-- enable commons-logging when inside jetty6:run -->
|
||||
<!--
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>jcl104-over-slf4j</artifactId>
|
||||
<version>1.5.0</version>
|
||||
</dependency>
|
||||
-->
|
||||
<!--
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-jcl</artifactId>
|
||||
</dependency>
|
||||
-->
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-jcl</artifactId>
|
||||
<artifactId>slf4j-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-log4j12</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>log4j</groupId>
|
||||
<artifactId>log4j</artifactId>
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ import org.apache.commons.logging.Log;
|
|||
import org.apache.commons.logging.LogFactory;
|
||||
import org.springframework.web.bind.ServletRequestDataBinder;
|
||||
import org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping;
|
||||
import org.springframework.web.servlet.HandlerExecutionChain;
|
||||
|
||||
/**
|
||||
* @version $Revision$
|
||||
|
|
@ -33,17 +34,28 @@ public class BindingBeanNameUrlHandlerMapping extends BeanNameUrlHandlerMapping
|
|||
Object object = super.getHandlerInternal(request);
|
||||
|
||||
if (object instanceof String) {
|
||||
String handlerName = (String)object;
|
||||
String handlerName = (String) object;
|
||||
object = getApplicationContext().getBean(handlerName);
|
||||
}
|
||||
if (object instanceof HandlerExecutionChain) {
|
||||
HandlerExecutionChain handlerExecutionChain = (HandlerExecutionChain) object;
|
||||
object = handlerExecutionChain.getHandler();
|
||||
}
|
||||
|
||||
ServletRequestDataBinder binder = new ServletRequestDataBinder(object, "request");
|
||||
binder.bind(request);
|
||||
binder.setIgnoreUnknownFields(true);
|
||||
if (LOG.isDebugEnabled()) {
|
||||
LOG.debug("Bound POJO is now: " + object);
|
||||
if (object != null) {
|
||||
ServletRequestDataBinder binder = new ServletRequestDataBinder(object, "request");
|
||||
try {
|
||||
binder.bind(request);
|
||||
binder.setIgnoreUnknownFields(true);
|
||||
if (LOG.isDebugEnabled()) {
|
||||
LOG.debug("Bound POJO is now: " + object);
|
||||
}
|
||||
}
|
||||
catch (Exception e) {
|
||||
LOG.warn("Caught: " + e, e);
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
return object;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,7 +61,14 @@ public class DestinationFacade {
|
|||
// Properties
|
||||
// -------------------------------------------------------------------------
|
||||
public BrokerViewMBean getBrokerAdmin() throws Exception {
|
||||
return brokerFacade.getBrokerAdmin();
|
||||
if (brokerFacade == null) {
|
||||
throw new IllegalArgumentException("No brokerFacade injected!");
|
||||
}
|
||||
BrokerViewMBean answer = brokerFacade.getBrokerAdmin();
|
||||
if (answer == null) {
|
||||
throw new IllegalArgumentException("No brokerAdmin on the injected brokerFacade: " + brokerFacade);
|
||||
}
|
||||
return answer;
|
||||
}
|
||||
|
||||
public BrokerFacade getBrokerFacade() {
|
||||
|
|
|
|||
10
pom.xml
10
pom.xml
|
|
@ -65,7 +65,7 @@
|
|||
<howl-version>0.1.8</howl-version>
|
||||
<hsqldb-version>1.7.2.2</hsqldb-version>
|
||||
<jdom-version>1.0</jdom-version>
|
||||
<jetty-version>6.1.4</jetty-version>
|
||||
<jetty-version>6.1.9</jetty-version>
|
||||
<jmock-version>1.0.1</jmock-version>
|
||||
<junit-version>3.8.1</junit-version>
|
||||
<jxta-version>2.0</jxta-version>
|
||||
|
|
@ -75,8 +75,7 @@
|
|||
<p2psockets-version>1.1.2</p2psockets-version>
|
||||
<regexp-version>1.3</regexp-version>
|
||||
<rome-version>0.8</rome-version>
|
||||
<slf4j-version>1.4.0</slf4j-version>
|
||||
<!--<slf4j-version>1.0-rc5</slf4j-version>-->
|
||||
<slf4j-version>1.5.0</slf4j-version>
|
||||
<stax-version>1.2.0</stax-version>
|
||||
<xalan-version>2.6.0</xalan-version>
|
||||
<xmlbeans-version>2.0.0-beta1</xmlbeans-version>
|
||||
|
|
@ -847,6 +846,11 @@
|
|||
<artifactId>slf4j-jcl</artifactId>
|
||||
<version>${slf4j-version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-log4j12</artifactId>
|
||||
<version>${slf4j-version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>opensymphony</groupId>
|
||||
<artifactId>sitemesh</artifactId>
|
||||
|
|
|
|||
Loading…
Reference in New Issue