svn commit: r749232 - in /tuscany/java/sca/modules/myfaces/src/main/java/org/apache/tuscany/myfaces: TuscanyAnnotationLifecycleProvider.java TuscanyAnnotationProcessor.java

[antelder]

Author: antelder
Date: Mon Mar  2 08:24:51 2009
New Revision: 749232

URL: http://svn.apache.org/viewvc?rev=749232&view=rev
Log:
Clean up some code removing sysout printlns and commented out code

Modified:
    
tuscany/java/sca/modules/myfaces/src/main/java/org/apache/tuscany/myfaces/TuscanyAnnotationLifecycleProvider.java
    
tuscany/java/sca/modules/myfaces/src/main/java/org/apache/tuscany/myfaces/TuscanyAnnotationProcessor.java

Modified: 
tuscany/java/sca/modules/myfaces/src/main/java/org/apache/tuscany/myfaces/TuscanyAnnotationLifecycleProvider.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/myfaces/src/main/java/org/apache/tuscany/myfaces/TuscanyAnnotationLifecycleProvider.java?rev=749232&r1=749231&r2=749232&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/myfaces/src/main/java/org/apache/tuscany/myfaces/TuscanyAnnotationLifecycleProvider.java
 (original)
+++ 
tuscany/java/sca/modules/myfaces/src/main/java/org/apache/tuscany/myfaces/TuscanyAnnotationLifecycleProvider.java
 Mon Mar  2 08:24:51 2009
@@ -36,43 +36,24 @@
     private static Log log = 
LogFactory.getLog(TomcatAnnotationLifecycleProvider.class);
 
     private TuscanyAnnotationProcessor annotationProcessor;
-    private ExternalContext externalContext;
-    private ServletContext sc;
+    private ServletContext servletContext;
 
     public TuscanyAnnotationLifecycleProvider(ExternalContext externalContext) 
{
         super(externalContext);
-        this.externalContext = externalContext;
-        this.sc = (ServletContext)externalContext.getContext();
-        AnnotationProcessor ap = 
(org.apache.AnnotationProcessor)sc.getAttribute(org.apache.AnnotationProcessor.class.getName());
+        this.servletContext = (ServletContext)externalContext.getContext();
+        AnnotationProcessor ap = 
(org.apache.AnnotationProcessor)servletContext.getAttribute(org.apache.AnnotationProcessor.class.getName());
         annotationProcessor = new TuscanyAnnotationProcessor(ap);
     }
 
     public Object newInstance(String className) throws InstantiationException, 
IllegalAccessException, InvocationTargetException, NamingException, 
ClassNotFoundException {
 
-        System.out.println("foo newInstance: " + className);
-
-        Class clazz = ClassUtils.classForName(className);
+        Class<?> clazz = ClassUtils.classForName(className);
         log.info("Creating instance of " + className);
         Object object = clazz.newInstance();
-        annotationProcessor.processAnnotations(object, sc);
+        annotationProcessor.processAnnotations(object, servletContext);
         annotationProcessor.postConstruct(object);
 
         return object;
     }
 
-//    public boolean isAvailable() {
-//        try {
-//            ServletContext sc = (ServletContext)externalContext.getContext();
-//            AnnotationProcessor ap = 
(org.apache.AnnotationProcessor)sc.getAttribute(org.apache.AnnotationProcessor.class.getName());
-//
-//            annotationProcessor = new TuscanyAnnotationProcessor(ap);
-//            sc.setAttribute(org.apache.AnnotationProcessor.class.getName(), 
annotationProcessor);
-//
-//            return super.isAvailable();
-//        } catch (Exception e) {
-//            // ignore
-//        }
-//        return false;
-//    }
-
 }

Modified: 
tuscany/java/sca/modules/myfaces/src/main/java/org/apache/tuscany/myfaces/TuscanyAnnotationProcessor.java
URL: 
http://svn.apache.org/viewvc/tuscany/java/sca/modules/myfaces/src/main/java/org/apache/tuscany/myfaces/TuscanyAnnotationProcessor.java?rev=749232&r1=749231&r2=749232&view=diff
==============================================================================
--- 
tuscany/java/sca/modules/myfaces/src/main/java/org/apache/tuscany/myfaces/TuscanyAnnotationProcessor.java
 (original)
+++ 
tuscany/java/sca/modules/myfaces/src/main/java/org/apache/tuscany/myfaces/TuscanyAnnotationProcessor.java
 Mon Mar  2 08:24:51 2009
@@ -44,7 +44,6 @@
     }
 
     public void processAnnotations(Object arg0, ServletContext servletContext) 
throws IllegalAccessException, InvocationTargetException, NamingException {
-        System.out.println("foo2 processAnnotations: " + arg0);
         ContextHelper.inject(arg0, servletContext);
         annotationProcessor.processAnnotations(arg0);
     }