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

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

Revision: 777
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=777&view=rev
Author:   iansmith
Date:     2008-02-26 18:40:31 -0800 (Tue, 26 Feb 2008)

Log Message:
-----------
Added log4j cruft to allow sensible debugging.

Added support for finding possessions by ID from the java api.

Modified Paths:
--------------
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClientWire.java
    maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java
    maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AccountServlet.java

Added Paths:
-----------
    maven/trunk/ogoglio-integration-test/src/main/resources/log4j/
    maven/trunk/ogoglio-integration-test/src/main/resources/log4j/log4j.properties

Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java	2008-02-27 01:45:14 UTC (rev 776)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java	2008-02-27 02:40:31 UTC (rev 777)
@@ -162,6 +162,10 @@
         return (PossessionDocument[]) results.toArray(new PossessionDocument[0]);
     }
 
+    public PossessionDocument getPossessionDocument(long possessionID) throws IOException {
+        return new PossessionDocument(wire.fetchAuthenticatedXML(descriptor.getPossessionURI(authenticator.getUsername(),possessionID), authenticator.getAuthCookie()));
+    }
+    
     public PossessionDocument addPossessionToSpace(long possessionID, long spaceID) throws IOException {
         PossessionDocument doc = new PossessionDocument(possessionID, null, -1, spaceID, -1);
         XMLElement result = wire.sendAuthenticatedXML(descriptor.getPossessionURI(authenticator.getUsername(), possessionID), doc.toString(), "POST", authenticator.getAuthCookie());

Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClientWire.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClientWire.java	2008-02-27 01:45:14 UTC (rev 776)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClientWire.java	2008-02-27 02:40:31 UTC (rev 777)
@@ -195,6 +195,7 @@
         int code = connection.getResponseCode();
         if (code != 200) {
             if (!followRedirects) {
+                Log.info("About to set redirects back on, but code was:"+code);
                 //we have to switch it back to prevent problems in the future
                 //XXX does this mean we can get concurrency problems in wire?
                 HttpURLConnection.setFollowRedirects(true);

Added: maven/trunk/ogoglio-integration-test/src/main/resources/log4j/log4j.properties
===================================================================
--- maven/trunk/ogoglio-integration-test/src/main/resources/log4j/log4j.properties	                        (rev 0)
+++ maven/trunk/ogoglio-integration-test/src/main/resources/log4j/log4j.properties	2008-02-27 02:40:31 UTC (rev 777)
@@ -0,0 +1,22 @@
+# if you want to have any hope of debugging things, you need this file
+log4j.rootLogger=DEBUG, R 
+
+log4j.logger.org.apache=ERROR, R
+log4j.logger.org.hibernate=ERROR, R
+
+log4j.logger.com.ogoglio=DEBUG, R
+log4j.logger.com.ogoglio.space=ERROR, R
+
+#
+# do not want extra copies
+#
+log4j.additivity.com.ogoglio=false
+log4j.additivity.com.ogoglio.space=false
+log4j.additivity.org.apache=false
+
+#R appender, only should be used for stuff not configured here
+log4j.appender.R=org.apache.log4j.ConsoleAppender
+log4j.appender.R.layout=org.apache.log4j.PatternLayout 
+log4j.appender.R.layout.ConversionPattern=%d [%p] %c - %m%n 
+ 
+

Modified: maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java
===================================================================
--- maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java	2008-02-27 01:45:14 UTC (rev 776)
+++ maven/trunk/ogoglio-integration-test/src/test/java/com/ogoglio/client/test/ClientTest.java	2008-02-27 02:40:31 UTC (rev 777)
@@ -80,6 +80,7 @@
 import com.ogoglio.xml.ThingDocument;
 import com.ogoglio.xml.UserDocument;
 import com.sun.org.apache.xalan.internal.xsltc.compiler.Template;
+import com.sun.swing.internal.plaf.basic.resources.basic;
 
 public class ClientTest extends TestCase {
 
@@ -220,6 +221,7 @@
         assertEquals("Test", accountDoc.getFirstName());
         assertEquals("Sims", accountDoc.getLastName());
 
+        
         assertFalse(accountDoc.isEmailValid());
         String emailValidationURL = getLastEmailValidationURL(accountDoc.getEmail());
         assertNotNull(emailValidationURL);
@@ -563,6 +565,12 @@
         possDoc = basicWebClient.addPossessionToSpace(possDoc.getPossessionID(), spaceDocument.getSpaceID());
         assertTrue(possDoc.getThingID() != -1);
 
+        long pid=possDoc.getPossessionID();
+        //just call the api one other way to get the same document...
+        possDoc=basicWebClient.getPossessionDocument(pid);
+        assertEquals(pid,possDoc.getPossessionID());
+        assertEquals(spaceDocument.getSpaceID(),possDoc.getSpaceID());
+        
         ThingDocument thingDoc = basicWebClient.getThingDocument(spaceDocument.getSpaceID(), possDoc.getThingID());
         thingDoc.setZ(-10);
         basicWebClient.updateThing(spaceDocument.getSpaceID(), thingDoc);

Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AccountServlet.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AccountServlet.java	2008-02-27 01:45:14 UTC (rev 776)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/site/AccountServlet.java	2008-02-27 02:40:31 UTC (rev 777)
@@ -476,12 +476,14 @@
 
         public void doGet(HttpServletRequest request, HttpServletResponse response, String[] pathElements, AccountRecord authedAccount) throws PersistException, ServletException, IOException {
             String requestedSecret = request.getParameter(SECRET_PARAMETER);
+            Log.info("Got a email validation GET on "+requestedSecret);
             if (requestedSecret == null || requestedSecret.length() == 0) {
                 Log.error("Requested validation with no secret");
                 response.setStatus(HttpServletResponse.SC_NOT_FOUND);
                 return;
             }
             PendingEmailValidationRecord validationRecord = PendingEmailValidationTasks.findPendingEmailValidationBySecret(requestedSecret, getSessionFactory());
+            Log.info("Email validation "+requestedSecret+" and "+(validationRecord==null));
             if (validationRecord == null) {
                 Log.error("Requested validation with unknown secret: " + requestedSecret);
                 response.setStatus(HttpServletResponse.SC_NOT_FOUND);


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