[Ogoglio-commits] SF.net SVN: ogoglio: [383] maven/trunk/ogoglio-server/src/main

[<ian...@us...>]

Revision: 383
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=383&view=rev
Author:   iansmith
Date:     2007-09-07 14:08:36 -0700 (Fri, 07 Sep 2007)

Log Message:
-----------
More futzing with security stuff. This passes "clean install" so should have no effect on 
non-demo users.

Modified Paths:
--------------
    maven/trunk/ogoglio-server/src/main/java/com/ogoglio/media/site/MediaServlet.java
    maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml
    maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web.xml

Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/media/site/MediaServlet.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/media/site/MediaServlet.java	2007-09-07 20:37:27 UTC (rev 382)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/media/site/MediaServlet.java	2007-09-07 21:08:36 UTC (rev 383)
@@ -118,8 +118,8 @@
                 response.setStatus(HttpServletResponse.SC_NOT_FOUND);
                 return;
             }
-
             String name = pathElements[pathElements.length - 1];
+            Log.debug("in doPut of media servlet:"+name);
             fileStore.write(name, request.getInputStream(), -1);
             response.setStatus(HttpServletResponse.SC_OK);
             response.setContentLength(0);

Modified: maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml
===================================================================
--- maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml	2007-09-07 20:37:27 UTC (rev 382)
+++ maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml	2007-09-07 21:08:36 UTC (rev 383)
@@ -2,7 +2,9 @@
 <Context reloadable="true" path="/og" >
 	<Realm className="org.apache.catalina.realm.MemoryRealm" />
 
-	 
+	<tomcat-users>
+	
+	</tomcat-users>	 
 	<Resource name="jdbc/space" scope="Shareable"
 		type="javax.sql.DataSource" auth='Container'
 		factory="org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory"
@@ -14,6 +16,10 @@
 		show_sql="false" 
 		maxIdle="5" 
 		maxActive="50" />
+
+	<tomcat-users>
+  	<user name="seattle" password="demolove" roles="demo"/>
+	</tomcat-users>
 		
     <Environment name="ogoglio/oktoZapDB" value="false" type="java.lang.String"/>  <!-- not running tests! -->
     <Environment name="ogoglio/okToMigrateDB" value="${ogoglio.okToMigrateDB}" type="java.lang.String"/>

Modified: maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web.xml
===================================================================
--- maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web.xml	2007-09-07 20:37:27 UTC (rev 382)
+++ maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web.xml	2007-09-07 21:08:36 UTC (rev 383)
@@ -41,7 +41,7 @@
     </servlet-mapping>
 
     <servlet-mapping>
-        <servlet-name>SpaceServlet</servlet-name>
+        <servlet-name>SpaceServlet</servlet-name>test
         <url-pattern>/space/*</url-pattern>
     </servlet-mapping>
 


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