r7294 - in dumbhippo/trunk: . server/src/com/dumbhippo/polling server/src/com/dumbhippo/server super super/firehose/files/conf super/jboss/files/deploy

[commits mugshot org]

Author: walters
Date: 2008-02-07 11:00:26 -0600 (Thu, 07 Feb 2008)
New Revision: 7294

Modified:
   dumbhippo/trunk/.project
   dumbhippo/trunk/server/src/com/dumbhippo/polling/SwarmPollingSystem.java
   dumbhippo/trunk/server/src/com/dumbhippo/server/HippoProperty.java
   dumbhippo/trunk/super/base.conf
   dumbhippo/trunk/super/firehose/files/conf/mugshot.cfg
   dumbhippo/trunk/super/jboss/files/deploy/properties-service.xml
Log:
Finish super-ification.


Modified: dumbhippo/trunk/.project
===================================================================
--- dumbhippo/trunk/.project	2008-02-07 01:35:04 UTC (rev 7293)
+++ dumbhippo/trunk/.project	2008-02-07 17:00:26 UTC (rev 7294)
@@ -2,28 +2,39 @@
 <projectDescription>
 	<name>trunk</name>
 	<comment></comment>
-	<projects></projects>
+	<projects>
+	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.antlr.eclipse.core.antlrbuilder</name>
-			<arguments></arguments>
+			<arguments>
+			</arguments>
 		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments></arguments>
+			<arguments>
+			</arguments>
 		</buildCommand>
 		<buildCommand>
 			<name>org.antlr.eclipse.core.warningcleanerbuilder</name>
-			<arguments></arguments>
+			<arguments>
+			</arguments>
 		</buildCommand>
 		<buildCommand>
 			<name>org.antlr.eclipse.core.smapbuilder</name>
-			<arguments></arguments>
+			<arguments>
+			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.antlr.eclipse.core.antlrnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.python.pydev.pythonNature</nature>
 	</natures>
 	<linkedResources>
 		<link>

Modified: dumbhippo/trunk/server/src/com/dumbhippo/polling/SwarmPollingSystem.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/polling/SwarmPollingSystem.java	2008-02-07 01:35:04 UTC (rev 7293)
+++ dumbhippo/trunk/server/src/com/dumbhippo/polling/SwarmPollingSystem.java	2008-02-07 17:00:26 UTC (rev 7294)
@@ -324,14 +324,14 @@
 	private void notifyExternalTasks(Collection<PollingTask> newExternalTasks, boolean overwrite) {
 		Configuration config = EJBUtil.defaultLookup(Configuration.class);
 					
-		String firehoseId = config.getPropertyFatalIfUnset(HippoProperty.FIREHOSE_SERVICE_ID);
-		if (firehoseId.equals("")) {
-			logger.warn("FIREHOSE_SERVICE_ID not set, not updating firehose");
+		String firehoseHost = config.getPropertyFatalIfUnset(HippoProperty.FIREHOSE_MASTER_HOST);
+		if (firehoseHost.equals("")) {
+			logger.warn("FIREHOSE_MASTER_HOST not set, not updating firehose");
 			return;
 		}
 		URL firehoseUrl;
 		try {
-			firehoseUrl = new URL(firehoseId);
+			firehoseUrl = new URL("http://"; + firehoseHost);
 		} catch (MalformedURLException e) {
 			throw new RuntimeException(e);
 		}

Modified: dumbhippo/trunk/server/src/com/dumbhippo/server/HippoProperty.java
===================================================================
--- dumbhippo/trunk/server/src/com/dumbhippo/server/HippoProperty.java	2008-02-07 01:35:04 UTC (rev 7293)
+++ dumbhippo/trunk/server/src/com/dumbhippo/server/HippoProperty.java	2008-02-07 17:00:26 UTC (rev 7294)
@@ -43,8 +43,8 @@
 	BIND_HOST("dumbhippo.server.bind.host", null),
 	GOOGLE_ANALYTICS_KEY("dumbhippo.server.googleanalytics.key", ""), 
 	DDM_PROTOCOL_VERSION("dumbhippo.server.ddmProtocolVersion", null),
-	FIREHOSE_SERVICE_ID("dumbhippo.server.firehoseServiceId", null),
-	EXTERNAL_SERVICE_KEY("dumbhippo.server.externalServiceKey", null);
+	EXTERNAL_SERVICE_KEY("dumbhippo.server.externalServiceKey", null), 
+	FIREHOSE_MASTER_HOST("dumbhippo.server.firehoseMasterHost", null);
 	
 	private String key;
 	private String def;

Modified: dumbhippo/trunk/super/base.conf
===================================================================
--- dumbhippo/trunk/super/base.conf	2008-02-07 01:35:04 UTC (rev 7293)
+++ dumbhippo/trunk/super/base.conf	2008-02-07 17:00:26 UTC (rev 7294)
@@ -18,6 +18,10 @@
 	<!-- you definitely need to change this if you're virtualizing -->
 	<parameter name="tomcatHttpPort">8080</parameter>
 
+    <!-- if unset, defaults to local server -->
+    <parameter name="firehoseMasterPort">$((baseport+80))</parameter>    
+    <parameter name="firehoseMasterHost">$serverHost:$firehoseMasterPort</parameter>
+
 	<!-- Base for public URLs -->
 	<parameter name="baseurl">http://$serverHost:$tomcatHttpPort</parameter>
 
@@ -27,9 +31,6 @@
     <!-- Secret key used for "external" services to make requests -->
     <parameter name="externalServiceKey"></parameter>
 
-    <!-- URL for "firehose" polling service -->
-    <parameter name="firehoseServiceId"></parameter>
-
 	<!-- Who we send messages as over XMPP -->
     <parameter name="adminJid">admin mugshot org</parameter>
 
@@ -489,8 +490,6 @@
         <parameter name="targetdir">$basedir/firehose</parameter>
         <parameter name="firehosedir">$svndir/firehose</parameter>
 
-        
-
         <merge src="$superdir/firehose/files"
                expand="yes"/>
         <merge src="$firehosedir/start-firehose.py"
@@ -502,7 +501,6 @@
         <targetAttributes pattern="/run/*"   ignore="yes"/>
         <targetAttributes pattern="/data/*"  ignore="yes" preserve="yes"/>        
         
-        <parameter name="firehoseMasterPort">$((baseport+80))</parameter>
         <parameter name="firehoseLocalSlavePort">$((baseport+81))</parameter>         
 
         <parameter name="startCommand">$targetdir/scripts/firehose-start.sh</parameter>

Modified: dumbhippo/trunk/super/firehose/files/conf/mugshot.cfg
===================================================================
--- dumbhippo/trunk/super/firehose/files/conf/mugshot.cfg	2008-02-07 01:35:04 UTC (rev 7293)
+++ dumbhippo/trunk/super/firehose/files/conf/mugshot.cfg	2008-02-07 17:00:26 UTC (rev 7294)
@@ -12,7 +12,7 @@
 # sqlobject.dburi="sqlite:///file_name_and_path"
 
 firehose.taskdbpath="%(current_dir_uri)s/data/dev-tasks.sqlite"
-firehose.masterhost="@@serverHost@@:@@firehoseMasterPort@@"
+firehose.masterhost="@@firehoseMasterHost@@"
 firehose.localslaveport="@@firehoseLocalSlavePort@@"
 firehose.clienturl="http://@@serverHost@:@@tomcatHttpPort@@/extservice/notify-polling-tasks";
 firehose.externalServiceKey="@@externalServiceKey@@"

Modified: dumbhippo/trunk/super/jboss/files/deploy/properties-service.xml
===================================================================
--- dumbhippo/trunk/super/jboss/files/deploy/properties-service.xml	2008-02-07 01:35:04 UTC (rev 7293)
+++ dumbhippo/trunk/super/jboss/files/deploy/properties-service.xml	2008-02-07 17:00:26 UTC (rev 7294)
@@ -27,7 +27,8 @@
 		dumbhippo.server.baseurl=@@baseurl:properties@@
 		dumbhippo.server.baseurlGnome=@@baseurlGnome:properties@@
         dumbhippo.server.externalServiceKey=@@externalServiceKey::properties@@
-        dumbhippo.server.firehoseServiceId=@@firehoseServiceId:properties@@
+        dumbhippo.server.firehoseMasterHost=@@firehoseMasterHost:properties@@
+        dumbhippo.server.firehoseMasterPort=@@firehoseMasterPort:properties@@
 		dumbhippo.server.adminjid.mugshot=@@adminJid:properties@@
 		dumbhippo.server.adminjid.gnome=@@adminJidGnome:properties@@
 		dumbhippo.server.web.version=@@webVersion:properties@@