[Ogoglio-commits] SF.net SVN: ogoglio: [291] maven/trunk

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

Revision: 291
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=291&view=rev
Author:   iansmith
Date:     2007-08-29 14:43:58 -0700 (Wed, 29 Aug 2007)

Log Message:
-----------
Removed file leftover from merge.

Reorganized servlet heirarchy in appdev to accomodate transmutable.

Whitespace changes in context.xml. sheesh.

Modified Paths:
--------------
    maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java
    maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml

Removed Paths:
-------------
    maven/trunk/ogoglio-integration-test/src/test/resources/bootstrapUser.properties

Modified: maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java
===================================================================
--- maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java	2007-08-29 20:55:24 UTC (rev 290)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java	2007-08-29 21:43:58 UTC (rev 291)
@@ -20,7 +20,7 @@
 import com.ogoglio.util.ArgumentUtils;
 import com.ogoglio.xml.AuthDocument;
 
-public abstract class AbstractRemoteServlet extends AbstractResourceServlet {
+public abstract class AbstractRemoteServlet extends MigratedResourceServlet {
 
     private WebAPIClient ogoglioClient = null;
 

Deleted: maven/trunk/ogoglio-integration-test/src/test/resources/bootstrapUser.properties
===================================================================
--- maven/trunk/ogoglio-integration-test/src/test/resources/bootstrapUser.properties	2007-08-29 20:55:24 UTC (rev 290)
+++ maven/trunk/ogoglio-integration-test/src/test/resources/bootstrapUser.properties	2007-08-29 21:43:58 UTC (rev 291)
@@ -1,2 +0,0 @@
-bootstrapUser=${ogoglio.bootstrapUser}
-bootstrapUserPW=${ogoglio.bootstrapUserPW}

Modified: maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml
===================================================================
--- maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml	2007-08-29 20:55:24 UTC (rev 290)
+++ maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml	2007-08-29 21:43:58 UTC (rev 291)
@@ -14,6 +14,7 @@
 		show_sql="false" 
 		maxIdle="5" 
 		maxActive="50" />
+		
     <Environment name="ogoglio/oktoZapDB" value="false" type="java.lang.String"/>  <!-- not running tests! -->
     <Environment name="ogoglio/okToMigrateDB" value="${ogoglio.okToMigrateDB}" type="java.lang.String"/>
     <Environment name="ogoglio/mediaURL" value="${ogoglio.mediaURL}" type="java.lang.String"/>


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