You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2007/01/24 12:47:38 UTC
svn commit: r499370 - in /geronimo/server/trunk:
assemblies/geronimo-jetty6-jee5/src/main/var/config/
assemblies/geronimo-tomcat6-jee5/src/main/var/config/
configs/client-deployer/src/plan/ configs/j2ee-deployer/src/plan/
configs/openejb-deployer/src/p...
Author: dain
Date: Wed Jan 24 03:47:37 2007
New Revision: 499370
URL: http://svn.apache.org/viewvc?view=rev&rev=499370
Log:
renamed ejb-ref builders
Added:
geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/ejbref/EjbRefBuilder.java
- copied, changed from r499338, geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/ejbref/RemoteEjbRefBuilder.java
Removed:
geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/ejbref/RemoteEjbRefBuilder.java
Modified:
geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml
geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml
geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/openejb-deployer/src/plan/plan.xml
geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/ejbref/ClientEjbRefBuilder.java
Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml?view=diff&rev=499370&r1=499369&r2=499370
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml Wed Jan 24 03:47:37 2007
@@ -161,11 +161,11 @@
</pattern>
</reference>
</gbean>
- <gbean name="OpenEjbRemoteRefBuilder">
+ <gbean name="EjbRefBuilder">
<attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
</gbean>
- <gbean name="OpenEjbClientRemoteRefBuilder">
+ <gbean name="ClientEjbRefBuilder">
<attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
</gbean>
</module>
Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml?view=diff&rev=499370&r1=499369&r2=499370
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/var/config/config.xml Wed Jan 24 03:47:37 2007
@@ -168,11 +168,11 @@
</pattern>
</reference>
</gbean>
- <gbean name="OpenEjbRemoteRefBuilder">
+ <gbean name="EjbRefBuilder">
<attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
</gbean>
- <gbean name="OpenEjbClientRemoteRefBuilder">
+ <gbean name="ClientEjbRefBuilder">
<attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
</gbean>
</module>
Modified: geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml?view=diff&rev=499370&r1=499369&r2=499370
==============================================================================
--- geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/client-deployer/src/plan/plan.xml Wed Jan 24 03:47:37 2007
@@ -51,7 +51,7 @@
<name>AxisClientServiceRefBuilder</name>
</pattern>
<pattern>
- <name>OpenEjbClientRemoteRefBuilder</name>
+ <name>ClientEjbRefBuilder</name>
</pattern>
<pattern>
<name>OpenEjbClientCorbaRefBuilder</name>
Modified: geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml?view=diff&rev=499370&r1=499369&r2=499370
==============================================================================
--- geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/j2ee-deployer/src/plan/plan.xml Wed Jan 24 03:47:37 2007
@@ -120,10 +120,7 @@
<name>AxisServiceRefBuilder</name>
</pattern>
<pattern>
- <name>OpenEjbRemoteRefBuilder</name>
- </pattern>
- <pattern>
- <name>OpenEjbLocalRefBuilder</name>
+ <name>EjbRefBuilder</name>
</pattern>
<pattern>
<name>OpenEjbCorbaRefBuilder</name>
Modified: geronimo/server/trunk/configs/openejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/openejb-deployer/src/plan/plan.xml?view=diff&rev=499370&r1=499369&r2=499370
==============================================================================
--- geronimo/server/trunk/configs/openejb-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/openejb-deployer/src/plan/plan.xml Wed Jan 24 03:47:37 2007
@@ -63,7 +63,7 @@
</gbean>
- <gbean name="OpenEjbRemoteRefBuilder" class="org.apache.geronimo.openejb.deployment.ejbref.RemoteEjbRefBuilder">
+ <gbean name="EjbRefBuilder" class="org.apache.geronimo.openejb.deployment.ejbref.EjbRefBuilder">
<attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
<xml-attribute name="defaultEnvironment">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
@@ -78,7 +78,7 @@
</xml-attribute>
</gbean>
- <gbean name="OpenEjbClientRemoteRefBuilder" class="org.apache.geronimo.openejb.deployment.ejbref.ClientEjbRefBuilder">
+ <gbean name="ClientEjbRefBuilder" class="org.apache.geronimo.openejb.deployment.ejbref.ClientEjbRefBuilder">
<attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
<attribute name="host">${PlanClientAddresses}</attribute>
<attribute name="port">${PlanOpenEJBPort}</attribute>
Modified: geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/ejbref/ClientEjbRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/ejbref/ClientEjbRefBuilder.java?view=diff&rev=499370&r1=499369&r2=499370
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/ejbref/ClientEjbRefBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/ejbref/ClientEjbRefBuilder.java Wed Jan 24 03:47:37 2007
@@ -30,7 +30,7 @@
/**
* @version $Rev: 451417 $ $Date: 2006-09-29 13:13:22 -0700 (Fri, 29 Sep 2006) $
*/
-public class ClientEjbRefBuilder extends RemoteEjbRefBuilder {
+public class ClientEjbRefBuilder extends EjbRefBuilder {
private final URI uri;
public ClientEjbRefBuilder(Environment defaultEnvironment, String[] eeNamespaces, String host, int port) throws URISyntaxException {
@@ -51,7 +51,7 @@
public static final GBeanInfo GBEAN_INFO;
static {
- GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(ClientEjbRefBuilder.class, RemoteEjbRefBuilder.GBEAN_INFO, NameFactory.MODULE_BUILDER);
+ GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(ClientEjbRefBuilder.class, EjbRefBuilder.GBEAN_INFO, NameFactory.MODULE_BUILDER);
infoBuilder.addAttribute("host", String.class, true);
infoBuilder.addAttribute("port", int.class, true);
Copied: geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/ejbref/EjbRefBuilder.java (from r499338, geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/ejbref/RemoteEjbRefBuilder.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/ejbref/EjbRefBuilder.java?view=diff&rev=499370&p1=geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/ejbref/RemoteEjbRefBuilder.java&r1=499338&p2=geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/ejbref/EjbRefBuilder.java&r2=499370
==============================================================================
--- geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/ejbref/RemoteEjbRefBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/ejbref/EjbRefBuilder.java Wed Jan 24 03:47:37 2007
@@ -65,13 +65,13 @@
/**
* @version $Revision: 475950 $ $Date: 2006-11-16 14:18:14 -0800 (Thu, 16 Nov 2006) $
*/
-public class RemoteEjbRefBuilder extends AbstractNamingBuilder {
- private static final Log log = LogFactory.getLog(RemoteEjbRefBuilder.class);
+public class EjbRefBuilder extends AbstractNamingBuilder {
+ private static final Log log = LogFactory.getLog(EjbRefBuilder.class);
private final QNameSet ejbRefQNameSet;
private final QNameSet ejbLocalRefQNameSet;
- public RemoteEjbRefBuilder(Environment defaultEnvironment, String[] eeNamespaces) {
+ public EjbRefBuilder(Environment defaultEnvironment, String[] eeNamespaces) {
super(defaultEnvironment);
ejbRefQNameSet = buildQNameSet(eeNamespaces, "ejb-ref");
ejbLocalRefQNameSet = buildQNameSet(eeNamespaces, "ejb-local-ref");
@@ -342,7 +342,7 @@
public static final GBeanInfo GBEAN_INFO;
static {
- GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(RemoteEjbRefBuilder.class, NameFactory.MODULE_BUILDER);
+ GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(EjbRefBuilder.class, NameFactory.MODULE_BUILDER);
infoBuilder.addAttribute("eeNamespaces", String[].class, true, true);
infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);