jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1475850 - in /incubator/jspwiki/trunk: .classpath ChangeLog build.xml etc/ini/ pom.xml src/main/java/org/apache/wiki/Release.java src/main/resources/ src/main/resources/ini/ src/test/resources/ src/test/resources/ini/ tests/etc/ini/
Date Thu, 25 Apr 2013 16:48:26 GMT
Author: gmazza
Date: Thu Apr 25 16:48:25 2013
New Revision: 1475850

URL: http://svn.apache.org/r1475850
Log:
Moved ini resource folders to standard Maven location.

Added:
    incubator/jspwiki/trunk/src/main/resources/
    incubator/jspwiki/trunk/src/main/resources/ini/
      - copied from r1475832, incubator/jspwiki/trunk/etc/ini/
    incubator/jspwiki/trunk/src/test/resources/
    incubator/jspwiki/trunk/src/test/resources/ini/
      - copied from r1475832, incubator/jspwiki/trunk/tests/etc/ini/
Removed:
    incubator/jspwiki/trunk/etc/ini/
    incubator/jspwiki/trunk/tests/etc/ini/
Modified:
    incubator/jspwiki/trunk/.classpath
    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/.classpath
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.classpath?rev=1475850&r1=1475849&r2=1475850&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.classpath (original)
+++ incubator/jspwiki/trunk/.classpath Thu Apr 25 16:48:25 2013
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="**/package.html|images/|main/|webdocs/|wikipages/" kind="src"
output="build" path="src"/>
-	<classpathentry kind="src" output="build" path="src/main/java"/>
+	<classpathentry excluding="**/package.html|images/|test/|main/|webdocs/|wikipages/" kind="src"
output="build" path="src"/>
+    <classpathentry kind="src" output="build" path="src/main/java"/>
+    <classpathentry kind="src" output="build" path="src/test/java"/>
 	<classpathentry including="ini/classmappings.xml" kind="src" path="etc"/>
 	<classpathentry excluding="build/|etc/|lib/|libs-opt/|reports/" kind="src" output="tests/build"
path="tests"/>
 	<classpathentry kind="lib" path="lib/commons-lang-2.6.jar"/>

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1475850&r1=1475849&r2=1475850&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Thu Apr 25 16:48:25 2013
@@ -1,3 +1,12 @@
+2013-04-25 Glen Mazza (glenmazza AT apache DOT org)
+
+       * 2.9.1-incubating-4
+
+       * Moved ini folders from etc/ and tests/etc to 
+         Mavenized locations src/[main|test]/resources/ini
+         
+       * Updated build.xml and pom.xml for new ini source locations
+
 2013-04-24 Glen Mazza (glenmazza AT apache DOT org)
 
        * 2.9.1-incubating-3

Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1475850&r1=1475849&r2=1475850&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Thu Apr 25 16:48:25 2013
@@ -169,6 +169,10 @@
      <fileset dir="${libs.tests}">
         <include name="*.jar" />
      </fileset>
+     <!-- Standard Maven location for test resources; note ini folder
+          present both below and in ${jarfile} (can cause conflict? bug?) -->
+     <pathelement path="${tests.src}/../resources" />
+     <!-- Below line temporary until all test resources in Maven location -->
      <pathelement path="${tests.resources}/etc" />
   </path>
 
@@ -428,7 +432,7 @@
          <fileset dir="${code.src}" includes="org/**/*.properties" />
          <fileset dir="${code.resources}" includes="templates/**/*.properties" />
          <fileset dir="${code.i18n}" />
-         <fileset dir="etc" includes="ini/*.xml ini/*.properties" />
+         <fileset dir="src/main/resources" includes="ini/*.*" />
       </jar>
   </target>
 

Modified: incubator/jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1475850&r1=1475849&r2=1475850&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Thu Apr 25 16:48:25 2013
@@ -209,9 +209,9 @@
         <finalName>JSPWiki</finalName>
         <resources>
             <resource>
-                <directory>etc</directory>
+                <directory>src/main/resources</directory>
                 <includes>
-                    <include>ini/*</include>
+                    <include>**/*</include>
                 </includes>
             </resource>
             <resource>
@@ -223,10 +223,12 @@
         </resources>
         <testResources>
             <testResource>
+                <directory>src/test/resources</directory>
+            </testResource>
+            <testResource>
                 <directory>tests/etc</directory>
                 <includes>
                     <!--include>selenium/*</include-->
-                    <include>ini/*</include>
                     <include>jspwiki.policy</include>
                     <include>jspwiki-testUserPolicy.policy</include>
                     <include>test.properties</include>

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=1475850&r1=1475849&r2=1475850&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 Thu Apr 25 16:48:25
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         = "3";
+    public static final String     BUILD         = "4";
     
     /**
      *  This is the generic version string you should use



Mime
View raw message