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 2006/04/03 02:45:48 UTC
svn commit: r390932 - in /geronimo/branches/1.1/modules:
common/src/java/org/apache/geronimo/common/
connector-builder/src/test/org/apache/geronimo/connector/deployment/
j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/
j2ee-builder/src/test/o...
Author: dain
Date: Sun Apr 2 17:45:37 2006
New Revision: 390932
URL: http://svn.apache.org/viewcvs?rev=390932&view=rev
Log:
EJB refs now work
Modified:
geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/UnresolvedEJBRefException.java
geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java
geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java
geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableEJBReferenceBuilder.java
geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java
geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
geronimo/branches/1.1/modules/naming-builder/src/test/org/apache/geronimo/naming/deployment/MessageDestinationTest.java
geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
Modified: geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/UnresolvedEJBRefException.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/UnresolvedEJBRefException.java?rev=390932&r1=390931&r2=390932&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/UnresolvedEJBRefException.java (original)
+++ geronimo/branches/1.1/modules/common/src/java/org/apache/geronimo/common/UnresolvedEJBRefException.java Sun Apr 2 17:45:37 2006
@@ -68,7 +68,7 @@
}
msg.append(" for reference ").append(refName).append(" to a ");
msg.append((local ? "local " : "remote "));
- msg.append((session ? "session " : "entity "));
+ msg.append((session ? "session" : "entity"));
msg.append(" bean that has the home interface ").append(homeInterface);
msg.append(" and the ").append(local ? "local" : "remote");
Modified: geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=390932&r1=390931&r2=390932&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java Sun Apr 2 17:45:37 2006
@@ -116,11 +116,11 @@
return null;
}
- public Reference createEJBRemoteRef(String requiredModule, String optionalModule, String name, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String home, String remote, Configuration configuration) {
+ public Reference createEJBRemoteRef(String refName, Configuration configuration, String name, String requiredModule, String optionalModule, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String home, String remote) {
return null;
}
- public Reference createEJBLocalRef(String requiredModule, String optionalModule, String name, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String localHome, String local, Configuration configuration) {
+ public Reference createEJBLocalRef(String refName, Configuration configuration, String name, String requiredModule, String optionalModule, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String localHome, String local) {
return null;
}
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java?rev=390932&r1=390931&r2=390932&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBReferenceBuilder.java Sun Apr 2 17:45:37 2006
@@ -30,7 +30,7 @@
/**
- * @version $Rev$ $Date$
+ * @version $Rev: 386000 $ $Date$
*/
public interface EJBReferenceBuilder {
@@ -38,7 +38,7 @@
Object createHandleDelegateReference() throws DeploymentException;
- Reference createEJBRemoteRef(String requiredModule, String optionalModule, String name, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String home, String remote, Configuration configuration) throws DeploymentException;
+ Reference createEJBRemoteRef(String refName, Configuration configuration, String name, String requiredModule, String optionalModule, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String home, String remote) throws DeploymentException;
- Reference createEJBLocalRef(String requiredModule, String optionalModule, String name, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String localHome, String local, Configuration configuration) throws DeploymentException;
+ Reference createEJBLocalRef(String refName, Configuration configuration, String name, String requiredModule, String optionalModule, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String localHome, String local) throws DeploymentException;
}
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java?rev=390932&r1=390931&r2=390932&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/RefContext.java Sun Apr 2 17:45:37 2006
@@ -68,12 +68,12 @@
public Object getHandleDelegateReference() throws DeploymentException {
return ejbReferenceBuilder.createHandleDelegateReference();
}
- public Reference getEJBRemoteRef(String requiredModule, String optionalModule, String name, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String home, String remote, Configuration configuration) throws DeploymentException {
- return ejbReferenceBuilder.createEJBRemoteRef(requiredModule, optionalModule, name, targetConfigId, query, isSession, home, remote, configuration);
+ public Reference getEJBRemoteRef(String refName, Configuration configuration, String name, String requiredModule, String optionalModule, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String home, String remote) throws DeploymentException {
+ return ejbReferenceBuilder.createEJBRemoteRef(refName, configuration, name, requiredModule, optionalModule, targetConfigId, query, isSession, home, remote);
}
- public Reference getEJBLocalRef(String requiredModule, String optionalModule, String name, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String localHome, String local, Configuration configuration) throws DeploymentException {
- return ejbReferenceBuilder.createEJBLocalRef(requiredModule, optionalModule, name, targetConfigId, query, isSession, localHome, local, configuration);
+ public Reference getEJBLocalRef(String refName, Configuration configuration, String name, String requiredModule, String optionalModule, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String localHome, String local) throws DeploymentException {
+ return ejbReferenceBuilder.createEJBLocalRef(refName, configuration, name, requiredModule, optionalModule, targetConfigId, query, isSession, localHome, local);
}
public Reference getConnectionFactoryRef(AbstractNameQuery containerId, Class iface, Configuration configuration) throws DeploymentException {
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableEJBReferenceBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableEJBReferenceBuilder.java?rev=390932&r1=390931&r2=390932&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableEJBReferenceBuilder.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/UnavailableEJBReferenceBuilder.java Sun Apr 2 17:45:37 2006
@@ -28,7 +28,7 @@
import java.net.URI;
/**
- * @version $Rev$ $Date$
+ * @version $Rev: 386000 $ $Date$
*/
public class UnavailableEJBReferenceBuilder implements EJBReferenceBuilder {
@@ -40,11 +40,11 @@
throw new DeploymentException("EJB references are unavailable in this configuration");
}
- public Reference createEJBRemoteRef(String requiredModule, String optionalModule, String name, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String home, String remote, Configuration configuration) throws DeploymentException {
+ public Reference createEJBRemoteRef(String refName, Configuration configuration, String name, String requiredModule, String optionalModule, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String home, String remote) throws DeploymentException {
throw new DeploymentException("EJB references are unavailable in this configuration");
}
- public Reference createEJBLocalRef(String requiredModule, String optionalModule, String name, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String localHome, String local, Configuration configuration) throws DeploymentException {
+ public Reference createEJBLocalRef(String refName, Configuration configuration, String name, String requiredModule, String optionalModule, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String localHome, String local) throws DeploymentException {
throw new DeploymentException("EJB references are unavailable in this configuration");
}
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java?rev=390932&r1=390931&r2=390932&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EJBRefContextTest.java Sun Apr 2 17:45:37 2006
@@ -59,24 +59,24 @@
public void testNothing() throws Exception {}
public void xtestSimpleRefs() throws Exception {
- assertReferenceEqual(coffee_peaberry, refContext.getEJBRemoteRef(null, coffee, "peaberry", null, null, true, null, null, configuration));
- assertReferenceEqual(coffee_peaberry, refContext.getEJBLocalRef(null, coffee, "peaberry", null, null, true, null, null, configuration));
+ assertReferenceEqual(coffee_peaberry, refContext.getEJBRemoteRef(null, configuration, "peaberry", null, coffee, null, null, true, null, null));
+ assertReferenceEqual(coffee_peaberry, refContext.getEJBLocalRef(null, configuration, "peaberry", null, coffee, null, null, true, null, null));
}
public void xtestAmbiguousRefs() throws Exception {
- assertReferenceEqual(coffee_java, refContext.getEJBRemoteRef(null, coffee, "java", null, null, true, null, null, configuration));
- assertReferenceEqual(coffee_java, refContext.getEJBLocalRef(null, coffee, "java", null, null, true, null, null, configuration));
- assertReferenceEqual(language_java, refContext.getEJBRemoteRef(null, language, "java", null, null, true, null, null, configuration));
- assertReferenceEqual(language_java, refContext.getEJBLocalRef(null, language, "java", null, null, true, null, null, configuration));
+ assertReferenceEqual(coffee_java, refContext.getEJBRemoteRef(null, configuration, "java", null, coffee, null, null, true, null, null));
+ assertReferenceEqual(coffee_java, refContext.getEJBLocalRef(null, configuration, "java", null, coffee, null, null, true, null, null));
+ assertReferenceEqual(language_java, refContext.getEJBRemoteRef(null, configuration, "java", null, language, null, null, true, null, null));
+ assertReferenceEqual(language_java, refContext.getEJBLocalRef(null, configuration, "java", null, language, null, null, true, null, null));
try {
- refContext.getEJBRemoteRef(null, car, "java", null, null, true, null, null, configuration);
+ refContext.getEJBRemoteRef(null, configuration, "java", null, car, null, null, true, null, null);
fail("should have thrown an AmbiguousEJBRefException");
} catch (UnresolvedReferenceException e) {
// good
}
try {
- refContext.getEJBLocalRef(null, car, "java", null, null, true, null, null, configuration);
+ refContext.getEJBLocalRef(null, configuration, "java", null, car, null, null, true, null, null);
fail("should have thrown an AmbiguousEJBRefException");
} catch (UnresolvedReferenceException e) {
// good
@@ -84,51 +84,51 @@
}
public void xtestRelativeRefs() throws Exception {
- assertReferenceEqual(car_enzo, refContext.getEJBRemoteRef("../../foo/bar/car.jar", coffee, "enzo", null, null, true, null, null, configuration));
- assertReferenceEqual(car_enzo, refContext.getEJBLocalRef("../../foo/bar/car.jar", coffee, "enzo", null, null, true, null, null, configuration));
- assertReferenceEqual(car_enzo, refContext.getEJBRemoteRef("./../funk/../../foo/bar/car.jar", coffee, "enzo", null, null, true, null, null, configuration));
- assertReferenceEqual(car_enzo, refContext.getEJBLocalRef("./../funk/../../foo/bar/car.jar", coffee, "enzo", null, null, true, null, null, configuration));
- assertReferenceEqual(coffee_java, refContext.getEJBRemoteRef("./coffee.jar", coffee, "java", null, null, true, null, null, configuration));
- assertReferenceEqual(coffee_java, refContext.getEJBLocalRef("./coffee.jar", coffee, "java", null, null, true, null, null, configuration));
- assertReferenceEqual(coffee_java, refContext.getEJBRemoteRef("coffee.jar", coffee, "java", null, null, true, null, null, configuration));
- assertReferenceEqual(coffee_java, refContext.getEJBLocalRef("coffee.jar", coffee, "java", null, null, true, null, null, configuration));
+ assertReferenceEqual(car_enzo, refContext.getEJBRemoteRef(null, configuration, "enzo", "../../foo/bar/car.jar", coffee, null, null, true, null, null));
+ assertReferenceEqual(car_enzo, refContext.getEJBLocalRef(null, configuration, "enzo", "../../foo/bar/car.jar", coffee, null, null, true, null, null));
+ assertReferenceEqual(car_enzo, refContext.getEJBRemoteRef(null, configuration, "enzo", "./../funk/../../foo/bar/car.jar", coffee, null, null, true, null, null));
+ assertReferenceEqual(car_enzo, refContext.getEJBLocalRef(null, configuration, "enzo", "./../funk/../../foo/bar/car.jar", coffee, null, null, true, null, null));
+ assertReferenceEqual(coffee_java, refContext.getEJBRemoteRef(null, configuration, "java", "./coffee.jar", coffee, null, null, true, null, null));
+ assertReferenceEqual(coffee_java, refContext.getEJBLocalRef(null, configuration, "java", "./coffee.jar", coffee, null, null, true, null, null));
+ assertReferenceEqual(coffee_java, refContext.getEJBRemoteRef(null, configuration, "java", "coffee.jar", coffee, null, null, true, null, null));
+ assertReferenceEqual(coffee_java, refContext.getEJBLocalRef(null, configuration, "java", "coffee.jar", coffee, null, null, true, null, null));
try {
- refContext.getEJBRemoteRef("not_exist.jar", coffee, "blah", null, null, true, null, null, configuration);
+ refContext.getEJBRemoteRef(null, configuration, "blah", "not_exist.jar", coffee, null, null, true, null, null);
fail("should have thrown an UnknownEJBRefException");
} catch (UnresolvedReferenceException e) {
// good
}
try {
- refContext.getEJBLocalRef("not_exist.jar", coffee, "blah", null, null, true, null, null, configuration);
+ refContext.getEJBLocalRef(null, configuration, "blah", "not_exist.jar", coffee, null, null, true, null, null);
fail("should have thrown an UnknownEJBRefException");
} catch (UnresolvedReferenceException e) {
// good
}
try {
- refContext.getEJBRemoteRef("coffee.jar", coffee, "blah", null, null, true, null, null, configuration);
+ refContext.getEJBRemoteRef(null, configuration, "blah", "coffee.jar", coffee, null, null, true, null, null);
fail("should have thrown an UnknownEJBRefException");
} catch (UnresolvedReferenceException e) {
// good
}
try {
- refContext.getEJBLocalRef("coffee.jar", coffee, "blah", null, null, true, null, null, configuration);
+ refContext.getEJBLocalRef(null, configuration, "blah", "coffee.jar", coffee, null, null, true, null, null);
fail("should have thrown an UnknownEJBRefException");
} catch (UnresolvedReferenceException e) {
// good
}
try {
- refContext.getEJBRemoteRef("../../../../foo/bar/car.jar",coffee, "enzo", null, null, true, null, null, configuration);
+ refContext.getEJBRemoteRef(null, configuration, "enzo", "../../../../foo/bar/car.jar",coffee, null, null, true, null, null);
fail("should have thrown an UnknownEJBRefException");
} catch (UnresolvedReferenceException e) {
// good
}
try {
- refContext.getEJBLocalRef("../../../../foo/bar/car.jar",coffee, "enzo", null, null, true, null, null, configuration);
+ refContext.getEJBLocalRef(null, configuration, "enzo", "../../../../foo/bar/car.jar",coffee, null, null, true, null, null);
fail("should have thrown an UnknownEJBRefException");
} catch (UnresolvedReferenceException e) {
// good
@@ -136,18 +136,18 @@
}
public void xtestBasicImplicitRefs() throws Exception {
- assertReferenceEqual(language_lisp, refContext.getEJBRemoteRef(null, coffee, "blah", null, null, true, "LispHome", "LispRemote", configuration));
- assertReferenceEqual(language_lisp, refContext.getEJBLocalRef(null, coffee, "blah", null, null, true, "LispLocalHome", "LispLocal", configuration));
+ assertReferenceEqual(language_lisp, refContext.getEJBRemoteRef(null, configuration, "blah", null, coffee, null, null, true, "LispHome", "LispRemote"));
+ assertReferenceEqual(language_lisp, refContext.getEJBLocalRef(null, configuration, "blah", null, coffee, null, null, true, "LispLocalHome", "LispLocal"));
}
public void xtestInModuleImplicitRefs() throws Exception {
- assertReferenceEqual(coffee_java, refContext.getEJBLocalRef(null, coffee, "blah", null, null, true, "LocalHome", "Local", configuration));
- assertReferenceEqual(car_enzo, refContext.getEJBLocalRef(null, car, "blah", null, null, true, "LocalHome", "Local", configuration));
+ assertReferenceEqual(coffee_java, refContext.getEJBLocalRef(null, configuration, "blah", null, coffee, null, null, true, "LocalHome", "Local"));
+ assertReferenceEqual(car_enzo, refContext.getEJBLocalRef(null, configuration, "blah", null, car, null, null, true, "LocalHome", "Local"));
}
public void xtestAmbiguousModuleImplicitRefs() throws Exception {
try {
- refContext.getEJBLocalRef(null, language, "blah", null, null, true, "LocalHome", "Local", configuration);
+ refContext.getEJBLocalRef(null, configuration, "blah", null, language, null, null, true, "LocalHome", "Local");
fail("should have thrown an UnresolvedEJBRefException");
} catch (UnresolvedEJBRefException e) {
// good
@@ -156,7 +156,7 @@
public void xtestNoMatchImplicitRefs() throws Exception {
try {
- refContext.getEJBLocalRef(null, language, "blah", null, null, true, "foo", "bar", configuration);
+ refContext.getEJBLocalRef(null, configuration, "blah", null, language, null, null, true, "foo", "bar");
fail("should have thrown an UnresolvedEJBRefException");
} catch (UnresolvedEJBRefException e) {
// good
@@ -249,11 +249,11 @@
return null;
}
- public Reference createEJBRemoteRef(String requiredModule, String optionalModule, String name, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String home, String remote, Configuration configuration) throws DeploymentException {
+ public Reference createEJBRemoteRef(String refName, Configuration configuration, String name, String requiredModule, String optionalModule, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String home, String remote) throws DeploymentException {
return null;
}
- public Reference createEJBLocalRef(String requiredModule, String optionalModule, String name, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String localHome, String local, Configuration configuration) throws DeploymentException {
+ public Reference createEJBLocalRef(String refName, Configuration configuration, String name, String requiredModule, String optionalModule, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String localHome, String local) throws DeploymentException {
return null;
}
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java?rev=390932&r1=390931&r2=390932&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java Sun Apr 2 17:45:37 2006
@@ -92,11 +92,11 @@
return null;
}
- public Reference createEJBRemoteRef(String requiredModule, String optionalModule, String name, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String home, String remote, Configuration configuration) throws DeploymentException {
+ public Reference createEJBRemoteRef(String refName, Configuration configuration, String name, String requiredModule, String optionalModule, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String home, String remote) throws DeploymentException {
return null;
}
- public Reference createEJBLocalRef(String requiredModule, String optionalModule, String name, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String localHome, String local, Configuration configuration) throws DeploymentException {
+ public Reference createEJBLocalRef(String refName, Configuration configuration, String name, String requiredModule, String optionalModule, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String localHome, String local) throws DeploymentException {
return null;
}
Modified: geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java?rev=390932&r1=390931&r2=390932&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java (original)
+++ geronimo/branches/1.1/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java Sun Apr 2 17:45:37 2006
@@ -159,11 +159,11 @@
return null;
}
- public Reference createEJBRemoteRef(String requiredModule, String optionalModule, String name, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String home, String remote, Configuration configuration) {
+ public Reference createEJBRemoteRef(String refName, Configuration configuration, String name, String requiredModule, String optionalModule, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String home, String remote) {
return null;
}
- public Reference createEJBLocalRef(String requiredModule, String optionalModule, String name, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String localHome, String local, Configuration configuration) {
+ public Reference createEJBLocalRef(String refName, Configuration configuration, String name, String requiredModule, String optionalModule, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String localHome, String local) {
return null;
}
Modified: geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java?rev=390932&r1=390931&r2=390932&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java (original)
+++ geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java Sun Apr 2 17:45:37 2006
@@ -298,26 +298,26 @@
static Reference addEJBRef(Configuration earContext, Configuration ejbContext, RefContext refContext, URI moduleURI, EjbRefType ejbRef, GerEjbRefType remoteRef, ClassLoader cl) throws DeploymentException {
String remote = getStringValue(ejbRef.getRemote());
+ String refName = getStringValue(ejbRef.getEjbRefName());
try {
assureEJBObjectInterface(remote, cl);
} catch (DeploymentException e) {
- throw new DeploymentException("Error processing 'remote' element for EJB Reference '" + getStringValue(ejbRef.getEjbRefName()) + "' for module '" + moduleURI + "': " + e.getMessage());
+ throw new DeploymentException("Error processing 'remote' element for EJB Reference '" + refName + "' for module '" + moduleURI + "': " + e.getMessage());
}
String home = getStringValue(ejbRef.getHome());
try {
assureEJBHomeInterface(home, cl);
} catch (DeploymentException e) {
- throw new DeploymentException("Error processing 'home' element for EJB Reference '" + getStringValue(ejbRef.getEjbRefName()) + "' for module '" + moduleURI + "': " + e.getMessage());
+ throw new DeploymentException("Error processing 'home' element for EJB Reference '" + refName + "' for module '" + moduleURI + "': " + e.getMessage());
}
Reference ejbReference;
boolean isSession = "Session".equals(getStringValue(ejbRef.getEjbRefType()));
- if (isSession && remote.equals("javax.management.j2ee.Management") && home.equals("javax.management.j2ee.ManagementHome"))
- {
+ if (isSession && remote.equals("javax.management.j2ee.Management") && home.equals("javax.management.j2ee.ManagementHome")) {
AbstractNameQuery query = new AbstractNameQuery(null, Collections.singletonMap("name", "ejb/mgmt/MEJB"));
- ejbReference = refContext.getEJBRemoteRef(null, null, null, null, query, isSession, home, remote, ejbContext);
+ ejbReference = refContext.getEJBRemoteRef(null, ejbContext, null, null, null, null, query, isSession, home, remote);
} else {
String ejbLink = null;
@@ -364,7 +364,7 @@
GerPatternType patternType = remoteRef.getPattern();
containerQuery = buildAbstractNameQuery(patternType, null);
}
- ejbReference = refContext.getEJBRemoteRef(requiredModule, optionalModule, ejbLink, targetConfigId, containerQuery, isSession, home, remote, ejbContext);
+ ejbReference = refContext.getEJBRemoteRef(refName, ejbContext, ejbLink, requiredModule, optionalModule, targetConfigId, containerQuery, isSession, home, remote);
}
}
return ejbReference;
@@ -384,17 +384,18 @@
static Reference addEJBLocalRef(Configuration ejbContext, RefContext refContext, URI moduleURI, EjbLocalRefType ejbLocalRef, GerEjbLocalRefType localRef, ClassLoader cl) throws DeploymentException {
String local = getStringValue(ejbLocalRef.getLocal());
+ String refName = getStringValue(ejbLocalRef.getEjbRefName());
try {
assureEJBLocalObjectInterface(local, cl);
} catch (DeploymentException e) {
- throw new DeploymentException("Error processing 'local' element for EJB Local Reference '" + getStringValue(ejbLocalRef.getEjbRefName()) + "' for module '" + moduleURI + "': " + e.getMessage());
+ throw new DeploymentException("Error processing 'local' element for EJB Local Reference '" + refName + "' for module '" + moduleURI + "': " + e.getMessage());
}
String localHome = getStringValue(ejbLocalRef.getLocalHome());
try {
assureEJBLocalHomeInterface(localHome, cl);
} catch (DeploymentException e) {
- throw new DeploymentException("Error processing 'local-home' element for EJB Local Reference '" + getStringValue(ejbLocalRef.getEjbRefName()) + "' for module '" + moduleURI + "': " + e.getMessage());
+ throw new DeploymentException("Error processing 'local-home' element for EJB Local Reference '" + refName + "' for module '" + moduleURI + "': " + e.getMessage());
}
boolean isSession = "Session".equals(getStringValue(ejbLocalRef.getEjbRefType()));
@@ -427,7 +428,7 @@
GerPatternType patternType = localRef.getPattern();
containerQuery = buildAbstractNameQuery(patternType, null);
}
- return refContext.getEJBRemoteRef(requiredModule, optionalModule, ejbLink, targetConfigId, containerQuery, isSession, localHome, local, ejbContext);
+ return refContext.getEJBLocalRef(refName, ejbContext, ejbLink, requiredModule, optionalModule, targetConfigId, containerQuery, isSession, localHome, local);
}
//TODO current implementation does not deal with portComponentRef links.
Modified: geronimo/branches/1.1/modules/naming-builder/src/test/org/apache/geronimo/naming/deployment/MessageDestinationTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/naming-builder/src/test/org/apache/geronimo/naming/deployment/MessageDestinationTest.java?rev=390932&r1=390931&r2=390932&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/naming-builder/src/test/org/apache/geronimo/naming/deployment/MessageDestinationTest.java (original)
+++ geronimo/branches/1.1/modules/naming-builder/src/test/org/apache/geronimo/naming/deployment/MessageDestinationTest.java Sun Apr 2 17:45:37 2006
@@ -60,11 +60,11 @@
return null;
}
- public Reference createEJBRemoteRef(String requiredModule, String optionalModule, String name, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String home, String remote, Configuration configuration) {
+ public Reference createEJBRemoteRef(String refName, Configuration configuration, String name, String requiredModule, String optionalModule, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String home, String remote) {
return null;
}
- public Reference createEJBLocalRef(String requiredModule, String optionalModule, String name, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String localHome, String local, Configuration configuration) {
+ public Reference createEJBLocalRef(String refName, Configuration configuration, String name, String requiredModule, String optionalModule, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String localHome, String local) {
return null;
}
Modified: geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java?rev=390932&r1=390931&r2=390932&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java (original)
+++ geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java Sun Apr 2 17:45:37 2006
@@ -188,11 +188,11 @@
return null;
}
- public Reference createEJBRemoteRef(String requiredModule, String optionalModule, String name, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String home, String remote, Configuration configuration) {
+ public Reference createEJBRemoteRef(String refName, Configuration configuration, String name, String requiredModule, String optionalModule, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String home, String remote) {
return null;
}
- public Reference createEJBLocalRef(String requiredModule, String optionalModule, String name, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String localHome, String local, Configuration configuration) {
+ public Reference createEJBLocalRef(String refName, Configuration configuration, String name, String requiredModule, String optionalModule, Artifact targetConfigId, AbstractNameQuery query, boolean isSession, String localHome, String local) {
return null;
}