jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1484301 - in /incubator/jspwiki/trunk: ./ src/main/java/org/apache/wiki/ src/main/webapp/ src/main/webapp/admin/ src/main/webapp/error/ src/main/webapp/images/ src/main/webapp/scripts/ src/main/webapp/templates/ src/webdocs/ src/webdocs/ad...
Date Sun, 19 May 2013 15:50:57 GMT
Author: gmazza
Date: Sun May 19 15:50:56 2013
New Revision: 1484301

URL: http://svn.apache.org/r1484301
Log:
Mavenized location of webdocs folder.

Added:
    incubator/jspwiki/trunk/src/main/webapp/Captcha.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/Captcha.jsp
    incubator/jspwiki/trunk/src/main/webapp/Comment.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/Comment.jsp
    incubator/jspwiki/trunk/src/main/webapp/CookieError.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/CookieError.jsp
    incubator/jspwiki/trunk/src/main/webapp/Delete.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/Delete.jsp
    incubator/jspwiki/trunk/src/main/webapp/DeleteGroup.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp
    incubator/jspwiki/trunk/src/main/webapp/Diff.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/Diff.jsp
    incubator/jspwiki/trunk/src/main/webapp/Edit.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/Edit.jsp
    incubator/jspwiki/trunk/src/main/webapp/EditGroup.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp
    incubator/jspwiki/trunk/src/main/webapp/Error.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/Error.jsp
    incubator/jspwiki/trunk/src/main/webapp/Group.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/Group.jsp
    incubator/jspwiki/trunk/src/main/webapp/Install.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/Install.jsp
    incubator/jspwiki/trunk/src/main/webapp/Login.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/Login.jsp
    incubator/jspwiki/trunk/src/main/webapp/LoginForm.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/LoginForm.jsp
    incubator/jspwiki/trunk/src/main/webapp/Logout.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/Logout.jsp
    incubator/jspwiki/trunk/src/main/webapp/LostPassword.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/LostPassword.jsp
    incubator/jspwiki/trunk/src/main/webapp/Message.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/Message.jsp
    incubator/jspwiki/trunk/src/main/webapp/NewBlogEntry.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/NewBlogEntry.jsp
    incubator/jspwiki/trunk/src/main/webapp/NewGroup.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp
    incubator/jspwiki/trunk/src/main/webapp/PageInfo.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/PageInfo.jsp
    incubator/jspwiki/trunk/src/main/webapp/PageModified.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/PageModified.jsp
    incubator/jspwiki/trunk/src/main/webapp/Preview.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/Preview.jsp
    incubator/jspwiki/trunk/src/main/webapp/Rename.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/Rename.jsp
    incubator/jspwiki/trunk/src/main/webapp/Search.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/Search.jsp
    incubator/jspwiki/trunk/src/main/webapp/SisterSites.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp
    incubator/jspwiki/trunk/src/main/webapp/Upload.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/Upload.jsp
    incubator/jspwiki/trunk/src/main/webapp/UserPreferences.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/UserPreferences.jsp
    incubator/jspwiki/trunk/src/main/webapp/Wiki.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/Wiki.jsp
    incubator/jspwiki/trunk/src/main/webapp/Workflow.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/Workflow.jsp
    incubator/jspwiki/trunk/src/main/webapp/admin/
      - copied from r1484286, incubator/jspwiki/trunk/src/webdocs/admin/
    incubator/jspwiki/trunk/src/main/webapp/atom.css
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/atom.css
    incubator/jspwiki/trunk/src/main/webapp/error/
      - copied from r1484286, incubator/jspwiki/trunk/src/webdocs/error/
    incubator/jspwiki/trunk/src/main/webapp/images/
      - copied from r1484286, incubator/jspwiki/trunk/src/webdocs/images/
    incubator/jspwiki/trunk/src/main/webapp/rss.jsp
      - copied unchanged from r1484286, incubator/jspwiki/trunk/src/webdocs/rss.jsp
    incubator/jspwiki/trunk/src/main/webapp/scripts/
      - copied from r1484286, incubator/jspwiki/trunk/src/webdocs/scripts/
    incubator/jspwiki/trunk/src/main/webapp/templates/
      - copied from r1484286, incubator/jspwiki/trunk/src/webdocs/templates/
Removed:
    incubator/jspwiki/trunk/src/webdocs/Captcha.jsp
    incubator/jspwiki/trunk/src/webdocs/Comment.jsp
    incubator/jspwiki/trunk/src/webdocs/CookieError.jsp
    incubator/jspwiki/trunk/src/webdocs/Delete.jsp
    incubator/jspwiki/trunk/src/webdocs/DeleteGroup.jsp
    incubator/jspwiki/trunk/src/webdocs/Diff.jsp
    incubator/jspwiki/trunk/src/webdocs/Edit.jsp
    incubator/jspwiki/trunk/src/webdocs/EditGroup.jsp
    incubator/jspwiki/trunk/src/webdocs/Error.jsp
    incubator/jspwiki/trunk/src/webdocs/Group.jsp
    incubator/jspwiki/trunk/src/webdocs/Install.jsp
    incubator/jspwiki/trunk/src/webdocs/Login.jsp
    incubator/jspwiki/trunk/src/webdocs/LoginForm.jsp
    incubator/jspwiki/trunk/src/webdocs/Logout.jsp
    incubator/jspwiki/trunk/src/webdocs/LostPassword.jsp
    incubator/jspwiki/trunk/src/webdocs/Message.jsp
    incubator/jspwiki/trunk/src/webdocs/NewBlogEntry.jsp
    incubator/jspwiki/trunk/src/webdocs/NewGroup.jsp
    incubator/jspwiki/trunk/src/webdocs/PageInfo.jsp
    incubator/jspwiki/trunk/src/webdocs/PageModified.jsp
    incubator/jspwiki/trunk/src/webdocs/Preview.jsp
    incubator/jspwiki/trunk/src/webdocs/Rename.jsp
    incubator/jspwiki/trunk/src/webdocs/Search.jsp
    incubator/jspwiki/trunk/src/webdocs/SisterSites.jsp
    incubator/jspwiki/trunk/src/webdocs/Upload.jsp
    incubator/jspwiki/trunk/src/webdocs/UserPreferences.jsp
    incubator/jspwiki/trunk/src/webdocs/Wiki.jsp
    incubator/jspwiki/trunk/src/webdocs/Workflow.jsp
    incubator/jspwiki/trunk/src/webdocs/admin/
    incubator/jspwiki/trunk/src/webdocs/atom.css
    incubator/jspwiki/trunk/src/webdocs/error/
    incubator/jspwiki/trunk/src/webdocs/images/
    incubator/jspwiki/trunk/src/webdocs/rss.jsp
    incubator/jspwiki/trunk/src/webdocs/scripts/
    incubator/jspwiki/trunk/src/webdocs/templates/
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=1484301&r1=1484300&r2=1484301&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun May 19 15:50:56 2013
@@ -1,3 +1,9 @@
+2013-05-19  Glen Mazza (gmazza AT apache DOT org)
+
+       * 2.9.2-incubating-3
+       
+       * Mavenized location of src/webdocs files
+
 2013-05-18  Glen Mazza (gmazza AT apache DOT org)
 
        * 2.9.2-incubating-2

Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1484301&r1=1484300&r2=1484301&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Sun May 19 15:50:56 2013
@@ -523,7 +523,14 @@
        <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" />
+       <fileset dir="src/main/webapp">
+           <include name="admin/**" />
+	   <include name="error/**" />
+	   <include name="images/**"/>
+	   <include name="scripts/**"/>
+	   <include name="templates/**" />
+	   <include name="*.*" />
+      </fileset>
        <webinf dir="target/etc">
          <include name="jspwiki.properties" />
        </webinf>
@@ -538,8 +545,8 @@
 
     <war warfile="${warfile}"
          webxml="src/main/webapp/WEB-INF/web.xml" update="true">
-      	<fileset dir="${tmpdir}/compress/webdocs/" includes="**/*.js" />
-      	<fileset dir="${tmpdir}/compress/webdocs/" includes="**/*.css" />
+      	<fileset dir="${tmpdir}/compress/src/main/webapp/" includes="**/*.js" />
+      	<fileset dir="${tmpdir}/compress/src/main/webapp/" includes="**/*.css" />
     </war>
 
    </target>
@@ -554,7 +561,7 @@
             <java jar="tests/lib/yuicompressor-2.4.7.jar"
                   output="${tmpdir}/compress/@{src}"
                   fork="true">
-                <arg line="'${code.resources}/@{src}' @{args}" />
+                <arg line="'@{src}' @{args}" />
             </java>
         </sequential>
     </macrodef>
@@ -565,36 +572,36 @@
         .js files from the distro on top of the compressed ones from the WAR.
     -->
    <target name="compressedjs">
-        <mkdir dir="${tmpdir}/compress/webdocs/scripts"/>
+        <mkdir dir="${tmpdir}/compress/src/main/webapp/scripts"/>
     
-        <compressjs src="webdocs/scripts/jspwiki-common.js"/>
-        <compressjs src="webdocs/scripts/jspwiki-edit.js"/>
-        <compressjs src="webdocs/scripts/jspwiki-prefs.js"/>
-        <compressjs src="webdocs/scripts/jspwiki-commonstyles.js"/>
-        <compressjs src="webdocs/scripts/prettify.js"/>
+        <compressjs src="src/main/webapp/scripts/jspwiki-common.js"/>
+        <compressjs src="src/main/webapp/scripts/jspwiki-edit.js"/>
+        <compressjs src="src/main/webapp/scripts/jspwiki-prefs.js"/>
+        <compressjs src="src/main/webapp/scripts/jspwiki-commonstyles.js"/>
+        <compressjs src="src/main/webapp/scripts/prettify.js"/>
 
-        <mkdir dir="${tmpdir}/compress/webdocs/templates/default"/>
+        <mkdir dir="${tmpdir}/compress/src/main/webapp/templates/default"/>
 
-        <compressjs src="webdocs/templates/default/jspwiki.css"
+        <compressjs src="src/main/webapp/templates/default/jspwiki.css"
                     args="--line-break 0" />
     
-        <compressjs src="webdocs/templates/default/jspwiki_print.css"
+        <compressjs src="src/main/webapp/templates/default/jspwiki_print.css"
                     args="--line-break 0" />   	
 
-        <mkdir dir="${tmpdir}/compress/webdocs/templates/default/skins/OrderedList"/>
  	
-   	    <compressjs src="webdocs/templates/default/skins/OrderedList/skin.css"
+        <mkdir dir="${tmpdir}/compress/src/main/webapp/templates/default/skins/OrderedList"/>
  	
+   	    <compressjs src="src/main/webapp/templates/default/skins/OrderedList/skin.css"
                 args="--line-break 0" />
 
-        <mkdir dir="${tmpdir}/compress/webdocs/templates/default/skins/PlainVanilla"/>
  	
-   	    <compressjs src="webdocs/templates/default/skins/PlainVanilla/skin.css"
+        <mkdir dir="${tmpdir}/compress/src/main/webapp/templates/default/skins/PlainVanilla"/>
  	
+   	    <compressjs src="src/main/webapp/templates/default/skins/PlainVanilla/skin.css"
                 args="--line-break 0" />
 
-        <mkdir dir="${tmpdir}/compress/webdocs/templates/default/skins/PlainVanilla 1024x768"/>
  	
-        <compressjs src="webdocs/templates/default/skins/PlainVanilla 1024x768/skin.css"
+        <mkdir dir="${tmpdir}/compress/src/main/webapp/templates/default/skins/PlainVanilla
1024x768"/>   	
+        <compressjs src="src/main/webapp/templates/default/skins/PlainVanilla 1024x768/skin.css"
                 args="--line-break 0" />
 
-   	    <mkdir dir="${tmpdir}/compress/webdocs/templates/default/skins/Smart"/>   

-        <compressjs src="webdocs/templates/default/skins/Smart/skin.css"
+   	    <mkdir dir="${tmpdir}/compress/src/main/webapp/templates/default/skins/Smart"/>
  	
+        <compressjs src="src/main/webapp/templates/default/skins/Smart/skin.css"
                 args="--line-break 0" />
    </target>
 
@@ -1050,7 +1057,14 @@ If all of the tests ran successfully, th
 
       <!-- Copy the JSPs -->
       <copy toDir="@{context.dir}/webapp">
-        <fileset dir="${code.resources}/webdocs" includes="**" />
+        <fileset dir="src/main/webapp">
+            <include name="admin/**" />
+            <include name="error/**" />
+	    <include name="images/**"/>
+	    <include name="scripts/**"/>
+	    <include name="templates/**" />
+	    <include name="*.*" />
+        </fileset>
       </copy>
 
     </sequential>
@@ -1484,7 +1498,7 @@ To automate the JAR signing processs, yo
         	${release.dir}/**" />
 <!--
       <fileset dir="src/org"/>
-      <fileset dir="src/webdocs" 
+      <fileset dir="src/src/main/webapp" 
                excludes="**/SilkIconSet-readme.txt,**/fckconfig.js,**/mootools.js,**/posteditor.js"
/>
       <fileset dir="tests/org"/>
       -->

Modified: incubator/jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1484301&r1=1484300&r2=1484301&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Sun May 19 15:50:56 2013
@@ -326,9 +326,7 @@
                 </configuration>
             </plugin>
             <!-- Compress certain CSS and JS files using the YUICompressor 
-                 TODO: See if all JS files can be compressed to simplify
-                 configuration (currently just using hardcoded subset in
-                 Ant file.) 
+                 (http://alchim.sourceforge.net/yuicompressor-maven-plugin/)
             -->
             <plugin>
                 <groupId>net.alchim31.maven</groupId>
@@ -342,44 +340,8 @@
                         </goals>
                         <configuration>
                             <nosuffix>true</nosuffix>
-                            <warSourceDirectory>${basedir}/src/webdocs</warSourceDirectory>
+                            <excludeResources>true</excludeResources>
                             <webappDirectory>${project.build.directory}/generated-sources/yuicompress</webappDirectory>
-                            <!-- Lots of warnings (300+) as YUICompressor is unhappy with
our JS files -->
-                            <!--jswarn>false</jswarn-->
-                            <includes>
-                                <include>scripts/jspwiki-common.js</include>
-                                <include>scripts/jspwiki-edit.js</include>
-                                <include>scripts/jspwiki-prefs.js</include>
-                                <include>scripts/jspwiki-commonstyles.js</include>
-                                <include>scripts/prettify.js</include>
-                            </includes>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <!-- Separate execution for CSS files due to its different line-break
setting 
-                             (https://github.com/yui/yuicompressor/blob/master/README.md)
as configured
-                             in Ant.
-                             TODO: See if can compress all CSS files (using Ant subset)
-                             TODO: See if can have same line-break setting for JS and CSS
to simplify
-                                   configuration
-                        -->
-                        <id>compressCSSfiles</id>
-                        <goals>
-                            <goal>compress</goal>
-                        </goals>
-                        <configuration>
-                            <nosuffix>true</nosuffix>
-                            <warSourceDirectory>${basedir}/src/webdocs</warSourceDirectory>
-                            <webappDirectory>${project.build.directory}/generated-sources/yuicompress</webappDirectory>
-                            <linebreakpos>0</linebreakpos>
-                            <includes>
-                                <include>templates/default/jspwiki.css</include>
-                                <include>templates/default/jspwiki_print.css</include>
-                                <include>templates/default/skins/OrderedList/skin.css</include>
-                                <include>templates/default/skins/PlainVanilla/skin.css</include>
-                                <include>templates/default/skins/PlainVanilla 1024x768/skin.css</include>
-                                <include>templates/default/skins/Smart/skin.css</include>
-                            </includes>
                         </configuration>
                     </execution>
                 </executions> 
@@ -399,33 +361,6 @@
                             </includes>
                             <filtering>true</filtering>
                         </resource>
-                        <resource>
-                            <directory>src/webdocs</directory>
-                            <includes>
-                                <include>admin/**</include>
-                                <include>error/**</include>
-                                <include>images/**</include>
-                                <include>scripts/**</include>
-                                <include>templates/**</include>
-                                <include>*.jsp</include>
-                                <include>*.css</include>
-                            </includes>
-                            <!-- Below excluded because YUICompressor's version of
-                                 the files will be used. -->
-                            <excludes>
-                                <exclude>scripts/jspwiki-common.js</exclude>
-                                <exclude>scripts/jspwiki-edit.js</exclude>
-                                <exclude>scripts/jspwiki-prefs.js</exclude>
-                                <exclude>scripts/jspwiki-commonstyles.js</exclude>
-                                <exclude>scripts/prettify.js</exclude>
-                                <exclude>templates/default/jspwiki.css</exclude>
-                                <exclude>templates/default/jspwiki_print.css</exclude>
-                                <exclude>templates/default/skins/OrderedList/skin.css</exclude>
-                                <exclude>templates/default/skins/PlainVanilla/skin.css</exclude>
-                                <exclude>templates/default/skins/PlainVanilla 1024x768/skin.css</exclude>
-                                <exclude>templates/default/skins/Smart/skin.css</exclude>
-                            </excludes>
-                        </resource>
                         <!-- Output directory configured above with the YUICompressor
Maven plugin -->
                         <resource>
                             <directory>${project.build.directory}/generated-sources/yuicompress</directory>

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=1484301&r1=1484300&r2=1484301&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 Sun May 19 15:50:56
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         = "2";
+    public static final String     BUILD         = "3";
     
     /**
      *  This is the generic version string you should use



Mime
View raw message