Author: ruchithf
Date: Fri May 18 14:47:04 2007
New Revision: 539612
URL: http://svn.apache.org/viewvc?view=rev&rev=539612
Log:
minor code clean up and updates to the dist build
Modified:
webservices/rampart/trunk/java/build.xml
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
webservices/rampart/trunk/java/release-docs/build.xml
Modified: webservices/rampart/trunk/java/build.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/build.xml?view=diff&rev=539612&r1=539611&r2=539612
==============================================================================
--- webservices/rampart/trunk/java/build.xml (original)
+++ webservices/rampart/trunk/java/build.xml Fri May 18 14:47:04 2007
@@ -1,52 +1,67 @@
<project name="Apache Rampart release build" default="bin-dist">
<property name="rampart.version" value="SNAPSHOT"/>
- <property name="rampart.bin.dist" value="rampart-bin"/>
+ <property name="rampart.bin.dist" value="rampart"/>
<property name="rampart.src.dist" value="rampart-src"/>
+ <property name="rampart.src.dist" value="rampart-docs"/>
<property name="dir.dist" value="dist"/>
+ <property name="dir.dist.bin"
value="${dir.dist}/bin/${rampart.bin.dist}-${rampart.version}"/>
+ <property name="dir.dist.src"
value="${dir.dist}/src/${rampart.src.dist}-${rampart.version}"/>
+ <property name="dir.mvn2.repo" value="${user.home}/.m2/repository"/>
-
-
- <target name="init" depends="clean">
+ <property name="version.bcprov13" value="132"/>
+ <property name="version.xmlsec" value="1.4.0"/>
+ <property name="version.opensaml" value="1.1"/>
+ <property name="version.wss4j" value="SNAPSHOT"/>
+
+ <target name="init">
<mkdir dir="${dir.dist}"/>
</target>
<target name="bin-dist" depends="init">
- <mkdir dir="${dir.dist}/${rampart.bin.dist}"/>
+ <mkdir dir="${dir.dist.bin}"/>
- <copy todir="${dir.dist}/${rampart.bin.dist}">
+ <copy todir="${dir.dist.bin}">
<fileset dir="release-docs">
</fileset>
</copy>
<!-- Modules -->
<echo>Copying mars in to modules</echo>
- <mkdir dir="${dir.dist}/${rampart.bin.dist}/modules"/>
+ <mkdir dir="${dir.dist.bin}/modules"/>
- <copy todir="${dir.dist}/${rampart.bin.dist}/modules"
file="modules/rampart-mar/target/rampart-${rampart.version}.mar"/>
- <copy todir="${dir.dist}/${rampart.bin.dist}/modules"
file="modules/rampart-trust-mar/target/rahas-${rampart.version}.mar"/>
+ <copy todir="${dir.dist.bin}/modules"
file="modules/rampart-mar/target/rampart-${rampart.version}.mar"/>
+ <copy todir="${dir.dist.bin}/modules"
file="modules/rampart-trust-mar/target/rahas-${rampart.version}.mar"/>
<!-- All dep jars -->
<echo>Copying dependencies into lib</echo>
- <mkdir dir="${dir.dist}/${rampart.bin.dist}/lib"/>
+ <mkdir dir="${dir.dist.bin}/lib"/>
+
+ <copy todir="${dir.dist.bin}/lib"
file="modules/rampart-core/target/rampart-core-${rampart.version}.jar"/>
+ <copy todir="${dir.dist.bin}/lib"
file="modules/rampart-policy/target/rampart-policy-${rampart.version}.jar"/>
+ <copy todir="${dir.dist.bin}/lib"
file="modules/rampart-trust/target/rampart-trust-${rampart.version}.jar"/>
+
+ <copy todir="${dir.dist.bin}/lib"
file="${dir.mvn2.repo}/bouncycastle/bcprov-jdk13/${version.bcprov13}/bcprov-jdk13-${version.bcprov13}.jar"/>
+ <copy todir="${dir.dist.bin}/lib"
file="${dir.mvn2.repo}/org/apache/santuario/xmlsec/${version.xmlsec}/xmlsec-${version.xmlsec}.jar"/>
+ <copy todir="${dir.dist.bin}/lib"
file="${dir.mvn2.repo}/opensaml/opensaml/${version.opensaml}/opensaml-${version.opensaml}.jar"/>
+ <copy todir="${dir.dist.bin}/lib"
file="${dir.mvn2.repo}/org/apache/ws/security/wss4j/${version.wss4j}/wss4j-${version.wss4j}.jar"/>
- <copy todir="${dir.dist}/${rampart.bin.dist}/lib"
file="modules/rampart-core/target/rampart-core-${rampart.version}.jar"/>
- <copy todir="${dir.dist}/${rampart.bin.dist}/lib"
file="modules/rampart-policy/target/rampart-policy-${rampart.version}.jar"/>
- <copy todir="${dir.dist}/${rampart.bin.dist}/lib"
file="modules/rampart-trust/target/rampart-trust-${rampart.version}.jar"/>
-
<echo>Copying samples</echo>
<!-- copy samples -->
- <mkdir dir="${dir.dist}/${rampart.bin.dist}/samples"/>
+ <mkdir dir="${dir.dist.bin}/samples"/>
- <copy todir="${dir.dist}/${rampart.bin.dist}/samples">
+ <copy todir="${dir.dist.bin}/samples">
<fileset dir="modules/rampart-samples/">
</fileset>
</copy>
-
+ <zip destfile="${dir.dist}/${rampart.bin.dist}-${rampart.version}.zip">
+ <zipfileset dir="${dir.dist.bin}/../"/>
+ </zip>
+
</target>
<target name="src-dist" depends="init">
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java?view=diff&rev=539612&r1=539611&r2=539612
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
Fri May 18 14:47:04 2007
@@ -194,7 +194,6 @@
sgndEndSuppTokMap = this.handleSupportingTokens(rmd,
sgndEndSuppTokens);
- //Rampart - 36
SupportingToken supportingToks = rpd.getSupportingTokens();
this.handleSupportingTokens(rmd, supportingToks);
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java?view=diff&rev=539612&r1=539611&r2=539612
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
Fri May 18 14:47:04 2007
@@ -287,7 +287,7 @@
if(suppTokens != null && suppTokens.getTokens() != null &&
suppTokens.getTokens().size() > 0) {
- log.debug("Processing endorsing supporting tokens");
+ log.debug("Processing supporting tokens");
ArrayList tokens = suppTokens.getTokens();
for (Iterator iter = tokens.iterator(); iter.hasNext();) {
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java?view=diff&rev=539612&r1=539611&r2=539612
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
Fri May 18 14:47:04 2007
@@ -213,7 +213,6 @@
sgndEndSuppTokMap = this.handleSupportingTokens(rmd,
sgndEndSuppTokens);
- //Rampart - 36
SupportingToken supportingToks = rpd.getSupportingTokens();
this.handleSupportingTokens(rmd, supportingToks);
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java?view=diff&rev=539612&r1=539611&r2=539612
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
Fri May 18 14:47:04 2007
@@ -125,7 +125,6 @@
}
-// Rampart - 36
SupportingToken supportingToks = rpd.getSupportingTokens();
this.handleSupportingTokens(rmd, supportingToks);
Modified: webservices/rampart/trunk/java/release-docs/build.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/release-docs/build.xml?view=diff&rev=539612&r1=539611&r2=539612
==============================================================================
--- webservices/rampart/trunk/java/release-docs/build.xml (original)
+++ webservices/rampart/trunk/java/release-docs/build.xml Fri May 18 14:47:04
2007
@@ -19,7 +19,7 @@
<project basedir="." default="setup">
<property name="lib.dir" value="lib"/>
- <property name="modules.dir" value="."/>
+ <property name="modules.dir" value="modules"/>
<property environment="env"/>
@@ -33,11 +33,6 @@
<property name="axis2.modules.dir"
value="${env.AXIS2_HOME}/repository/modules/"/>
<property name="axis2.lib.dir" value="${env.AXIS2_HOME}/lib"/>
- <!-- Delete exising axiom jars -->
- <delete file="${axis2.lib.dir}/axiom-api-1.2.jar"/>
- <delete file="${axis2.lib.dir}/axiom-impl-1.2.jar"/>
- <delete file="${axis2.lib.dir}/axiom-dom-1.2.jar"/>
-
<copy todir="${axis2.lib.dir}">
<fileset dir="${lib.dir}">
<include name="**/*.jar"/>
@@ -52,4 +47,4 @@
</target>
-</project>
\ No newline at end of file
+</project>
