geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1156403 - in /geronimo/yoko/trunk: yoko-core/pom.xml yoko-core/src/test/java/org/apache/yoko/AbstractOrbTestBase.java yoko-rmi-spec/src/main/java/org/apache/yoko/rmispec/util/UtilLoader.java
Date Wed, 10 Aug 2011 23:47:50 GMT
Author: djencks
Date: Wed Aug 10 23:47:50 2011
New Revision: 1156403

URL: http://svn.apache.org/viewvc?rev=1156403&view=rev
Log:
YOKO-436 fix the tests after requiring use of yoko-rmi-impl since sun orb is too broken

Modified:
    geronimo/yoko/trunk/yoko-core/pom.xml
    geronimo/yoko/trunk/yoko-core/src/test/java/org/apache/yoko/AbstractOrbTestBase.java
    geronimo/yoko/trunk/yoko-rmi-spec/src/main/java/org/apache/yoko/rmispec/util/UtilLoader.java

Modified: geronimo/yoko/trunk/yoko-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/yoko-core/pom.xml?rev=1156403&r1=1156402&r2=1156403&view=diff
==============================================================================
--- geronimo/yoko/trunk/yoko-core/pom.xml (original)
+++ geronimo/yoko/trunk/yoko-core/pom.xml Wed Aug 10 23:47:50 2011
@@ -42,6 +42,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.yoko</groupId>
+            <artifactId>yoko-rmi-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.yoko</groupId>
             <artifactId>yoko-osgi</artifactId>
         </dependency>
         <dependency>
@@ -72,6 +77,13 @@
                                     <overWrite>true</overWrite>
                                     <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
                                 </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.apache.yoko</groupId>
+                                    <artifactId>yoko-rmi-spec</artifactId>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+                                </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>

Modified: geronimo/yoko/trunk/yoko-core/src/test/java/org/apache/yoko/AbstractOrbTestBase.java
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/yoko-core/src/test/java/org/apache/yoko/AbstractOrbTestBase.java?rev=1156403&r1=1156402&r2=1156403&view=diff
==============================================================================
--- geronimo/yoko/trunk/yoko-core/src/test/java/org/apache/yoko/AbstractOrbTestBase.java (original)
+++ geronimo/yoko/trunk/yoko-core/src/test/java/org/apache/yoko/AbstractOrbTestBase.java Wed
Aug 10 23:47:50 2011
@@ -94,7 +94,7 @@ public class AbstractOrbTestBase extends
         // and is somewhat non-robust.
         Thread.sleep(1000);
         client.invokeMain(clientClass, clientArgs);
-        serverThread.join();
+        serverThread.join(10000);
         server.exit(0);
                 
     }

Modified: geronimo/yoko/trunk/yoko-rmi-spec/src/main/java/org/apache/yoko/rmispec/util/UtilLoader.java
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/yoko-rmi-spec/src/main/java/org/apache/yoko/rmispec/util/UtilLoader.java?rev=1156403&r1=1156402&r2=1156403&view=diff
==============================================================================
--- geronimo/yoko/trunk/yoko-rmi-spec/src/main/java/org/apache/yoko/rmispec/util/UtilLoader.java
(original)
+++ geronimo/yoko/trunk/yoko-rmi-spec/src/main/java/org/apache/yoko/rmispec/util/UtilLoader.java
Wed Aug 10 23:47:50 2011
@@ -40,7 +40,10 @@ public class UtilLoader {
     static public Class<?> loadServiceClass(String delegateName, String delegateKey)
throws ClassNotFoundException {
     	
     	try {
-    		return ProviderLocator.getServiceClass(delegateKey, null, null);
+    		Class<?> cls = ProviderLocator.getServiceClass(delegateKey, null, null);
+            if (cls != null) {
+                return cls;
+            }
     	} catch (ClassNotFoundException e){
     		// skip
     	}



Mime
View raw message