Author: coheigea
Date: Mon Mar 7 14:07:18 2011
New Revision: 1078778
URL: http://svn.apache.org/viewvc?rev=1078778&view=rev
Log:
Website updates + some distribution changes.
Modified:
webservices/wss4j/trunk/build.xml
webservices/wss4j/trunk/contrib/wss4j-release.sh
webservices/wss4j/trunk/src/site/xdoc/download.xml
webservices/wss4j/trunk/src/site/xdoc/index.xml
Modified: webservices/wss4j/trunk/build.xml
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/build.xml?rev=1078778&r1=1078777&r2=1078778&view=diff
==============================================================================
--- webservices/wss4j/trunk/build.xml (original)
+++ webservices/wss4j/trunk/build.xml Mon Mar 7 14:07:18 2011
@@ -342,15 +342,22 @@ org.apache.ws.security.util
/>
</target>
- <target name="dist" depends="otherdist, srcdist"/>
+ <target name="dist" depends="bindist, srcdist"/>
- <target name="otherdist" depends="init"
- description="Build zip for required jars">
+ <!-- Note that this requires the jars to have been built by maven first -->
+ <target name="bindist" depends="init"
+ description="Build binary zip for distro">
<mkdir dir="${dir.dist}"/>
<zip destfile=
- "${dir.dist}/${product.shortname}-otherjars-${product.version}.zip">
- <zipfileset prefix="wss4j" dir="."
- includes="lib/*.jar, endorsed/*.jar, LICENSE.txt, README.txt,
NOTICE, legal/**"/>
+ "${dir.dist}/${product.shortname}-bin-${product.version}.zip">
+ <zipfileset prefix="wss4j-${product.version}" dir="."
+ includes="legal/** lib/** LICENSE.txt NOTICE "/>
+ <zipfileset prefix="wss4j-${product.version}/lib" dir="target/"
+ includes="wss4j-${product.version}.jar" />
+ <zipfileset prefix="wss4j-${product.version}/doc" dir="target/"
+ includes="wss4j-${product.version}-*.jar" />
+ <zipfileset prefix="wss4j-${product.version}/lib" dir="endorsed/"
+ includes="*.jar" />
</zip>
</target>
@@ -359,21 +366,9 @@ org.apache.ws.security.util
<mkdir dir="${dir.dist}"/>
<zip destfile=
"${dir.dist}/${product.shortname}-src-${product.version}.zip">
- <zipfileset prefix="wss4j" dir="."
- includes="src/** keys/** test/** legal/** lib/** endorsed/**
ChangeLog.txt LICENSE.txt README.txt NOTICE build.xml pom.xml ChangeLog.txt"/>
+ <zipfileset prefix="wss4j-${product.version}" dir="."
+ includes="src/** legal/** lib/** endorsed/** ChangeLog.txt
LICENSE.txt NOTICE build.xml pom.xml"/>
</zip>
</target>
- <target name="fixcrlf"
- description="Fixes CRLF">
- <fixcrlf srcdir="."
- eol="crlf"
- includes="**/*.java"
- />
- <fixcrlf srcdir="."
- eol="crlf"
- includes="**/*.properties"
- />
- </target>
-
</project>
Modified: webservices/wss4j/trunk/contrib/wss4j-release.sh
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/contrib/wss4j-release.sh?rev=1078778&r1=1078777&r2=1078778&view=diff
==============================================================================
--- webservices/wss4j/trunk/contrib/wss4j-release.sh (original)
+++ webservices/wss4j/trunk/contrib/wss4j-release.sh Mon Mar 7 14:07:18 2011
@@ -38,36 +38,35 @@ fi
# set up the staging area
#
rm -rf ${WSS4J_STAGE_ROOT}
-#mkdir -p ${WSS4J_STAGE_ROOT}/dist
+mkdir -p ${WSS4J_STAGE_ROOT}/dist
mkdir -p
${WSS4J_STAGE_ROOT}/maven/org/apache/ws/security/wss4j/${WSS4J_VERSION}
#
-# Build and stage the distribution using ant
-#
-#cd ${WSS4J_SRC_ROOT}
-#ant clean
-#ant dist || exit 1
-#cp -r dist/* ${WSS4J_STAGE_ROOT}/dist
-#
# Build and stage through maven; copy the Jartifact built by Maven to the dist
#
+cd ${WSS4J_SRC_ROOT}
mvn clean || exit 1
mvn -Prelease,jdk15 install || exit 1
mkdir -p ${WSS4J_STAGE_ROOT}/maven/org/apache/ws/security/wss4j/
cp -r ${M2_REPO}/org/apache/ws/security/wss4j/${WSS4J_VERSION}
${WSS4J_STAGE_ROOT}/maven/org/apache/ws/security/wss4j
-#cp -f
${M2_REPO}/org/apache/ws/security/wss4j/${WSS4J_VERSION}/wss4j-${WSS4J_VERSION}.jar
${WSS4J_STAGE_ROOT}/dist
+#
+# Build and stage the distribution using ant
+#
+ant clean
+ant dist || exit 1
+cp -r dist/* ${WSS4J_STAGE_ROOT}/dist
#
# Sign and hash the release bits
#
-#cd ${WSS4J_STAGE_ROOT}/dist
-#for i in *
-#do
-# gpg --detach-sign --armor $i
-# gpg --verify $i.asc
-#done
-#for i in *.jar *.zip
-#do
-# md5sum $i > $i.md5
-#done
+cd ${WSS4J_STAGE_ROOT}/dist
+for i in *
+do
+ gpg --detach-sign --armor $i
+ gpg --verify $i.asc
+done
+for i in *.zip
+do
+ md5sum $i > $i.md5
+done
cd ${WSS4J_STAGE_ROOT}/maven/org/apache/ws/security/wss4j/${WSS4J_VERSION}
for i in *
do
Modified: webservices/wss4j/trunk/src/site/xdoc/download.xml
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/site/xdoc/download.xml?rev=1078778&r1=1078777&r2=1078778&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/site/xdoc/download.xml (original)
+++ webservices/wss4j/trunk/src/site/xdoc/download.xml Mon Mar 7 14:07:18 2011
@@ -3,8 +3,8 @@
<body>
<section name="Obtain the Apache WSS4J distribution">
<p>
-The <b>Apache WSS4J™</b> project is aimed at providing implementation of
the primary security
-standards for Web Services.
+The <b>Apache WSS4J™</b> project provides an implementation of the
primary security standards
+for Web Services.
</p>
<subsection name="How to Download">
<p>
@@ -19,14 +19,36 @@ LICENSE.txt and NOTICE.txt files contain
<ul>
<li>
<p>
-The current "new" release is Apache WSS4J 1.6:
-<a href="http://www.apache.org/dyn/closer.cgi/ws/wss4j/1_6";></a>
+The current "new" release is Apache WSS4J 1.6:
+</p>
+<p>
+<a
href="http://www.apache.org/dyn/closer.cgi/ws/wss4j/1_6/wss4j-bin-1.6.zip";>wss4j-bin-1.6.zip</a>
+(<a
href="http://www.apache.org/dyn/closer.cgi/ws/wss4j/1_6/wss4j-bin-1.6.zip.md5";>
+MD5</a>)
+(<a
href="http://www.apache.org/dyn/closer.cgi/ws/wss4j/1_6/wss4j-bin-1.6.zip.asc";>
+PGP</a>)
+</p>
+<p>
+<a
href="http://www.apache.org/dyn/closer.cgi/ws/wss4j/1_6/wss4j-src-1.6.zip";>wss4j-src-1.6.zip</a>
+(<a
href="http://www.apache.org/dyn/closer.cgi/ws/wss4j/1_6/wss4j-src-1.6.zip.md5";>
+MD5</a>)
+(<a
href="http://www.apache.org/dyn/closer.cgi/ws/wss4j/1_6/wss4j-src-1.6.zip.asc";>
+PGP</a>)
</p>
</li>
<li>
<p>
-The current "old" release is Apache WSS4J 1.5.11:
-<a href="http://www.apache.org/dyn/closer.cgi/ws/wss4j/1_5_11";></a>
+The current "old" release is Apache WSS4J 1.5.11:
+</p>
+<p>
+<a
href="http://www.apache.org/dyn/closer.cgi/ws/wss4j/1_5_11/wss4j-bin-1.5.11.zip";>
+wss4j-bin-1.5.11.zip</a>
+(<a
href="http://www.apache.org/dyn/closer.cgi/ws/wss4j/1_5_11/wss4j-bin-1.5.11.zip.asc";>PGP</a>)
+</p>
+<p>
+<a
href="http://www.apache.org/dyn/closer.cgi/ws/wss4j/1_5_11/wss4j-src-1.5.11.zip";>
+wss4j-src-1.5.11.zip</a>
+(<a
href="http://www.apache.org/dyn/closer.cgi/ws/wss4j/1_5_11/wss4j-src-1.5.11.zip.asc";>PGP</a>)
</p>
</li>
</ul>
Modified: webservices/wss4j/trunk/src/site/xdoc/index.xml
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/site/xdoc/index.xml?rev=1078778&r1=1078777&r2=1078778&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/site/xdoc/index.xml (original)
+++ webservices/wss4j/trunk/src/site/xdoc/index.xml Mon Mar 7 14:07:18 2011
@@ -8,7 +8,7 @@
The <b>Apache WSS4J™</b> project is aimed at providing implementation of
the primary security
standards for Web Services, namely the OASIS Web Services Security
(WS-Security) specifications from
the <a
href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=wss";>OASIS Web
Services
-Security TC</a>. WSS4J implements the following Web Services Security specs:
+Security TC</a>. WSS4J provides an implementation of the following WS-Security
standards:
</p>
<ul>
<li>
