jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1477835 - in /incubator/jspwiki/trunk: ./ doc/ etc/ etc/dtd/ src/main/java/org/apache/wiki/ src/main/resources/ src/main/webapp/ src/main/webapp/WEB-INF/
Date Tue, 30 Apr 2013 21:21:00 GMT
Author: gmazza
Date: Tue Apr 30 21:20:59 2013
New Revision: 1477835

URL: http://svn.apache.org/r1477835
Log:
Placed most WAR resources in Mavenized src/main/webapps folder.

Added:
    incubator/jspwiki/trunk/doc/jspwiki-checkstyle.xml
      - copied unchanged from r1477088, incubator/jspwiki/trunk/etc/jspwiki-checkstyle.xml
    incubator/jspwiki/trunk/doc/jspwiki-eclipse-codestyle.xml
      - copied unchanged from r1477088, incubator/jspwiki/trunk/etc/jspwiki-eclipse-codestyle.xml
    incubator/jspwiki/trunk/src/main/resources/oscache.properties
      - copied unchanged from r1477088, incubator/jspwiki/trunk/etc/oscache.properties
    incubator/jspwiki/trunk/src/main/webapp/
    incubator/jspwiki/trunk/src/main/webapp/WEB-INF/
    incubator/jspwiki/trunk/src/main/webapp/WEB-INF/web.xml
      - copied unchanged from r1477088, incubator/jspwiki/trunk/etc/web.xml
    incubator/jspwiki/trunk/src/main/webapp/geronimo-web.xml
      - copied unchanged from r1477088, incubator/jspwiki/trunk/etc/geronimo-web.xml
    incubator/jspwiki/trunk/src/main/webapp/jspwiki.policy
      - copied unchanged from r1477088, incubator/jspwiki/trunk/etc/jspwiki.policy
    incubator/jspwiki/trunk/src/main/webapp/jspwiki.tld
      - copied unchanged from r1477088, incubator/jspwiki/trunk/etc/jspwiki.tld
    incubator/jspwiki/trunk/src/main/webapp/jstl-fmt.tld
      - copied unchanged from r1477088, incubator/jspwiki/trunk/etc/jstl-fmt.tld
    incubator/jspwiki/trunk/src/main/webapp/oscache.tld
      - copied unchanged from r1477088, incubator/jspwiki/trunk/etc/oscache.tld
Removed:
    incubator/jspwiki/trunk/etc/dtd/
    incubator/jspwiki/trunk/etc/geronimo-web.xml
    incubator/jspwiki/trunk/etc/jspwiki.policy
    incubator/jspwiki/trunk/etc/jspwiki.tld
    incubator/jspwiki/trunk/etc/jstl-fmt.tld
    incubator/jspwiki/trunk/etc/oscache.properties
    incubator/jspwiki/trunk/etc/oscache.tld
    incubator/jspwiki/trunk/etc/web.xml
Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/build.xml
    incubator/jspwiki/trunk/pom.xml
    incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1477835&r1=1477834&r2=1477835&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Tue Apr 30 21:20:59 2013
@@ -1,3 +1,11 @@
+2013-04-30 Glen Mazza (glenmazza AT apache DOT org)
+
+       * 2.9.1-incubating-6
+
+       * Moved WAR resources that don't require modification from etc/ to Mavenized src/main/webapps
location.
+         
+       * removed unused etc/dtd folder
+
 2013-04-29 Glen Mazza (glenmazza AT apache DOT org)
 
        * 2.9.1-incubating-5

Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1477835&r1=1477834&r2=1477835&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Tue Apr 30 21:20:59 2013
@@ -248,9 +248,9 @@
         <get-element to-file="${libs.main}/jstl-1.1.2.jar" url="${central.url}/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar"
/>
         <get-element to-file="${libs.main}/jaxen-1.1-beta-6.jar" url="${central.url}/jaxen/jaxen/1.1-beta-6/jaxen-1.1-beta-6.jar"/>
         <get-element to-file="${libs.main}/jdom-1.0.jar" url="${central.url}/jdom/jdom/1.0/jdom-1.0.jar"
/>
-        <get-element to-file="${libs.main}/jrcs-diff-0.4.2.jar" 
+        <get-element to-file="${libs.main}/org.suigeneris.jrcs.diff-0.4.2.jar" 
                      url="${central.url}/org/jvnet/hudson/org.suigeneris.jrcs.diff/0.4.2/org.suigeneris.jrcs.diff-0.4.2.jar"
/>
-        <get-element to-file="${libs.main}/jsonrpc-1.0.jar" url="${central.url}/com/metaparadigm/json-rpc/1.0/json-rpc-1.0.jar"
/>
+        <get-element to-file="${libs.main}/json-rpc-1.0.jar" url="${central.url}/com/metaparadigm/json-rpc/1.0/json-rpc-1.0.jar"
/>
         <get-element to-file="${libs.main}/jsp-api-2.0.jar" url="${central.url}/javax/servlet/jsp/jsp-api/2.0/jsp-api-2.0.jar"
/>
         <get-element to-file="${libs.main}/log4j-1.2.14.jar" url="${central.url}/log4j/log4j/1.2.14/log4j-1.2.14.jar"
/>
         <get-element to-file="${libs.main}/lucene-core-3.6.0.jar" url="${central.url}/org/apache/lucene/lucene-core/3.6.0/lucene-core-3.6.0.jar"
/>
@@ -321,8 +321,9 @@
     <delete file="tests/etc/jspwiki_rcs.properties" />
     <delete file="tests/etc/jspwiki_vers.properties" />
     <delete dir="tests/etc/db" />
-    <delete dir="tests/etc/WEB-INF/dtd" />
-    <delete file="tests/etc/WEB-INF/web.xml" />
+    <delete dir="tests/etc/WEB-INF" />
+    <delete file="tests/etc/groupdatabase.xml.old" />
+    <delete file="tests/etc/userdatabase.xml.old" />
     <delete>
       <fileset dir="." includes="**/*~" defaultexcludes="no"/>
       <fileset dir="." includes="**/#*#" defaultexcludes="no"/>
@@ -432,7 +433,7 @@
 	  <copy file="${code.i18n}/plugin/PluginResources.properties" tofile="${code.i18n}/plugin/PluginResources_en.properties"/>
       <jar jarfile="${jarfile}">
          <fileset dir="${code.build}" includes="**/*.class" />
-         <fileset dir="${code.resources}" includes="templates/**/*.properties" />
+         <!--fileset dir="${code.resources}" includes="templates/**/*.properties"/-->
          <fileset dir="src/main/resources" />
       </jar>
   </target>
@@ -525,27 +526,25 @@
     <delete file="${warfile}" />
 
     <war warfile="${warfile}"
-         webxml="etc/web.xml">
+         webxml="src/main/webapp/WEB-INF/web.xml">
        <lib dir="${libs.main}" includes="*.jar" excludes="servlet-api-*.jar jsp-api-*.jar"/>
        <lib file="${jarfile}" />
        <!--lib file="${libs.tests}/stripes*.jar"/-->
        <fileset dir="${code.resources}/webdocs" includes="**" excludes="**/FCK/jsp" />
        <webinf dir="etc">
-         <include name="dtd/**" />
-         <include name="jsp/**" />
-         <include name="commons-logging.properties" />
-         <include name="jspwiki.policy" />
          <include name="jspwiki.properties" />
-         <include name="*.tld" />
          <include name="userdatabase.xml" />
-        <include name="groupdatabase.xml" />
-        <include name="geronimo-web.xml" />
+         <include name="groupdatabase.xml" />
+       </webinf>
+       <webinf dir="src/main/webapp">
+          <include name="geronimo-web.xml" />
+          <include name="*.tld" />
+          <include name="jspwiki.policy" />
        </webinf>
-       <classes dir="etc" includes="oscache.properties" />
     </war>
 
     <war warfile="${warfile}"
-         webxml="etc/web.xml" update="true">
+         webxml="src/main/webapp/WEB-INF/web.xml" update="true">
       	<fileset dir="${tmpdir}/compress/webdocs/" includes="**/*.js" />
       	<fileset dir="${tmpdir}/compress/webdocs/" includes="**/*.css" />
     </war>
@@ -784,7 +783,7 @@
       <mkdir dir="tests/etc/WEB-INF" />
 
       <!-- Create web.xml files for testing -->
-      <copy file="${basedir}/etc/web.xml" tofile="${webtests.build}/web.xml.custom" overwrite="true"
/>
+      <copy file="src/main/webapp/WEB-INF/web.xml" tofile="${webtests.build}/web.xml.custom"
overwrite="true" />
 
       <!-- For web unit tests, turn off SSL (self-signed certs b0rk
            the tests) and enable JDBC refs -->
@@ -805,11 +804,6 @@
       <copy file="${webtests.build}/web.xml.container"
           tofile="tests/etc/WEB-INF/web.xml" overwrite="true" />
 
-      <!-- Copy the DTDs to the test WEB-INF -->
-      <mkdir dir="tests/etc/WEB-INF/dtd" />
-      <copy toDir="tests/etc/WEB-INF/dtd">
-        <fileset dir="${basedir}/etc/dtd/" />
-      </copy>
   </target>
 
   <!-- This target runs the JUnit tests that are available
@@ -849,7 +843,7 @@
         <formatter type="xml" usefile="yes" />
         <batchtest todir="${tests.reports}">
            <fileset dir="${tests.src}">
-                <include name="**/*Test.java" />
+                <exclude name="**/*Test.java" />
                 <exclude name="**/AllTest*java" />
                 <include name="**/StressTestSpeed.java" if="tests.stress.enabled"/>
                 <include name="**/StressTestVersioningProvider.java" if="tests.stress.enabled"/>
@@ -1022,9 +1016,7 @@ If all of the tests ran successfully, th
 
       <!-- Copy the WEB-INF files -->
       <copy toDir="@{context.dir}/webapp/WEB-INF">
-        <fileset dir="etc">
-          <include name="dtd/**" />
-          <include name="commons-logging.properties" />
+        <fileset dir="src/main/webapp">
           <include name="jspwiki.policy" />
           <include name="*.tld" />
         </fileset>
@@ -1047,11 +1039,6 @@ If all of the tests ran successfully, th
         <propertyfile-entries/>
       </propertyfile>
 
-      <!-- Copy the classes -->
-      <copy toDir="@{context.dir}/webapp/WEB-INF/classes">
-        <fileset dir="etc" includes="oscache.properties" />
-      </copy>
-
       <!-- Copy the libraries -->
       <copy toDir="@{context.dir}/webapp/WEB-INF/lib">
         <fileset dir="lib" includes="*.jar" excludes="servlet-api-*.jar jsp-api-*.jar"
/>

Modified: incubator/jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1477835&r1=1477834&r2=1477835&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Tue Apr 30 21:20:59 2013
@@ -219,7 +219,6 @@
             <testResource>
                 <directory>tests/etc</directory>
                 <includes>
-                    <!--include>selenium/*</include-->
                     <include>jspwiki.policy</include>
                     <include>jspwiki-testUserPolicy.policy</include>
                     <include>test.properties</include>
@@ -293,7 +292,7 @@
                                          replacefilterfile="build.properties" />
 
                                 <!-- Create web.xml files for testing -->
-                                <copy file="${basedir}/etc/web.xml" tofile="target/test-classes/WEB-INF/web.xml"
/>
+                                <copy file="src/main/webapp/WEB-INF/web.xml" tofile="target/test-classes/WEB-INF/web.xml"
/>
 
                                 <!-- For web unit tests, turn off SSL (self-signed certs
b0rk
                                      the tests) and enable JDBC refs -->
@@ -310,12 +309,6 @@
                                 <replace file="target/test-classes/WEB-INF/web.xml"
                                         token="REMOVE ME TO ENABLE CONTAINER-MANAGED AUTH
 --&gt;" value="" />
 
-                                <!-- Copy the DTDs to the test WEB-INF -->
-                                <mkdir dir="target/test-classes/WEB-INF/dtd" />
-                                <copy toDir="target/test-classes/WEB-INF/dtd">
-                                    <fileset dir="${basedir}/etc/dtd/" />
-                                </copy>
- 
                                 <!-- Copy the database configuration information -->
                                 <mkdir dir="tests/etc/db/hsql" />
                                 <copy file="tests/etc/jdbc.properties.tmpl" tofile="tests/etc/db/jdbc.properties"
/>
@@ -422,7 +415,7 @@
                 <artifactId>maven-war-plugin</artifactId>
                 <version>2.3</version>
                 <configuration>
-                    <webXml>etc/web.xml</webXml>
+                    <!--webXml>etc/web.xml</webXml-->
                     <archiveClasses>true</archiveClasses>
                     <webResources>
                         <resource>
@@ -430,19 +423,17 @@
                             <targetPath>WEB-INF</targetPath>
                             <includes>
                                 <include>userdatabase.xml</include>
-                                <include>dtd/**</include>
                                 <include>groupdatabase.xml</include>
-                                <include>geronimo-web.xml</include>
-                                <include>jspwiki.policy</include>
-                                <include>*.tld</include>
                                 <include>jspwiki.properties</include>
                             </includes>
                         </resource>
                         <resource>
-                            <directory>etc</directory>
-                            <targetPath>WEB-INF/classes</targetPath>
+                            <directory>src/main/webapp</directory>
+                            <targetPath>WEB-INF</targetPath>
                             <includes>
-                                <include>oscache.properties</include>
+                                <include>geronimo-web.xml</include>
+                                <include>jspwiki.policy</include>
+                                <include>*.tld</include>
                             </includes>
                         </resource>
                         <resource>

Modified: incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java?rev=1477835&r1=1477834&r2=1477835&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/main/java/org/apache/wiki/Release.java Tue Apr 30 21:20:59
2013
@@ -75,7 +75,7 @@ public final class Release
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "5";
+    public static final String     BUILD         = "6";
     
     /**
      *  This is the generic version string you should use



Mime
View raw message