Changeset 29644 for main/trunk/package-kits/linux

Timestamp:

2014-12-18T17:47:05+13:00 (9 years ago)

Author:

Jeremy Symon

Message:

Using external xml file for main servlets (will be used when we write scripts for managing servlets / sites)

Location:

main/trunk/package-kits/linux

Files:

• files/greenstone3.xml (modified) (1 diff)
• files/servlets.xml (added)
• files/web.xml.external.patch (added)
• packages/greenstone (modified) (1 diff)
• segments/main (modified) (1 diff)

main/trunk/package-kits/linux/files/greenstone3.xml

@@ -2 +2 @@
          docBase="%WEB%"
          reloadable="true"
-         privileged="true">
+         privileged="true"
+         xmlBlockExternal="false">
     <Realm className="org.apache.catalina.realm.JDBCRealm" 
            driverName="org.apache.derby.jdbc.EmbeddedDriver"

main/trunk/package-kits/linux/packages/greenstone

@@ -14 +14 @@
     greenstone
     wvWare
+    servlets.xml
     perl-util.patch
     gs2build.patch
     servlets.patch
+    web.xml.external.patch
     gsdl3site.cfg.patch
     global.properties.patch

main/trunk/package-kits/linux/segments/main

@@ -1 +1 @@
 install_greenstone:
-    install -d $(DESTDIR)/$(web)
+    install -d $(DESTDIR)/$(web)/WEB-INF
     install -dm775 $(DESTDIR)/$(tomcatlib)
     rsync -a --info=STATS --exclude sites/localsite/collect/ --exclude .svn src/web/ $(DESTDIR)/$(web)/
     mv $(DESTDIR)/$(web)/WEB-INF/lib/derby.jar $(DESTDIR)/$(tomcatlib)
     install -Dm644 greenstone3.xml $(DESTDIR)/$(tomcatconf)/greenstone3.xml
+    install -Dm644 servlets.xml $(DESTDIR)/$(web)/WEB-INF/servlets.xml