[Ogoglio-commits] SF.net SVN: ogoglio: [242] spaces/trunk

[<tre...@us...>]

Revision: 242
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=242&view=rev
Author:   trevorolio
Date:     2007-08-09 16:56:22 -0700 (Thu, 09 Aug 2007)

Log Message:
-----------
Added a way to get an auth document based on an auth cookie.
Rearranged the build.xml so that the shared files are in a named fileset.

Modified Paths:
--------------
    spaces/trunk/build.xml
    spaces/trunk/src/com/ogoglio/client/WebAPIClient.java

Modified: spaces/trunk/build.xml
===================================================================
--- spaces/trunk/build.xml	2007-08-09 12:45:17 UTC (rev 241)
+++ spaces/trunk/build.xml	2007-08-09 23:56:22 UTC (rev 242)
@@ -38,7 +38,24 @@
                 <include name="plugin.jar" /> 	 
         </fileset> 	 
     </path>
-    
+
+	<!-- these are files which will end up in ogoglio-shared.jar in Tomcat's shared lib, and not in ogoglio.war -->
+    <fileset id="sharedFiles" dir="${dest}">
+        <include name="com/ogoglio/util/**/*" />
+        <include name="com/ogoglio/media/**/*" />
+        <include name="com/ogoglio/site/AbstractResourceServlet*" />
+        <include name="com/ogoglio/site/AuthServlet*" />
+        <include name="com/ogoglio/site/SiteResource*" />
+        <include name="com/ogoglio/site/DescendingSiteResource*" />
+        <include name="com/ogoglio/site/AuthenticatedSiteResource*" />
+        <include name="com/ogoglio/site/SiteInfo*" />
+        <include name="com/ogoglio/persist/HibernateTask*" />
+        <include name="com/ogoglio/persist/PersistException*" />
+        <include name="com/ogoglio/client/**/*" />
+        <include name="com/ogoglio/xml/**/*" />
+        <include name="nanoxml/*" />
+    </fileset>
+
     <target name="compile">
         <javac source="1.4" target="1.4" srcdir="${source}" destdir="${dest}" debug="${debug.on}">
             <classpath refid="classpath" />
@@ -52,17 +69,7 @@
 
     <target name="sharedJar" depends="compile">
         <jar destfile="ogoglio-shared.jar">
-            <fileset dir="${dest}">
-                <include name="com/ogoglio/util/**/*" />
-                <include name="com/ogoglio/media/**/*" />
-                <include name="com/ogoglio/site/AbstractResourceServlet*" />
-                <include name="com/ogoglio/site/SiteResource*" />
-                <include name="com/ogoglio/site/DescendingSiteResource*" />
-                <include name="com/ogoglio/site/SiteInfo*" />
-                <include name="com/ogoglio/persist/HibernateTask*" />
-                <include name="com/ogoglio/persist/PersistException*" />
-                <include name="nanoxml/*" />
-            </fileset>
+            <fileset refid="sharedFiles" />
         </jar>
     </target>
     

Modified: spaces/trunk/src/com/ogoglio/client/WebAPIClient.java
===================================================================
--- spaces/trunk/src/com/ogoglio/client/WebAPIClient.java	2007-08-09 12:45:17 UTC (rev 241)
+++ spaces/trunk/src/com/ogoglio/client/WebAPIClient.java	2007-08-09 23:56:22 UTC (rev 242)
@@ -97,6 +97,14 @@
         return new AccountDocument(response);
     }
 
+    public AuthDocument getAuthDocumentByAuthCookie(String authCookie) throws IOException {
+        XMLElement response = wire.fetchAuthenticatedXML(descriptor.getMeAuthURI(), authCookie);
+        if (response == null) {
+            return null;
+        }
+        return new AuthDocument(response);
+    }
+
     public DoorDocument getDoorDocument(long spaceID, long doorID) throws IOException {
         return new DoorDocument(wire.fetchAuthenticatedXML(descriptor.getDoorURI(spaceID, doorID), authenticator.getAuthCookie()));
     }


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