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/01/27 07:53:16 UTC
svn commit: r1236547 - in /openejb/trunk/openejb/examples:
cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/
cdi-alternative-and-stereotypes/src/main/resources/META-INF/
cdi-events/src/main/java/org/superbiz/cdi/events/ cdi-eve...
Author: dblevins
Date: Fri Jan 27 06:53:15 2012
New Revision: 1236547
URL: http://svn.apache.org/viewvc?rev=1236547&view=rev
Log:
reformatted
Modified:
openejb/trunk/openejb/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/Journey.java
openejb/trunk/openejb/examples/cdi-alternative-and-stereotypes/src/main/resources/META-INF/beans.xml
openejb/trunk/openejb/examples/cdi-events/src/main/java/org/superbiz/cdi/events/Notifier.java
openejb/trunk/openejb/examples/cdi-events/src/main/resources/META-INF/beans.xml
openejb/trunk/openejb/examples/cdi-events/src/test/resources/META-INF/beans.xml
openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/main/java/org/superbiz/dynamic/mbean/DynamicMBeanHandler.java
openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/main/java/org/superbiz/dynamic/mbean/ObjectName.java
openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClient.java
openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClientTest.java
openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicRemoteMBeanClient.java
openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/simple/Simple.java
openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/simple/SimpleMBean.java
openejb/trunk/openejb/examples/persistence-fragment/src/main/java/org/superbiz/injection/jpa/Movie.java
openejb/trunk/openejb/examples/reload-persistence-unit-properties/src/main/java/org/superbiz/reloadable/pu/Person.java
openejb/trunk/openejb/examples/reload-persistence-unit-properties/src/test/java/org/superbiz/reloadable/pu/CacheActivationTest.java
openejb/trunk/openejb/examples/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java
openejb/trunk/openejb/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/beans/BookShow.java
openejb/trunk/openejb/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/Log.java
openejb/trunk/openejb/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/interceptors/LoggingInterceptor.java
openejb/trunk/openejb/examples/simple-cdi-interceptor/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookShowTest.java
openejb/trunk/openejb/examples/simple-mdb-and-cdi/src/main/resources/META-INF/beans.xml
openejb/trunk/openejb/examples/simple-osgi/simple-osgi-api/src/main/java/org/superbiz/osgi/calculator/CalculatorLocal.java
openejb/trunk/openejb/examples/simple-osgi/simple-osgi-core/src/main/java/org/superbiz/osgi/moviefun/Movie.java
openejb/trunk/openejb/examples/simple-osgi/simple-osgi-core/src/main/java/org/superbiz/osgi/moviefun/Movies.java
Modified: openejb/trunk/openejb/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/Journey.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/Journey.java?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/Journey.java (original)
+++ openejb/trunk/openejb/examples/cdi-alternative-and-stereotypes/src/main/java/org/superbiz/cdi/stereotype/Journey.java Fri Jan 27 06:53:15 2012
@@ -22,8 +22,10 @@ import javax.inject.Inject;
@Singleton
public class Journey {
- @Inject private Vehicle vehicle;
- @Inject private Society society;
+ @Inject
+ private Vehicle vehicle;
+ @Inject
+ private Society society;
public String vehicle() {
return vehicle.name();
Modified: openejb/trunk/openejb/examples/cdi-alternative-and-stereotypes/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/cdi-alternative-and-stereotypes/src/main/resources/META-INF/beans.xml?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/cdi-alternative-and-stereotypes/src/main/resources/META-INF/beans.xml (original)
+++ openejb/trunk/openejb/examples/cdi-alternative-and-stereotypes/src/main/resources/META-INF/beans.xml Fri Jan 27 06:53:15 2012
@@ -17,6 +17,6 @@
-->
<beans xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/beans_1_0.xsd" />
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"/>
Modified: openejb/trunk/openejb/examples/cdi-events/src/main/java/org/superbiz/cdi/events/Notifier.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/cdi-events/src/main/java/org/superbiz/cdi/events/Notifier.java?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/cdi-events/src/main/java/org/superbiz/cdi/events/Notifier.java (original)
+++ openejb/trunk/openejb/examples/cdi-events/src/main/java/org/superbiz/cdi/events/Notifier.java Fri Jan 27 06:53:15 2012
@@ -24,7 +24,9 @@ import java.util.Date;
@Singleton
public class Notifier {
- @Inject private Event<Date> dateEvent;
+
+ @Inject
+ private Event<Date> dateEvent;
@Schedule(second = "*", minute = "*", hour = "*")
public void sendHour() {
Modified: openejb/trunk/openejb/examples/cdi-events/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/cdi-events/src/main/resources/META-INF/beans.xml?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/cdi-events/src/main/resources/META-INF/beans.xml (original)
+++ openejb/trunk/openejb/examples/cdi-events/src/main/resources/META-INF/beans.xml Fri Jan 27 06:53:15 2012
@@ -17,6 +17,6 @@
-->
<beans xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/beans_1_0.xsd" />
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"/>
Modified: openejb/trunk/openejb/examples/cdi-events/src/test/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/cdi-events/src/test/resources/META-INF/beans.xml?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/cdi-events/src/test/resources/META-INF/beans.xml (original)
+++ openejb/trunk/openejb/examples/cdi-events/src/test/resources/META-INF/beans.xml Fri Jan 27 06:53:15 2012
@@ -16,7 +16,7 @@
limitations under the License.
-->
<beans xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/beans_1_0.xsd" />
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"/>
Modified: openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/main/java/org/superbiz/dynamic/mbean/DynamicMBeanHandler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/main/java/org/superbiz/dynamic/mbean/DynamicMBeanHandler.java?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/main/java/org/superbiz/dynamic/mbean/DynamicMBeanHandler.java (original)
+++ openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/main/java/org/superbiz/dynamic/mbean/DynamicMBeanHandler.java Fri Jan 27 06:53:15 2012
@@ -42,7 +42,8 @@ import java.util.concurrent.ConcurrentHa
public class DynamicMBeanHandler implements InvocationHandler {
private final Map<Method, ConnectionInfo> infos = new ConcurrentHashMap<Method, ConnectionInfo>();
- @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ @Override
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
final String methodName = method.getName();
if (method.getDeclaringClass().equals(Object.class) && "toString".equals(methodName)) {
return getClass().getSimpleName() + " Proxy";
@@ -54,7 +55,7 @@ public class DynamicMBeanHandler impleme
final ConnectionInfo info = getConnectionInfo(method);
final MBeanInfo infos = info.getMBeanInfo();
if (methodName.startsWith("set") && methodName.length() > 3 && args != null && args.length == 1
- && (Void.TYPE.equals(method.getReturnType()) || Void.class.equals(method.getReturnType()))) {
+ && (Void.TYPE.equals(method.getReturnType()) || Void.class.equals(method.getReturnType()))) {
final String attributeName = attributeName(infos, methodName, method.getParameterTypes()[0]);
info.setAttribute(new Attribute(attributeName, args[0]));
return null;
@@ -96,7 +97,7 @@ public class DynamicMBeanHandler impleme
found = name;
}
} else if (found == null && ((lowerName.equals(name) && !attributeName.equals(name))
- || lowerName.equalsIgnoreCase(name))) {
+ || lowerName.equalsIgnoreCase(name))) {
foundBackUp = name;
if (attribute.getType().equals(type.getName())) {
found = name;
@@ -137,7 +138,7 @@ public class DynamicMBeanHandler impleme
info = new RemoteConnectionInfo();
final Map<String, String[]> environment = new HashMap<String, String[]>();
if (!on.user().isEmpty()) {
- environment.put(JMXConnector.CREDENTIALS, new String[]{ on.user(), on.password() });
+ environment.put(JMXConnector.CREDENTIALS, new String[]{on.user(), on.password()});
}
// ((RemoteConnectionInfo) info).connector = JMXConnectorFactory.newJMXConnector(new JMXServiceURL(on.url()), environment);
((RemoteConnectionInfo) info).connector = JMXConnectorFactory.connect(new JMXServiceURL(on.url()), environment);
@@ -156,20 +157,26 @@ public class DynamicMBeanHandler impleme
protected ObjectName objectName;
public abstract void setAttribute(Attribute attribute) throws Exception;
+
public abstract Object getAttribute(String attribute) throws Exception;
+
public abstract Object invoke(String operationName, Object params[], String signature[]) throws Exception;
+
public abstract MBeanInfo getMBeanInfo() throws Exception;
+
public abstract void clean();
}
private static class LocalConnectionInfo extends ConnectionInfo {
private MBeanServer server;
- @Override public void setAttribute(Attribute attribute) throws Exception {
+ @Override
+ public void setAttribute(Attribute attribute) throws Exception {
server.setAttribute(objectName, attribute);
}
- @Override public Object getAttribute(String attribute) throws Exception {
+ @Override
+ public Object getAttribute(String attribute) throws Exception {
return server.getAttribute(objectName, attribute);
}
@@ -178,11 +185,13 @@ public class DynamicMBeanHandler impleme
return server.invoke(objectName, operationName, params, signature);
}
- @Override public MBeanInfo getMBeanInfo() throws Exception {
+ @Override
+ public MBeanInfo getMBeanInfo() throws Exception {
return server.getMBeanInfo(objectName);
}
- @Override public void clean() {
+ @Override
+ public void clean() {
// no-op
}
}
@@ -199,13 +208,15 @@ public class DynamicMBeanHandler impleme
// no-op
}
- @Override public void setAttribute(Attribute attribute) throws Exception {
+ @Override
+ public void setAttribute(Attribute attribute) throws Exception {
before();
connection.setAttribute(objectName, attribute);
after();
}
- @Override public Object getAttribute(String attribute) throws Exception {
+ @Override
+ public Object getAttribute(String attribute) throws Exception {
before();
try {
return connection.getAttribute(objectName, attribute);
@@ -224,7 +235,8 @@ public class DynamicMBeanHandler impleme
}
}
- @Override public MBeanInfo getMBeanInfo() throws Exception {
+ @Override
+ public MBeanInfo getMBeanInfo() throws Exception {
before();
try {
return connection.getMBeanInfo(objectName);
@@ -233,7 +245,8 @@ public class DynamicMBeanHandler impleme
}
}
- @Override public void clean() {
+ @Override
+ public void clean() {
try {
connector.close();
} catch (IOException e) {
Modified: openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/main/java/org/superbiz/dynamic/mbean/ObjectName.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/main/java/org/superbiz/dynamic/mbean/ObjectName.java?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/main/java/org/superbiz/dynamic/mbean/ObjectName.java (original)
+++ openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/main/java/org/superbiz/dynamic/mbean/ObjectName.java Fri Jan 27 06:53:15 2012
@@ -20,8 +20,8 @@ package org.superbiz.dynamic.mbean;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
@Target({TYPE, METHOD})
@@ -31,6 +31,8 @@ public @interface ObjectName {
// for remote usage only
String url() default "";
+
String user() default "";
+
String password() default "";
}
Modified: openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClient.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClient.java?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClient.java (original)
+++ openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClient.java Fri Jan 27 06:53:15 2012
@@ -28,6 +28,8 @@ public interface DynamicMBeanClient {
static final String OBJECT_NAME = "test:group=DynamicMBeanClientTest";
int getCounter();
+
void setCounter(int i);
+
int length(String aString);
}
Modified: openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClientTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClientTest.java?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClientTest.java (original)
+++ openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClientTest.java Fri Jan 27 06:53:15 2012
@@ -36,58 +36,70 @@ public class DynamicMBeanClientTest {
private static ObjectName objectName;
private static EJBContainer container;
- @EJB private DynamicMBeanClient localClient;
- @EJB private DynamicRemoteMBeanClient remoteClient;
+ @EJB
+ private DynamicMBeanClient localClient;
+ @EJB
+ private DynamicRemoteMBeanClient remoteClient;
- @BeforeClass public static void start() {
+ @BeforeClass
+ public static void start() {
container = EJBContainer.createEJBContainer();
}
- @Before public void injectAndRegisterMBean() throws Exception {
+ @Before
+ public void injectAndRegisterMBean() throws Exception {
container.getContext().bind("inject", this);
objectName = new ObjectName(DynamicMBeanClient.OBJECT_NAME);
ManagementFactory.getPlatformMBeanServer().registerMBean(new Simple(), objectName);
}
- @After public void unregisterMBean() throws Exception {
+ @After
+ public void unregisterMBean() throws Exception {
if (objectName != null) {
ManagementFactory.getPlatformMBeanServer().unregisterMBean(objectName);
}
}
- @Test public void localGet() throws Exception {
+ @Test
+ public void localGet() throws Exception {
assertEquals(0, localClient.getCounter());
ManagementFactory.getPlatformMBeanServer().setAttribute(objectName, new Attribute("Counter", 5));
assertEquals(5, localClient.getCounter());
}
- @Test public void localSet() throws Exception {
+ @Test
+ public void localSet() throws Exception {
assertEquals(0, ((Integer) ManagementFactory.getPlatformMBeanServer().getAttribute(objectName, "Counter")).intValue());
localClient.setCounter(8);
assertEquals(8, ((Integer) ManagementFactory.getPlatformMBeanServer().getAttribute(objectName, "Counter")).intValue());
}
- @Test public void localOperation() {
+ @Test
+ public void localOperation() {
assertEquals(7, localClient.length("openejb"));
}
- @Test public void remoteGet() throws Exception {
+ @Test
+ public void remoteGet() throws Exception {
assertEquals(0, remoteClient.getCounter());
ManagementFactory.getPlatformMBeanServer().setAttribute(objectName, new Attribute("Counter", 5));
assertEquals(5, remoteClient.getCounter());
}
- @Test public void remoteSet() throws Exception {
+ @Test
+ public void remoteSet() throws Exception {
assertEquals(0, ((Integer) ManagementFactory.getPlatformMBeanServer().getAttribute(objectName, "Counter")).intValue());
remoteClient.setCounter(8);
assertEquals(8, ((Integer) ManagementFactory.getPlatformMBeanServer().getAttribute(objectName, "Counter")).intValue());
}
- @Test public void remoteOperation() {
+ @Test
+ public void remoteOperation() {
assertEquals(7, remoteClient.length("openejb"));
}
- @AfterClass public static void close() {
+ @AfterClass
+ public static void close() {
if (container != null) {
container.close();
}
Modified: openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicRemoteMBeanClient.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicRemoteMBeanClient.java?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicRemoteMBeanClient.java (original)
+++ openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicRemoteMBeanClient.java Fri Jan 27 06:53:15 2012
@@ -29,8 +29,11 @@ public interface DynamicRemoteMBeanClien
static final String OBJECT_NAME = "test:group=DynamicMBeanClientTest";
int getCounter();
+
void setCounter(int i);
+
int length(String aString);
- @PreDestroy void clean();
+ @PreDestroy
+ void clean();
}
Modified: openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/simple/Simple.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/simple/Simple.java?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/simple/Simple.java (original)
+++ openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/simple/Simple.java Fri Jan 27 06:53:15 2012
@@ -20,18 +20,21 @@ package org.superbiz.dynamic.mbean.simpl
public class Simple implements SimpleMBean {
private int counter = 0;
- @Override public int length(String s) {
+ @Override
+ public int length(String s) {
if (s == null) {
return 0;
}
return s.length();
}
- @Override public int getCounter() {
+ @Override
+ public int getCounter() {
return counter;
}
- @Override public void setCounter(int c) {
+ @Override
+ public void setCounter(int c) {
counter = c;
}
}
Modified: openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/simple/SimpleMBean.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/simple/SimpleMBean.java?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/simple/SimpleMBean.java (original)
+++ openejb/trunk/openejb/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/simple/SimpleMBean.java Fri Jan 27 06:53:15 2012
@@ -21,5 +21,6 @@ public interface SimpleMBean {
int length(String s);
int getCounter();
+
void setCounter(int c);
}
Modified: openejb/trunk/openejb/examples/persistence-fragment/src/main/java/org/superbiz/injection/jpa/Movie.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/persistence-fragment/src/main/java/org/superbiz/injection/jpa/Movie.java?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/persistence-fragment/src/main/java/org/superbiz/injection/jpa/Movie.java (original)
+++ openejb/trunk/openejb/examples/persistence-fragment/src/main/java/org/superbiz/injection/jpa/Movie.java Fri Jan 27 06:53:15 2012
@@ -22,7 +22,9 @@ import javax.persistence.Id;
@Entity
public class Movie {
- @Id @GeneratedValue private long id;
+ @Id
+ @GeneratedValue
+ private long id;
private String director;
private String title;
private int year;
Modified: openejb/trunk/openejb/examples/reload-persistence-unit-properties/src/main/java/org/superbiz/reloadable/pu/Person.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/reload-persistence-unit-properties/src/main/java/org/superbiz/reloadable/pu/Person.java?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/reload-persistence-unit-properties/src/main/java/org/superbiz/reloadable/pu/Person.java (original)
+++ openejb/trunk/openejb/examples/reload-persistence-unit-properties/src/main/java/org/superbiz/reloadable/pu/Person.java Fri Jan 27 06:53:15 2012
@@ -22,7 +22,8 @@ import javax.persistence.Id;
@Entity
public class Person {
- @Id private long id;
+ @Id
+ private long id;
private String name;
public Person() {
Modified: openejb/trunk/openejb/examples/reload-persistence-unit-properties/src/test/java/org/superbiz/reloadable/pu/CacheActivationTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/reload-persistence-unit-properties/src/test/java/org/superbiz/reloadable/pu/CacheActivationTest.java?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/reload-persistence-unit-properties/src/test/java/org/superbiz/reloadable/pu/CacheActivationTest.java (original)
+++ openejb/trunk/openejb/examples/reload-persistence-unit-properties/src/test/java/org/superbiz/reloadable/pu/CacheActivationTest.java Fri Jan 27 06:53:15 2012
@@ -89,9 +89,9 @@ public class CacheActivationTest {
private void activateCache() throws Exception {
ObjectName on = new ObjectName("openejb.management:ObjectType=persistence-unit,PersistenceUnit=reloadable");
MBeanServer server = ManagementFactory.getPlatformMBeanServer();
- server.invoke(on, "setProperty", new Object[] { "openjpa.DataCache", "true" }, null);
- server.invoke(on, "setProperty", new Object[] { "openjpa.RemoteCommitProvider", "sjvm" }, null);
- server.invoke(on, "setSharedCacheMode", new Object[] { "ALL" }, null);
+ server.invoke(on, "setProperty", new Object[]{"openjpa.DataCache", "true"}, null);
+ server.invoke(on, "setProperty", new Object[]{"openjpa.RemoteCommitProvider", "sjvm"}, null);
+ server.invoke(on, "setSharedCacheMode", new Object[]{"ALL"}, null);
server.invoke(on, "reload", new Object[0], null);
}
@@ -99,7 +99,7 @@ public class CacheActivationTest {
for (int i = 0; i < 3; i++) { // some multiple time to get if cache works or not
Person found = mgr.search(personId);
assertNotNull(found);
- assertEquals(personId, found.getId());
+ assertEquals(personId, found.getId());
}
}
}
Modified: openejb/trunk/openejb/examples/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java (original)
+++ openejb/trunk/openejb/examples/rest-on-ejb/src/test/java/org/superbiz/rest/UserServiceTest.java Fri Jan 27 06:53:15 2012
@@ -108,18 +108,18 @@ public class UserServiceTest {
assertEquals(
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
"<users>" +
- "<user>" +
- "<email>foo@foo.com</email>" +
- "<fullname>foo</fullname>" +
- "<id>1</id>" +
- "<password>foopwd</password>" +
- "</user>" +
- "<user>" +
- "<email>bar@bar.com</email>" +
- "<fullname>bar</fullname>" +
- "<id>2</id>" +
- "<password>barpwd</password>" +
- "</user>" +
+ " <user>" +
+ " <email>foo@foo.com</email>" +
+ " <fullname>foo</fullname>" +
+ " <id>1</id>" +
+ " <password>foopwd</password>" +
+ " </user>" +
+ " <user>" +
+ " <email>bar@bar.com</email>" +
+ " <fullname>bar</fullname>" +
+ " <id>2</id>" +
+ " <password>barpwd</password>" +
+ " </user>" +
"</users>", users);
}
Modified: openejb/trunk/openejb/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/beans/BookShow.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/beans/BookShow.java?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/beans/BookShow.java (original)
+++ openejb/trunk/openejb/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/beans/BookShow.java Fri Jan 27 06:53:15 2012
@@ -16,27 +16,27 @@
*/
package org.superbiz.cdi.bookshow.beans;
+import org.superbiz.cdi.bookshow.interceptorbinding.Log;
+
+import javax.ejb.Stateful;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import javax.ejb.Stateful;
-
-import org.superbiz.cdi.bookshow.interceptorbinding.Log;
-
@Log
@Stateful
public class BookShow implements Serializable {
- private static final long serialVersionUID = 6350400892234496909L;
+ private static final long serialVersionUID = 6350400892234496909L;
+
+ public List<String> getMoviesList() {
+ List<String> moviesAvailable = new ArrayList<String>();
+ moviesAvailable.add("12 Angry Men");
+ moviesAvailable.add("Kings speech");
+ return moviesAvailable;
+ }
- public List<String> getMoviesList() {
- List<String> moviesAvailable = new ArrayList<String>();
- moviesAvailable.add("12 Angry Men");
- moviesAvailable.add("Kings speech");
- return moviesAvailable;
- }
- public Integer getDiscountedPrice(int ticketPrice) {
- return ticketPrice - 50;
- }
- // assume more methods are present
+ public Integer getDiscountedPrice(int ticketPrice) {
+ return ticketPrice - 50;
+ }
+ // assume more methods are present
}
Modified: openejb/trunk/openejb/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/Log.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/Log.java?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/Log.java (original)
+++ openejb/trunk/openejb/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/interceptorbinding/Log.java Fri Jan 27 06:53:15 2012
@@ -16,15 +16,16 @@
*/
package org.superbiz.cdi.bookshow.interceptorbinding;
-import static java.lang.annotation.ElementType.*;
+import javax.interceptor.InterceptorBinding;
import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.*;
import java.lang.annotation.Target;
-import javax.interceptor.InterceptorBinding;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
@InterceptorBinding
-@Target({ TYPE, METHOD })
+@Target({TYPE, METHOD})
@Retention(RUNTIME)
public @interface Log {
}
Modified: openejb/trunk/openejb/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/interceptors/LoggingInterceptor.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/interceptors/LoggingInterceptor.java?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/interceptors/LoggingInterceptor.java (original)
+++ openejb/trunk/openejb/examples/simple-cdi-interceptor/src/main/java/org/superbiz/cdi/bookshow/interceptors/LoggingInterceptor.java Fri Jan 27 06:53:15 2012
@@ -32,19 +32,20 @@
*/
package org.superbiz.cdi.bookshow.interceptors;
+import org.superbiz.cdi.bookshow.interceptorbinding.Log;
+
import javax.interceptor.AroundInvoke;
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
-import org.superbiz.cdi.bookshow.interceptorbinding.Log;
-
@Interceptor
@Log
public class LoggingInterceptor {
- private static final long serialVersionUID = 8139854519874743530L;
- @AroundInvoke
- public Object logMethodEntry(InvocationContext ctx) throws Exception {
- System.out.println("Entering method: " + ctx.getMethod().getName());
- return ctx.proceed();
- }
+ private static final long serialVersionUID = 8139854519874743530L;
+
+ @AroundInvoke
+ public Object logMethodEntry(InvocationContext ctx) throws Exception {
+ System.out.println("Entering method: " + ctx.getMethod().getName());
+ return ctx.proceed();
+ }
}
Modified: openejb/trunk/openejb/examples/simple-cdi-interceptor/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookShowTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/simple-cdi-interceptor/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookShowTest.java?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/simple-cdi-interceptor/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookShowTest.java (original)
+++ openejb/trunk/openejb/examples/simple-cdi-interceptor/src/test/java/org/superbiz/cdi/bookshow/interceptors/BookShowTest.java Fri Jan 27 06:53:15 2012
@@ -16,34 +16,35 @@
*/
package org.superbiz.cdi.bookshow.interceptors;
-import javax.ejb.EJB;
-import javax.ejb.embeddable.EJBContainer;
-
import junit.framework.TestCase;
-
import org.superbiz.cdi.bookshow.beans.BookShow;
+import javax.ejb.EJB;
+import javax.ejb.embeddable.EJBContainer;
+
public class BookShowTest extends TestCase {
- @EJB
- private BookShow bookForAShowBean;
- EJBContainer ejbContainer;
- /**
- * Bootstrap the Embedded EJB Container
- *
- * @throws Exception
- */
- @Override
- protected void setUp() throws Exception {
- ejbContainer = EJBContainer.createEJBContainer();
- ejbContainer.getContext().bind("inject", this);
- }
- /**
- * Test basic interception
- */
- public void testMethodShouldBeIntercepted() {
+ @EJB
+ private BookShow bookForAShowBean;
+ EJBContainer ejbContainer;
+
+ /**
+ * Bootstrap the Embedded EJB Container
+ *
+ * @throws Exception
+ */
+ @Override
+ protected void setUp() throws Exception {
+ ejbContainer = EJBContainer.createEJBContainer();
+ ejbContainer.getContext().bind("inject", this);
+ }
+
+ /**
+ * Test basic interception
+ */
+ public void testMethodShouldBeIntercepted() {
- bookForAShowBean.getMoviesList();
+ bookForAShowBean.getMoviesList();
- }
+ }
}
Modified: openejb/trunk/openejb/examples/simple-mdb-and-cdi/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/simple-mdb-and-cdi/src/main/resources/META-INF/beans.xml?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/simple-mdb-and-cdi/src/main/resources/META-INF/beans.xml (original)
+++ openejb/trunk/openejb/examples/simple-mdb-and-cdi/src/main/resources/META-INF/beans.xml Fri Jan 27 06:53:15 2012
@@ -15,4 +15,4 @@
limitations under the License.
-->
-<beans />
+<beans/>
Modified: openejb/trunk/openejb/examples/simple-osgi/simple-osgi-api/src/main/java/org/superbiz/osgi/calculator/CalculatorLocal.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/simple-osgi/simple-osgi-api/src/main/java/org/superbiz/osgi/calculator/CalculatorLocal.java?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/simple-osgi/simple-osgi-api/src/main/java/org/superbiz/osgi/calculator/CalculatorLocal.java (original)
+++ openejb/trunk/openejb/examples/simple-osgi/simple-osgi-api/src/main/java/org/superbiz/osgi/calculator/CalculatorLocal.java Fri Jan 27 06:53:15 2012
@@ -29,6 +29,6 @@ public interface CalculatorLocal {
int divide(int a, int b);
int remainder(int a, int b);
-
+
String sayHello();
}
Modified: openejb/trunk/openejb/examples/simple-osgi/simple-osgi-core/src/main/java/org/superbiz/osgi/moviefun/Movie.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/simple-osgi/simple-osgi-core/src/main/java/org/superbiz/osgi/moviefun/Movie.java?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/simple-osgi/simple-osgi-core/src/main/java/org/superbiz/osgi/moviefun/Movie.java (original)
+++ openejb/trunk/openejb/examples/simple-osgi/simple-osgi-core/src/main/java/org/superbiz/osgi/moviefun/Movie.java Fri Jan 27 06:53:15 2012
@@ -22,7 +22,8 @@ import javax.persistence.Id;
@Entity
public class Movie {
- @Id @GeneratedValue
+ @Id
+ @GeneratedValue
private long id;
private String director;
private String title;
Modified: openejb/trunk/openejb/examples/simple-osgi/simple-osgi-core/src/main/java/org/superbiz/osgi/moviefun/Movies.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/simple-osgi/simple-osgi-core/src/main/java/org/superbiz/osgi/moviefun/Movies.java?rev=1236547&r1=1236546&r2=1236547&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/simple-osgi/simple-osgi-core/src/main/java/org/superbiz/osgi/moviefun/Movies.java (original)
+++ openejb/trunk/openejb/examples/simple-osgi/simple-osgi-core/src/main/java/org/superbiz/osgi/moviefun/Movies.java Fri Jan 27 06:53:15 2012
@@ -17,14 +17,12 @@
package org.superbiz.osgi.moviefun;
import javax.annotation.security.PermitAll;
-import javax.ejb.Stateful;
import javax.ejb.Stateless;
import javax.ejb.TransactionAttribute;
import javax.ejb.TransactionAttributeType;
import javax.interceptor.Interceptors;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContextType;
import javax.persistence.Query;
import java.util.List;