Author: dsh
Date: Sat Jan 2 06:43:09 2010
New Revision: 895136
URL: http://svn.apache.org/viewvc?rev=895136&view=rev
Log:
OPENEJB-1126: Added a comment explaining why the jaxp-ri dependency is
required. Added a separate build file to either create keystores using the IBM
or Sun keytool.
Added:
openejb/trunk/openejb3/examples/webservice-ws-security/create-keystores.xml
Modified:
openejb/trunk/openejb3/examples/simple-webservice/pom.xml
openejb/trunk/openejb3/examples/webservice-attachments/pom.xml
openejb/trunk/openejb3/examples/webservice-inheritance/pom.xml
openejb/trunk/openejb3/examples/webservice-security/pom.xml
openejb/trunk/openejb3/examples/webservice-ws-security/pom.xml
openejb/trunk/openejb3/server/openejb-cxf/pom.xml
Modified: openejb/trunk/openejb3/examples/simple-webservice/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/simple-webservice/pom.xml?rev=895136&r1=895135&r2=895136&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/simple-webservice/pom.xml (original)
+++ openejb/trunk/openejb3/examples/simple-webservice/pom.xml Sat Jan 2
06:43:09 2010
@@ -75,6 +75,14 @@
<version>3.1.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+ <!-- This is required on IBM JDKs (and potentially others) because
saaj-impl depends
+ on Sun's internal copy of Xerces. See AXIS2-4228. -->
+ <dependency>
+ <groupId>com.sun.xml.parsers</groupId>
+ <artifactId>jaxp-ri</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!--
Modified: openejb/trunk/openejb3/examples/webservice-attachments/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webservice-attachments/pom.xml?rev=895136&r1=895135&r2=895136&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webservice-attachments/pom.xml (original)
+++ openejb/trunk/openejb3/examples/webservice-attachments/pom.xml Sat Jan 2
06:43:09 2010
@@ -75,6 +75,14 @@
<version>3.1.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+ <!-- This is required on IBM JDKs (and potentially others) because
saaj-impl depends
+ on Sun's internal copy of Xerces. See AXIS2-4228. -->
+ <dependency>
+ <groupId>com.sun.xml.parsers</groupId>
+ <artifactId>jaxp-ri</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!--
Modified: openejb/trunk/openejb3/examples/webservice-inheritance/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webservice-inheritance/pom.xml?rev=895136&r1=895135&r2=895136&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webservice-inheritance/pom.xml (original)
+++ openejb/trunk/openejb3/examples/webservice-inheritance/pom.xml Sat Jan 2
06:43:09 2010
@@ -69,6 +69,14 @@
<version>3.1.3-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+ <!-- This is required on IBM JDKs (and potentially others) because
saaj-impl depends
+ on Sun's internal copy of Xerces. See AXIS2-4228. -->
+ <dependency>
+ <groupId>com.sun.xml.parsers</groupId>
+ <artifactId>jaxp-ri</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!--
Modified: openejb/trunk/openejb3/examples/webservice-security/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webservice-security/pom.xml?rev=895136&r1=895135&r2=895136&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webservice-security/pom.xml (original)
+++ openejb/trunk/openejb3/examples/webservice-security/pom.xml Sat Jan 2
06:43:09 2010
@@ -63,6 +63,14 @@
<version>4.4</version>
<scope>test</scope>
</dependency>
+ <!-- This is required on IBM JDKs (and potentially others) because
saaj-impl depends
+ on Sun's internal copy of Xerces. See AXIS2-4228. -->
+ <dependency>
+ <groupId>com.sun.xml.parsers</groupId>
+ <artifactId>jaxp-ri</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<defaultGoal>install</defaultGoal>
Added:
openejb/trunk/openejb3/examples/webservice-ws-security/create-keystores.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webservice-ws-security/create-keystores.xml?rev=895136&view=auto
==============================================================================
--- openejb/trunk/openejb3/examples/webservice-ws-security/create-keystores.xml
(added)
+++ openejb/trunk/openejb3/examples/webservice-ws-security/create-keystores.xml
Sat Jan 2 06:43:09 2010
@@ -0,0 +1,180 @@
+<?xml version="1.0"?>
+
+<project default="run" name="create keystores et al" >
+
+ <!-- first create our properties -->
+ <condition property="is.ibm.jdk">
+ <available classname="com.ibm.crypto.tools.KeyTool"/>
+ </condition>
+ <condition property="is.sun.jdk">
+ <available classname="sun.security.tools.KeyTool"/>
+ </condition>
+ <property name="server.alias" value="serveralias"/>
+ <property name="server.keypass" value="serverPassword"/>
+ <property name="server.keystore"
value="${basedir}/target/classes/META-INF/serverStore.jks"/>
+ <property name="server.storepass" value="keystorePass"/>
+ <property name="server.dname" value="'cn=serveralias'"/>
+ <property name="server.file"
value="${basedir}/target/classes/META-INF/serverKey.rsa"/>
+
+ <property name="client.alias" value="clientalias"/>
+ <property name="client.keypass" value="clientPassword"/>
+ <property name="client.keystore"
value="${basedir}/target/test-classes/META-INF/clientStore.jks"/>
+ <property name="client.storepass" value="keystorePass"/>
+ <property name="client.dname" value="'cn=clientalias'"/>
+ <property name="client.file"
value="${basedir}/target/test-classes/META-INF/clientKey.rsa"/>
+
+ <property name="keyalg" value="RSA"/>
+
+ <!-- now create our JDK specific targets -->
+ <target name="do.ibm.jdk" if="is.ibm.jdk">
+ <echo message="*** Running on an IBM JDK ***" />
+ <echo message="generate server keys"/>
+ <java classname="com.ibm.crypto.tools.KeyTool" fork="true">
+ <arg line="-genkey"/>
+ <arg line="-alias ${server.alias}"/>
+ <arg line="-keypass ${server.keypass}"/>
+ <arg line="-keystore ${server.keystore}"/>
+ <arg line="-storepass ${server.storepass}"/>
+ <arg line="-dname ${server.dname}"/>
+ <arg line="-keyalg ${keyalg}"/>
+ </java>
+ <java classname="com.ibm.crypto.tools.KeyTool" fork="true">
+ <arg line="-selfcert"/>
+ <arg line="-alias ${server.alias}"/>
+ <arg line="-keystore ${server.keystore}"/>
+ <arg line="-storepass ${server.storepass}"/>
+ <arg line="-keypass ${server.keypass}"/>
+ </java>
+ <java classname="com.ibm.crypto.tools.KeyTool" fork="true">
+ <arg line="-export"/>
+ <arg line="-alias ${server.alias}"/>
+ <arg line="-file ${server.file}"/>
+ <arg line="-keystore ${server.keystore}"/>
+ <arg line="-storepass ${server.storepass}"/>
+ </java>
+
+ <echo message="generate client keys"/>
+
+ <java classname="com.ibm.crypto.tools.KeyTool" fork="true">
+ <arg line="-genkey"/>
+ <arg line="-alias ${client.alias}"/>
+ <arg line="-keypass ${client.keypass}"/>
+ <arg line="-keystore ${client.keystore}"/>
+ <arg line="-storepass ${client.storepass}"/>
+ <arg line="-dname ${client.dname}"/>
+ <arg line="-keyalg ${keyalg}"/>
+ </java>
+ <java classname="com.ibm.crypto.tools.KeyTool" fork="true">
+ <arg line="-selfcert"/>
+ <arg line="-alias ${client.alias}"/>
+ <arg line="-keystore ${client.keystore}"/>
+ <arg line="-storepass ${client.storepass}"/>
+ <arg line="-keypass ${client.keypass}"/>
+ </java>
+ <java classname="com.ibm.crypto.tools.KeyTool" fork="true">
+ <arg line="-export"/>
+ <arg line="-alias ${client.alias}"/>
+ <arg line="-file ${client.file}"/>
+ <arg line="-keystore ${client.keystore}"/>
+ <arg line="-storepass ${client.storepass}"/>
+ </java>
+
+ <echo message="import client/server public keys in client/server
keystores"/>
+ <java classname="com.ibm.crypto.tools.KeyTool" fork="true">
+ <arg line="-import"/>
+ <arg line="-alias ${server.alias}"/>
+ <arg line="-file ${server.file}"/>
+ <arg line="-keystore ${client.keystore}"/>
+ <arg line="-storepass ${client.storepass}"/>
+ <arg line="-noprompt"/>
+ </java>
+ <java classname="com.ibm.crypto.tools.KeyTool" fork="true">
+ <arg line="-import"/>
+ <arg line="-alias ${client.alias}"/>
+ <arg line="-file ${client.file}"/>
+ <arg line="-keystore ${server.keystore}"/>
+ <arg line="-storepass ${server.storepass}"/>
+ <arg line="-noprompt"/>
+ </java>
+ </target>
+
+ <target name="do.sun.jdk" if="is.sun.jdk">
+ <echo message="*** Running on a Sun JDK ***" />
+ <echo message="generate server keys"/>
+ <java classname="sun.security.tools.KeyTool" fork="true">
+ <arg line="-genkey"/>
+ <arg line="-alias ${server.alias}"/>
+ <arg line="-keypass ${server.keypass}"/>
+ <arg line="-keystore ${server.keystore}"/>
+ <arg line="-storepass ${server.storepass}"/>
+ <arg line="-dname ${server.dname}"/>
+ <arg line="-keyalg ${keyalg}"/>
+ </java>
+ <java classname="sun.security.tools.KeyTool" fork="true">
+ <arg line="-selfcert"/>
+ <arg line="-alias ${server.alias}"/>
+ <arg line="-keystore ${server.keystore}"/>
+ <arg line="-storepass ${server.storepass}"/>
+ <arg line="-keypass ${server.keypass}"/>
+ </java>
+ <java classname="sun.security.tools.KeyTool" fork="true">
+ <arg line="-export"/>
+ <arg line="-alias ${server.alias}"/>
+ <arg line="-file ${server.file}"/>
+ <arg line="-keystore ${server.keystore}"/>
+ <arg line="-storepass ${server.storepass}"/>
+ </java>
+
+ <echo message="generate client keys"/>
+
+ <java classname="sun.security.tools.KeyTool" fork="true">
+ <arg line="-genkey"/>
+ <arg line="-alias ${client.alias}"/>
+ <arg line="-keypass ${client.keypass}"/>
+ <arg line="-keystore ${client.keystore}"/>
+ <arg line="-storepass ${client.storepass}"/>
+ <arg line="-dname ${client.dname}"/>
+ <arg line="-keyalg ${keyalg}"/>
+ </java>
+ <java classname="sun.security.tools.KeyTool" fork="true">
+ <arg line="-selfcert"/>
+ <arg line="-alias ${client.alias}"/>
+ <arg line="-keystore ${client.keystore}"/>
+ <arg line="-storepass ${client.storepass}"/>
+ <arg line="-keypass ${client.keypass}"/>
+ </java>
+ <java classname="sun.security.tools.KeyTool" fork="true">
+ <arg line="-export"/>
+ <arg line="-alias ${client.alias}"/>
+ <arg line="-file ${client.file}"/>
+ <arg line="-keystore ${client.keystore}"/>
+ <arg line="-storepass ${client.storepass}"/>
+ </java>
+
+ <echo message="import client/server public keys in client/server
keystores"/>
+ <java classname="sun.security.tools.KeyTool" fork="true">
+ <arg line="-import"/>
+ <arg line="-alias ${server.alias}"/>
+ <arg line="-file ${server.file}"/>
+ <arg line="-keystore ${client.keystore}"/>
+ <arg line="-storepass ${client.storepass}"/>
+ <arg line="-noprompt"/>
+ </java>
+ <java classname="sun.security.tools.KeyTool" fork="true">
+ <arg line="-import"/>
+ <arg line="-alias ${client.alias}"/>
+ <arg line="-file ${client.file}"/>
+ <arg line="-keystore ${server.keystore}"/>
+ <arg line="-storepass ${server.storepass}"/>
+ <arg line="-noprompt"/>
+ </java>
+ </target>
+
+ <!-- run everything from our main target -->
+ <!-- the other targets will only be run when their properties are true -->
+ <target name="run" depends="do.sun.jdk, do.ibm.jdk">
+ <echo message="Running JDK specific keystore creation target" />
+ </target>
+
+</project>
+
Modified: openejb/trunk/openejb3/examples/webservice-ws-security/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webservice-ws-security/pom.xml?rev=895136&r1=895135&r2=895136&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webservice-ws-security/pom.xml (original)
+++ openejb/trunk/openejb3/examples/webservice-ws-security/pom.xml Sat Jan 2
06:43:09 2010
@@ -123,90 +123,7 @@
</goals>
<configuration>
<tasks name="generate keys">
- <property name="server.alias" value="serveralias"/>
- <property name="server.keypass" value="serverPassword"/>
- <property name="server.keystore"
value="${basedir}/target/classes/META-INF/serverStore.jks"/>
- <property name="server.storepass" value="keystorePass"/>
- <property name="server.dname" value="'cn=serveralias'"/>
- <property name="server.file"
value="${basedir}/target/classes/META-INF/serverKey.rsa"/>
-
- <property name="client.alias" value="clientalias"/>
- <property name="client.keypass" value="clientPassword"/>
- <property name="client.keystore"
value="${basedir}/target/test-classes/META-INF/clientStore.jks"/>
- <property name="client.storepass" value="keystorePass"/>
- <property name="client.dname" value="'cn=clientalias'"/>
- <property name="client.file"
value="${basedir}/target/test-classes/META-INF/clientKey.rsa"/>
-
- <property name="keyalg" value="RSA"/>
-
- <echo message="generate server keys"/>
- <java classname="sun.security.tools.KeyTool" fork="true">
- <arg line="-genkey"/>
- <arg line="-alias ${server.alias}"/>
- <arg line="-keypass ${server.keypass}"/>
- <arg line="-keystore ${server.keystore}"/>
- <arg line="-storepass ${server.storepass}"/>
- <arg line="-dname ${server.dname}"/>
- <arg line="-keyalg ${keyalg}"/>
- </java>
- <java classname="sun.security.tools.KeyTool" fork="true">
- <arg line="-selfcert"/>
- <arg line="-alias ${server.alias}"/>
- <arg line="-keystore ${server.keystore}"/>
- <arg line="-storepass ${server.storepass}"/>
- <arg line="-keypass ${server.keypass}"/>
- </java>
- <java classname="sun.security.tools.KeyTool" fork="true">
- <arg line="-export"/>
- <arg line="-alias ${server.alias}"/>
- <arg line="-file ${server.file}"/>
- <arg line="-keystore ${server.keystore}"/>
- <arg line="-storepass ${server.storepass}"/>
- </java>
-
- <echo message="generate client keys"/>
-
- <java classname="sun.security.tools.KeyTool" fork="true">
- <arg line="-genkey"/>
- <arg line="-alias ${client.alias}"/>
- <arg line="-keypass ${client.keypass}"/>
- <arg line="-keystore ${client.keystore}"/>
- <arg line="-storepass ${client.storepass}"/>
- <arg line="-dname ${client.dname}"/>
- <arg line="-keyalg ${keyalg}"/>
- </java>
- <java classname="sun.security.tools.KeyTool" fork="true">
- <arg line="-selfcert"/>
- <arg line="-alias ${client.alias}"/>
- <arg line="-keystore ${client.keystore}"/>
- <arg line="-storepass ${client.storepass}"/>
- <arg line="-keypass ${client.keypass}"/>
- </java>
- <java classname="sun.security.tools.KeyTool" fork="true">
- <arg line="-export"/>
- <arg line="-alias ${client.alias}"/>
- <arg line="-file ${client.file}"/>
- <arg line="-keystore ${client.keystore}"/>
- <arg line="-storepass ${client.storepass}"/>
- </java>
-
- <echo message="import client/server public keys in
client/server keystores"/>
- <java classname="sun.security.tools.KeyTool" fork="true">
- <arg line="-import"/>
- <arg line="-alias ${server.alias}"/>
- <arg line="-file ${server.file}"/>
- <arg line="-keystore ${client.keystore}"/>
- <arg line="-storepass ${client.storepass}"/>
- <arg line="-noprompt"/>
- </java>
- <java classname="sun.security.tools.KeyTool" fork="true">
- <arg line="-import"/>
- <arg line="-alias ${client.alias}"/>
- <arg line="-file ${client.file}"/>
- <arg line="-keystore ${server.keystore}"/>
- <arg line="-storepass ${server.storepass}"/>
- <arg line="-noprompt"/>
- </java>
+ <ant antfile="create-keystores.xml" target="run"/>
</tasks>
</configuration>
</execution>
Modified: openejb/trunk/openejb3/server/openejb-cxf/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-cxf/pom.xml?rev=895136&r1=895135&r2=895136&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-cxf/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-cxf/pom.xml Sat Jan 2 06:43:09 2010
@@ -251,6 +251,14 @@
<artifactId>xml-resolver</artifactId>
<version>1.2</version>
</dependency>
+ <!-- This is required on IBM JDKs (and potentially others) because
saaj-impl depends
+ on Sun's internal copy of Xerces. See AXIS2-4228. -->
+ <dependency>
+ <groupId>com.sun.xml.parsers</groupId>
+ <artifactId>jaxp-ri</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
