You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2006/11/28 07:41:35 UTC
svn commit: r479930 [2/2] - in /incubator/openejb/trunk/openejb3:
container/openejb-core/src/main/java/org/apache/openejb/alt/config/
container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/
container/openejb-core/src/main/java/org/apach...
Added: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/Cmp2EntityContainer.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/Cmp2EntityContainer.java?view=auto&rev=479930
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/Cmp2EntityContainer.java (added)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/core/entity/Cmp2EntityContainer.java Mon Nov 27 22:41:33 2006
@@ -0,0 +1,76 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.core.entity;
+
+import org.apache.openejb.Container;
+import org.apache.openejb.DeploymentInfo;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.spi.SecurityService;
+import org.apache.openejb.core.ThreadContext;
+import org.apache.openejb.core.transaction.TransactionContainer;
+
+import javax.transaction.TransactionManager;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class Cmp2EntityContainer implements org.apache.openejb.RpcContainer, TransactionContainer {
+
+ private Map deploymentRegistry;
+
+ private Object containerID = null;
+
+ public Cmp2EntityContainer(Object id, TransactionManager transactionManager, SecurityService securityService, Map registry) throws OpenEJBException {
+ this.deploymentRegistry = registry;
+ this.containerID = id;
+ }
+
+ public Object invoke(Object deployID, Method callMethod, Object [] args, Object primKey, Object securityIdentity) throws OpenEJBException {
+ return null;
+ }
+
+ public void deploy(Object deploymentID, DeploymentInfo info) throws OpenEJBException {
+ Map registry = new HashMap(deploymentRegistry);
+ registry.put(deploymentID, info);
+ deploymentRegistry = registry;
+ org.apache.openejb.core.CoreDeploymentInfo di = (org.apache.openejb.core.CoreDeploymentInfo) info;
+ di.setContainer(this);
+ }
+
+ public DeploymentInfo [] deployments() {
+ return (DeploymentInfo []) deploymentRegistry.values().toArray(new DeploymentInfo[deploymentRegistry.size()]);
+ }
+
+ public Object getContainerID() {
+ return containerID;
+ }
+
+ public int getContainerType() {
+ return Container.ENTITY;
+ }
+
+ public DeploymentInfo getDeploymentInfo(Object deploymentID) {
+ return (DeploymentInfo) deploymentRegistry.get(deploymentID);
+ }
+
+ public void discardInstance(Object instance, ThreadContext context) {
+ }
+}
+
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/JdbcConnectionFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/JdbcConnectionFactory.java?view=diff&rev=479930&r1=479929&r2=479930
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/JdbcConnectionFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/JdbcConnectionFactory.java Mon Nov 27 22:41:33 2006
@@ -51,6 +51,22 @@
this.defaultUserName = defaultUserName;
}
+ public String getDefaultPassword() {
+ return defaultPassword;
+ }
+
+ public String getDefaultUserName() {
+ return defaultUserName;
+ }
+
+ public String getJdbcDriver() {
+ return jdbcDriver;
+ }
+
+ public String getJdbcUrl() {
+ return jdbcUrl;
+ }
+
public void setReference(Reference jndiReference) {
this.jndiReference = jndiReference;
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml?view=diff&rev=479930&r1=479929&r2=479930
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml Mon Nov 27 22:41:33 2006
@@ -82,6 +82,17 @@
<!--
# ==========================================================
+ # Default Container-Managed Persistence EntityBean Container
+ # ==========================================================
+ -->
+ <ServiceProvider id="Default CMP2 Container"
+ provider-type="Container"
+ constructor="id, transactionManager, securityService, deployments"
+ class-name="org.apache.openejb.core.entity.Cmp2EntityContainer">
+ </ServiceProvider>
+
+ <!--
+ # ==========================================================
# Default Bean-Managed Persistence EntityBean Container
# ==========================================================
-->
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf?view=diff&rev=479930&r1=479929&r2=479930
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/default.openejb.conf Mon Nov 27 22:41:33 2006
@@ -53,6 +53,10 @@
</Container>
+<Container id="Default CMP2 Container" ctype="CMP2_ENTITY">
+</Container>
+
+
<!--
<Container id="InstantDB CMP Container" ctype="CMP_ENTITY">
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpHome.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpHome.java?view=diff&rev=479930&r1=479929&r2=479930
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpHome.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpHome.java Mon Nov 27 22:41:33 2006
@@ -31,7 +31,4 @@
public EncCmpObject findByPrimaryKey(Integer primarykey)
throws javax.ejb.FinderException, java.rmi.RemoteException;
- public java.util.Collection findEmptyCollection()
- throws javax.ejb.FinderException, java.rmi.RemoteException;
-
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/RmiIiopCmpHome.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/RmiIiopCmpHome.java?view=diff&rev=479930&r1=479929&r2=479930
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/RmiIiopCmpHome.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/RmiIiopCmpHome.java Mon Nov 27 22:41:33 2006
@@ -29,7 +29,4 @@
public RmiIiopCmpObject findByPrimaryKey(Integer primarykey)
throws javax.ejb.FinderException, java.rmi.RemoteException;
- public java.util.Collection findEmptyCollection()
- throws javax.ejb.FinderException, java.rmi.RemoteException;
-
}
Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/openejb-jar.xml?view=diff&rev=479930&r1=479929&r2=479930
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/openejb-jar.xml (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-beans/src/main/resources/META-INF/openejb-jar.xml Mon Nov 27 22:41:33 2006
@@ -19,20 +19,49 @@
<openejb-jar xmlns="http://www.openejb.org/openejb-jar/1.1">
<ejb-deployment ejb-name="BasicCmpBean" deployment-id="client/tests/entity/cmp/BasicCmpHome" container-id="Default CMP Container">
<resource-link res-ref-name="jdbc/basic/entityDatabase" res-id="Default JDBC Database"/>
- <query>
- <query-method>
- <method-name>findByLastName</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </query-method>
- <object-ql>
- SELECT o FROM org.apache.openejb.test.entity.cmp.BasicCmpBean o WHERE o.lastName = $1
- </object-ql>
- </query>
+ <query>
+ <query-method>
+ <method-name>findByLastName</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ </method-params>
+ </query-method>
+ <object-ql>
+ SELECT o FROM org.apache.openejb.test.entity.cmp.BasicCmpBean o WHERE o.lastName = $1
+ </object-ql>
+ </query>
+ <query>
+ <query-method>
+ <method-name>findEmptyCollection</method-name>
+ <method-params/>
+ </query-method>
+ <object-ql>
+ SELECT o FROM org.apache.openejb.test.entity.cmp.BasicCmpBean o WHERE 'true' = 'false'
+ </object-ql>
+ </query>
</ejb-deployment>
<ejb-deployment ejb-name="AOBasicCmpBean" deployment-id="client/tests/entity/cmp/allowed_operations/EntityHome" container-id="Default CMP Container">
<resource-link res-ref-name="jdbc/basic/entityDatabase" res-id="Default JDBC Database"/>
+ <query>
+ <query-method>
+ <method-name>findByLastName</method-name>
+ <method-params>
+ <method-param>java.lang.String</method-param>
+ </method-params>
+ </query-method>
+ <object-ql>
+ SELECT o FROM org.apache.openejb.test.entity.cmp.BasicCmpBean o WHERE o.lastName = $1
+ </object-ql>
+ </query>
+ <query>
+ <query-method>
+ <method-name>findEmptyCollection</method-name>
+ <method-params/>
+ </query-method>
+ <object-ql>
+ SELECT o FROM org.apache.openejb.test.entity.cmp.BasicCmpBean o WHERE 'true' = 'false'
+ </object-ql>
+ </query>
</ejb-deployment>
<ejb-deployment ejb-name="EncCmpBean" deployment-id="client/tests/entity/cmp/EncBean" container-id="Default CMP Container">
<resource-link res-ref-name="datasource" res-id="Default JDBC Database"/>
Added: incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/ClientDataSource.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/ClientDataSource.java?view=auto&rev=479930
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/ClientDataSource.java (added)
+++ incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/ClientDataSource.java Mon Nov 27 22:41:33 2006
@@ -0,0 +1,99 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.client;
+
+import javax.sql.DataSource;
+import java.sql.*;
+import java.sql.Connection;
+import java.io.PrintWriter;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class ClientDataSource implements DataSource {
+ private final String jdbcUrl;
+ private final String jdbcDriver;
+ private final String defaultPassword;
+ private final String defaultUserName;
+
+ public static void main(String[] args) throws URISyntaxException {
+ URI uri1;
+ uri1 = new URI("datasource", null, "/path",null, null);
+ uri1 = new URI("datasource", null, "/path",null, null);
+ System.out.println("uri = " + uri1);
+ uri1 = new URI("datasource", "host", "/path",null, null);
+ System.out.println("uri = " + uri1);
+ uri1 = new URI("datasource", "host", "/path", "query", "fragment");
+ System.out.println("uri = " + uri1);
+ uri1 = new URI("jdbc:derby://localhost:8080/databaseName");
+ print(uri1);
+ print(new URI(uri1.getSchemeSpecificPart()));
+ }
+
+ private static void print(URI uri1) {
+ System.out.println("uri = " + uri1);
+ System.out.println(" scheme = " + uri1.getScheme());
+ System.out.println(" part = " + uri1.getSchemeSpecificPart());
+ System.out.println(" host = " + uri1.getHost());
+ System.out.println(" path = " + uri1.getPath());
+ System.out.println(" query = " + uri1.getQuery());
+ }
+
+ public ClientDataSource(DataSourceMetaData d) {
+ this(d.getJdbcDriver(), d.getJdbcUrl(), d.getDefaultUserName(), d.getDefaultPassword());
+ }
+
+ public ClientDataSource(String jdbcDriver, String jdbcUrl, String defaultUserName, String defaultPassword) {
+ this.defaultPassword = defaultPassword;
+ this.defaultUserName = defaultUserName;
+ this.jdbcDriver = jdbcDriver;
+ this.jdbcUrl = jdbcUrl;
+ ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+ try {
+ Class.forName(jdbcDriver, true, classLoader);
+ } catch (ClassNotFoundException e) {
+ throw new IllegalStateException("Cannot use DataSource in client VM without the JDBC Driver in classpath: "+jdbcDriver, e);
+ } catch (NoClassDefFoundError e) {
+ throw new IllegalStateException("Cannot use DataSource in client VM without the JDBC Driver in classpath: "+jdbcDriver, e);
+ }
+ }
+
+ public Connection getConnection() throws SQLException {
+ return getConnection(defaultUserName, defaultPassword);
+ }
+
+ public Connection getConnection(String username, String password) throws SQLException {
+ Connection connection = DriverManager.getConnection(jdbcUrl, username, password);
+ return connection;
+ }
+
+ public int getLoginTimeout() throws SQLException {
+ return 0;
+ }
+
+ public PrintWriter getLogWriter() throws SQLException {
+ return null;
+ }
+
+ public void setLoginTimeout(int seconds) throws SQLException {
+ }
+
+ public void setLogWriter(PrintWriter out) throws SQLException {
+ }
+}
Added: incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/DataSourceMetaData.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/DataSourceMetaData.java?view=auto&rev=479930
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/DataSourceMetaData.java (added)
+++ incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/DataSourceMetaData.java Mon Nov 27 22:41:33 2006
@@ -0,0 +1,72 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.client;
+
+import java.io.Externalizable;
+import java.io.ObjectInput;
+import java.io.IOException;
+import java.io.ObjectOutput;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class DataSourceMetaData implements Externalizable {
+ private String jdbcUrl;
+ private String jdbcDriver;
+ private String defaultPassword;
+ private String defaultUserName;
+
+ public DataSourceMetaData() {
+ }
+
+ public DataSourceMetaData(String jdbcDriver, String jdbcUrl, String defaultUserName, String defaultPassword) {
+ this.defaultPassword = defaultPassword;
+ this.defaultUserName = defaultUserName;
+ this.jdbcDriver = jdbcDriver;
+ this.jdbcUrl = jdbcUrl;
+ }
+
+ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ jdbcDriver = (String) in.readObject();
+ jdbcUrl = (String) in.readObject();
+ defaultUserName = (String) in.readObject();
+ defaultPassword = (String) in.readObject();
+ }
+
+ public void writeExternal(ObjectOutput out) throws IOException {
+ out.writeObject(jdbcDriver);
+ out.writeObject(jdbcUrl);
+ out.writeObject(defaultUserName);
+ out.writeObject(defaultPassword);
+ }
+
+ public String getDefaultPassword() {
+ return defaultPassword;
+ }
+
+ public String getDefaultUserName() {
+ return defaultUserName;
+ }
+
+ public String getJdbcDriver() {
+ return jdbcDriver;
+ }
+
+ public String getJdbcUrl() {
+ return jdbcUrl;
+ }
+}
Modified: incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIContext.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIContext.java?view=diff&rev=479930&r1=479929&r2=479930
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIContext.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIContext.java Mon Nov 27 22:41:33 2006
@@ -31,6 +31,7 @@
import javax.naming.NamingException;
import javax.naming.AuthenticationException;
import javax.naming.spi.InitialContextFactory;
+import javax.sql.DataSource;
public class JNDIContext implements Serializable, InitialContextFactory, Context, RequestMethods, ResponseCodes {
@@ -164,6 +165,12 @@
else if (name.startsWith("java:")) name = name.replaceFirst("^java:","");
else if (!name.startsWith("/")) name = tail + name;
+ String prop = name.replaceFirst("comp/env/","");
+ String value = System.getProperty(prop);
+ if (value != null){
+ return parseEntry(prop, value);
+ }
+
JNDIRequest req = new JNDIRequest();
req.setRequestMethod(JNDIRequest.JNDI_LOOKUP);
req.setRequestString(name);
@@ -193,7 +200,8 @@
if (!name.endsWith("/")) name += '/';
subCtx.tail = name;
return subCtx;
-
+ case JNDI_DATA_SOURCE:
+ return createDataSource((DataSourceMetaData)res.getResult());
case JNDI_NOT_FOUND:
throw new NameNotFoundException(name + " not found");
@@ -208,6 +216,27 @@
default:
throw new RuntimeException("Invalid response from server :" + res.getResponseCode());
}
+ }
+
+ private Object parseEntry(String name, String value) throws NamingException {
+ try {
+ URI uri = new URI(value);
+ String scheme = uri.getScheme();
+ if (scheme.equals("datasource")){
+ uri = new URI(uri.getSchemeSpecificPart());
+ String driver = uri.getScheme();
+ String url = uri.getSchemeSpecificPart();
+ return new ClientDataSource(driver, url, null, null);
+ } else {
+ throw new UnsupportedOperationException("Unsupported Naming URI scheme '"+scheme+"'");
+ }
+ } catch (URISyntaxException e) {
+ throw (NamingException) new NamingException("Unparsable jndi entry '"+name+"="+value+"'. Exception: "+e.getMessage()).initCause(e);
+ }
+ }
+
+ private DataSource createDataSource(DataSourceMetaData dataSourceMetaData) {
+ return new ClientDataSource(dataSourceMetaData);
}
public Object lookup(Name name) throws NamingException {
Modified: incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIResponse.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIResponse.java?view=diff&rev=479930&r1=479929&r2=479930
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIResponse.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/JNDIResponse.java Mon Nov 27 22:41:33 2006
@@ -68,6 +68,11 @@
m.readExternal(in);
result = m;
break;
+ case JNDI_DATA_SOURCE:
+ DataSourceMetaData ds = new DataSourceMetaData();
+ ds.readExternal(in);
+ result = ds;
+ break;
}
}
@@ -90,7 +95,10 @@
EJBMetaDataImpl m = (EJBMetaDataImpl) result;
m.writeExternal(out);
break;
-
+ case JNDI_DATA_SOURCE:
+ DataSourceMetaData ds = (DataSourceMetaData) result;
+ ds.writeExternal(out);
+ break;
}
}
}
Modified: incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/ResponseCodes.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/ResponseCodes.java?view=diff&rev=479930&r1=479929&r2=479930
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/ResponseCodes.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/ResponseCodes.java Mon Nov 27 22:41:33 2006
@@ -39,5 +39,6 @@
public static final int JNDI_ERROR = 19;
public static final int EJB_OK_FOUND_ENUMERATION = 20;
public static final int JNDI_BUSINESS_OBJECT = 21;
+ public static final int JNDI_DATA_SOURCE = 22;
}
Modified: incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java?view=diff&rev=479930&r1=479929&r2=479930
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java Mon Nov 27 22:41:33 2006
@@ -25,6 +25,7 @@
import org.apache.openejb.DeploymentInfo;
import org.apache.openejb.ProxyInfo;
+import org.apache.openejb.resource.jdbc.JdbcConnectionFactory;
import org.apache.openejb.util.proxy.ProxyManager;
import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
import org.apache.openejb.core.ivm.EjbHomeProxyHandler;
@@ -37,6 +38,7 @@
import org.apache.openejb.client.JNDIResponse;
import org.apache.openejb.client.RequestMethods;
import org.apache.openejb.client.ResponseCodes;
+import org.apache.openejb.client.DataSourceMetaData;
class JndiRequestHandler implements ResponseCodes, RequestMethods {
private final EjbDaemon daemon;
@@ -85,6 +87,13 @@
return;
} else if (object == null) {
throw new NullPointerException("lookup of '"+name+"' returned null");
+ } else if (object instanceof JdbcConnectionFactory){
+ JdbcConnectionFactory cf = (JdbcConnectionFactory) object;
+ DataSourceMetaData dataSourceMetaData = new DataSourceMetaData(cf.getJdbcDriver(), cf.getJdbcUrl(), cf.getDefaultUserName(), cf.getDefaultPassword());
+ res.setResponseCode(JNDI_DATA_SOURCE);
+ res.setResult(dataSourceMetaData);
+ res.writeExternal(out);
+ return;
}
} catch (NameNotFoundException e) {
res.setResponseCode(JNDI_NOT_FOUND);
@@ -175,4 +184,4 @@
res.writeExternal(out);
}
-}
\ No newline at end of file
+}
Modified: incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java?view=diff&rev=479930&r1=479929&r2=479930
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java Mon Nov 27 22:41:33 2006
@@ -275,7 +275,11 @@
System.out.println("[] received stop signal");
stop = true;
for (int i = 0; i < daemons.length; i++) {
- daemons[i].stop();
+ try {
+ daemons[i].stop();
+ } catch (ServiceException e) {
+ logger.fatal("Service Shutdown Failed: "+daemons[i].getName()+". Exception: "+e.getMessage(), e);
+ }
}
notifyAll();
}