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 2012/12/03 03:48:54 UTC
svn commit: r1416338 [2/2] - in /openejb/trunk/openejb:
arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/
arquillian/arquillian-tomee-moviefun-example/src/main/java/org/superbiz/moviefun/
arquillian/arquillia...
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckTowManyInterfaceTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckTowManyInterfaceTest.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckTowManyInterfaceTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/rules/CheckTowManyInterfaceTest.java Mon Dec 3 02:48:46 2012
@@ -20,11 +20,7 @@ import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.StatelessBean;
import org.junit.runner.RunWith;
-import javax.annotation.Resource;
import javax.ejb.Stateless;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.transaction.UserTransaction;
import java.util.concurrent.Callable;
/**
@@ -33,7 +29,7 @@ import java.util.concurrent.Callable;
@RunWith(ValidationRunner.class)
public class CheckTowManyInterfaceTest {
- @Keys( @Key("too.many.interfaces") )
+ @Keys(@Key("too.many.interfaces"))
public EjbJar testSLSBwithUserTransaction() throws Exception {
EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(new StatelessBean(TwoManyInterface.class));
@@ -42,8 +38,12 @@ public class CheckTowManyInterfaceTest {
@Stateless
public static class TwoManyInterface implements Callable, Runnable {
- public Object call() throws Exception { return null; }
- @Override public void run() {}
- }
+ public Object call() throws Exception {
+ return null;
+ }
+ @Override
+ public void run() {
+ }
+ }
}
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvalidInterfacesTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvalidInterfacesTest.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvalidInterfacesTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/rules/InvalidInterfacesTest.java Mon Dec 3 02:48:46 2012
@@ -16,6 +16,13 @@
*/
package org.apache.openejb.config.rules;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.StatelessBean;
+import org.apache.openejb.loader.SystemInstance;
+import org.junit.After;
+import org.junit.runner.RunWith;
+
import javax.annotation.PostConstruct;
import javax.ejb.EJB;
import javax.ejb.EJBHome;
@@ -26,13 +33,6 @@ import javax.ejb.Local;
import javax.ejb.Remote;
import javax.interceptor.AroundInvoke;
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.jee.StatelessBean;
-import org.apache.openejb.loader.SystemInstance;
-import org.junit.After;
-import org.junit.runner.RunWith;
-
/**
* @version $Rev$ $Date$
*/
@@ -49,59 +49,59 @@ public class InvalidInterfacesTest {
return ejbJar;
}
- @Keys( { @Key("xml.remote.businessLocal"), @Key("xml.home.businessLocal"), @Key("xml.local.businessLocal"), @Key("xml.localHome.businessLocal") })
+ @Keys({@Key("xml.remote.businessLocal"), @Key("xml.home.businessLocal"), @Key("xml.local.businessLocal"), @Key("xml.localHome.businessLocal")})
public EjbJar testBusinessLocal() throws Exception {
return validate(FooLocal.class);
}
- @Keys( { @Key("xml.remote.businessRemote"), @Key("xml.home.businessRemote"), @Key("xml.local.businessRemote"), @Key("xml.localHome.businessRemote") })
+ @Keys({@Key("xml.remote.businessRemote"), @Key("xml.home.businessRemote"), @Key("xml.local.businessRemote"), @Key("xml.localHome.businessRemote")})
public EjbJar testBusinessRemote() throws Exception {
return validate(FooRemote.class);
}
- @Keys( { @Key("xml.home.ejbObject"), @Key("xml.local.ejbObject"), @Key("xml.localHome.ejbObject"), @Key("xml.businessLocal.ejbObject"), @Key("xml.businessRemote.ejbObject") })
+ @Keys({@Key("xml.home.ejbObject"), @Key("xml.local.ejbObject"), @Key("xml.localHome.ejbObject"), @Key("xml.businessLocal.ejbObject"), @Key("xml.businessRemote.ejbObject")})
public EjbJar testEJBObject() throws Exception {
return validate(FooEJBObject.class);
}
- @Keys( { @Key("xml.remote.ejbHome"), @Key("xml.local.ejbHome"), @Key("xml.localHome.ejbHome"), @Key("xml.businessLocal.ejbHome"), @Key("xml.businessRemote.ejbHome") })
+ @Keys({@Key("xml.remote.ejbHome"), @Key("xml.local.ejbHome"), @Key("xml.localHome.ejbHome"), @Key("xml.businessLocal.ejbHome"), @Key("xml.businessRemote.ejbHome")})
public EjbJar testEJBHome() throws Exception {
return validate(FooEJBHome.class);
}
- @Keys( { @Key("xml.remote.ejbLocalHome"), @Key("xml.home.ejbLocalHome"), @Key("xml.local.ejbLocalHome"), @Key("xml.businessLocal.ejbLocalHome"),
- @Key("xml.businessRemote.ejbLocalHome") })
+ @Keys({@Key("xml.remote.ejbLocalHome"), @Key("xml.home.ejbLocalHome"), @Key("xml.local.ejbLocalHome"), @Key("xml.businessLocal.ejbLocalHome"),
+ @Key("xml.businessRemote.ejbLocalHome")})
public EjbJar testEJBLocalHome() throws Exception {
return validate(FooEJBLocalHome.class);
}
- @Keys( { @Key("xml.remote.ejbLocalObject"), @Key("xml.home.ejbLocalObject"), @Key("xml.localHome.ejbLocalObject"), @Key("xml.businessLocal.ejbLocalObject"),
- @Key("xml.businessRemote.ejbLocalObject") })
+ @Keys({@Key("xml.remote.ejbLocalObject"), @Key("xml.home.ejbLocalObject"), @Key("xml.localHome.ejbLocalObject"), @Key("xml.businessLocal.ejbLocalObject"),
+ @Key("xml.businessRemote.ejbLocalObject")})
public EjbJar testEJBLocalObject() throws Exception {
return validate(FooEJBLocalObject.class);
}
- @Keys( { @Key("xml.remote.unknown"), @Key("xml.home.unknown"), @Key("xml.localHome.unknown"), @Key("xml.local.unknown"), @Key("xml.localRemote.conflict") })
+ @Keys({@Key("xml.remote.unknown"), @Key("xml.home.unknown"), @Key("xml.localHome.unknown"), @Key("xml.local.unknown"), @Key("xml.localRemote.conflict")})
public EjbJar testUnkown() throws Exception {
SystemInstance.get().setProperty("openejb.strict.interface.declaration", "true");
return validate(FooUnknown.class);
}
- @Keys( { @Key("xml.remote.beanClass"), @Key("xml.home.beanClass"), @Key("xml.localHome.beanClass"), @Key("xml.local.beanClass"), @Key("xml.businessRemote.beanClass"),
- @Key("xml.businessLocal.beanClass") })
+ @Keys({@Key("xml.remote.beanClass"), @Key("xml.home.beanClass"), @Key("xml.localHome.beanClass"), @Key("xml.local.beanClass"), @Key("xml.businessRemote.beanClass"),
+ @Key("xml.businessLocal.beanClass")})
public EjbJar testBeanClass() throws Exception {
return validate(FooBean.class);
}
- @Keys( { @Key("xml.remote.notInterface"), @Key("xml.home.notInterface"), @Key("xml.localHome.notInterface"), @Key("xml.local.notInterface"),
- @Key("xml.businessRemote.notInterface"), @Key("xml.businessLocal.notInterface") })
+ @Keys({@Key("xml.remote.notInterface"), @Key("xml.home.notInterface"), @Key("xml.localHome.notInterface"), @Key("xml.local.notInterface"),
+ @Key("xml.businessRemote.notInterface"), @Key("xml.businessLocal.notInterface")})
public EjbJar testNotInterface() throws Exception {
return validate(FooClass.class);
}
- @Keys( { @Key("ann.notAnInterface"), @Key("xml.businessLocal.notInterface"), @Key("ann.localRemote.conflict"), @Key("ann.remoteOrLocal.ejbHome"),
+ @Keys({@Key("ann.notAnInterface"), @Key("xml.businessLocal.notInterface"), @Key("ann.localRemote.conflict"), @Key("ann.remoteOrLocal.ejbHome"),
@Key("xml.businessRemote.ejbHome"), @Key("ann.remoteOrLocal.ejbObject"), @Key("xml.businessRemote.ejbObject"), @Key(value = "ann.remoteOrLocal.ejbLocalHome"),
- @Key(value = "ann.remoteOrLocal.ejbLocalObject"), @Key("xml.businessLocal.ejbLocalHome"), @Key("xml.businessLocal.ejbLocalObject") })
+ @Key(value = "ann.remoteOrLocal.ejbLocalObject"), @Key("xml.businessLocal.ejbLocalHome"), @Key("xml.businessLocal.ejbLocalObject")})
public EjbJar test() throws OpenEJBException {
SystemInstance.get().setProperty("openejb.strict.interface.declaration", "true");
EjbJar ejbJar = new EjbJar();
@@ -110,23 +110,26 @@ public class InvalidInterfacesTest {
StatelessBean mybean1 = ejbJar.addEnterpriseBean(new StatelessBean("MyBean1", MyBean.class));
return ejbJar;
}
- @Keys({@Key(value="interface.beanOnlyAnnotation",type=KeyType.WARNING),@Key(value="interfaceMethod.beanOnlyAnnotation",type=KeyType.WARNING),@Key("aroundInvoke.invalidArguments")})
- public EjbJar test1(){
+
+ @Keys({@Key(value = "interface.beanOnlyAnnotation", type = KeyType.WARNING), @Key(value = "interfaceMethod.beanOnlyAnnotation", type = KeyType.WARNING), @Key("aroundInvoke.invalidArguments")})
+ public EjbJar test1() {
SystemInstance.get().setProperty("openejb.strict.interface.declaration", "true");
EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(new StatelessBean(DBean.class));
return ejbJar;
-
+
}
- @Keys({@Key(value="ann.remoteOrLocal.converse.parent",count=2)})
- public EjbJar test2(){
- SystemInstance.get().setProperty("openejb.strict.interface.declaration", "true");
+
+ @Keys({@Key(value = "ann.remoteOrLocal.converse.parent", count = 2)})
+ public EjbJar test2() {
+ SystemInstance.get().setProperty("openejb.strict.interface.declaration", "true");
EjbJar ejbJar = new EjbJar();
ejbJar.addEnterpriseBean(new StatelessBean(EBean.class));
ejbJar.addEnterpriseBean(new StatelessBean(FBean.class));
return ejbJar;
-
+
}
+
@After
public void after() {
SystemInstance.get().setProperty("openejb.strict.interface.declaration", "false");
@@ -142,66 +145,103 @@ public class InvalidInterfacesTest {
return ejbJar;
}
- public static class FooBean {}
+ public static class FooBean {
+ }
- public static interface FooEJBHome extends EJBHome {}
+ public static interface FooEJBHome extends EJBHome {
+ }
- public static interface FooEJBObject extends EJBObject {}
+ public static interface FooEJBObject extends EJBObject {
+ }
- public static interface FooEJBLocalHome extends EJBLocalHome {}
+ public static interface FooEJBLocalHome extends EJBLocalHome {
+ }
- public static interface FooEJBLocalObject extends EJBLocalObject {}
+ public static interface FooEJBLocalObject extends EJBLocalObject {
+ }
@Remote
- public static interface FooRemote {}
+ public static interface FooRemote {
+ }
@Local
- public static interface FooLocal {}
+ public static interface FooLocal {
+ }
- public static interface FooUnknown {}
+ public static interface FooUnknown {
+ }
- public static class FooClass {}
+ public static class FooClass {
+ }
- public static interface MyRemoteHome extends EJBHome {}
+ public static interface MyRemoteHome extends EJBHome {
+ }
- public static interface MyLocalHome extends EJBLocalHome {}
+ public static interface MyLocalHome extends EJBLocalHome {
+ }
- public static interface MyRemote extends EJBObject {}
+ public static interface MyRemote extends EJBObject {
+ }
- public static interface MyLocal extends EJBLocalObject {}
+ public static interface MyLocal extends EJBLocalObject {
+ }
- @Remote( { MyRemoteHome.class, MyRemote.class })
- @Local( { MyLocalHome.class, MyLocal.class })
- public static class MyBean {}
+ @Remote({MyRemoteHome.class, MyRemote.class})
+ @Local({MyLocalHome.class, MyLocal.class})
+ public static class MyBean {
+ }
- public static class ABean {}
+ public static class ABean {
+ }
@Local(ABean.class)
- public static class BBean extends ABean {}
+ public static class BBean extends ABean {
+ }
- public static interface C {}
+ public static interface C {
+ }
@Local(C.class)
@Remote(C.class)
- public static class CBean {}
+ public static class CBean {
+ }
+
@EJB
- public static interface D{
+ public static interface D {
@PostConstruct
public void foo();
}
+
@Local(D.class)
- public static class DBean{
- public void foo(){}
- @AroundInvoke public Object bar(){return null;}
+ public static class DBean {
+ public void foo() {
+ }
+
+ @AroundInvoke
+ public Object bar() {
+ return null;
+ }
}
+
@Local
- public static interface E{}
+ public static interface E {
+ }
+
@Remote
- public static interface E1 extends E{}
- public static class EBean implements E1{}
+ public static interface E1 extends E {
+ }
+
+ public static class EBean implements E1 {
+ }
+
@Remote
- public static interface F{}
+ public static interface F {
+ }
+
@Local
- public static interface F1 extends F{}
- public static class FBean implements F1{}
+ public static interface F1 extends F {
+ }
+
+ public static class FBean implements F1 {
+ }
}
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonCircularTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonCircularTest.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonCircularTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/core/singleton/SingletonCircularTest.java Mon Dec 3 02:48:46 2012
@@ -16,17 +16,7 @@
*/
package org.apache.openejb.core.singleton;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.ejb.EJB;
-import javax.ejb.Singleton;
-import javax.ejb.Startup;
-
import junit.framework.TestCase;
-
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
@@ -37,11 +27,19 @@ import org.apache.openejb.core.ivm.namin
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.SingletonBean;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.ejb.EJB;
+import javax.ejb.Singleton;
+import javax.ejb.Startup;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @version $Rev$ $Date$
*/
public class SingletonCircularTest extends TestCase {
-
+
private static final String one = "one";
private static final String two = "two";
@@ -58,7 +56,7 @@ public class SingletonCircularTest exten
// containers
assembler.createContainer(config.configureService(SingletonSessionContainerInfo.class));
-
+
actual.clear();
EjbJar ejbJar = new EjbJar();
@@ -79,8 +77,9 @@ public class SingletonCircularTest exten
@Startup
public static class One {
- @EJB Two two;
-
+ @EJB
+ Two two;
+
@PostConstruct
@PreDestroy
public void callback() {
@@ -92,13 +91,14 @@ public class SingletonCircularTest exten
@Startup
public static class Two {
- @EJB One one;
-
+ @EJB
+ One one;
+
@PostConstruct
@PreDestroy
public void callback() {
actual.add(two);
}
}
-
+
}
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/mbeans/Parent.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/mbeans/Parent.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/mbeans/Parent.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/mbeans/Parent.java Mon Dec 3 02:48:46 2012
@@ -24,14 +24,16 @@ public abstract class Parent {
private int i = -1;
@ManagedAttribute
- @Description("just a value") public int getValue() {
+ @Description("just a value")
+ public int getValue() {
if (i < 0) {
return 2;
}
return i;
}
- @ManagedAttribute public void setValue(int v) {
+ @ManagedAttribute
+ public void setValue(int v) {
i = v;
}
}
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ReloadableEntityManagerFactoryTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ReloadableEntityManagerFactoryTest.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ReloadableEntityManagerFactoryTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/persistence/ReloadableEntityManagerFactoryTest.java Mon Dec 3 02:48:46 2012
@@ -63,7 +63,8 @@ public class ReloadableEntityManagerFact
return p;
}
- @Test public void reload() {
+ @Test
+ public void reload() {
final ReloadableEntityManagerFactory remft = (ReloadableEntityManagerFactory) emf;
final EntityManagerFactory originalEmf = remft.getDelegate();
assertEquals("false", emf.getProperties().get("openjpa.DataCache"));
@@ -80,13 +81,14 @@ public class ReloadableEntityManagerFact
private void select() {
emf.createEntityManager()
- .createQuery("select m from ReloadableEntityManagerFactoryTest$MyEntity m")
- .getResultList();
+ .createQuery("select m from ReloadableEntityManagerFactoryTest$MyEntity m")
+ .getResultList();
}
@Entity
public static class MyEntity {
- @Id @GeneratedValue
+ @Id
+ @GeneratedValue
private long id;
public long getId() {
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/timer/TimerContainerTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/timer/TimerContainerTest.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/timer/TimerContainerTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/timer/TimerContainerTest.java Mon Dec 3 02:48:46 2012
@@ -17,14 +17,7 @@
*/
package org.apache.openejb.timer;
-import javax.annotation.Resource;
-import javax.ejb.SessionContext;
-import javax.ejb.Stateless;
-import javax.ejb.TimerService;
-import javax.naming.InitialContext;
-
import junit.framework.TestCase;
-
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.ProxyFactoryInfo;
import org.apache.openejb.assembler.classic.SecurityServiceInfo;
@@ -35,12 +28,18 @@ import org.apache.openejb.core.ivm.namin
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.StatelessBean;
+import javax.annotation.Resource;
+import javax.ejb.SessionContext;
+import javax.ejb.Stateless;
+import javax.ejb.TimerService;
+import javax.naming.InitialContext;
+
/**
* @version $Revision$ $Date$
*/
public class TimerContainerTest extends TestCase {
- public void testTimerServiceInjection() throws Exception {
+ public void testTimerServiceInjection() throws Exception {
InitialContext ctx = new InitialContext();
Object object = ctx.lookup("WidgetBeanLocal");
@@ -50,7 +49,7 @@ public class TimerContainerTest extends
Widget widget = (Widget) object;
// Do a business method...
- assertTrue("Timer was not injected", widget.isTimerSet());
+ assertTrue("Timer was not injected", widget.isTimerSet());
}
protected void setUp() throws Exception {
@@ -95,9 +94,10 @@ public class TimerContainerTest extends
@Stateless
public static class WidgetBean implements Widget, RemoteWidget {
- @Resource TimerService timer;
+ @Resource
+ TimerService timer;
- public WidgetBean() {
+ public WidgetBean() {
}
@Resource
Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/util/DynamicEJBImplTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/util/DynamicEJBImplTest.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/util/DynamicEJBImplTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/util/DynamicEJBImplTest.java Mon Dec 3 02:48:46 2012
@@ -59,39 +59,49 @@ import static junit.framework.Assert.fai
public class DynamicEJBImplTest {
private static boolean initDone = false;
- @EJB private UserDAO dao = null;
- @EJB private UtilBean util = null;
- @EJB private UserDAOChild child = null;
- @EJB private DynamicCustomProxy custom = null;
+ @EJB
+ private UserDAO dao = null;
+ @EJB
+ private UtilBean util = null;
+ @EJB
+ private UserDAOChild child = null;
+ @EJB
+ private DynamicCustomProxy custom = null;
- @Test public void custom() {
+ @Test
+ public void custom() {
assertEquals("method = foo", custom.foo());
}
- @Before public void initDatabaseIfNotDone() {
+ @Before
+ public void initDatabaseIfNotDone() {
if (!initDone) {
util.init();
initDone = true;
}
}
- @After public void checkAll() {
+ @After
+ public void checkAll() {
Collection<User> users = dao.findAll();
assertEquals(10, users.size());
}
- @Test public void simple() {
+ @Test
+ public void simple() {
User user = dao.findById(1);
assertNotNull(user);
assertEquals(1, user.getId());
}
- @Test public void findAll() {
+ @Test
+ public void findAll() {
Collection<User> users = dao.findAll();
assertEquals(10, users.size());
}
- @Test public void pagination() {
+ @Test
+ public void pagination() {
Collection<User> users = dao.findAll(0, 5);
assertEquals(5, users.size());
@@ -100,14 +110,16 @@ public class DynamicEJBImplTest {
assertEquals(7, users.iterator().next().getId());
}
- @Test public void persist() {
+ @Test
+ public void persist() {
User u = new User();
dao.save(u);
assertNotNull(u.getId());
util.remove(u);
}
- @Test public void remove() {
+ @Test
+ public void remove() {
User u = new User();
dao.save(u);
assertNotNull(u.getId());
@@ -120,7 +132,8 @@ public class DynamicEJBImplTest {
}
}
- @Test public void merge() {
+ @Test
+ public void merge() {
User u = new User();
u.setInfo("one");
dao.save(u);
@@ -134,7 +147,8 @@ public class DynamicEJBImplTest {
dao.delete(u);
}
- @Test public void oneCriteria() {
+ @Test
+ public void oneCriteria() {
Collection<User> users = dao.findByName("foo");
assertEquals(4, users.size());
for (User user : users) {
@@ -142,7 +156,8 @@ public class DynamicEJBImplTest {
}
}
- @Test public void twoCriteria() {
+ @Test
+ public void twoCriteria() {
Collection<User> users = dao.findByNameAndInfo("bar-1", "1");
assertEquals(1, users.size());
@@ -151,13 +166,15 @@ public class DynamicEJBImplTest {
assertEquals("1", user.getInfo());
}
- @Test public void checkInjections() {
+ @Test
+ public void checkInjections() {
UserDAO injection = util.getDao();
assertNotNull(injection);
assertEquals(10, injection.findAll().size());
}
- @Test public void query() {
+ @Test
+ public void query() {
Map<String, String> params = new HashMap<String, String>();
params.put("name", "foo");
@@ -182,7 +199,8 @@ public class DynamicEJBImplTest {
assertEquals(4, users.size());
}
- @Test public void inheritance() {
+ @Test
+ public void inheritance() {
Map<String, String> params = new HashMap<String, String>();
params.put("name", "foo");
@@ -207,7 +225,9 @@ public class DynamicEJBImplTest {
assertEquals(4, users.size());
}
- @Stateless @PersistenceContext(name = "pu") public static interface UserDAO {
+ @Stateless
+ @PersistenceContext(name = "pu")
+ public static interface UserDAO {
User findById(long id);
Collection<User> findByName(String name);
@@ -215,11 +235,15 @@ public class DynamicEJBImplTest {
Collection<User> findByNameAndInfo(String name, String info);
Collection<User> findAll();
+
Collection<User> findAll(int first, int max);
Collection<User> namedQuery(String name, Map<String, ?> params, int first, int max);
+
Collection<User> namedQuery(String name, int first, int max, Map<String, ?> params);
+
Collection<User> namedQuery(String name, Map<String, ?> params);
+
Collection<User> namedQuery(String name);
Collection<User> query(String value, Map<String, ?> params);
@@ -231,16 +255,21 @@ public class DynamicEJBImplTest {
User update(User u);
}
- @Stateless @PersistenceContext(name = "pu") public static interface UserDAOChild extends UserDAO {
+ @Stateless
+ @PersistenceContext(name = "pu")
+ public static interface UserDAOChild extends UserDAO {
// just inherited methods
}
@NamedQueries({
- @NamedQuery(name = "dynamic-ejb-impl-test.query", query = "SELECT u FROM DynamicEJBImplTest$User AS u WHERE u.name LIKE :name"),
- @NamedQuery(name = "dynamic-ejb-impl-test.all", query = "SELECT u FROM DynamicEJBImplTest$User AS u")
+ @NamedQuery(name = "dynamic-ejb-impl-test.query", query = "SELECT u FROM DynamicEJBImplTest$User AS u WHERE u.name LIKE :name"),
+ @NamedQuery(name = "dynamic-ejb-impl-test.all", query = "SELECT u FROM DynamicEJBImplTest$User AS u")
})
- @Entity public static class User {
- @Id @GeneratedValue private long id;
+ @Entity
+ public static class User {
+ @Id
+ @GeneratedValue
+ private long id;
private String name;
private String info;
@@ -268,14 +297,18 @@ public class DynamicEJBImplTest {
this.info = info;
}
- @Override public String toString() {
+ @Override
+ public String toString() {
return "User{info='" + info + '\'' + ", name='" + name + '\'' + ", id=" + id + '}';
}
}
- @Singleton public static class UtilBean {
- @PersistenceContext private EntityManager em;
- @EJB private UserDAO dao = null;
+ @Singleton
+ public static class UtilBean {
+ @PersistenceContext
+ private EntityManager em;
+ @EJB
+ private UserDAO dao = null;
public void init() {
for (int i = 0; i < 10; i++) {
@@ -300,7 +333,8 @@ public class DynamicEJBImplTest {
}
public static class Handler implements InvocationHandler {
- @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ @Override
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
return "method = " + method.getName();
}
}
@@ -311,7 +345,8 @@ public class DynamicEJBImplTest {
public String foo();
}
- @Configuration public Properties config() {
+ @Configuration
+ public Properties config() {
final Properties p = new Properties();
p.put("dynamicEjbDatabase", "new://Resource?type=DataSource");
p.put("dynamicEjbDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
@@ -319,7 +354,8 @@ public class DynamicEJBImplTest {
return p;
}
- @Module public EjbJar app() throws Exception {
+ @Module
+ public EjbJar app() throws Exception {
EjbJar ejbJar = new EjbJar("dynamic");
ejbJar.addEnterpriseBean(new SingletonBean(UtilBean.class));
ejbJar.addEnterpriseBean(new SingletonBean(DynamicCustomProxy.class));
@@ -328,7 +364,8 @@ public class DynamicEJBImplTest {
return ejbJar;
}
- @Module public Persistence persistence() {
+ @Module
+ public Persistence persistence() {
PersistenceUnit unit = new PersistenceUnit("pu");
unit.addClass(User.class);
unit.setProperty("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)");
Modified: openejb/trunk/openejb/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java (original)
+++ openejb/trunk/openejb/examples/moviefun/src/test/java/org/superbiz/moviefun/MoviesArquillianHtmlUnitTest.java Mon Dec 3 02:48:46 2012
@@ -16,15 +16,8 @@
*/
package org.superbiz.moviefun;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Collection;
-
-import javax.ejb.EJB;
-
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
@@ -40,67 +33,76 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import javax.ejb.EJB;
+import java.io.File;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.junit.Assert.assertTrue;
@RunWith(Arquillian.class)
public class MoviesArquillianHtmlUnitTest {
- private static final String WEBAPP_SRC = "src/main/webapp";
+ private static final String WEBAPP_SRC = "src/main/webapp";
+
+ @Deployment
+ public static WebArchive createDeployment() {
+
+ Collection<String> dependencies = Arrays.asList(new String[]{
+ "javax.servlet:jstl",
+ "taglibs:standard",
+ "commons-lang:commons-lang"
+ });
- @Deployment public static WebArchive createDeployment() {
-
- Collection<String> dependencies = Arrays.asList(new String[] {
- "javax.servlet:jstl",
- "taglibs:standard",
- "commons-lang:commons-lang"
- });
-
- File[] libs = Maven.resolver()
+ File[] libs = Maven.resolver()
.loadPomFromFile("pom.xml").resolve(dependencies)
- .withTransitivity().asFile();
-
- WebArchive war = ShrinkWrap.create(WebArchive.class, "test.war")
+ .withTransitivity().asFile();
+
+ WebArchive war = ShrinkWrap.create(WebArchive.class, "test.war")
.addClasses(Movie.class, MoviesBean.class, MoviesArquillianHtmlUnitTest.class, ActionServlet.class)
.addAsResource(new ClassLoaderAsset("META-INF/ejb-jar.xml"), "META-INF/ejb-jar.xml")
.addAsResource(new ClassLoaderAsset("META-INF/persistence.xml"), "META-INF/persistence.xml")
- .addAsLibraries(libs);
-
- war.merge(ShrinkWrap.create(GenericArchive.class).as(ExplodedImporter.class)
- .importDirectory(WEBAPP_SRC).as(GenericArchive.class),
- "/", Filters.includeAll());
-
- return war;
- }
-
- @EJB private MoviesBean movies;
-
- @ArquillianResource
- private URL deploymentUrl;
+ .addAsLibraries(libs);
+
+ war.merge(ShrinkWrap.create(GenericArchive.class).as(ExplodedImporter.class)
+ .importDirectory(WEBAPP_SRC).as(GenericArchive.class),
+ "/", Filters.includeAll());
+
+ return war;
+ }
- @Before @After public void clean() {
+ @EJB
+ private MoviesBean movies;
+
+ @ArquillianResource
+ private URL deploymentUrl;
+
+ @Before
+ @After
+ public void clean() {
movies.clean();
}
@Test
- public void testShouldMakeSureWebappIsWorking() throws Exception {
- WebClient webClient = new WebClient();
- HtmlPage page = webClient.getPage(deploymentUrl + "/setup.jsp");
-
- assertMoviesPresent(page);
-
- page = webClient.getPage(deploymentUrl + "/moviefun");
-
- assertMoviesPresent(page);
- webClient.closeAllWindows();
- }
-
- private void assertMoviesPresent(HtmlPage page) {
- String pageAsText = page.asText();
- assertTrue(pageAsText.contains("Wedding Crashers"));
- assertTrue(pageAsText.contains("Starsky & Hutch"));
- assertTrue(pageAsText.contains("Shanghai Knights"));
- assertTrue(pageAsText.contains("I-Spy"));
- assertTrue(pageAsText.contains("The Royal Tenenbaums"));
- }
+ public void testShouldMakeSureWebappIsWorking() throws Exception {
+ WebClient webClient = new WebClient();
+ HtmlPage page = webClient.getPage(deploymentUrl + "/setup.jsp");
+
+ assertMoviesPresent(page);
+
+ page = webClient.getPage(deploymentUrl + "/moviefun");
+
+ assertMoviesPresent(page);
+ webClient.closeAllWindows();
+ }
+
+ private void assertMoviesPresent(HtmlPage page) {
+ String pageAsText = page.asText();
+ assertTrue(pageAsText.contains("Wedding Crashers"));
+ assertTrue(pageAsText.contains("Starsky & Hutch"));
+ assertTrue(pageAsText.contains("Shanghai Knights"));
+ assertTrue(pageAsText.contains("I-Spy"));
+ assertTrue(pageAsText.contains("The Royal Tenenbaums"));
+ }
}
Modified: openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java (original)
+++ openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java Mon Dec 3 02:48:46 2012
@@ -235,7 +235,7 @@ public abstract class AbstractTomEEMojo
private void removeDefaultWebapps(final boolean removeTomee) {
final File webapps = new File(catalinaBase, webappDir);
if (webapps.isDirectory()) {
- final File[] files = webapps.listFiles();
+ final File[] files = webapps.listFiles();
if (null != files) for (File webapp : files) {
final String name = webapp.getName();
if (webapp.isDirectory() && (removeTomee || !name.equals("tomee"))) {
@@ -530,7 +530,8 @@ public abstract class AbstractTomEEMojo
if (getNoShutdownHook()) {
Runtime.getRuntime().addShutdownHook(new Thread() {
- @Override public void run() {
+ @Override
+ public void run() {
server.stop();
}
});
@@ -559,7 +560,7 @@ public abstract class AbstractTomEEMojo
// no-op
}
- protected int getConnectAttempts() {
+ protected int getConnectAttempts() {
return Integer.MAX_VALUE;
}
Modified: openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java (original)
+++ openejb/trunk/openejb/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/UpdatableTomEEMojo.java Mon Dec 3 02:48:46 2012
@@ -89,7 +89,8 @@ public abstract class UpdatableTomEEMojo
protected void addShutdownHooks(final RemoteServer server) {
if (synchronization != null) {
Runtime.getRuntime().addShutdownHook(new Thread() {
- @Override public void run() {
+ @Override
+ public void run() {
timer.cancel();
}
});
Modified: openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/proxy/Jdk13ProxyFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/proxy/Jdk13ProxyFactory.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/proxy/Jdk13ProxyFactory.java (original)
+++ openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/proxy/Jdk13ProxyFactory.java Mon Dec 3 02:48:46 2012
@@ -147,7 +147,8 @@ public class Jdk13ProxyFactory implement
delegatingClassloaders = classLoaders;
}
- @Override public Class<?> loadClass(String name) throws ClassNotFoundException {
+ @Override
+ public Class<?> loadClass(String name) throws ClassNotFoundException {
ClassNotFoundException ex = null;
for (ClassLoader cl : delegatingClassloaders) {
try {
Modified: openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomExceptionMapperTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomExceptionMapperTest.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomExceptionMapperTest.java (original)
+++ openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomExceptionMapperTest.java Mon Dec 3 02:48:46 2012
@@ -38,7 +38,8 @@ import static junit.framework.Assert.ass
public class CustomExceptionMapperTest {
private static EJBContainer container;
- @BeforeClass public static void start() throws Exception {
+ @BeforeClass
+ public static void start() throws Exception {
final Properties properties = new Properties();
properties.setProperty(DeploymentFilterable.CLASSPATH_INCLUDE, ".*openejb-cxf-rs.*");
properties.setProperty(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true");
@@ -46,13 +47,15 @@ public class CustomExceptionMapperTest {
container = EJBContainer.createEJBContainer(properties);
}
- @AfterClass public static void close() throws Exception {
+ @AfterClass
+ public static void close() throws Exception {
if (container != null) {
container.close();
}
}
- @Test public void exceptionMapper() {
+ @Test
+ public void exceptionMapper() {
final String response = WebClient.create("http://localhost:4204/openejb-cxf-rs")
.path("/exception-mapper/throw").get(String.class);
assertEquals(FooException.class.getName(), response);
Modified: openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java (original)
+++ openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java Mon Dec 3 02:48:46 2012
@@ -45,7 +45,8 @@ import static junit.framework.Assert.ass
public class CustomProviderTest {
private static EJBContainer container;
- @BeforeClass public static void start() throws Exception {
+ @BeforeClass
+ public static void start() throws Exception {
final Properties properties = new Properties();
properties.setProperty(DeploymentFilterable.CLASSPATH_INCLUDE, ".*openejb-cxf-rs.*");
properties.setProperty(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true");
@@ -53,28 +54,34 @@ public class CustomProviderTest {
container = EJBContainer.createEJBContainer(properties);
}
- @AfterClass public static void close() throws Exception {
+ @AfterClass
+ public static void close() throws Exception {
if (container != null) {
container.close();
}
}
- @Test public void customProvider() {
+ @Test
+ public void customProvider() {
String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").accept("openejb/reverse")
- .path("/custom1/reverse").get(String.class);
+ .path("/custom1/reverse").get(String.class);
assertEquals("provider", response);
}
- @Test public void customSpecificProvider() {
+ @Test
+ public void customSpecificProvider() {
String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").accept("openejb/constant")
- .path("/custom2/constant").get(String.class);
+ .path("/custom2/constant").get(String.class);
assertEquals("it works!", response);
}
@Singleton
@Path("/custom1")
public static class CustomService {
- @GET @Path("/reverse") @Produces("openejb/reverse") public String go() {
+ @GET
+ @Path("/reverse")
+ @Produces("openejb/reverse")
+ public String go() {
return "redivorp";
}
}
@@ -82,7 +89,10 @@ public class CustomProviderTest {
@Singleton
@Path("/custom2")
public static class CustomSpecificService {
- @GET @Path("/constant") @Produces("openejb/constant") public String go() {
+ @GET
+ @Path("/constant")
+ @Produces("openejb/constant")
+ public String go() {
return "will be overriden";
}
}
Modified: openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EjbDeploymentTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EjbDeploymentTest.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EjbDeploymentTest.java (original)
+++ openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EjbDeploymentTest.java Mon Dec 3 02:48:46 2012
@@ -42,7 +42,8 @@ public class EjbDeploymentTest {
private static EJBContainer container;
private static RESTIsCool service;
- @BeforeClass public static void start() throws Exception {
+ @BeforeClass
+ public static void start() throws Exception {
Properties properties = new Properties();
properties.setProperty(DeploymentFilterable.CLASSPATH_INCLUDE, ".*openejb-cxf-rs.*");
properties.setProperty(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true");
@@ -50,23 +51,27 @@ public class EjbDeploymentTest {
service = (RESTIsCool) container.getContext().lookup("java:/global/openejb-cxf-rs/RESTIsCool");
}
- @AfterClass public static void close() throws Exception {
+ @AfterClass
+ public static void close() throws Exception {
if (container != null) {
container.close();
}
}
- @Test public void normal() {
+ @Test
+ public void normal() {
assertNotNull(service);
assertEquals("ok", service.normal());
}
- @Test public void rest() {
+ @Test
+ public void rest() {
String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/ejb/rest").get(String.class);
assertEquals("ok", response);
}
- @Test public void restParameterInjected() {
+ @Test
+ public void restParameterInjected() {
String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/ejb/param").get(String.class);
assertEquals("true", response);
@@ -74,7 +79,8 @@ public class EjbDeploymentTest {
assertEquals("foo", response);
}
- @Test public void restFieldInjected() {
+ @Test
+ public void restFieldInjected() {
Boolean response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/ejb/field").get(Boolean.class);
assertEquals(true, response.booleanValue());
}
@@ -82,22 +88,32 @@ public class EjbDeploymentTest {
@Stateless
@Path("/ejb")
public static class RESTIsCool {
- @EJB private SimpleEJB simpleEJB;
- @javax.ws.rs.core.Context Request request;
-
- @Path("/normal") @GET public String normal() {
+ @EJB
+ private SimpleEJB simpleEJB;
+ @javax.ws.rs.core.Context
+ Request request;
+
+ @Path("/normal")
+ @GET
+ public String normal() {
return simpleEJB.ok();
}
- @Path("/rest") @GET public String rest() {
+ @Path("/rest")
+ @GET
+ public String rest() {
return simpleEJB.ok();
}
- @Path("/param") @GET public String param(@QueryParam("arg") @DefaultValue("true") String p) {
+ @Path("/param")
+ @GET
+ public String param(@QueryParam("arg") @DefaultValue("true") String p) {
return p;
}
- @Path("/field") @GET public boolean field() {
+ @Path("/field")
+ @GET
+ public boolean field() {
return "GET".equals(request.getMethod());
}
}
Modified: openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/PathParamAtClassLevelTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/PathParamAtClassLevelTest.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/PathParamAtClassLevelTest.java (original)
+++ openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/PathParamAtClassLevelTest.java Mon Dec 3 02:48:46 2012
@@ -17,44 +17,42 @@
package org.apache.openejb.server.cxf.rs;
-import java.util.Properties;
-import javax.ejb.EJB;
-import javax.ejb.Stateless;
-import javax.ejb.embeddable.EJBContainer;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Request;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.openejb.OpenEjbContainer;
import org.apache.openejb.config.DeploymentFilterable;
-import org.apache.openejb.server.cxf.rs.beans.SimpleEJB;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import javax.ejb.Stateless;
+import javax.ejb.embeddable.EJBContainer;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import java.util.Properties;
+
import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
public class PathParamAtClassLevelTest {
private static EJBContainer container;
- @BeforeClass public static void start() throws Exception {
+ @BeforeClass
+ public static void start() throws Exception {
Properties properties = new Properties();
properties.setProperty(DeploymentFilterable.CLASSPATH_INCLUDE, ".*openejb-cxf-rs.*");
properties.setProperty(OpenEjbContainer.OPENEJB_EMBEDDED_REMOTABLE, "true");
container = EJBContainer.createEJBContainer(properties);
}
- @AfterClass public static void close() throws Exception {
+ @AfterClass
+ public static void close() throws Exception {
if (container != null) {
container.close();
}
}
- @Test public void rest() {
+ @Test
+ public void rest() {
String response = WebClient.create("http://localhost:4204/openejb-cxf-rs").path("/match/openejb/test/normal").get(String.class);
assertEquals("openejb", response);
}
@@ -62,7 +60,9 @@ public class PathParamAtClassLevelTest {
@Stateless
@Path("/match/{name}/test")
public static class DoesItMatchWithPathParamAtClassLevel {
- @Path("/normal") @GET public String normal(@PathParam("name") String name) {
+ @Path("/normal")
+ @GET
+ public String normal(@PathParam("name") String name) {
return name;
}
}
Modified: openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RestDeploymentTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RestDeploymentTest.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RestDeploymentTest.java (original)
+++ openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/RestDeploymentTest.java Mon Dec 3 02:48:46 2012
@@ -78,7 +78,8 @@ public class RestDeploymentTest {
private static ServiceDaemon daemon;
public static final String BASE_URL = "http://localhost:4204/my-web-app/my-app";
- @BeforeClass public static void start() throws Exception {
+ @BeforeClass
+ public static void start() throws Exception {
WebApp webApp = new WebApp();
webApp.setContextRoot("/my-web-app");
webApp.setId("web");
@@ -116,7 +117,8 @@ public class RestDeploymentTest {
final AppContext application = assembler.createApplication(appInfo);
Context ctx = (Context) Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class<?>[]{Context.class}, new InvocationHandler() {
- @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ @Override
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
if (args.length == 1 && args[0].equals("SimpleEJBLocalBean")) {
return new SimpleEJB();
}
@@ -154,7 +156,8 @@ public class RestDeploymentTest {
service.start();
}
- @AfterClass public static void close() throws ServiceException {
+ @AfterClass
+ public static void close() throws ServiceException {
if (service != null) {
service.stop();
}
@@ -166,17 +169,20 @@ public class RestDeploymentTest {
}
}
- @Test public void first() {
+ @Test
+ public void first() {
String hi = WebClient.create(BASE_URL).path("/first/hi").get(String.class);
assertEquals("Hi from REST World!", hi);
}
- @Test public void second() {
+ @Test
+ public void second() {
String hi = WebClient.create(BASE_URL).path("/second/hi2/2nd").get(String.class);
assertEquals("hi 2nd", hi);
}
- @Test public void expert() throws Exception {
+ @Test
+ public void expert() throws Exception {
Response response = WebClient.create(BASE_URL).path("/expert/still-hi").post("Pink Floyd");
assertEquals(HttpServletResponse.SC_OK, response.getStatus());
@@ -191,15 +197,18 @@ public class RestDeploymentTest {
assertEquals("hi Pink Floyd", writer.toString());
}
- @Test public void nonListed() { // default handler from openejb-http
+ @Test
+ public void nonListed() { // default handler from openejb-http
assertEquals("", WebClient.create(BASE_URL).path("/non-listed/yata/foo").get(String.class));
}
- @Test public void hooked() {
+ @Test
+ public void hooked() {
assertEquals(true, WebClient.create(BASE_URL).path("/hooked/post").get(Boolean.class).booleanValue());
}
- @Test public void injectEjb() {
+ @Test
+ public void injectEjb() {
assertEquals(true, WebClient.create(BASE_URL).path("/inject/ejb").get(Boolean.class).booleanValue());
}
}
Modified: openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/RestWithInjections.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/RestWithInjections.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/RestWithInjections.java (original)
+++ openejb/trunk/openejb/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/beans/RestWithInjections.java Mon Dec 3 02:48:46 2012
@@ -24,10 +24,14 @@ import javax.ws.rs.core.UriInfo;
@Path("/inject")
public class RestWithInjections {
- @EJB private SimpleEJB simple;
- @Context UriInfo uriInfo;
+ @EJB
+ private SimpleEJB simple;
+ @Context
+ UriInfo uriInfo;
- @Path("/ejb") @GET public boolean ejb() {
+ @Path("/ejb")
+ @GET
+ public boolean ejb() {
return simple != null && "ok".equals(simple.ok()) && uriInfo != null;
}
}
Modified: openejb/trunk/openejb/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/HttpDestination.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/HttpDestination.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/HttpDestination.java (original)
+++ openejb/trunk/openejb/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/HttpDestination.java Mon Dec 3 02:48:46 2012
@@ -21,12 +21,7 @@ import org.apache.cxf.Bus;
import org.apache.cxf.service.model.EndpointInfo;
import org.apache.cxf.transport.http.AbstractHTTPDestination;
import org.apache.cxf.transport.http.DestinationRegistry;
-import org.apache.openejb.server.httpd.HttpRequest;
-import org.apache.openejb.server.httpd.HttpResponse;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.logging.Logger;
@@ -35,7 +30,8 @@ public class HttpDestination extends Abs
super(bus, registry, endpointInfo, path, true);
}
- @Override public Logger getLogger() {
+ @Override
+ public Logger getLogger() {
return Logger.getLogger(HttpDestination.class.getName());
}
}
Modified: openejb/trunk/openejb/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/HttpTransportFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/HttpTransportFactory.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/HttpTransportFactory.java (original)
+++ openejb/trunk/openejb/server/openejb-cxf-transport/src/main/java/org/apache/openejb/server/cxf/transport/HttpTransportFactory.java Mon Dec 3 02:48:46 2012
@@ -26,15 +26,16 @@ import java.io.IOException;
public class HttpTransportFactory extends HTTPTransportFactory {
public HttpTransportFactory() {
- // no-op
+ // no-op
}
-
+
public HttpTransportFactory(Bus bus) {
setBus(bus);
}
- @Override public Destination getDestination(EndpointInfo endpointInfo) throws IOException {
+ @Override
+ public Destination getDestination(EndpointInfo endpointInfo) throws IOException {
return new HttpDestination(getBus(), getRegistry(), endpointInfo, endpointInfo.getAddress());
}
}
Modified: openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/OpenEJBLoginValidator.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/OpenEJBLoginValidator.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/OpenEJBLoginValidator.java (original)
+++ openejb/trunk/openejb/server/openejb-cxf/src/main/java/org/apache/openejb/server/cxf/OpenEJBLoginValidator.java Mon Dec 3 02:48:46 2012
@@ -25,13 +25,12 @@ import org.apache.ws.security.message.to
import org.apache.ws.security.validate.UsernameTokenValidator;
import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.login.LoginException;
-import java.io.IOException;
public class OpenEJBLoginValidator extends UsernameTokenValidator {
- @Override protected void verifyDigestPassword(UsernameToken usernameToken,
- RequestData data) throws WSSecurityException {
+ @Override
+ protected void verifyDigestPassword(UsernameToken usernameToken,
+ RequestData data) throws WSSecurityException {
// check password
super.verifyDigestPassword(usernameToken, data);
Modified: openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java (original)
+++ openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java Mon Dec 3 02:48:46 2012
@@ -310,7 +310,7 @@ public abstract class RESTService implem
}
}
- protected Map<String,EJBRestServiceInfo> getRestEjbs(AppInfo appInfo) {
+ protected Map<String, EJBRestServiceInfo> getRestEjbs(AppInfo appInfo) {
Map<String, BeanContext> beanContexts = new HashMap<String, BeanContext>();
for (EjbJarInfo ejbJar : appInfo.ejbJars) {
for (EnterpriseBeanInfo bean : ejbJar.enterpriseBeans) {
@@ -452,7 +452,7 @@ public abstract class RESTService implem
if (itfs != null) {
for (Class<?> c : itfs) {
usedClass = findPath(c);
- if (usedClass.getAnnotation(Path.class) != null ) {
+ if (usedClass.getAnnotation(Path.class) != null) {
break;
}
}
@@ -542,7 +542,8 @@ public abstract class RESTService implem
}
}
- @Override public void start() throws ServiceException {
+ @Override
+ public void start() throws ServiceException {
SystemInstance.get().setComponent(RESTService.class, this);
beforeStart();
@@ -564,7 +565,8 @@ public abstract class RESTService implem
}
}
- @Override public void stop() throws ServiceException {
+ @Override
+ public void stop() throws ServiceException {
if (assembler != null) {
SystemInstance.get().removeObserver(this);
for (AppInfo appInfo : new ArrayList<AppInfo>(deployedApplications)) {
@@ -577,23 +579,28 @@ public abstract class RESTService implem
}
}
- @Override public void service(InputStream in, OutputStream out) throws ServiceException, IOException {
+ @Override
+ public void service(InputStream in, OutputStream out) throws ServiceException, IOException {
throw new UnsupportedOperationException(getClass().getName() + " cannot be invoked directly");
}
- @Override public void service(Socket socket) throws ServiceException, IOException {
+ @Override
+ public void service(Socket socket) throws ServiceException, IOException {
throw new UnsupportedOperationException(getClass().getName() + " cannot be invoked directly");
}
- @Override public String getIP() {
+ @Override
+ public String getIP() {
return IP;
}
- @Override public int getPort() {
+ @Override
+ public int getPort() {
return PORT;
}
- @Override public void init(Properties props) throws Exception {
+ @Override
+ public void init(Properties props) throws Exception {
virtualHost = props.getProperty("virtualHost");
enabled = ServiceManager.isEnabled(props);
}
Modified: openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsRegistryImpl.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsRegistryImpl.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsRegistryImpl.java (original)
+++ openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsRegistryImpl.java Mon Dec 3 02:48:46 2012
@@ -27,14 +27,16 @@ import java.util.Map;
public class RsRegistryImpl extends OpenEJBHttpRegistry implements RsRegistry {
private Map<String, String> addresses = new HashMap<String, String>();
- @Override public AddressInfo createRsHttpListener(String root, HttpListener listener, ClassLoader classLoader, String path, String virtualHost) {
+ @Override
+ public AddressInfo createRsHttpListener(String root, HttpListener listener, ClassLoader classLoader, String path, String virtualHost) {
String address = HttpUtil.selectSingleAddress(getResolvedAddresses(path));
addWrappedHttpListener(listener, classLoader, path);
addresses.put(address, path);
return new AddressInfo(address, address);
}
- @Override public HttpListener removeListener(String context) {
+ @Override
+ public HttpListener removeListener(String context) {
String regex = addresses.get(context);
if (regex != null) {
HttpListener listener = registry.removeHttpListener(regex);
Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBSecurityListener.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBSecurityListener.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBSecurityListener.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBSecurityListener.java Mon Dec 3 02:48:46 2012
@@ -33,19 +33,23 @@ public class OpenEJBSecurityListener imp
request = req;
}
- @Override public void onComplete(AsyncEvent asyncEvent) throws IOException {
+ @Override
+ public void onComplete(AsyncEvent asyncEvent) throws IOException {
exit();
}
- @Override public void onError(AsyncEvent asyncEvent) throws IOException {
+ @Override
+ public void onError(AsyncEvent asyncEvent) throws IOException {
exit();
}
- @Override public void onStartAsync(AsyncEvent asyncEvent) throws IOException {
+ @Override
+ public void onStartAsync(AsyncEvent asyncEvent) throws IOException {
enter();
}
- @Override public void onTimeout(AsyncEvent asyncEvent) throws IOException {
+ @Override
+ public void onTimeout(AsyncEvent asyncEvent) throws IOException {
exit();
}
Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJavaJndiBinder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJavaJndiBinder.java?rev=1416338&r1=1416337&r2=1416338&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJavaJndiBinder.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatJavaJndiBinder.java Mon Dec 3 02:48:46 2012
@@ -22,7 +22,8 @@ import org.apache.catalina.LifecycleList
import org.apache.catalina.core.StandardContext;
public class TomcatJavaJndiBinder implements LifecycleListener {
- @Override public void lifecycleEvent(LifecycleEvent event) {
+ @Override
+ public void lifecycleEvent(LifecycleEvent event) {
Object source = event.getSource();
if (source instanceof StandardContext) {
final StandardContext context = (StandardContext) source;