[Ogoglio-commits] SF.net SVN: ogoglio: [301] maven/trunk/ogoglio-common/src/main/java/com/ ogoglio

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

Revision: 301
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=301&view=rev
Author:   trevorolio
Date:     2007-08-30 20:40:40 -0700 (Thu, 30 Aug 2007)

Log Message:
-----------
Added a bridge between the external URL space and things, so now template scripts can be directly addressed via HTTP, and info panels are just iFrames showing a thing's service page.

Modified Paths:
--------------
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/MultiuserTests.java
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIDescriptor.java
    maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/SpaceEvent.java

Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/MultiuserTests.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/MultiuserTests.java	2007-08-31 03:40:36 UTC (rev 300)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/MultiuserTests.java	2007-08-31 03:40:40 UTC (rev 301)
@@ -109,9 +109,7 @@
         public void contextItemChosen(Thing thing, long nonce, String id) {
         }
 
-        public void receivedInfoPanel(long sourceThingID, String panelHTML) {
-            // TODO Auto-generated method stub
-            
+        public void receivedInfoPanel(long sourceThingID, String nonce) {
         }
 
     }

Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java	2007-08-31 03:40:36 UTC (rev 300)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/SpaceClient.java	2007-08-31 03:40:40 UTC (rev 301)
@@ -522,9 +522,9 @@
                 listener.receivedLink(displayName, link);
 
             } else if (SpaceEvent.SHOW_INFO_PANEL_EVENT.equals(event.getName())) {
-                String panelHTML = event.getStringProperty(SpaceEvent.INFO_PANEL_HTML);
+                String nonce = event.getStringProperty(SpaceEvent.INFO_PANEL_NONCE);
                 long sourceThingID = event.getLongProperty(SpaceEvent.THING_ID).longValue();
-                listener.receivedInfoPanel(sourceThingID, panelHTML);
+                listener.receivedInfoPanel(sourceThingID, nonce);
 
             } else if (SpaceEvent.RELOAD_THING_EVENT.equals(event.getName())) {
                 long thingID = event.getLongProperty(SpaceEvent.THING_ID).longValue();
@@ -655,7 +655,7 @@
     public interface Listener {
         public void receivedChatMessage(String username, String message);
 
-        public void receivedInfoPanel(long sourceThingID, String panelHTML);
+        public void receivedInfoPanel(long sourceThingID, String nonce);
 
         public void contextItemChosen(Thing thing, long nonce, String id);
 

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	2007-08-31 03:40:36 UTC (rev 300)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIClient.java	2007-08-31 03:40:40 UTC (rev 301)
@@ -371,6 +371,14 @@
         return (ThingDocument[]) results.toArray(new ThingDocument[0]);
     }
 
+    public String getThingService(long spaceID, long thingID) throws IOException {
+        InputStream stream = wire.fetchAuthenticatedStream(descriptor.getThingServiceURI(spaceID, thingID), authenticator.getAuthCookie());
+        if(stream == null){
+            return null;
+        }
+        return StreamUtils.readInput(stream);
+    }
+
     public PageDocument[] getPageDocuments(long spaceID, long thingID) throws IOException {
         Vector results = new Vector();
 
@@ -512,5 +520,5 @@
     public WebAPIClientWire getWire() {
         return wire;
     }
+}
 
-}

Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIDescriptor.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIDescriptor.java	2007-08-31 03:40:36 UTC (rev 300)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIDescriptor.java	2007-08-31 03:40:40 UTC (rev 301)
@@ -99,6 +99,10 @@
         return WebAPIUtil.appendToURI(getThingsURI(spaceID), thingID + "/");
     }
 
+    public URI getThingServiceURI(long spaceID, long thingID) {
+        return WebAPIUtil.appendToURI(getThingURI(spaceID, thingID), "service/");
+    }
+
     public URI getReloadThingURI(long spaceID, long thingID) {
         return WebAPIUtil.appendToURI(getThingsURI(spaceID), thingID + "/?reload=true");
     }
@@ -158,5 +162,4 @@
     public URI getServiceStateURI() {
         return WebAPIUtil.appendToURI(getSpacesURI(), "state/");
     }
-
 }

Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/SpaceEvent.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/SpaceEvent.java	2007-08-31 03:40:36 UTC (rev 300)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/xml/SpaceEvent.java	2007-08-31 03:40:40 UTC (rev 301)
@@ -219,7 +219,7 @@
 
     public static final String SHOW_INFO_PANEL_EVENT = "ShowInfoPanelEvent";
 
-    public static final String INFO_PANEL_HTML = "infoPanelHTML";
+    public static final String INFO_PANEL_NONCE = "infoPanelNonce";
 
     private String name = null;
 


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