Changeset 29903 for main/trunk/greenstone3/resources

Timestamp:

2015-05-20T17:19:33+12:00 (9 years ago)

Author:

ak19

Message:

Changing over from embedded derby db to networked derby server. Not yet tested on windows.

Location:

main/trunk/greenstone3/resources

Files:

• tomcat/greenstone3.xml.in (modified) (1 diff)
• web/global.properties.in (modified) (1 diff)

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

@@ -10 +10 @@
     allowLinking="false"
     xmlBlockExternal="false">
-  
+
+<!--
+   For embedded derby db:
+   driverName="org.apache.derby.jdbc.EmbeddedDriver"
+   connectionURL="jdbc:derby:@gsdl3webhome@/etc/usersDB"
+-->  
     <Realm className="org.apache.catalina.realm.JDBCRealm" 
-        driverName="org.apache.derby.jdbc.EmbeddedDriver"
-        connectionURL="jdbc:derby:@gsdl3webhome@/etc/usersDB"
+        driverName="org.apache.derby.jdbc.ClientDriver"
+        connectionURL="jdbc:derby://localhost:@derbyserverport@/@gsdl3webhome@/etc/usersDB"
         userTable="users" userNameCol="username" userCredCol="password"
         userRoleTable="roles" roleNameCol="role"

main/trunk/greenstone3/resources/web/global.properties.in

@@ -19 +19 @@
 [email protected]@
 tomcat.context=greenstone3
+[email protected]@
 
 ## Proxy setup - set these if you are behind a firewall and you want services that access the internet