jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1485175 - in /incubator/jspwiki/trunk: ./ doc/ src/main/config/doc/ src/main/java/org/apache/wiki/
Date Wed, 22 May 2013 12:17:39 GMT
Author: gmazza
Date: Wed May 22 12:17:38 2013
New Revision: 1485175

URL: http://svn.apache.org/r1485175
Log:
Mavenized location of doc folder (now src/main/config/doc)

Added:
    incubator/jspwiki/trunk/src/main/config/doc/
    incubator/jspwiki/trunk/src/main/config/doc/2.10-API.txt
      - copied unchanged from r1485149, incubator/jspwiki/trunk/doc/2.10-API.txt
    incubator/jspwiki/trunk/src/main/config/doc/Compiling.txt
      - copied unchanged from r1485149, incubator/jspwiki/trunk/doc/Compiling.txt
    incubator/jspwiki/trunk/src/main/config/doc/LICENSE.OpenSymphony
      - copied unchanged from r1485149, incubator/jspwiki/trunk/doc/LICENSE.OpenSymphony
    incubator/jspwiki/trunk/src/main/config/doc/LICENSE.SilkIconSet.txt
      - copied unchanged from r1485149, incubator/jspwiki/trunk/doc/LICENSE.SilkIconSet.txt
    incubator/jspwiki/trunk/src/main/config/doc/LICENSE.akismet
      - copied unchanged from r1485149, incubator/jspwiki/trunk/doc/LICENSE.akismet
    incubator/jspwiki/trunk/src/main/config/doc/LICENSE.cddl
      - copied unchanged from r1485149, incubator/jspwiki/trunk/doc/LICENSE.cddl
    incubator/jspwiki/trunk/src/main/config/doc/LICENSE.cpl
      - copied unchanged from r1485149, incubator/jspwiki/trunk/doc/LICENSE.cpl
    incubator/jspwiki/trunk/src/main/config/doc/LICENSE.hsqldb
      - copied unchanged from r1485149, incubator/jspwiki/trunk/doc/LICENSE.hsqldb
    incubator/jspwiki/trunk/src/main/config/doc/LICENSE.jaxen
      - copied unchanged from r1485149, incubator/jspwiki/trunk/doc/LICENSE.jaxen
    incubator/jspwiki/trunk/src/main/config/doc/LICENSE.jdom
      - copied unchanged from r1485149, incubator/jspwiki/trunk/doc/LICENSE.jdom
    incubator/jspwiki/trunk/src/main/config/doc/LICENSE.mit
      - copied unchanged from r1485149, incubator/jspwiki/trunk/doc/LICENSE.mit
    incubator/jspwiki/trunk/src/main/config/doc/LICENSE.mpl
      - copied unchanged from r1485149, incubator/jspwiki/trunk/doc/LICENSE.mpl
    incubator/jspwiki/trunk/src/main/config/doc/LICENSE.sandler
      - copied unchanged from r1485149, incubator/jspwiki/trunk/doc/LICENSE.sandler
    incubator/jspwiki/trunk/src/main/config/doc/LICENSE.yui
      - copied unchanged from r1485149, incubator/jspwiki/trunk/doc/LICENSE.yui
    incubator/jspwiki/trunk/src/main/config/doc/Translating.txt
      - copied unchanged from r1485149, incubator/jspwiki/trunk/doc/Translating.txt
    incubator/jspwiki/trunk/src/main/config/doc/aaa-diagram.pdf
      - copied unchanged from r1485149, incubator/jspwiki/trunk/doc/aaa-diagram.pdf
    incubator/jspwiki/trunk/src/main/config/doc/jspwiki-checkstyle.xml
      - copied unchanged from r1485149, incubator/jspwiki/trunk/doc/jspwiki-checkstyle.xml
    incubator/jspwiki/trunk/src/main/config/doc/jspwiki-eclipse-codestyle.xml
      - copied unchanged from r1485149, incubator/jspwiki/trunk/doc/jspwiki-eclipse-codestyle.xml
Removed:
    incubator/jspwiki/trunk/doc/2.10-API.txt
    incubator/jspwiki/trunk/doc/Compiling.txt
    incubator/jspwiki/trunk/doc/LICENSE.OpenSymphony
    incubator/jspwiki/trunk/doc/LICENSE.SilkIconSet.txt
    incubator/jspwiki/trunk/doc/LICENSE.akismet
    incubator/jspwiki/trunk/doc/LICENSE.cddl
    incubator/jspwiki/trunk/doc/LICENSE.cpl
    incubator/jspwiki/trunk/doc/LICENSE.hsqldb
    incubator/jspwiki/trunk/doc/LICENSE.jaxen
    incubator/jspwiki/trunk/doc/LICENSE.jdom
    incubator/jspwiki/trunk/doc/LICENSE.mit
    incubator/jspwiki/trunk/doc/LICENSE.mpl
    incubator/jspwiki/trunk/doc/LICENSE.sandler
    incubator/jspwiki/trunk/doc/LICENSE.yui
    incubator/jspwiki/trunk/doc/Translating.txt
    incubator/jspwiki/trunk/doc/aaa-diagram.pdf
    incubator/jspwiki/trunk/doc/jspwiki-checkstyle.xml
    incubator/jspwiki/trunk/doc/jspwiki-eclipse-codestyle.xml
Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/build.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=1485175&r1=1485174&r2=1485175&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed May 22 12:17:38 2013
@@ -1,3 +1,10 @@
+2013-05-22  Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.2-incubating-5
+       
+       * Mavenized location of doc directory; rat, javadoc,
+         and releases folder now under target.         
+
 2013-05-20  Glen Mazza (gmazza AT apache DOT org)
 
        * 2.9.2-incubating-4

Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1485175&r1=1485174&r2=1485175&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Wed May 22 12:17:38 2013
@@ -109,7 +109,7 @@
   <property name="tests.resources" value="tests" />
   <property name="tests.build" value="tests/build" />
   <property name="tests.reports" value="tests/reports" />
-  <property name="doc.rat" value="doc/rat" />
+  <property name="doc.rat" value="target/rat" />
 	
   <!-- dirs holding libs -->
   <property name="libs.main" value="lib" />
@@ -128,7 +128,7 @@
 
   <!-- The place where the javadocs are created -->
 
-  <property name="docs.javadoc" value="doc/javadoc" />
+  <property name="docs.javadoc" value="target/javadoc" />
 
   <!-- The temporary installation directory where all war-files
        are collected, for example -->
@@ -144,7 +144,7 @@
   <property name="svn.tag" value="trunk" />
 
   <!-- And finally, the directory where the final .zip-file is put -->
-  <property name="release.dir" value="releases" />
+  <property name="release.dir" value="target/releases" />
 
   <!--  PATH DEFINITIONS -->
 
@@ -310,8 +310,6 @@
     <delete dir="${tests.build}" />
     <delete dir="${code.build}" />
     <delete dir="${tests.reports}" />
-    <delete dir="${docs.javadoc}" />
-    <delete dir="${doc.rat}" />
     <delete file="${code.i18n}/CoreResources_en.properties" />
     <delete file="${code.i18n}/plugin/PluginResources_en.properties" />
     <delete file="${code.i18n}/templates/default_en.properties" />
@@ -690,8 +688,9 @@
           description="Creates JSPWiki documentation zipfile">
 
     <zip zipfile="${install.fulldir}/${ant.project.name}-doc.zip">
-        <zipfileset dir="doc" prefix="doc" excludes="rat/**" />
-        <zipfileset dir="src/main/config/wikipages" prefix="doc/wikipages" excludes="**/.??*"
/>
+        <zipfileset dir="src/main/config/doc" prefix="doc" />
+        <zipfileset dir="${docs.javadoc}" prefix="javadoc" />
+        <zipfileset dir="src/main/config/wikipages" prefix="wikipages" excludes="**/.??*"
/>
     </zip>
   </target>
 
@@ -1485,7 +1484,7 @@ To automate the JAR signing processs, yo
     <report reportFile="${doc.rat}/rat-report.txt" addLicenseHeaders="false">
         <fileset dir="."
         	excludes=".*, .*/**,
-        	doc/LICENSE.*,
+        	src/main/config/doc/LICENSE.*,
         	${code.resources}/main/config/wikipages/**,
         	${code.build}/**,
         	${tests.build}/**,

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=1485175&r1=1485174&r2=1485175&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 Wed May 22 12:17:38
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         = "4";
+    public static final String     BUILD         = "5";
     
     /**
      *  This is the generic version string you should use



Mime
View raw message