summaryrefslogtreecommitdiffstats
path: root/java/sca
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-03-02 08:56:07 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2009-03-02 08:56:07 +0000
commit9fb7e225d5e387bab48312eab567a3661214558a (patch)
tree212807b424f77fa1038ce4f7ab0517508a71c5c7 /java/sca
parenta4cf73926c2e560a3a51b6d5e10027efeefb6a3b (diff)
Clean up some dependencies
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@749239 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca')
-rw-r--r--java/sca/modules/myfaces/META-INF/MANIFEST.MF26
-rw-r--r--java/sca/modules/myfaces/src/main/java/org/apache/tuscany/myfaces/TuscanyAnnotationLifecycleProvider.java8
2 files changed, 12 insertions, 22 deletions
diff --git a/java/sca/modules/myfaces/META-INF/MANIFEST.MF b/java/sca/modules/myfaces/META-INF/MANIFEST.MF
index 002b57b46e..7a89c80b5c 100644
--- a/java/sca/modules/myfaces/META-INF/MANIFEST.MF
+++ b/java/sca/modules/myfaces/META-INF/MANIFEST.MF
@@ -1,31 +1,21 @@
Manifest-Version: 1.0
Tool: Bnd-0.0.255
-Bundle-Name: Apache Tuscany SCA Webapp Host
+Bundle-Name: Apache Tuscany MyFaces JSF Integration
Created-By: 1.6.0_07 (Sun Microsystems Inc.)
Bundle-Vendor: The Apache Software Foundation
Bundle-Version: 2.0
Bnd-LastModified: 1222833658000
Bundle-ManifestVersion: 2
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-Description: Apache Tuscany SCA Stripes
+Bundle-Description: Apache Tuscany SCA MyFaces JSF Integration
Import-Package: javax.naming,
javax.servlet,
- javax.servlet.http,
- javax.servlet.jsp,
- javax.servlet.jsp.tagext,
- net.sourceforge.stripes;version="1.5",
- net.sourceforge.stripes.action;version="1.5",
- net.sourceforge.stripes.config;version="1.5",
- net.sourceforge.stripes.controller;version="1.5",
- net.sourceforge.stripes.exception;version="1.5",
- net.sourceforge.stripes.util;version="1.5",
- org.apache.tuscany.sca.core;version="2.0",
- org.apache.tuscany.sca.host.http;version="2.0",
- org.apache.tuscany.sca.host.webapp;version="2.0",
+ javax.faces.context;version="1.2.2",
+ org.apache.myfaces.config.annotation;version="1.2.2",
+ org.apache.myfaces.shared_impl.util;version="1.2.2",
+ org.apache.tuscany.sca.node.impl;version="2.0",
org.apache.tuscany.sca.implementation.web.runtime.utils;version="2.0",
- org.apache.tuscany.sca.node;version="2.0.0",
- org.oasisopen.sca;version="2.0",
- org.oasisopen.sca.annotation;version="2.0"
-Bundle-SymbolicName: org.apache.tuscany.sca.stripes
+ org.apache;version="6.0.18"
+Bundle-SymbolicName: org.apache.tuscany.sca.myfaces
Bundle-DocURL: http://www.apache.org/
diff --git a/java/sca/modules/myfaces/src/main/java/org/apache/tuscany/myfaces/TuscanyAnnotationLifecycleProvider.java b/java/sca/modules/myfaces/src/main/java/org/apache/tuscany/myfaces/TuscanyAnnotationLifecycleProvider.java
index a7152206eb..8f9000ffe6 100644
--- a/java/sca/modules/myfaces/src/main/java/org/apache/tuscany/myfaces/TuscanyAnnotationLifecycleProvider.java
+++ b/java/sca/modules/myfaces/src/main/java/org/apache/tuscany/myfaces/TuscanyAnnotationLifecycleProvider.java
@@ -20,20 +20,20 @@
package org.apache.tuscany.myfaces;
import java.lang.reflect.InvocationTargetException;
+import java.util.logging.Logger;
import javax.faces.context.ExternalContext;
import javax.naming.NamingException;
import javax.servlet.ServletContext;
import org.apache.AnnotationProcessor;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.myfaces.config.annotation.DiscoverableLifecycleProvider;
import org.apache.myfaces.config.annotation.TomcatAnnotationLifecycleProvider;
import org.apache.myfaces.shared_impl.util.ClassUtils;
+import org.apache.tuscany.sca.node.impl.NodeImpl;
public class TuscanyAnnotationLifecycleProvider extends TomcatAnnotationLifecycleProvider implements DiscoverableLifecycleProvider {
- private static Log log = LogFactory.getLog(TomcatAnnotationLifecycleProvider.class);
+ private static final Logger logger = Logger.getLogger(TuscanyAnnotationLifecycleProvider.class.getName());
private TuscanyAnnotationProcessor annotationProcessor;
private ServletContext servletContext;
@@ -48,7 +48,7 @@ public class TuscanyAnnotationLifecycleProvider extends TomcatAnnotationLifecycl
public Object newInstance(String className) throws InstantiationException, IllegalAccessException, InvocationTargetException, NamingException, ClassNotFoundException {
Class<?> clazz = ClassUtils.classForName(className);
- log.info("Creating instance of " + className);
+ logger.info("Creating instance of " + className);
Object object = clazz.newInstance();
annotationProcessor.processAnnotations(object, servletContext);
annotationProcessor.postConstruct(object);