You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/07/15 23:55:19 UTC
svn commit: r1610862 [2/44] - in /tomee/tomee/trunk/itests: ./ failover-ejb/
failover-ejb/src/main/java/org/apache/openejb/itest/failover/ejb/ failover/
failover/src/main/java/org/apache/openejb/itest/failover/
failover/src/main/java/org/apache/openejb...
Modified: tomee/tomee/trunk/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayListSelfTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayListSelfTest.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayListSelfTest.java (original)
+++ tomee/tomee/trunk/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayListSelfTest.java Tue Jul 15 21:55:09 2014
@@ -42,7 +42,7 @@ import java.util.logging.Logger;
/**
* This test verifies the situation where none of the
* servers listed in the 'initialServers' list can be contacted.
- *
+ * <p/>
* A server that is unable to connect to any of its peers should
* continue trying to connect to servers on the 'initialServers'
* list. How long to wait between attempts is dictated by the
@@ -57,7 +57,7 @@ public class ReconnectDelayListSelfTest
set(Logger.getLogger("OpenEJB.client"), Level.FINER);
}
- private static void set(Logger logger, Level level) {
+ private static void set(final Logger logger, final Level level) {
final ConsoleHandler consoleHandler = new ConsoleHandler();
consoleHandler.setLevel(level);
logger.addHandler(consoleHandler);
@@ -73,7 +73,7 @@ public class ReconnectDelayListSelfTest
// To run in an IDE, uncomment and update this line
System.setProperty("version", OpenEjbVersion.get().getVersion());
- Duration reconnectDelay = new Duration("1 second");
+ final Duration reconnectDelay = new Duration("1 second");
final File zip = Repository.getArtifact("org.apache.openejb", "openejb-standalone", "zip");
final File app = Repository.getArtifact("org.apache.openejb.itests", "failover-ejb", "jar");
@@ -84,7 +84,7 @@ public class ReconnectDelayListSelfTest
final Map<String, StandaloneServer> servers = new HashMap<String, StandaloneServer>();
- for (String name : new String[]{"red", "green", "blue"}) {
+ for (final String name : new String[]{"red", "green", "blue"}) {
final File home = new File(dir, name);
Files.mkdir(home);
Zips.unzip(zip, home, true);
@@ -121,15 +121,15 @@ public class ReconnectDelayListSelfTest
final StandaloneServer red = servers.get("red");
// Set all the initialServers to point to RED
- for (Map.Entry<String, StandaloneServer> entry : servers.entrySet()) {
+ for (final Map.Entry<String, StandaloneServer> entry : servers.entrySet()) {
final StandaloneServer server = entry.getValue();
final StandaloneServer.ServerService multipoint = server.getServerService(MULTIPOINT);
- final String value = "localhost:" + red.getServerService(MULTIPOINT).getPort() + ",localhost:"+multipoint.getPort();
+ final String value = "localhost:" + red.getServerService(MULTIPOINT).getPort() + ",localhost:" + multipoint.getPort();
multipoint.set("initialServers", value);
}
// Start all the servers except RED
- for (Map.Entry<String, StandaloneServer> entry : servers.entrySet()) {
+ for (final Map.Entry<String, StandaloneServer> entry : servers.entrySet()) {
if (entry.getKey().equals("red")) continue;
entry.getValue().start(1, TimeUnit.MINUTES);
}
@@ -159,7 +159,7 @@ public class ReconnectDelayListSelfTest
try {
bean.name();
Assert.fail("Server should be down and failover not hooked up");
- } catch (Exception e) {
+ } catch (final Exception e) {
// pass
}
}
@@ -197,13 +197,13 @@ public class ReconnectDelayListSelfTest
}
}
- private long invoke(Calculator bean, int max, String expectedName) {
+ private long invoke(final Calculator bean, final int max, final String expectedName) {
long total = 0;
for (int i = 0; i < max; i++) {
final long start = System.nanoTime();
- String name = bean.name();
+ final String name = bean.name();
System.out.println(name);
Assert.assertEquals(expectedName, name);
total += System.nanoTime() - start;
Modified: tomee/tomee/trunk/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayTest.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayTest.java (original)
+++ tomee/tomee/trunk/itests/failover/src/test/java/org/apache/openejb/itest/failover/ReconnectDelayTest.java Tue Jul 15 21:55:09 2014
@@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit;
/**
* This test verifies the situation where none of the
* servers listed in the 'initialServers' list can be contacted.
- *
+ * <p/>
* A server that is unable to connect to any of its peers should
* continue trying to connect to servers on the 'initialServers'
* list. How long to wait between attempts is dictated by the
@@ -55,7 +55,7 @@ public class ReconnectDelayTest {
// To run in an IDE, uncomment and update this line
System.setProperty("version", OpenEjbVersion.get().getVersion());
- Duration reconnectDelay = new Duration("1 second");
+ final Duration reconnectDelay = new Duration("1 second");
final File zip = Repository.getArtifact("org.apache.openejb", "openejb-standalone", "zip");
final File app = Repository.getArtifact("org.apache.openejb.itests", "failover-ejb", "jar");
@@ -66,7 +66,7 @@ public class ReconnectDelayTest {
final Map<String, StandaloneServer> servers = new HashMap<String, StandaloneServer>();
- for (String name : new String[]{"red", "green", "blue"}) {
+ for (final String name : new String[]{"red", "green", "blue"}) {
final File home = new File(dir, name);
Files.mkdir(home);
Zips.unzip(zip, home, true);
@@ -103,14 +103,14 @@ public class ReconnectDelayTest {
final StandaloneServer red = servers.get("red");
// Set all the initialServers to point to RED
- for (Map.Entry<String, StandaloneServer> entry : servers.entrySet()) {
+ for (final Map.Entry<String, StandaloneServer> entry : servers.entrySet()) {
final StandaloneServer server = entry.getValue();
final StandaloneServer.ServerService multipoint = server.getServerService(MULTIPOINT);
multipoint.set("initialServers", "localhost:" + red.getServerService(MULTIPOINT).getPort());
}
// Start all the servers except RED
- for (Map.Entry<String, StandaloneServer> entry : servers.entrySet()) {
+ for (final Map.Entry<String, StandaloneServer> entry : servers.entrySet()) {
if (entry.getKey().equals("red")) continue;
entry.getValue().start(1, TimeUnit.MINUTES);
}
@@ -140,7 +140,7 @@ public class ReconnectDelayTest {
try {
bean.name();
Assert.fail("Server should be down and failover not hooked up");
- } catch (Exception e) {
+ } catch (final Exception e) {
// pass
}
}
@@ -178,13 +178,13 @@ public class ReconnectDelayTest {
}
}
- private long invoke(Calculator bean, int max, String expectedName) {
+ private long invoke(final Calculator bean, final int max, final String expectedName) {
long total = 0;
for (int i = 0; i < max; i++) {
final long start = System.nanoTime();
- String name = bean.name();
+ final String name = bean.name();
System.out.println(name);
Assert.assertEquals(expectedName, name);
total += System.nanoTime() - start;
Modified: tomee/tomee/trunk/itests/failover/src/test/java/org/apache/openejb/itest/failover/RoundRobinConnectionStrategyTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/failover/src/test/java/org/apache/openejb/itest/failover/RoundRobinConnectionStrategyTest.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/failover/src/test/java/org/apache/openejb/itest/failover/RoundRobinConnectionStrategyTest.java (original)
+++ tomee/tomee/trunk/itests/failover/src/test/java/org/apache/openejb/itest/failover/RoundRobinConnectionStrategyTest.java Tue Jul 15 21:55:09 2014
@@ -59,7 +59,7 @@ public class RoundRobinConnectionStrateg
// set(Logger.getLogger("OpenEJB.client"), Level.FINEST);
}
- private static void set(Logger logger, Level level) {
+ private static void set(final Logger logger, final Level level) {
final ConsoleHandler consoleHandler = new ConsoleHandler();
consoleHandler.setLevel(level);
logger.addHandler(consoleHandler);
@@ -109,7 +109,7 @@ public class RoundRobinConnectionStrateg
Client.addEventObserver(services);
final Map<String, StandaloneServer> servers = new HashMap<String, StandaloneServer>();
- for (String name : new String[]{"red", "green", "blue"}) {
+ for (final String name : new String[]{"red", "green", "blue"}) {
final File home = new File(dir, name);
Files.mkdir(home);
@@ -162,7 +162,7 @@ public class RoundRobinConnectionStrateg
final InitialContext context = new InitialContext(environment);
final Calculator bean = (Calculator) context.lookup("CalculatorBeanRemote");
- for (Map.Entry<String, StandaloneServer> entry : servers.entrySet()) {
+ for (final Map.Entry<String, StandaloneServer> entry : servers.entrySet()) {
final String name = entry.getKey();
final StandaloneServer server = entry.getValue();
final URI serverURI = server.getContext().get(URI.class);
@@ -185,13 +185,13 @@ public class RoundRobinConnectionStrateg
final String name = bean.name();
Assert.fail("Server should be destroyed: " + name);
- } catch (EJBException e) {
+ } catch (final EJBException e) {
logger.info(String.format("Pass. Request resulted in %s: %s", e.getCause().getClass().getSimpleName(), e.getMessage()));
// good
}
- for (Map.Entry<String, StandaloneServer> entry : servers.entrySet()) {
+ for (final Map.Entry<String, StandaloneServer> entry : servers.entrySet()) {
final String name = entry.getKey();
final StandaloneServer server = entry.getValue();
final URI serverURI = server.getContext().get(URI.class);
@@ -209,23 +209,23 @@ public class RoundRobinConnectionStrateg
}
}
- private void assertBalance(Calculator bean, int size) {
+ private void assertBalance(final Calculator bean, final int size) {
final int expectedInvocations = 100;
final int tolerance = 2;
final int totalInvocations = size * expectedInvocations + (size * tolerance);
// Verify the work was split up more or less evenly (within a tolerance of 2)
- for (Map.Entry<String, AtomicInteger> entry : invoke(bean, totalInvocations).entrySet()) {
+ for (final Map.Entry<String, AtomicInteger> entry : invoke(bean, totalInvocations).entrySet()) {
final int actualInvocations = entry.getValue().get();
- Assert.assertTrue(String.format("Expected %s invocations, received %s", expectedInvocations, actualInvocations), actualInvocations >= expectedInvocations && actualInvocations <= (expectedInvocations + tolerance + size) );
+ Assert.assertTrue(String.format("Expected %s invocations, received %s", expectedInvocations, actualInvocations), actualInvocations >= expectedInvocations && actualInvocations <= (expectedInvocations + tolerance + size));
}
}
- private Map<String, AtomicInteger> invoke(Calculator bean, int max) {
+ private Map<String, AtomicInteger> invoke(final Calculator bean, final int max) {
final Map<String, AtomicInteger> invocations = new HashMap<String, AtomicInteger>();
for (int i = 0; i < max; i++) {
final String name = bean.name();
@@ -237,7 +237,7 @@ public class RoundRobinConnectionStrateg
invocations.get(name).incrementAndGet();
}
- for (Map.Entry<String, AtomicInteger> entry : invocations.entrySet()) {
+ for (final Map.Entry<String, AtomicInteger> entry : invocations.entrySet()) {
logger.info(String.format("Server %s invoked %s times", entry.getKey(), entry.getValue()));
}
@@ -260,15 +260,15 @@ public class RoundRobinConnectionStrateg
return expected;
}
- public boolean add(URI uri) {
+ public boolean add(final URI uri) {
return expected.add(uri);
}
- public boolean remove(URI o) {
+ public boolean remove(final URI o) {
return expected.remove(o);
}
- public void observe(@Observes ClusterMetaDataUpdated updated) {
+ public void observe(@Observes final ClusterMetaDataUpdated updated) {
found.clear();
Collections.addAll(found, updated.getClusterMetaData().getLocations());
@@ -282,26 +282,26 @@ public class RoundRobinConnectionStrateg
}
}
- public Set<URI> diff(Set<URI> a, Set<URI> b) {
+ public Set<URI> diff(final Set<URI> a, final Set<URI> b) {
final Set<URI> diffs = new HashSet<URI>();
- for (URI uri : b) {
+ for (final URI uri : b) {
if (!a.contains(uri)) diffs.add(uri);
}
return diffs;
}
- public void assertServices(long timeout, TimeUnit unit, Callable callable) {
+ public void assertServices(final long timeout, final TimeUnit unit, final Callable callable) {
assertServices(timeout, unit, callable, 10);
}
- public void assertServices(long timeout, TimeUnit unit, Callable callable, int delay) {
+ public void assertServices(final long timeout, final TimeUnit unit, final Callable callable, final int delay) {
final ClientThread client = new ClientThread(callable);
client.delay(delay);
client.start();
try {
Assert.assertTrue(String.format("services failed to come online: waited %s %s", timeout, unit), await(timeout, unit));
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
Thread.interrupted();
Assert.fail("Interrupted");
} finally {
@@ -310,7 +310,7 @@ public class RoundRobinConnectionStrateg
}
- public boolean await(long timeout, TimeUnit unit) throws InterruptedException {
+ public boolean await(final long timeout, final TimeUnit unit) throws InterruptedException {
if (expected.equals(found)) return true;
lock.lock();
@@ -325,7 +325,7 @@ public class RoundRobinConnectionStrateg
private static class CalculatorCallable implements Callable {
private final Calculator bean;
- public CalculatorCallable(Calculator bean) {
+ public CalculatorCallable(final Calculator bean) {
this.bean = bean;
}
@@ -334,7 +334,7 @@ public class RoundRobinConnectionStrateg
try {
logger.info("Invoke");
return bean.name();
- } catch (Exception e) {
+ } catch (final Exception e) {
logger.log(Level.SEVERE, "bean invocation failed", e);
throw e;
}
Modified: tomee/tomee/trunk/itests/failover/src/test/java/org/apache/openejb/itest/failover/StickyConnectionStrategyTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/failover/src/test/java/org/apache/openejb/itest/failover/StickyConnectionStrategyTest.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/failover/src/test/java/org/apache/openejb/itest/failover/StickyConnectionStrategyTest.java (original)
+++ tomee/tomee/trunk/itests/failover/src/test/java/org/apache/openejb/itest/failover/StickyConnectionStrategyTest.java Tue Jul 15 21:55:09 2014
@@ -49,24 +49,24 @@ import static org.junit.Assert.assertFal
* one dedicated multipoint root server which does
* no other function other than to serve as a central
* hub for making multipoint introductions.
- *
+ * <p/>
* This dedicate root server will not serve applications
* and not be added to the list of servers that can
* service EJB requests.
- *
*/
public class StickyConnectionStrategyTest {
static final Logger logger = Logger.getLogger("org.apache.openejb.client");
+
static {
final ConsoleHandler consoleHandler = new ConsoleHandler();
consoleHandler.setLevel(Level.FINER);
logger.addHandler(consoleHandler);
logger.setLevel(Level.FINER);
logger.setUseParentHandlers(false);
-
- //Set a high socket timeout for tests
- System.setProperty("openejb.client.connection.socket.timeout", System.getProperty("openejb.client.connection.socket.timeout", "5000"));
+
+ //Set a high socket timeout for tests
+ System.setProperty("openejb.client.connection.socket.timeout", System.getProperty("openejb.client.connection.socket.timeout", "5000"));
}
@Test
@@ -82,7 +82,7 @@ public class StickyConnectionStrategyTes
final StandaloneServer root;
{
- StandaloneServer root1;
+ final StandaloneServer root1;
final String name = "root";
final File home = new File(dir, name);
@@ -109,7 +109,7 @@ public class StickyConnectionStrategyTes
final Map<String, StandaloneServer> servers = new HashMap<String, StandaloneServer>();
- for (String name : new String[]{"red", "green", "blue"}) {
+ for (final String name : new String[]{"red", "green", "blue"}) {
final File home = new File(dir, name);
Files.mkdir(home);
Zips.unzip(zip, home, true);
@@ -135,7 +135,7 @@ public class StickyConnectionStrategyTes
multipoint.setPort(getAvailablePort());
multipoint.setDisabled(false);
multipoint.set("discoveryName", name);
- multipoint.set("initialServers", "localhost:"+root.getServerService("multipoint").getPort());
+ multipoint.set("initialServers", "localhost:" + root.getServerService("multipoint").getPort());
servers.put(name, server);
@@ -159,7 +159,7 @@ public class StickyConnectionStrategyTes
String previous = null;
- for (StandaloneServer ignored : servers.values()) {
+ for (final StandaloneServer ignored : servers.values()) {
logger.info("Looping");
@@ -195,7 +195,7 @@ public class StickyConnectionStrategyTes
final String name = bean.name();
Assert.fail("Server should be destroyed: " + name);
- } catch (EJBException e) {
+ } catch (final EJBException e) {
logger.info(String.format("Pass. Request resulted in %s: %s", e.getCause().getClass().getSimpleName(), e.getMessage()));
// good
}
@@ -216,7 +216,7 @@ public class StickyConnectionStrategyTes
assertEquals(5, bean.sum(2, 3));
}
- private void invoke(String name, StandaloneServer server) throws NamingException {
+ private void invoke(final String name, final StandaloneServer server) throws NamingException {
final Properties environment = new Properties();
environment.put(Context.INITIAL_CONTEXT_FACTORY, RemoteInitialContextFactory.class.getName());
environment.put(Context.PROVIDER_URL, "ejbd://localhost:" + server.getServerService("ejbd").getPort() + "/" + name);
@@ -226,13 +226,13 @@ public class StickyConnectionStrategyTes
assertEquals(name, bean.name());
}
- private long invoke(Calculator bean, int max, String expectedName) {
+ private long invoke(final Calculator bean, final int max, final String expectedName) {
long total = 0;
for (int i = 0; i < max; i++) {
final long start = System.nanoTime();
- String name = bean.name();
+ final String name = bean.name();
Assert.assertEquals(expectedName, name);
total += System.nanoTime() - start;
}
@@ -240,7 +240,7 @@ public class StickyConnectionStrategyTes
return TimeUnit.NANOSECONDS.toMicros(total / max);
}
- private long invoke(Calculator bean, int max) {
+ private long invoke(final Calculator bean, final int max) {
long total = 0;
Modified: tomee/tomee/trunk/itests/legacy-client/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/legacy-client/pom.xml?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/legacy-client/pom.xml (original)
+++ tomee/tomee/trunk/itests/legacy-client/pom.xml Tue Jul 15 21:55:09 2014
@@ -16,7 +16,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>itests</artifactId>
Modified: tomee/tomee/trunk/itests/legacy-client/src/test/java/org/apache/openejb/itest/legacy/ClientThread.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/legacy-client/src/test/java/org/apache/openejb/itest/legacy/ClientThread.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/legacy-client/src/test/java/org/apache/openejb/itest/legacy/ClientThread.java (original)
+++ tomee/tomee/trunk/itests/legacy-client/src/test/java/org/apache/openejb/itest/legacy/ClientThread.java Tue Jul 15 21:55:09 2014
@@ -21,8 +21,8 @@ import java.util.concurrent.atomic.Atomi
import java.util.concurrent.atomic.AtomicLong;
/**
-* @version $Rev$ $Date$
-*/
+ * @version $Rev$ $Date$
+ */
public class ClientThread implements Runnable {
private final AtomicBoolean run = new AtomicBoolean(false);
@@ -40,13 +40,13 @@ public class ClientThread implements Run
try {
callable.call();
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
}
}
}
- public ClientThread delay(final long delay){
+ public ClientThread delay(final long delay) {
setDelay(delay);
return this;
}
@@ -59,7 +59,7 @@ public class ClientThread implements Run
final long l = delay.get();
try {
if (l > 0) Thread.sleep(l);
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
Thread.interrupted();
}
}
Modified: tomee/tomee/trunk/itests/legacy-client/src/test/java/org/apache/openejb/itest/legacy/LegacyClientTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/legacy-client/src/test/java/org/apache/openejb/itest/legacy/LegacyClientTest.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/legacy-client/src/test/java/org/apache/openejb/itest/legacy/LegacyClientTest.java (original)
+++ tomee/tomee/trunk/itests/legacy-client/src/test/java/org/apache/openejb/itest/legacy/LegacyClientTest.java Tue Jul 15 21:55:09 2014
@@ -108,20 +108,20 @@ public class LegacyClientTest {
root = new StandaloneServer(roothome, roothome);
- root.killOnExit();
- root.getJvmOpts().add("-Dopenejb.classloader.forced-load=org.apache.openejb");
- root.ignoreOut();
+ root.killOnExit();
+ root.getJvmOpts().add("-Dopenejb.classloader.forced-load=org.apache.openejb");
+ root.ignoreOut();
root.setProperty("name", rootname);
- root.setProperty("openejb.extract.configuration", "false");
+ root.setProperty("openejb.extract.configuration", "false");
StandaloneServer.ServerService multipoint = root.getServerService("multipoint");
- multipoint.setBind("localhost");
- multipoint.setPort(getNextAvailablePort());
- multipoint.setDisabled(false);
+ multipoint.setBind("localhost");
+ multipoint.setPort(getNextAvailablePort());
+ multipoint.setDisabled(false);
multipoint.set("discoveryName", rootname);
- logger.info("Starting Root server");
- root.start();
+ logger.info("Starting Root server");
+ root.start();
final Services services = new Services();
@@ -203,7 +203,7 @@ public class LegacyClientTest {
final String name = bean.name();
Assert.fail("Server should be destroyed: " + name);
- } catch (EJBException e) {
+ } catch (final EJBException e) {
logger.info(String.format("Pass. Request resulted in %s: %s", e.getCause().getClass().getSimpleName(), e.getMessage()));
// good
}
@@ -321,7 +321,7 @@ public class LegacyClientTest {
client.start();
try {
Assert.assertTrue(String.format("services failed to come online: waited %s %s", timeout, unit), await(timeout, unit));
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
Thread.interrupted();
Assert.fail("Interrupted");
} finally {
Modified: tomee/tomee/trunk/itests/legacy-server/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/legacy-server/pom.xml?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/legacy-server/pom.xml (original)
+++ tomee/tomee/trunk/itests/legacy-server/pom.xml Tue Jul 15 21:55:09 2014
@@ -16,7 +16,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>itests</artifactId>
Modified: tomee/tomee/trunk/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/ClientThread.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/ClientThread.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/ClientThread.java (original)
+++ tomee/tomee/trunk/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/ClientThread.java Tue Jul 15 21:55:09 2014
@@ -21,8 +21,8 @@ import java.util.concurrent.atomic.Atomi
import java.util.concurrent.atomic.AtomicLong;
/**
-* @version $Rev$ $Date$
-*/
+ * @version $Rev$ $Date$
+ */
public class ClientThread implements Runnable {
private final AtomicBoolean run = new AtomicBoolean(false);
@@ -40,13 +40,13 @@ public class ClientThread implements Run
try {
callable.call();
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
}
}
}
- public ClientThread delay(final long delay){
+ public ClientThread delay(final long delay) {
setDelay(delay);
return this;
}
@@ -59,7 +59,7 @@ public class ClientThread implements Run
final long l = delay.get();
try {
if (l > 0) Thread.sleep(l);
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
Thread.interrupted();
}
}
Modified: tomee/tomee/trunk/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java (original)
+++ tomee/tomee/trunk/itests/legacy-server/src/test/java/org/apache/openejb/itest/legacy/LegacyServerTest.java Tue Jul 15 21:55:09 2014
@@ -183,7 +183,7 @@ public class LegacyServerTest {
final String name = bean.name();
Assert.fail("Server should be destroyed: " + name);
- } catch (EJBException e) {
+ } catch (final EJBException e) {
logger.info(String.format("Pass. Request resulted in %s: %s", e.getCause().getClass().getSimpleName(), e.getMessage()));
// good
}
@@ -303,7 +303,7 @@ public class LegacyServerTest {
client.start();
try {
Assert.assertTrue(String.format("services failed to come online: waited %s %s", timeout, unit), await(timeout, unit));
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
Thread.interrupted();
Assert.fail("Interrupted");
} finally {
Modified: tomee/tomee/trunk/itests/openejb-itests-app/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-app/pom.xml?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-app/pom.xml (original)
+++ tomee/tomee/trunk/itests/openejb-itests-app/pom.xml Tue Jul 15 21:55:09 2014
@@ -19,7 +19,8 @@
<!-- $Rev$ $Date$ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>itests</artifactId>
<groupId>org.apache.openejb</groupId>
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/pom.xml?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/pom.xml (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/pom.xml Tue Jul 15 21:55:09 2014
@@ -16,58 +16,96 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>itests</artifactId>
<groupId>org.apache.openejb</groupId>
<version>5.0.0-SNAPSHOT</version>
</parent>
+
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-itests-beans</artifactId>
<packaging>jar</packaging>
<name>OpenEJB :: iTests :: Beans</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-<!--
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>openjpa-maven-plugin</artifactId>
+ <version>1.2</version>
<executions>
<execution>
- <phase>compile</phase>
- <configuration>
- <tasks>
- <java classname="org.apache.openjpa.enhance.PCEnhancer">
- <arg value="-p" />
- <arg value="${basedir}/src/main/resources/META-INF/persistence.xml" />
- <classpath>
- <path refid="maven.dependency.classpath" />
- <path refid="maven.compile.classpath" />
- </classpath>
- </java>
- </tasks>
- </configuration>
+ <id>enhancer-</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>enhance</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>enhancer</id>
+ <phase>process-test-classes</phase>
<goals>
- <goal>run</goal>
+ <goal>enhance</goal>
</goals>
</execution>
</executions>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openejb.patch</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>2.4.0-nonfinal-1598334</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
+
</build>
--->
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <!--
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <java classname="org.apache.openjpa.enhance.PCEnhancer">
+ <arg value="-p" />
+ <arg value="${basedir}/src/main/resources/META-INF/persistence.xml" />
+ <classpath>
+ <path refid="maven.dependency.classpath" />
+ <path refid="maven.compile.classpath" />
+ </classpath>
+ </java>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ -->
</project>
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/AnnotatedApplicationException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/AnnotatedApplicationException.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/AnnotatedApplicationException.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/AnnotatedApplicationException.java Tue Jul 15 21:55:09 2014
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.test;
-
-@javax.ejb.ApplicationException(rollback=true)
-public class AnnotatedApplicationException extends RuntimeException{
-
- public AnnotatedApplicationException(String message){
- super(message);
- }
-
- public AnnotatedApplicationException(){
- super();
- }
-}
+package org.apache.openejb.test;
+
+@javax.ejb.ApplicationException(rollback = true)
+public class AnnotatedApplicationException extends RuntimeException {
+
+ public AnnotatedApplicationException(final String message) {
+ super(message);
+ }
+
+ public AnnotatedApplicationException() {
+ super();
+ }
+}
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/ApplicationException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/ApplicationException.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/ApplicationException.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/ApplicationException.java Tue Jul 15 21:55:09 2014
@@ -16,13 +16,13 @@
*/
package org.apache.openejb.test;
-public class ApplicationException extends Exception{
+public class ApplicationException extends Exception {
- public ApplicationException(String message){
+ public ApplicationException(final String message) {
super(message);
}
- public ApplicationException(){
+ public ApplicationException() {
super();
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/SuperInterceptedBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/SuperInterceptedBean.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/SuperInterceptedBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/SuperInterceptedBean.java Tue Jul 15 21:55:09 2014
@@ -24,57 +24,54 @@ import javax.interceptor.InvocationConte
import org.apache.openejb.test.interceptor.Interceptor;
/**
- *
* @version $Rev$ $Date$
*/
public class SuperInterceptedBean {
/**
- *
+ *
*/
public SuperInterceptedBean() {
super();
}
-
+
/**
- * The interceptor method.
+ * The interceptor method.
* This should intercept all business methods in this bean class.
* It cannot exclude even those annotated with <code>@ExcludeClassInterceptors</code>
- *
+ *
* @param ctx - InvocationContext
- *
- * @return - the result of the next method invoked. If a method returns void, proceed returns null.
- * For lifecycle callback interceptor methods, if there is no callback method defined on the bean class,
- * the invocation of proceed in the last interceptor method in the chain is a no-op, and null is returned.
+ * @return - the result of the next method invoked. If a method returns void, proceed returns null.
+ * For lifecycle callback interceptor methods, if there is no callback method defined on the bean class,
+ * the invocation of proceed in the last interceptor method in the chain is a no-op, and null is returned.
* If there is more than one such interceptor method, the invocation of proceed causes the container to execute those methods in order.
- *
* @throws runtime exceptions or application exceptions that are allowed in the throws clause of the business method.
*/
@AroundInvoke
- public Object superBeanInterceptor(InvocationContext ctx) throws Exception {
+ public Object superBeanInterceptor(final InvocationContext ctx) throws Exception {
Interceptor.profile(ctx, "superBeanInterceptor");
return ctx.proceed();
}
-
+
/**
- * The interceptor method.
+ * The interceptor method.
* This should intercept postConstruct of the bean
- *
+ *
* @throws runtime exceptions.
- */
+ */
@PostConstruct
public void superBeanInterceptorPostConstruct() throws Exception {
Interceptor.profile(this, "superBeanInterceptorPostConstruct");
return;
}
-
-
+
+
/**
- * The interceptor method.
+ * The interceptor method.
* This should intercept preDestroy of the bean.
- *
+ *
* @throws runtime exceptions.
- */
+ */
@PreDestroy
public void superBeanInterceptorPreDestroy() throws Exception {
Interceptor.profile(this, "superBeanInterceptorPreDestroy");
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/TestFailureException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/TestFailureException.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/TestFailureException.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/TestFailureException.java Tue Jul 15 21:55:09 2014
@@ -18,21 +18,21 @@ package org.apache.openejb.test;
import junit.framework.AssertionFailedError;
-public class TestFailureException extends Exception{
+public class TestFailureException extends Exception {
public AssertionFailedError error;
- public TestFailureException(AssertionFailedError afe){
+ public TestFailureException(final AssertionFailedError afe) {
error = afe;
}
-
+
public String getMessage() {
- if (error == null) {
- return super.getMessage();
- } else {
- return super.getMessage() + "; nested exception is: \n\t" +
- error.toString();
- }
+ if (error == null) {
+ return super.getMessage();
+ } else {
+ return super.getMessage() + "; nested exception is: \n\t" +
+ error.toString();
+ }
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/Calculator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/Calculator.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/Calculator.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/Calculator.java Tue Jul 15 21:55:09 2014
@@ -19,9 +19,9 @@ package org.apache.openejb.test.beans;
import java.rmi.RemoteException;
public interface Calculator extends javax.ejb.EJBObject {
-
+
public int add(int a, int b) throws RemoteException;
-
+
public int sub(int a, int b) throws RemoteException;
-
+
}
\ No newline at end of file
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/CalculatorBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/CalculatorBean.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/CalculatorBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/CalculatorBean.java Tue Jul 15 21:55:09 2014
@@ -32,7 +32,7 @@ public class CalculatorBean implements j
public void ejbCreate() {
}
- public int add(int a, int b) {
+ public int add(final int a, final int b) {
return a + b;
}
@@ -41,29 +41,29 @@ public class CalculatorBean implements j
Connection con = null;
try {
- javax.sql.DataSource ds =
- (javax.sql.DataSource) jndiContext.lookup("java:comp/env/jdbc/mydb");
+ final javax.sql.DataSource ds =
+ (javax.sql.DataSource) jndiContext.lookup("java:comp/env/jdbc/mydb");
con = ds.getConnection();
- Statement stmt = con.createStatement();
+ final Statement stmt = con.createStatement();
try {
- ResultSet rs = stmt.executeQuery("select * from Employees");
+ final ResultSet rs = stmt.executeQuery("select * from Employees");
while (rs.next())
System.out.println(rs.getString(2));
} finally {
stmt.close();
}
- } catch (javax.naming.NamingException re) {
+ } catch (final javax.naming.NamingException re) {
throw new RuntimeException("Using JNDI failed");
- } catch (java.sql.SQLException se) {
+ } catch (final java.sql.SQLException se) {
throw new RuntimeException("Getting JDBC data source failed");
} finally {
if (con != null) {
try {
con.close();
- } catch (SQLException se) {
+ } catch (final SQLException se) {
se.printStackTrace();
}
}
@@ -71,7 +71,7 @@ public class CalculatorBean implements j
}
- public int sub(int a, int b) {
+ public int sub(final int a, final int b) {
return a - b;
}
@@ -87,55 +87,55 @@ public class CalculatorBean implements j
if (testRemove) testAllowedOperations("ejbRemove");
}
- public void setSessionContext(javax.ejb.SessionContext cntx) {
+ public void setSessionContext(final javax.ejb.SessionContext cntx) {
context = cntx;
if (testSetSessionContext) testAllowedOperations("setSessionContext");
}
- private void testAllowedOperations(String methodName) {
+ private void testAllowedOperations(final String methodName) {
System.out.println("******************************************************");
System.out.println("\nTesting Allowed Operations for " + methodName + "() method\n");
try {
context.getEJBObject();
System.out.println("SessionContext.getEJBObject() ......... Allowed");
- } catch (IllegalStateException ise) {
+ } catch (final IllegalStateException ise) {
System.out.println("SessionContext.getEJBObject() ......... Failed");
}
try {
context.getEJBHome();
System.out.println("SessionContext.getEJBHome() ........... Allowed");
- } catch (IllegalStateException ise) {
+ } catch (final IllegalStateException ise) {
System.out.println("SessionContext.getEJBHome() ........... Failed");
}
try {
context.getCallerPrincipal();
System.out.println("SessionContext.getCallerPrincipal() ... Allowed");
- } catch (IllegalStateException ise) {
+ } catch (final IllegalStateException ise) {
System.out.println("SessionContext.getCallerPrincipal() ... Failed");
}
try {
context.isCallerInRole("ROLE");
System.out.println("SessionContext.isCallerInRole() ....... Allowed");
- } catch (IllegalStateException ise) {
+ } catch (final IllegalStateException ise) {
System.out.println("SessionContext.isCallerInRole() ....... Failed");
}
try {
context.getRollbackOnly();
System.out.println("SessionContext.getRollbackOnly() ...... Allowed");
- } catch (IllegalStateException ise) {
+ } catch (final IllegalStateException ise) {
System.out.println("SessionContext.getRollbackOnly() ...... Failed");
}
try {
context.setRollbackOnly();
System.out.println("SessionContext.setRollbackOnly() ...... Allowed");
- } catch (IllegalStateException ise) {
+ } catch (final IllegalStateException ise) {
System.out.println("SessionContext.setRollbackOnly() ...... Failed");
}
try {
context.getUserTransaction();
System.out.println("SessionContext.getUserTransaction() ... Allowed");
- } catch (IllegalStateException ise) {
+ } catch (final IllegalStateException ise) {
System.out.println("SessionContext.getUserTransaction() ... Failed");
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/CalculatorHome.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/CalculatorHome.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/CalculatorHome.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/CalculatorHome.java Tue Jul 15 21:55:09 2014
@@ -19,7 +19,7 @@ package org.apache.openejb.test.beans;
import java.rmi.RemoteException;
public interface CalculatorHome extends javax.ejb.EJBHome {
-
- public Calculator create( ) throws RemoteException;
-
+
+ public Calculator create() throws RemoteException;
+
}
\ No newline at end of file
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/Database.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/Database.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/Database.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/Database.java Tue Jul 15 21:55:09 2014
@@ -21,6 +21,7 @@ import java.rmi.RemoteException;
public interface Database extends javax.ejb.EJBObject {
public void executeQuery(String statement) throws RemoteException, java.sql.SQLException;
+
public boolean execute(String statement) throws RemoteException, java.sql.SQLException;
}
\ No newline at end of file
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/DatabaseBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/DatabaseBean.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/DatabaseBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/DatabaseBean.java Tue Jul 15 21:55:09 2014
@@ -31,30 +31,30 @@ import javax.sql.DataSource;
public class DatabaseBean implements javax.ejb.SessionBean {
private static final long serialVersionUID = 1L;
-
+
public SessionContext context;
public InitialContext jndiContext;
public DatabaseBean() {
- this.getClass();
+ this.getClass();
}
public void ejbCreate() throws javax.ejb.CreateException {
try {
jndiContext = new InitialContext();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new EJBException(e.getMessage());
}
}
- public void executeQuery(String statement) throws java.sql.SQLException {
+ public void executeQuery(final String statement) throws java.sql.SQLException {
try {
- DataSource ds = (DataSource) jndiContext.lookup("java:comp/env/database");
- Connection con = ds.getConnection();
+ final DataSource ds = (DataSource) jndiContext.lookup("java:comp/env/database");
+ final Connection con = ds.getConnection();
try {
- PreparedStatement stmt = con.prepareStatement(statement);
+ final PreparedStatement stmt = con.prepareStatement(statement);
try {
stmt.executeQuery();
} finally {
@@ -63,27 +63,27 @@ public class DatabaseBean implements jav
} finally {
con.close();
}
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new EJBException("Cannot execute the statement: " + statement + e.getMessage());
}
}
- public boolean execute(String statement) throws java.sql.SQLException {
+ public boolean execute(final String statement) throws java.sql.SQLException {
boolean retval;
Connection con = null;
try {
- DataSource ds = (DataSource) jndiContext.lookup("java:comp/env/database");
+ final DataSource ds = (DataSource) jndiContext.lookup("java:comp/env/database");
con = ds.getConnection();
- Statement stmt = con.createStatement();
+ final Statement stmt = con.createStatement();
try {
retval = stmt.execute(statement);
} finally {
stmt.close();
}
- } catch (javax.naming.NamingException e) {
+ } catch (final javax.naming.NamingException e) {
// } catch (Exception e){
// e.printStackTrace();
//throw new RemoteException("Cannot execute the statement: "+statement, e);
@@ -107,7 +107,7 @@ public class DatabaseBean implements jav
public void ejbRemove() {
}
- public void setSessionContext(javax.ejb.SessionContext cntx) {
+ public void setSessionContext(final javax.ejb.SessionContext cntx) {
context = cntx;
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/DatabaseHome.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/DatabaseHome.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/DatabaseHome.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/DatabaseHome.java Tue Jul 15 21:55:09 2014
@@ -19,7 +19,7 @@ package org.apache.openejb.test.beans;
import java.rmi.RemoteException;
public interface DatabaseHome extends javax.ejb.EJBHome {
-
- public Database create( ) throws javax.ejb.CreateException, RemoteException;
-
+
+ public Database create() throws javax.ejb.CreateException, RemoteException;
+
}
\ No newline at end of file
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/Employee.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/Employee.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/Employee.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/Employee.java Tue Jul 15 21:55:09 2014
@@ -19,18 +19,18 @@ package org.apache.openejb.test.beans;
import java.rmi.RemoteException;
public interface Employee extends javax.ejb.EJBObject {
-
+
public void setFirstName(String firstName)
- throws RemoteException;
-
+ throws RemoteException;
+
public void setLastName(String lastName)
- throws RemoteException;
-
- public String getFirstName( )
- throws RemoteException;
-
- public String getLastName( )
- throws RemoteException;
-
+ throws RemoteException;
+
+ public String getFirstName()
+ throws RemoteException;
+
+ public String getLastName()
+ throws RemoteException;
+
}
\ No newline at end of file
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/EmployeeBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/EmployeeBean.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/EmployeeBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/EmployeeBean.java Tue Jul 15 21:55:09 2014
@@ -31,25 +31,25 @@ public class EmployeeBean implements jav
EntityContext ejbContext;
- public int ejbHomeSum(int one, int two) {
+ public int ejbHomeSum(final int one, final int two) {
return one + two;
}
- public Integer ejbFindByPrimaryKey(Integer primaryKey)
- throws javax.ejb.FinderException {
+ public Integer ejbFindByPrimaryKey(final Integer primaryKey)
+ throws javax.ejb.FinderException {
boolean found = false;
try {
- InitialContext jndiContext = new InitialContext();
+ final InitialContext jndiContext = new InitialContext();
- javax.sql.DataSource ds = (javax.sql.DataSource) jndiContext.lookup("java:comp/env/jdbc/orders");
+ final javax.sql.DataSource ds = (javax.sql.DataSource) jndiContext.lookup("java:comp/env/jdbc/orders");
- Connection con = ds.getConnection();
+ final Connection con = ds.getConnection();
try {
- PreparedStatement stmt = con.prepareStatement("select * from Employees where EmployeeID = ?");
+ final PreparedStatement stmt = con.prepareStatement("select * from Employees where EmployeeID = ?");
try {
stmt.setInt(1, primaryKey.intValue());
- ResultSet rs = stmt.executeQuery();
+ final ResultSet rs = stmt.executeQuery();
found = rs.next();
} finally {
stmt.close();
@@ -57,7 +57,7 @@ public class EmployeeBean implements jav
} finally {
con.close();
}
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
throw new FinderException("FindByPrimaryKey failed");
}
@@ -72,17 +72,17 @@ public class EmployeeBean implements jav
public java.util.Collection ejbFindAll() throws FinderException {
try {
- InitialContext jndiContext = new InitialContext();
+ final InitialContext jndiContext = new InitialContext();
- javax.sql.DataSource ds = (javax.sql.DataSource) jndiContext.lookup("java:comp/env/jdbc/orders");
+ final javax.sql.DataSource ds = (javax.sql.DataSource) jndiContext.lookup("java:comp/env/jdbc/orders");
- Connection con = ds.getConnection();
+ final Connection con = ds.getConnection();
java.util.Vector keys;
try {
- Statement stmt = con.createStatement();
+ final Statement stmt = con.createStatement();
try {
- ResultSet rs = stmt.executeQuery("select EmployeeID from Employees");
+ final ResultSet rs = stmt.executeQuery("select EmployeeID from Employees");
keys = new java.util.Vector();
while (rs.next()) {
keys.addElement(new Integer(rs.getInt("EmployeeID")));
@@ -94,23 +94,23 @@ public class EmployeeBean implements jav
con.close();
}
return keys;
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
throw new FinderException("FindAll failed");
}
}
- public Integer ejbCreate(String fname, String lname)
- throws javax.ejb.CreateException {
+ public Integer ejbCreate(final String fname, final String lname)
+ throws javax.ejb.CreateException {
try {
lastName = lname;
firstName = fname;
- InitialContext jndiContext = new InitialContext();
+ final InitialContext jndiContext = new InitialContext();
- javax.sql.DataSource ds = (javax.sql.DataSource) jndiContext.lookup("java:comp/env/jdbc/orders");
+ final javax.sql.DataSource ds = (javax.sql.DataSource) jndiContext.lookup("java:comp/env/jdbc/orders");
- Connection con = ds.getConnection();
+ final Connection con = ds.getConnection();
try {
PreparedStatement stmt = con.prepareStatement("insert into Employees (FirstName, LastName) values (?,?)");
@@ -122,7 +122,7 @@ public class EmployeeBean implements jav
stmt = con.prepareStatement("select EmployeeID from Employees where FirstName = ? AND LastName = ?");
stmt.setString(1, firstName);
stmt.setString(2, lastName);
- ResultSet set = stmt.executeQuery();
+ final ResultSet set = stmt.executeQuery();
while (set.next())
id = set.getInt("EmployeeID");
} finally {
@@ -134,7 +134,7 @@ public class EmployeeBean implements jav
return new Integer(id);
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
throw new javax.ejb.CreateException("can't create");
}
@@ -148,27 +148,27 @@ public class EmployeeBean implements jav
return firstName;
}
- public void setLastName(String lname) {
+ public void setLastName(final String lname) {
lastName = lname;
}
- public void setFirstName(String fname) {
+ public void setFirstName(final String fname) {
firstName = fname;
}
public void ejbLoad() {
try {
- InitialContext jndiContext = new InitialContext();
+ final InitialContext jndiContext = new InitialContext();
- javax.sql.DataSource ds = (javax.sql.DataSource) jndiContext.lookup("java:comp/env/jdbc/orders");
+ final javax.sql.DataSource ds = (javax.sql.DataSource) jndiContext.lookup("java:comp/env/jdbc/orders");
- Connection con = ds.getConnection();
+ final Connection con = ds.getConnection();
try {
- PreparedStatement stmt = con.prepareStatement("select * from Employees where EmployeeID = ?");
+ final PreparedStatement stmt = con.prepareStatement("select * from Employees where EmployeeID = ?");
try {
- Integer primaryKey = (Integer) ejbContext.getPrimaryKey();
+ final Integer primaryKey = (Integer) ejbContext.getPrimaryKey();
stmt.setInt(1, primaryKey.intValue());
- ResultSet rs = stmt.executeQuery();
+ final ResultSet rs = stmt.executeQuery();
while (rs.next()) {
lastName = rs.getString("LastName");
firstName = rs.getString("FirstName");
@@ -180,7 +180,7 @@ public class EmployeeBean implements jav
con.close();
}
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
}
@@ -188,13 +188,13 @@ public class EmployeeBean implements jav
public void ejbStore() {
try {
- InitialContext jndiContext = new InitialContext();
+ final InitialContext jndiContext = new InitialContext();
- javax.sql.DataSource ds = (javax.sql.DataSource) jndiContext.lookup("java:comp/env/jdbc/orders");
- Connection con = ds.getConnection();
+ final javax.sql.DataSource ds = (javax.sql.DataSource) jndiContext.lookup("java:comp/env/jdbc/orders");
+ final Connection con = ds.getConnection();
try {
- PreparedStatement stmt = con.prepareStatement("update Employees set FirstName = ?, LastName = ? where EmployeeID = ?");
+ final PreparedStatement stmt = con.prepareStatement("update Employees set FirstName = ?, LastName = ? where EmployeeID = ?");
try {
stmt.setString(1, firstName);
stmt.setString(2, lastName);
@@ -206,7 +206,7 @@ public class EmployeeBean implements jav
} finally {
con.close();
}
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
}
@@ -221,17 +221,17 @@ public class EmployeeBean implements jav
public void ejbRemove() {
try {
- InitialContext jndiContext = new InitialContext();
+ final InitialContext jndiContext = new InitialContext();
- javax.sql.DataSource ds =
- (javax.sql.DataSource) jndiContext.lookup("java:comp/env/jdbc/orders");
+ final javax.sql.DataSource ds =
+ (javax.sql.DataSource) jndiContext.lookup("java:comp/env/jdbc/orders");
- Connection con = ds.getConnection();
+ final Connection con = ds.getConnection();
try {
- PreparedStatement stmt = con.prepareStatement("delete from Employees where EmployeeID = ?");
+ final PreparedStatement stmt = con.prepareStatement("delete from Employees where EmployeeID = ?");
try {
- Integer primaryKey = (Integer) ejbContext.getPrimaryKey();
+ final Integer primaryKey = (Integer) ejbContext.getPrimaryKey();
stmt.setInt(1, primaryKey.intValue());
stmt.executeUpdate();
} finally {
@@ -241,12 +241,12 @@ public class EmployeeBean implements jav
con.close();
}
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
}
}
- public void setEntityContext(javax.ejb.EntityContext cntx) {
+ public void setEntityContext(final javax.ejb.EntityContext cntx) {
ejbContext = cntx;
}
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/EmployeeHome.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/EmployeeHome.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/EmployeeHome.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/EmployeeHome.java Tue Jul 15 21:55:09 2014
@@ -17,16 +17,16 @@
package org.apache.openejb.test.beans;
-public interface EmployeeHome extends javax.ejb.EJBHome{
-
+public interface EmployeeHome extends javax.ejb.EJBHome {
+
public Employee create(String lastname, String firstName)
- throws javax.ejb.CreateException, java.rmi.RemoteException;
-
+ throws javax.ejb.CreateException, java.rmi.RemoteException;
+
public int sum(int one, int two) throws java.rmi.RemoteException;
-
- public java.util.Collection findAll( )
- throws javax.ejb.FinderException, java.rmi.RemoteException;
-
+
+ public java.util.Collection findAll()
+ throws javax.ejb.FinderException, java.rmi.RemoteException;
+
public Employee findByPrimaryKey(Integer primkey)
- throws javax.ejb.FinderException, java.rmi.RemoteException;
+ throws javax.ejb.FinderException, java.rmi.RemoteException;
}
\ No newline at end of file
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/ShoppingCart.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/ShoppingCart.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/ShoppingCart.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/ShoppingCart.java Tue Jul 15 21:55:09 2014
@@ -21,13 +21,13 @@ import java.rmi.RemoteException;
import javax.ejb.EJBObject;
public interface ShoppingCart extends EJBObject {
-
- public String getName( )throws RemoteException;
-
- public void setName(String name)throws RemoteException;
-
+
+ public String getName() throws RemoteException;
+
+ public void setName(String name) throws RemoteException;
+
public Calculator getCalculator() throws RemoteException;
-
+
public void doJdbcCall() throws RemoteException;
-
+
}
\ No newline at end of file
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/ShoppingCartBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/ShoppingCartBean.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/ShoppingCartBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/ShoppingCartBean.java Tue Jul 15 21:55:09 2014
@@ -33,17 +33,17 @@ public class ShoppingCartBean implements
Context envContext;
Boolean useJdbc = Boolean.FALSE;
- public void ejbCreate(String name) throws javax.ejb.CreateException {
+ public void ejbCreate(final String name) throws javax.ejb.CreateException {
//testAllowedOperations("ejbCreate");
try {
jndiContext = new InitialContext();
- String author = (String) jndiContext.lookup("java:comp/env/author");
+ final String author = (String) jndiContext.lookup("java:comp/env/author");
- Double price = (Double) jndiContext.lookup("java:comp/env/price");
+ final Double price = (Double) jndiContext.lookup("java:comp/env/price");
- } catch (javax.naming.NamingException re) {
+ } catch (final javax.naming.NamingException re) {
throw new RuntimeException("Using JNDI failed");
}
@@ -53,17 +53,17 @@ public class ShoppingCartBean implements
try {
- boolean test = context.isCallerInRole("TheMan");
+ final boolean test = context.isCallerInRole("TheMan");
jndiContext = new InitialContext();
- CalculatorHome home = (CalculatorHome) jndiContext.lookup("java:comp/env/ejb/calculator");
- Calculator calc = home.create();
+ final CalculatorHome home = (CalculatorHome) jndiContext.lookup("java:comp/env/ejb/calculator");
+ final Calculator calc = home.create();
return calc;
- } catch (java.rmi.RemoteException re) {
+ } catch (final java.rmi.RemoteException re) {
throw new RuntimeException("Getting calulator bean failed");
- } catch (javax.naming.NamingException re) {
+ } catch (final javax.naming.NamingException re) {
throw new RuntimeException("Using JNDI failed");
}
@@ -75,36 +75,36 @@ public class ShoppingCartBean implements
Connection con = null;
try {
- javax.sql.DataSource ds = (javax.sql.DataSource) jndiContext.lookup("java:comp/env/jdbc/orders");
+ final javax.sql.DataSource ds = (javax.sql.DataSource) jndiContext.lookup("java:comp/env/jdbc/orders");
con = ds.getConnection();
- Statement stmt = con.createStatement();
+ final Statement stmt = con.createStatement();
try {
- ResultSet rs = stmt.executeQuery("select * from Employees");
+ final ResultSet rs = stmt.executeQuery("select * from Employees");
while (rs.next())
System.out.println(rs.getString(2));
- Calculator calc = getCalculator();
+ final Calculator calc = getCalculator();
calc.add(1, 1);
calc.sub(1, 2);
- int i = 1;
+ final int i = 1;
} finally {
stmt.close();
}
- } catch (java.rmi.RemoteException re) {
+ } catch (final java.rmi.RemoteException re) {
throw new RuntimeException("Accessing Calculator bean failed");
- } catch (javax.naming.NamingException ne) {
+ } catch (final javax.naming.NamingException ne) {
throw new RuntimeException("Using JNDI failed");
- } catch (java.sql.SQLException se) {
+ } catch (final java.sql.SQLException se) {
throw new RuntimeException("Getting JDBC data source failed");
} finally {
if (con != null) {
try {
con.close();
- } catch (SQLException se) {
+ } catch (final SQLException se) {
se.printStackTrace();
}
}
@@ -117,12 +117,12 @@ public class ShoppingCartBean implements
return name;
}
- public void setName(String name) {
+ public void setName(final String name) {
//testAllowedOperations("setName");
this.name = name;
}
- public void setSessionContext(SessionContext cntx) {
+ public void setSessionContext(final SessionContext cntx) {
context = cntx;
//testAllowedOperations("setSessionContext");
}
@@ -147,53 +147,53 @@ public class ShoppingCartBean implements
// do nothing
}
- public void afterCompletion(boolean commit) {
+ public void afterCompletion(final boolean commit) {
// do nothing
}
- private void testAllowedOperations(String methodName) {
+ private void testAllowedOperations(final String methodName) {
System.out.println("******************************************************");
System.out.println("\nTesting Allowed Operations for " + methodName + "() method\n");
try {
context.getEJBObject();
System.out.println("SessionContext.getEJBObject() ... Allowed");
- } catch (IllegalStateException ise) {
+ } catch (final IllegalStateException ise) {
System.out.println("SessionContext.getEJBObject() ... Failed");
}
try {
context.getEJBHome();
System.out.println("SessionContext.getEJBHome() ... Allowed");
- } catch (IllegalStateException ise) {
+ } catch (final IllegalStateException ise) {
System.out.println("SessionContext.getEJBHome() ... Failed");
}
try {
context.getCallerPrincipal();
System.out.println("SessionContext.getCallerPrincipal() ... Allowed");
- } catch (IllegalStateException ise) {
+ } catch (final IllegalStateException ise) {
System.out.println("SessionContext.getCallerPrincipal() ... Failed");
}
try {
context.isCallerInRole("ROLE");
System.out.println("SessionContext.isCallerInRole() ... Allowed");
- } catch (IllegalStateException ise) {
+ } catch (final IllegalStateException ise) {
System.out.println("SessionContext.isCallerInRole() ... Failed");
}
try {
context.getRollbackOnly();
System.out.println("SessionContext.getRollbackOnly() ... Allowed");
- } catch (IllegalStateException ise) {
+ } catch (final IllegalStateException ise) {
System.out.println("SessionContext.getRollbackOnly() ... Failed");
}
try {
context.setRollbackOnly();
System.out.println("SessionContext.setRollbackOnly() ... Allowed");
- } catch (IllegalStateException ise) {
+ } catch (final IllegalStateException ise) {
System.out.println("SessionContext.setRollbackOnly() ... Failed");
}
try {
context.getUserTransaction();
System.out.println("SessionContext.getUserTransaction() ... Allowed");
- } catch (IllegalStateException ise) {
+ } catch (final IllegalStateException ise) {
System.out.println("SessionContext.getUserTransaction() ... Failed");
}
}
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/ShoppingCartHome.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/ShoppingCartHome.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/ShoppingCartHome.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/ShoppingCartHome.java Tue Jul 15 21:55:09 2014
@@ -21,8 +21,8 @@ import java.rmi.RemoteException;
import javax.ejb.EJBHome;
public interface ShoppingCartHome extends EJBHome {
-
+
public ShoppingCart create(String name) throws RemoteException;
-
-
+
+
}
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/TimerSyncBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/TimerSyncBean.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/TimerSyncBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/beans/TimerSyncBean.java Tue Jul 15 21:55:09 2014
@@ -27,21 +27,21 @@ import java.util.concurrent.TimeUnit;
public class TimerSyncBean implements TimerSync {
private static Map<String, CountDownLatch> latches = new TreeMap<String, CountDownLatch>();
- public boolean waitFor(String name) {
- CountDownLatch latch = getLatch(name);
+ public boolean waitFor(final String name) {
+ final CountDownLatch latch = getLatch(name);
try {
return latch.await(1, TimeUnit.SECONDS);
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
return false;
}
}
- public void countDown(String name) {
- CountDownLatch latch = getLatch(name);
+ public void countDown(final String name) {
+ final CountDownLatch latch = getLatch(name);
latch.countDown();
}
- private synchronized CountDownLatch getLatch(String name) {
+ private synchronized CountDownLatch getLatch(final String name) {
CountDownLatch latch = latches.get(name);
if (latch == null) {
latch = new CountDownLatch(1);
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/Customer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/Customer.java?rev=1610862&r1=1610861&r2=1610862&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/Customer.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/Customer.java Tue Jul 15 21:55:09 2014
@@ -22,26 +22,31 @@ import javax.persistence.Entity;
@Entity
public class Customer {
- private String customerName;
- private int customerAge;
- private int id;
-
- public int getId() {
- return id;
- }
- public void setId(int id) {
- this.id = id;
- }
- public int getCustomerAge() {
- return customerAge;
- }
- public void setCustomerAge(int customerAge) {
- this.customerAge = customerAge;
- }
- public String getCustomerName() {
- return customerName;
- }
- public void setCustomerName(String customerName) {
- this.customerName = customerName;
- }
+ private String customerName;
+ private int customerAge;
+ private int id;
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(final int id) {
+ this.id = id;
+ }
+
+ public int getCustomerAge() {
+ return customerAge;
+ }
+
+ public void setCustomerAge(final int customerAge) {
+ this.customerAge = customerAge;
+ }
+
+ public String getCustomerName() {
+ return customerName;
+ }
+
+ public void setCustomerName(final String customerName) {
+ this.customerName = customerName;
+ }
}