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/17 09:53:05 UTC
svn commit: r1611274 [14/15] - in /tomee/tomee/branches/tomee-1.7.x/server:
./ openejb-activemq/
openejb-activemq/src/main/java/org/apache/openejb/server/activemq/
openejb-axis/ openejb-axis/src/main/java/org/apache/openejb/server/axis/
openejb-axis/sr...
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/ServicePool.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/ServicePool.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/ServicePool.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/ServicePool.java Thu Jul 17 07:52:58 2014
@@ -97,64 +97,64 @@ public class ServicePool extends ServerS
final int q = queue;
threadPool = new ThreadPoolExecutor(threadCore, threads, keepAliveTime, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(queue),
- new ThreadFactory() {
- private final AtomicInteger i = new AtomicInteger(0);
+ new ThreadFactory() {
+ private final AtomicInteger i = new AtomicInteger(0);
- @Override
- public Thread newThread(final Runnable r) {
- final Thread t = new Thread(r, "OpenEJB." + ServicePool.this.getName() + "." + i.incrementAndGet());
- t.setDaemon(true);
- t.setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
- @Override
- public void uncaughtException(final Thread t, final Throwable e) {
- log.error("ServicePool '" + ServicePool.this.getName() + "': Uncaught error in: " + t.getName(), e);
- }
- });
+ @Override
+ public Thread newThread(final Runnable r) {
+ final Thread t = new Thread(r, "OpenEJB." + ServicePool.this.getName() + "." + i.incrementAndGet());
+ t.setDaemon(true);
+ t.setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
+ @Override
+ public void uncaughtException(final Thread t, final Throwable e) {
+ log.error("ServicePool '" + ServicePool.this.getName() + "': Uncaught error in: " + t.getName(), e);
+ }
+ });
+
+ return t;
+ }
- return t;
+ },
+ new RejectedExecutionHandler() {
+ @Override
+ public void rejectedExecution(final Runnable r, final ThreadPoolExecutor tpe) {
+
+ if (null == r || null == tpe || tpe.isShutdown() || tpe.isTerminated() || tpe.isTerminating()) {
+ return;
}
- },
- new RejectedExecutionHandler() {
- @Override
- public void rejectedExecution(final Runnable r, final ThreadPoolExecutor tpe) {
+ if (log.isWarningEnabled()) {
+ log.warning(String.format("ServicePool '" + ServicePool.this.getName() + "' with (%1$s) threads is at capicity (%2$s) for queue (%3$s) on process: %4$s"
+ + "\nConsider increasing the 'threadCore','threads' and 'queue' size properties.", c, t, q, r));
+ }
- if (null == r || null == tpe || tpe.isShutdown() || tpe.isTerminated() || tpe.isTerminating()) {
- return;
- }
+ boolean offer = false;
+ try {
+ offer = tpe.getQueue().offer(r, 10, TimeUnit.SECONDS);
+ } catch (final InterruptedException e) {
+ //Ignore
+ }
- if (log.isWarningEnabled()) {
- log.warning(String.format("ServicePool '" + ServicePool.this.getName() + "' with (%1$s) threads is at capicity (%2$s) for queue (%3$s) on process: %4$s"
- + "\nConsider increasing the 'threadCore','threads' and 'queue' size properties.", c, t, q, r));
- }
+ if (!offer) {
- boolean offer = false;
- try {
- offer = tpe.getQueue().offer(r, 10, TimeUnit.SECONDS);
- } catch (InterruptedException e) {
- //Ignore
- }
+ if (block) {
+ try {
+ //Last ditch effort to run the process in the current thread
+ r.run();
- if (!offer) {
+ log.warning("ServicePool '" + ServicePool.this.getName() + "' forced execution on the current server thread: " + r
+ + "\nIt is highly recommended that the service 'threadCore','threads' and 'queue' size properties are increased!");
- if (block) {
- try {
- //Last ditch effort to run the process in the current thread
- r.run();
-
- log.warning("ServicePool '" + ServicePool.this.getName() + "' forced execution on the current server thread: " + r
- + "\nIt is highly recommended that the service 'threadCore','threads' and 'queue' size properties are increased!");
-
- } catch (Throwable e) {
- log.error("ServicePool '" + ServicePool.this.getName() + "' failed to run a process in the current server thread: " + r);
- }
- } else {
- log.error("ServicePool '" + ServicePool.this.getName() + "' rejected asynchronous process: " + r
- + "\nIt is strongly advised that the 'threadCore', 'threads', 'queue' size and 'block' properties are modified to prevent data loss!");
+ } catch (final Throwable e) {
+ log.error("ServicePool '" + ServicePool.this.getName() + "' failed to run a process in the current server thread: " + r);
}
+ } else {
+ log.error("ServicePool '" + ServicePool.this.getName() + "' rejected asynchronous process: " + r
+ + "\nIt is strongly advised that the 'threadCore', 'threads', 'queue' size and 'block' properties are modified to prevent data loss!");
}
}
- });
+ }
+ });
SystemInstance.get().setComponent(ServicePool.class, this);
@@ -197,21 +197,21 @@ public class ServicePool extends ServerS
ServicePool.super.service(socket);
- } catch (SecurityException e) {
+ } catch (final SecurityException e) {
final String msg = "ServicePool '" + ServicePool.this.getName() + "': Security error: " + e.getMessage();
if (log.isDebugEnabled()) {
log.error(msg, e);
} else {
log.error(msg + " - Debug for StackTrace");
}
- } catch (IOException e) {
+ } catch (final IOException e) {
final String msg = "ServicePool '" + ServicePool.this.getName() + "': Unexpected IO error: " + e.getMessage();
if (log.isDebugEnabled()) {
log.debug(msg, e);
} else {
log.warning(msg + " - Debug for StackTrace");
}
- } catch (Throwable e) {
+ } catch (final Throwable e) {
final String msg = "ServicePool '" + ServicePool.this.getName() + "': Unexpected error: " + e.getMessage();
if (log.isDebugEnabled()) {
log.error(msg, e);
@@ -227,7 +227,7 @@ public class ServicePool extends ServerS
if (socket != null) {
socket.close();
}
- } catch (Throwable t) {
+ } catch (final Throwable t) {
if (log.isDebugEnabled()) {
log.debug("ServicePool '" + ServicePool.this.getName() + "': Error closing socket", t);
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/SimpleServiceManager.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/SimpleServiceManager.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/SimpleServiceManager.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/SimpleServiceManager.java Thu Jul 17 07:52:58 2014
@@ -129,7 +129,7 @@ public class SimpleServiceManager extend
ServiceLogger.MDCput("SERVER", "main");
final InetAddress localhost = InetAddress.getLocalHost();
ServiceLogger.MDCput("HOST", localhost.getHostName());
- } catch (Throwable e) {
+ } catch (final Throwable e) {
//Ignore
}
@@ -138,7 +138,7 @@ public class SimpleServiceManager extend
// register the mbean
try {
LocalMBeanServer.get().registerMBean(new ManagedMBean(registry), getDiscoveryRegistryObjectName());
- } catch (Throwable e) {
+ } catch (final Throwable e) {
logger.error("Failed to register 'openejb' MBean", e);
}
@@ -170,7 +170,7 @@ public class SimpleServiceManager extend
try {
d.start();
errors[i] = null;
- } catch (Exception e) {
+ } catch (final Exception e) {
errors[i] = e;
LOGGER.info("Can't start service " + d.getName(), e);
}
@@ -217,7 +217,7 @@ public class SimpleServiceManager extend
this.wait(Long.MAX_VALUE);
}
- } catch (Throwable t) {
+ } catch (final Throwable t) {
logger.fatal("Unable to keep the server thread alive. Received exception: " + t.getClass().getName() + " : " + t.getMessage());
}
logger.info("Stopping Remote Server");
@@ -237,7 +237,7 @@ public class SimpleServiceManager extend
if (server.isRegistered(on)) {
try {
server.unregisterMBean(on);
- } catch (Exception ignored) {
+ } catch (final Exception ignored) {
// no-op
}
}
@@ -245,7 +245,7 @@ public class SimpleServiceManager extend
try {
service.stop();
- } catch (ServiceException e) {
+ } catch (final ServiceException e) {
logger.fatal("Service Shutdown Failed: " + service.getName() + ". Exception: " + e.getMessage(), e);
}
}
@@ -258,7 +258,7 @@ public class SimpleServiceManager extend
server.unregisterMBean(objectName);
}
- } catch (Throwable e) {
+ } catch (final Throwable e) {
logger.warning("Failed to de-register the 'openejb' mbean", e);
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/Start.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/Start.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/Start.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/Start.java Thu Jul 17 07:52:58 2014
@@ -29,7 +29,7 @@ import java.util.Set;
public class Start {
- public static void main(String[] args) {
+ public static void main(final String[] args) {
// System.exit(new Start().start()?0:1);
@@ -65,14 +65,14 @@ public class Start {
try {
- ArrayList<String> cmd = new ArrayList<String>();
+ final ArrayList<String> cmd = new ArrayList<String>();
- String s = java.io.File.separator;
+ final String s = java.io.File.separator;
//Not really required here for exec, but as a reminder that we run on all platforms
final boolean isWindows = System.getProperty("os.name").toLowerCase().contains("win");
- String java = System.getProperty("java.home") + s + "bin" + s + (isWindows ? "java.exe" : "java");
+ final String java = System.getProperty("java.home") + s + "bin" + s + (isWindows ? "java.exe" : "java");
cmd.add(java);
@@ -84,29 +84,29 @@ public class Start {
cmd.add("org.apache.openejb.server.Main");
- String[] command = cmd.toArray(new String[cmd.size()]);
+ final String[] command = cmd.toArray(new String[cmd.size()]);
- Runtime runtime = Runtime.getRuntime();
+ final Runtime runtime = Runtime.getRuntime();
- Process server = runtime.exec(command);
+ final Process server = runtime.exec(command);
- InputStream out = server.getInputStream();
+ final InputStream out = server.getInputStream();
- Thread serverOut = new Thread(new Pipe(out, System.out));
+ final Thread serverOut = new Thread(new Pipe(out, System.out));
serverOut.setDaemon(true);
serverOut.start();
- InputStream err = server.getErrorStream();
+ final InputStream err = server.getErrorStream();
- Thread serverErr = new Thread(new Pipe(err, System.err));
+ final Thread serverErr = new Thread(new Pipe(err, System.err));
serverErr.setDaemon(true);
serverErr.start();
- } catch (Exception e) {
+ } catch (final Exception e) {
throw new ServerRuntimeException("Cannot start the server.");
@@ -114,17 +114,17 @@ public class Start {
}
- private void addSystemProperties(ArrayList<String> cmd) {
+ private void addSystemProperties(final ArrayList<String> cmd) {
- Set set = System.getProperties().entrySet();
+ final Set set = System.getProperties().entrySet();
for (final Object aSet : set) {
- Map.Entry entry = (Map.Entry) aSet;
+ final Map.Entry entry = (Map.Entry) aSet;
- String key = (String) entry.getKey();
+ final String key = (String) entry.getKey();
- String value = (String) entry.getValue();
+ final String value = (String) entry.getValue();
if (key.matches("^-X.*")) {
@@ -145,21 +145,21 @@ public class Start {
String classpath = System.getProperty("java.class.path");
- ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ final ClassLoader cl = Thread.currentThread().getContextClassLoader();
- String antLoader = "org.apache.tools.ant.AntClassLoader";
+ final String antLoader = "org.apache.tools.ant.AntClassLoader";
if (cl.getClass().getName().equals(antLoader)) {
try {
- Class ant = cl.getClass();
+ final Class ant = cl.getClass();
- Method getClasspath = ant.getMethod("getClasspath", new Class[0]);
+ final Method getClasspath = ant.getMethod("getClasspath", new Class[0]);
classpath += File.pathSeparator + getClasspath.invoke(cl, new Object[0]);
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
@@ -176,7 +176,7 @@ public class Start {
private final InputStream is;
private final OutputStream out;
- private Pipe(InputStream is, OutputStream out) {
+ private Pipe(final InputStream is, final OutputStream out) {
super();
@@ -203,7 +203,7 @@ public class Start {
}
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/Status.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/Status.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/Status.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/Status.java Thu Jul 17 07:52:58 2014
@@ -52,13 +52,13 @@ public class Status {
final int port = SystemInstance.get().getOptions().get("ejbd.port", 4201);
socket = new Socket("localhost", port);
out = socket.getOutputStream();
- } catch (Exception e) {
+ } catch (final Exception e) {
if (tries < 2) {
return false;
} else {
try {
Thread.sleep(2000);
- } catch (Exception e2) {
+ } catch (final Exception e2) {
e.printStackTrace();
}
return connect(--tries);
@@ -67,7 +67,7 @@ public class Status {
if (null != out) {
try {
out.close();
- } catch (Throwable t) {
+ } catch (final Throwable t) {
//Ignore
}
}
@@ -75,7 +75,7 @@ public class Status {
if (null != socket) {
try {
socket.close();
- } catch (Throwable t) {
+ } catch (final Throwable t) {
//Ignore
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/admin/AdminDaemon.java Thu Jul 17 07:52:58 2014
@@ -31,19 +31,19 @@ import org.apache.openejb.util.Logger;
public class AdminDaemon implements ServerService {
@Override
- public void init(Properties props) throws Exception {
+ public void init(final Properties props) throws Exception {
}
@Override
- public void service(Socket socket) throws ServiceException, IOException {
+ public void service(final Socket socket) throws ServiceException, IOException {
InputStream in = null;
try {
in = socket.getInputStream();
- byte requestTypeByte = (byte) in.read();
+ final byte requestTypeByte = (byte) in.read();
try {
- RequestType requestType = RequestType.valueOf(requestTypeByte);
+ final RequestType requestType = RequestType.valueOf(requestTypeByte);
switch (requestType) {
case NOP_REQUEST:
@@ -52,7 +52,7 @@ public class AdminDaemon implements Serv
case STOP_REQUEST_quit:
case STOP_REQUEST_Stop:
case STOP_REQUEST_stop:
- Server server = SystemInstance.get().getComponent(Server.class);
+ final Server server = SystemInstance.get().getComponent(Server.class);
if (null != server) {
server.stop();
}
@@ -62,17 +62,17 @@ public class AdminDaemon implements Serv
Logger.getInstance(LogCategory.OPENEJB_SERVER, AdminDaemon.class).warning("Invalid Server Socket request: " + requestType);
break;
}
- } catch (IllegalArgumentException iae) {
+ } catch (final IllegalArgumentException iae) {
Logger.getInstance(LogCategory.OPENEJB_SERVER, AdminDaemon.class).warning("Invalid Server Socket request: " + requestTypeByte);
}
- } catch (Throwable e) {
+ } catch (final Throwable e) {
Logger.getInstance(LogCategory.OPENEJB_SERVER, AdminDaemon.class).warning("Server Socket request failed", e);
} finally {
if (null != in) {
try {
in.close();
- } catch (Throwable t) {
+ } catch (final Throwable t) {
//Ignore
}
}
@@ -80,7 +80,7 @@ public class AdminDaemon implements Serv
if (null != socket) {
try {
socket.close();
- } catch (Throwable t) {
+ } catch (final Throwable t) {
//Ignore
}
}
@@ -88,7 +88,7 @@ public class AdminDaemon implements Serv
}
@Override
- public void service(InputStream in, OutputStream out) throws ServiceException, IOException {
+ public void service(final InputStream in, final OutputStream out) throws ServiceException, IOException {
throw new UnsupportedOperationException("Method not implemented: service(InputStream in, OutputStream out)");
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/admin/Stop.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/admin/Stop.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/admin/Stop.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/admin/Stop.java Thu Jul 17 07:52:58 2014
@@ -44,15 +44,15 @@ public class Stop {
out.write(RequestType.STOP_REQUEST_Stop.getCode());
- } catch (ConnectException e) {
+ } catch (final ConnectException e) {
System.out.println(":: server not running ::");
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
} finally {
if (null != out) {
try {
out.close();
- } catch (Throwable e) {
+ } catch (final Throwable e) {
//Ignore
}
}
@@ -60,7 +60,7 @@ public class Stop {
if (null != socket) {
try {
socket.close();
- } catch (Throwable e) {
+ } catch (final Throwable e) {
//Ignore
}
}
@@ -97,7 +97,7 @@ public class Stop {
}
stop(host, port);
- } catch (Exception re) {
+ } catch (final Exception re) {
System.err.println("[EJB Server] FATAL ERROR: " + re.getMessage());
re.printStackTrace();
}
@@ -108,7 +108,7 @@ public class Stop {
try {
final Properties versionInfo = loadVersionProperties();
header += versionInfo.get("version");
- } catch (Exception e) {
+ } catch (final Exception e) {
//Ignore
}
@@ -126,13 +126,13 @@ public class Stop {
b = in.read();
}
}
- } catch (Exception e) {
+ } catch (final Exception e) {
//Ignore
} finally {
if (null != in) {
try {
in.close();
- } catch (Throwable e) {
+ } catch (final Throwable e) {
//Ignore
}
}
@@ -144,7 +144,7 @@ public class Stop {
try {
final Properties versionInfo = loadVersionProperties();
header += versionInfo.get("version");
- } catch (Exception e) {
+ } catch (final Exception e) {
//Ignore
}
@@ -161,13 +161,13 @@ public class Stop {
b = in.read();
}
}
- } catch (Exception e) {
+ } catch (final Exception e) {
//Ignore
} finally {
if (null != in) {
try {
in.close();
- } catch (Throwable e) {
+ } catch (final Throwable e) {
//Ignore
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPAddressPermission.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPAddressPermission.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPAddressPermission.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPAddressPermission.java Thu Jul 17 07:52:58 2014
@@ -28,27 +28,27 @@ import java.net.Inet4Address;
public class ExactIPAddressPermission implements IPAddressPermission {
private static final Pattern MASK_VALIDATOR = Pattern.compile("^(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})$");
- public static boolean canSupport(String mask) {
- Matcher matcher = MASK_VALIDATOR.matcher(mask);
+ public static boolean canSupport(final String mask) {
+ final Matcher matcher = MASK_VALIDATOR.matcher(mask);
return matcher.matches();
}
private final byte[] bytes;
- public ExactIPAddressPermission(byte[] bytes) {
+ public ExactIPAddressPermission(final byte[] bytes) {
this.bytes = bytes;
}
- public ExactIPAddressPermission(String mask) {
- Matcher matcher = MASK_VALIDATOR.matcher(mask);
+ public ExactIPAddressPermission(final String mask) {
+ final Matcher matcher = MASK_VALIDATOR.matcher(mask);
if (false == matcher.matches()) {
throw new IllegalArgumentException("Mask " + mask + " does not match pattern " + MASK_VALIDATOR.pattern());
}
bytes = new byte[4];
for (int i = 0; i < 4; i++) {
- String group = matcher.group(i + 1);
- int value = Integer.parseInt(group);
+ final String group = matcher.group(i + 1);
+ final int value = Integer.parseInt(group);
if (value < 0 || 255 < value) {
throw new IllegalArgumentException("byte #" + i + " is not valid.");
}
@@ -56,12 +56,12 @@ public class ExactIPAddressPermission im
}
}
- public boolean implies(InetAddress address) {
+ public boolean implies(final InetAddress address) {
if (false == address instanceof Inet4Address) {
return false;
}
- byte[] byteAddress = address.getAddress();
+ final byte[] byteAddress = address.getAddress();
for (int i = 0; i < 4; i++) {
if (byteAddress[i] != bytes[i]) {
return false;
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPv6AddressPermission.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPv6AddressPermission.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPv6AddressPermission.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPv6AddressPermission.java Thu Jul 17 07:52:58 2014
@@ -29,40 +29,40 @@ import java.net.Inet6Address;
public class ExactIPv6AddressPermission implements IPAddressPermission {
private static final Pattern MASK_VALIDATOR = Pattern.compile("^(([a-fA-F0-9]{1,4}:){7})([a-fA-F0-9]{1,4})$");
- public static boolean canSupport(String mask) {
- Matcher matcher = MASK_VALIDATOR.matcher(mask);
+ public static boolean canSupport(final String mask) {
+ final Matcher matcher = MASK_VALIDATOR.matcher(mask);
return matcher.matches();
}
private final byte[] bytes;
- public ExactIPv6AddressPermission(byte[] bytes) {
+ public ExactIPv6AddressPermission(final byte[] bytes) {
this.bytes = bytes;
}
- public ExactIPv6AddressPermission(String mask) {
- Matcher matcher = MASK_VALIDATOR.matcher(mask);
+ public ExactIPv6AddressPermission(final String mask) {
+ final Matcher matcher = MASK_VALIDATOR.matcher(mask);
if (false == matcher.matches()) {
throw new IllegalArgumentException("Mask " + mask + " does not match pattern " + MASK_VALIDATOR.pattern());
}
bytes = new byte[16];
int pos = 0;
- StringTokenizer tokenizer = new StringTokenizer(mask, ":");
+ final StringTokenizer tokenizer = new StringTokenizer(mask, ":");
while (tokenizer.hasMoreTokens()) {
- String token = tokenizer.nextToken();
- int value = Integer.parseInt(token, 16);
+ final String token = tokenizer.nextToken();
+ final int value = Integer.parseInt(token, 16);
bytes[pos++] = (byte) ((value & 0xff00) >> 8);
bytes[pos++] = (byte) value;
}
}
- public boolean implies(InetAddress address) {
+ public boolean implies(final InetAddress address) {
if (false == address instanceof Inet6Address) {
return false;
}
- byte[] byteAddress = address.getAddress();
+ final byte[] byteAddress = address.getAddress();
for (int i = 0; i < 16; i++) {
if (byteAddress[i] != bytes[i]) {
return false;
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/FactorizedIPAddressPermission.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/FactorizedIPAddressPermission.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/FactorizedIPAddressPermission.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/FactorizedIPAddressPermission.java Thu Jul 17 07:52:58 2014
@@ -29,28 +29,28 @@ import java.net.Inet4Address;
public class FactorizedIPAddressPermission implements IPAddressPermission {
private static final Pattern MASK_VALIDATOR = Pattern.compile("^((\\d{1,3}){1}(\\.\\d{1,3}){0,2}\\.)?\\{(\\d{1,3}){1}((,\\d{1,3})*)\\}$");
- public static boolean canSupport(String mask) {
- Matcher matcher = MASK_VALIDATOR.matcher(mask);
+ public static boolean canSupport(final String mask) {
+ final Matcher matcher = MASK_VALIDATOR.matcher(mask);
return matcher.matches();
}
private final byte[] prefixBytes;
private final byte[] suffixBytes;
- public FactorizedIPAddressPermission(String mask) {
- Matcher matcher = MASK_VALIDATOR.matcher(mask);
+ public FactorizedIPAddressPermission(final String mask) {
+ final Matcher matcher = MASK_VALIDATOR.matcher(mask);
if (false == matcher.matches()) {
throw new IllegalArgumentException("Mask " + mask + " does not match pattern " + MASK_VALIDATOR.pattern());
}
// group 1 is the factorized IP part.
// e.g. group 1 in "1.2.3.{4,5,6}" is "1.2.3."
- String prefix = matcher.group(1);
+ final String prefix = matcher.group(1);
StringTokenizer tokenizer = new StringTokenizer(prefix, ".");
prefixBytes = new byte[tokenizer.countTokens()];
for (int i = 0; i < prefixBytes.length; i++) {
- String token = tokenizer.nextToken();
- int value = Integer.parseInt(token);
+ final String token = tokenizer.nextToken();
+ final int value = Integer.parseInt(token);
if (value < 0 || 255 < value) {
throw new IllegalArgumentException("byte #" + i + " is not valid.");
}
@@ -59,7 +59,7 @@ public class FactorizedIPAddressPermissi
// group 5 is a comma separated list of optional suffixes.
// e.g. group 5 in "1.2.3.{4,5,6}" is ",5,6"
- String suffix = matcher.group(5);
+ final String suffix = matcher.group(5);
tokenizer = new StringTokenizer(suffix, ",");
suffixBytes = new byte[1 + tokenizer.countTokens()];
@@ -73,7 +73,7 @@ public class FactorizedIPAddressPermissi
suffixBytes[i++] = (byte) value;
for (; i < suffixBytes.length; i++) {
- String token = tokenizer.nextToken();
+ final String token = tokenizer.nextToken();
value = Integer.parseInt(token);
if (value < 0 || 255 < value) {
throw new IllegalArgumentException("byte #" + i + " is not valid.");
@@ -82,18 +82,18 @@ public class FactorizedIPAddressPermissi
}
}
- public boolean implies(InetAddress address) {
+ public boolean implies(final InetAddress address) {
if (false == address instanceof Inet4Address) {
return false;
}
- byte[] byteAddress = address.getAddress();
+ final byte[] byteAddress = address.getAddress();
for (int i = 0; i < prefixBytes.length; i++) {
if (byteAddress[i] != prefixBytes[i]) {
return false;
}
}
- byte lastByte = byteAddress[prefixBytes.length];
+ final byte lastByte = byteAddress[prefixBytes.length];
for (int i = 0; i < suffixBytes.length; i++) {
if (lastByte == suffixBytes[i]) {
return true;
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/IPAddressPermissionEditor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/IPAddressPermissionEditor.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/IPAddressPermissionEditor.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/IPAddressPermissionEditor.java Thu Jul 17 07:52:58 2014
@@ -25,7 +25,7 @@ import java.beans.PropertyEditorSupport;
public class IPAddressPermissionEditor extends PropertyEditorSupport {
private IPAddressPermission addressMask;
- public void setAsText(String text) throws IllegalArgumentException {
+ public void setAsText(final String text) throws IllegalArgumentException {
addressMask = IPAddressPermissionFactory.getIPAddressMask(text);
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/IPAddressPermissionFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/IPAddressPermissionFactory.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/IPAddressPermissionFactory.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/IPAddressPermissionFactory.java Thu Jul 17 07:52:58 2014
@@ -22,7 +22,7 @@ package org.apache.openejb.server.auth;
*/
public class IPAddressPermissionFactory {
- public static IPAddressPermission getIPAddressMask(String mask) {
+ public static IPAddressPermission getIPAddressMask(final String mask) {
if (StartWithIPAddressPermission.canSupport(mask)) {
return new StartWithIPAddressPermission(mask);
} else if (ExactIPAddressPermission.canSupport(mask)) {
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPAddressPermission.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPAddressPermission.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPAddressPermission.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPAddressPermission.java Thu Jul 17 07:52:58 2014
@@ -28,24 +28,24 @@ import java.net.Inet4Address;
public class NetmaskIPAddressPermission implements IPAddressPermission {
private static final Pattern MASK_VALIDATOR = Pattern.compile("^(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})/((\\d{1,2})|(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3}))$");
- public static boolean canSupport(String mask) {
- Matcher matcher = MASK_VALIDATOR.matcher(mask);
+ public static boolean canSupport(final String mask) {
+ final Matcher matcher = MASK_VALIDATOR.matcher(mask);
return matcher.matches();
}
private final byte[] networkAddressBytes;
private final byte[] netmaskBytes;
- public NetmaskIPAddressPermission(String mask) {
- Matcher matcher = MASK_VALIDATOR.matcher(mask);
+ public NetmaskIPAddressPermission(final String mask) {
+ final Matcher matcher = MASK_VALIDATOR.matcher(mask);
if (false == matcher.matches()) {
throw new IllegalArgumentException("Mask " + mask + " does not match pattern " + MASK_VALIDATOR.pattern());
}
networkAddressBytes = new byte[4];
for (int i = 0; i < 4; i++) {
- String group = matcher.group(i + 1);
- int value = Integer.parseInt(group);
+ final String group = matcher.group(i + 1);
+ final int value = Integer.parseInt(group);
if (value < 0 || 255 < value) {
throw new IllegalArgumentException("byte #" + i + " is not valid.");
}
@@ -53,19 +53,19 @@ public class NetmaskIPAddressPermission
}
netmaskBytes = new byte[4];
- String netmask = matcher.group(6);
+ final String netmask = matcher.group(6);
if (null != netmask) {
- int value = Integer.parseInt(netmask);
- int pos = value / 8;
- int shift = 8 - value % 8;
+ final int value = Integer.parseInt(netmask);
+ final int pos = value / 8;
+ final int shift = 8 - value % 8;
for (int i = 0; i < pos; i++) {
netmaskBytes[i] = (byte) 0xff;
}
netmaskBytes[pos] = (byte) (0xff << shift);
} else {
for (int i = 0; i < 4; i++) {
- String group = matcher.group(i + 7);
- int value = Integer.parseInt(group);
+ final String group = matcher.group(i + 7);
+ final int value = Integer.parseInt(group);
if (value < 0 || 255 < value) {
throw new IllegalArgumentException("byte #" + i + " is not valid.");
}
@@ -74,12 +74,12 @@ public class NetmaskIPAddressPermission
}
}
- public boolean implies(InetAddress address) {
+ public boolean implies(final InetAddress address) {
if (false == address instanceof Inet4Address) {
return false;
}
- byte[] byteAddress = address.getAddress();
+ final byte[] byteAddress = address.getAddress();
for (int i = 0; i < 4; i++) {
if ((netmaskBytes[i] & byteAddress[i]) != networkAddressBytes[i]) {
return false;
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPv6AddressPermission.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPv6AddressPermission.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPv6AddressPermission.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPv6AddressPermission.java Thu Jul 17 07:52:58 2014
@@ -29,16 +29,16 @@ import java.net.Inet6Address;
public class NetmaskIPv6AddressPermission implements IPAddressPermission {
private static final Pattern MASK_VALIDATOR = Pattern.compile("^(([a-fA-F0-9]{1,4}:){7}[a-fA-F0-9]{1,4})/((\\d{1,3})|(([a-fA-F0-9]{1,4}:){7}[a-fA-F0-9]{1,4}))$");
- public static boolean canSupport(String mask) {
- Matcher matcher = MASK_VALIDATOR.matcher(mask);
+ public static boolean canSupport(final String mask) {
+ final Matcher matcher = MASK_VALIDATOR.matcher(mask);
return matcher.matches();
}
private final byte[] networkAddressBytes;
private final byte[] netmaskBytes;
- public NetmaskIPv6AddressPermission(String mask) {
- Matcher matcher = MASK_VALIDATOR.matcher(mask);
+ public NetmaskIPv6AddressPermission(final String mask) {
+ final Matcher matcher = MASK_VALIDATOR.matcher(mask);
if (false == matcher.matches()) {
throw new IllegalArgumentException("Mask " + mask + " does not match pattern " + MASK_VALIDATOR.pattern());
}
@@ -47,18 +47,18 @@ public class NetmaskIPv6AddressPermissio
int pos = 0;
StringTokenizer tokenizer = new StringTokenizer(matcher.group(1), ":");
while (tokenizer.hasMoreTokens()) {
- String token = tokenizer.nextToken();
- int value = Integer.parseInt(token, 16);
+ final String token = tokenizer.nextToken();
+ final int value = Integer.parseInt(token, 16);
networkAddressBytes[pos++] = (byte) ((value & 0xff00) >> 8);
networkAddressBytes[pos++] = (byte) value;
}
netmaskBytes = new byte[16];
- String netmask = matcher.group(4);
+ final String netmask = matcher.group(4);
if (null != netmask) {
- int value = Integer.parseInt(netmask);
+ final int value = Integer.parseInt(netmask);
pos = value / 8;
- int shift = 8 - value % 8;
+ final int shift = 8 - value % 8;
for (int i = 0; i < pos; i++) {
netmaskBytes[i] = (byte) 0xff;
}
@@ -67,20 +67,20 @@ public class NetmaskIPv6AddressPermissio
pos = 0;
tokenizer = new StringTokenizer(matcher.group(5), ":");
while (tokenizer.hasMoreTokens()) {
- String token = tokenizer.nextToken();
- int value = Integer.parseInt(token, 16);
+ final String token = tokenizer.nextToken();
+ final int value = Integer.parseInt(token, 16);
netmaskBytes[pos++] = (byte) ((value & 0xff00) >> 8);
netmaskBytes[pos++] = (byte) value;
}
}
}
- public boolean implies(InetAddress address) {
+ public boolean implies(final InetAddress address) {
if (false == address instanceof Inet6Address) {
return false;
}
- byte[] byteAddress = address.getAddress();
+ final byte[] byteAddress = address.getAddress();
for (int i = 0; i < 16; i++) {
if ((netmaskBytes[i] & byteAddress[i]) != networkAddressBytes[i]) {
return false;
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/PermitAllPermission.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/PermitAllPermission.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/PermitAllPermission.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/PermitAllPermission.java Thu Jul 17 07:52:58 2014
@@ -22,7 +22,7 @@ import java.net.InetAddress;
* @version $Rev$ $Date$
*/
public class PermitAllPermission implements IPAddressPermission {
- public boolean implies(InetAddress address) {
+ public boolean implies(final InetAddress address) {
return true;
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/StartWithIPAddressPermission.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/StartWithIPAddressPermission.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/StartWithIPAddressPermission.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/auth/StartWithIPAddressPermission.java Thu Jul 17 07:52:58 2014
@@ -28,30 +28,30 @@ import java.net.Inet4Address;
public class StartWithIPAddressPermission implements IPAddressPermission {
private static final Pattern MASK_VALIDATOR = Pattern.compile("^(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.0$");
- public static boolean canSupport(String mask) {
- Matcher matcher = MASK_VALIDATOR.matcher(mask);
+ public static boolean canSupport(final String mask) {
+ final Matcher matcher = MASK_VALIDATOR.matcher(mask);
return matcher.matches();
}
private final byte[] bytes;
- public StartWithIPAddressPermission(String mask) {
- Matcher matcher = MASK_VALIDATOR.matcher(mask);
+ public StartWithIPAddressPermission(final String mask) {
+ final Matcher matcher = MASK_VALIDATOR.matcher(mask);
if (false == matcher.matches()) {
throw new IllegalArgumentException("Mask " + mask + " does not match pattern " + MASK_VALIDATOR.pattern());
}
- Byte[] tmpBytes = new Byte[4];
+ final Byte[] tmpBytes = new Byte[4];
boolean isWildCard = false;
int size = 0;
for (int i = 0; i < 3; i++) {
- String group = matcher.group(i + 1);
+ final String group = matcher.group(i + 1);
if (group.equals("0")) {
isWildCard = true;
} else if (isWildCard) {
throw new IllegalArgumentException("0 at position " + size + " in mask");
} else {
- int value = Integer.parseInt(group);
+ final int value = Integer.parseInt(group);
if (value < 0 || 255 < value) {
throw new IllegalArgumentException("byte #" + i + " is not valid.");
}
@@ -66,12 +66,12 @@ public class StartWithIPAddressPermissio
}
}
- public boolean implies(InetAddress address) {
+ public boolean implies(final InetAddress address) {
if (false == address instanceof Inet4Address) {
return false;
}
- byte[] byteAddress = address.getAddress();
+ final byte[] byteAddress = address.getAddress();
for (int i = 0; i < bytes.length; i++) {
if (byteAddress[i] != bytes[i]) {
return false;
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/context/RequestInfos.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/context/RequestInfos.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/context/RequestInfos.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/context/RequestInfos.java Thu Jul 17 07:52:58 2014
@@ -105,10 +105,10 @@ public final class RequestInfos {
@Override
public String toString() {
return "RequestInfo{"
- + "ip='" + ip + '\''
- + ", request-size=" + (inputStream != null ? inputStream.getCount() : "unknown")
- + ", response-size=" + (outputStream != null ? outputStream.getCount() : "unknown")
- + '}';
+ + "ip='" + ip + '\''
+ + ", request-size=" + (inputStream != null ? inputStream.getCount() : "unknown")
+ + ", response-size=" + (outputStream != null ? outputStream.getCount() : "unknown")
+ + '}';
}
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java Thu Jul 17 07:52:58 2014
@@ -28,13 +28,13 @@ public class Activator implements Bundle
private ServiceManagerExtender manager;
private ServiceRegistration registration;
-
- public void start(BundleContext bundleContext) throws Exception {
+
+ public void start(final BundleContext bundleContext) throws Exception {
manager = new ServiceManagerExtender(bundleContext);
registration = bundleContext.registerService(ServiceManager.class.getName(), manager, null);
}
- public void stop(BundleContext bundleContext) throws Exception {
+ public void stop(final BundleContext bundleContext) throws Exception {
if (manager != null) {
manager.shutdown();
}
@@ -42,5 +42,5 @@ public class Activator implements Bundle
registration.unregister();
}
}
-
+
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/ServiceManagerExtender.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/ServiceManagerExtender.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/ServiceManagerExtender.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/ServiceManagerExtender.java Thu Jul 17 07:52:58 2014
@@ -158,21 +158,21 @@ public class ServiceManagerExtender exte
public void start() {
try {
server = initServer(name, description);
- } catch (IOException e) {
+ } catch (final IOException e) {
logger.error("Error initializing " + name + " service.", e);
}
if (server != null) {
try {
server.start();
- } catch (Exception e) {
+ } catch (final Exception e) {
logger.error("Service Start Failed: " + name + " " + server.getIP() + " " + server.getPort() + ". Exception: " + e.getMessage(), e);
}
final BundleContext context = bundle.getBundleContext();
registration = context.registerService(ServerService.class.getName(),
- server,
- getServiceProperties());
+ server,
+ getServiceProperties());
}
}
@@ -191,14 +191,14 @@ public class ServiceManagerExtender exte
if (server != null) {
try {
server.stop();
- } catch (Exception e) {
+ } catch (final Exception e) {
logger.warning("Service Shutdown Failed: " + name + ". Exception: " + e.getMessage(), e);
}
}
if (registration != null) {
try {
registration.unregister();
- } catch (IllegalStateException ignore) {
+ } catch (final IllegalStateException ignore) {
}
}
}
@@ -234,7 +234,7 @@ public class ServiceManagerExtender exte
setClass(props, bundle, ServerService.class);
setRawProperties(props, entry);
resources.put(name, props);
- } catch (Exception e) {
+ } catch (final Exception e) {
logger.error("Error loading " + name + " properties", e);
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingInputStream.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingInputStream.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingInputStream.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingInputStream.java Thu Jul 17 07:52:58 2014
@@ -49,7 +49,7 @@ public class CountingInputStream extends
}
@Override
- public void mark(int readlimit) {
+ public void mark(final int readlimit) {
delegate.mark(readlimit);
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerDefaultsTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerDefaultsTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerDefaultsTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerDefaultsTest.java Thu Jul 17 07:52:58 2014
@@ -40,12 +40,12 @@ public class FilteredServiceManagerDefau
}
@Test
- public void numberOfServices () {
+ public void numberOfServices() {
// when using @EnableServices with the application composer
// the return value should be a FilteredServiceManager
assertEquals(FilteredServiceManager.class, ServiceManager.get().getClass());
- FilteredServiceManager manager = (FilteredServiceManager) ServiceManager.get();
+ final FilteredServiceManager manager = (FilteredServiceManager) ServiceManager.get();
assertEquals(1, manager.getDaemons().length);
assertEquals("admin", manager.getDaemons()[0].getName());
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/test/java/org/apache/openejb/server/FilteredServiceManagerTest.java Thu Jul 17 07:52:58 2014
@@ -23,27 +23,27 @@ import static org.junit.Assert.assertTru
public class FilteredServiceManagerTest {
@Test
public void checkJaxRs() {
- final FilteredServiceManager fsm = new FilteredServiceManager(new String[] { "jaxrs" });
+ final FilteredServiceManager fsm = new FilteredServiceManager(new String[]{"jaxrs"});
assertTrue(fsm.accept("httpejbd"));
assertTrue(fsm.accept("cxf-rs"));
}
@Test
public void checkJaxWs() {
- final FilteredServiceManager fsm = new FilteredServiceManager(new String[] { "jaxws" });
+ final FilteredServiceManager fsm = new FilteredServiceManager(new String[]{"jaxws"});
assertTrue(fsm.accept("httpejbd"));
assertTrue(fsm.accept("cxf"));
}
@Test
public void checkEjbd() {
- final FilteredServiceManager fsm = new FilteredServiceManager(new String[] { "http" });
+ final FilteredServiceManager fsm = new FilteredServiceManager(new String[]{"http"});
assertTrue(fsm.accept("httpejbd"));
}
@Test
public void checkDefault() {
- final FilteredServiceManager fsm = new FilteredServiceManager(new String[] { "foo" });
+ final FilteredServiceManager fsm = new FilteredServiceManager(new String[]{"foo"});
assertTrue(fsm.accept("foo"));
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/test/java/org/apache/openejb/server/ServiceAccessControllerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/test/java/org/apache/openejb/server/ServiceAccessControllerTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/test/java/org/apache/openejb/server/ServiceAccessControllerTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-server/src/test/java/org/apache/openejb/server/ServiceAccessControllerTest.java Thu Jul 17 07:52:58 2014
@@ -33,7 +33,7 @@ public class ServiceAccessControllerTest
try {
IPAddressPermissionFactory.getIPAddressMask("121.122.123.a");
fail();
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
}
}
@@ -41,7 +41,7 @@ public class ServiceAccessControllerTest
try {
IPAddressPermissionFactory.getIPAddressMask("121.122.123.256");
fail();
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
}
}
@@ -55,7 +55,7 @@ public class ServiceAccessControllerTest
try {
IPAddressPermissionFactory.getIPAddressMask("121.0.123.0");
fail();
- } catch (IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
}
}
@@ -146,7 +146,7 @@ public class ServiceAccessControllerTest
try {
controller.service(mockSocket);
fail();
- } catch (SecurityException e) {
+ } catch (final SecurityException e) {
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBCommands.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBCommands.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBCommands.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBCommands.java Thu Jul 17 07:52:58 2014
@@ -35,22 +35,22 @@ public class OpenEJBCommands extends Cli
private ExitCallback cbk;
private LoginContext loginContext;
- public OpenEJBCommands(String bind, int port) {
+ public OpenEJBCommands(final String bind, final int port) {
super(bind, port, null, "\r\n");
}
@Override
- public void setInputStream(InputStream in) {
+ public void setInputStream(final InputStream in) {
super.setInputStream(in);
}
@Override
- public void setOutputStream(OutputStream out) {
+ public void setOutputStream(final OutputStream out) {
super.setOutputStream(out);
}
@Override
- public void setErrorStream(OutputStream err) {
+ public void setErrorStream(final OutputStream err) {
super.setErrorStream(err);
}
@@ -60,12 +60,12 @@ public class OpenEJBCommands extends Cli
}
@Override
- public void setExitCallback(ExitCallback callback) {
+ public void setExitCallback(final ExitCallback callback) {
cbk = callback;
}
@Override
- public void start(Environment env) throws IOException {
+ public void start(final Environment env) throws IOException {
start();
}
@@ -85,7 +85,7 @@ public class OpenEJBCommands extends Cli
} finally {
try {
loginContext.logout();
- } catch (LoginException e) {
+ } catch (final LoginException e) {
// ignored
}
cbk.onExit(0);
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBJaasPasswordAuthenticator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBJaasPasswordAuthenticator.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBJaasPasswordAuthenticator.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBJaasPasswordAuthenticator.java Thu Jul 17 07:52:58 2014
@@ -42,7 +42,7 @@ public class OpenEJBJaasPasswordAuthenti
try {
final Subject subject = new Subject();
final LoginContext loginContext = new LoginContext(getDomain(), subject, new CallbackHandler() {
- public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+ public void handle(final Callback[] callbacks) throws IOException, UnsupportedCallbackException {
for (final Callback callback : callbacks) {
if (callback instanceof NameCallback) {
((NameCallback) callback).setName(username);
@@ -59,7 +59,7 @@ public class OpenEJBJaasPasswordAuthenti
session.setAttribute(USERNAME_KEY, username);
session.setAttribute(LOGIN_CONTEXT_KEY, loginContext);
return true;
- } catch (Exception e) {
+ } catch (final Exception e) {
LOGGER.debug("can't log using username '" + username + "'", e);
return false;
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBShellFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBShellFactory.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBShellFactory.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/OpenEJBShellFactory.java Thu Jul 17 07:52:58 2014
@@ -23,7 +23,7 @@ public class OpenEJBShellFactory impleme
private String bind;
private int port;
- public OpenEJBShellFactory(String bind, int port) {
+ public OpenEJBShellFactory(final String bind, final int port) {
this.bind = bind;
this.port = port;
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/SSHServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/SSHServer.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/SSHServer.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/SSHServer.java Thu Jul 17 07:52:58 2014
@@ -63,7 +63,7 @@ public class SSHServer implements Server
try {
sshServer.start();
- } catch (IOException e) {
+ } catch (final IOException e) {
// no-op
}
}
@@ -72,18 +72,18 @@ public class SSHServer implements Server
public void stop() throws ServiceException {
try {
sshServer.stop();
- } catch (Exception e) {
+ } catch (final Exception e) {
// no-op
}
}
@Override
- public void service(InputStream in, OutputStream out) throws ServiceException, IOException {
+ public void service(final InputStream in, final OutputStream out) throws ServiceException, IOException {
// no-op
}
@Override
- public void service(Socket socket) throws ServiceException, IOException {
+ public void service(final Socket socket) throws ServiceException, IOException {
// no-op
}
@@ -103,21 +103,21 @@ public class SSHServer implements Server
}
@Override
- public void init(Properties props) throws Exception {
+ public void init(final Properties props) throws Exception {
bind = props.getProperty("bind");
domain = props.getProperty("domain");
port = Integer.parseInt(props.getProperty("port"));
}
- public void setPort(int port) {
+ public void setPort(final int port) {
this.port = port;
}
- public void setDomain(String domain) {
+ public void setDomain(final String domain) {
this.domain = domain;
}
- public void setBind(String bind) {
+ public void setBind(final String bind) {
this.bind = bind;
}
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-ssh/src/test/java/org/apache/openejb/server/ssh/SSHServerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-ssh/src/test/java/org/apache/openejb/server/ssh/SSHServerTest.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-ssh/src/test/java/org/apache/openejb/server/ssh/SSHServerTest.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-ssh/src/test/java/org/apache/openejb/server/ssh/SSHServerTest.java Thu Jul 17 07:52:58 2014
@@ -66,11 +66,11 @@ public class SSHServerTest {
session.authPassword("jonathan", "secret");
final ClientChannel channel = session.createChannel("shell");
- ByteArrayOutputStream sent = new ByteArrayOutputStream();
- PipedOutputStream pipedIn = new TeePipedOutputStream(sent);
+ final ByteArrayOutputStream sent = new ByteArrayOutputStream();
+ final PipedOutputStream pipedIn = new TeePipedOutputStream(sent);
channel.setIn(new PipedInputStream(pipedIn));
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- ByteArrayOutputStream err = new ByteArrayOutputStream();
+ final ByteArrayOutputStream out = new ByteArrayOutputStream();
+ final ByteArrayOutputStream err = new ByteArrayOutputStream();
channel.setOut(out);
channel.setErr(err);
channel.open();
@@ -87,7 +87,7 @@ public class SSHServerTest {
assertTrue(new String(sent.toByteArray()).contains("properties\r\nexit\r\n"));
assertTrue(new String(out.toByteArray()).contains("ServerService(id=ssh)"));
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
fail();
}
@@ -96,18 +96,18 @@ public class SSHServerTest {
public static class TeePipedOutputStream extends PipedOutputStream {
private OutputStream tee;
- public TeePipedOutputStream(OutputStream tee) {
+ public TeePipedOutputStream(final OutputStream tee) {
this.tee = tee;
}
@Override
- public void write(int b) throws IOException {
+ public void write(final int b) throws IOException {
super.write(b);
tee.write(b);
}
@Override
- public void write(byte[] b, int off, int len) throws IOException {
+ public void write(final byte[] b, final int off, final int len) throws IOException {
super.write(b, off, len);
tee.write(b, off, len);
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-webservices/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-webservices/pom.xml?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-webservices/pom.xml (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-webservices/pom.xml Thu Jul 17 07:52:58 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>server</artifactId>
<groupId>org.apache.openejb</groupId>
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/LightWeightMappingValidator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/LightWeightMappingValidator.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/LightWeightMappingValidator.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/LightWeightMappingValidator.java Thu Jul 17 07:52:58 2014
@@ -44,7 +44,7 @@ public class LightWeightMappingValidator
private ValidationContext context;
private Class<? extends DeploymentModule> moduleType;
- public LightWeightMappingValidator(Definition definition, Class<? extends DeploymentModule> moduleType) {
+ public LightWeightMappingValidator(final Definition definition, final Class<? extends DeploymentModule> moduleType) {
super(definition);
this.moduleType = moduleType;
}
@@ -58,7 +58,7 @@ public class LightWeightMappingValidator
}
public boolean isValid() {
- ValidationContext context = validate();
+ final ValidationContext context = validate();
return !context.hasFailures() && !context.hasErrors();
}
@@ -66,28 +66,28 @@ public class LightWeightMappingValidator
operationNames = new ArrayList<String>();
}
- protected void visit(Definition definition) {
+ protected void visit(final Definition definition) {
if (definition.getServices().values().size() != 1) {
context.addFailure(new ValidationFailure("A lightweight RPC/Encoded service must contain only one Service"));
}
}
- protected void visit(Output output) {
- Map outputParts = output.getMessage().getParts();
+ protected void visit(final Output output) {
+ final Map outputParts = output.getMessage().getParts();
if (outputParts.size() != 0 && outputParts.size() != 1) {
context.addFailure(new ValidationFailure("The output message must contain zero or one parts: " + output.getName()));
}
}
- protected void visit(Operation operation) {
+ protected void visit(final Operation operation) {
if (!operationNames.add(operation.getName())) {
context.addFailure(new ValidationFailure("No two operations can have the same name: " + operation.getName()));
}
}
- protected void visit(Fault fault) {
- Part message = fault.getMessage().getPart("message");
+ protected void visit(final Fault fault) {
+ final Part message = fault.getMessage().getPart("message");
if (message == null) {
context.addFailure(new ValidationFailure("The fault message must contain one part named 'message' : " + fault.getName()));
} else if (!XSD_STRING.equals(message.getTypeName())) {
@@ -96,38 +96,38 @@ public class LightWeightMappingValidator
}
- protected void visit(BindingInput bindingInput) {
- SOAPBody body = getSOAPBody(bindingInput.getExtensibilityElements());
- String encoding = body.getUse();
+ protected void visit(final BindingInput bindingInput) {
+ final SOAPBody body = getSOAPBody(bindingInput.getExtensibilityElements());
+ final String encoding = body.getUse();
if (encoding == null || !encoding.equals("encoded")) {
context.addFailure(new ValidationFailure("The use attribute of the binding input operation must be 'encoded': " + bindingInput.getName()));
}
}
- protected void visit(BindingOutput bindingOutput) {
- SOAPBody body = getSOAPBody(bindingOutput.getExtensibilityElements());
- String encoding = body.getUse();
+ protected void visit(final BindingOutput bindingOutput) {
+ final SOAPBody body = getSOAPBody(bindingOutput.getExtensibilityElements());
+ final String encoding = body.getUse();
if (encoding == null || !encoding.equals("encoded")) {
context.addFailure(new ValidationFailure("The use attribute of the binding output operation must be 'encoded': " + bindingOutput.getName()));
}
}
- protected void visit(BindingFault bindingFault) {
- SOAPBody body = getSOAPBody(bindingFault.getExtensibilityElements());
- String encoding = body.getUse();
+ protected void visit(final BindingFault bindingFault) {
+ final SOAPBody body = getSOAPBody(bindingFault.getExtensibilityElements());
+ final String encoding = body.getUse();
if (encoding == null || !encoding.equals("encoded")) {
context.addFailure(new ValidationFailure("The use attribute of the binding fault operation must be 'encoded': " + bindingFault.getName()));
}
}
- protected void visit(Binding binding) {
- SOAPBinding soapBinding = getSOAPBinding(binding);
+ protected void visit(final Binding binding) {
+ final SOAPBinding soapBinding = getSOAPBinding(binding);
if (soapBinding == null || soapBinding.getStyle() == null || !soapBinding.getStyle().equals("rpc")) {
context.addFailure(new ValidationFailure("The messaging style of the binding must be rpc: " + binding.getQName()));
}
}
- protected void visit(Service service) {
+ protected void visit(final Service service) {
if (service.getPorts().values().size() != 1) {
context.addFailure(new ValidationFailure("A lightweight RPC/Encoded service must contain only one Port"));
}
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsRegistry.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsRegistry.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsRegistry.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsRegistry.java Thu Jul 17 07:52:58 2014
@@ -23,9 +23,9 @@ import java.util.List;
public interface WsRegistry {
List<String> setWsContainer(HttpListener httpListener,
- ClassLoader classLoader,
- String context, String virtualHost, ServletInfo servletInfo,
- String realmName, String transportGuarantee, String authMethod) throws Exception;
+ ClassLoader classLoader,
+ String context, String virtualHost, ServletInfo servletInfo,
+ String realmName, String transportGuarantee, String authMethod) throws Exception;
void clearWsContainer(String context, String virtualHost, ServletInfo servletInfo);
Modified: tomee/tomee/branches/tomee-1.7.x/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java?rev=1611274&r1=1611273&r2=1611274&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java Thu Jul 17 07:52:58 2014
@@ -391,8 +391,8 @@ public abstract class WsService implemen
pojoConfiguration = PojoUtil.findPojoConfig(pojoConfiguration, appInfo, webApp);
final HttpListener container = createPojoWsContainer(classLoader, moduleBaseUrl, port, portInfo.serviceLink,
- target, context, webApp.contextRoot, bindings,
- new ServiceConfiguration(PojoUtil.findConfiguration(pojoConfiguration, target.getName()), appInfo.services));
+ target, context, webApp.contextRoot, bindings,
+ new ServiceConfiguration(PojoUtil.findConfiguration(pojoConfiguration, target.getName()), appInfo.services));
if (wsRegistry != null) {
String auth = authMethod;