Menu
▾
▴
[Ogoglio-commits] SF.net SVN: ogoglio: [388] maven/trunk
|
From: <ian...@us...> - 2007-09-08 19:04:06
|
Revision: 388
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=388&view=rev
Author: iansmith
Date: 2007-09-08 12:04:09 -0700 (Sat, 08 Sep 2007)
Log Message:
-----------
More combat to allow protected instances of the server to be run.
Modified Paths:
--------------
maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java
maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractResourceServlet.java
maven/trunk/ogoglio-server/pom.xml
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-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 00:30:36 UTC (rev 387)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractRemoteServlet.java 2007-09-08 19:04:09 UTC (rev 388)
@@ -22,11 +22,15 @@
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();
@@ -41,6 +45,9 @@
ArgumentUtils.assertNotEmpty(ogoglioUsername);
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);
}
@@ -50,7 +57,7 @@
if (ogoglioClient == null) {
try {
WebAPIClientWire wire = new WebAPIClientWire();
- URI serviceURI = new URI(getBaseUrl());
+ URI serviceURI = new URI(internalURL);
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-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractResourceServlet.java
===================================================================
--- maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractResourceServlet.java 2007-09-08 00:30:36 UTC (rev 387)
+++ maven/trunk/ogoglio-appdev/src/main/java/com/ogoglio/appdev/servlet/AbstractResourceServlet.java 2007-09-08 19:04:09 UTC (rev 388)
@@ -57,7 +57,7 @@
private boolean noCache = true;
- // WARNING: This is really, really easy to hose yourself with. This will get called
+ // WARNING: This is really, really easy to hose yourself with this. This will get called
// WARNING: during the init() of this class, so it is very easy to end up calling this
// WARNING: init method "too soon" in your init method, before you are fully initialized
public abstract SiteResource createBaseResource(ServletConfig servletConfig);
Modified: maven/trunk/ogoglio-server/pom.xml
===================================================================
--- maven/trunk/ogoglio-server/pom.xml 2007-09-08 00:30:36 UTC (rev 387)
+++ maven/trunk/ogoglio-server/pom.xml 2007-09-08 19:04:09 UTC (rev 388)
@@ -198,7 +198,7 @@
<!-- these are for the populate -->
<configuration>
- <serviceURI>${ogoglio.baseURL}</serviceURI>
+ <serviceURI>${ogoglio.internalURL}</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 00:30:36 UTC (rev 387)
+++ maven/trunk/ogoglio-server/src/main/webapp/META-INF/context.xml 2007-09-08 19:04:09 UTC (rev 388)
@@ -2,9 +2,6 @@
<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"
@@ -16,16 +13,12 @@
show_sql="false"
maxIdle="5"
maxActive="50" />
-
- <tomcat-users>
- <role rolename="admin"/>
- <user username="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"/>
<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"/>
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-08 00:30:36 UTC (rev 387)
+++ maven/trunk/ogoglio-server/src/main/webapp/WEB-INF/web.xml 2007-09-08 19:04:09 UTC (rev 388)
@@ -41,7 +41,7 @@
</servlet-mapping>
<servlet-mapping>
- <servlet-name>SpaceServlet</servlet-name>test
+ <servlet-name>SpaceServlet</servlet-name>
<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.
|
