You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/09/30 19:37:34 UTC
svn commit: r451628 - in /geronimo/server/trunk:
applications/magicGball/magicGball-ear/src/main/plan/
modules/geronimo-axis/src/test/java/org/apache/geronimo/axis/
modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/
modu...
Author: djencks
Date: Sat Sep 30 10:37:33 2006
New Revision: 451628
URL: http://svn.apache.org/viewvc?view=rev&rev=451628
Log:
GERONIMO-2441 some additional changes org.openejb>> org.apache.openejb
Modified:
geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-nosec-plan.xml
geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-plan.xml
geronimo/server/trunk/modules/geronimo-axis/src/test/java/org/apache/geronimo/axis/AxisWebServiceContainerTest.java
geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java
geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/ejb_pkgen_1.xml
Modified: geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-nosec-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-nosec-plan.xml?view=diff&rev=451628&r1=451627&r2=451628
==============================================================================
--- geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-nosec-plan.xml (original)
+++ geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-nosec-plan.xml Sat Sep 30 10:37:33 2006
@@ -39,7 +39,7 @@
<tss-link>IdentityTokenNoSecurity </tss-link>
</session>
</enterprise-beans>
- <gbean name="IdentityTokenNoSecurity" class="org.openejb.corba.TSSBean">
+ <gbean name="IdentityTokenNoSecurity" class="org.apache.openejb.corba.TSSBean">
<attribute name="POAName">IdentityTokenNoSecurity</attribute>
<reference name="Server">
<name>UnprotectedServer</name>
@@ -112,14 +112,14 @@
</ejb-ref>
<realm-name>client-properties-realm</realm-name>
<callback-handler>org.acme.MagicGBallCallbackHandler</callback-handler>
- <gbean name="NoSecurity" class="org.openejb.corba.CSSBean">
+ <gbean name="NoSecurity" class="org.apache.openejb.corba.CSSBean">
<reference name="ThreadPool">
<name>DefaultThreadPool</name>
</reference>
<reference name="TransactionContextManager">
<name>TransactionContextManager</name>
</reference>
- <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
+ <attribute name="configAdapter">org.apache.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
<attribute name="description">NoSecurity</attribute>
<attribute name="cssArgs"></attribute>
<xml-attribute name="cssConfig">
Modified: geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-plan.xml?view=diff&rev=451628&r1=451627&r2=451628
==============================================================================
--- geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-plan.xml (original)
+++ geronimo/server/trunk/applications/magicGball/magicGball-ear/src/main/plan/magicgball-corba-plan.xml Sat Sep 30 10:37:33 2006
@@ -40,7 +40,7 @@
<tss-link>SSLClientPassword</tss-link>
</session>
</enterprise-beans>
- <gbean name="SSLClientPassword" class="org.openejb.corba.TSSBean">
+ <gbean name="SSLClientPassword" class="org.apache.openejb.corba.TSSBean">
<attribute name="POAName">SSLClientPassword</attribute>
<reference name="Server">
<name>Server</name>
@@ -114,14 +114,14 @@
</ejb-ref>
<realm-name>client-properties-realm</realm-name>
<callback-handler>org.acme.MagicGBallCallbackHandler</callback-handler>
- <gbean name="SSLClientPassword" class="org.openejb.corba.CSSBean">
+ <gbean name="SSLClientPassword" class="org.apache.openejb.corba.CSSBean">
<reference name="ThreadPool">
<name>DefaultThreadPool</name>
</reference>
<reference name="TransactionContextManager">
<name>TransactionContextManager</name>
</reference>
- <attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
+ <attribute name="configAdapter">org.apache.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
<attribute name="description">SSLClientPassword</attribute>
<xml-attribute name="nssConfig">
<css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
Modified: geronimo/server/trunk/modules/geronimo-axis/src/test/java/org/apache/geronimo/axis/AxisWebServiceContainerTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis/src/test/java/org/apache/geronimo/axis/AxisWebServiceContainerTest.java?view=diff&rev=451628&r1=451627&r2=451628
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis/src/test/java/org/apache/geronimo/axis/AxisWebServiceContainerTest.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis/src/test/java/org/apache/geronimo/axis/AxisWebServiceContainerTest.java Sat Sep 30 10:37:33 2006
@@ -43,8 +43,6 @@
import org.apache.geronimo.axis.testData.echosample.EchoBean;
import org.apache.geronimo.webservices.WebServiceContainer;
-//import org.openejb.deployment.OpenEJBModuleBuilder;
-
/**
*
* @version $Rev$ $Date$
Modified: geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java?view=diff&rev=451628&r1=451627&r2=451628
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java (original)
+++ geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java Sat Sep 30 10:37:33 2006
@@ -52,7 +52,7 @@
//todo: need an EAR configurer
} else if(dObj.getType().equals(ModuleType.EJB)) {
try {
- Class cls = Class.forName("org.openejb.deployment.EJBConfigurer");
+ Class cls = Class.forName("org.apache.openejb.deployment.EJBConfigurer");
return (DeploymentConfiguration)cls.getMethod("createConfiguration", new Class[]{DeployableObject.class}).invoke(cls.newInstance(), new Object[]{dObj});
} catch (Exception e) {
log.error("Unable to invoke EJB deployer", e);
Modified: geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java?view=diff&rev=451628&r1=451627&r2=451628
==============================================================================
--- geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java (original)
+++ geronimo/server/trunk/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java Sat Sep 30 10:37:33 2006
@@ -285,7 +285,7 @@
//todo: need an EAR configurer
} else if(dObj.getType().equals(ModuleType.EJB)) {
try {
- Class cls = Class.forName("org.openejb.deployment.EJBConfigurer");
+ Class cls = Class.forName("org.apache.openejb.deployment.EJBConfigurer");
return (DeploymentConfiguration)cls.getMethod("createConfiguration", new Class[]{DeployableObject.class}).invoke(cls.newInstance(), new Object[]{dObj});
} catch (Exception e) {
log.error("Unable to invoke EJB deployer", e);
Modified: geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/ejb_pkgen_1.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/ejb_pkgen_1.xml?view=diff&rev=451628&r1=451627&r2=451628
==============================================================================
--- geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/ejb_pkgen_1.xml (original)
+++ geronimo/server/trunk/modules/geronimo-upgrade/src/test/data/ejb_pkgen_1.xml Sat Sep 30 10:37:33 2006
@@ -28,7 +28,7 @@
</entity>
</enterprise-beans>
- <gbean gbeanName="geronimo.server:name=CMPPKGenerator" class="org.openejb.entity.cmp.pkgenerator.SequenceTablePrimaryKeyGeneratorWrapper">
+ <gbean gbeanName="geronimo.server:name=CMPPKGenerator" class="org.apache.openejb.entity.cmp.pkgenerator.SequenceTablePrimaryKeyGeneratorWrapper">
<reference name="TransactionManager">
<gbean-name>*:name=TransactionManager,*</gbean-name>
</reference>