You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2011/02/22 02:16:52 UTC
svn commit: r1073195 - in /geronimo/server/trunk: ./
framework/configs/karaf-framework/src/main/filtered-resources/etc/
plugins/client/client/src/main/history/ plugins/corba/
plugins/corba/geronimo-corba/src/main/java/org/apache/geronimo/corba/util/
pl...
Author: xiaming
Date: Tue Feb 22 01:16:51 2011
New Revision: 1073195
URL: http://svn.apache.org/viewvc?rev=1073195&view=rev
Log:
GERONIMO-5815 still change to use yoko 1.2 snapshot, but add a fix to endorsed package so that UtilLoader in yoko-rmi-spec could be resolved by yoko-rmi-impl bundle
Modified:
geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
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/plugins/openejb/openejb/src/main/history/dependencies.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties?rev=1073195&r1=1073194&r2=1073195&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties Tue Feb 22 01:16:51 2011
@@ -43,6 +43,7 @@ org.osgi.framework.system.packages.extra
sun.reflect, \
org.apache.yoko, \
org.apache.yoko.osgi, \
+ org.apache.yoko.rmispec.util, \
org.apache.karaf.jaas.boot; version=${karaf.osgi.version}, \
org.apache.karaf.version; version=${karaf.osgi.version}, \
org.apache.geronimo.main, \
Modified: geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=1073195&r1=1073194&r2=1073195&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml Tue Feb 22 01:16:51 2011
@@ -298,11 +298,6 @@
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-ee-common</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ejb</artifactId>
<type>jar</type>
</dependency>
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=1073195&r1=1073194&r2=1073195&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 Tue Feb 22 01:16:51 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=1073195&r1=1073194&r2=1073195&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/pom.xml (original)
+++ geronimo/server/trunk/plugins/corba/pom.xml Tue Feb 22 01:16:51 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/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=1073195&r1=1073194&r2=1073195&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml Tue Feb 22 01:16:51 2011
@@ -113,11 +113,6 @@
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-ee-common</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-ejb</artifactId>
<type>jar</type>
</dependency>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1073195&r1=1073194&r2=1073195&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Feb 22 01:16:51 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>