cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r647277 - in /incubator/cxf/branches/2.0.x-fixes: ./ distribution/bundle/ 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/ ...
Date Fri, 11 Apr 2008 19:36:10 GMT
Author: dkulp
Date: Fri Apr 11 12:36:01 2008
New Revision: 647277

URL: http://svn.apache.org/viewvc?rev=647277&view=rev
Log:
Merged revisions 646922 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r646922 | dkulp | 2008-04-10 14:51:58 -0400 (Thu, 10 Apr 2008) | 3 lines
  
  Update various versions of things
  Change the poms to point to real versions of xmlbeans/etc... to avoid the relocation warnings
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml
    incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
    incubator/cxf/branches/2.0.x-fixes/rt/frontend/js/pom.xml
    incubator/cxf/branches/2.0.x-fixes/rt/ws/security/pom.xml
    incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
    incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
    incubator/cxf/branches/2.0.x-fixes/systests/pom.xml

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml?rev=647277&r1=647276&r2=647277&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/bundle/pom.xml Fri Apr 11 12:36:01 2008
@@ -237,6 +237,7 @@
                             junit.framework*;resolution:=optional,
                             org.apache.commons.lang*;resolution:=optional,
                             org.apache.log4j*;resolution:=optional,
+                            org.apache.tools.ant*;resolution:=optional,
                             org.apache.velocity*;resolution:=optional,
                             org.apache.xmlbeans*;resolution:=optional,
                             org.apache.ws.security*;resolution:=optional,

Modified: incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/parent/pom.xml?rev=647277&r1=647276&r2=647277&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/parent/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/parent/pom.xml Fri Apr 11 12:36:01 2008
@@ -47,7 +47,7 @@
         <jaxb.impl.version>2.0.5</jaxb.impl.version>
         <jaxb.xjc.version>2.0</jaxb.xjc.version>
         <jaxws.version>2.0</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>
@@ -57,7 +57,7 @@
         <activemq.version>4.1.1</activemq.version>
         <rhino.version>1.6R5</rhino.version>
         <jdom.version>1.0</jdom.version>
-        <xmlbeans.version>2.2.0</xmlbeans.version>
+        <xmlbeans.version>2.3.0</xmlbeans.version>
 
         <spring.validation.mode>VALIDATION_AUTO</spring.validation.mode>
 
@@ -725,12 +725,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>
@@ -779,8 +779,8 @@
                 <version>${rhino.version}</version>
             </dependency>
             <dependency>
-                <groupId>xmlbeans</groupId>
-                <artifactId>xbean</artifactId>
+                <groupId>org.apache.xmlbeans</groupId>
+                <artifactId>xmlbeans</artifactId>
                 <version>${xmlbeans.version}</version>
             </dependency>
             <dependency>

Modified: incubator/cxf/branches/2.0.x-fixes/rt/frontend/js/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/js/pom.xml?rev=647277&r1=647276&r2=647277&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/frontend/js/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/js/pom.xml Fri Apr 11 12:36:01 2008
@@ -38,8 +38,8 @@
             <artifactId>js</artifactId>
         </dependency>
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
+            <groupId>org.apache.xmlbeans</groupId>
+            <artifactId>xmlbeans</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>

Modified: incubator/cxf/branches/2.0.x-fixes/rt/ws/security/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/ws/security/pom.xml?rev=647277&r1=647276&r2=647277&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/ws/security/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/ws/security/pom.xml Fri Apr 11 12:36:01 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/branches/2.0.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java?rev=647277&r1=647276&r2=647277&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/WSS4JInInterceptor.java
Fri Apr 11 12:36:01 2008
@@ -179,7 +179,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");
@@ -201,7 +202,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");
@@ -309,7 +310,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/branches/2.0.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java?rev=647277&r1=647276&r2=647277&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
Fri Apr 11 12:36:01 2008
@@ -134,7 +134,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);
     }
     
@@ -198,7 +199,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/branches/2.0.x-fixes/systests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/pom.xml?rev=647277&r1=647276&r2=647277&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/pom.xml Fri Apr 11 12:36:01 2008
@@ -385,8 +385,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
+            <groupId>org.apache.xmlbeans</groupId>
+            <artifactId>xmlbeans</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>



Mime
View raw message