You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by da...@apache.org on 2007/10/20 05:04:43 UTC
svn commit: r586659 - in /openejb/trunk/openejb3:
assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/
container/openejb-jee/src/main/java/org/apache/openejb/jee/
server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/
Author: dain
Date: Fri Oct 19 20:04:40 2007
New Revision: 586659
URL: http://svn.apache.org/viewvc?rev=586659&view=rev
Log:
EJB refs when embedded in tomcat should use http://127.0.0.1:8080/openejb/ejb for default server uri
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatJndiBuilder.java
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatLoader.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldTaglib.java
openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java
openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatJndiBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatJndiBuilder.java?rev=586659&r1=586658&r2=586659&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatJndiBuilder.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatJndiBuilder.java Fri Oct 19 20:04:40 2007
@@ -63,7 +63,7 @@
private final WebAppInfo webAppInfo;
private final LinkResolver<EntityManagerFactory> emfLinkResolver;
private final boolean replaceEntry;
- private boolean useCrossClassLoaderRef = false;
+ private boolean useCrossClassLoaderRef = true;
private NamingContextListener namingContextListener;
public TomcatJndiBuilder(StandardContext standardContext, WebAppInfo webAppInfo, LinkResolver<EntityManagerFactory> emfLinkResolver) {
@@ -163,7 +163,7 @@
ejb.setLink(null);
ejb.setType(ref.remoteType);
if (useCrossClassLoaderRef) {
- ejb.setProperty(EXTERNAL, ref.externalReference);
+ ejb.setProperty(EXTERNAL, "" + ref.externalReference);
}
if (ref.ejbDeploymentId != null) {
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatLoader.java?rev=586659&r1=586658&r2=586659&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatLoader.java (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatLoader.java Fri Oct 19 20:04:40 2007
@@ -104,7 +104,11 @@
ejbServer = new EjbServer();
SystemInstance.get().setComponent(EjbServer.class, ejbServer);
OpenEJB.init(props, new ServerFederation());
- ejbServer.init(props);
+
+ Properties ejbServerProps = new Properties();
+ ejbServerProps.putAll(props);
+ ejbServerProps.setProperty("openejb.ejbd.uri", "http://127.0.0.1:8080/openejb/ejb");
+ ejbServer.init(ejbServerProps);
// Add our naming context listener to the server which registers all Tomcat resources with OpenEJB
StandardServer standardServer = (StandardServer) ServerFactory.getServer();
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldTaglib.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldTaglib.java?rev=586659&r1=586658&r2=586659&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldTaglib.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/TldTaglib.java Fri Oct 19 20:04:40 2007
@@ -75,6 +75,7 @@
"displayNames",
"icon",
"tlibVersion",
+ "jspVersion",
"shortName",
"uri",
"validator",
@@ -94,6 +95,8 @@
@XmlElement(name = "tlib-version", required = true)
protected String tlibVersion;
+ @XmlElement(name = "jsp-version")
+ protected String jspVersion;
@XmlElement(name = "short-name", required = true)
protected String shortName;
protected String uri;
@@ -162,6 +165,14 @@
public void setTlibVersion(String value) {
this.tlibVersion = value;
+ }
+
+ public String getJspVersion() {
+ return jspVersion;
+ }
+
+ public void setJspVersion(String jspVersion) {
+ this.jspVersion = jspVersion;
}
public String getShortName() {
Modified: openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java?rev=586659&r1=586658&r2=586659&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java (original)
+++ openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java Fri Oct 19 20:04:40 2007
@@ -17,6 +17,7 @@
package org.apache.openejb.server.ejbd;
import java.net.URI;
+import java.util.Properties;
import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.ProxyInfo;
@@ -29,19 +30,16 @@
import org.apache.openejb.client.ServerMetaData;
class ClientObjectFactory implements org.apache.openejb.spi.ApplicationServer {
- private final EjbDaemon daemon;
-
protected ServerMetaData sMetaData;
- public ClientObjectFactory(EjbDaemon daemon) {
+ public ClientObjectFactory(EjbDaemon daemon, Properties props) {
try {
- this.sMetaData = new ServerMetaData(new URI[]{new URI("foo://"+"127.0.0.1" +":"+4201)});
+ String uriString = props.getProperty("openejb.ejbd.uri", "foo://127.0.0.1:4201");
+ this.sMetaData = new ServerMetaData(new URI(uriString));
} catch (Exception e) {
-
e.printStackTrace();
}
- this.daemon = daemon;
}
public javax.ejb.EJBMetaData getEJBMetaData(ProxyInfo info) {
Modified: openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java?rev=586659&r1=586658&r2=586659&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java (original)
+++ openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java Fri Oct 19 20:04:40 2007
@@ -69,7 +69,7 @@
containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
// deploymentIndex = new DeploymentIndex(containerSystem.deployments());
- clientObjectFactory = new ClientObjectFactory(this);
+ clientObjectFactory = new ClientObjectFactory(this, props);
ejbHandler = new EjbRequestHandler(this);
jndiHandler = new JndiRequestHandler(this);