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

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

Revision: 390
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=390&view=rev
Author:   iansmith
Date:     2007-09-10 15:36:05 -0700 (Mon, 10 Sep 2007)

Log Message:
-----------
Removed config cruft for when I was trying to do security.

Modified Paths:
--------------
    maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java
    maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties
    maven/trunk/ogoglio-server/pom.xml
    maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml

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-09-08 20:35:20 UTC (rev 389)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java	2007-09-10 22:36:05 UTC (rev 390)
@@ -18,20 +18,17 @@
 import com.ogoglio.client.WebAPIClientWire;
 import com.ogoglio.client.WebAPIDescriptor;
 import com.ogoglio.util.ArgumentUtils;
+import com.ogoglio.util.Log;
 import com.ogoglio.xml.AuthDocument;
 
 public abstract class AbstractRemoteServlet extends MigratedResourceServlet {
 
-    public static final String OGOGLIO_INTERNAL_URL_KEY = "ogoglio/internalURL";
-
     private WebAPIClient ogoglioClient = null;
 
     private String ogoglioUsername = null;
 
     private String ogoglioPassword = null;
     
-    private String internalURL = null;
-
     public abstract String getOgoglioUsernameContextKey();
     
     public abstract String getOgoglioPasswordContextKey();
@@ -39,6 +36,8 @@
     public void init(ServletConfig config) throws ServletException {
         super.init(config);
         try {
+        	Log.info("In AbstractRemoteServlet---init");
+        	System.out.println("In AbstractRemoveServlet---init no log");
             Context envCtx = (Context) initCtx.lookup("java:comp/env");
 
             ogoglioUsername = (String) envCtx.lookup(getOgoglioUsernameContextKey());
@@ -46,8 +45,6 @@
             ogoglioPassword = (String) envCtx.lookup(getOgoglioPasswordContextKey());
             ArgumentUtils.assertNotEmpty(ogoglioPassword);
             
-            internalURL = (String) envCtx.lookup(OGOGLIO_INTERNAL_URL_KEY);
-            
         } catch (NamingException e) {
             throw new ServletException("Could not init EventServlet (probably forgot env variables in setup.xml): " + e);
         }
@@ -57,7 +54,7 @@
         if (ogoglioClient == null) {
             try {
                 WebAPIClientWire wire = new WebAPIClientWire();
-                URI serviceURI = new URI(internalURL);
+                URI serviceURI = new URI(baseUrl);
                 WebAPIDescriptor descriptor = new WebAPIDescriptor(serviceURI);
                 WebAPIAuthenticator authenticator = new WebAPIAuthenticatorFactory().authenticate(wire, descriptor, ogoglioUsername, ogoglioPassword);
                 ogoglioClient = new WebAPIClient(new WebAPIDescriptor(serviceURI), authenticator, wire);

Modified: maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties
===================================================================
--- maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties	2007-09-08 20:35:20 UTC (rev 389)
+++ maven/trunk/ogoglio-integration-test/src/test/resources/basic-config.properties	2007-09-10 22:36:05 UTC (rev 390)
@@ -1,6 +1,5 @@
 # basic info needed for some tests
 ogoglio.testSpaceNumber = ${ogoglio.testSpaceNumber}
 ogoglio.baseUrl = ${ogoglio.baseURL}
-ogoglio.internalUrl = ${ogoglio.internalURL}
 ogoglio.baseSimUrl = ${ogoglio.baseSimURL}
 

Modified: maven/trunk/ogoglio-server/pom.xml
===================================================================
--- maven/trunk/ogoglio-server/pom.xml	2007-09-08 20:35:20 UTC (rev 389)
+++ maven/trunk/ogoglio-server/pom.xml	2007-09-10 22:36:05 UTC (rev 390)
@@ -198,7 +198,7 @@
 
 				<!-- these are for the populate -->
 				<configuration>
-					<serviceURI>${ogoglio.internalURL}</serviceURI>
+					<serviceURI>${ogoglio.baseURL}</serviceURI>
 					<username>${ogoglio.bootstrapUser}</username>
 					<password>${ogoglio.bootstrapUserPW}</password>
 					<populateDir>src/main/resources/populate</populateDir>

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-08 20:35:20 UTC (rev 389)
+++ maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml	2007-09-10 22:36:05 UTC (rev 390)
@@ -18,7 +18,6 @@
     <Environment name="ogoglio/okToMigrateDB" value="${ogoglio.okToMigrateDB}" type="java.lang.String"/>
     <Environment name="ogoglio/mediaURL" value="${ogoglio.mediaURL}" type="java.lang.String"/>
     <Environment name="ogoglio/baseURL" value="${ogoglio.baseURL}" type="java.lang.String"/>
-    <Environment name="ogoglio/internalURL" value="${ogoglio.internalURL}" type="java.lang.String"/>
     <Environment name="ogoglio/simsAllowRemoteAccess" value="true" type="java.lang.String" />
 	<Environment name="ogoglio/mediaDirectory" value="${ogoglio.mediaDirectory}" type="java.lang.String"/>
 	<Environment name="ogoglio/bootstrapUser" value="${ogoglio.bootstrapUser}" type="java.lang.String"/>


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