cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r646922 - in /incubator/cxf/trunk: ./ parent/ rt/frontend/js/ rt/ws/security/ rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/ rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/ systests/
Date Thu, 10 Apr 2008 18:52:00 GMT
Author: dkulp
Date: Thu Apr 10 11:51:58 2008
New Revision: 646922

URL: http://svn.apache.org/viewvc?rev=646922&view=rev
Log:
Update various versions of things
Change the poms to point to real versions of xmlbeans/etc... to avoid the relocation warnings

Modified:
    incubator/cxf/trunk/parent/pom.xml
    incubator/cxf/trunk/pom.xml
    incubator/cxf/trunk/rt/frontend/js/pom.xml
    incubator/cxf/trunk/rt/ws/security/pom.xml
    incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
    incubator/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
    incubator/cxf/trunk/systests/pom.xml

Modified: incubator/cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/parent/pom.xml?rev=646922&r1=646921&r2=646922&view=diff
==============================================================================
--- incubator/cxf/trunk/parent/pom.xml (original)
+++ incubator/cxf/trunk/parent/pom.xml Thu Apr 10 11:51:58 2008
@@ -47,7 +47,7 @@
         <jaxb.impl.version>2.1.6</jaxb.impl.version>
         <jaxb.xjc.version>2.1.6</jaxb.xjc.version>
         <jaxws.version>2.1-1</jaxws.version>
-        <jetty.version>6.1.8</jetty.version>
+        <jetty.version>6.1.9</jetty.version>
         <saaj.version>1.3</saaj.version>
         <saaj.impl.version>1.3</saaj.impl.version>
         <spring.version>2.0.8</spring.version>
@@ -810,12 +810,12 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                <version>1.1.2</version>
+                <version>1.2</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-javamail_1.4_spec</artifactId>
-                <version>1.2</version>
+                <version>1.3</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
@@ -864,7 +864,7 @@
                 <version>${rhino.version}</version>
             </dependency>
             <dependency>
-                <groupId>xmlbeans</groupId>
+                <groupId>org.apache.xmlbeans</groupId>
                 <artifactId>xmlbeans</artifactId>
                 <version>${xmlbeans.version}</version>
             </dependency>

Modified: incubator/cxf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/pom.xml?rev=646922&r1=646921&r2=646922&view=diff
==============================================================================
--- incubator/cxf/trunk/pom.xml (original)
+++ incubator/cxf/trunk/pom.xml Thu Apr 10 11:51:58 2008
@@ -443,7 +443,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-eclipse-plugin</artifactId>
-                    <version>2.5</version>
+                    <version>2.5.1</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.apache.cxf</groupId>

Modified: incubator/cxf/trunk/rt/frontend/js/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/js/pom.xml?rev=646922&r1=646921&r2=646922&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/js/pom.xml (original)
+++ incubator/cxf/trunk/rt/frontend/js/pom.xml Thu Apr 10 11:51:58 2008
@@ -38,7 +38,7 @@
             <artifactId>js</artifactId>
         </dependency>
         <dependency>
-            <groupId>xmlbeans</groupId>
+            <groupId>org.apache.xmlbeans</groupId>
             <artifactId>xmlbeans</artifactId>
         </dependency>
         <dependency>

Modified: incubator/cxf/trunk/rt/ws/security/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/security/pom.xml?rev=646922&r1=646921&r2=646922&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/ws/security/pom.xml (original)
+++ incubator/cxf/trunk/rt/ws/security/pom.xml Thu Apr 10 11:51:58 2008
@@ -58,9 +58,9 @@
             <artifactId>saaj-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>wss4j</groupId>
+            <groupId>org.apache.ws.security</groupId>
             <artifactId>wss4j</artifactId>
-            <version>1.5.1</version>
+            <version>1.5.2</version>
         </dependency>
         <dependency>
             <groupId>xml-security</groupId>

Modified: incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=646922&r1=646921&r2=646922&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
(original)
+++ incubator/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
Thu Apr 10 11:51:58 2008
@@ -180,7 +180,8 @@
                 .fetchActionResult(wsResult, WSConstants.SIGN);
 
             if (actionResult != null) {
-                X509Certificate returnCert = actionResult.getCertificate();
+                X509Certificate returnCert = (X509Certificate)actionResult
+                    .get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
 
                 if (returnCert != null && !verifyTrust(returnCert, reqData)) {
                     LOG.warning("The certificate used for the signature is not trusted");
@@ -202,7 +203,7 @@
             actionResult = WSSecurityUtil.fetchActionResult(wsResult, WSConstants.TS);
 
             if (actionResult != null) {
-                Timestamp timestamp = actionResult.getTimestamp();
+                Timestamp timestamp = (Timestamp)actionResult.get(WSSecurityEngineResult.TAG_TIMESTAMP);
 
                 if (timestamp != null && !verifyTimestamp(timestamp, decodeTimeToLive(reqData)))
{
                     LOG.warning("The timestamp could not be validated");
@@ -310,7 +311,9 @@
         // broken checkReceiverResults method in WSS4J.
         //
         for (int i = 0; i < wsResult.size(); i++) {
-            if (((WSSecurityEngineResult) wsResult.get(i)).getAction() == WSConstants.SC)
{
+            Integer action = (Integer)((WSSecurityEngineResult)wsResult.get(i))
+                .get(WSSecurityEngineResult.TAG_ACTION);
+            if (action != null && action.intValue() == WSConstants.SC) {
                 wsResult.remove(i);
             }
         }

Modified: incubator/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java?rev=646922&r1=646921&r2=646922&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
(original)
+++ incubator/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
Thu Apr 10 11:51:58 2008
@@ -136,7 +136,8 @@
         WSSecurityEngineResult result = 
             (WSSecurityEngineResult) inmsg.get(WSS4JInInterceptor.SIGNATURE_RESULT);
         assertNotNull(result);
-        X509Certificate certificate = result.getCertificate();
+        X509Certificate certificate = (X509Certificate)result
+            .get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
         assertNotNull(certificate);
     }
     
@@ -201,7 +202,8 @@
         WSSecurityEngineResult result = 
             (WSSecurityEngineResult) inmsg.get(WSS4JInInterceptor.SIGNATURE_RESULT);
         assertNotNull(result);
-        X509Certificate certificate = result.getCertificate();
+        X509Certificate certificate = (X509Certificate)result
+            .get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
         assertNotNull(certificate);
     }
 

Modified: incubator/cxf/trunk/systests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/pom.xml?rev=646922&r1=646921&r2=646922&view=diff
==============================================================================
--- incubator/cxf/trunk/systests/pom.xml (original)
+++ incubator/cxf/trunk/systests/pom.xml Thu Apr 10 11:51:58 2008
@@ -312,13 +312,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>aspectj</groupId>
+            <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
             <version>1.5.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>aspectj</groupId>
+            <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
             <version>1.5.4</version>
             <scope>test</scope>
@@ -401,7 +401,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>xmlbeans</groupId>
+            <groupId>org.apache.xmlbeans</groupId>
             <artifactId>xmlbeans</artifactId>
             <scope>test</scope>
         </dependency>



Mime
View raw message