You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2015/09/25 12:42:43 UTC
[08/33] tomee git commit: Align SNAPSHOT versions & reformat examples
http://git-wip-us.apache.org/repos/asf/tomee/blob/f9f1b8ad/examples/simple-mdb-with-descriptor/src/test/java/org/superbiz/mdbdesc/ChatBeanTest.java
----------------------------------------------------------------------
diff --git a/examples/simple-mdb-with-descriptor/src/test/java/org/superbiz/mdbdesc/ChatBeanTest.java b/examples/simple-mdb-with-descriptor/src/test/java/org/superbiz/mdbdesc/ChatBeanTest.java
index 79ee86b..c69281c 100644
--- a/examples/simple-mdb-with-descriptor/src/test/java/org/superbiz/mdbdesc/ChatBeanTest.java
+++ b/examples/simple-mdb-with-descriptor/src/test/java/org/superbiz/mdbdesc/ChatBeanTest.java
@@ -1,85 +1,85 @@
-/**
- * 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.
- */
-//START SNIPPET: code
-package org.superbiz.mdb;
-
-import junit.framework.TestCase;
-
-import javax.annotation.Resource;
-import javax.ejb.embeddable.EJBContainer;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
-public class ChatBeanTest extends TestCase {
-
- @Resource
- private ConnectionFactory connectionFactory;
-
- @Resource(name = "ChatBean")
- private Queue questionQueue;
-
- @Resource(name = "AnswerQueue")
- private Queue answerQueue;
-
- public void test() throws Exception {
-
- EJBContainer.createEJBContainer().getContext().bind("inject", this);
-
- final Connection connection = connectionFactory.createConnection();
-
- connection.start();
-
- final Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- final MessageProducer questions = session.createProducer(questionQueue);
-
- final MessageConsumer answers = session.createConsumer(answerQueue);
-
- sendText("Hello World!", questions, session);
-
- assertEquals("Hello, Test Case!", receiveText(answers));
-
- sendText("How are you?", questions, session);
-
- assertEquals("I'm doing well.", receiveText(answers));
-
- sendText("Still spinning?", questions, session);
-
- assertEquals("Once every day, as usual.", receiveText(answers));
-
- }
-
- private void sendText(String text, MessageProducer questions, Session session) throws JMSException {
-
- questions.send(session.createTextMessage(text));
-
- }
-
- private String receiveText(MessageConsumer answers) throws JMSException {
-
- return ((TextMessage) answers.receive(1000)).getText();
-
- }
-
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.
+ */
+//START SNIPPET: code
+package org.superbiz.mdb;
+
+import junit.framework.TestCase;
+
+import javax.annotation.Resource;
+import javax.ejb.embeddable.EJBContainer;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
+public class ChatBeanTest extends TestCase {
+
+ @Resource
+ private ConnectionFactory connectionFactory;
+
+ @Resource(name = "ChatBean")
+ private Queue questionQueue;
+
+ @Resource(name = "AnswerQueue")
+ private Queue answerQueue;
+
+ public void test() throws Exception {
+
+ EJBContainer.createEJBContainer().getContext().bind("inject", this);
+
+ final Connection connection = connectionFactory.createConnection();
+
+ connection.start();
+
+ final Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ final MessageProducer questions = session.createProducer(questionQueue);
+
+ final MessageConsumer answers = session.createConsumer(answerQueue);
+
+ sendText("Hello World!", questions, session);
+
+ assertEquals("Hello, Test Case!", receiveText(answers));
+
+ sendText("How are you?", questions, session);
+
+ assertEquals("I'm doing well.", receiveText(answers));
+
+ sendText("Still spinning?", questions, session);
+
+ assertEquals("Once every day, as usual.", receiveText(answers));
+
+ }
+
+ private void sendText(String text, MessageProducer questions, Session session) throws JMSException {
+
+ questions.send(session.createTextMessage(text));
+
+ }
+
+ private String receiveText(MessageConsumer answers) throws JMSException {
+
+ return ((TextMessage) answers.receive(1000)).getText();
+
+ }
+
+}
+//END SNIPPET: code
http://git-wip-us.apache.org/repos/asf/tomee/blob/f9f1b8ad/examples/simple-mdb/src/main/java/org/superbiz/mdb/ChatBean.java
----------------------------------------------------------------------
diff --git a/examples/simple-mdb/src/main/java/org/superbiz/mdb/ChatBean.java b/examples/simple-mdb/src/main/java/org/superbiz/mdb/ChatBean.java
index 4b5a464..8fd1556 100644
--- a/examples/simple-mdb/src/main/java/org/superbiz/mdb/ChatBean.java
+++ b/examples/simple-mdb/src/main/java/org/superbiz/mdb/ChatBean.java
@@ -1,98 +1,98 @@
-/**
- * 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.
- */
-//START SNIPPET: code
-package org.superbiz.mdb;
-
-import javax.annotation.Resource;
-import javax.ejb.MessageDriven;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.DeliveryMode;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
-@MessageDriven
-public class ChatBean implements MessageListener {
-
- @Resource
- private ConnectionFactory connectionFactory;
-
- @Resource(name = "AnswerQueue")
- private Queue answerQueue;
-
- public void onMessage(Message message) {
- try {
-
- final TextMessage textMessage = (TextMessage) message;
- final String question = textMessage.getText();
-
- if ("Hello World!".equals(question)) {
-
- respond("Hello, Test Case!");
-
- } else if ("How are you?".equals(question)) {
-
- respond("I'm doing well.");
-
- } else if ("Still spinning?".equals(question)) {
-
- respond("Once every day, as usual.");
-
- }
- } catch (JMSException e) {
- throw new IllegalStateException(e);
- }
- }
-
- private void respond(String text) throws JMSException {
-
- Connection connection = null;
- Session session = null;
-
- try {
- connection = connectionFactory.createConnection();
- connection.start();
-
- // Create a Session
- session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- // Create a MessageProducer from the Session to the Topic or Queue
- MessageProducer producer = session.createProducer(answerQueue);
- producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
-
- // Create a message
- TextMessage message = session.createTextMessage(text);
-
- // Tell the producer to send the message
- producer.send(message);
- } finally {
- // Clean up
- if (session != null) {
- session.close();
- }
- if (connection != null) {
- connection.close();
- }
- }
- }
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.
+ */
+//START SNIPPET: code
+package org.superbiz.mdb;
+
+import javax.annotation.Resource;
+import javax.ejb.MessageDriven;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.DeliveryMode;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
+@MessageDriven
+public class ChatBean implements MessageListener {
+
+ @Resource
+ private ConnectionFactory connectionFactory;
+
+ @Resource(name = "AnswerQueue")
+ private Queue answerQueue;
+
+ public void onMessage(Message message) {
+ try {
+
+ final TextMessage textMessage = (TextMessage) message;
+ final String question = textMessage.getText();
+
+ if ("Hello World!".equals(question)) {
+
+ respond("Hello, Test Case!");
+
+ } else if ("How are you?".equals(question)) {
+
+ respond("I'm doing well.");
+
+ } else if ("Still spinning?".equals(question)) {
+
+ respond("Once every day, as usual.");
+
+ }
+ } catch (JMSException e) {
+ throw new IllegalStateException(e);
+ }
+ }
+
+ private void respond(String text) throws JMSException {
+
+ Connection connection = null;
+ Session session = null;
+
+ try {
+ connection = connectionFactory.createConnection();
+ connection.start();
+
+ // Create a Session
+ session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ // Create a MessageProducer from the Session to the Topic or Queue
+ MessageProducer producer = session.createProducer(answerQueue);
+ producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
+
+ // Create a message
+ TextMessage message = session.createTextMessage(text);
+
+ // Tell the producer to send the message
+ producer.send(message);
+ } finally {
+ // Clean up
+ if (session != null) {
+ session.close();
+ }
+ if (connection != null) {
+ connection.close();
+ }
+ }
+ }
+}
+//END SNIPPET: code
http://git-wip-us.apache.org/repos/asf/tomee/blob/f9f1b8ad/examples/simple-mdb/src/test/java/org/superbiz/mdb/ChatBeanTest.java
----------------------------------------------------------------------
diff --git a/examples/simple-mdb/src/test/java/org/superbiz/mdb/ChatBeanTest.java b/examples/simple-mdb/src/test/java/org/superbiz/mdb/ChatBeanTest.java
index a360d10..700cc96 100644
--- a/examples/simple-mdb/src/test/java/org/superbiz/mdb/ChatBeanTest.java
+++ b/examples/simple-mdb/src/test/java/org/superbiz/mdb/ChatBeanTest.java
@@ -1,84 +1,84 @@
-/**
- * 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.
- */
-//START SNIPPET: code
-package org.superbiz.mdb;
-
-import junit.framework.TestCase;
-
-import javax.annotation.Resource;
-import javax.ejb.embeddable.EJBContainer;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
-public class ChatBeanTest extends TestCase {
-
- @Resource
- private ConnectionFactory connectionFactory;
-
- @Resource(name = "ChatBean")
- private Queue questionQueue;
-
- @Resource(name = "AnswerQueue")
- private Queue answerQueue;
-
- public void test() throws Exception {
- EJBContainer.createEJBContainer().getContext().bind("inject", this);
-
- final Connection connection = connectionFactory.createConnection();
-
- connection.start();
-
- final Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-
- final MessageProducer questions = session.createProducer(questionQueue);
-
- final MessageConsumer answers = session.createConsumer(answerQueue);
-
- sendText("Hello World!", questions, session);
-
- assertEquals("Hello, Test Case!", receiveText(answers));
-
- sendText("How are you?", questions, session);
-
- assertEquals("I'm doing well.", receiveText(answers));
-
- sendText("Still spinning?", questions, session);
-
- assertEquals("Once every day, as usual.", receiveText(answers));
-
- }
-
- private void sendText(String text, MessageProducer questions, Session session) throws JMSException {
-
- questions.send(session.createTextMessage(text));
-
- }
-
- private String receiveText(MessageConsumer answers) throws JMSException {
-
- return ((TextMessage) answers.receive(1000)).getText();
-
- }
-
-}
-//END SNIPPET: code
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.
+ */
+//START SNIPPET: code
+package org.superbiz.mdb;
+
+import junit.framework.TestCase;
+
+import javax.annotation.Resource;
+import javax.ejb.embeddable.EJBContainer;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
+public class ChatBeanTest extends TestCase {
+
+ @Resource
+ private ConnectionFactory connectionFactory;
+
+ @Resource(name = "ChatBean")
+ private Queue questionQueue;
+
+ @Resource(name = "AnswerQueue")
+ private Queue answerQueue;
+
+ public void test() throws Exception {
+ EJBContainer.createEJBContainer().getContext().bind("inject", this);
+
+ final Connection connection = connectionFactory.createConnection();
+
+ connection.start();
+
+ final Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ final MessageProducer questions = session.createProducer(questionQueue);
+
+ final MessageConsumer answers = session.createConsumer(answerQueue);
+
+ sendText("Hello World!", questions, session);
+
+ assertEquals("Hello, Test Case!", receiveText(answers));
+
+ sendText("How are you?", questions, session);
+
+ assertEquals("I'm doing well.", receiveText(answers));
+
+ sendText("Still spinning?", questions, session);
+
+ assertEquals("Once every day, as usual.", receiveText(answers));
+
+ }
+
+ private void sendText(String text, MessageProducer questions, Session session) throws JMSException {
+
+ questions.send(session.createTextMessage(text));
+
+ }
+
+ private String receiveText(MessageConsumer answers) throws JMSException {
+
+ return ((TextMessage) answers.receive(1000)).getText();
+
+ }
+
+}
+//END SNIPPET: code
http://git-wip-us.apache.org/repos/asf/tomee/blob/f9f1b8ad/examples/simple-rest/src/main/java/org/superbiz/rest/GreetingService.java
----------------------------------------------------------------------
diff --git a/examples/simple-rest/src/main/java/org/superbiz/rest/GreetingService.java b/examples/simple-rest/src/main/java/org/superbiz/rest/GreetingService.java
index 6b1449a..0ee554d 100644
--- a/examples/simple-rest/src/main/java/org/superbiz/rest/GreetingService.java
+++ b/examples/simple-rest/src/main/java/org/superbiz/rest/GreetingService.java
@@ -1,35 +1,35 @@
-/**
- * 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.superbiz.rest;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-
-@Path("/greeting")
-public class GreetingService {
-
- @GET
- public String message() {
- return "Hi REST!";
- }
-
- @POST
- public String lowerCase(final String message) {
- return "Hi REST!".toLowerCase();
- }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.rest;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+
+@Path("/greeting")
+public class GreetingService {
+
+ @GET
+ public String message() {
+ return "Hi REST!";
+ }
+
+ @POST
+ public String lowerCase(final String message) {
+ return "Hi REST!".toLowerCase();
+ }
+}
http://git-wip-us.apache.org/repos/asf/tomee/blob/f9f1b8ad/examples/simple-rest/src/test/java/org/superbiz/rest/GreetingServiceTest.java
----------------------------------------------------------------------
diff --git a/examples/simple-rest/src/test/java/org/superbiz/rest/GreetingServiceTest.java b/examples/simple-rest/src/test/java/org/superbiz/rest/GreetingServiceTest.java
index 8ad7a4d..d7e6732 100644
--- a/examples/simple-rest/src/test/java/org/superbiz/rest/GreetingServiceTest.java
+++ b/examples/simple-rest/src/test/java/org/superbiz/rest/GreetingServiceTest.java
@@ -1,53 +1,53 @@
-/**
- * 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.superbiz.rest;
-
-import org.apache.cxf.jaxrs.client.WebClient;
-import org.apache.openejb.jee.WebApp;
-import org.apache.openejb.junit.ApplicationComposer;
-import org.apache.openejb.testing.Classes;
-import org.apache.openejb.testing.EnableServices;
-import org.apache.openejb.testing.Module;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.io.IOException;
-
-import static org.junit.Assert.assertEquals;
-
-@EnableServices(value = "jaxrs")
-@RunWith(ApplicationComposer.class)
-public class GreetingServiceTest {
-
- @Module
- @Classes(GreetingService.class)
- public WebApp app() {
- return new WebApp().contextRoot("test");
- }
-
- @Test
- public void get() throws IOException {
- final String message = WebClient.create("http://localhost:4204").path("/test/greeting/").get(String.class);
- assertEquals("Hi REST!", message);
- }
-
- @Test
- public void post() throws IOException {
- final String message = WebClient.create("http://localhost:4204").path("/test/greeting/").post("Hi REST!", String.class);
- assertEquals("hi rest!", message);
- }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.rest;
+
+import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.openejb.jee.WebApp;
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.testing.Classes;
+import org.apache.openejb.testing.EnableServices;
+import org.apache.openejb.testing.Module;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+
+import static org.junit.Assert.assertEquals;
+
+@EnableServices(value = "jaxrs")
+@RunWith(ApplicationComposer.class)
+public class GreetingServiceTest {
+
+ @Module
+ @Classes(GreetingService.class)
+ public WebApp app() {
+ return new WebApp().contextRoot("test");
+ }
+
+ @Test
+ public void get() throws IOException {
+ final String message = WebClient.create("http://localhost:4204").path("/test/greeting/").get(String.class);
+ assertEquals("Hi REST!", message);
+ }
+
+ @Test
+ public void post() throws IOException {
+ final String message = WebClient.create("http://localhost:4204").path("/test/greeting/").post("Hi REST!", String.class);
+ assertEquals("hi rest!", message);
+ }
+}
http://git-wip-us.apache.org/repos/asf/tomee/blob/f9f1b8ad/examples/simple-singleton/README.md
----------------------------------------------------------------------
diff --git a/examples/simple-singleton/README.md b/examples/simple-singleton/README.md
index 60aaee8..d24e14d 100644
--- a/examples/simple-singleton/README.md
+++ b/examples/simple-singleton/README.md
@@ -1,344 +1,344 @@
-Title: Simple Singleton
-
-As the name implies a `javax.ejb.Singleton` is a session bean with a guarantee that there is at most one instance in the application.
-
-What it gives that is completely missing in EJB 3.0 and prior versions is the ability to have an EJB that is notified when the application starts and notified when the application stops. So you can do all sorts of things that you previously could only do with a load-on-startup servlet. It also gives you a place to hold data that pertains to the entire application and all users using it, without the need for a static. Additionally, Singleton beans can be invoked by several threads at one time similar to a Servlet.
-
-See the [Singleton Beans](../../singleton-beans.html) page for a full description of the javax.ejb.Singleton api.
-
-#The Code
-
-## PropertyRegistry <small>Bean-Managed Concurrency</small>
-
-Here we see a bean that uses the Bean-Managed Concurrency option as well as the @Startup annotation which causes the bean to be instantiated by the container when the application starts. Singleton beans with @ConcurrencyManagement(BEAN) are responsible for their own thread-safety. The bean shown is a simple properties "registry" and provides a place where options could be set and retrieved by all beans in the application.
-
- package org.superbiz.registry;
-
- import javax.annotation.PostConstruct;
- import javax.annotation.PreDestroy;
- import javax.ejb.ConcurrencyManagement;
- import javax.ejb.Singleton;
- import javax.ejb.Startup;
- import java.util.Properties;
-
- import static javax.ejb.ConcurrencyManagementType.BEAN;
-
- @Singleton
- @Startup
- @ConcurrencyManagement(BEAN)
- public class PropertyRegistry {
-
- // Note the java.util.Properties object is a thread-safe
- // collections that uses synchronization. If it didn't
- // you would have to use some form of synchronization
- // to ensure the PropertyRegistryBean is thread-safe.
- private final Properties properties = new Properties();
-
- // The @Startup annotation ensures that this method is
- // called when the application starts up.
- @PostConstruct
- public void applicationStartup() {
- properties.putAll(System.getProperties());
- }
-
- @PreDestroy
- public void applicationShutdown() {
- properties.clear();
- }
-
- public String getProperty(final String key) {
- return properties.getProperty(key);
- }
-
- public String setProperty(final String key, final String value) {
- return (String) properties.setProperty(key, value);
- }
-
- public String removeProperty(final String key) {
- return (String) properties.remove(key);
- }
- }
-
-## ComponentRegistry <small>Container-Managed Concurrency</small>
-
-Here we see a bean that uses the Container-Managed Concurrency option, the default. With @ConcurrencyManagement(CONTAINER) the container controls whether multi-threaded access should be allowed to the bean (`@Lock(READ)`) or if single-threaded access should be enforced (`@Lock(WRITE)`).
-
- package org.superbiz.registry;
-
- import javax.ejb.Lock;
- import javax.ejb.Singleton;
- import java.util.ArrayList;
- import java.util.Collection;
- import java.util.HashMap;
- import java.util.Map;
-
- import static javax.ejb.LockType.READ;
- import static javax.ejb.LockType.WRITE;
-
- @Singleton
- @Lock(READ)
- public class ComponentRegistry {
-
- private final Map<Class, Object> components = new HashMap<Class, Object>();
-
- public <T> T getComponent(final Class<T> type) {
- return (T) components.get(type);
- }
-
- public Collection<?> getComponents() {
- return new ArrayList(components.values());
- }
-
- @Lock(WRITE)
- public <T> T setComponent(final Class<T> type, final T value) {
- return (T) components.put(type, value);
- }
-
- @Lock(WRITE)
- public <T> T removeComponent(final Class<T> type) {
- return (T) components.remove(type);
- }
- }
-
-Unless specified explicitly on the bean class or a method, the default `@Lock` value is `@Lock(WRITE)`. The code above uses the `@Lock(READ)` annotation on bean class to change the default so that multi-threaded access is granted by default. We then only need to apply the `@Lock(WRITE)` annotation to the methods that modify the state of the bean.
-
-Essentially `@Lock(READ)` allows multithreaded access to the Singleton bean instance unless someone is invoking an `@Lock(WRITE)` method. With `@Lock(WRITE)`, the thread invoking the bean will be guaranteed to have exclusive access to the Singleton bean instance for the duration of its invocation. This combination allows the bean instance to use data types that are not normally thread safe. Great care must still be used, though.
-
-In the example we see `ComponentRegistryBean` using a `java.util.HashMap` which is not synchronized. To make this ok we do three things:
-
- 1. Encapsulation. We don't expose the HashMap instance directly; including its iterators, key set, value set or entry set.
- 1. We use `@Lock(WRITE)` on the methods that mutate the map such as the `put()` and `remove()` methods.
- 1. We use `@Lock(READ)` on the `get()` and `values()` methods as they do not change the map state and are guaranteed not to be called at the same as any of the `@Lock(WRITE)` methods, so we know the state of the HashMap is no being mutated and therefore safe for reading.
-
-The end result is that the threading model for this bean will switch from multi-threaded access to single-threaded access dynamically as needed, depending on the method being invoked. This gives Singletons a bit of an advantage over Servlets for processing multi-threaded requests.
-
-See the [Singleton Beans](../../singleton-beans.html) page for more advanced details on Container-Managed Concurrency.
-
-# Testing
-
-
-## ComponentRegistryTest
-
- package org.superbiz.registry;
-
- import org.junit.AfterClass;
- import org.junit.Assert;
- import org.junit.Test;
-
- import javax.ejb.embeddable.EJBContainer;
- import javax.naming.Context;
- import java.net.URI;
- import java.util.Collection;
- import java.util.Date;
-
- public class ComponentRegistryTest {
-
- private final static EJBContainer ejbContainer = EJBContainer.createEJBContainer();
-
- @Test
- public void oneInstancePerMultipleReferences() throws Exception {
-
- final Context context = ejbContainer.getContext();
-
- // Both references below will point to the exact same instance
- final ComponentRegistry one = (ComponentRegistry) context.lookup("java:global/simple-singleton/ComponentRegistry");
- final ComponentRegistry two = (ComponentRegistry) context.lookup("java:global/simple-singleton/ComponentRegistry");
-
- final URI expectedUri = new URI("foo://bar/baz");
- one.setComponent(URI.class, expectedUri);
- final URI actualUri = two.getComponent(URI.class);
- Assert.assertSame(expectedUri, actualUri);
-
- two.removeComponent(URI.class);
- URI uri = one.getComponent(URI.class);
- Assert.assertNull(uri);
-
- one.removeComponent(URI.class);
- uri = two.getComponent(URI.class);
- Assert.assertNull(uri);
-
- final Date expectedDate = new Date();
- two.setComponent(Date.class, expectedDate);
- final Date actualDate = one.getComponent(Date.class);
- Assert.assertSame(expectedDate, actualDate);
-
- Collection<?> collection = one.getComponents();
- System.out.println(collection);
- Assert.assertEquals("Reference 'one' - ComponentRegistry contains one record", collection.size(), 1);
-
- collection = two.getComponents();
- Assert.assertEquals("Reference 'two' - ComponentRegistry contains one record", collection.size(), 1);
- }
-
- @AfterClass
- public static void closeEjbContainer() {
- ejbContainer.close();
- }
- }
-
-## PropertiesRegistryTest
-
- package org.superbiz.registry;
-
- import org.junit.AfterClass;
- import org.junit.Assert;
- import org.junit.Test;
-
- import javax.ejb.embeddable.EJBContainer;
- import javax.naming.Context;
-
- public class PropertiesRegistryTest {
-
- private final static EJBContainer ejbContainer = EJBContainer.createEJBContainer();
-
- @Test
- public void oneInstancePerMultipleReferences() throws Exception {
-
- final Context context = ejbContainer.getContext();
-
- final PropertyRegistry one = (PropertyRegistry) context.lookup("java:global/simple-singleton/PropertyRegistry");
- final PropertyRegistry two = (PropertyRegistry) context.lookup("java:global/simple-singleton/PropertyRegistry");
-
- one.setProperty("url", "http://superbiz.org");
- String url = two.getProperty("url");
- Assert.assertSame("http://superbiz.org", url);
-
- two.removeProperty("url");
- url = one.getProperty("url");
- Assert.assertNull(url);
-
- two.setProperty("version", "1.0.5");
- String version = one.getProperty("version");
- Assert.assertSame("1.0.5", version);
-
- one.removeProperty("version");
- version = two.getProperty("version");
- Assert.assertNull(version);
- }
-
- @AfterClass
- public static void closeEjbContainer() {
- ejbContainer.close();
- }
- }
-
-
-#Running
-
-Running the example is fairly simple. In the "simple-singleton" directory run:
-
- $ mvn clean install
-
-Which should create output like the following.
-
-
- -------------------------------------------------------
- T E S T S
- -------------------------------------------------------
- Running org.superbiz.registry.ComponentRegistryTest
- INFO - ********************************************************************************
- INFO - OpenEJB http://tomee.apache.org/
- INFO - Startup: Sun Jun 09 03:46:51 IDT 2013
- INFO - Copyright 1999-2013 (C) Apache OpenEJB Project, All Rights Reserved.
- INFO - Version: 4.6.0-SNAPSHOT
- INFO - Build date: 20130608
- INFO - Build time: 04:07
- INFO - ********************************************************************************
- INFO - openejb.home = C:\Users\Oz\Desktop\ee-examples\simple-singleton
- INFO - openejb.base = C:\Users\Oz\Desktop\ee-examples\simple-singleton
- INFO - Created new singletonService org.apache.openejb.cdi.ThreadSingletonServiceImpl@448ad367
- INFO - Succeeded in installing singleton service
- INFO - Using 'javax.ejb.embeddable.EJBContainer=true'
- INFO - Cannot find the configuration file [conf/openejb.xml]. Will attempt to create one for the beans deployed.
- INFO - Configuring Service(id=Default Security Service, type=SecurityService, provider-id=Default Security Service)
- INFO - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
- INFO - Creating TransactionManager(id=Default Transaction Manager)
- INFO - Creating SecurityService(id=Default Security Service)
- INFO - Found EjbModule in classpath: c:\users\oz\desktop\ee-examples\simple-singleton\target\classes
- INFO - Beginning load: c:\users\oz\desktop\ee-examples\simple-singleton\target\classes
- INFO - Configuring enterprise application: C:\Users\Oz\Desktop\ee-examples\simple-singleton
- INFO - Auto-deploying ejb PropertyRegistry: EjbDeployment(deployment-id=PropertyRegistry)
- INFO - Auto-deploying ejb ComponentRegistry: EjbDeployment(deployment-id=ComponentRegistry)
- INFO - Configuring Service(id=Default Singleton Container, type=Container, provider-id=Default Singleton Container)
- INFO - Auto-creating a container for bean PropertyRegistry: Container(type=SINGLETON, id=Default Singleton Container)
- INFO - Creating Container(id=Default Singleton Container)
- INFO - Configuring Service(id=Default Managed Container, type=Container, provider-id=Default Managed Container)
- INFO - Auto-creating a container for bean org.superbiz.registry.ComponentRegistryTest: Container(type=MANAGED, id=Default Managed Container)
- INFO - Creating Container(id=Default Managed Container)
- INFO - Using directory C:\Users\Oz\AppData\Local\Temp for stateful session passivation
- INFO - Enterprise application "C:\Users\Oz\Desktop\ee-examples\simple-singleton" loaded.
- INFO - Assembling app: C:\Users\Oz\Desktop\ee-examples\simple-singleton
- INFO - Jndi(name="java:global/simple-singleton/PropertyRegistry!org.superbiz.registry.PropertyRegistry")
- INFO - Jndi(name="java:global/simple-singleton/PropertyRegistry")
- INFO - Jndi(name="java:global/simple-singleton/ComponentRegistry!org.superbiz.registry.ComponentRegistry")
- INFO - Jndi(name="java:global/simple-singleton/ComponentRegistry")
- INFO - Existing thread singleton service in SystemInstance(): org.apache.openejb.cdi.ThreadSingletonServiceImpl@448ad367
- INFO - OpenWebBeans Container is starting...
- INFO - Adding OpenWebBeansPlugin : [CdiPlugin]
- INFO - All injection points were validated successfully.
- INFO - OpenWebBeans Container has started, it took 68 ms.
- INFO - Created Ejb(deployment-id=PropertyRegistry, ejb-name=PropertyRegistry, container=Default Singleton Container)
- INFO - Created Ejb(deployment-id=ComponentRegistry, ejb-name=ComponentRegistry, container=Default Singleton Container)
- INFO - Started Ejb(deployment-id=PropertyRegistry, ejb-name=PropertyRegistry, container=Default Singleton Container)
- INFO - Started Ejb(deployment-id=ComponentRegistry, ejb-name=ComponentRegistry, container=Default Singleton Container)
- INFO - Deployed Application(path=C:\Users\Oz\Desktop\ee-examples\simple-singleton)
- [Sun Jun 09 03:46:52 IDT 2013]
- INFO - Undeploying app: C:\Users\Oz\Desktop\ee-examples\simple-singleton
- INFO - Destroying OpenEJB container
- Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.431 sec
- Running org.superbiz.registry.PropertiesRegistryTest
- INFO - ********************************************************************************
- INFO - OpenEJB http://tomee.apache.org/
- INFO - Startup: Sun Jun 09 03:46:52 IDT 2013
- INFO - Copyright 1999-2013 (C) Apache OpenEJB Project, All Rights Reserved.
- INFO - Version: 4.6.0-SNAPSHOT
- INFO - Build date: 20130608
- INFO - Build time: 04:07
- INFO - ********************************************************************************
- INFO - openejb.home = C:\Users\Oz\Desktop\ee-examples\simple-singleton
- INFO - openejb.base = C:\Users\Oz\Desktop\ee-examples\simple-singleton
- INFO - Created new singletonService org.apache.openejb.cdi.ThreadSingletonServiceImpl@448ad367
- INFO - Succeeded in installing singleton service
- INFO - Using 'javax.ejb.embeddable.EJBContainer=true'
- INFO - Cannot find the configuration file [conf/openejb.xml]. Will attempt to create one for the beans deployed.
- INFO - Configuring Service(id=Default Security Service, type=SecurityService, provider-id=Default Security Service)
- INFO - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
- INFO - Creating TransactionManager(id=Default Transaction Manager)
- INFO - Creating SecurityService(id=Default Security Service)
- INFO - Using 'java.security.auth.login.config=jar:file:/C:/Users/Oz/.m2/repository/org/apache/openejb/openejb-core/4.6.0-SNAPSHOT/openejb-core-4.6.0-SNAPSHOT.jar!/login.config'
- INFO - Found EjbModule in classpath: c:\users\oz\desktop\ee-examples\simple-singleton\target\classes
- INFO - Beginning load: c:\users\oz\desktop\ee-examples\simple-singleton\target\classes
- INFO - Configuring enterprise application: C:\Users\Oz\Desktop\ee-examples\simple-singleton
- INFO - Auto-deploying ejb ComponentRegistry: EjbDeployment(deployment-id=ComponentRegistry)
- INFO - Auto-deploying ejb PropertyRegistry: EjbDeployment(deployment-id=PropertyRegistry)
- INFO - Configuring Service(id=Default Singleton Container, type=Container, provider-id=Default Singleton Container)
- INFO - Auto-creating a container for bean ComponentRegistry: Container(type=SINGLETON, id=Default Singleton Container)
- INFO - Creating Container(id=Default Singleton Container)
- INFO - Configuring Service(id=Default Managed Container, type=Container, provider-id=Default Managed Container)
- INFO - Auto-creating a container for bean org.superbiz.registry.PropertiesRegistryTest: Container(type=MANAGED, id=Default Managed Container)
- INFO - Creating Container(id=Default Managed Container)
- INFO - Using directory C:\Users\Oz\AppData\Local\Temp for stateful session passivation
- INFO - Enterprise application "C:\Users\Oz\Desktop\ee-examples\simple-singleton" loaded.
- INFO - Assembling app: C:\Users\Oz\Desktop\ee-examples\simple-singleton
- INFO - Jndi(name="java:global/simple-singleton/ComponentRegistry!org.superbiz.registry.ComponentRegistry")
- INFO - Jndi(name="java:global/simple-singleton/ComponentRegistry")
- INFO - Jndi(name="java:global/simple-singleton/PropertyRegistry!org.superbiz.registry.PropertyRegistry")
- INFO - Jndi(name="java:global/simple-singleton/PropertyRegistry")
- INFO - Existing thread singleton service in SystemInstance(): org.apache.openejb.cdi.ThreadSingletonServiceImpl@448ad367
- INFO - OpenWebBeans Container is starting...
- INFO - Adding OpenWebBeansPlugin : [CdiPlugin]
- INFO - All injection points were validated successfully.
- INFO - OpenWebBeans Container has started, it took 4 ms.
- INFO - Created Ejb(deployment-id=PropertyRegistry, ejb-name=PropertyRegistry, container=Default Singleton Container)
- INFO - Created Ejb(deployment-id=ComponentRegistry, ejb-name=ComponentRegistry, container=Default Singleton Container)
- INFO - Started Ejb(deployment-id=PropertyRegistry, ejb-name=PropertyRegistry, container=Default Singleton Container)
- INFO - Started Ejb(deployment-id=ComponentRegistry, ejb-name=ComponentRegistry, container=Default Singleton Container)
- INFO - Deployed Application(path=C:\Users\Oz\Desktop\ee-examples\simple-singleton)
- INFO - Undeploying app: C:\Users\Oz\Desktop\ee-examples\simple-singleton
- INFO - Destroying OpenEJB container
- Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.171 sec
-
- Results :
-
- Tests run: 2, Failures: 0, Errors: 0, Skipped: 0
-
+Title: Simple Singleton
+
+As the name implies a `javax.ejb.Singleton` is a session bean with a guarantee that there is at most one instance in the application.
+
+What it gives that is completely missing in EJB 3.0 and prior versions is the ability to have an EJB that is notified when the application starts and notified when the application stops. So you can do all sorts of things that you previously could only do with a load-on-startup servlet. It also gives you a place to hold data that pertains to the entire application and all users using it, without the need for a static. Additionally, Singleton beans can be invoked by several threads at one time similar to a Servlet.
+
+See the [Singleton Beans](../../singleton-beans.html) page for a full description of the javax.ejb.Singleton api.
+
+#The Code
+
+## PropertyRegistry <small>Bean-Managed Concurrency</small>
+
+Here we see a bean that uses the Bean-Managed Concurrency option as well as the @Startup annotation which causes the bean to be instantiated by the container when the application starts. Singleton beans with @ConcurrencyManagement(BEAN) are responsible for their own thread-safety. The bean shown is a simple properties "registry" and provides a place where options could be set and retrieved by all beans in the application.
+
+ package org.superbiz.registry;
+
+ import javax.annotation.PostConstruct;
+ import javax.annotation.PreDestroy;
+ import javax.ejb.ConcurrencyManagement;
+ import javax.ejb.Singleton;
+ import javax.ejb.Startup;
+ import java.util.Properties;
+
+ import static javax.ejb.ConcurrencyManagementType.BEAN;
+
+ @Singleton
+ @Startup
+ @ConcurrencyManagement(BEAN)
+ public class PropertyRegistry {
+
+ // Note the java.util.Properties object is a thread-safe
+ // collections that uses synchronization. If it didn't
+ // you would have to use some form of synchronization
+ // to ensure the PropertyRegistryBean is thread-safe.
+ private final Properties properties = new Properties();
+
+ // The @Startup annotation ensures that this method is
+ // called when the application starts up.
+ @PostConstruct
+ public void applicationStartup() {
+ properties.putAll(System.getProperties());
+ }
+
+ @PreDestroy
+ public void applicationShutdown() {
+ properties.clear();
+ }
+
+ public String getProperty(final String key) {
+ return properties.getProperty(key);
+ }
+
+ public String setProperty(final String key, final String value) {
+ return (String) properties.setProperty(key, value);
+ }
+
+ public String removeProperty(final String key) {
+ return (String) properties.remove(key);
+ }
+ }
+
+## ComponentRegistry <small>Container-Managed Concurrency</small>
+
+Here we see a bean that uses the Container-Managed Concurrency option, the default. With @ConcurrencyManagement(CONTAINER) the container controls whether multi-threaded access should be allowed to the bean (`@Lock(READ)`) or if single-threaded access should be enforced (`@Lock(WRITE)`).
+
+ package org.superbiz.registry;
+
+ import javax.ejb.Lock;
+ import javax.ejb.Singleton;
+ import java.util.ArrayList;
+ import java.util.Collection;
+ import java.util.HashMap;
+ import java.util.Map;
+
+ import static javax.ejb.LockType.READ;
+ import static javax.ejb.LockType.WRITE;
+
+ @Singleton
+ @Lock(READ)
+ public class ComponentRegistry {
+
+ private final Map<Class, Object> components = new HashMap<Class, Object>();
+
+ public <T> T getComponent(final Class<T> type) {
+ return (T) components.get(type);
+ }
+
+ public Collection<?> getComponents() {
+ return new ArrayList(components.values());
+ }
+
+ @Lock(WRITE)
+ public <T> T setComponent(final Class<T> type, final T value) {
+ return (T) components.put(type, value);
+ }
+
+ @Lock(WRITE)
+ public <T> T removeComponent(final Class<T> type) {
+ return (T) components.remove(type);
+ }
+ }
+
+Unless specified explicitly on the bean class or a method, the default `@Lock` value is `@Lock(WRITE)`. The code above uses the `@Lock(READ)` annotation on bean class to change the default so that multi-threaded access is granted by default. We then only need to apply the `@Lock(WRITE)` annotation to the methods that modify the state of the bean.
+
+Essentially `@Lock(READ)` allows multithreaded access to the Singleton bean instance unless someone is invoking an `@Lock(WRITE)` method. With `@Lock(WRITE)`, the thread invoking the bean will be guaranteed to have exclusive access to the Singleton bean instance for the duration of its invocation. This combination allows the bean instance to use data types that are not normally thread safe. Great care must still be used, though.
+
+In the example we see `ComponentRegistryBean` using a `java.util.HashMap` which is not synchronized. To make this ok we do three things:
+
+ 1. Encapsulation. We don't expose the HashMap instance directly; including its iterators, key set, value set or entry set.
+ 1. We use `@Lock(WRITE)` on the methods that mutate the map such as the `put()` and `remove()` methods.
+ 1. We use `@Lock(READ)` on the `get()` and `values()` methods as they do not change the map state and are guaranteed not to be called at the same as any of the `@Lock(WRITE)` methods, so we know the state of the HashMap is no being mutated and therefore safe for reading.
+
+The end result is that the threading model for this bean will switch from multi-threaded access to single-threaded access dynamically as needed, depending on the method being invoked. This gives Singletons a bit of an advantage over Servlets for processing multi-threaded requests.
+
+See the [Singleton Beans](../../singleton-beans.html) page for more advanced details on Container-Managed Concurrency.
+
+# Testing
+
+
+## ComponentRegistryTest
+
+ package org.superbiz.registry;
+
+ import org.junit.AfterClass;
+ import org.junit.Assert;
+ import org.junit.Test;
+
+ import javax.ejb.embeddable.EJBContainer;
+ import javax.naming.Context;
+ import java.net.URI;
+ import java.util.Collection;
+ import java.util.Date;
+
+ public class ComponentRegistryTest {
+
+ private final static EJBContainer ejbContainer = EJBContainer.createEJBContainer();
+
+ @Test
+ public void oneInstancePerMultipleReferences() throws Exception {
+
+ final Context context = ejbContainer.getContext();
+
+ // Both references below will point to the exact same instance
+ final ComponentRegistry one = (ComponentRegistry) context.lookup("java:global/simple-singleton/ComponentRegistry");
+ final ComponentRegistry two = (ComponentRegistry) context.lookup("java:global/simple-singleton/ComponentRegistry");
+
+ final URI expectedUri = new URI("foo://bar/baz");
+ one.setComponent(URI.class, expectedUri);
+ final URI actualUri = two.getComponent(URI.class);
+ Assert.assertSame(expectedUri, actualUri);
+
+ two.removeComponent(URI.class);
+ URI uri = one.getComponent(URI.class);
+ Assert.assertNull(uri);
+
+ one.removeComponent(URI.class);
+ uri = two.getComponent(URI.class);
+ Assert.assertNull(uri);
+
+ final Date expectedDate = new Date();
+ two.setComponent(Date.class, expectedDate);
+ final Date actualDate = one.getComponent(Date.class);
+ Assert.assertSame(expectedDate, actualDate);
+
+ Collection<?> collection = one.getComponents();
+ System.out.println(collection);
+ Assert.assertEquals("Reference 'one' - ComponentRegistry contains one record", collection.size(), 1);
+
+ collection = two.getComponents();
+ Assert.assertEquals("Reference 'two' - ComponentRegistry contains one record", collection.size(), 1);
+ }
+
+ @AfterClass
+ public static void closeEjbContainer() {
+ ejbContainer.close();
+ }
+ }
+
+## PropertiesRegistryTest
+
+ package org.superbiz.registry;
+
+ import org.junit.AfterClass;
+ import org.junit.Assert;
+ import org.junit.Test;
+
+ import javax.ejb.embeddable.EJBContainer;
+ import javax.naming.Context;
+
+ public class PropertiesRegistryTest {
+
+ private final static EJBContainer ejbContainer = EJBContainer.createEJBContainer();
+
+ @Test
+ public void oneInstancePerMultipleReferences() throws Exception {
+
+ final Context context = ejbContainer.getContext();
+
+ final PropertyRegistry one = (PropertyRegistry) context.lookup("java:global/simple-singleton/PropertyRegistry");
+ final PropertyRegistry two = (PropertyRegistry) context.lookup("java:global/simple-singleton/PropertyRegistry");
+
+ one.setProperty("url", "http://superbiz.org");
+ String url = two.getProperty("url");
+ Assert.assertSame("http://superbiz.org", url);
+
+ two.removeProperty("url");
+ url = one.getProperty("url");
+ Assert.assertNull(url);
+
+ two.setProperty("version", "1.0.5");
+ String version = one.getProperty("version");
+ Assert.assertSame("1.0.5", version);
+
+ one.removeProperty("version");
+ version = two.getProperty("version");
+ Assert.assertNull(version);
+ }
+
+ @AfterClass
+ public static void closeEjbContainer() {
+ ejbContainer.close();
+ }
+ }
+
+
+#Running
+
+Running the example is fairly simple. In the "simple-singleton" directory run:
+
+ $ mvn clean install
+
+Which should create output like the following.
+
+
+ -------------------------------------------------------
+ T E S T S
+ -------------------------------------------------------
+ Running org.superbiz.registry.ComponentRegistryTest
+ INFO - ********************************************************************************
+ INFO - OpenEJB http://tomee.apache.org/
+ INFO - Startup: Sun Jun 09 03:46:51 IDT 2013
+ INFO - Copyright 1999-2013 (C) Apache OpenEJB Project, All Rights Reserved.
+ INFO - Version: 7.0.0-SNAPSHOT
+ INFO - Build date: 20130608
+ INFO - Build time: 04:07
+ INFO - ********************************************************************************
+ INFO - openejb.home = C:\Users\Oz\Desktop\ee-examples\simple-singleton
+ INFO - openejb.base = C:\Users\Oz\Desktop\ee-examples\simple-singleton
+ INFO - Created new singletonService org.apache.openejb.cdi.ThreadSingletonServiceImpl@448ad367
+ INFO - Succeeded in installing singleton service
+ INFO - Using 'javax.ejb.embeddable.EJBContainer=true'
+ INFO - Cannot find the configuration file [conf/openejb.xml]. Will attempt to create one for the beans deployed.
+ INFO - Configuring Service(id=Default Security Service, type=SecurityService, provider-id=Default Security Service)
+ INFO - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
+ INFO - Creating TransactionManager(id=Default Transaction Manager)
+ INFO - Creating SecurityService(id=Default Security Service)
+ INFO - Found EjbModule in classpath: c:\users\oz\desktop\ee-examples\simple-singleton\target\classes
+ INFO - Beginning load: c:\users\oz\desktop\ee-examples\simple-singleton\target\classes
+ INFO - Configuring enterprise application: C:\Users\Oz\Desktop\ee-examples\simple-singleton
+ INFO - Auto-deploying ejb PropertyRegistry: EjbDeployment(deployment-id=PropertyRegistry)
+ INFO - Auto-deploying ejb ComponentRegistry: EjbDeployment(deployment-id=ComponentRegistry)
+ INFO - Configuring Service(id=Default Singleton Container, type=Container, provider-id=Default Singleton Container)
+ INFO - Auto-creating a container for bean PropertyRegistry: Container(type=SINGLETON, id=Default Singleton Container)
+ INFO - Creating Container(id=Default Singleton Container)
+ INFO - Configuring Service(id=Default Managed Container, type=Container, provider-id=Default Managed Container)
+ INFO - Auto-creating a container for bean org.superbiz.registry.ComponentRegistryTest: Container(type=MANAGED, id=Default Managed Container)
+ INFO - Creating Container(id=Default Managed Container)
+ INFO - Using directory C:\Users\Oz\AppData\Local\Temp for stateful session passivation
+ INFO - Enterprise application "C:\Users\Oz\Desktop\ee-examples\simple-singleton" loaded.
+ INFO - Assembling app: C:\Users\Oz\Desktop\ee-examples\simple-singleton
+ INFO - Jndi(name="java:global/simple-singleton/PropertyRegistry!org.superbiz.registry.PropertyRegistry")
+ INFO - Jndi(name="java:global/simple-singleton/PropertyRegistry")
+ INFO - Jndi(name="java:global/simple-singleton/ComponentRegistry!org.superbiz.registry.ComponentRegistry")
+ INFO - Jndi(name="java:global/simple-singleton/ComponentRegistry")
+ INFO - Existing thread singleton service in SystemInstance(): org.apache.openejb.cdi.ThreadSingletonServiceImpl@448ad367
+ INFO - OpenWebBeans Container is starting...
+ INFO - Adding OpenWebBeansPlugin : [CdiPlugin]
+ INFO - All injection points were validated successfully.
+ INFO - OpenWebBeans Container has started, it took 68 ms.
+ INFO - Created Ejb(deployment-id=PropertyRegistry, ejb-name=PropertyRegistry, container=Default Singleton Container)
+ INFO - Created Ejb(deployment-id=ComponentRegistry, ejb-name=ComponentRegistry, container=Default Singleton Container)
+ INFO - Started Ejb(deployment-id=PropertyRegistry, ejb-name=PropertyRegistry, container=Default Singleton Container)
+ INFO - Started Ejb(deployment-id=ComponentRegistry, ejb-name=ComponentRegistry, container=Default Singleton Container)
+ INFO - Deployed Application(path=C:\Users\Oz\Desktop\ee-examples\simple-singleton)
+ [Sun Jun 09 03:46:52 IDT 2013]
+ INFO - Undeploying app: C:\Users\Oz\Desktop\ee-examples\simple-singleton
+ INFO - Destroying OpenEJB container
+ Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.431 sec
+ Running org.superbiz.registry.PropertiesRegistryTest
+ INFO - ********************************************************************************
+ INFO - OpenEJB http://tomee.apache.org/
+ INFO - Startup: Sun Jun 09 03:46:52 IDT 2013
+ INFO - Copyright 1999-2013 (C) Apache OpenEJB Project, All Rights Reserved.
+ INFO - Version: 7.0.0-SNAPSHOT
+ INFO - Build date: 20130608
+ INFO - Build time: 04:07
+ INFO - ********************************************************************************
+ INFO - openejb.home = C:\Users\Oz\Desktop\ee-examples\simple-singleton
+ INFO - openejb.base = C:\Users\Oz\Desktop\ee-examples\simple-singleton
+ INFO - Created new singletonService org.apache.openejb.cdi.ThreadSingletonServiceImpl@448ad367
+ INFO - Succeeded in installing singleton service
+ INFO - Using 'javax.ejb.embeddable.EJBContainer=true'
+ INFO - Cannot find the configuration file [conf/openejb.xml]. Will attempt to create one for the beans deployed.
+ INFO - Configuring Service(id=Default Security Service, type=SecurityService, provider-id=Default Security Service)
+ INFO - Configuring Service(id=Default Transaction Manager, type=TransactionManager, provider-id=Default Transaction Manager)
+ INFO - Creating TransactionManager(id=Default Transaction Manager)
+ INFO - Creating SecurityService(id=Default Security Service)
+ INFO - Using 'java.security.auth.login.config=jar:file:/C:/Users/Oz/.m2/repository/org/apache/openejb/openejb-core/7.0.0-SNAPSHOT/openejb-core-7.0.0-SNAPSHOT.jar!/login.config'
+ INFO - Found EjbModule in classpath: c:\users\oz\desktop\ee-examples\simple-singleton\target\classes
+ INFO - Beginning load: c:\users\oz\desktop\ee-examples\simple-singleton\target\classes
+ INFO - Configuring enterprise application: C:\Users\Oz\Desktop\ee-examples\simple-singleton
+ INFO - Auto-deploying ejb ComponentRegistry: EjbDeployment(deployment-id=ComponentRegistry)
+ INFO - Auto-deploying ejb PropertyRegistry: EjbDeployment(deployment-id=PropertyRegistry)
+ INFO - Configuring Service(id=Default Singleton Container, type=Container, provider-id=Default Singleton Container)
+ INFO - Auto-creating a container for bean ComponentRegistry: Container(type=SINGLETON, id=Default Singleton Container)
+ INFO - Creating Container(id=Default Singleton Container)
+ INFO - Configuring Service(id=Default Managed Container, type=Container, provider-id=Default Managed Container)
+ INFO - Auto-creating a container for bean org.superbiz.registry.PropertiesRegistryTest: Container(type=MANAGED, id=Default Managed Container)
+ INFO - Creating Container(id=Default Managed Container)
+ INFO - Using directory C:\Users\Oz\AppData\Local\Temp for stateful session passivation
+ INFO - Enterprise application "C:\Users\Oz\Desktop\ee-examples\simple-singleton" loaded.
+ INFO - Assembling app: C:\Users\Oz\Desktop\ee-examples\simple-singleton
+ INFO - Jndi(name="java:global/simple-singleton/ComponentRegistry!org.superbiz.registry.ComponentRegistry")
+ INFO - Jndi(name="java:global/simple-singleton/ComponentRegistry")
+ INFO - Jndi(name="java:global/simple-singleton/PropertyRegistry!org.superbiz.registry.PropertyRegistry")
+ INFO - Jndi(name="java:global/simple-singleton/PropertyRegistry")
+ INFO - Existing thread singleton service in SystemInstance(): org.apache.openejb.cdi.ThreadSingletonServiceImpl@448ad367
+ INFO - OpenWebBeans Container is starting...
+ INFO - Adding OpenWebBeansPlugin : [CdiPlugin]
+ INFO - All injection points were validated successfully.
+ INFO - OpenWebBeans Container has started, it took 4 ms.
+ INFO - Created Ejb(deployment-id=PropertyRegistry, ejb-name=PropertyRegistry, container=Default Singleton Container)
+ INFO - Created Ejb(deployment-id=ComponentRegistry, ejb-name=ComponentRegistry, container=Default Singleton Container)
+ INFO - Started Ejb(deployment-id=PropertyRegistry, ejb-name=PropertyRegistry, container=Default Singleton Container)
+ INFO - Started Ejb(deployment-id=ComponentRegistry, ejb-name=ComponentRegistry, container=Default Singleton Container)
+ INFO - Deployed Application(path=C:\Users\Oz\Desktop\ee-examples\simple-singleton)
+ INFO - Undeploying app: C:\Users\Oz\Desktop\ee-examples\simple-singleton
+ INFO - Destroying OpenEJB container
+ Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.171 sec
+
+ Results :
+
+ Tests run: 2, Failures: 0, Errors: 0, Skipped: 0
+
http://git-wip-us.apache.org/repos/asf/tomee/blob/f9f1b8ad/examples/simple-singleton/src/main/java/org/superbiz/registry/ComponentRegistry.java
----------------------------------------------------------------------
diff --git a/examples/simple-singleton/src/main/java/org/superbiz/registry/ComponentRegistry.java b/examples/simple-singleton/src/main/java/org/superbiz/registry/ComponentRegistry.java
index 8197241..eea69a4 100644
--- a/examples/simple-singleton/src/main/java/org/superbiz/registry/ComponentRegistry.java
+++ b/examples/simple-singleton/src/main/java/org/superbiz/registry/ComponentRegistry.java
@@ -1,53 +1,53 @@
-/**
- * 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.superbiz.registry;
-
-import javax.ejb.Lock;
-import javax.ejb.Singleton;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import static javax.ejb.LockType.READ;
-import static javax.ejb.LockType.WRITE;
-
-@Singleton
-@Lock(READ)
-public class ComponentRegistry {
-
- private final Map<Class, Object> components = new HashMap<Class, Object>();
-
- public <T> T getComponent(final Class<T> type) {
- return (T) components.get(type);
- }
-
- public Collection<?> getComponents() {
- return new ArrayList(components.values());
- }
-
- @Lock(WRITE)
- public <T> T setComponent(final Class<T> type, final T value) {
- return (T) components.put(type, value);
- }
-
- @Lock(WRITE)
- public <T> T removeComponent(final Class<T> type) {
- return (T) components.remove(type);
- }
-}
-
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.registry;
+
+import javax.ejb.Lock;
+import javax.ejb.Singleton;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import static javax.ejb.LockType.READ;
+import static javax.ejb.LockType.WRITE;
+
+@Singleton
+@Lock(READ)
+public class ComponentRegistry {
+
+ private final Map<Class, Object> components = new HashMap<Class, Object>();
+
+ public <T> T getComponent(final Class<T> type) {
+ return (T) components.get(type);
+ }
+
+ public Collection<?> getComponents() {
+ return new ArrayList(components.values());
+ }
+
+ @Lock(WRITE)
+ public <T> T setComponent(final Class<T> type, final T value) {
+ return (T) components.put(type, value);
+ }
+
+ @Lock(WRITE)
+ public <T> T removeComponent(final Class<T> type) {
+ return (T) components.remove(type);
+ }
+}
+
http://git-wip-us.apache.org/repos/asf/tomee/blob/f9f1b8ad/examples/simple-singleton/src/main/java/org/superbiz/registry/PropertyRegistry.java
----------------------------------------------------------------------
diff --git a/examples/simple-singleton/src/main/java/org/superbiz/registry/PropertyRegistry.java b/examples/simple-singleton/src/main/java/org/superbiz/registry/PropertyRegistry.java
index 56adcb1..14094b3 100644
--- a/examples/simple-singleton/src/main/java/org/superbiz/registry/PropertyRegistry.java
+++ b/examples/simple-singleton/src/main/java/org/superbiz/registry/PropertyRegistry.java
@@ -1,62 +1,62 @@
-/**
- * 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.superbiz.registry;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.ejb.ConcurrencyManagement;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-import java.util.Properties;
-
-import static javax.ejb.ConcurrencyManagementType.BEAN;
-
-@Singleton
-@Startup
-@ConcurrencyManagement(BEAN)
-public class PropertyRegistry {
-
- // Note the java.util.Properties object is a thread-safe
- // collections that uses synchronization. If it didn't
- // you would have to use some form of synchronization
- // to ensure the PropertyRegistryBean is thread-safe.
- private final Properties properties = new Properties();
-
- // The @Startup annotation ensures that this method is
- // called when the application starts up.
- @PostConstruct
- public void applicationStartup() {
- properties.putAll(System.getProperties());
- }
-
- @PreDestroy
- public void applicationShutdown() {
- properties.clear();
- }
-
- public String getProperty(final String key) {
- return properties.getProperty(key);
- }
-
- public String setProperty(final String key, final String value) {
- return (String) properties.setProperty(key, value);
- }
-
- public String removeProperty(final String key) {
- return (String) properties.remove(key);
- }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.registry;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.ejb.ConcurrencyManagement;
+import javax.ejb.Singleton;
+import javax.ejb.Startup;
+import java.util.Properties;
+
+import static javax.ejb.ConcurrencyManagementType.BEAN;
+
+@Singleton
+@Startup
+@ConcurrencyManagement(BEAN)
+public class PropertyRegistry {
+
+ // Note the java.util.Properties object is a thread-safe
+ // collections that uses synchronization. If it didn't
+ // you would have to use some form of synchronization
+ // to ensure the PropertyRegistryBean is thread-safe.
+ private final Properties properties = new Properties();
+
+ // The @Startup annotation ensures that this method is
+ // called when the application starts up.
+ @PostConstruct
+ public void applicationStartup() {
+ properties.putAll(System.getProperties());
+ }
+
+ @PreDestroy
+ public void applicationShutdown() {
+ properties.clear();
+ }
+
+ public String getProperty(final String key) {
+ return properties.getProperty(key);
+ }
+
+ public String setProperty(final String key, final String value) {
+ return (String) properties.setProperty(key, value);
+ }
+
+ public String removeProperty(final String key) {
+ return (String) properties.remove(key);
+ }
+}
http://git-wip-us.apache.org/repos/asf/tomee/blob/f9f1b8ad/examples/simple-singleton/src/test/java/org/superbiz/registry/ComponentRegistryTest.java
----------------------------------------------------------------------
diff --git a/examples/simple-singleton/src/test/java/org/superbiz/registry/ComponentRegistryTest.java b/examples/simple-singleton/src/test/java/org/superbiz/registry/ComponentRegistryTest.java
index e325e42..bd6b14e 100644
--- a/examples/simple-singleton/src/test/java/org/superbiz/registry/ComponentRegistryTest.java
+++ b/examples/simple-singleton/src/test/java/org/superbiz/registry/ComponentRegistryTest.java
@@ -1,72 +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.superbiz.registry;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Test;
-
-import javax.ejb.embeddable.EJBContainer;
-import javax.naming.Context;
-import java.net.URI;
-import java.util.Collection;
-import java.util.Date;
-
-public class ComponentRegistryTest {
-
- private final static EJBContainer ejbContainer = EJBContainer.createEJBContainer();
-
- @Test
- public void oneInstancePerMultipleReferences() throws Exception {
-
- final Context context = ejbContainer.getContext();
-
- // Both references below will point to the exact same instance
- final ComponentRegistry one = (ComponentRegistry) context.lookup("java:global/simple-singleton/ComponentRegistry");
- final ComponentRegistry two = (ComponentRegistry) context.lookup("java:global/simple-singleton/ComponentRegistry");
-
- final URI expectedUri = new URI("foo://bar/baz");
- one.setComponent(URI.class, expectedUri);
- final URI actualUri = two.getComponent(URI.class);
- Assert.assertSame(expectedUri, actualUri);
-
- two.removeComponent(URI.class);
- URI uri = one.getComponent(URI.class);
- Assert.assertNull(uri);
-
- one.removeComponent(URI.class);
- uri = two.getComponent(URI.class);
- Assert.assertNull(uri);
-
- final Date expectedDate = new Date();
- two.setComponent(Date.class, expectedDate);
- final Date actualDate = one.getComponent(Date.class);
- Assert.assertSame(expectedDate, actualDate);
-
- Collection<?> collection = one.getComponents();
- System.out.println(collection);
- Assert.assertEquals("Reference 'one' - ComponentRegistry contains one record", collection.size(), 1);
-
- collection = two.getComponents();
- Assert.assertEquals("Reference 'two' - ComponentRegistry contains one record", collection.size(), 1);
- }
-
- @AfterClass
- public static void closeEjbContainer() {
- ejbContainer.close();
- }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.registry;
+
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Test;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.naming.Context;
+import java.net.URI;
+import java.util.Collection;
+import java.util.Date;
+
+public class ComponentRegistryTest {
+
+ private final static EJBContainer ejbContainer = EJBContainer.createEJBContainer();
+
+ @Test
+ public void oneInstancePerMultipleReferences() throws Exception {
+
+ final Context context = ejbContainer.getContext();
+
+ // Both references below will point to the exact same instance
+ final ComponentRegistry one = (ComponentRegistry) context.lookup("java:global/simple-singleton/ComponentRegistry");
+ final ComponentRegistry two = (ComponentRegistry) context.lookup("java:global/simple-singleton/ComponentRegistry");
+
+ final URI expectedUri = new URI("foo://bar/baz");
+ one.setComponent(URI.class, expectedUri);
+ final URI actualUri = two.getComponent(URI.class);
+ Assert.assertSame(expectedUri, actualUri);
+
+ two.removeComponent(URI.class);
+ URI uri = one.getComponent(URI.class);
+ Assert.assertNull(uri);
+
+ one.removeComponent(URI.class);
+ uri = two.getComponent(URI.class);
+ Assert.assertNull(uri);
+
+ final Date expectedDate = new Date();
+ two.setComponent(Date.class, expectedDate);
+ final Date actualDate = one.getComponent(Date.class);
+ Assert.assertSame(expectedDate, actualDate);
+
+ Collection<?> collection = one.getComponents();
+ System.out.println(collection);
+ Assert.assertEquals("Reference 'one' - ComponentRegistry contains one record", collection.size(), 1);
+
+ collection = two.getComponents();
+ Assert.assertEquals("Reference 'two' - ComponentRegistry contains one record", collection.size(), 1);
+ }
+
+ @AfterClass
+ public static void closeEjbContainer() {
+ ejbContainer.close();
+ }
+}
http://git-wip-us.apache.org/repos/asf/tomee/blob/f9f1b8ad/examples/simple-singleton/src/test/java/org/superbiz/registry/PropertiesRegistryTest.java
----------------------------------------------------------------------
diff --git a/examples/simple-singleton/src/test/java/org/superbiz/registry/PropertiesRegistryTest.java b/examples/simple-singleton/src/test/java/org/superbiz/registry/PropertiesRegistryTest.java
index 4b887c7..8384286 100644
--- a/examples/simple-singleton/src/test/java/org/superbiz/registry/PropertiesRegistryTest.java
+++ b/examples/simple-singleton/src/test/java/org/superbiz/registry/PropertiesRegistryTest.java
@@ -1,59 +1,59 @@
-/**
- * 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.superbiz.registry;
-
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Test;
-
-import javax.ejb.embeddable.EJBContainer;
-import javax.naming.Context;
-
-public class PropertiesRegistryTest {
-
- private final static EJBContainer ejbContainer = EJBContainer.createEJBContainer();
-
- @Test
- public void oneInstancePerMultipleReferences() throws Exception {
-
- final Context context = ejbContainer.getContext();
-
- final PropertyRegistry one = (PropertyRegistry) context.lookup("java:global/simple-singleton/PropertyRegistry");
- final PropertyRegistry two = (PropertyRegistry) context.lookup("java:global/simple-singleton/PropertyRegistry");
-
- one.setProperty("url", "http://superbiz.org");
- String url = two.getProperty("url");
- Assert.assertSame("http://superbiz.org", url);
-
- two.removeProperty("url");
- url = one.getProperty("url");
- Assert.assertNull(url);
-
- two.setProperty("version", "1.0.5");
- String version = one.getProperty("version");
- Assert.assertSame("1.0.5", version);
-
- one.removeProperty("version");
- version = two.getProperty("version");
- Assert.assertNull(version);
- }
-
- @AfterClass
- public static void closeEjbContainer() {
- ejbContainer.close();
- }
-}
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.superbiz.registry;
+
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Test;
+
+import javax.ejb.embeddable.EJBContainer;
+import javax.naming.Context;
+
+public class PropertiesRegistryTest {
+
+ private final static EJBContainer ejbContainer = EJBContainer.createEJBContainer();
+
+ @Test
+ public void oneInstancePerMultipleReferences() throws Exception {
+
+ final Context context = ejbContainer.getContext();
+
+ final PropertyRegistry one = (PropertyRegistry) context.lookup("java:global/simple-singleton/PropertyRegistry");
+ final PropertyRegistry two = (PropertyRegistry) context.lookup("java:global/simple-singleton/PropertyRegistry");
+
+ one.setProperty("url", "http://superbiz.org");
+ String url = two.getProperty("url");
+ Assert.assertSame("http://superbiz.org", url);
+
+ two.removeProperty("url");
+ url = one.getProperty("url");
+ Assert.assertNull(url);
+
+ two.setProperty("version", "1.0.5");
+ String version = one.getProperty("version");
+ Assert.assertSame("1.0.5", version);
+
+ one.removeProperty("version");
+ version = two.getProperty("version");
+ Assert.assertNull(version);
+ }
+
+ @AfterClass
+ public static void closeEjbContainer() {
+ ejbContainer.close();
+ }
+}