Return-Path: 
 <activemq-commits-return-3755-apmail-geronimo-activemq-commits-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org
Received: (qmail 90682 invoked from network); 26 Oct 2006 15:01:28 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 26 Oct 2006 15:01:28 -0000
Received: (qmail 98052 invoked by uid 500); 26 Oct 2006 15:01:39 -0000
Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org
Received: (qmail 98027 invoked by uid 500); 26 Oct 2006 15:01:39 -0000
Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:activemq-commits-help@geronimo.apache.org>
List-Unsubscribe: <mailto:activemq-commits-unsubscribe@geronimo.apache.org>
List-Post: <mailto:activemq-commits@geronimo.apache.org>
List-Id: <activemq-commits.geronimo.apache.org>
Reply-To: activemq-dev@geronimo.apache.org
Delivered-To: mailing list activemq-commits@geronimo.apache.org
Received: (qmail 98012 invoked by uid 99); 26 Oct 2006 15:01:39 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Oct 2006 08:01:39 -0700
X-ASF-Spam-Status: No, hits=0.6 required=10.0
	tests=NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (herse.apache.org: local policy)
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Oct 2006 08:01:10 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 572ED1A984D; Thu, 26 Oct 2006 08:00:49 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r468029 - in
 /incubator/activemq/trunk/activemq-web-console:
 pom.xml
 src/main/java/org/apache/activemq/web/handler/BindingBeanNameUrlHandlerMapping.java
 src/main/resources/log4j.properties src/main/webapp/WEB-INF/activemq.xml
Date: Thu, 26 Oct 2006 15:00:49 -0000
To: activemq-commits@geronimo.apache.org
From: jstrachan@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20061026150049.572ED1A984D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jstrachan
Date: Thu Oct 26 08:00:48 2006
New Revision: 468029

URL: http://svn.apache.org/viewvc?view=rev&rev=468029
Log:
fixed the web console so it works fine with spring 2.0 along with adding XMPP support so you can chat with the broker using a Jabber client or use the web front end to send / browse messages

Modified:
    incubator/activemq/trunk/activemq-web-console/pom.xml
    incubator/activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/handler/BindingBeanNameUrlHandlerMapping.java
    incubator/activemq/trunk/activemq-web-console/src/main/resources/log4j.properties
    incubator/activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml

Modified: incubator/activemq/trunk/activemq-web-console/pom.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-web-console/pom.xml?view=diff&rev=468029&r1=468028&r2=468029
==============================================================================
--- incubator/activemq/trunk/activemq-web-console/pom.xml (original)
+++ incubator/activemq/trunk/activemq-web-console/pom.xml Thu Oct 26 08:00:48 2006
@@ -98,6 +98,13 @@
       <artifactId>activemq-web</artifactId>
     </dependency>
 
+    <!-- XMPP support -->
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>activemq-xmpp</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+
     <!-- TODO this should not be needed, but transitive dependencies are not working -->
     <dependency>
       <groupId>${pom.groupId}</groupId>

Modified: incubator/activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/handler/BindingBeanNameUrlHandlerMapping.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/handler/BindingBeanNameUrlHandlerMapping.java?view=diff&rev=468029&r1=468028&r2=468029
==============================================================================
--- incubator/activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/handler/BindingBeanNameUrlHandlerMapping.java (original)
+++ incubator/activemq/trunk/activemq-web-console/src/main/java/org/apache/activemq/web/handler/BindingBeanNameUrlHandlerMapping.java Thu Oct 26 08:00:48 2006
@@ -19,6 +19,8 @@
 
 import org.springframework.web.bind.ServletRequestDataBinder;
 import org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -27,6 +29,7 @@
  * @version $Revision$
  */
 public class BindingBeanNameUrlHandlerMapping extends BeanNameUrlHandlerMapping {
+    private static final transient Log log = LogFactory.getLog(BindingBeanNameUrlHandlerMapping.class);
 
     protected Object getHandlerInternal(HttpServletRequest request) throws Exception {
         Object object = super.getHandlerInternal(request);
@@ -36,9 +39,12 @@
             object = getApplicationContext().getBean(handlerName);
         }
 
-        ServletRequestDataBinder binder = new ServletRequestDataBinder(object, null);
+        ServletRequestDataBinder binder = new ServletRequestDataBinder(object, "request");
         binder.bind(request);
-        System.out.println("Bound POJO is now: " + object);
+        binder.setIgnoreUnknownFields(true);
+        if (log.isDebugEnabled()) {
+            log.debug("Bound POJO is now: " + object);
+        }
         return object;
     }
 

Modified: incubator/activemq/trunk/activemq-web-console/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-web-console/src/main/resources/log4j.properties?view=diff&rev=468029&r1=468028&r2=468029
==============================================================================
--- incubator/activemq/trunk/activemq-web-console/src/main/resources/log4j.properties (original)
+++ incubator/activemq/trunk/activemq-web-console/src/main/resources/log4j.properties Thu Oct 26 08:00:48 2006
@@ -18,7 +18,7 @@
 #
 # The logging properties used during tests..
 #
-log4j.rootLogger=INFO, stdout
+log4j.rootLogger=DEBUG, stdout
 
 log4j.logger.org.apache.activemq.spring=WARN
 log4j.logger.org.springframework=warn

Modified: incubator/activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml?view=diff&rev=468029&r1=468028&r2=468029
==============================================================================
--- incubator/activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml (original)
+++ incubator/activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml Thu Oct 26 08:00:48 2006
@@ -62,13 +62,14 @@
     </persistenceAdapter>
   
     <transportConnectors>
-       <transportConnector name="default" uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
+       <transportConnector name="openwire" uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
        <transportConnector name="stomp"   uri="stomp://localhost:61613"/>
+       <transportConnector name="xmpp"   uri="xmpp://localhost:61222"/>
     </transportConnectors>
     
     <networkConnectors>
       <!-- by default just auto discover the other brokers -->
-      <networkConnector name="default" uri="multicast://default"/>
+      <networkConnector name="defaultNetork" uri="multicast://default"/>
       <!--
       <networkConnector name="host1 and host2" uri="static://(tcp://host1:61616,tcp://host2:61616)" failover="true"/>
       -->