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/28 02:39:51 UTC

svn commit: r1546254 - in /tomee/tomee/trunk/container/openejb-core: ./ src/main/config/pmd/ src/main/java/org/apache/openejb/assembler/classic/ src/main/java/org/apache/openejb/cdi/ src/main/java/org/apache/openejb/config/ src/main/java/org/apache/ope...

Author: tveronezi
Date: Thu Nov 28 01:39:50 2013
New Revision: 1546254

URL: http://svn.apache.org/r1546254
Log:
https://issues.apache.org/jira/browse/OPENEJB-2055
PMD basic.xml rule.

Added:
    tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-basic.xml
    tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-controversial.xml
    tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-optimizations.xml
Modified:
    tomee/tomee/trunk/container/openejb-core/pom.xml
    tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-empty.xml
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiBuilder.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappWebBeansContext.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/GeronimoMappedName.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ObjectFactory.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbObjectHandler.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerServiceWrapper.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/TimeWatcherExecutor.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Base64.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PaxLogStreamFactory.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/Jdk13ProxyFactory.java

Modified: tomee/tomee/trunk/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/pom.xml?rev=1546254&r1=1546253&r2=1546254&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/pom.xml (original)
+++ tomee/tomee/trunk/container/openejb-core/pom.xml Thu Nov 28 01:39:50 2013
@@ -259,6 +259,9 @@
             <ruleset>rulesets/java/finalizers.xml</ruleset>
             <ruleset>rulesets/java/imports.xml</ruleset>
             <ruleset>rulesets/java/unusedcode.xml</ruleset>
+            <ruleset>${project.basedir}/src/main/config/pmd/openejb-controversial.xml</ruleset>
+            <ruleset>${project.basedir}/src/main/config/pmd/openejb-basic.xml</ruleset>
+            <ruleset>${project.basedir}/src/main/config/pmd/openejb-optimizations.xml</ruleset>
           </rulesets>
         </configuration>
         <executions>

Added: tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-basic.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-basic.xml?rev=1546254&view=auto
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-basic.xml (added)
+++ tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-basic.xml Thu Nov 28 01:39:50 2013
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<ruleset name="Basic"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+  <description>
+    Custom basic.xml for openejb-core
+  </description>
+
+  <!-- All the rules from basic.xml -->
+  <rule ref="rulesets/java/basic.xml">
+    <exclude name="EmptyCatchBlock"/> <!-- This is covered by the openejb-empty.xml file -->
+    <exclude name="UselessOverridingMethod"/>
+    <exclude name="CollapsibleIfStatements"/>
+    <exclude name="ReturnFromFinallyBlock"/>
+    <exclude name="AvoidBranchingStatementAsLastInLoop"/>
+    <exclude name="AvoidThreadGroup"/>
+  </rule>
+
+
+</ruleset>

Added: tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-controversial.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-controversial.xml?rev=1546254&view=auto
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-controversial.xml (added)
+++ tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-controversial.xml Thu Nov 28 01:39:50 2013
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!--
+
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+-->
+<ruleset name="Basic"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+  <description>
+    Custom controversial.xml for openejb-core
+  </description>
+
+  <rule ref="rulesets/java/controversial.xml/OneDeclarationPerLine" />
+  <rule ref="rulesets/java/controversial.xml/UnnecessaryConstructor" />
+
+</ruleset>

Modified: tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-empty.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-empty.xml?rev=1546254&r1=1546253&r2=1546254&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-empty.xml (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-empty.xml Thu Nov 28 01:39:50 2013
@@ -1,11 +1,28 @@
 <?xml version="1.0"?>
+<!--
 
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+-->
 <ruleset name="Basic"
          xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
   <description>
-    Custom java-basic.xml for openejb-core
+    Custom empty.xml for openejb-core
   </description>
 
   <!-- All the rules from empty.xml -->

Added: tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-optimizations.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-optimizations.xml?rev=1546254&view=auto
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-optimizations.xml (added)
+++ tomee/tomee/trunk/container/openejb-core/src/main/config/pmd/openejb-optimizations.xml Thu Nov 28 01:39:50 2013
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<!--
+
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+-->
+<ruleset name="Basic"
+         xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
+  <description>
+    Custom optimizations.xml for openejb-core
+  </description>
+
+  <!-- All the rules from basic.xml -->
+  <rule ref="rulesets/java/optimizations.xml">
+    <exclude name="PrematureDeclaration"/> <!-- this rule is buggy -->
+    <exclude name="AvoidInstantiatingObjectsInLoops"/>
+    <exclude name="MethodArgumentCouldBeFinal"/>
+    <exclude name="LocalVariableCouldBeFinal"/>
+    <exclude name="RedundantFieldInitializer"/>
+    <exclude name="SimplifyStartsWith"/>
+    <exclude name="UseStringBufferForStringAppends"/>
+    <exclude name="AddEmptyString"/>
+    <exclude name="UseArrayListInsteadOfVector"/>
+  </rule>
+
+</ruleset>

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java?rev=1546254&r1=1546253&r2=1546254&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java Thu Nov 28 01:39:50 2013
@@ -249,7 +249,7 @@ public class JndiEncBuilder {
                 } else if (type == Short.class) {
                     obj = new Short(entry.value);
                 } else if (type == Boolean.class) {
-                    obj = new Boolean(entry.value);
+                    obj = Boolean.valueOf(entry.value);
                 } else if (type == Byte.class) {
                     obj = new Byte(entry.value);
                 } else if (type == Character.class) {

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiBuilder.java?rev=1546254&r1=1546253&r2=1546254&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiBuilder.java Thu Nov 28 01:39:50 2013
@@ -36,9 +36,6 @@ public class CdiBuilder {
     private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_CDI, CdiBuilder.class);
     private static final ThreadSingletonService SINGLETON_SERVICE = new ThreadSingletonServiceImpl();
 
-    public CdiBuilder() {
-    }
-
     public void build(final AppInfo appInfo, final AppContext appContext, final List<BeanContext> allDeployments) {
         initSingleton().initialize(new StartupObject(appContext, appInfo, allDeployments));
     }

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java?rev=1546254&r1=1546253&r2=1546254&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/ThreadSingletonServiceImpl.java Thu Nov 28 01:39:50 2013
@@ -65,10 +65,6 @@ public class ThreadSingletonServiceImpl 
     private static final Map<ClassLoader, WebBeansContext> contextByClassLoader = new ConcurrentHashMap<ClassLoader, WebBeansContext>();
     private static final String WEBBEANS_FAILOVER_ISSUPPORTFAILOVER = "org.apache.webbeans.web.failover.issupportfailover";
 
-    public ThreadSingletonServiceImpl() {
-        // no-op
-    }
-
     @Override
     public void initialize(final StartupObject startupObject) {
         if (sessionContextClass == null) { // done here cause Cdibuilder trigger this class loading and that's from Warmup so we can't init too early config

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappWebBeansContext.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappWebBeansContext.java?rev=1546254&r1=1546253&r2=1546254&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappWebBeansContext.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/WebappWebBeansContext.java Thu Nov 28 01:39:50 2013
@@ -23,23 +23,17 @@ import java.util.Map;
 import java.util.Properties;
 
 public class WebappWebBeansContext extends WebBeansContext {
-    private WebBeansContext parent;
-    private BeanManagerImpl bm;
+    private final WebBeansContext parent;
+    private final BeanManagerImpl bm;
 
     public WebappWebBeansContext(Map<Class<?>, Object> services, Properties properties, WebBeansContext webBeansContext) {
         super(services, properties);
-        parent = webBeansContext;
+        this.parent = webBeansContext;
+        this.bm = new WebappBeanManager(this);
     }
 
     @Override
     public BeanManagerImpl getBeanManagerImpl() {
-        if (bm == null) { // should be done in the constructor
-            synchronized (this) {
-                if (bm == null) {
-                    bm = new WebappBeanManager(this);
-                }
-            }
-        }
         return bm;
     }
 

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/GeronimoMappedName.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/GeronimoMappedName.java?rev=1546254&r1=1546253&r2=1546254&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/GeronimoMappedName.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/GeronimoMappedName.java Thu Nov 28 01:39:50 2013
@@ -34,9 +34,6 @@ public class GeronimoMappedName implemen
 
     private static final String MAPPED_NAME_PREFIX = "jndi:java:comp/geronimo/env/";
 
-    public GeronimoMappedName() {
-    }
-
     public AppModule deploy(AppModule appModule) throws OpenEJBException {
         mapReferences(appModule);
         return appModule;

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ObjectFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ObjectFactory.java?rev=1546254&r1=1546253&r2=1546254&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ObjectFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/sys/ObjectFactory.java Thu Nov 28 01:39:50 2013
@@ -35,13 +35,6 @@ import javax.xml.bind.annotation.XmlRegi
 @XmlRegistry
 public class ObjectFactory {
 
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.openejb.config.sys
-     */
-    public ObjectFactory() {
-    }
-
     /**
      * Create an instance of {@link Container }
      */

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbObjectHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbObjectHandler.java?rev=1546254&r1=1546253&r2=1546254&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbObjectHandler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/singleton/SingletonEjbObjectHandler.java Thu Nov 28 01:39:50 2013
@@ -50,10 +50,9 @@ public class SingletonEjbObjectHandler e
     protected Object isIdentical(Method method, Object[] args, Object proxy) throws Throwable {
         try {
             EjbObjectProxyHandler handler = (EjbObjectProxyHandler) ProxyManager.getInvocationHandler(args[0]);
-            return new Boolean(deploymentID.equals(handler.deploymentID));
+            return deploymentID.equals(handler.deploymentID);
         } catch (Throwable t) {
             return Boolean.FALSE;
-
         }
     }
 

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerServiceWrapper.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerServiceWrapper.java?rev=1546254&r1=1546253&r2=1546254&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerServiceWrapper.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/TimerServiceWrapper.java Thu Nov 28 01:39:50 2013
@@ -38,9 +38,6 @@ public class TimerServiceWrapper impleme
     
     private static final Logger log = Logger.getInstance(LogCategory.TIMER, TimerServiceWrapper.class);
 
-    public TimerServiceWrapper() {
-    }
-
     public Timer createTimer(Date initialExpiration, long intervalDuration, Serializable info) throws IllegalArgumentException, IllegalStateException, EJBException {
         return getTimerService().createTimer(initialExpiration, intervalDuration, info);
     }

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/TimeWatcherExecutor.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/TimeWatcherExecutor.java?rev=1546254&r1=1546253&r2=1546254&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/TimeWatcherExecutor.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/logging/TimeWatcherExecutor.java Thu Nov 28 01:39:50 2013
@@ -26,7 +26,8 @@ public final class TimeWatcherExecutor {
     }
 
     public static TimerWatcherResult execute(final Method mtd, final Object instance, final Object[] args, boolean watch) throws Throwable {
-        long start = 0, duration = 0;
+        long start = 0;
+        long duration = 0;
         if (watch) {
             start = System.nanoTime();
         }

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Base64.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Base64.java?rev=1546254&r1=1546253&r2=1546254&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Base64.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Base64.java Thu Nov 28 01:39:50 2013
@@ -29,6 +29,7 @@ import java.io.IOException;
  * @since 1.0-dev
  * @version $Id$
  */
+@SuppressWarnings("PMD.OneDeclarationPerLine")
 public class Base64 {
 
     /**

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java?rev=1546254&r1=1546253&r2=1546254&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Duration.java Thu Nov 28 01:39:50 2013
@@ -146,6 +146,7 @@ public class Duration {
         }
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
@@ -156,6 +157,13 @@ public class Duration {
         return n.a == n.b;
     }
 
+    @Override
+    public int hashCode() {
+        int result = (int) (time ^ (time >>> 32));
+        result = 31 * result + (unit != null ? unit.hashCode() : 0);
+        return result;
+    }
+
     public Duration add(Duration that) {
         Normalize n = new Normalize(this, that);
         return new Duration(n.a + n.b, n.base);

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java?rev=1546254&r1=1546253&r2=1546254&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/ExecutorBuilder.java Thu Nov 28 01:39:50 2013
@@ -40,9 +40,6 @@ public class ExecutorBuilder {
     private ThreadFactory threadFactory;
     private RejectedExecutionHandler rejectedExecutionHandler;
 
-    public ExecutorBuilder() {
-    }
-
     public ExecutorBuilder size(final int size) {
         this.size = size;
         return this;

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PaxLogStreamFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PaxLogStreamFactory.java?rev=1546254&r1=1546253&r2=1546254&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PaxLogStreamFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/PaxLogStreamFactory.java Thu Nov 28 01:39:50 2013
@@ -29,7 +29,5 @@ public class PaxLogStreamFactory impleme
         return new Log4jLogStream(logCategory);
     }
 
-    public PaxLogStreamFactory() {
-    }
 }
 

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/Jdk13ProxyFactory.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/Jdk13ProxyFactory.java?rev=1546254&r1=1546253&r2=1546254&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/Jdk13ProxyFactory.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/Jdk13ProxyFactory.java Thu Nov 28 01:39:50 2013
@@ -29,9 +29,6 @@ import java.util.Set;
  */
 public class Jdk13ProxyFactory implements ProxyFactory {
 
-    public Jdk13ProxyFactory() {
-    }
-
     public void init(Properties props) throws OpenEJBException {
     }