Author: vishwanathk
Date: Sat Sep 8 20:34:34 2012
New Revision: 1382357
URL: http://svn.apache.org/viewvc?rev=1382357&view=rev
Log:
TOMEE-356 Reformat code. Oops, had missed a log message in previous commit.
r1382352 is to test injection of queue,topic and connectionFactory in JSF
managedBean
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jms/DummyManagedBean.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jms/JMSInjectionTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/jsf/jms/dummy.xhtml
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jms/DummyManagedBean.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jms/DummyManagedBean.java?rev=1382357&r1=1382356&r2=1382357&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jms/DummyManagedBean.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jms/DummyManagedBean.java
Sat Sep 8 20:34:34 2012
@@ -18,9 +18,9 @@ package org.apache.openejb.arquillian.te
import javax.annotation.Resource;
import javax.faces.bean.ManagedBean;
+import javax.jms.ConnectionFactory;
import javax.jms.Queue;
import javax.jms.Topic;
-import javax.jms.ConnectionFactory;
@ManagedBean
public class DummyManagedBean {
@@ -33,21 +33,24 @@ public class DummyManagedBean {
@Resource
ConnectionFactory connectionFactory;
- public String getFoo()
- {
- if(queue!=null){return "queueInjected";}
+ public String getFoo() {
+ if (queue != null) {
+ return "queueInjected";
+ }
return "queueNotInjected";
}
- public String getBoo()
- {
- if(topic!=null){return "topicInjected";}
+ public String getBoo() {
+ if (topic != null) {
+ return "topicInjected";
+ }
return "topicNotInjected";
}
- public String getBaz()
- {
- if(connectionFactory!=null){return "connectionFactoryInjected";}
+ public String getBaz() {
+ if (connectionFactory != null) {
+ return "connectionFactoryInjected";
+ }
return "connectionFactoryNotInjected";
}
}
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jms/JMSInjectionTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jms/JMSInjectionTest.java?rev=1382357&r1=1382356&r2=1382357&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jms/JMSInjectionTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/jms/JMSInjectionTest.java
Sat Sep 8 20:34:34 2012
@@ -22,12 +22,8 @@ import org.apache.openejb.loader.IO;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
-import org.jboss.shrinkwrap.api.asset.Asset;
import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
-import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.descriptor.api.Descriptors;
-import org.jboss.shrinkwrap.descriptor.api.persistence20.PersistenceDescriptor;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -43,16 +39,15 @@ public class JMSInjectionTest extends JS
@ArquillianResource
private URL url;
- static Logger logger=Logger.getLogger(JMSInjectionTest.class.getName());
+ static Logger logger = Logger.getLogger(JMSInjectionTest.class.getName());
@Deployment
- public static WebArchive getArchive()
- {
+ public static WebArchive getArchive() {
return base("jsf-jms-test.war")
.addPackage(JMSInjectionTest.class.getPackage())
.addAsWebResource(new ClassLoaderAsset(
- JMSInjectionTest.class.getPackage().getName().replace('.',
'/').concat("/").concat("dummy.xhtml")), "dummy.xhtml");
+
JMSInjectionTest.class.getPackage().getName().replace('.',
'/').concat("/").concat("dummy.xhtml")), "dummy.xhtml");
}
@Test
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/jsf/jms/dummy.xhtml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/jsf/jms/dummy.xhtml?rev=1382357&r1=1382356&r2=1382357&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/jsf/jms/dummy.xhtml
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/jsf/jms/dummy.xhtml
Sat Sep 8 20:34:34 2012
@@ -18,9 +18,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY
See the License for the specific language governing permissions and
limitations under the License.
-->
-<html xmlns="http://www.w3.org/1999/xhtml";
- >
+<html xmlns="http://www.w3.org/1999/xhtml";>
#{dummyManagedBean.foo} #{dummyManagedBean.boo} #{dummyManagedBean.baz}
+
</html>
