Author: dblevins
Date: Thu Jul 15 18:21:22 2010
New Revision: 964520
URL: http://svn.apache.org/viewvc?rev=964520&view=rev
Log:
Trivial impl for OPENEJB-1183: javax.ejb.embeddable.EJBContainer
OPENEJB-1184: javax.ejb.spi.EJBContainerProvider
Added:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
(with props)
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/services/javax.ejb.spi.EJBContainerProvider
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContext.java
Added:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java?rev=964520&view=auto
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
(added)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
Thu Jul 15 18:21:22 2010
@@ -0,0 +1,69 @@
+/**
+ * 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;
+
+import org.apache.openejb.client.LocalInitialContext;
+import org.apache.openejb.client.LocalInitialContextFactory;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.ejb.spi.EJBContainerProvider;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import java.util.Hashtable;
+import java.util.Map;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class OpenEjbContainer extends EJBContainer {
+
+ private final Context context;
+
+ public OpenEjbContainer(Context context) {
+ this.context = context;
+ }
+
+ @Override
+ public void close() {
+ try {
+ context.close();
+ } catch (NamingException e) {
+ throw new IllegalStateException(e);
+ }
+ }
+
+ @Override
+ public Context getContext() {
+ return context;
+ }
+
+
+ public static class Provider implements EJBContainerProvider {
+
+ @Override
+ public EJBContainer createEJBContainer(Map<?, ?> properties) {
+ try {
+ final Hashtable hashtable = new Hashtable(properties);
+ hashtable.put(LocalInitialContext.ON_CLOSE,
LocalInitialContext.Close.DESTROY.name());
+ final Context context = new
LocalInitialContextFactory().getInitialContext(hashtable);
+ return new OpenEjbContainer(context);
+ } catch (NamingException e) {
+ throw new IllegalStateException(e);
+ }
+ }
+ }
+}
Propchange:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContext.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContext.java?rev=964520&r1=964519&r2=964520&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContext.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/client/LocalInitialContext.java
Thu Jul 15 18:21:22 2010
@@ -51,7 +51,7 @@ public class LocalInitialContext extends
private Properties properties;
private Object clientIdentity;
- private static final String ON_CLOSE =
"openejb.embedded.initialcontext.close";
+ public static final String ON_CLOSE =
"openejb.embedded.initialcontext.close";
private Close onClose;
private Options options;
private ServiceManagerProxy serviceManager;
Added:
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/services/javax.ejb.spi.EJBContainerProvider
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/services/javax.ejb.spi.EJBContainerProvider?rev=964520&view=auto
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/services/javax.ejb.spi.EJBContainerProvider
(added)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/services/javax.ejb.spi.EJBContainerProvider
Thu Jul 15 18:21:22 2010
@@ -0,0 +1 @@
+org.apache.openejb.OpenEjbContainer$Provider
\ No newline at end of file