cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r764049 - in /cxf/branches/2.1.x-fixes: ./ parent/ rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/ rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/ rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runt...
Date Fri, 10 Apr 2009 20:55:34 GMT
Author: dkulp
Date: Fri Apr 10 20:55:34 2009
New Revision: 764049

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

........
  r763854 | dkulp | 2009-04-09 21:20:33 -0400 (Thu, 09 Apr 2009) | 2 lines
  
  Progress toward getting things working with IBM JDK
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/parent/pom.xml
    cxf/branches/2.1.x-fixes/pom.xml
    cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
    cxf/branches/2.1.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
    cxf/branches/2.1.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
    cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 10 20:55:34 2009
@@ -1 +1 @@
-/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495
+/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854

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

Modified: cxf/branches/2.1.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/parent/pom.xml?rev=764049&r1=764048&r2=764049&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/parent/pom.xml Fri Apr 10 20:55:34 2009
@@ -1073,6 +1073,8 @@
             <id>fastinstall</id>
             <properties>
                 <maven.test.skip>true</maven.test.skip>
+                <pmd.skip>true</pmd.skip>
+                <checkstyle.skip>true</checkstyle.skip>
             </properties>
         </profile>
 
@@ -1085,6 +1087,10 @@
 
         <profile>
             <id>nochecks</id>
+            <properties>
+                <pmd.skip>true</pmd.skip>
+                <checkstyle.skip>true</checkstyle.skip>
+            </properties>
         </profile>
 
         <profile>

Modified: cxf/branches/2.1.x-fixes/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/pom.xml?rev=764049&r1=764048&r2=764049&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/pom.xml Fri Apr 10 20:55:34 2009
@@ -426,6 +426,9 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
                     <version>2.3</version>
+                    <configuration>
+                        <encoding>UTF-8</encoding>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

Modified: cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java?rev=764049&r1=764048&r2=764049&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
Fri Apr 10 20:55:34 2009
@@ -96,22 +96,30 @@
     public void prepare(Message message) throws IOException {    
         try {
             prepareOrb();
-            AddressType address = endpointInfo.getExtensor(AddressType.class);
-
+            
+            String address = null;
+            if (target != null) {
+                address = target.getAddress().getValue();
+            }
             if (address == null) {
-                LOG.log(Level.SEVERE, "Unable to locate a valid CORBA address");
-                throw new CorbaBindingException("Unable to locate a valid CORBA address");
+                AddressType ad = endpointInfo.getExtensor(AddressType.class);
+                if (ad != null) {
+                    address = ad.getLocation();
+                }
             }
             String ref = (String)message.get(Message.ENDPOINT_ADDRESS);
-            org.omg.CORBA.Object targetObject;
-            // A non-null endpoint address from the message means that we want to invoke
on a particular
-            // object reference specified by the endpoint reference type.  If the reference
is null, then
-            // we want to invoke on the default location as specified in the WSDL.
             if (ref != null) {
-                targetObject = CorbaUtils.importObjectReference(orb, ref);
-            } else {
-                targetObject = CorbaUtils.importObjectReference(orb, address.getLocation());
+                // A non-null endpoint address from the message means that we want to invoke
on a particular
+                // object reference specified by the endpoint reference type.  If the reference
is null, then
+                // we want to invoke on the default location as specified in the WSDL.
+                address = ref;
+            }
+            if (address == null) {
+                LOG.log(Level.SEVERE, "Unable to locate a valid CORBA address");
+                throw new CorbaBindingException("Unable to locate a valid CORBA address");
             }
+            org.omg.CORBA.Object targetObject;
+            targetObject = CorbaUtils.importObjectReference(orb, address);
             message.put(CorbaConstants.ORB, orb);
             message.put(CorbaConstants.CORBA_ENDPOINT_OBJECT, targetObject);
             message.setContent(OutputStream.class,

Modified: cxf/branches/2.1.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java?rev=764049&r1=764048&r2=764049&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/CorbaConduitTest.java
Fri Apr 10 20:55:34 2009
@@ -113,6 +113,13 @@
                          "SimpleCORBAPort");
 
         CorbaDestination destination = new CorbaDestination(endpointInfo, orbConfig);
+        
+        if (System.getProperty("java.vendor").contains("IBM")) {
+            //IBM requires it to activate to resolve it, but cannot
+            //activate on sun without more config
+            destination.activate();
+        }
+
         CorbaConduit conduit = new CorbaConduit(endpointInfo, destination.getAddress(), orbConfig);
         CorbaMessage message = new CorbaMessage(new MessageImpl());
         try {

Modified: cxf/branches/2.1.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java?rev=764049&r1=764048&r2=764049&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/bindings/corba/src/test/java/org/apache/cxf/binding/corba/runtime/CorbaObjectReaderTest.java
Fri Apr 10 20:55:34 2009
@@ -484,6 +484,11 @@
     
     @Test
     public void testReadFixed() {
+        if (System.getProperty("java.vendor").contains("IBM")) {
+            //The ORB in the IBM jdk doesn't support writing fixed
+            //to the stream.
+            return;
+        }
         OutputStream oStream = orb.create_output_stream();
         
         // create the following fixed

Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java?rev=764049&r1=764048&r2=764049&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
(original)
+++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
Fri Apr 10 20:55:34 2009
@@ -59,6 +59,11 @@
     }
 
     public boolean shouldRunTest(String name) {
+        if (System.getProperty("java.vendor").contains("IBM")
+            && "GMonth".equals(name)) {
+            //the validator in ibm doesn't like this type.
+            return false;
+        }
         return true;
     }
     



Mime
View raw message