Changeset 2429

Timestamp:

12/08/09 21:51:34

Author:

douglm

Message:

Create a servlet.properties file in buildwar.xml

We cannot have multiple servlet.properties files in a ear file as they all end up on the same classpath

Files:

• trunk/build/buildwar.xml (modified) (2 diffs)

trunk/build/buildwar.xml

@@ -196 +196 @@
-    </copy>
-
+        <!-- Make our own servlet.properties file for struts applications
-    <copy tofile="${app.dest.classes}/servlet.properties" file="${app.sou.properties}">
-      <filterset refid="property.filters" />
-    </copy>
+    -->
-
-    <copy tofile="${app.dest.classes}/sysevents.properties"
@@ -340 +342 @@
-
-  <target name="struts-stuff" if="org.bedework.strutsapp">
+        <!-- Make our own servlet.properties file for struts applications -->
+    <echo file="${app.dest.classes}/servlet.properties" ><![CDATA[#
+# ========================================================================
+# This file contains all properties for servlet applications.
+# It cannot be application specific as the jboss build creates a
+# single set of resources on the classpath.
+# ========================================================================
+#
+
+# ========================================================================
+# Properties for the xml/xslt based calendar web applications
+# ========================================================================
+#
+# author Mike Douglass douglm rpi.edu
+
+# This is only here because the jetspeed portal-struts bridge does not seem to be
+# passing across the servlet context.
+#org.bedework.svcicb.sessionAttrName=org.bedework.admin.svcicb.sessionattrname.@APP-NAME@
+
+# These are required by the Struts framework
+errors.header=<errors><ul>
+errors.footer=</ul></errors>
+
+messages.header=<messages><ul>
+messages.footer=</ul></messages>
+
+edu.rpi.sss.util.action.noactionerrors=yes
+
+applicationResources=<li>Cannot load application resources bundle {0}</li>
+
+# set the default content type - html for jsp, xml for xml/xslt.
+#edu.rpi.sss.util.action.contenttype=@DEFAULT-CONTENTTYPE@
+edu.rpi.sss.util.action.contenttype=text/xml
+
+edu.rpi.sss.util.error.exc=<li>Exception: {0}</li>
+
+# Turn nocache headers on. We don't use the standard struts directives
+# because we need to be able to turn nocache off for a single response.
+# This gets around an IE problem with delivery of files.
+edu.rpi.sss.util.action.nocache=yes
+
+org.bedework.security.prefix=@SECURITY-PREFIX@
+
+edu.rpi.sss.util.action.logprefix=@APP-NAME@
+
+# Roles we need to know about - init action uses these
+# (Not using roles in the current system)
+#org.bedework.role.admin=@SECURITY-PREFIX@.admin
+#org.bedework.role.contentadmin=@SECURITY-PREFIX@.contentadmin
+#org.bedework.role.alert=@SECURITY-PREFIX@.alerts
+#org.bedework.role.owner=@SECURITY-PREFIX@.owner
+]]></echo>
+
+    <!-- Replace the tokens -->
+    <replace file="${app.dest.classes}/servlet.properties">
+      <replacefilter token="@SECURITY-PREFIX@"
+                     value="${propval.app.security.prefix}" />
+      <replacefilter token="@APP-NAME@"
+                     value="${propval.app.name}" />
+      <replacefilter token="@DEFAULT-CONTENTTYPE@"
+                     value="${propval.app.default.contenttype}" />
+    </replace>
+        
-    <!-- Copy a dummy startup file into the war. -->
-    <copy todir="${app.dest.war}">