svn commit: r1612072 - in /axis/axis2/java/rampart/trunk: ./ apidocs/ code-coverage/ modules/distribution/ modules/rampart-samples/
Author: veithen Date: Sun Jul 20 10:13:28 2014 New Revision: 1612072 URL: http://svn.apache.org/r1612072 Log: Set svn:ignore. Modified: axis/axis2/java/rampart/trunk/ (props changed) axis/axis2/java/rampart/trunk/apidocs/ (props changed) axis/axis2/java/rampart/trunk/code-coverage/ (props changed) axis/axis2/java/rampart/trunk/modules/distribution/ (props changed) axis/axis2/java/rampart/trunk/modules/rampart-samples/ (props changed) Propchange: axis/axis2/java/rampart/trunk/ -- --- svn:ignore (original) +++ svn:ignore Sun Jul 20 10:13:28 2014 @@ -1 +1,3 @@ +.project +.settings target Propchange: axis/axis2/java/rampart/trunk/apidocs/ -- --- svn:ignore (original) +++ svn:ignore Sun Jul 20 10:13:28 2014 @@ -1 +1,3 @@ +.project +.settings target Propchange: axis/axis2/java/rampart/trunk/code-coverage/ -- --- svn:ignore (original) +++ svn:ignore Sun Jul 20 10:13:28 2014 @@ -1 +1,3 @@ +.project +.settings target Propchange: axis/axis2/java/rampart/trunk/modules/distribution/ -- --- svn:ignore (original) +++ svn:ignore Sun Jul 20 10:13:28 2014 @@ -1 +1,3 @@ +.project +.settings target Propchange: axis/axis2/java/rampart/trunk/modules/rampart-samples/ -- --- svn:ignore (added) +++ svn:ignore Sun Jul 20 10:13:28 2014 @@ -0,0 +1,4 @@ +.classpath +.project +.settings +target
svn commit: r1612073 - in /axis/axis2/java/rampart/trunk: ./ modules/rampart-integration/ modules/rampart-integration/src/main/java/org/apache/axis2/integration/ modules/rampart-integration/src/main/j
Author: veithen
Date: Sun Jul 20 10:56:50 2014
New Revision: 1612073
URL: http://svn.apache.org/r1612073
Log:
RAMPART-416: Applied Detelin Yordanov's patch to enable Rampart transport
binding integration tests.
Added:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/JettyServer.java
(with props)
Removed:
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/UtilServer.java
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/UtilServerBasedTestCase.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/rahas/TestClient.java
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/conf/axis2.xml
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/log4j.properties
axis/axis2/java/rampart/trunk/pom.xml
Modified: axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml?rev=1612073&r1=1612072&r2=1612073&view=diff
==
--- axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-integration/pom.xml Sun Jul
20 10:56:50 2014
@@ -376,6 +376,83 @@
+
+maven-clean-plugin
+
+
+
+generate-test-resources
+
+clean
+
+
+
true
+
+
+
${project.build.directory}/test-resources/jetty
+
+server.jks
+server.cer
+client.jks
+
+
+
+
+
+
+
+
+org.codehaus.mojo
+keytool-maven-plugin
+1.5
+
+
+generate-key-pair
+generate-test-resources
+
+generateKeyPair
+
+
+server
+cn=localhost,o=OASIS
+RSA
+password
+
${project.build.directory}/test-resources/jetty/server.jks
+password
+
+
+
+export-certificate
+generate-test-resources
+
+exportCertificate
+
+
+server
+
${project.build.directory}/test-resources/jetty/server.cer
+
${project.build.directory}/test-resources/jetty/server.jks
+password
+
+
+
+import-certificate
+generate-test-resources
+
+importCertificate
+
+
+server
+
${project.build.directory}/test-resources/jetty/server.cer
+
${project.build.directory}/test-resources/jetty/client.jks
+password
+true
+
+
+
+
+
+
+javax.servlet
+servlet-api
+
+
org.apache.rampart
rampart-trust
${project.version}
+
+
+
+javax.servlet
+servlet-api
+
+
org.apache.rampart
rampart-core
${project.version}
+
+
+
+javax.servlet
+
svn commit: r1612138 - /axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rahas/SimpleTokenStoreTest.java
Author: veithen
Date: Sun Jul 20 18:08:22 2014
New Revision: 1612138
URL: http://svn.apache.org/r1612138
Log:
Prevent SimpleTokenStoreTest from writing a file into the root directory of the
Maven module.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rahas/SimpleTokenStoreTest.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rahas/SimpleTokenStoreTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rahas/SimpleTokenStoreTest.java?rev=1612138&r1=1612137&r2=1612138&view=diff
==
---
axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rahas/SimpleTokenStoreTest.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rahas/SimpleTokenStoreTest.java
Sun Jul 20 18:08:22 2014
@@ -23,9 +23,8 @@ import org.apache.axiom.om.OMNamespace;
import junit.framework.TestCase;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.Date;
@@ -156,7 +155,6 @@ public class SimpleTokenStoreTest extend
public void testSerialize()
throws Exception {
-String fileName = "test.ser";
OMFactory factory = OMAbstractFactory.getOMFactory();
OMNamespace ns1 = factory.createOMNamespace("bar", "x");
@@ -167,30 +165,13 @@ public class SimpleTokenStoreTest extend
SimpleTokenStore store = new SimpleTokenStore();
store.add(t);
-FileOutputStream fos = null;
-ObjectOutputStream out = null;
+ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ObjectOutputStream out = new ObjectOutputStream(baos);
-try {
-fos = new FileOutputStream(fileName);
-out = new ObjectOutputStream(fos);
-out.writeObject(store);
-} finally {
-out.close();
-}
-
-SimpleTokenStore store2 = null;
-FileInputStream fis = null;
-ObjectInputStream in = null;
-try {
-fis = new FileInputStream(fileName);
-in = new ObjectInputStream(fis);
-store2 = (SimpleTokenStore)in.readObject();
-in.close();
-} catch (IOException ex) {
-ex.printStackTrace();
-} catch (ClassNotFoundException ex) {
-ex.printStackTrace();
-}
+out.writeObject(store);
+
+ObjectInputStream in = new ObjectInputStream(new
ByteArrayInputStream(baos.toByteArray()));
+SimpleTokenStore store2 = (SimpleTokenStore)in.readObject();
assertEquals(store.getToken("#1232122").getId(),
store2.getToken("#1232122").getId());
assertEquals(store.getToken("#1232122").getCreated(),
store2.getToken("#1232122").getCreated());
