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/12/04 21:57:49 UTC

svn commit: r1547910 - in /tomee/tomee/trunk: ./ container/openejb-core/src/main/config/ container/openejb-core/src/main/java/org/apache/openejb/ container/openejb-core/src/main/java/org/apache/openejb/cdi/ container/openejb-core/src/main/java/org/apac...

Author: tveronezi
Date: Wed Dec  4 20:57:48 2013
New Revision: 1547910

URL: http://svn.apache.org/r1547910
Log:
https://issues.apache.org/jira/browse/OPENEJB-2058
-adjusting code
 -removing old checkstyle.xml file and profile.

Removed:
    tomee/tomee/trunk/checkstyle.xml
Modified:
    tomee/tomee/trunk/container/openejb-core/src/main/config/checkstyle.xml
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ProviderGenerator.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/PropertiesLoginModule.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EJBCronTrigger.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Messages.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java
    tomee/tomee/trunk/pom.xml

Modified: tomee/tomee/trunk/container/openejb-core/src/main/config/checkstyle.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/config/checkstyle.xml?rev=1547910&r1=1547909&r2=1547910&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/config/checkstyle.xml (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/config/checkstyle.xml Wed Dec  4 20:57:48 2013
@@ -45,12 +45,12 @@
     <!-- Checks for Naming Conventions.                  -->
     <!-- See http://checkstyle.sf.net/config_naming.html -->
     <!--<module name="ConstantName"/>-->
-    <!--<module name="LocalFinalVariableName"/>-->
-    <!--<module name="LocalVariableName"/>-->
-    <!--<module name="MemberName"/>-->
+    <module name="LocalFinalVariableName"/>
+    <module name="LocalVariableName"/>
+    <module name="MemberName"/>
     <!--<module name="MethodName"/>-->
     <module name="PackageName"/>
-    <!--<module name="ParameterName"/>-->
+    <module name="ParameterName"/>
     <!--<module name="StaticVariableName"/>-->
     <!--<module name="TypeName"/>-->
 

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java?rev=1547910&r1=1547909&r2=1547910&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java Wed Dec  4 20:57:48 2013
@@ -231,10 +231,10 @@ public class ClassLoaderUtil {
         }
 
         res = true;
-        final Vector java_lang_ClassLoader_NativeLibrary = (Vector) obj;
+        final Vector javaLangClassLoaderNativeLibrary = (Vector) obj;
         Method finalize;
 
-        for (final Object lib : java_lang_ClassLoader_NativeLibrary) {
+        for (final Object lib : javaLangClassLoaderNativeLibrary) {
 
             try {
                 finalize = lib.getClass().getDeclaredMethod("finalize", new Class[0]);

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java?rev=1547910&r1=1547909&r2=1547910&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java Wed Dec  4 20:57:48 2013
@@ -247,7 +247,7 @@ public class CdiPlugin extends AbstractO
             final Context context = webBeansContext.getBeanManagerImpl().getContext(scopeClass);
             instance = context.get(bean, cc);
         }
-        bean.setOWBProxy(instance);
+        bean.setOwbProxy(instance);
         return instance;
     }
 
@@ -525,7 +525,7 @@ public class CdiPlugin extends AbstractO
     // /!\ don't extend AbstractOwbBean without checking equals()
     private static class InstanceBean<T> implements OwbBean<T>, PassivationCapable {
         private final CdiEjbBean<T> bean;
-        private T OWBProxy;
+        private T owbProxy;
 
         public InstanceBean(final CdiEjbBean<T> tCdiEjbBean) {
             bean = tCdiEjbBean;
@@ -579,8 +579,8 @@ public class CdiPlugin extends AbstractO
         @Override
         public T create(final CreationalContext<T> creationalContext) {
             final T instance = bean.createEjb(creationalContext);
-            if (OWBProxy != null && SessionBeanType.STATEFUL.equals(bean.getEjbType())) { // we need to be able to remove OWB proxy to remove (statefuls for instance)
-                bean.storeStatefulInstance(OWBProxy, instance);
+            if (owbProxy != null && SessionBeanType.STATEFUL.equals(bean.getEjbType())) { // we need to be able to remove OWB proxy to remove (statefuls for instance)
+                bean.storeStatefulInstance(owbProxy, instance);
             }
             return instance;
         }
@@ -649,8 +649,8 @@ public class CdiPlugin extends AbstractO
             return bean.getWebBeansContext();
         }
 
-        public void setOWBProxy(final T OWBProxy) {
-            this.OWBProxy = OWBProxy;
+        public void setOwbProxy(final T owbProxy) {
+            this.owbProxy = owbProxy;
         }
 
         @Override

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java?rev=1547910&r1=1547909&r2=1547910&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/AppValidator.java Wed Dec  4 20:57:48 2013
@@ -56,10 +56,10 @@ public class AppValidator {
 
     protected static final Messages _messages = new Messages("org.apache.openejb.config.rules");
 
-    int LEVEL = 2;
-    boolean PRINT_XML = false;
-    boolean PRINT_WARNINGS = true;
-    boolean PRINT_COUNT = false;
+    private int level = 2;
+    private boolean printXml = false;
+    private boolean printWarnings = true;
+    private boolean printCount = false;
 
     private List<ValidationResults> sets = new ArrayList<ValidationResults>();
     private ValidationBase[] additionalValidators;
@@ -70,11 +70,11 @@ public class AppValidator {
     public AppValidator() throws OpenEJBException {
     }
 
-    public AppValidator(int LEVEL, boolean PRINT_XML, boolean PRINT_WARNINGS, boolean PRINT_COUNT) {
-        this.LEVEL = LEVEL;
-        this.PRINT_XML = PRINT_XML;
-        this.PRINT_WARNINGS = PRINT_WARNINGS;
-        this.PRINT_COUNT = PRINT_COUNT;
+    public AppValidator(int level, boolean printXml, boolean printWarnings, boolean printCount) {
+        this.level = level;
+        this.printXml = printXml;
+        this.printWarnings = printWarnings;
+        this.printCount = printCount;
     }
 
     public AppValidator(final ValidationBase... additionalValidator) {
@@ -144,7 +144,7 @@ public class AppValidator {
 
     // END SNIPPET : code1
     public void printResults(ValidationResults set) {
-        if (!set.hasErrors() && !set.hasFailures() && (!PRINT_WARNINGS || !set.hasWarnings())) {
+        if (!set.hasErrors() && !set.hasFailures() && (!printWarnings || !set.hasWarnings())) {
             return;
         }
         System.out.println("------------------------------------------");
@@ -154,7 +154,7 @@ public class AppValidator {
         printValidationExceptions(set.getErrors());
         printValidationExceptions(set.getFailures());
 
-        if (PRINT_WARNINGS) {
+        if (printWarnings) {
             printValidationExceptions(set.getWarnings());
         }
     }
@@ -168,17 +168,17 @@ public class AppValidator {
                 System.out.print(exceptions[i].getComponentName());
                 System.out.print(": ");
             }
-            if (LEVEL > 2) {
+            if (level > 2) {
                 System.out.println(exceptions[i].getMessage(1));
                 System.out.println();
                 System.out.print('\t');
-                System.out.println(exceptions[i].getMessage(LEVEL));
+                System.out.println(exceptions[i].getMessage(level));
                 System.out.println();
             } else {
-                System.out.println(exceptions[i].getMessage(LEVEL));
+                System.out.println(exceptions[i].getMessage(level));
             }
         }
-        if (PRINT_COUNT && exceptions.length > 0) {
+        if (printCount && exceptions.length > 0) {
             System.out.println();
             System.out.print(" " + exceptions.length + " ");
             System.out.println(exceptions[0].getCategory());
@@ -188,7 +188,7 @@ public class AppValidator {
     }
 
     public void printResultsXML(ValidationResults set) {
-        if (!set.hasErrors() && !set.hasFailures() && (!PRINT_WARNINGS || !set.hasWarnings())) {
+        if (!set.hasErrors() && !set.hasFailures() && (!printWarnings || !set.hasWarnings())) {
             return;
         }
 
@@ -200,7 +200,7 @@ public class AppValidator {
         printValidationExceptionsXML(set.getErrors());
         printValidationExceptionsXML(set.getFailures());
 
-        if (PRINT_WARNINGS) {
+        if (printWarnings) {
             printValidationExceptionsXML(set.getWarnings());
         }
         System.out.println("</jar>");
@@ -229,7 +229,7 @@ public class AppValidator {
     }
 
     public void displayResults(ValidationResults[] sets) {
-        if (PRINT_XML) {
+        if (printXml) {
             System.out.println("<results>");
             for (int i = 0; i < sets.length; i++) {
                 printResultsXML(sets[i]);
@@ -241,7 +241,7 @@ public class AppValidator {
             }
             for (int i = 0; i < sets.length; i++) {
                 if (sets[i].hasErrors() || sets[i].hasFailures()) {
-                    if (LEVEL < 3) {
+                    if (level < 3) {
                         System.out.println();
                         System.out.println("For more details, use the -vvv option");
                     }

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ProviderGenerator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ProviderGenerator.java?rev=1547910&r1=1547909&r2=1547910&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ProviderGenerator.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/typed/util/ProviderGenerator.java Wed Dec  4 20:57:48 2013
@@ -175,11 +175,11 @@ public class ProviderGenerator extends R
             );
 
             for (Map.Entry<Object, Object> entry : provider.getProperties().entrySet()) {
-                final String key = Strings.lcfirst(entry.getKey().toString());
-                final String Key = Strings.ucfirst(key);
+                final String lcFirstKey = Strings.lcfirst(entry.getKey().toString());
+                final String ucFirstKey = Strings.ucfirst(lcFirstKey);
                 final String value = entry.getValue().toString();
 
-                final String type = guessType(key, value);
+                final String type = guessType(lcFirstKey, value);
 
                 // builder method
 
@@ -190,8 +190,8 @@ public class ProviderGenerator extends R
                                 "    }\n")
                         .apply(
                                 "builder", builder,
-                                "key", key,
-                                "Key", Key,
+                                "key", lcFirstKey,
+                                "Key", ucFirstKey,
                                 "value", value,
                                 "type", type
                         )
@@ -204,8 +204,8 @@ public class ProviderGenerator extends R
                                 "        this.${key} = ${key};\n" +
                                 "    }\n")
                         .apply(
-                                "key", key,
-                                "Key", Key,
+                                "key", lcFirstKey,
+                                "Key", ucFirstKey,
                                 "value", value,
                                 "type", type
                         )
@@ -217,8 +217,8 @@ public class ProviderGenerator extends R
                                 "        return ${key};\n" +
                                 "    }\n")
                         .apply(
-                                "key", key,
-                                "Key", Key,
+                                "key", lcFirstKey,
+                                "Key", ucFirstKey,
                                 "value", value,
                                 "type", type
                         )
@@ -231,8 +231,8 @@ public class ProviderGenerator extends R
                                     "    }\n")
                             .apply(
                                     "builder", builder,
-                                    "key", key,
-                                    "Key", Key,
+                                    "key", lcFirstKey,
+                                    "Key", ucFirstKey,
                                     "value", value,
                                     "type", type
                             )
@@ -243,15 +243,15 @@ public class ProviderGenerator extends R
                                     "        set${Key}(new Duration(time, unit));\n" +
                                     "    }\n")
                             .apply(
-                                    "key", key,
-                                    "Key", Key,
+                                    "key", lcFirstKey,
+                                    "Key", ucFirstKey,
                                     "value", value,
                                     "type", type
                             )
                     );
                 }
 
-                final String s = key.toLowerCase();
+                final String s = lcFirstKey.toLowerCase();
                 if ("long".equals(type) && s.contains("time")) {
                     TimeUnit unit = null;
                     if (s.endsWith("millis")) {
@@ -269,8 +269,8 @@ public class ProviderGenerator extends R
                     if (unit == null) continue;
 
                     final Pattern pattern = Pattern.compile("(millis(econds)?|seconds|minutes|hours)", Pattern.CASE_INSENSITIVE);
-                    final String key2 = pattern.matcher(key).replaceAll("");
-                    final String Key2 = pattern.matcher(Key).replaceAll("");
+                    final String lcFirstKey2 = pattern.matcher(lcFirstKey).replaceAll("");
+                    final String ucFirstKey2 = pattern.matcher(ucFirstKey).replaceAll("");
 
                     out.println(template(
                             "    public ${builder} with${Key2}(long time, TimeUnit unit) {\n" +
@@ -278,10 +278,10 @@ public class ProviderGenerator extends R
                                     "    }\n")
                             .apply(
                                     "builder", builder,
-                                    "key2", key2,
-                                    "Key2", Key2,
-                                    "key", key,
-                                    "Key", Key,
+                                    "key2", lcFirstKey2,
+                                    "Key2", ucFirstKey2,
+                                    "key", lcFirstKey,
+                                    "Key", ucFirstKey,
                                     "value", value,
                                     "unit", unit.name(),
                                     "type", type
@@ -293,10 +293,10 @@ public class ProviderGenerator extends R
                                     "        set${Key}(TimeUnit.${unit}.convert(time, unit));\n" +
                                     "    }\n")
                             .apply(
-                                    "key2", key2,
-                                    "Key2", Key2,
-                                    "key", key,
-                                    "Key", Key,
+                                    "key2", lcFirstKey2,
+                                    "Key2", ucFirstKey2,
+                                    "key", lcFirstKey,
+                                    "Key", ucFirstKey,
                                     "value", value,
                                     "unit", unit.name(),
                                     "type", type

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/PropertiesLoginModule.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/PropertiesLoginModule.java?rev=1547910&r1=1547909&r2=1547910&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/PropertiesLoginModule.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/core/security/jaas/PropertiesLoginModule.java Wed Dec  4 20:57:48 2013
@@ -44,8 +44,8 @@ import static org.apache.openejb.loader.
  */
 public class PropertiesLoginModule implements LoginModule {
 
-    private final String USER_FILE = "UsersFile";
-    private final String GROUP_FILE = "GroupsFile";
+    private static final String USER_FILE = "UsersFile";
+    private static final String GROUP_FILE = "GroupsFile";
 
     private static Logger log = Logger.getInstance(LogCategory.OPENEJB_SECURITY, "org.apache.openejb.util.resources");
 

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=1547910&r1=1547909&r2=1547910&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 Wed Dec  4 20:57:48 2013
@@ -168,8 +168,8 @@ public class EJBCronTrigger extends Cron
 
             String[] expressions = expr.split(",");
 
-            for (String sub_expression : expressions) {
-                validateExpression(field, sub_expression);
+            for (String subExpression : expressions) {
+                validateExpression(field, subExpression);
             }
 
         } else {

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Messages.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Messages.java?rev=1547910&r1=1547909&r2=1547910&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Messages.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/Messages.java Wed Dec  4 20:57:48 2013
@@ -31,10 +31,10 @@ public class Messages {
     static private Map<String, Map<String, MessageFormat>> _rbFormats = new ConcurrentHashMap<String, Map<String, MessageFormat>>();
     static private Locale _globalLocale;
 
-    private ResourceBundle _messages;
-    private Map<String, MessageFormat> _formats;
-    private Locale _locale;
-    private String _resourceName;
+    private ResourceBundle messages;
+    private Map<String, MessageFormat> formats;
+    private Locale locale;
+    private String resourceName;
 
     public Messages(Class clazz) {
         this(packageName(clazz));
@@ -46,36 +46,36 @@ public class Messages {
     }
 
     public Messages(String resourceName) {
-        _resourceName = resourceName + ".Messages";
+        this.resourceName = resourceName + ".Messages";
         synchronized (Messages.class) {
-            _locale = _globalLocale;
+            locale = _globalLocale;
         }
     }
 
     protected void init() {
-        if (_formats != null && _messages != null) {
+        if (formats != null && messages != null) {
             return;
         }
 
-        final ResourceBundle rb = _rbBundles.get(_resourceName);
+        final ResourceBundle rb = _rbBundles.get(resourceName);
         if (rb == null) {
             try {
-                if (_locale == null) {
-                    _messages = ResourceBundle.getBundle(_resourceName);
+                if (locale == null) {
+                    messages = ResourceBundle.getBundle(resourceName);
                 } else {
-                    _messages = ResourceBundle.getBundle(_resourceName, _locale);
+                    messages = ResourceBundle.getBundle(resourceName, locale);
                 }
             } catch (Exception except) {
-                _messages = new EmptyResourceBundle();
+                messages = new EmptyResourceBundle();
             }
 
-            _formats = new ConcurrentHashMap<String, MessageFormat>();
+            formats = new ConcurrentHashMap<String, MessageFormat>();
 
-            _rbBundles.put(_resourceName, _messages);
-            _rbFormats.put(_resourceName, _formats);
+            _rbBundles.put(resourceName, messages);
+            _rbFormats.put(resourceName, formats);
         } else {
-            _messages = rb;
-            _formats = _rbFormats.get(_resourceName);
+            messages = rb;
+            formats = _rbFormats.get(resourceName);
         }
     }
 
@@ -85,7 +85,7 @@ public class Messages {
 
     public String format(String message, Object... args) {
         init();
-        if (_locale != _globalLocale) {
+        if (locale != _globalLocale) {
             synchronized (Messages.class) {
                 init();
             }
@@ -95,15 +95,15 @@ public class Messages {
         String msg;
 
         try {
-            mf = (MessageFormat) _formats.get(message);
+            mf = (MessageFormat) formats.get(message);
             if (mf == null) {
                 try {
-                    msg = _messages.getString(message);
+                    msg = messages.getString(message);
                 } catch (MissingResourceException except) {
                     return message + (args != null ? " " + Arrays.toString(args) : "");
                 }
                 mf = new MessageFormat(msg);
-                _formats.put(message, mf);
+                formats.put(message, mf);
             }
             return mf.format(args);
         } catch (Exception except) {
@@ -113,14 +113,14 @@ public class Messages {
 
     public String message(String message) {
         init();
-        if (_locale != _globalLocale) {
+        if (locale != _globalLocale) {
             synchronized (Messages.class) {
                 init();
             }
         }
 
         try {
-            return _messages.getString(message);
+            return messages.getString(message);
         } catch (MissingResourceException except) {
             return message;
         }

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java?rev=1547910&r1=1547909&r2=1547910&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/QueryProxy.java Wed Dec  4 20:57:48 2013
@@ -60,8 +60,8 @@ public class QueryProxy implements Invoc
     public static final String AND = "And";
 
     // cache for finders of the current instance
-    private final Map<String, Class<?>> RETURN_TYPES = new ConcurrentHashMap<String, Class<?>>();
-    private final Map<String, List<String>> CONDITIONS = new ConcurrentHashMap<String, List<String>>();
+    private final Map<String, Class<?>> returnsTypes = new ConcurrentHashMap<String, Class<?>>();
+    private final Map<String, List<String>> conditions = new ConcurrentHashMap<String, List<String>>();
 
     private EntityManager em;
 
@@ -197,11 +197,11 @@ public class QueryProxy implements Invoc
     private Class<?> getReturnedType(Method method) {
         final String methodName = method.getName();
         Class<?> type;
-        if (RETURN_TYPES.containsKey(methodName)) {
-            type = RETURN_TYPES.get(methodName);
+        if (returnsTypes.containsKey(methodName)) {
+            type = returnsTypes.get(methodName);
         } else {
             type = getGenericType(method.getGenericReturnType());
-            RETURN_TYPES.put(methodName, type);
+            returnsTypes.put(methodName, type);
         }
         return type;
     }
@@ -350,8 +350,8 @@ public class QueryProxy implements Invoc
 
     private List<String> parseMethodName(final String methodName) {
         List<String> parsed;
-        if (CONDITIONS.containsKey(methodName)) {
-            parsed = CONDITIONS.get(methodName);
+        if (conditions.containsKey(methodName)) {
+            parsed = conditions.get(methodName);
         } else {
             parsed = new ArrayList<String>();
 
@@ -364,7 +364,7 @@ public class QueryProxy implements Invoc
                 }
             }
 
-            CONDITIONS.put(methodName, parsed);
+            conditions.put(methodName, parsed);
         }
         return parsed;
     }

Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1547910&r1=1547909&r2=1547910&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Wed Dec  4 20:57:48 2013
@@ -384,45 +384,6 @@
       </modules>
     </profile>
     <profile>
-      <id>style</id>
-      <modules>
-      </modules>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-checkstyle-plugin</artifactId>
-            <version>2.9.1</version>
-            <configuration>
-              <sourceDirectory>${project.build.directory}/../container/openejb-core/src/main/java/org/apache/openejb/config</sourceDirectory>
-              <configLocation>checkstyle.xml</configLocation>
-              <consoleOutput>true</consoleOutput>
-              <enableRulesSummary>false</enableRulesSummary>
-              <failsOnError>true</failsOnError>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-      <repositories>
-        <repository>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <id>Codehaus Snapshots</id>
-          <url>http://snapshots.repository.codehaus.org/</url>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <id>Codehaus Snapshots</id>
-          <url>http://snapshots.repository.codehaus.org/</url>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-    <profile>
       <id>rat</id>
       <modules>
         <module>deps</module>