Changeset 36023 for main/trunk/greenstone3/resources/tomcat/greenstone3.xml.svn

Timestamp:

2022-01-25T12:47:02+13:00 (2 years ago)

Author:

cstephen

Message:

Migrated the GoogleSigninJDBCRealm to use a DataSourceRealm as a backing source.

The tomcat context file, greenstone3.xml, has been updated accordingly to setup the Realm correctly.

File:

• main/trunk/greenstone3/resources/tomcat/greenstone3.xml.svn (modified) (2 diffs)

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

@@ +1 @@
+<!-- For deployment-time modifications ensure that you are editing greenstone3.xml.in, found in resources/tomcat. -->
 <!-- set allowLinking to true if you want to use symlinks to files or directories outside the docBase directory -->
 <!-- set reloadable to false for a production version. if true, automatically reloads the webapp if it detects changes in classes or lib directories -->
@@ -10 +11 @@
     allowLinking="@allowlinking@"
     xmlBlockExternal="false">
+
     <Resources allowLinking="@allowlinking@" />
 
-<!--
-   For embedded derby db:
-   driverName="org.apache.derby.jdbc.EmbeddedDriver"
-   connectionURL="jdbc:derby:@gsdl3webhome@/etc/usersDB"
--->  
-    <Realm className="org.greenstone.gsdl3.GoogleSigninJDBCRealm" 
-        driverName="org.apache.derby.jdbc.ClientDriver"
-        connectionURL="jdbc:derby://@derbyserver@:@derbyserverport@/@gsdl3webhome@/etc/usersDB"
-        userTable="users" userNameCol="username" userCredCol="password"     
-        userRoleTable="roles" roleNameCol="role"
-        userEmailCol="email"
-        googlesigninClientId="@googlesigninclientid@"
-        />
+    <!--
+        For embedded derby db:
+        driverName="org.apache.derby.jdbc.EmbeddedDriver"
+        connectionURL="jdbc:derby:@gsdl3webhome@/etc/usersDB"
+    -->
+    <!--
+        JNDI resources require the validationQuery parameter if you are using validations (which we are).
+        A list of values for this parameter, depending on your database driver, can be found here:
+        https://stackoverflow.com/questions/10684244/dbcp-validationquery-for-different-databases
+        For more info about why you need the parameter value, see here:
+        https://stackoverflow.com/a/41232124
+    -->
+    <Resource 
+        name="jdbc/realmDB"
+        auth="Container"
+        type="javax.sql.DataSource"
+        maxActive="10"
+        maxIdle="4"
+        maxWaitMillis="10000"
+        validationQuery="values 1"
+        driverClassName="org.apache.derby.jdbc.ClientDriver"
+        url="jdbc:derby://@derbyserver@:@derbyserverport@/@gsdl3webhome@/etc/usersDB" />
+
+    <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <Realm
+            className="org.greenstone.gsdl3.GoogleSigninJDBCRealm"
+            userTable="USERS" userNameCol="USERNAME" userCredCol="PASSWORD"
+            userRoleTable="ROLES" roleNameCol="ROLE"
+            userEmailCol="email"
+            googlesigninClientId="@googlesigninclientid@"
+            localDataSource="true"
+            dataSourceName="jdbc/realmDB" />
+    </Realm>
+
     <!-- Session Manager. Default values are used. See
          packages/tomcat/webapps/docs/config/manager.html for more info.