Changeset 141

Timestamp:

01/30/06 14:33:45 (2 years ago)

Author:

dsandler

Message:

New, more flexible publisher.conf format, based on JSON.

It's not quite JSON, though: the new JSONPropertyFile class parses strings
that look a whole lot like Java Properties files. The format is almost
JSONObject: the differences are that

• the outermost curly braces have been removed, and
  
• no delimiter is required between key=value clauses.
  

As for publisher.conf, the feed_urls key has been replaced by
feeds, to allow for future expansion. The argument is no longer a
space-separated list of URLs, but a JSONArray of URLs:

feeds = [

"http://foo.com/bar/",
"http://baz.com/wombat/"

]

This checkin includes the public source for json.org's Java implementation of
core JSON parsing.

See also:

• http://json.org/
  
• http://www.crockford.com/JSON/java/index.html
  

Files:

• feedtree/trunk/build.xml (modified) (2 diffs)
• feedtree/trunk/publisher.conf (modified) (1 diff)
• feedtree/trunk/src/net/feedtree/publisher/JSONPropertyFile.java (added)
• feedtree/trunk/src/net/feedtree/publisher/Publisher.java (modified) (10 diffs)
• feedtree/trunk/src/org (added)
• feedtree/trunk/src/org/json (added)
• feedtree/trunk/src/org/json/JSONArray.java (added)
• feedtree/trunk/src/org/json/JSONException.java (added)
• feedtree/trunk/src/org/json/JSONObject.java (added)
• feedtree/trunk/src/org/json/JSONStringer.java (added)
• feedtree/trunk/src/org/json/JSONTokener.java (added)

feedtree/trunk/build.xml

@@ -104 +104 @@
-        </jar>
-    </target>
-
+
-    <!-- command-line proxy JAR file -->
-    <target name="ftproxy.jar" depends="compile"
@@ -141 +141 @@
-                <include name="net/feedtree/util/**/*.class"/>
-                <include name="net/feedtree/publisher/*.class"/>
+                <include name="org/json/**/*.class"/>
-            </fileset>
-            <include name="build.properties"/>

feedtree/trunk/publisher.conf

@@ -2 +2 @@
-# default configuration file for the FeedTree publisher
-# http://feedtree.net/
+#
+# File format (version 2):
+# key = 12345
+# key = "string"
+# key = [ "a", "list", "of", "things" ]
-
-#### Feed information ####
-
-
-
+
+
+
-
-
+
+
+
+
+
+
-fetch_interval_sec = 120
-
-:
+ =
-heartbeat_interval_sec = 600
-
-# file to store cached feed data (previously-seen entries) in
-publisher_feeds.cache
+"publisher_feeds.cache"
-
-#### Keystore information ####
-
-# path to a JKS or PKCS#12 keystore file
-         = demokey.jks
+= "demokey.jks"
-
-# type of the keystore (e.g. JKS or PKCS12; default JKS)
-    = JKS
+= "JKS"
-
-:
-monkey
+ =
+"monkey"
-
-:
-         = demokey
+ =
+= "demokey"
-
-:
-     = monkey
+ =
+= "monkey"
-
-
+
+
+
+
-
-# port to run the FeedTree node on (default 29690; this is the port that 
-# must be forwarded to the Publisher host in a NAT situation)
+# note that this must be changed to something else (e.g, 29691) if 29690 is
+# occupied (i.e. by a FeedTree proxy running on the same host)
-node_port = 29691
-
-
- 
+ (currently unused)
+
-
-# TODO: add access control for the web interface to this file
-
-
+
+
+
+
-
-# host to contact when starting (bootstrap.feedtree.net will boot you into 
-# the global FeedTree network)
-     = bootstrap.feedtree.net
+= "bootstrap.feedtree.net"
-
-# port on the bootstrap to contact (29690 is the FeedTree default)

feedtree/trunk/src/net/feedtree/publisher/Publisher.java

@@ -57 +57 @@
-import java.security.*;
-
+import org.json.*;
+
-public class Publisher
-    extends Client
@@ -97 +99 @@
-    public static final String PROP_WEB_PORT = "web_port";
-    
-
-
-
-
+
+
+
+
+
+
+
+
-    /// Filename of a local keystore (optional; required for signing entries)
-    public static final String PROP_KEYSTORE = "keystore";
@@ -124 +130 @@
-    protected static ClassLoader g_classLoader;
-    protected static Properties g_buildProperties;
-Properties
+JSONPropertyFile
-
-    protected PrivateKey m_key = null;
@@ -602 +608 @@
-        
-        m_storage = Shelf.open(
-getProperty
+optString
-        Integer storageVers = (Integer)m_storage.get("version");
-        if (storageVers == null || storageVers.intValue() < 1) {
@@ -647 +653 @@
-        m_startDate = new Date();
-        
-new Long(
-getProperty(PROP_FETCH_INTERVAL, "120")).longValue(
-new Long(
-getProperty(PROP_HEARTBEAT_INTERVAL, "600")).longValue(
+
+optLong(PROP_FETCH_INTERVAL, 120L
+
+optLong(PROP_HEARTBEAT_INTERVAL, 600L
-
-        Logger.global.info("### Scheduling first refresh task for " 
@@ -671 +677 @@
-    }
-    
-    protected static final int to_int(String s) {
-        return new Integer(s).intValue();
-    }
-    
-    public static void main(String[] args) {
-        // Disable use of graphics accelerator for Sparklines
@@ -690 +692 @@
-        }
-        
-        g_config = new Properties();
-        String confFile = DEFAULT_PROPERTIES_FILE;
-        
@@ -718 +719 @@
-
-        try {
-
+
+
+
+
+
+
+
+
+
-        } catch (IOException exc) {
-            Logger.global.severe("error: could not load publisher configuration from file: " + confFile);
@@ -724 +733 @@
-        }
-        
-
-
-
-
-
+
+
+
-            PROP_BOOTSTRAP, DEFAULT_BOOTSTRAP);
-
-
-
-
-
+
+
+
+
+
+
+
+
-            System.exit(1);
+        } else {
+            int len = urlList.length();
+            urls = new String[len];
+            try {
+                for (int i=0; i<len; i++) {
+                    urls[i] = urlList.getString(i);
+                }
+            } catch (JSONException exc) {
+                Logger.global.severe("error: invalid syntax for " + PROP_FEEDS + ": " + exc.toString());
+            }
-        }
-
-        PrivateKey privateKey = null;
-
-
+
-        if (keystoreFile == null) {
-            Logger.global.info("No keystore; entries will not be signed");
-        } else {
-getProperty
+optString
-                PROP_KEYSTORE_TYPE, "JKS");
-            try {
-                KeyStore ks = KeyStore.getInstance(keystoreType);
-                ks.load(new FileInputStream(keystoreFile), 
-getProperty
+optString
-                privateKey = (PrivateKey)ks.getKey(
-getProperty
-getProperty
+optString
+optString
-            
-            } catch (FileNotFoundException exc) {
@@ -768 +788 @@
-        // systemwide default proxy is a FeedTree web proxy application.
-        System.setProperty("http.proxyHost",
-getProperty
+optString
-        
-