Author: xiaming
Date: Wed Feb 16 13:56:38 2011
New Revision: 1071253
URL: http://svn.apache.org/viewvc?rev=1071253&view=rev
Log:
GERONIMO-5815 upgrade yoko from 1.1 to 1.2-SNAPSHOT and fix a classloading issue in UtilDelegateImpl.java
Modified:
geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/UtilDelegateImpl.java
geronimo/server/trunk/plugins/corba/pom.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/UtilDelegateImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/UtilDelegateImpl.java?rev=1071253&r1=1071252&r2=1071253&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/UtilDelegateImpl.java
(original)
+++ geronimo/server/trunk/plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/UtilDelegateImpl.java
Wed Feb 16 13:56:38 2011
@@ -57,6 +57,7 @@ import org.omg.CORBA.portable.InputStrea
import org.omg.CORBA.portable.OutputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.yoko.osgi.ProviderLocator;
/**
* @version $Revision: 451417 $ $Date: 2006-09-29 13:13:22 -0700 (Fri, 29 Sep 2006) $
@@ -69,6 +70,8 @@ public final class UtilDelegateImpl impl
private static ClassLoader classLoader;
private final static String DELEGATE_NAME = "org.apache.geronimo.corba.UtilDelegateClass";
+
+ private final static String PROVIDERKEY = "javax.rmi.CORBA.UtilClass";
public UtilDelegateImpl() throws ClassNotFoundException, IllegalAccessException, InstantiationException
{
// String value = System.getProperty(DELEGATE_NAME);
@@ -79,6 +82,8 @@ public final class UtilDelegateImpl impl
//
// if (log.isDebugEnabled()) log.debug("Set delegate " + value);
// delegate = (UtilDelegate) Class.forName(value).newInstance();
+ Class clz = ProviderLocator.locate(PROVIDERKEY);
+ UtilDelegateImpl.setDelegateClass(clz);
delegate = delegateClass.newInstance();
}
Modified: geronimo/server/trunk/plugins/corba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/pom.xml?rev=1071253&r1=1071252&r2=1071253&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/pom.xml Wed Feb 16 13:56:38 2011
@@ -69,7 +69,7 @@
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko</artifactId>
- <version>1.1</version>
+ <version>${yokoVersion}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1071253&r1=1071252&r2=1071253&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Feb 16 13:56:38 2011
@@ -88,6 +88,7 @@
<pax.logging.version>1.5.3</pax.logging.version>
<woodstoxVersion>3.2.9_1</woodstoxVersion>
<sxcVersion>0.7.3_1</sxcVersion>
+ <yokoVersion>1.2-SNAPSHOT</yokoVersion>
<!-- Deployers -->
<gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${project.version}/car
@@ -1354,13 +1355,13 @@
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-spec-corba</artifactId>
- <version>1.1</version>
+ <version>${yokoVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-rmi-spec</artifactId>
- <version>1.1</version>
+ <version>${yokoVersion}</version>
</dependency>
<dependency>
@@ -2181,7 +2182,7 @@ only found in cxf
</assembly>
</assemblies>
- <defaultAssemblyId>jetty</defaultAssemblyId>
+ <defaultAssemblyId>tomcat</defaultAssemblyId>
<optionSets>
<optionSet>
|