Added derby net support to build system.

Based on patch from Matt Vliet: https://bugzilla.mcs.anl.gov/globus/show_bug.cgi?id=6516#c5
nimbusproject · Dec 24, 2009 · d197b32 · d197b32
1 parent dc7d844
commit d197b32
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 5 deletions.
diff --git a/messaging/gt4.0/java/gar-builder/etc/post-deploy.xml b/messaging/gt4.0/java/gar-builder/etc/post-deploy.xml
@@ -118,6 +118,8 @@
                    value="${base.package.name}" />
             <entry key="derby.classpath.dir.prop"
                    value="${deploy.dir}/lib" />
+            <entry key="pwGen.path.prop"
+                   value="${workspace.conf.dir}/other/shared-secret-suggestion.py"/>
 
         </propertyfile>
     </target>
@@ -154,6 +156,8 @@
                   value="${base.package.name}" />
         <property name="derby.classpath.dir.prop"
                   value="${deploy.dir}/lib" />
+        <property name="pwGen.path.prop"
+                   value="${workspace.conf.dir}/other/shared-secret-suggestion.py"/>
 
         <ant antfile="${dbsetup.antfile}" target="setupWorkspacePersistence" />
     </target>

diff --git a/service/service/java/source/etc/workspace-service/other/main.conflocator.xml b/service/service/java/source/etc/workspace-service/other/main.conflocator.xml
@@ -109,4 +109,13 @@
                   value="$METADATA{" />
     </bean>
 
+    <bean id="derbySettings"
+          class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+        <property name="location"
+                  value="/@DERBY_DIR@/derby.properties" />
+        <property name="placeholderPrefix"
+                  value="$DERBY{" />
+
+    </bean>
+
 </beans>
diff --git a/service/service/java/source/etc/workspace-service/other/main.xml b/service/service/java/source/etc/workspace-service/other/main.xml
@@ -623,6 +623,8 @@
                   value="org.apache.derby.jdbc.EmbeddedDriver" />
         <property name="url"
                   value="jdbc:derby:nimbus/WorkspacePersistenceDB" />
+        <property name="username" value="nimbus"/>
+        <property name="password" value="$DERBY{derby.user.nimbus}"/>
 
     </bean>
 
@@ -637,6 +639,8 @@
                   value="org.apache.derby.jdbc.EmbeddedDriver" />
         <property name="url"
                   value="jdbc:derby:nimbus/WorkspaceAccountingDB" />
+        <property name="username" value="nimbus"/>
+        <property name="password" value="$DERBY{derby.user.nimbus}"/>
 
     </bean>
 

diff --git a/service/service/java/source/share/lib/db-mgmt.xml b/service/service/java/source/share/lib/db-mgmt.xml
@@ -14,6 +14,7 @@
         derby.system.home.prop    - derby home dir to call IJ with
         derby.relative.dir.prop   - relative path from homedir where our dir is
         derby.classpath.dir.prop  - path to dir with derby jars
+        pwGen.path.prop           - path to password generation comd
     </description>
 
     <property file="../workspace.persistence.conf" />
@@ -65,7 +66,7 @@
             <jvmarg value="-Dderby.system.home=${derby.system.home.prop}"/>
             <jvmarg value="-Dderby.infolog.append=true"/>
             <jvmarg value="-Dij.protocol=jdbc:derby:directory:${derby.system.home.prop}/"/>
-            <jvmarg value="-Dij.database=${derby.relative.dir.prop}/WorkspacePersistenceDB;create=true"/>
+            <jvmarg value="-Dij.database=${derby.relative.dir.prop}/WorkspacePersistenceDB;create=true;user=nimbus;password=${derby.user.pass}"/>
             <classpath refid="derby.classpath" />
             <arg value="${workspace.sqldir.prop}/workspace_service_derby_schema.sql"/>
         </java>
@@ -107,7 +108,7 @@
             <jvmarg value="-Dderby.system.home=${derby.system.home.prop}"/>
             <jvmarg value="-Dderby.infolog.append=true"/>
             <jvmarg value="-Dij.protocol=jdbc:derby:directory:${derby.system.home.prop}/"/>
-            <jvmarg value="-Dij.database=${derby.relative.dir.prop}/WorkspacePersistenceDB;create=false"/>
+            <jvmarg value="-Dij.database=${derby.relative.dir.prop}/WorkspacePersistenceDB;create=false;user=nimbus;password=${derby.user.pass}"/>
             <classpath refid="derby.classpath" />
             <arg value="${workspace.sqldir.prop}/workspace_service_derby_dump.sql"/>
         </java>
@@ -131,7 +132,7 @@
             <jvmarg value="-Dderby.system.home.prop=${derby.system.home.prop}"/>
             <jvmarg value="-Dderby.infolog.append=true"/>
             <jvmarg value="-Dij.protocol=jdbc:derby:directory:${derby.system.home.prop}/"/>
-            <jvmarg value="-Dij.database=${derby.relative.dir.prop}/WorkspaceAccountingDB;create=true"/>
+            <jvmarg value="-Dij.database=${derby.relative.dir.prop}/WorkspaceAccountingDB;create=true;user=nimbus;password=${derby.user.pass}"/>
             <classpath refid="derby.classpath" />
             <arg value="${workspace.sqldir.prop}/workspace_service_derby_accounting_schema.sql"/>
         </java>
@@ -163,7 +164,7 @@
             <jvmarg value="-Dderby.system.home.prop=${derby.system.home.prop}"/>
             <jvmarg value="-Dderby.infolog.append=true"/>
             <jvmarg value="-Dij.protocol=jdbc:derby:directory:${derby.system.home.prop}/"/>
-            <jvmarg value="-Dij.database=${derby.relative.dir.prop}/WorkspaceAccountingDB;create=false"/>
+            <jvmarg value="-Dij.database=${derby.relative.dir.prop}/WorkspaceAccountingDB;create=false;user=nimbus;password=${derby.user.pass}"/>
             <classpath refid="derby.classpath" />
             <arg value="${workspace.sqldir.prop}/workspace_service_derby_accounting_dump.sql"/>
         </java>
@@ -174,7 +175,59 @@
          "SUBROUTINES"
          ******************************************************************* -->
 
-    <target name="allparamscheck">
+    <target name="assureDerbyProps"
+            depends="checkDerbyProps, createDerbyProps, readDerbyProps" />
+    <target name="checkDerbyProps">
+        <available file="${derby.system.home.prop}/derby.properties"
+                   property="derbyProps.exist"/>
+        <antcall target="createDerbyProps"/>
+        <antcall target="readDerbyProps"/>
+    </target>
+
+    <target name="readDerbyProps" if="derbyProps.exist">
+        <loadproperties srcfile="${derby.system.home.prop}/derby.properties">
+            <filterchain>
+                <linecontains>
+                    <contains value="derby.user.nimbus"/>
+                </linecontains>
+            </filterchain>
+        </loadproperties>
+        <property name="derby.user.pass" value="${derby.user.nimbus}" />
+    </target>
+
+    <target name="createDerbyProps" unless="derbyProps.exist">
+
+        <fail message="must specify 'pwGen.path.prop' (path to password generation command)"
+              unless="pwGen.path.prop"/>
+
+        <exec executable="${pwGen.path.prop}" outputproperty="derby.user.pass"/>
+        <exec executable="${pwGen.path.prop}" outputproperty="derby.guest.pass"/>
+
+        <propertyfile file="${derby.system.home.prop}/derby.properties"
+                      comment="Generated by db-mgmt.xml script">
+            <entry key="derby.user.nimbus" value="${derby.user.pass}"/>
+            <entry key="derby.user.guest" value="${derby.guest.pass}"/>
+
+            <entry key="derby.authentication.provider" value="BUILTIN"/>
+            <entry key="derby.connection.requireAuthentication" value="true"/>
+            <entry key="derby.database.propertiesOnly" value="true"/>
+            <entry key="derby.database.defaultConnectionMode" value="noAccess"/>
+            <entry key="derby.database.fullAccessUsers" value="nimbus"/>
+            <entry key="derby.database.readOnlyAccessUsers" value="guest"/>
+
+            <entry key="derby.drda.startNetworkServer" value="false"/>
+            <entry key="derby.drda.keepAlive" value="true"/>
+            <entry key="derby.drda.securityMechanism"
+                   value="STRONG_PASSWORD_SUBSTITUTE_SECURITY"/>
+
+        </propertyfile>
+
+        <chmod file="${derby.system.home.prop}/derby.properties" perm="600" />
+
+    </target>
+
+
+    <target name="allparamscheck" depends="assureDerbyProps">
 
         <fail message="Must specify 'workspace.dbdir.prop' for this"
               unless="workspace.dbdir.prop"/>
@@ -193,6 +246,9 @@
 
         <fail message="Must specify 'derby.classpath.dir.prop' for this"
               unless="derby.classpath.dir.prop"/>
+
+        <fail message="Must specify 'derby.user.pass' for this"
+              unless="derby.user.pass"/>
 
     </target>