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 2009/09/29 02:15:43 UTC
svn commit: r819783 - in /openejb/trunk/openejb3/container/openejb-core/src:
main/java/org/apache/openejb/assembler/classic/
main/resources/org/apache/openejb/assembler/classic/
test/java/org/apache/openejb/config/
Author: dblevins
Date: Tue Sep 29 00:15:42 2009
New Revision: 819783
URL: http://svn.apache.org/viewvc?rev=819783&view=rev
Log:
Log all LocalClients found. Added a test case to verify that LocalClients will not fail if they have not used the injection annotations.
Added:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientNoInjectionTest.java
- copied, changed from r817378, openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientTest.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/assembler/classic/Messages.properties
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=819783&r1=819782&r2=819783&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Tue Sep 29 00:15:42 2009
@@ -633,6 +633,7 @@
for (String clientClassName : clientInfo.localClients) {
containerSystem.getJNDIContext().bind("openejb/client/" + clientClassName, clientInfo.moduleId);
+ logger.getChildLogger("client").info("createApplication.createLocalClient", clientClassName, clientInfo.moduleId);
}
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/assembler/classic/Messages.properties
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/assembler/classic/Messages.properties?rev=819783&r1=819782&r2=819783&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/assembler/classic/Messages.properties (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/resources/org/apache/openejb/assembler/classic/Messages.properties Tue Sep 29 00:15:42 2009
@@ -59,6 +59,9 @@
# info("createApplication.createdEjb", beanInfo.ejbDeploymentId, beanInfo.ejbName, beanInfo.containerId);
createApplication.createdEjb = Created Ejb(deployment-id={0}, ejb-name={1}, container={2})
+# info("createApplication.createLocalClient", clientClassName, clientInfo.moduleId);
+createApplication.createLocalClient = LocalClient(class={0}, module={1})
+
# info("createApplication.success", appInfo.jarPath);
createApplication.success = Deployed Application(path={0})
Copied: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientNoInjectionTest.java (from r817378, openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientTest.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientNoInjectionTest.java?p2=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientNoInjectionTest.java&p1=openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientTest.java&r1=817378&r2=819783&rev=819783&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientTest.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/LocalClientNoInjectionTest.java Tue Sep 29 00:15:42 2009
@@ -52,37 +52,7 @@
import java.io.Serializable;
import java.util.Properties;
-public class LocalClientTest extends TestCase {
-
- @EJB
- private Everything local;
-
- @Resource
- private UserTransaction useerTransaction;
-
- @Resource
- private DataSource daataSource;
-
- @Resource
- private Queue quueue;
-
- @Resource
- private Topic toopic;
-
- @Resource
- private ConnectionFactory coonnectionFactory;
-
- @Resource
- private QueueConnectionFactory queueCoonnectionFactory;
-
- @Resource
- private TopicConnectionFactory topicCoonnectionFactory;
-
- @PersistenceUnit
- private EntityManagerFactory emf;
-
- @PersistenceContext
- private EntityManager em;
+public class LocalClientNoInjectionTest extends TestCase {
public void setUp() throws OpenEJBException, NamingException, IOException {
ConfigurationFactory config = new ConfigurationFactory();
@@ -104,7 +74,7 @@
clientModule.getLocalClients().add(this.getClass().getName());
app.getClientModules().add(clientModule);
-
+
assembler.createApplication(config.configureApplication(app));
}
@@ -115,63 +85,6 @@
InitialContext context = new InitialContext(properties);
context.bind("inject", this);
- // @EJB
- Reference reference = new Reference("test");
-
- assertNotNull("The EJB BusinessRemote is null", local);
- assertEquals(reference, local.echo(reference));
- assertSame(reference, local.echo(reference)); // pass by reference
-
- // @Resource DataSource
- assertNotNull("The DataSource is null", daataSource);
-
- // @Resource Topic
- assertNotNull("The Topic is null", toopic);
-
- // @Resource Queue
- assertNotNull("The Queue is null", quueue);
-
- // @Resource ConnectionFactory
- assertNotNull("The ConnectionFactory is null", coonnectionFactory);
- testJmsConnection(coonnectionFactory.createConnection());
-
- // @Resource QueueConnectionFactory
- assertNotNull("The QueueConnectionFactory is null", queueCoonnectionFactory);
- testJmsConnection(queueCoonnectionFactory.createConnection());
-
- // @Resource TopicConnectionFactory
- assertNotNull("The TopicConnectionFactory is null", queueCoonnectionFactory);
- testJmsConnection(queueCoonnectionFactory.createConnection());
-
- // @Resource UserTransaction
- assertNotNull("The UserTransaction is null", useerTransaction);
-
- // @PersistenceUnit
- assertNotNull("The EntityManagerFactory is null", emf);
-
- // @PersistenceContext
- assertNotNull("The EntityManager is null", em);
- }
-
- public void lookupPersistenceContext() {
- assertNotNull("The EntityManager is null", em);
-
- try {
- // call a do nothing method to assure entity manager actually exists
- em.getFlushMode();
- } catch (Exception e) {
- fail("Received Exception " + e.getClass() + " : " + e.getMessage());
- }
- }
-
- private void testJmsConnection(javax.jms.Connection connection) throws JMSException {
- Session session = connection.createSession(false, Session.DUPS_OK_ACKNOWLEDGE);
- Topic topic = session.createTopic("test");
- MessageProducer producer = session.createProducer(topic);
- producer.send(session.createMessage());
- producer.close();
- session.close();
- connection.close();
}
@Local
@@ -212,4 +125,4 @@
}
}
-}
+}
\ No newline at end of file