Repository: cxf
Updated Branches:
  refs/heads/master-java9 5e068d215 -> 746cd3c0b


[CXF-7054]CORBADocLitClientTypeTest failed with java9(with Grzegorz Grzybek's 
help)


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/746cd3c0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/746cd3c0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/746cd3c0

Branch: refs/heads/master-java9
Commit: 746cd3c0b850702e5b3601d18ce81652a1f3441f
Parents: 5e068d2
Author: Freeman Fang <freeman.f...@gmail.com>
Authored: Mon Sep 19 11:07:54 2016 +0800
Committer: Freeman Fang <freeman.f...@gmail.com>
Committed: Mon Sep 19 11:07:54 2016 +0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/cxf/common/util/ASMHelper.java | 8 ++++++++
 systests/uncategorized/pom.xml                              | 9 ++++-----
 .../java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java | 1 +
 3 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/746cd3c0/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java 
b/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
index 7e64216..2287625 100644
--- a/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
+++ b/core/src/main/java/org/apache/cxf/common/util/ASMHelper.java
@@ -372,6 +372,14 @@ public class ASMHelper {
         public Class<?> lookupDefinedClass(String name) {
             return defined.get(name.replace('/', '.'));
         }
+
+        @Override
+        protected Class<?> findClass(String name) throws 
ClassNotFoundException {
+            if (name.endsWith("package-info")) {
+                return getParent().loadClass(name);
+            }
+            return super.findClass(name);
+        }
         
         public Class<?> defineClass(String name, byte bytes[]) {
             Class<?> ret = defined.get(name.replace('/', '.'));

http://git-wip-us.apache.org/repos/asf/cxf/blob/746cd3c0/systests/uncategorized/pom.xml
----------------------------------------------------------------------
diff --git a/systests/uncategorized/pom.xml b/systests/uncategorized/pom.xml
index e5a8380..e024d81 100644
--- a/systests/uncategorized/pom.xml
+++ b/systests/uncategorized/pom.xml
@@ -457,6 +457,9 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
+                            <systemPropertyVariables>
+                                
<org.omg.CORBA.ORBClass>com.sun.corba.se.impl.orb.ORBImpl</org.omg.CORBA.ORBClass>
+                            </systemPropertyVariables>
                             <argLine>
                                 ${cxf.surefire.fork.vmargs}
                                 --patch-module java.corba=target/java9-jacorb
@@ -467,17 +470,13 @@
                                 
--add-exports=java.corba/org.omg.GIOP=ALL-UNNAMED
                                 
--add-exports=java.corba/org.omg.PortableGroup=ALL-UNNAMED
                                 
--add-exports=java.corba/org.omg.SSLIOP=ALL-UNNAMED
+                                
--add-exports=java.corba/com.sun.corba.se.spi.orb=ALL-UNNAMED
                             </argLine>
                             <includes>
                                 <include>**/*Test.java</include>
                                 <include>**/*TestCase.java</include>
                                 <include>**/*TestCases.java</include>
                             </includes>
-                            <excludes>
-                                <exclude>**/*$*</exclude>
-                                <exclude>**/*CorbaTimeoutTest.java</exclude>
-                                
<exclude>**/*CORBADocLitClientTypeTest.java</exclude>
-                            </excludes>
                         </configuration>
                     </plugin>
                 </plugins>

http://git-wip-us.apache.org/repos/asf/cxf/blob/746cd3c0/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
----------------------------------------------------------------------
diff --git 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
index 55ad459..9142963 100644
--- 
a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
+++ 
b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java
@@ -88,6 +88,7 @@ public class CorbaTimeoutTest extends 
AbstractBusClientServerTestBase {
         } finally {
             System.getProperties().remove("org.omg.CORBA.ORBClass");
             System.getProperties().remove("org.omg.CORBA.ORBSingletonClass");
+            System.setProperty("org.omg.CORBA.ORBClass", 
"com.sun.corba.se.impl.orb.ORBImpl");
         }
     }
 

Reply via email to