Author: coheigea
Date: Fri Nov 12 17:34:20 2010
New Revision: 1034485
URL: http://svn.apache.org/viewvc?rev=1034485&view=rev
Log:
[WSS-249] - Parameterize Collections in WSS4J 1.6
Modified:
webservices/wss4j/trunk/build.xml
webservices/wss4j/trunk/interop/build.xml
webservices/wss4j/trunk/pom.xml
Modified: webservices/wss4j/trunk/build.xml
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/build.xml?rev=1034485&r1=1034484&r2=1034485&view=diff
==============================================================================
--- webservices/wss4j/trunk/build.xml (original)
+++ webservices/wss4j/trunk/build.xml Fri Nov 12 17:34:20 2010
@@ -339,7 +339,7 @@ org.apache.ws.axis.security.util
<target name="compile.library" depends="prepare-src">
<!-- Compile the java code from ${dir.src} into ${build.classes} -->
- <javac srcdir="${dir.src}" destdir="${build.classes}" debug="on"
source="1.4" target="1.4" includeAntRuntime="false">
+ <javac srcdir="${dir.src}" destdir="${build.classes}" debug="on"
source="1.5" target="1.5" includeAntRuntime="false">
<classpath refid="classpath.library"/>
<exclude name="**/Merlin.java" unless="merlin.ok"/>
</javac>
@@ -356,13 +356,13 @@ org.apache.ws.axis.security.util
depends="compile.interops"
if="junit.present">
- <javac srcdir="${dir.test}" destdir="${build.classes}" debug="on"
source="1.4" target="1.4" includeAntRuntime="false">
+ <javac srcdir="${dir.test}" destdir="${build.classes}" debug="on"
source="1.5" target="1.5" includeAntRuntime="false">
<classpath refid="classpath.test"/>
</javac>
<mkdir dir="${build.work}"/>
- <javac srcdir="${build.work}" destdir="${build.classes}" debug="on"
source="1.4" target="1.4" includeAntRuntime="false">
+ <javac srcdir="${build.work}" destdir="${build.classes}" debug="on"
source="1.5" target="1.5" includeAntRuntime="false">
<classpath refid="classpath.test"/>
</javac>
@@ -380,8 +380,8 @@ org.apache.ws.axis.security.util
<!-- Compile the java code from ${dir.src} into ${build.classes} -->
<javac srcdir="${dir.samples}"
debug="on"
- source="1.4"
- destdir="${build.classes}" target="1.4" includeAntRuntime="false">
+ source="1.5"
+ destdir="${build.classes}" target="1.5" includeAntRuntime="false">
<classpath refid="classpath.library"/>
</javac>
<copy todir="${build.classes}">
Modified: webservices/wss4j/trunk/interop/build.xml
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/interop/build.xml?rev=1034485&r1=1034484&r2=1034485&view=diff
==============================================================================
--- webservices/wss4j/trunk/interop/build.xml (original)
+++ webservices/wss4j/trunk/interop/build.xml Fri Nov 12 17:34:20 2010
@@ -84,7 +84,7 @@
</copy>
<javac srcdir="${dir.work}"
destdir="${dir.classes}"
- source="1.4"
+ source="1.5"
debug="true"
includeAntRuntime="false">
<classpath refid="classpath.libraries" />
Modified: webservices/wss4j/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/pom.xml?rev=1034485&r1=1034484&r2=1034485&view=diff
==============================================================================
--- webservices/wss4j/trunk/pom.xml (original)
+++ webservices/wss4j/trunk/pom.xml Fri Nov 12 17:34:20 2010
@@ -1,21 +1,21 @@
-<!--
- 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
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
+<!--
+ 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
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
@@ -56,51 +56,6 @@
</mailingList>
</mailingLists>
<inceptionYear>2004</inceptionYear>
- <!-- who the developers are for the project -->
- <developers>
- <developer>
- <name>Davanum Srinivas</name>
- <id>dims</id>
- <email>[email protected]</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Werner Dittmann</name>
- <id>werner</id>
- <email>[email protected]</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Ias</name>
- <id>ias</id>
- <email>[email protected]</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Ruchith Fernando</name>
- <id>ruchithf</id>
- <email>[email protected]</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Fred Dushin</name>
- <id>fadushin</id>
- <email>[email protected]</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Colm O hEigeartaigh</name>
- <id>coheigea</id>
- <email>[email protected]</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Nandana Mihindukulasooriya</name>
- <id>nandana</id>
- <email>[email protected]</email>
- <organization></organization>
- </developer>
- </developers>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
@@ -153,6 +108,7 @@
<failOnViolation>true</failOnViolation>
<verbose>true</verbose>
<includeTests>false</includeTests>
+ <targetJdk>1.5</targetJdk>
<excludes>
<exclude>**/Merlin.java, **/CryptoBase.java,
**/SAMLIssuerImpl.java, **/DOM2Writer.java
</exclude>
@@ -175,11 +131,11 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Implementation-Title>Apache
WSS4J</Implementation-Title>
- <Implementation-Vendor>The Apache Software
Foundation</Implementation-Vendor>
-
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
-
<Implementation-Version>${pom.version}</Implementation-Version>
- <Specification-Title>Apache WSS4J</Specification-Title>
+ <Implementation-Title>Apache
WSS4J</Implementation-Title>
+ <Implementation-Vendor>The Apache Software
Foundation</Implementation-Vendor>
+
<Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+
<Implementation-Version>${pom.version}</Implementation-Version>
+ <Specification-Title>Apache WSS4J</Specification-Title>
<Specification-Vendor>The Apache Software
Foundation</Specification-Vendor>
<Specification-Version>${pom.version}</Specification-Version>
@@ -200,26 +156,26 @@
<DynamicImport-Package>*</DynamicImport-Package>
</instructions>
</configuration>
- </plugin>
- <plugin>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
-
<resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
- </resourceBundles>
- <properties>
- <projectName>Apache WebServices -
WSS4J</projectName>
- </properties>
- <appendedResourcesDirectory>
${basedir}/appended-resources</appendedResourcesDirectory>
- </configuration>
- </execution>
- </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ </resourceBundles>
+ <properties>
+ <projectName>Apache WebServices -
WSS4J</projectName>
+ </properties>
+ <appendedResourcesDirectory>
${basedir}/appended-resources</appendedResourcesDirectory>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
@@ -255,8 +211,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.4</source>
- <target>1.4</target>
+ <source>1.5</source>
+ <target>1.5</target>
<testExcludes>
<exclude>interop/**/*</exclude>
</testExcludes>
@@ -306,8 +262,8 @@
</plugin>
</plugins>
- </pluginManagement>
-
+ </pluginManagement>
+
<defaultGoal>install</defaultGoal>
</build>
@@ -355,7 +311,7 @@
</profile>
<profile>
<id>jdk15</id>
- <activation>
+ <activation>
<activeByDefault>true</activeByDefault>
<jdk>1.5</jdk>
</activation>
@@ -367,20 +323,20 @@
<scope>test</scope>
</dependency>
</dependencies>
- </profile>
- <profile>
- <id>jdk16</id>
- <activation>
- <jdk>1.6</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk16</artifactId>
- <version>${bcprov.jdk16.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ </profile>
+ <profile>
+ <id>jdk16</id>
+ <activation>
+ <jdk>1.6</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk16</artifactId>
+ <version>${bcprov.jdk16.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</profile>
<profile>
<id>fastinstall</id>
@@ -401,7 +357,7 @@
<xmlsec.version>1.4.3</xmlsec.version>
<opensaml.version>1.1</opensaml.version>
<xml.apis.version>1.3.04</xml.apis.version>
- <bcprov.jdk15.version>1.45</bcprov.jdk15.version>
+ <bcprov.jdk15.version>1.45</bcprov.jdk15.version>
<bcprov.jdk16.version>1.45</bcprov.jdk16.version>
<commons.logging.version>1.1</commons.logging.version>
<xalan.version>2.7.1</xalan.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
