svn commit: r729726 - in /incubator/jspwiki/trunk: build.xml etc/geronimo-web.xml

[me...@apache.org]

Author: metskem
Date: Sun Dec 28 04:37:15 2008
New Revision: 729726

URL: http://svn.apache.org/viewvc?rev=729726&view=rev
Log:
added a geronimo deployment plan which is always necessary (or you get jdom classloading issues), 
included it in build.xml and removed commons-logging.properties from build.xml

Added:
    incubator/jspwiki/trunk/etc/geronimo-web.xml
Modified:
    incubator/jspwiki/trunk/build.xml

Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=729726&r1=729725&r2=729726&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Sun Dec 28 04:37:15 2008
@@ -426,9 +426,9 @@
        <lib file="${jarfile}" />
        <fileset dir="${code.src}/webdocs" includes="**" excludes="**/FCK/jsp" />
        <webinf dir="etc">
+        <include name="geronimo-web.xml" />
          <include name="dtd/**" />
          <include name="jsp/**" />
-         <include name="commons-logging.properties" />
          <include name="jspwiki.policy" />
          <include name="jspwiki.properties" />
          <include name="oscache.tld" />

Added: incubator/jspwiki/trunk/etc/geronimo-web.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/geronimo-web.xml?rev=729726&view=auto
==============================================================================
--- incubator/jspwiki/trunk/etc/geronimo-web.xml (added)
+++ incubator/jspwiki/trunk/etc/geronimo-web.xml Sun Dec 28 04:37:15 2008
@@ -0,0 +1,14 @@
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+	xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+	<sys:environment>
+		<sys:moduleId>
+			<sys:groupId>default</sys:groupId>
+			<sys:artifactId>JSPWiki</sys:artifactId>
+			<sys:type>war</sys:type>
+		</sys:moduleId>
+		<sys:hidden-classes>
+			<sys:filter>org.jaxen</sys:filter>
+			<sys:filter>org.jdom</sys:filter>
+		</sys:hidden-classes>
+	</sys:environment>
+</web-app>
\ No newline at end of file