activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1387498 - in /activemq/trunk/activemq-web-demo/src/main/webapp: WEB-INF/web.xml send.html
Date Wed, 19 Sep 2012 08:59:59 GMT
Author: davsclaus
Date: Wed Sep 19 08:59:59 2012
New Revision: 1387498

URL: http://svn.apache.org/viewvc?rev=1387498&view=rev
Log:
AMQ-4043: web.xml was not valid according to the DTD

Modified:
    activemq/trunk/activemq-web-demo/src/main/webapp/WEB-INF/web.xml
    activemq/trunk/activemq-web-demo/src/main/webapp/send.html

Modified: activemq/trunk/activemq-web-demo/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-demo/src/main/webapp/WEB-INF/web.xml?rev=1387498&r1=1387497&r2=1387498&view=diff
==============================================================================
--- activemq/trunk/activemq-web-demo/src/main/webapp/WEB-INF/web.xml (original)
+++ activemq/trunk/activemq-web-demo/src/main/webapp/WEB-INF/web.xml Wed Sep 19 08:59:59 2012
@@ -21,10 +21,7 @@
 
 <web-app>
 
-    <display-name>ActiveMQ Web Demos</display-name>
-    <description>
-    Apache ActiveMQ Web Demos
-    </description>
+    <display-name>Apache ActiveMQ Web Demo</display-name>
 
     <!-- context config -->
     <context-param>
@@ -32,14 +29,28 @@
         <param-value>vm://localhost</param-value>
         <description>The URL of the Message Broker to connect to</description>
     </context-param>
-
     <context-param>
         <param-name>org.apache.activemq.embeddedBroker</param-name>
         <param-value>true</param-value>
         <description>Whether we should include an embedded broker or not</description>
     </context-param>
 
-    <!-- servlet mappings -->
+	<!-- filters -->
+	<filter>
+		<filter-name>session</filter-name>
+		<filter-class>org.apache.activemq.web.SessionFilter</filter-class>
+	</filter>
+	<filter-mapping>
+		<filter-name>session</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+	<!-- listener -->
+	<listener>
+		<listener-class>org.apache.activemq.web.SessionListener</listener-class>
+	</listener>
+
+	<!-- servlet mappings -->
     
     <!-- the subscription REST servlet -->
     <servlet>
@@ -59,7 +70,6 @@
                 <param-value>consumer.prefetchSize=1</param-value>
         </init-param> 
         -->
-
     </servlet>
 
     <!-- the queue browse servlet -->
@@ -74,7 +84,8 @@
         <servlet-class>org.apache.activemq.web.PortfolioPublishServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
-    
+
+	<!-- servlet mappings -->
     <servlet-mapping>
         <servlet-name>AjaxServlet</servlet-name>
         <url-pattern>/amq/*</url-pattern>
@@ -95,17 +106,4 @@
         <url-pattern>/portfolioPublish</url-pattern>
     </servlet-mapping>
 
-    <filter>
-      <filter-name>session</filter-name>
-      <filter-class>org.apache.activemq.web.SessionFilter</filter-class>
-    </filter>
-    
-    <filter-mapping>
-      <filter-name>session</filter-name>
-      <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-    <listener>
-        <listener-class>org.apache.activemq.web.SessionListener</listener-class>
-    </listener>
 </web-app>

Modified: activemq/trunk/activemq-web-demo/src/main/webapp/send.html
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-demo/src/main/webapp/send.html?rev=1387498&r1=1387497&r2=1387498&view=diff
==============================================================================
--- activemq/trunk/activemq-web-demo/src/main/webapp/send.html (original)
+++ activemq/trunk/activemq-web-demo/src/main/webapp/send.html Wed Sep 19 08:59:59 2012
@@ -33,7 +33,7 @@
     <label for="type">Destination Type: </label>
     <select name="type">
       <option selected value="queue">Queue</option>
-      <option type" value="topic">Topic</option>
+      <option value="topic">Topic</option>
    </select>
   </p>
   <p>



Mime
View raw message