openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r954210 - in /openwebbeans/trunk: webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/
Date Sun, 13 Jun 2010 12:28:21 GMT
Author: struberg
Date: Sun Jun 13 12:28:21 2010
New Revision: 954210

URL: http://svn.apache.org/viewvc?rev=954210&view=rev
Log:
OWB-275 code cleanup

Modified:
    openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/BeansImpl.java
    openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ContainersImpl.java
    openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ContextsImpl.java
    openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
    openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/TomcatConnector.java
    openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java
    openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceProcessor.java

Modified: openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/BeansImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/BeansImpl.java?rev=954210&r1=954209&r2=954210&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/BeansImpl.java
(original)
+++ openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/BeansImpl.java
Sun Jun 13 12:28:21 2010
@@ -52,24 +52,28 @@ public class BeansImpl implements Beans
         return bean;
     }
 
-    public boolean isEnterpriseBean( Class<?> clazz ) {
+    public boolean isEnterpriseBean( Class<?> clazz )
+    {
         return false;
     }
 
-    public boolean isEntityBean( Class<?> clazz ) 
+    public boolean isEntityBean( Class<?> clazz )
     {
         return (AnnotationUtil.hasClassAnnotation(clazz, Entity.class));
     }        
 
-    public boolean isProxy( Object instance ) {
+    public boolean isProxy( Object instance )
+    {
         return instance.getClass().getName().contains("$$");
     }
 
-    public boolean isStatefulBean( Class<?> clazz ) {
+    public boolean isStatefulBean( Class<?> clazz )
+    {
         return false;
     }
 
-    public boolean isStatelessBean( Class<?> clazz ) {
+    public boolean isStatelessBean( Class<?> clazz )
+    {
         return false;
     }
 

Modified: openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ContainersImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ContainersImpl.java?rev=954210&r1=954209&r2=954210&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ContainersImpl.java
(original)
+++ openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ContainersImpl.java
Sun Jun 13 12:28:21 2010
@@ -73,7 +73,8 @@ public class ContainersImpl extends Tomc
                     }                    
                 }
                 
-            }finally
+            }
+            finally
             {
                 method.releaseConnection();
             }

Modified: openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ContextsImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ContextsImpl.java?rev=954210&r1=954209&r2=954210&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ContextsImpl.java
(original)
+++ openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/ContextsImpl.java
Sun Jun 13 12:28:21 2010
@@ -52,7 +52,8 @@ public class ContextsImpl implements Con
         context.setActive(false);
     }
 
-    public AbstractContext getDependentContext() {
+    public AbstractContext getDependentContext()
+    {
         return (AbstractContext) ContextFactory.getStandardContext(ContextTypes.DEPENDENT);
     }
 

Modified: openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java?rev=954210&r1=954209&r2=954210&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
(original)
+++ openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
Sun Jun 13 12:28:21 2010
@@ -83,7 +83,8 @@ public class StandaloneContainersImpl im
             
             this.lifeCycle.startApplication(null);
             
-        }catch(Throwable e)
+        }
+        catch(Throwable e)
         {
             e.printStackTrace();
             this.excpetion = new DeploymentException("Standalone Container Impl.",e);
@@ -183,7 +184,8 @@ public class StandaloneContainersImpl im
         return deployInternal(classes, xmls);
     }
     
-    private void setUp(Collection<Class<?>> classes){
+    private void setUp(Collection<Class<?>> classes)
+    {
         
         try
         {
@@ -206,7 +208,8 @@ public class StandaloneContainersImpl im
             Properties properties = new Properties(System.getProperties());
             properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, InitContextFactory.class.getName());
             new InitialContext(properties);            
-        }catch(Exception e)
+        }
+        catch(Exception e)
         {
             e.printStackTrace();
         }

Modified: openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/TomcatConnector.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/TomcatConnector.java?rev=954210&r1=954209&r2=954210&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/TomcatConnector.java
(original)
+++ openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/TomcatConnector.java
Sun Jun 13 12:28:21 2010
@@ -56,7 +56,8 @@ public class TomcatConnector extends Abs
 
    public TomcatConnector() throws IOException
    {
-      logger.info("You must add the the tests/secret user to Tomcat, for example, in $CATALINA_BASE/conf/tomcat-users.xml
add <user name=\"tests\" password=\"secret\" roles=\"standard,manager\" />");
+      logger.info("You must add the the tests/secret user to Tomcat, for example, in $CATALINA_BASE/conf/tomcat-users.xml
add " +
+                  "<user name=\"tests\" password=\"secret\" roles=\"standard,manager\"
/>");
       tmpdir = new File(System.getProperty("java.io.tmpdir"), "org.jboss.webbeans.tck.integration.jbossas");
       tmpdir.mkdir();
       tmpdir.deleteOnExit();

Modified: openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java?rev=954210&r1=954209&r2=954210&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java
(original)
+++ openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java
Sun Jun 13 12:28:21 2010
@@ -1,18 +1,18 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
+ * or more contributor license agreements. See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
+ * 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
+ * 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
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  */
@@ -39,7 +39,7 @@ import org.apache.webbeans.util.Security
 
 public class StandaloneResourceInjectionService implements ResourceInjectionService
 {
-    private static final StandaloneResourceProcessor processor = StandaloneResourceProcessor.getProcessor();
+    private final StandaloneResourceProcessor processor = StandaloneResourceProcessor.getProcessor();
     
     private static final WebBeansLogger logger = WebBeansLogger.getLogger(StandaloneResourceInjectionService.class);
 
@@ -95,12 +95,14 @@ public class StandaloneResourceInjection
                             SecurityUtil.doPrivilegedSetAccessible(field, true);
                             field.set(managedBeanInstance, getResourceReference(resourceRef));
                             
-                        }catch(Exception e)
+                        }
+                        catch(Exception e)
                         {
                             logger.error(OWBLogConst.ERROR_0025, e, field);
                             throw new WebBeansException(MessageFormat.format(logger.getTokenString(OWBLogConst.ERROR_0025),
field), e);
                             
-                        }finally
+                        }
+                        finally
                         {
                             SecurityUtil.doPrivilegedSetAccessible(field, acess);
                         }                        

Modified: openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceProcessor.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceProcessor.java?rev=954210&r1=954209&r2=954210&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceProcessor.java
(original)
+++ openwebbeans/trunk/webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceProcessor.java
Sun Jun 13 12:28:21 2010
@@ -40,7 +40,7 @@ public class StandaloneResourceProcessor
     
     private static WebBeansLogger logger = WebBeansLogger.getLogger(StandaloneResourceProcessor.class);
     
-    private static final StandaloneResourceProcessor processor = new StandaloneResourceProcessor();
+    private static StandaloneResourceProcessor processor = new StandaloneResourceProcessor();
     
     /**
      *  A cache for EntityManagerFactories.
@@ -53,7 +53,8 @@ public class StandaloneResourceProcessor
         {
             context = new InitialContext();
             
-        }catch(Exception e)
+        }
+        catch(Exception e)
         {
             throw new ExceptionInInitializerError(e);
         }
@@ -166,7 +167,8 @@ public class StandaloneResourceProcessor
             {
                 factory.close();
                 
-            }catch(Exception e)
+            }
+            catch(Exception e)
             {
                 logger.warn(OWBLogConst.WARN_0006, e, key);
             }



Mime
View raw message