Updated service suite configs for elastic sqlite

nimbusproject · Jun 20, 2011 · 95adbcc · 95adbcc
1 parent e1c9df4
commit 95adbcc
Show file tree

Hide file tree

Showing 14 changed files with 52 additions and 35 deletions.
diff --git a/messaging/gt4.0-elastic/java/msgbridge/etc/elastic/other/other-elastic.conf b/messaging/gt4.0-elastic/java/msgbridge/etc/elastic/other/other-elastic.conf
@@ -67,7 +67,5 @@ ra.name.unknown=[unknown]
 unknown.pubnet=[unknown]
 unknown.privnet=[unknown]
 
-# disk-persistent caching
-caches.dir=$NIMBUS_HOME/services/var/nimbus/elastic-caches
 
 elastic.db=$NIMBUS_HOME/services/var/nimbus/elastic.db
diff --git a/service/service/java/source/share/lib/db-mgmt.xml b/service/service/java/source/share/lib/db-mgmt.xml
@@ -98,7 +98,7 @@
              also need a reset -->
         <echo message="Deleting disk-caches for the Workspace Service"/>
         <delete dir="${workspace.dbdir.prop}/caches" />
-        <delete dir="${workspace.dbdir.prop}/elastic-caches" />
+        <delete file="${workspace.dbdir.prop}/elastic.db" />
         <echo message="Deleting notification msgs for the Workspace Service"/>
         <delete dir="${workspace.dbdir.prop}/msg-sinks" />
     </target>
@@ -269,8 +269,6 @@
 
         <mkdir dir="${workspace.dbdir.prop}/caches" />
 
-        <mkdir dir="${workspace.dbdir.prop}/elastic-caches" />
-
         <mkdir dir="${workspace.dbdir.prop}/tmpfiles" />
 
         <mkdir dir="${workspace.dbdir.prop}/msg-sinks" />

diff --git a/service/service/java/tests/suites/basic/home/services/etc/nimbus/elastic/other/main.xml b/service/service/java/tests/suites/basic/home/services/etc/nimbus/elastic/other/main.xml
@@ -76,10 +76,16 @@
     <bean id="nimbus-elastic.rm.idmappings"
           class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.defaults.DefaultIDMgmtProxy" />
 
+    <bean id="nimbus-elastic.rm.persistence"
+          class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.general.defaults.DefaultElasticPersistence"
+            init-method="initialize">
+        <constructor-arg value="$OTHER_ELASTIC{elastic.db}"/>
+    </bean>
+
     <!-- Don't reference this bean directly. See DefaultIDMgmtProxy class notes.  -->
     <bean id="nimbus-elastic.rm.realidmappings"
           class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.defaults.DefaultIDMgmt">
-        <constructor-arg value="$OTHER_ELASTIC{caches.dir}" />
+        <constructor-arg ref="nimbus-elastic.rm.persistence"/>
     </bean>
 
     <!-- ************ Spot Instances *********** -->
@@ -191,8 +197,7 @@
           class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.security.defaults.DefaultSSHKeys"
           init-method="validate">
 
-        <!-- key cache provider -->
-        <constructor-arg ref="nimbus-elastic.rm.idmappings" />
+        <constructor-arg ref="nimbus-elastic.rm.persistence" />
         <property name="pubkeyOnly" value="$ELASTIC{ssh.pubkey.only}" />
         <property name="splitToken" value="$ELASTIC{ssh.split.token}" />
 

diff --git a/...service/java/tests/suites/basic/home/services/etc/nimbus/elastic/other/other-elastic.conf b/...service/java/tests/suites/basic/home/services/etc/nimbus/elastic/other/other-elastic.conf
@@ -67,5 +67,5 @@ ra.name.unknown=[unknown]
 unknown.pubnet=[unknown]
 unknown.privnet=[unknown]
 
-# disk-persistent caching
-caches.dir=$NIMBUS_HOME/services/var/nimbus/elastic-caches
+
+elastic.db=$NIMBUS_HOME/services/var/nimbus/elastic.db
diff --git a/service/service/java/tests/suites/basic/home/services/etc/nimbus/query/other/main.xml b/service/service/java/tests/suites/basic/home/services/etc/nimbus/query/other/main.xml
@@ -161,6 +161,11 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
         <constructor-arg ref="userDetailsService" />
     </bean>
 
+    <bean id="nimbus-elastic.rm.persistence"
+          class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.general.defaults.DefaultElasticPersistence"
+            init-method="initialize">
+        <constructor-arg value="$OTHER_ELASTIC{elastic.db}"/>
+    </bean>
 
     <bean id="nimbus-query.rm.idmappings"
           class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.defaults.DefaultIDMgmtProxy" />
@@ -274,8 +279,7 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
           class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.security.defaults.DefaultSSHKeys"
           init-method="validate">
 
-        <!-- key cache provider -->
-        <constructor-arg ref="nimbus-query.rm.idmappings" />
+        <constructor-arg ref="nimbus-elastic.rm.persistence" />
         <property name="pubkeyOnly" value="$ELASTIC{ssh.pubkey.only}" />
         <property name="splitToken" value="$ELASTIC{ssh.split.token}" />
 

diff --git a/service/service/java/tests/suites/basic/home/services/share/nimbus/lib/db-mgmt.xml b/service/service/java/tests/suites/basic/home/services/share/nimbus/lib/db-mgmt.xml
@@ -98,7 +98,7 @@
              also need a reset -->
         <echo message="Deleting disk-caches for the Workspace Service"/>
         <delete dir="${workspace.dbdir.prop}/caches" />
-        <delete dir="${workspace.dbdir.prop}/elastic-caches" />
+        <delete file="${workspace.dbdir.prop}/elastic.db" />
         <echo message="Deleting notification msgs for the Workspace Service"/>
         <delete dir="${workspace.dbdir.prop}/msg-sinks" />
     </target>
@@ -269,8 +269,6 @@
 
         <mkdir dir="${workspace.dbdir.prop}/caches" />
 
-        <mkdir dir="${workspace.dbdir.prop}/elastic-caches" />
-
         <mkdir dir="${workspace.dbdir.prop}/tmpfiles" />
 
         <mkdir dir="${workspace.dbdir.prop}/msg-sinks" />

diff --git a/service/service/java/tests/suites/failure/home/services/etc/nimbus/elastic/other/main.xml b/service/service/java/tests/suites/failure/home/services/etc/nimbus/elastic/other/main.xml
@@ -76,10 +76,16 @@
     <bean id="nimbus-elastic.rm.idmappings"
           class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.defaults.DefaultIDMgmtProxy" />
 
+    <bean id="nimbus-elastic.rm.persistence"
+          class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.general.defaults.DefaultElasticPersistence"
+            init-method="initialize">
+        <constructor-arg value="$OTHER_ELASTIC{elastic.db}"/>
+    </bean>
+
     <!-- Don't reference this bean directly. See DefaultIDMgmtProxy class notes.  -->
     <bean id="nimbus-elastic.rm.realidmappings"
           class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.defaults.DefaultIDMgmt">
-        <constructor-arg value="$OTHER_ELASTIC{caches.dir}" />
+        <constructor-arg ref="nimbus-elastic.rm.persistence"/>
     </bean>
 
     <!-- ************ Spot Instances *********** -->
@@ -191,8 +197,7 @@
           class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.security.defaults.DefaultSSHKeys"
           init-method="validate">
 
-        <!-- key cache provider -->
-        <constructor-arg ref="nimbus-elastic.rm.idmappings" />
+        <constructor-arg ref="nimbus-elastic.rm.persistence" />
         <property name="pubkeyOnly" value="$ELASTIC{ssh.pubkey.only}" />
         <property name="splitToken" value="$ELASTIC{ssh.split.token}" />
 

diff --git a/...rvice/java/tests/suites/failure/home/services/etc/nimbus/elastic/other/other-elastic.conf b/...rvice/java/tests/suites/failure/home/services/etc/nimbus/elastic/other/other-elastic.conf
@@ -67,5 +67,5 @@ ra.name.unknown=[unknown]
 unknown.pubnet=[unknown]
 unknown.privnet=[unknown]
 
-# disk-persistent caching
-caches.dir=$NIMBUS_HOME/services/var/nimbus/elastic-caches
+
+elastic.db=$NIMBUS_HOME/services/var/nimbus/elastic.db
diff --git a/service/service/java/tests/suites/failure/home/services/etc/nimbus/query/other/main.xml b/service/service/java/tests/suites/failure/home/services/etc/nimbus/query/other/main.xml
@@ -161,6 +161,11 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
         <constructor-arg ref="userDetailsService" />
     </bean>
 
+    <bean id="nimbus-elastic.rm.persistence"
+          class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.general.defaults.DefaultElasticPersistence"
+            init-method="initialize">
+        <constructor-arg value="$OTHER_ELASTIC{elastic.db}"/>
+    </bean>
 
     <bean id="nimbus-query.rm.idmappings"
           class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.defaults.DefaultIDMgmtProxy" />
@@ -274,8 +279,7 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
           class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.security.defaults.DefaultSSHKeys"
           init-method="validate">
 
-        <!-- key cache provider -->
-        <constructor-arg ref="nimbus-query.rm.idmappings" />
+        <constructor-arg ref="nimbus-elastic.rm.persistence" />
         <property name="pubkeyOnly" value="$ELASTIC{ssh.pubkey.only}" />
         <property name="splitToken" value="$ELASTIC{ssh.split.token}" />
 

diff --git a/service/service/java/tests/suites/failure/home/services/share/nimbus/lib/db-mgmt.xml b/service/service/java/tests/suites/failure/home/services/share/nimbus/lib/db-mgmt.xml
@@ -98,7 +98,7 @@
              also need a reset -->
         <echo message="Deleting disk-caches for the Workspace Service"/>
         <delete dir="${workspace.dbdir.prop}/caches" />
-        <delete dir="${workspace.dbdir.prop}/elastic-caches" />
+        <delete file="${workspace.dbdir.prop}/elastic.db" />
         <echo message="Deleting notification msgs for the Workspace Service"/>
         <delete dir="${workspace.dbdir.prop}/msg-sinks" />
     </target>
@@ -269,8 +269,6 @@
 
         <mkdir dir="${workspace.dbdir.prop}/caches" />
 
-        <mkdir dir="${workspace.dbdir.prop}/elastic-caches" />
-
         <mkdir dir="${workspace.dbdir.prop}/tmpfiles" />
 
         <mkdir dir="${workspace.dbdir.prop}/msg-sinks" />

diff --git a/...e/service/java/tests/suites/spotinstances/home/services/etc/nimbus/elastic/other/main.xml b/...e/service/java/tests/suites/spotinstances/home/services/etc/nimbus/elastic/other/main.xml
@@ -76,10 +76,16 @@
     <bean id="nimbus-elastic.rm.idmappings"
           class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.defaults.DefaultIDMgmtProxy" />
 
+    <bean id="nimbus-elastic.rm.persistence"
+          class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.general.defaults.DefaultElasticPersistence"
+            init-method="initialize">
+        <constructor-arg value="$OTHER_ELASTIC{elastic.db}"/>
+    </bean>
+
     <!-- Don't reference this bean directly. See DefaultIDMgmtProxy class notes.  -->
     <bean id="nimbus-elastic.rm.realidmappings"
           class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.defaults.DefaultIDMgmt">
-        <constructor-arg value="$OTHER_ELASTIC{caches.dir}" />
+        <constructor-arg ref="nimbus-elastic.rm.persistence"/>
     </bean>
 
     <!-- ************ Spot Instances *********** -->
@@ -191,8 +197,7 @@
           class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.security.defaults.DefaultSSHKeys"
           init-method="validate">
 
-        <!-- key cache provider -->
-        <constructor-arg ref="nimbus-elastic.rm.idmappings" />
+        <constructor-arg ref="nimbus-elastic.rm.persistence" />
         <property name="pubkeyOnly" value="$ELASTIC{ssh.pubkey.only}" />
         <property name="splitToken" value="$ELASTIC{ssh.split.token}" />
 

diff --git a/...java/tests/suites/spotinstances/home/services/etc/nimbus/elastic/other/other-elastic.conf b/...java/tests/suites/spotinstances/home/services/etc/nimbus/elastic/other/other-elastic.conf
@@ -67,5 +67,5 @@ ra.name.unknown=[unknown]
 unknown.pubnet=[unknown]
 unknown.privnet=[unknown]
 
-# disk-persistent caching
-caches.dir=$NIMBUS_HOME/services/var/nimbus/elastic-caches
+
+elastic.db=$NIMBUS_HOME/services/var/nimbus/elastic.db
diff --git a/...ice/service/java/tests/suites/spotinstances/home/services/etc/nimbus/query/other/main.xml b/...ice/service/java/tests/suites/spotinstances/home/services/etc/nimbus/query/other/main.xml
@@ -161,6 +161,11 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
         <constructor-arg ref="userDetailsService" />
     </bean>
 
+    <bean id="nimbus-elastic.rm.persistence"
+          class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.general.defaults.DefaultElasticPersistence"
+            init-method="initialize">
+        <constructor-arg value="$OTHER_ELASTIC{elastic.db}"/>
+    </bean>
 
     <bean id="nimbus-query.rm.idmappings"
           class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.defaults.DefaultIDMgmtProxy" />
@@ -274,8 +279,7 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
           class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.security.defaults.DefaultSSHKeys"
           init-method="validate">
 
-        <!-- key cache provider -->
-        <constructor-arg ref="nimbus-query.rm.idmappings" />
+        <constructor-arg ref="nimbus-elastic.rm.persistence" />
         <property name="pubkeyOnly" value="$ELASTIC{ssh.pubkey.only}" />
         <property name="splitToken" value="$ELASTIC{ssh.split.token}" />
 

diff --git a/service/service/java/tests/suites/spotinstances/home/services/share/nimbus/lib/db-mgmt.xml b/service/service/java/tests/suites/spotinstances/home/services/share/nimbus/lib/db-mgmt.xml
@@ -98,7 +98,7 @@
              also need a reset -->
         <echo message="Deleting disk-caches for the Workspace Service"/>
         <delete dir="${workspace.dbdir.prop}/caches" />
-        <delete dir="${workspace.dbdir.prop}/elastic-caches" />
+        <delete file="${workspace.dbdir.prop}/elastic.db" />
         <echo message="Deleting notification msgs for the Workspace Service"/>
         <delete dir="${workspace.dbdir.prop}/msg-sinks" />
     </target>
@@ -269,8 +269,6 @@
 
         <mkdir dir="${workspace.dbdir.prop}/caches" />
 
-        <mkdir dir="${workspace.dbdir.prop}/elastic-caches" />
-
         <mkdir dir="${workspace.dbdir.prop}/tmpfiles" />
 
         <mkdir dir="${workspace.dbdir.prop}/msg-sinks" />