Changeset 35347 for main/trunk

Timestamp:

2021-09-07T14:45:56+12:00 (3 years ago)

Author:

davidb

Message:

Support added to ant build file for GoogleSignin via custom Realm, along with companion chage to greenstone3.xml.svn where @googlesigninclientid@ gets substituted for property \tomcat.googlesigninJDBCRealm.clientid in build.properties (assuming that it has been uncommented and set appropriately by the developer who is installing that particular version of Greenstone3

Location:

main/trunk/greenstone3

Files:

• build.properties.svn (modified) (1 diff)
• build.xml (modified) (5 diffs)
• resources/tomcat/greenstone3.xml.svn (modified) (1 diff)

main/trunk/greenstone3/build.properties.svn

@@ -11 +11 @@
 # you should ensure this value remains set to false for security reasons.
 tomcat.user.allowLinking=false
+
+# Specify your Google Client API Id here, and uncomment if you want Greenstone3 to allow users
+#   signin on through Google Signin
+# Note: You also need to specify the Google Client Id in web/WEB-INF/servlet.xml as
+//  an <init-param></init-param>
+#tomcat.googlesigninJDBCRealm.clientid=????....????.apps.googleusercontent.com
 
 # Set this to the internet/intranet name of the machine that Tomcat is/will be 

main/trunk/greenstone3/build.xml

@@ -44 +44 @@
   <taskdef name="stringutil" classname="ise.antelope.tasks.StringUtilTask" classpathref="project.classpath"/>
 
- 
   <!-- ===================== Property Definitions =========================== -->
   
@@ -371 +370 @@
   <property name="build.home" value="${basedir}/build"/>
   <property name="src.home" value="${basedir}/src/java"/>
+  <property name="jarsupport.home" value="${basedir}/src/jar-support"/>
 
   <if><bool><istrue value="${gsdl3home.isreadonly}"/></bool>
@@ -2465 +2465 @@
     <filter token="derbyserver" value="${derby.server}"/>
     <filter token="derbyserverport" value="${derby.server.port}"/>
+    <filter token="googlesigninclientid" value="${tomcat.googlesigninJDBCRealm.clientid}"/>
+
       </filterset>
     </copy>
@@ -3227 +3229 @@
     <copy file="${build.home}/gsdl3.jar" todir="${web.lib}"/>
 
+
+    <antcall target="googlesignin-jar-with-dependencies" />
+    <copy file="${build.home}/googlesignin-jdbcrealm.jar" todir="${catalina.home}/lib"/>
+    
     <jar destfile="${build.home}/gutil.jar">
       <fileset dir="${build.home}">
@@ -3306 +3312 @@
     </jar>
     <copy file="${build.home}/server.jar" todir="${basedir}"/>
+  </target>
+
+  <target name="googlesignin-checkforchanges">
+    <uptodate property="googlesignin-nochanges" targetfile="${build.home}/googlesignin-jdbcrealm.jar">
+      <srcfiles dir="${build.home}" includes="org/greenstone/gsdl3/GoogleSigninJDBCRealm.class"/>
+    </uptodate>
+  </target>
+  
+  <target name="googlesignin-jar-with-dependencies" depends="init,googlesignin-checkforchanges" unless="googlesignin-nochanges">
+    <path id="googlesignin-jar-dependencies">
+      <fileset dir="${web.lib}">
+    <includesfile name="${jarsupport.home}/google-api-client-jars/jar-list.txt"/>
+      </fileset>
+    </path>
+    
+    <unzip dest="${web.lib}/unjarred">
+      <patternset>
+        <exclude name="META-INF/*.SF"/>
+      </patternset>
+      <!-- fileset to include ... -->
+      <path refid="googlesignin-jar-dependencies"/>
+    </unzip>
+
+    <path id="googlesignin-unjarred">
+      <fileset dir="${web.lib}/unjarred">
+      </fileset>
+    </path>
+
+    <jar destfile="${build.home}/googlesignin-jdbcrealm.jar">
+    <fileset dir="${build.home}">
+          <include name="org/greenstone/gsdl3/GoogleSigninJDBCRealm.class"/>
+    </fileset>
+    <fileset dir="${src.home}">
+          <include name="org/greenstone/gsdl3/mbeans-descriptor.xml"/>
+    </fileset>
+    <path refid="googlesignin-unjarred" />
+    <manifest>
+          <attribute name="Built-By" value="${user.name}" />
+    </manifest>
+    </jar>
+    <delete dir="${web.lib}/unjarred" quiet="true"/>
+    
   </target>
 

main/trunk/greenstone3/resources/tomcat/greenstone3.xml.svn

@@ -20 +20 @@
         driverName="org.apache.derby.jdbc.ClientDriver"
         connectionURL="jdbc:derby://@derbyserver@:@derbyserverport@/@gsdl3webhome@/etc/usersDB"
-        userTable="users" userNameCol="username" userCredCol="password"
+        userTable="users" userNameCol="username" userCredCol="password"     
         userRoleTable="roles" roleNameCol="role"
+        userEmailCol="email"
+        googlesigninClientId="@googlesigninclientid@"
         />
     <!-- Session Manager. Default values are used. See