jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From flori...@apache.org
Subject svn commit: r1400529 - in /incubator/jspwiki/trunk: ./ etc/ src/org/apache/wiki/diff/ src/org/apache/wiki/modules/ src/org/apache/wiki/parser/ src/org/apache/wiki/plugin/ src/webdocs/scripts/ tests/org/apache/wiki/plugin/
Date Sat, 20 Oct 2012 22:54:00 GMT
Author: florianh
Date: Sat Oct 20 22:53:59 2012
New Revision: 1400529

URL: http://svn.apache.org/viewvc?rev=1400529&view=rev
Log:
some further fixes to license headers
build improvements: checksum files in correct format, added SHA-512 hash

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/build.xml
    incubator/jspwiki/trunk/etc/geronimo-web.xml
    incubator/jspwiki/trunk/src/org/apache/wiki/diff/ContextualDiffProvider.java
    incubator/jspwiki/trunk/src/org/apache/wiki/diff/DifferenceManager.java
    incubator/jspwiki/trunk/src/org/apache/wiki/diff/ExternalDiffProvider.java
    incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java
    incubator/jspwiki/trunk/src/org/apache/wiki/modules/InternalModule.java
    incubator/jspwiki/trunk/src/org/apache/wiki/parser/Heading.java
    incubator/jspwiki/trunk/src/org/apache/wiki/parser/WikiDocument.java
    incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Search.java
    incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js
    incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-commonstyles.js
    incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js
    incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-prefs.js
    incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/RecentChangesPluginTest.java

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1400529&r1=1400528&r2=1400529&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sat Oct 20 22:53:59 2012
@@ -1,3 +1,9 @@
+2012-10-21  Florian Holeczek (florianh AT apache DOT org)
+
+       * some further fixes to license headers
+
+       * build improvements: checksum files in correct format, added SHA-512 hash
+
 2012-10-20  Florian Holeczek (florianh AT apache DOT org)
 
        * some fixes for JSPWIKI-749 and CheckStyle version 5.6

Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1400529&r1=1400528&r2=1400529&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Sat Oct 20 22:53:59 2012
@@ -1,6 +1,4 @@
 <!--
-    JSPWiki - a JSP-based WikiWiki clone.
-
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
@@ -702,14 +700,14 @@
     </java>
   </target>
 
-  <!-- Builds the entire distribution set.
+  <!-- Builds the entire distribution artifacts without checksums and signatures.
 
        We build both the WAR-file and the source zip, then
        copy in some useful files and zip the whole thing
        into the release directory.
     -->
   <target name="dist" depends="clean-deps,installinit,srczip,war,corepageszip,documentzip,version"
-          description="Builds the entire distribution archive.">
+          description="Builds the entire distribution artifacts without checksums and signatures.">
      <copy file="README" todir="${install.fulldir}" />
      <copy file="ChangeLog" todir="${install.fulldir}" />
      <copy file="ReleaseNotes" todir="${install.fulldir}" />
@@ -725,12 +723,11 @@
   </target>
 
   <!-- Nabbed from solr -->
-  <macrodef name="sign-artifact" description="Signs the artifact">
+  <macrodef name="sign-artifact" description="Signs an artifact.">
     <attribute name="input.file"/>
     <attribute name="output.file" default="@{input.file}.asc"/>
     <sequential>
       <echo>Signing @{input.file} Sig File: @{output.file}</echo>
-
       <exec executable="gpg">
         <arg value="--armor"/>
         <arg value="--output"/>
@@ -741,17 +738,22 @@
     </sequential>
   </macrodef>
 
-  <!-- Generates signatures and MD5 hashes for the release artifacts. -->
-  <target name="signeddist" depends="dist">
+  <!-- Generate signatures and checksums for the release artifacts. -->
+  <target name="signeddist" depends="dist" description="Generate signatures and checksums
for the release artifacts.">
 
-     <checksum>
-       <fileset dir="${release.dir}"><include name="*.zip"/></fileset>
-     </checksum>
+  	<echo>Generating checksums for the release artifacts.</echo>
+    <checksum algorithm="MD5" fileext=".md5" format="MD5SUM" forceoverwrite="yes">
+      <fileset dir="${release.dir}"><include name="*.zip"/></fileset>
+    </checksum>
+    <checksum algorithm="SHA-512" fileext=".sha" format="MD5SUM" forceoverwrite="yes">
+      <fileset dir="${release.dir}"><include name="*.zip"/></fileset>
+    </checksum>
+
+  	<sequential>
+      <sign-artifact input.file="${release.dir}/${ant.project.name}-${jspwiki.version}-bin.zip"
/>
+      <sign-artifact input.file="${release.dir}/${ant.project.name}-${jspwiki.version}-src.zip"
/>
+    </sequential>
 
-     <sequential>
-       <sign-artifact input.file="${release.dir}/${ant.project.name}-${jspwiki.version}-bin.zip"
/>
-       <sign-artifact input.file="${release.dir}/${ant.project.name}-${jspwiki.version}-src.zip"
/>
-     </sequential>
   </target>
 
   <!-- ============================================================== -->

Modified: incubator/jspwiki/trunk/etc/geronimo-web.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/geronimo-web.xml?rev=1400529&r1=1400528&r2=1400529&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/geronimo-web.xml (original)
+++ incubator/jspwiki/trunk/etc/geronimo-web.xml Sat Oct 20 22:53:59 2012
@@ -1,7 +1,5 @@
 
 <!-- 
-    JSPWiki - a JSP-based WikiWiki clone.
-
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/diff/ContextualDiffProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/diff/ContextualDiffProvider.java?rev=1400529&r1=1400528&r2=1400529&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/diff/ContextualDiffProvider.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/diff/ContextualDiffProvider.java Sat Oct 20
22:53:59 2012
@@ -1,6 +1,4 @@
 /*
-   JSPWiki - a JSP-based WikiWiki clone.
-
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/diff/DifferenceManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/diff/DifferenceManager.java?rev=1400529&r1=1400528&r2=1400529&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/diff/DifferenceManager.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/diff/DifferenceManager.java Sat Oct 20 22:53:59
2012
@@ -1,6 +1,4 @@
 /*
-   JSPWiki - a JSP-based WikiWiki clone.
-
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/diff/ExternalDiffProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/diff/ExternalDiffProvider.java?rev=1400529&r1=1400528&r2=1400529&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/diff/ExternalDiffProvider.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/diff/ExternalDiffProvider.java Sat Oct 20
22:53:59 2012
@@ -1,6 +1,4 @@
 /*
-   JSPWiki - a JSP-based WikiWiki clone.
-
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java?rev=1400529&r1=1400528&r2=1400529&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/diff/TraditionalDiffProvider.java Sat Oct
20 22:53:59 2012
@@ -1,6 +1,4 @@
 /*
-   JSPWiki - a JSP-based WikiWiki clone.
-
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/modules/InternalModule.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/modules/InternalModule.java?rev=1400529&r1=1400528&r2=1400529&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/modules/InternalModule.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/modules/InternalModule.java Sat Oct 20 22:53:59
2012
@@ -1,6 +1,4 @@
 /* 
-   JSPWiki - a JSP-based WikiWiki clone.
-
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/parser/Heading.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/parser/Heading.java?rev=1400529&r1=1400528&r2=1400529&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/parser/Heading.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/parser/Heading.java Sat Oct 20 22:53:59 2012
@@ -1,6 +1,4 @@
 /*
-  JSPWiki - a JSP-based WikiWiki clone.
-
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/parser/WikiDocument.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/parser/WikiDocument.java?rev=1400529&r1=1400528&r2=1400529&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/parser/WikiDocument.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/parser/WikiDocument.java Sat Oct 20 22:53:59
2012
@@ -1,6 +1,4 @@
 /* 
-   JSPWiki - a JSP-based WikiWiki clone.
-
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Search.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Search.java?rev=1400529&r1=1400528&r2=1400529&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Search.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/plugin/Search.java Sat Oct 20 22:53:59 2012
@@ -1,6 +1,4 @@
 /* 
-   JSPWiki - a JSP-based WikiWiki clone.
-
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information

Modified: incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js?rev=1400529&r1=1400528&r2=1400529&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js (original)
+++ incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-common.js Sat Oct 20 22:53:59 2012
@@ -1,6 +1,4 @@
 /*
-    JSPWiki - a JSP-based WikiWiki clone.
-
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information

Modified: incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-commonstyles.js
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-commonstyles.js?rev=1400529&r1=1400528&r2=1400529&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-commonstyles.js (original)
+++ incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-commonstyles.js Sat Oct 20 22:53:59
2012
@@ -1,6 +1,4 @@
 /* 
-    JSPWiki - a JSP-based WikiWiki clone.
-
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information

Modified: incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js?rev=1400529&r1=1400528&r2=1400529&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js (original)
+++ incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-edit.js Sat Oct 20 22:53:59 2012
@@ -1,6 +1,4 @@
 /* 
-    JSPWiki - a JSP-based WikiWiki clone.
-
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information

Modified: incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-prefs.js
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-prefs.js?rev=1400529&r1=1400528&r2=1400529&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-prefs.js (original)
+++ incubator/jspwiki/trunk/src/webdocs/scripts/jspwiki-prefs.js Sat Oct 20 22:53:59 2012
@@ -1,6 +1,4 @@
 /* 
-    JSPWiki - a JSP-based WikiWiki clone.
-
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information

Modified: incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/RecentChangesPluginTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/RecentChangesPluginTest.java?rev=1400529&r1=1400528&r2=1400529&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/RecentChangesPluginTest.java (original)
+++ incubator/jspwiki/trunk/tests/org/apache/wiki/plugin/RecentChangesPluginTest.java Sat
Oct 20 22:53:59 2012
@@ -1,6 +1,4 @@
 /*
-JSPWiki - a JSP-based WikiWiki clone.
-
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
 distributed with this work for additional information



Mime
View raw message