You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2013/11/19 03:12:29 UTC
svn commit: r1543287 [5/9] - in
/tomee/tomee/trunk/container/openejb-core/src:
main/java/javax/xml/ws/wsaddressing/ main/java/org/apache/openejb/
main/java/org/apache/openejb/assembler/
main/java/org/apache/openejb/assembler/classic/ main/java/org/apac...
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/SimpleCache.java Tue Nov 19 02:12:21 2013
@@ -16,6 +16,11 @@
*/
package org.apache.openejb.core.stateful;
+import org.apache.openejb.OpenEJBRuntimeException;
+import org.apache.openejb.util.Duration;
+import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.util.Logger;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -31,11 +36,6 @@ import java.util.concurrent.ThreadFactor
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
-import org.apache.openejb.OpenEJBRuntimeException;
-import org.apache.openejb.util.LogCategory;
-import org.apache.openejb.util.Logger;
-import org.apache.openejb.util.Duration;
-
public class SimpleCache<K, V> implements Cache<K, V> {
public static final Logger logger = Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources");
@@ -577,7 +577,7 @@ public class SimpleCache<K, V> implement
if (value instanceof Cache.TimeOut) {
Duration duration = ((Cache.TimeOut) value).getTimeOut();
- this.timeOut = (duration != null) ? duration.getTime(TimeUnit.MILLISECONDS) : getTimeOut();
+ this.timeOut = duration != null ? duration.getTime(TimeUnit.MILLISECONDS) : getTimeOut();
} else {
this.timeOut = getTimeOut();
}
@@ -614,7 +614,7 @@ public class SimpleCache<K, V> implement
return true;
} else {
long now = System.currentTimeMillis();
- return (now - lastAccess) > timeOut;
+ return now - lastAccess > timeOut;
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainer.java Tue Nov 19 02:12:21 2013
@@ -355,7 +355,7 @@ public class StatefulContainer implement
final Data data = (Data) beanContext.getContainerData();
MethodType methodType = data.getMethodIndex().get(callMethod);
- methodType = (methodType != null) ? methodType : MethodType.BUSINESS;
+ methodType = methodType != null ? methodType : MethodType.BUSINESS;
switch (methodType) {
case CREATE:
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainerFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainerFactory.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainerFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulContainerFactory.java Tue Nov 19 02:12:21 2013
@@ -16,15 +16,15 @@
*/
package org.apache.openejb.core.stateful;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-import java.util.Map.Entry;
-
import org.apache.openejb.spi.SecurityService;
import org.apache.openejb.util.Duration;
import org.apache.xbean.recipe.ObjectRecipe;
import org.apache.xbean.recipe.Option;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
public class StatefulContainerFactory {
private Object id;
private SecurityService securityService;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbHomeHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbHomeHandler.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbHomeHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbHomeHandler.java Tue Nov 19 02:12:21 2013
@@ -16,19 +16,17 @@
*/
package org.apache.openejb.core.stateful;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.List;
-
-import javax.ejb.RemoveException;
-
-import org.apache.openejb.InterfaceType;
import org.apache.openejb.BeanContext;
-import org.apache.openejb.cdi.CdiEjbBean;
+import org.apache.openejb.InterfaceType;
import org.apache.openejb.core.ivm.EjbHomeProxyHandler;
import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
import org.apache.openejb.util.proxy.ProxyManager;
+import javax.ejb.RemoveException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.List;
+
public class StatefulEjbHomeHandler extends EjbHomeProxyHandler {
public StatefulEjbHomeHandler(BeanContext beanContext, InterfaceType interfaceType, List<Class> interfaces, Class mainInterface) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbObjectHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbObjectHandler.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbObjectHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulEjbObjectHandler.java Tue Nov 19 02:12:21 2013
@@ -17,15 +17,15 @@
package org.apache.openejb.core.stateful;
import org.apache.openejb.BeanContext;
-import org.apache.openejb.InterfaceType;
import org.apache.openejb.Container;
+import org.apache.openejb.InterfaceType;
import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
import org.apache.openejb.util.proxy.ProxyManager;
+import java.io.Serializable;
import java.lang.reflect.Method;
import java.rmi.RemoteException;
import java.util.List;
-import java.io.Serializable;
public class StatefulEjbObjectHandler extends EjbObjectProxyHandler {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulUserTransaction.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulUserTransaction.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulUserTransaction.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateful/StatefulUserTransaction.java Tue Nov 19 02:12:21 2013
@@ -16,17 +16,17 @@
*/
package org.apache.openejb.core.stateful;
-import javax.transaction.UserTransaction;
-import javax.transaction.NotSupportedException;
-import javax.transaction.SystemException;
+import org.apache.openejb.BeanContext;
+import org.apache.openejb.BeanType;
+import org.apache.openejb.core.ThreadContext;
+import org.apache.openejb.persistence.JtaEntityManagerRegistry;
+
import javax.transaction.HeuristicMixedException;
import javax.transaction.HeuristicRollbackException;
+import javax.transaction.NotSupportedException;
import javax.transaction.RollbackException;
-
-import org.apache.openejb.persistence.JtaEntityManagerRegistry;
-import org.apache.openejb.core.ThreadContext;
-import org.apache.openejb.BeanContext;
-import org.apache.openejb.BeanType;
+import javax.transaction.SystemException;
+import javax.transaction.UserTransaction;
public class StatefulUserTransaction implements UserTransaction {
private final UserTransaction userTransaction;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EjbWsContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EjbWsContext.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EjbWsContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/EjbWsContext.java Tue Nov 19 02:12:21 2013
@@ -16,16 +16,15 @@
*/
package org.apache.openejb.core.stateless;
-import java.security.Principal;
+import org.apache.openejb.core.ThreadContext;
+import org.apache.openejb.core.webservices.AddressingSupport;
+import org.w3c.dom.Element;
import javax.ejb.SessionContext;
-import javax.xml.ws.WebServiceContext;
import javax.xml.ws.EndpointReference;
+import javax.xml.ws.WebServiceContext;
import javax.xml.ws.handler.MessageContext;
-
-import org.apache.openejb.core.ThreadContext;
-import org.apache.openejb.core.webservices.AddressingSupport;
-import org.w3c.dom.Element;
+import java.security.Principal;
public class EjbWsContext implements WebServiceContext {
private SessionContext context;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessContainer.java Tue Nov 19 02:12:21 2013
@@ -153,7 +153,7 @@ public class StatelessContainer implemen
Instance bean = null;
CurrentCreationalContext currentCreationalContext = beanContext.get(CurrentCreationalContext.class);
try {
- final boolean authorized = (type == InterfaceType.TIMEOUT || this.securityService.isCallerAuthorized(callMethod, type));
+ final boolean authorized = type == InterfaceType.TIMEOUT || this.securityService.isCallerAuthorized(callMethod, type);
if (!authorized) {
throw new org.apache.openejb.ApplicationException(new javax.ejb.EJBAccessException("Unauthorized Access by Principal Denied"));
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbHomeHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbHomeHandler.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbHomeHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessEjbHomeHandler.java Tue Nov 19 02:12:21 2013
@@ -16,16 +16,15 @@
*/
package org.apache.openejb.core.stateless;
-import java.lang.reflect.Method;
-import java.util.List;
-
-import javax.ejb.RemoveException;
-
-import org.apache.openejb.InterfaceType;
import org.apache.openejb.BeanContext;
+import org.apache.openejb.InterfaceType;
import org.apache.openejb.core.ivm.EjbHomeProxyHandler;
import org.apache.openejb.core.ivm.EjbObjectProxyHandler;
+import javax.ejb.RemoveException;
+import java.lang.reflect.Method;
+import java.util.List;
+
public class StatelessEjbHomeHandler extends EjbHomeProxyHandler {
public StatelessEjbHomeHandler(BeanContext beanContext, InterfaceType interfaceType, List<Class> interfaces, Class mainInterface) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/stateless/StatelessInstanceManager.java Tue Nov 19 02:12:21 2013
@@ -98,7 +98,7 @@ public class StatelessInstanceManager {
accessTimeout.setUnit(TimeUnit.MILLISECONDS);
}
- final int qsize = (callbackThreads > 1 ? callbackThreads - 1 : 1);
+ final int qsize = callbackThreads > 1 ? callbackThreads - 1 : 1;
final ThreadFactory threadFactory = new DaemonThreadFactory("StatelessPool.worker.");
this.executor = new ThreadPoolExecutor(
callbackThreads, callbackThreads * 2,
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/DefaultTimerThreadPoolAdapter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/DefaultTimerThreadPoolAdapter.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/DefaultTimerThreadPoolAdapter.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/DefaultTimerThreadPoolAdapter.java Tue Nov 19 02:12:21 2013
@@ -74,7 +74,7 @@ public class DefaultTimerThreadPoolAdapt
SystemInstance.get().setComponent(TimerExecutor.class, new TimerExecutor(this.executor));
}
- this.threadPoolExecutorUsed = (this.executor instanceof ThreadPoolExecutor);
+ this.threadPoolExecutorUsed = this.executor instanceof ThreadPoolExecutor;
if (!this.threadPoolExecutorUsed) {
logger.warning("Unrecognized ThreadPool implementation [" + this.executor.getClass().getName() + "] is used, EJB Timer service may not work correctly");
@@ -101,7 +101,7 @@ public class DefaultTimerThreadPoolAdapt
if (this.threadPoolExecutorUsed) {
final ThreadPoolExecutor threadPoolExecutor = (ThreadPoolExecutor) this.executor;
synchronized (this.threadAvailableLock) {
- while ((threadPoolExecutor.getMaximumPoolSize() - threadPoolExecutor.getActiveCount()) < 1 && !threadPoolExecutor.isShutdown()) {
+ while (threadPoolExecutor.getMaximumPoolSize() - threadPoolExecutor.getActiveCount() < 1 && !threadPoolExecutor.isShutdown()) {
try {
this.threadAvailableLock.wait(500L);
} catch (InterruptedException ignore) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java Tue Nov 19 02:12:21 2013
@@ -780,7 +780,7 @@ public class EJBCronTrigger extends Cron
*/
if (field == Calendar.DAY_OF_WEEK) {
- if ((beginValue == 8 && endValue == 1)||(endValue == 8 && beginValue == 1)) {
+ if (beginValue == 8 && endValue == 1 || endValue == 8 && beginValue == 1) {
beginValue = 1;
endValue = 7;
} else {
@@ -1123,16 +1123,16 @@ public class EJBCronTrigger extends Cron
// Calculate the first day in the month whose weekday is the same as the
// one we're looking for
- int firstWeekday = (currDay % 7) - (currWeekday - weekday);
+ int firstWeekday = currDay % 7 - (currWeekday - weekday);
- firstWeekday = (firstWeekday == 0) ? 7 : firstWeekday;
+ firstWeekday = firstWeekday == 0 ? 7 : firstWeekday;
// Then calculate how many such weekdays there is in this month
int numWeekdays = firstWeekday>=0?(maxDay - firstWeekday) / 7 +1:(maxDay - firstWeekday) / 7;
// Then calculate the Nth of those days, or the last one if ordinal is null
int multiplier = ordinal != null ? ordinal : numWeekdays;
- int nthDay = firstWeekday>=0?(firstWeekday + (multiplier-1) * 7):(firstWeekday + multiplier * 7);
+ int nthDay = firstWeekday>=0? firstWeekday + (multiplier-1) * 7 : firstWeekday + multiplier * 7;
// Return the calculated day, or null if the day is out of range
return nthDay <= maxDay ? nthDay : null;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java Tue Nov 19 02:12:21 2013
@@ -325,7 +325,7 @@ public class EjbTimerServiceImpl impleme
boolean defaultScheduler = false;
final Scheduler ds = SystemInstance.get().getComponent(Scheduler.class);
try { // == is the faster way to test, we rely on name (key in quartz registry) only for serialization
- defaultScheduler = (ds == scheduler || scheduler.getSchedulerName().equals(ds.getSchedulerName()));
+ defaultScheduler = ds == scheduler || scheduler.getSchedulerName().equals(ds.getSchedulerName());
} catch (Exception e) {
// no-op: default should be fine
}
@@ -742,7 +742,7 @@ public class EjbTimerServiceImpl impleme
}
// return;
}
- for (int tries = 0; tries < (1 + retryAttempts); tries++) {
+ for (int tries = 0; tries < 1 + retryAttempts; tries++) {
boolean retry = false;
// if transacted, begin the transaction
if (transacted) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerImpl.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerImpl.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerImpl.java Tue Nov 19 02:12:21 2013
@@ -16,8 +16,9 @@
*/
package org.apache.openejb.core.timer;
-import java.io.Serializable;
-import java.util.Date;
+import org.apache.openejb.BeanContext;
+import org.apache.openejb.core.BaseContext;
+import org.apache.openejb.core.ThreadContext;
import javax.ejb.EJBContext;
import javax.ejb.EJBException;
@@ -26,10 +27,8 @@ import javax.ejb.NoSuchObjectLocalExcept
import javax.ejb.ScheduleExpression;
import javax.ejb.Timer;
import javax.ejb.TimerHandle;
-
-import org.apache.openejb.BeanContext;
-import org.apache.openejb.core.BaseContext;
-import org.apache.openejb.core.ThreadContext;
+import java.io.Serializable;
+import java.util.Date;
public class TimerImpl implements Timer, Serializable {
private final TimerData timerData;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerServiceImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerServiceImpl.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerServiceImpl.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerServiceImpl.java Tue Nov 19 02:12:21 2013
@@ -16,16 +16,15 @@
*/
package org.apache.openejb.core.timer;
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.Date;
-
import javax.ejb.EJBException;
import javax.ejb.ScheduleExpression;
import javax.ejb.Timer;
import javax.ejb.TimerConfig;
import javax.ejb.TimerService;
+import java.io.Serializable;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.Date;
public class TimerServiceImpl implements TimerService {
private final EjbTimerService ejbTimerService;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/BeanTransactionPolicy.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/BeanTransactionPolicy.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/BeanTransactionPolicy.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/BeanTransactionPolicy.java Tue Nov 19 02:12:21 2013
@@ -16,10 +16,10 @@
*/
package org.apache.openejb.core.transaction;
-import javax.transaction.UserTransaction;
-
import org.apache.openejb.SystemException;
+import javax.transaction.UserTransaction;
+
/**
* BeanTransactionPolicy is an extension to the TransactionPolicy which provides
* operations for controlling a JEE bean managed transaction.
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/EjbUserTransaction.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/EjbUserTransaction.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/EjbUserTransaction.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/EjbUserTransaction.java Tue Nov 19 02:12:21 2013
@@ -16,15 +16,15 @@
*/
package org.apache.openejb.core.transaction;
-import java.io.Serializable;
+import org.apache.openejb.core.ThreadContext;
+
import javax.transaction.HeuristicMixedException;
import javax.transaction.HeuristicRollbackException;
import javax.transaction.NotSupportedException;
import javax.transaction.RollbackException;
import javax.transaction.SystemException;
import javax.transaction.UserTransaction;
-
-import org.apache.openejb.core.ThreadContext;
+import java.io.Serializable;
public class EjbUserTransaction implements UserTransaction, Serializable {
private static final long serialVersionUID = 8369364873055306924L;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/JtaTransactionPolicyFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/JtaTransactionPolicyFactory.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/JtaTransactionPolicyFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/JtaTransactionPolicyFactory.java Tue Nov 19 02:12:21 2013
@@ -16,11 +16,11 @@
*/
package org.apache.openejb.core.transaction;
-import javax.transaction.TransactionManager;
-
import org.apache.openejb.ApplicationException;
import org.apache.openejb.SystemException;
+import javax.transaction.TransactionManager;
+
public class JtaTransactionPolicyFactory implements TransactionPolicyFactory {
private final TransactionManager transactionManager;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/SimpleBootstrapContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/SimpleBootstrapContext.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/SimpleBootstrapContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/SimpleBootstrapContext.java Tue Nov 19 02:12:21 2013
@@ -16,15 +16,14 @@
*/
package org.apache.openejb.core.transaction;
-import java.util.Timer;
+import org.apache.geronimo.connector.work.GeronimoWorkManager;
import javax.resource.spi.BootstrapContext;
import javax.resource.spi.XATerminator;
import javax.resource.spi.work.WorkContext;
import javax.resource.spi.work.WorkManager;
import javax.transaction.TransactionSynchronizationRegistry;
-
-import org.apache.geronimo.connector.work.GeronimoWorkManager;
+import java.util.Timer;
public class SimpleBootstrapContext implements BootstrapContext {
private final WorkManager workManager;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/SimpleWorkManager.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/SimpleWorkManager.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/SimpleWorkManager.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/SimpleWorkManager.java Tue Nov 19 02:12:21 2013
@@ -16,29 +16,30 @@
*/
package org.apache.openejb.core.transaction;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Executor;
+import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.util.Logger;
+
import javax.resource.spi.work.ExecutionContext;
import javax.resource.spi.work.Work;
import javax.resource.spi.work.WorkAdapter;
import javax.resource.spi.work.WorkCompletedException;
import javax.resource.spi.work.WorkEvent;
+import javax.resource.spi.work.WorkException;
+import javax.resource.spi.work.WorkListener;
+import javax.resource.spi.work.WorkManager;
+import javax.resource.spi.work.WorkRejectedException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executor;
+
import static javax.resource.spi.work.WorkEvent.WORK_ACCEPTED;
import static javax.resource.spi.work.WorkEvent.WORK_COMPLETED;
import static javax.resource.spi.work.WorkEvent.WORK_REJECTED;
import static javax.resource.spi.work.WorkEvent.WORK_STARTED;
-import javax.resource.spi.work.WorkException;
import static javax.resource.spi.work.WorkException.INTERNAL;
import static javax.resource.spi.work.WorkException.START_TIMED_OUT;
-import javax.resource.spi.work.WorkListener;
-import javax.resource.spi.work.WorkManager;
-import javax.resource.spi.work.WorkRejectedException;
-
import static org.apache.openejb.core.transaction.SimpleWorkManager.WorkType.DO;
import static org.apache.openejb.core.transaction.SimpleWorkManager.WorkType.SCHEDULE;
import static org.apache.openejb.core.transaction.SimpleWorkManager.WorkType.START;
-import org.apache.openejb.util.LogCategory;
-import org.apache.openejb.util.Logger;
public class SimpleWorkManager implements WorkManager {
public enum WorkType {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionPolicy.java Tue Nov 19 02:12:21 2013
@@ -16,11 +16,11 @@
*/
package org.apache.openejb.core.transaction;
-import javax.transaction.xa.XAResource;
-
import org.apache.openejb.ApplicationException;
import org.apache.openejb.SystemException;
+import javax.transaction.xa.XAResource;
+
/**
* TransactionPolicy represents a JEE container managed or bean manage
* transaction.
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionRolledbackException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionRolledbackException.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionRolledbackException.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TransactionRolledbackException.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,10 @@
*/
package org.apache.openejb.core.transaction;
-import org.apache.openejb.core.ivm.IntraVmArtifact;
-
import java.io.ByteArrayOutputStream;
import java.io.ObjectStreamException;
import java.io.PrintStream;
import java.io.PrintWriter;
-import java.io.StringWriter;
/**
* Subclass of javax.transaction.TransactionRolledbackException which adds init cause to the exception.
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxBeanManaged.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxBeanManaged.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxBeanManaged.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxBeanManaged.java Tue Nov 19 02:12:21 2013
@@ -16,15 +16,15 @@
*/
package org.apache.openejb.core.transaction;
-import java.rmi.RemoteException;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-import javax.transaction.UserTransaction;
-
import org.apache.openejb.ApplicationException;
import org.apache.openejb.SystemException;
import org.apache.openejb.core.CoreUserTransaction;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
+import java.rmi.RemoteException;
+
public class TxBeanManaged extends JtaTransactionPolicy implements BeanTransactionPolicy {
private Transaction clientTx;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxMandatory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxMandatory.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxMandatory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxMandatory.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,13 @@
*/
package org.apache.openejb.core.transaction;
+import org.apache.openejb.ApplicationException;
+import org.apache.openejb.SystemException;
+
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import javax.transaction.TransactionRequiredException;
-import org.apache.openejb.ApplicationException;
-import org.apache.openejb.SystemException;
-
/**
* 17.6.2.5 Mandatory
* <p/>
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNever.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNever.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNever.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNever.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,13 @@
*/
package org.apache.openejb.core.transaction;
-import java.rmi.RemoteException;
-import javax.transaction.TransactionManager;
-import javax.transaction.Transaction;
-
import org.apache.openejb.ApplicationException;
import org.apache.openejb.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+import java.rmi.RemoteException;
+
/**
* 17.6.2.6 Never
* <p/>
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNotSupported.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNotSupported.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNotSupported.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxNotSupported.java Tue Nov 19 02:12:21 2013
@@ -16,11 +16,11 @@
*/
package org.apache.openejb.core.transaction;
+import org.apache.openejb.SystemException;
+
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import org.apache.openejb.SystemException;
-
/**
* 17.6.2.1 NotSupported
* <p/>
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequired.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequired.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequired.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequired.java Tue Nov 19 02:12:21 2013
@@ -16,12 +16,12 @@
*/
package org.apache.openejb.core.transaction;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-
import org.apache.openejb.ApplicationException;
import org.apache.openejb.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+
/**
* 17.6.2.2 Required
* <p/>
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequiresNew.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequiresNew.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequiresNew.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxRequiresNew.java Tue Nov 19 02:12:21 2013
@@ -16,12 +16,12 @@
*/
package org.apache.openejb.core.transaction;
-import javax.transaction.Transaction;
-import javax.transaction.TransactionManager;
-
import org.apache.openejb.ApplicationException;
import org.apache.openejb.SystemException;
+import javax.transaction.Transaction;
+import javax.transaction.TransactionManager;
+
/**
* 17.6.2.4 RequiresNew
* <p/>
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxSupports.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxSupports.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxSupports.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/transaction/TxSupports.java Tue Nov 19 02:12:21 2013
@@ -16,11 +16,11 @@
*/
package org.apache.openejb.core.transaction;
+import org.apache.openejb.SystemException;
+
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
-import org.apache.openejb.SystemException;
-
/**
* 17.6.2.3 Supports
* <p/>
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/AddressingSupport.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/AddressingSupport.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/AddressingSupport.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/AddressingSupport.java Tue Nov 19 02:12:21 2013
@@ -16,10 +16,10 @@
*/
package org.apache.openejb.core.webservices;
-import javax.xml.ws.EndpointReference;
-
import org.w3c.dom.Element;
+import javax.xml.ws.EndpointReference;
+
/**
* This interface defines the WS-Addressing functions of {@link javax.xml.ws.WebServiceContext WebServiceContext}
* that must be implemented by each JAX-WS provider. This interface is used within
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerResolverImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerResolverImpl.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerResolverImpl.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/HandlerResolverImpl.java Tue Nov 19 02:12:21 2013
@@ -18,7 +18,6 @@ package org.apache.openejb.core.webservi
import org.apache.openejb.Injection;
import org.apache.openejb.InjectionProcessor;
-import static org.apache.openejb.InjectionProcessor.unwrap;
import javax.naming.Context;
import javax.xml.namespace.QName;
@@ -33,6 +32,8 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import static org.apache.openejb.InjectionProcessor.unwrap;
+
public class HandlerResolverImpl implements HandlerResolver {
private final List<HandlerChainData> handlerChains;
private final Collection<Injection> injections;
@@ -94,20 +95,20 @@ public class HandlerResolverImpl impleme
}
private boolean matchServiceName(PortInfo info, QName namePattern) {
- return match((info == null ? null : info.getServiceName()), namePattern);
+ return match(info == null ? null : info.getServiceName(), namePattern);
}
private boolean matchPortName(PortInfo info, QName namePattern) {
- return match((info == null ? null : info.getPortName()), namePattern);
+ return match(info == null ? null : info.getPortName(), namePattern);
}
private boolean matchBinding(PortInfo info, List bindings) {
- return match((info == null ? null : info.getBindingID()), bindings);
+ return match(info == null ? null : info.getBindingID(), bindings);
}
private boolean match(String binding, List bindings) {
if (binding == null) {
- return (bindings == null || bindings.isEmpty());
+ return bindings == null || bindings.isEmpty();
} else {
if (bindings == null || bindings.isEmpty()) {
return true;
@@ -131,7 +132,7 @@ public class HandlerResolverImpl impleme
*/
private boolean match(QName name, QName namePattern) {
if (name == null) {
- return (namePattern == null || namePattern.getLocalPart().equals("*"));
+ return namePattern == null || namePattern.getLocalPart().equals("*");
} else {
if (namePattern == null) {
return true;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/JaxWsUtils.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/JaxWsUtils.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/JaxWsUtils.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/JaxWsUtils.java Tue Nov 19 02:12:21 2013
@@ -71,12 +71,12 @@ public class JaxWsUtils {
}
public static boolean isWebService(Class clazz) {
- return ((clazz.isAnnotationPresent(WebService.class) || clazz.isAnnotationPresent(WebServiceProvider.class)) && isProperWebService(clazz));
+ return (clazz.isAnnotationPresent(WebService.class) || clazz.isAnnotationPresent(WebServiceProvider.class)) && isProperWebService(clazz);
}
private static boolean isProperWebService(Class clazz) {
int modifiers = clazz.getModifiers();
- return (Modifier.isPublic(modifiers) && !Modifier.isFinal(modifiers) && !Modifier.isAbstract(modifiers));
+ return Modifier.isPublic(modifiers) && !Modifier.isFinal(modifiers) && !Modifier.isAbstract(modifiers);
}
public static String getServiceName(Class clazz) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/NoAddressingSupport.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/NoAddressingSupport.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/NoAddressingSupport.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/NoAddressingSupport.java Tue Nov 19 02:12:21 2013
@@ -16,10 +16,10 @@
*/
package org.apache.openejb.core.webservices;
-import javax.xml.ws.EndpointReference;
-
import org.w3c.dom.Element;
+import javax.xml.ws.EndpointReference;
+
/**
* An implementation of the {@link AddressingSupport} interface that throws
* {@link UnsupportedOperationException} for all its methods.
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortData.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortData.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortData.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/PortData.java Tue Nov 19 02:12:21 2013
@@ -20,10 +20,10 @@ import org.apache.openejb.Injection;
import javax.xml.namespace.QName;
import javax.xml.ws.handler.PortInfo;
-import java.util.List;
+import java.net.URL;
import java.util.ArrayList;
+import java.util.List;
import java.util.Properties;
-import java.net.URL;
public class PortData implements PortInfo {
private String portId;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/ProviderWrapper.java Tue Nov 19 02:12:21 2013
@@ -26,17 +26,33 @@ import javax.jws.WebService;
import javax.xml.bind.JAXBContext;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
-import javax.xml.ws.*;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.Endpoint;
+import javax.xml.ws.EndpointReference;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebServiceException;
+import javax.xml.ws.WebServiceFeature;
import javax.xml.ws.handler.HandlerResolver;
import javax.xml.ws.soap.SOAPBinding;
import javax.xml.ws.spi.Provider;
import javax.xml.ws.spi.ServiceDelegate;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
import java.util.concurrent.Executor;
public class ProviderWrapper extends Provider {
@@ -94,7 +110,7 @@ public class ProviderWrapper extends Pro
public ProviderWrapper() {
delegate = findProvider();
- portRefs = (threadPortRefs.get() == null) ? null : threadPortRefs.get().portRefData;
+ portRefs = threadPortRefs.get() == null ? null : threadPortRefs.get().portRefData;
}
public Provider getDelegate() {
@@ -300,7 +316,7 @@ public class ProviderWrapper extends Pro
} catch (Exception e) {
}
}
- if ((qname != null && qname.equals(portRef.getQName())) || (intf != null && intf.isInstance(proxy))) {
+ if (qname != null && qname.equals(portRef.getQName()) || intf != null && intf.isInstance(proxy)) {
// set address
if (!portRef.getAddresses().isEmpty()) {
proxy.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, portRef.getAddresses().get(0));
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/UriResolver.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/UriResolver.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/UriResolver.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/UriResolver.java Tue Nov 19 02:12:21 2013
@@ -61,7 +61,7 @@ public class UriResolver {
}
public UriResolver(String baseUriStr, String uriStr, Class calling) throws IOException {
- this.calling = (calling != null) ? calling : getClass();
+ this.calling = calling != null ? calling : getClass();
if (uriStr.startsWith("classpath:")) {
tryClasspath(uriStr);
} else if (baseUriStr != null && baseUriStr.startsWith("jar:")) {
@@ -75,7 +75,7 @@ public class UriResolver {
public void resolve(String baseUriStr, String uriStr, Class callingCls) throws IOException {
- this.calling = (callingCls != null) ? callingCls : getClass();
+ this.calling = callingCls != null ? callingCls : getClass();
this.file = null;
this.uri = null;
@@ -321,7 +321,7 @@ public class UriResolver {
url = callingClass.getResource(resourceName);
}
- if ((url == null) && (resourceName != null) && (resourceName.charAt(0) != '/')) {
+ if (url == null && resourceName != null && resourceName.charAt(0) != '/') {
return getResource('/' + resourceName, callingClass);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/WsdlResolver.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/WsdlResolver.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/WsdlResolver.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/WsdlResolver.java Tue Nov 19 02:12:21 2013
@@ -19,12 +19,12 @@ package org.apache.openejb.core.webservi
import org.xml.sax.InputSource;
import javax.wsdl.xml.WSDLLocator;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
import java.io.File;
import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.URLConnection;
public class WsdlResolver implements WSDLLocator {
private String baseUri;
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/ColorFormatter.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/ColorFormatter.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/ColorFormatter.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/ColorFormatter.java Tue Nov 19 02:12:21 2013
@@ -16,14 +16,15 @@
*/
package org.apache.openejb.log;
+import org.apache.openejb.loader.SystemInstance;
+import org.fusesource.jansi.Ansi;
+
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.LogRecord;
-import org.apache.openejb.loader.SystemInstance;
-import org.fusesource.jansi.Ansi;
public class ColorFormatter extends SingleLineFormatter {
public static final String OPENEJB_LOG_COLOR_PREFIX = "openejb.log.color.";
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/ConsoleColorHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/ConsoleColorHandler.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/ConsoleColorHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/ConsoleColorHandler.java Tue Nov 19 02:12:21 2013
@@ -16,12 +16,12 @@
*/
package org.apache.openejb.log;
-import java.util.logging.ConsoleHandler;
import org.apache.openejb.loader.SystemInstance;
import org.fusesource.jansi.AnsiConsole;
-import org.fusesource.jansi.AnsiOutputStream;
import org.fusesource.jansi.WindowsAnsiOutputStream;
+import java.util.logging.ConsoleHandler;
+
import static org.apache.openejb.log.JULUtil.level;
public class ConsoleColorHandler extends ConsoleHandler {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/FileHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/FileHandler.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/FileHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/FileHandler.java Tue Nov 19 02:12:21 2013
@@ -385,7 +385,7 @@ public class FileHandler
FileOutputStream fos = new FileOutputStream(pathname, true);
OutputStream os = bufferSize>0?new BufferedOutputStream(fos,bufferSize):fos;
writer = new PrintWriter(
- (encoding != null) ? new OutputStreamWriter(os, encoding)
+ encoding != null ? new OutputStreamWriter(os, encoding)
: new OutputStreamWriter(os), false);
writer.write(getFormatter().getHead(this));
} catch (Exception e) {
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/JULUtil.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/JULUtil.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/JULUtil.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/JULUtil.java Tue Nov 19 02:12:21 2013
@@ -16,9 +16,10 @@
*/
package org.apache.openejb.log;
-import java.util.logging.Level;
import org.apache.openejb.loader.SystemInstance;
+import java.util.logging.Level;
+
public final class JULUtil {
public static final String DEFAULT_LOG_LEVEL = "INFO";
public static final String OPENEJB_LOG_LEVEL = "openejb.log.level";
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Log4jLogger.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Log4jLogger.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Log4jLogger.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Log4jLogger.java Tue Nov 19 02:12:21 2013
@@ -18,6 +18,11 @@
*/
package org.apache.openejb.log.logger;
+import org.apache.log4j.Appender;
+import org.apache.log4j.AppenderSkeleton;
+import org.apache.log4j.Priority;
+import org.apache.log4j.spi.LoggingEvent;
+
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Enumeration;
@@ -28,11 +33,6 @@ import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.LogRecord;
-import org.apache.log4j.Appender;
-import org.apache.log4j.AppenderSkeleton;
-import org.apache.log4j.Priority;
-import org.apache.log4j.spi.LoggingEvent;
-
/**
* java.util.logging.Logger implementation delegating to Log4j.
* All methods can be used except:
@@ -191,7 +191,7 @@ public class Log4jLogger extends Abstrac
@Override
public boolean isAsSevereAsThreshold(Priority priority) {
Priority p = getThreshold();
- return (p == null) || priority.isGreaterOrEqual(p);
+ return p == null || priority.isGreaterOrEqual(p);
}
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Slf4jLogger.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Slf4jLogger.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Slf4jLogger.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/log/logger/Slf4jLogger.java Tue Nov 19 02:12:21 2013
@@ -18,12 +18,12 @@
*/
package org.apache.openejb.log.logger;
+import org.slf4j.spi.LocationAwareLogger;
+
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.LogRecord;
-import org.slf4j.spi.LocationAwareLogger;
-
/**
* <p>
* java.util.logging.Logger implementation delegating to SLF4J.
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/MathRuntimeException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/MathRuntimeException.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/MathRuntimeException.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/MathRuntimeException.java Tue Nov 19 02:12:21 2013
@@ -60,7 +60,7 @@ public class MathRuntimeException extend
*/
public MathRuntimeException(final String pattern, final Object ... arguments) {
this.pattern = pattern;
- this.arguments = (arguments == null) ? new Object[0] : arguments.clone();
+ this.arguments = arguments == null ? new Object[0] : arguments.clone();
}
/**
@@ -89,7 +89,7 @@ public class MathRuntimeException extend
final String pattern, final Object ... arguments) {
super(rootCause);
this.pattern = pattern;
- this.arguments = (arguments == null) ? new Object[0] : arguments.clone();
+ this.arguments = arguments == null ? new Object[0] : arguments.clone();
}
/**
@@ -127,7 +127,7 @@ public class MathRuntimeException extend
*/
private static String buildMessage(final Locale locale, final String pattern,
final Object ... arguments) {
- return (pattern == null) ? "" : new MessageFormat(translate(pattern, locale), locale).format(arguments);
+ return pattern == null ? "" : new MessageFormat(translate(pattern, locale), locale).format(arguments);
}
/** Gets the pattern used to build the message of this throwable.
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/DescriptiveStatistics.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/DescriptiveStatistics.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/DescriptiveStatistics.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/DescriptiveStatistics.java Tue Nov 19 02:12:21 2013
@@ -16,10 +16,6 @@
*/
package org.apache.openejb.math.stat.descriptive;
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-
import org.apache.openejb.math.MathRuntimeException;
import org.apache.openejb.math.stat.descriptive.moment.GeometricMean;
import org.apache.openejb.math.stat.descriptive.moment.Kurtosis;
@@ -33,6 +29,10 @@ import org.apache.openejb.math.stat.desc
import org.apache.openejb.math.stat.descriptive.summary.SumOfSquares;
import org.apache.openejb.math.util.ResizableDoubleArray;
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
+
/**
* Maintains a dataset of values of a single variable and computes descriptive
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FirstMoment.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FirstMoment.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FirstMoment.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FirstMoment.java Tue Nov 19 02:12:21 2013
@@ -16,9 +16,10 @@
*/
package org.apache.openejb.math.stat.descriptive.moment;
-import java.io.Serializable;
import org.apache.openejb.math.stat.descriptive.AbstractStorelessUnivariateStatistic;
+import java.io.Serializable;
+
/**
* Computes the first moment (arithmetic mean). Uses the definitional formula:
* <p>
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FourthMoment.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FourthMoment.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FourthMoment.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/FourthMoment.java Tue Nov 19 02:12:21 2013
@@ -97,7 +97,7 @@ public class FourthMoment extends ThirdM
double n0 = n;
m4 = m4 - 4.0 * nDev * prevM3 + 6.0 * nDevSq * prevM2 +
- ((n0 * n0) - 3 * (n0 -1)) * (nDevSq * nDevSq * (n0 - 1) * n0);
+ (n0 * n0 - 3 * (n0 -1)) * nDevSq * nDevSq * (n0 - 1) * n0;
}
/**
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/GeometricMean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/GeometricMean.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/GeometricMean.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/GeometricMean.java Tue Nov 19 02:12:21 2013
@@ -16,13 +16,13 @@
*/
package org.apache.openejb.math.stat.descriptive.moment;
-import java.io.Serializable;
-
import org.apache.openejb.math.MathRuntimeException;
import org.apache.openejb.math.stat.descriptive.AbstractStorelessUnivariateStatistic;
import org.apache.openejb.math.stat.descriptive.StorelessUnivariateStatistic;
import org.apache.openejb.math.stat.descriptive.summary.SumOfLogs;
+import java.io.Serializable;
+
/**
* Returns the <a href="http://www.xycoon.com/geometric_mean.htm">
* geometric mean </a> of the available values.
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Kurtosis.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Kurtosis.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Kurtosis.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Kurtosis.java Tue Nov 19 02:12:21 2013
@@ -16,11 +16,11 @@
*/
package org.apache.openejb.math.stat.descriptive.moment;
-import java.io.Serializable;
-
import org.apache.openejb.math.MathRuntimeException;
import org.apache.openejb.math.stat.descriptive.AbstractStorelessUnivariateStatistic;
+import java.io.Serializable;
+
/**
* Computes the Kurtosis of the available values.
@@ -183,12 +183,12 @@ public class Kurtosis extends AbstractSt
double n0 = length;
double coefficientOne =
- (n0 * (n0 + 1)) / ((n0 - 1) * (n0 - 2) * (n0 - 3));
+ n0 * (n0 + 1) / ((n0 - 1) * (n0 - 2) * (n0 - 3));
double termTwo =
- (3 * Math.pow(n0 - 1, 2.0)) / ((n0 - 2) * (n0 - 3));
+ 3 * Math.pow(n0 - 1, 2.0) / ((n0 - 2) * (n0 - 3));
// Calculate kurtosis
- kurt = (coefficientOne * accum3) - termTwo;
+ kurt = coefficientOne * accum3 - termTwo;
}
return kurt;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Mean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Mean.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Mean.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Mean.java Tue Nov 19 02:12:21 2013
@@ -16,12 +16,12 @@
*/
package org.apache.openejb.math.stat.descriptive.moment;
-import java.io.Serializable;
-
import org.apache.openejb.math.stat.descriptive.AbstractStorelessUnivariateStatistic;
import org.apache.openejb.math.stat.descriptive.WeightedEvaluation;
import org.apache.openejb.math.stat.descriptive.summary.Sum;
+import java.io.Serializable;
+
/**
* <p>Computes the arithmetic mean of a set of values. Uses the definitional
* formula:</p>
@@ -164,7 +164,7 @@ public class Mean extends AbstractStorel
for (int i = begin; i < begin + length; i++) {
correction += values[i] - xbar;
}
- return xbar + (correction/sampleSize);
+ return xbar + correction/sampleSize;
}
return Double.NaN;
}
@@ -212,7 +212,7 @@ public class Mean extends AbstractStorel
for (int i = begin; i < begin + length; i++) {
correction += weights[i] * (values[i] - xbarw);
}
- return xbarw + (correction/sumw);
+ return xbarw + correction/sumw;
}
return Double.NaN;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Skewness.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Skewness.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Skewness.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Skewness.java Tue Nov 19 02:12:21 2013
@@ -16,10 +16,10 @@
*/
package org.apache.openejb.math.stat.descriptive.moment;
-import java.io.Serializable;
-
import org.apache.openejb.math.stat.descriptive.AbstractStorelessUnivariateStatistic;
+import java.io.Serializable;
+
/**
* Computes the skewness of the available values.
* <p>
@@ -108,7 +108,7 @@ public class Skewness extends AbstractSt
return 0.0d;
} else {
double n0 = moment.getN();
- return (n0 * moment.m3) /
+ return n0 * moment.m3 /
((n0 - 1) * (n0 -2) * Math.sqrt(variance) * variance);
}
}
@@ -168,7 +168,7 @@ public class Skewness extends AbstractSt
accum += d * d;
accum2 += d;
}
- final double variance = (accum - (accum2 * accum2 / length)) / (length - 1);
+ final double variance = (accum - accum2 * accum2 / length) / (length - 1);
double accum3 = 0.0;
for (int i = begin; i < begin + length; i++) {
@@ -181,7 +181,7 @@ public class Skewness extends AbstractSt
double n0 = length;
// Calculate skewness
- skew = (n0 / ((n0 - 1) * (n0 - 2))) * accum3;
+ skew = n0 / ((n0 - 1) * (n0 - 2)) * accum3;
}
return skew;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Variance.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Variance.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Variance.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/moment/Variance.java Tue Nov 19 02:12:21 2013
@@ -16,11 +16,11 @@
*/
package org.apache.openejb.math.stat.descriptive.moment;
-import java.io.Serializable;
-
import org.apache.openejb.math.MathRuntimeException;
-import org.apache.openejb.math.stat.descriptive.WeightedEvaluation;
import org.apache.openejb.math.stat.descriptive.AbstractStorelessUnivariateStatistic;
+import org.apache.openejb.math.stat.descriptive.WeightedEvaluation;
+
+import java.io.Serializable;
/**
* Computes the variance of the available values. By default, the unbiased
@@ -172,7 +172,7 @@ public class Variance extends AbstractSt
if (isBiasCorrected) {
return moment.m2 / (moment.n - 1d);
} else {
- return moment.m2 / (moment.n);
+ return moment.m2 / moment.n;
}
}
}
@@ -403,9 +403,9 @@ public class Variance extends AbstractSt
}
double len = length;
if (isBiasCorrected) {
- var = (accum - (accum2 * accum2 / len)) / (len - 1.0);
+ var = (accum - accum2 * accum2 / len) / (len - 1.0);
} else {
- var = (accum - (accum2 * accum2 / len)) / len;
+ var = (accum - accum2 * accum2 / len) / len;
}
}
}
@@ -500,7 +500,7 @@ public class Variance extends AbstractSt
double accum2 = 0.0;
for (int i = begin; i < begin + length; i++) {
dev = values[i] - mean;
- accum += weights[i] * (dev * dev);
+ accum += weights[i] * dev * dev;
accum2 += weights[i] * dev;
}
@@ -510,9 +510,9 @@ public class Variance extends AbstractSt
}
if (isBiasCorrected) {
- var = (accum - (accum2 * accum2 / sumWts)) / (sumWts - 1.0);
+ var = (accum - accum2 * accum2 / sumWts) / (sumWts - 1.0);
} else {
- var = (accum - (accum2 * accum2 / sumWts)) / sumWts;
+ var = (accum - accum2 * accum2 / sumWts) / sumWts;
}
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Max.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Max.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Max.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Max.java Tue Nov 19 02:12:21 2013
@@ -16,10 +16,10 @@
*/
package org.apache.openejb.math.stat.descriptive.rank;
-import java.io.Serializable;
-
import org.apache.openejb.math.stat.descriptive.AbstractStorelessUnivariateStatistic;
+import java.io.Serializable;
+
/**
* Returns the maximum of the available values.
* <p>
@@ -130,7 +130,7 @@ public class Max extends AbstractStorele
max = values[begin];
for (int i = begin; i < begin + length; i++) {
if (!Double.isNaN(values[i])) {
- max = (max > values[i]) ? max : values[i];
+ max = max > values[i] ? max : values[i];
}
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Min.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Min.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Min.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Min.java Tue Nov 19 02:12:21 2013
@@ -16,10 +16,10 @@
*/
package org.apache.openejb.math.stat.descriptive.rank;
-import java.io.Serializable;
-
import org.apache.openejb.math.stat.descriptive.AbstractStorelessUnivariateStatistic;
+import java.io.Serializable;
+
/**
* Returns the minimum of the available values.
* <p>
@@ -130,7 +130,7 @@ public class Min extends AbstractStorele
min = values[begin];
for (int i = begin; i < begin + length; i++) {
if (!Double.isNaN(values[i])) {
- min = (min < values[i]) ? min : values[i];
+ min = min < values[i] ? min : values[i];
}
}
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Percentile.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Percentile.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Percentile.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/rank/Percentile.java Tue Nov 19 02:12:21 2013
@@ -16,12 +16,12 @@
*/
package org.apache.openejb.math.stat.descriptive.rank;
-import java.io.Serializable;
-import java.util.Arrays;
-
import org.apache.openejb.math.MathRuntimeException;
import org.apache.openejb.math.stat.descriptive.AbstractUnivariateStatistic;
+import java.io.Serializable;
+import java.util.Arrays;
+
/**
* Provides percentile computation.
* <p>
@@ -197,7 +197,7 @@ public class Percentile extends Abstract
test(values, begin, length);
- if ((p > 100) || (p <= 0)) {
+ if (p > 100 || p <= 0) {
throw MathRuntimeException.createIllegalArgumentException(
"out of bounds quantile value: {0}, must be in (0, 100]", p);
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/Sum.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/Sum.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/Sum.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/Sum.java Tue Nov 19 02:12:21 2013
@@ -16,10 +16,10 @@
*/
package org.apache.openejb.math.stat.descriptive.summary;
-import java.io.Serializable;
-
import org.apache.openejb.math.stat.descriptive.AbstractStorelessUnivariateStatistic;
+import java.io.Serializable;
+
/**
* Returns the sum of the available values.
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfLogs.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfLogs.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfLogs.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfLogs.java Tue Nov 19 02:12:21 2013
@@ -16,10 +16,10 @@
*/
package org.apache.openejb.math.stat.descriptive.summary;
-import java.io.Serializable;
-
import org.apache.openejb.math.stat.descriptive.AbstractStorelessUnivariateStatistic;
+import java.io.Serializable;
+
/**
* Returns the sum of the natural logs for this collection of values.
* <p>
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfSquares.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfSquares.java?rev=1543287&r1=1543286&r2=1543287&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfSquares.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/math/stat/descriptive/summary/SumOfSquares.java Tue Nov 19 02:12:21 2013
@@ -16,10 +16,10 @@
*/
package org.apache.openejb.math.stat.descriptive.summary;
-import java.io.Serializable;
-
import org.apache.openejb.math.stat.descriptive.AbstractStorelessUnivariateStatistic;
+import java.io.Serializable;
+
/**
* Returns the sum of the squares of the available values.
* <p>