[virtualcommons-svn] SF.net SVN: virtualcommons:[106] mentalmodels/trunk/src/main/webapp/WEB-INF

[<al...@us...>]

Revision: 106
          http://virtualcommons.svn.sourceforge.net/virtualcommons/?rev=106&view=rev
Author:   alllee
Date:     2009-04-18 00:18:06 +0000 (Sat, 18 Apr 2009)

Log Message:
-----------
mvn jetty:run should work now, removed spring security from web.xml and
flex:message-broker since I don't think we are going to use it for this first
incarnation of the application.  Also ran through xmllint --format

Modified Paths:
--------------
    mentalmodels/trunk/src/main/webapp/WEB-INF/applicationContext.xml
    mentalmodels/trunk/src/main/webapp/WEB-INF/web.xml

Added Paths:
-----------
    mentalmodels/trunk/src/main/webapp/WEB-INF/mme-servlet.xml

Removed Paths:
-------------
    mentalmodels/trunk/src/main/webapp/WEB-INF/testdrive-servlet.xml

Modified: mentalmodels/trunk/src/main/webapp/WEB-INF/applicationContext.xml
===================================================================
--- mentalmodels/trunk/src/main/webapp/WEB-INF/applicationContext.xml	2009-04-17 23:17:48 UTC (rev 105)
+++ mentalmodels/trunk/src/main/webapp/WEB-INF/applicationContext.xml	2009-04-18 00:18:06 UTC (rev 106)
@@ -25,7 +25,6 @@
 
 <!-- Flex related information started -->
   <flex:message-broker >
-    <flex:secured />
   </flex:message-broker>
 
 <!--  XXX: Split these out into separate XML files and import them if this file gets too large -->

Copied: mentalmodels/trunk/src/main/webapp/WEB-INF/mme-servlet.xml (from rev 105, mentalmodels/trunk/src/main/webapp/WEB-INF/testdrive-servlet.xml)
===================================================================
--- mentalmodels/trunk/src/main/webapp/WEB-INF/mme-servlet.xml	                        (rev 0)
+++ mentalmodels/trunk/src/main/webapp/WEB-INF/mme-servlet.xml	2009-04-18 00:18:06 UTC (rev 106)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+</beans>
\ No newline at end of file


Property changes on: mentalmodels/trunk/src/main/webapp/WEB-INF/mme-servlet.xml
___________________________________________________________________
Added: svn:mergeinfo
   + 

Deleted: mentalmodels/trunk/src/main/webapp/WEB-INF/testdrive-servlet.xml
===================================================================
--- mentalmodels/trunk/src/main/webapp/WEB-INF/testdrive-servlet.xml	2009-04-17 23:17:48 UTC (rev 105)
+++ mentalmodels/trunk/src/main/webapp/WEB-INF/testdrive-servlet.xml	2009-04-18 00:18:06 UTC (rev 106)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
-
-</beans>
\ No newline at end of file

Modified: mentalmodels/trunk/src/main/webapp/WEB-INF/web.xml
===================================================================
--- mentalmodels/trunk/src/main/webapp/WEB-INF/web.xml	2009-04-17 23:17:48 UTC (rev 105)
+++ mentalmodels/trunk/src/main/webapp/WEB-INF/web.xml	2009-04-18 00:18:06 UTC (rev 106)
@@ -4,7 +4,7 @@
 -->
 <web-app>
   <display-name>Mental Models Experiment</display-name>
-
+  <!--
     <filter>
         <filter-name>springSecurityFilterChain</filter-name>
         <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
@@ -14,24 +14,20 @@
       <filter-name>springSecurityFilterChain</filter-name>
       <url-pattern>/*</url-pattern>
     </filter-mapping>
-	
-	<listener>
-		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	</listener>
-	
-	<servlet>
-		<servlet-name>mme</servlet-name>
-		<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-
-	<servlet-mapping>
-    	<servlet-name>mme</servlet-name>
-    	<url-pattern>/messagebroker/*</url-pattern>
- 	</servlet-mapping>
-
-     <welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-	</welcome-file-list>
-
+    -->
+  <listener>
+    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+  </listener>
+  <servlet>
+    <servlet-name>mme</servlet-name>
+    <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>mme</servlet-name>
+    <url-pattern>/messagebroker/*</url-pattern>
+  </servlet-mapping>
+  <welcome-file-list>
+    <welcome-file>index.html</welcome-file>
+  </welcome-file-list>
 </web-app>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.