Author: andygumbrecht
Date: Thu Dec 20 13:34:46 2012
New Revision: 1424458
URL: http://svn.apache.org/viewvc?rev=1424458&view=rev
Log:
Surefire to console.
Finals /Cleanup.
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/RAFPassivater.java
openejb/trunk/openejb/server/openejb-client/pom.xml
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/MulticastPulseClient.java
openejb/trunk/openejb/server/openejb-client/src/test/java/org/apache/openejb/client/JaxWsProviderWrapperTest.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/RAFPassivater.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/RAFPassivater.java?rev=1424458&r1=1424457&r2=1424458&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/RAFPassivater.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/RAFPassivater.java
Thu Dec 20 13:34:46 2012
@@ -20,49 +20,50 @@ import org.apache.openejb.spi.Serializer
import java.io.File;
import java.io.RandomAccessFile;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Properties;
-import java.util.Map;
+import java.util.HashMap;
import java.util.Iterator;
-
-// optimization: replace HashTable with HashMap (vc no debug hashmap)
+import java.util.Map;
+import java.util.Properties;
public class RAFPassivater implements PassivationStrategy {
int fileID = 0;
- Hashtable masterTable = new Hashtable();
+ HashMap masterTable = new HashMap();
static class Pointer {
+
int fileid;
long filepointer;
int bytesize;
- public Pointer(int file, long pointer, int bytecount) {
+ public Pointer(final int file, final long pointer, final int
bytecount) {
fileid = file;
filepointer = pointer;
bytesize = bytecount;
}
}
- public void init(Properties props) throws
org.apache.openejb.SystemException {
+ @Override
+ public void init(final Properties props) throws
org.apache.openejb.SystemException {
}
- public synchronized void passivate(Map stateTable)
+ @Override
+ public synchronized void passivate(final Map stateTable)
throws org.apache.openejb.SystemException {
try {
fileID++;
- RandomAccessFile ras = new
RandomAccessFile(System.getProperty("java.io.tmpdir", File.separator + "tmp") +
File.separator + "passivation" + fileID + ".ser", "rw");
- Iterator iterator = stateTable.keySet().iterator();
+ final RandomAccessFile ras = new
RandomAccessFile(System.getProperty("java.io.tmpdir", File.separator + "tmp") +
File.separator + "passivation" + fileID + ".ser", "rw");
+ final Iterator iterator = stateTable.keySet().iterator();
Pointer lastPointer = null;
while (iterator.hasNext()) {
- Object id = iterator.next();
- Object obj = stateTable.get(id);
- byte [] bytes = Serializer.serialize(obj);
- long filepointer = ras.getFilePointer();
+ final Object id = iterator.next();
+ final Object obj = stateTable.get(id);
+ final byte[] bytes = Serializer.serialize(obj);
+ final long filepointer = ras.getFilePointer();
- if (lastPointer == null) lastPointer = new Pointer(fileID,
filepointer, (int) (filepointer));
+ if (lastPointer == null)
+ lastPointer = new Pointer(fileID, filepointer, (int)
(filepointer));
else
lastPointer = new Pointer(fileID, filepointer, (int)
(filepointer - lastPointer.filepointer));
@@ -75,16 +76,17 @@ public class RAFPassivater implements Pa
}
}
- public synchronized Object activate(Object primaryKey)
+ @Override
+ public synchronized Object activate(final Object primaryKey)
throws org.apache.openejb.SystemException {
- Pointer pointer = (Pointer) masterTable.get(primaryKey);
+ final Pointer pointer = (Pointer) masterTable.get(primaryKey);
if (pointer == null)
return null;
try {
- RandomAccessFile ras = new
RandomAccessFile(System.getProperty("java.io.tmpdir", File.separator + "tmp") +
File.separator + "passivation" + pointer.fileid + ".ser", "r");
- byte [] bytes = new byte[(int) pointer.bytesize];
+ final RandomAccessFile ras = new
RandomAccessFile(System.getProperty("java.io.tmpdir", File.separator + "tmp") +
File.separator + "passivation" + pointer.fileid + ".ser", "r");
+ final byte[] bytes = new byte[(int) pointer.bytesize];
ras.seek(pointer.filepointer);
ras.readFully(bytes);
ras.close();
Modified: openejb/trunk/openejb/server/openejb-client/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-client/pom.xml?rev=1424458&r1=1424457&r2=1424458&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-client/pom.xml (original)
+++ openejb/trunk/openejb/server/openejb-client/pom.xml Thu Dec 20 13:34:46 2012
@@ -87,6 +87,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>pertest</forkMode>
+ <useFile>false</useFile>
</configuration>
</plugin>
<plugin>
Modified:
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/MulticastPulseClient.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/MulticastPulseClient.java?rev=1424458&r1=1424457&r2=1424458&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/MulticastPulseClient.java
(original)
+++
openejb/trunk/openejb/server/openejb-client/src/main/java/org/apache/openejb/client/MulticastPulseClient.java
Thu Dec 20 13:34:46 2012
@@ -169,7 +169,7 @@ public class MulticastPulseClient extend
final Set<URI> set = new TreeSet<URI>(new Comparator<URI>() {
@Override
- public int compare(URI uri1, URI uri2) {
+ public int compare(final URI uri1, final URI uri2) {
//Ignore server hostname
URI u1 = URI.create(uri1.getSchemeSpecificPart());
@@ -354,7 +354,7 @@ public class MulticastPulseClient extend
running.set(false);
- for (Future future : futures) {
+ for (final Future future : futures) {
future.cancel(true);
}
@@ -506,7 +506,7 @@ public class MulticastPulseClient extend
}
@Override
- protected List<String> validate(Arguments arguments) {
+ protected List<String> validate(final Arguments arguments) {
return super.validate(arguments);
}
@@ -538,6 +538,7 @@ public class MulticastPulseClient extend
final AtomicBoolean running = new AtomicBoolean(true);
final Thread t = new Thread(new Runnable() {
+ @SuppressWarnings("UseOfSystemOutOrSystemErr")
@Override
public void run() {
while (running.get()) {
Modified:
openejb/trunk/openejb/server/openejb-client/src/test/java/org/apache/openejb/client/JaxWsProviderWrapperTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-client/src/test/java/org/apache/openejb/client/JaxWsProviderWrapperTest.java?rev=1424458&r1=1424457&r2=1424458&view=diff
==============================================================================
---
openejb/trunk/openejb/server/openejb-client/src/test/java/org/apache/openejb/client/JaxWsProviderWrapperTest.java
(original)
+++
openejb/trunk/openejb/server/openejb-client/src/test/java/org/apache/openejb/client/JaxWsProviderWrapperTest.java
Thu Dec 20 13:34:46 2012
@@ -18,21 +18,21 @@
package org.apache.openejb.client;
import junit.framework.TestCase;
+import org.w3c.dom.Element;
-import javax.xml.ws.spi.Provider;
-import javax.xml.ws.spi.ServiceDelegate;
+import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
import javax.xml.ws.Endpoint;
import javax.xml.ws.EndpointReference;
import javax.xml.ws.WebServiceFeature;
+import javax.xml.ws.spi.Provider;
+import javax.xml.ws.spi.ServiceDelegate;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
import java.net.URL;
import java.util.List;
-import org.w3c.dom.Element;
-
public class JaxWsProviderWrapperTest extends TestCase {
+
public void test() throws Exception {
System.setProperty(Provider.JAXWSPROVIDER_PROPERTY,
MockProvider.class.getName());
Provider provider = Provider.provider();
@@ -44,10 +44,10 @@ public class JaxWsProviderWrapperTest ex
provider = Provider.provider();
assertNotNull("provider is null", provider);
assertTrue("provider should be an instance of ProviderWrapper",
provider instanceof JaxWsProviderWrapper);
- JaxWsProviderWrapper providerWrapper =
(JaxWsProviderWrapper)provider;
+ final JaxWsProviderWrapper providerWrapper =
(JaxWsProviderWrapper) provider;
// check delegate
- Provider delegate = providerWrapper.getDelegate();
+ final Provider delegate = providerWrapper.getDelegate();
assertNotNull("providerWrapper delegate is null", delegate);
assertFalse("providerWrapper delegate should not be an instance of
ProviderWrapper", delegate instanceof JaxWsProviderWrapper);
} finally {
@@ -57,27 +57,34 @@ public class JaxWsProviderWrapperTest ex
@SuppressWarnings({"UnusedDeclaration"})
public static class MockProvider extends Provider {
- public ServiceDelegate createServiceDelegate(URL url, QName qName,
Class aClass) {
+
+ @Override
+ public ServiceDelegate createServiceDelegate(final URL url, final
QName qName, final Class aClass) {
return null;
}
- public Endpoint createEndpoint(String string, Object object) {
+ @Override
+ public Endpoint createEndpoint(final String string, final Object
object) {
return null;
}
- public Endpoint createAndPublishEndpoint(String string, Object object)
{
+ @Override
+ public Endpoint createAndPublishEndpoint(final String string, final
Object object) {
return null;
}
- public W3CEndpointReference createW3CEndpointReference(String address,
QName serviceName, QName portName, List<Element> metadata, String
wsdlDocumentLocation, List<Element> referenceParameters) {
+ @Override
+ public W3CEndpointReference createW3CEndpointReference(final String
address, final QName serviceName, final QName portName, final List<Element>
metadata, final String wsdlDocumentLocation, final List<Element>
referenceParameters) {
return null;
}
- public EndpointReference readEndpointReference(Source source){
+ @Override
+ public EndpointReference readEndpointReference(final Source source) {
return null;
}
- public <T> T getPort(EndpointReference endpointReference, Class<T>
serviceEndpointInterface, WebServiceFeature... features) {
+ @Override
+ public <T> T getPort(final EndpointReference endpointReference, final
Class<T> serviceEndpointInterface, final WebServiceFeature... features) {
return null;
}
}
