Author: dblevins
Date: Sun Nov 11 18:12:39 2007
New Revision: 594005
URL: http://svn.apache.org/viewvc?rev=594005&view=rev
Log:
Actually functioning, OPENEJB-253: Per EJB or EJB Interface JNDI Name
declaration
Added:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameTest.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/Jndi.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java?rev=594005&r1=594004&r2=594005&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbJarInfoBuilder.java
Sun Nov 11 18:12:39 2007
@@ -38,6 +38,7 @@
import org.apache.openejb.assembler.classic.StatefulBeanInfo;
import org.apache.openejb.assembler.classic.StatelessBeanInfo;
import org.apache.openejb.assembler.classic.ApplicationExceptionInfo;
+import org.apache.openejb.assembler.classic.JndiNameInfo;
import org.apache.openejb.jee.ActivationConfig;
import org.apache.openejb.jee.ActivationConfigProperty;
import org.apache.openejb.jee.CallbackMethod;
@@ -74,6 +75,7 @@
import org.apache.openejb.jee.ApplicationException;
import org.apache.openejb.jee.oejb3.EjbDeployment;
import org.apache.openejb.jee.oejb3.ResourceLink;
+import org.apache.openejb.jee.oejb3.Jndi;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
import org.apache.openejb.util.Messages;
@@ -160,6 +162,7 @@
beanInfo.runAs = bean.getSecurityIdentity().getRunAs();
}
+ initJndiNames(ejbds, bean, beanInfo);
}
if (jar.getEjbJar().getAssemblyDescriptor() != null) {
@@ -180,6 +183,16 @@
}
return ejbJar;
+ }
+
+ private void initJndiNames(Map<String, EjbDeployment> ejbds,
EnterpriseBean bean, EnterpriseBeanInfo info) {
+ EjbDeployment deployment = ejbds.get(info.ejbDeploymentId);
+ for (Jndi jndi : deployment.getJndi()) {
+ JndiNameInfo jndiNameInfo = new JndiNameInfo();
+ jndiNameInfo.intrface = jndi.getInterface();
+ jndiNameInfo.name = jndi.getName();
+ info.jndiNamess.add(jndiNameInfo);
+ }
}
private void initRelationships(EjbModule jar, Map<String,
EnterpriseBeanInfo> infos) throws OpenEJBException {
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java?rev=594005&r1=594004&r2=594005&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
Sun Nov 11 18:12:39 2007
@@ -49,6 +49,10 @@
this(Thread.currentThread().getContextClassLoader(), null, ejbJar,
null);
}
+ public EjbModule(EjbJar ejbJar, OpenejbJar openejbJar){
+ this(Thread.currentThread().getContextClassLoader(), null, ejbJar,
openejbJar);
+ }
+
public EjbModule(ClassLoader classLoader, String moduleId, String jarURI,
EjbJar ejbJar, OpenejbJar openejbJar) {
if (classLoader == null) {
throw new NullPointerException("classLoader is null");
Added:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameTest.java?rev=594005&view=auto
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameTest.java
(added)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/JndiNameTest.java
Sun Nov 11 18:12:39 2007
@@ -0,0 +1,78 @@
+/**
+ * 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.config;
+
+import junit.framework.TestCase;
+import org.apache.openejb.assembler.classic.Assembler;
+import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
+import org.apache.openejb.assembler.classic.SecurityServiceInfo;
+import org.apache.openejb.assembler.classic.StatelessSessionContainerInfo;
+import org.apache.openejb.assembler.classic.TransactionServiceInfo;
+import org.apache.openejb.core.ivm.naming.InitContextFactory;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.StatelessBean;
+import org.apache.openejb.jee.oejb3.EjbDeployment;
+import org.apache.openejb.jee.oejb3.Jndi;
+import org.apache.openejb.jee.oejb3.OpenejbJar;
+
+import javax.ejb.Local;
+import javax.naming.InitialContext;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class JndiNameTest extends TestCase {
+
+ public void test() throws Exception {
+ System.setProperty(javax.naming.Context.INITIAL_CONTEXT_FACTORY,
InitContextFactory.class.getName());
+
+ ConfigurationFactory config = new ConfigurationFactory();
+ Assembler assembler = new Assembler();
+
+
assembler.createProxyFactory(config.configureService(ProxyFactoryInfo.class));
+
assembler.createTransactionManager(config.configureService(TransactionServiceInfo.class));
+
assembler.createSecurityService(config.configureService(SecurityServiceInfo.class));
+
+ // containers
+ StatelessSessionContainerInfo statelessContainerInfo =
config.configureService(StatelessSessionContainerInfo.class);
+ assembler.createContainer(statelessContainerInfo);
+
+ // Setup the descriptor information
+
+ EjbModule ejbModule = new EjbModule(new EjbJar(), new OpenejbJar());
+ ejbModule.getEjbJar().addEnterpriseBean(new
StatelessBean(FooBean.class));
+
+ EjbDeployment ejbDeployment = new EjbDeployment(null, "FooBean",
"FooBean");
+ ejbDeployment.getJndi().add(new Jndi("thename", "Local"));
+ ejbModule.getOpenejbJar().addEjbDeployment(ejbDeployment);
+
+ assembler.createApplication(config.configureApplication(ejbModule));
+
+ InitialContext initialContext = new InitialContext();
+ Object o = initialContext.lookup("thename");
+ assertNotNull(o);
+ }
+
+ @Local
+ public static interface Foo {
+
+ }
+
+ public static class FooBean implements Foo {
+
+ }
+}
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/Jndi.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/Jndi.java?rev=594005&r1=594004&r2=594005&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/Jndi.java
(original)
+++
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb3/Jndi.java
Sun Nov 11 18:12:39 2007
@@ -37,8 +37,8 @@
}
public Jndi(String name, String intrface) {
- this.name = intrface;
- this.intrface = name;
+ this.name = name;
+ this.intrface = intrface;
}
public String getName() {
