[axis-axis2-java-rampart] 03/14: Merge latest changes from trunk.

[billblough]

This is an automated email from the ASF dual-hosted git repository.

billblough pushed a commit to branch RAMPART-426
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git

commit 98737e4b2ee72441decd37a48bac58ab495db8a7
Merge: 48a0422 4b70d3b
Author: Andreas Veithen <veit...@apache.org>
AuthorDate: Sat Jan 28 16:09:03 2017 +0000

    Merge latest changes from trunk.

 modules/rampart-integration/pom.xml                |  90 +-----
 .../org/apache/axis2/integration/JettyServer.java  | 328 +++++++++++----------
 .../apache/axis2/integration/TestConstants.java    |  25 ++
 .../src/main/java/org/apache/rahas/TestClient.java |  29 +-
 .../rahas/RahasSAML2TokenCertForHoKTest.java       |   6 +-
 .../java/org/apache/rahas/RahasSAML2TokenTest.java |  10 +-
 .../rahas/RahasSAML2TokenUTForBearerTest.java      |   9 +-
 .../apache/rahas/RahasSAMLTokenAttributeTest.java  |   7 +-
 .../apache/rahas/RahasSAMLTokenCertForHoKTest.java |   8 +-
 .../rahas/RahasSAMLTokenCertForHoKV1205Test.java   |   8 +-
 .../java/org/apache/rahas/RahasSAMLTokenTest.java  |  11 +-
 .../rahas/RahasSAMLTokenUTForBearerTest.java       |   9 +-
 .../rahas/RahasSAMLTokenUTForBearerV1205Test.java  |  10 +-
 .../apache/rahas/RahasSAMLTokenUTForHoKTest.java   |   7 +-
 .../rahas/RahasSAMLTokenUTForHoKV1205Test.java     |   9 +-
 .../org/apache/rahas/RahasSAMLTokenV1205Test.java  |  10 +-
 .../test/java/org/apache/rampart/RampartTest.java  |  93 ++----
 17 files changed, 275 insertions(+), 394 deletions(-)

diff --cc 
modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
index 923595a,064d197..e0aec1d
--- 
a/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
+++ 
b/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
@@@ -16,12 -16,10 +16,11 @@@
  
  package org.apache.rampart;
  
- import static org.apache.axis2.integration.JettyServer.getHttpPort;
- import static org.apache.axis2.integration.JettyServer.getHttpsPort;
- import static org.apache.axis2.integration.JettyServer.CLIENT_KEYSTORE;
- import static org.apache.axis2.integration.JettyServer.KEYSTORE_PASSWORD;
+ import static org.apache.axis2.integration.TestConstants.TESTING_PATH;
+ import static org.junit.Assert.assertEquals;
++import static org.junit.Assert.assertNotNull;
+ import static org.junit.Assert.fail;
  
- import junit.framework.TestCase;
  import org.apache.axiom.om.OMAbstractFactory;
  import org.apache.axiom.om.OMElement;
  import org.apache.axiom.om.OMFactory;