From ab6904bc2f622129bc548391745b08eb0c219e57 Mon Sep 17 00:00:00 2001 From: rfeng Date: Tue, 21 Jul 2009 07:03:47 +0000 Subject: Fix svn:eol-style and svn:keywords properties for java/xml files git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@796166 13f79535-47bb-0310-9956-ffa450edef68 --- java/sca/modules/myfaces/pom.xml | 152 ++++++++++----------- .../TuscanyAnnotationLifecycleProvider.java | 138 +++++++++---------- .../sca/myfaces/TuscanyAnnotationProcessor.java | 106 +++++++------- 3 files changed, 198 insertions(+), 198 deletions(-) (limited to 'java/sca/modules/myfaces') diff --git a/java/sca/modules/myfaces/pom.xml b/java/sca/modules/myfaces/pom.xml index c911016783..9e6f742ce3 100644 --- a/java/sca/modules/myfaces/pom.xml +++ b/java/sca/modules/myfaces/pom.xml @@ -1,76 +1,76 @@ - - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-modules - 2.0-SNAPSHOT - ../pom.xml - - - tuscany-myfaces - Apache Tuscany SCA MyFaces JSF Integration - - - - org.apache.tuscany.sca - tuscany-host-webapp - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-web-runtime - 2.0-SNAPSHOT - - - - org.apache.myfaces.core - myfaces-api - 1.2.2 - compile - - - - org.apache.myfaces.core - myfaces-impl - 1.2.2 - compile - - - - javax.servlet - jstl - 1.1.2 - runtime - - - - javax.servlet - servlet-api - 2.5 - provided - - - - - + + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-modules + 2.0-SNAPSHOT + ../pom.xml + + + tuscany-myfaces + Apache Tuscany SCA MyFaces JSF Integration + + + + org.apache.tuscany.sca + tuscany-host-webapp + 2.0-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-implementation-web-runtime + 2.0-SNAPSHOT + + + + org.apache.myfaces.core + myfaces-api + 1.2.2 + compile + + + + org.apache.myfaces.core + myfaces-impl + 1.2.2 + compile + + + + javax.servlet + jstl + 1.1.2 + runtime + + + + javax.servlet + servlet-api + 2.5 + provided + + + + + diff --git a/java/sca/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationLifecycleProvider.java b/java/sca/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationLifecycleProvider.java index 1ab88d722f..b1ef8eb3ed 100644 --- a/java/sca/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationLifecycleProvider.java +++ b/java/sca/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationLifecycleProvider.java @@ -1,69 +1,69 @@ -/* - * 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. - */ - -package org.apache.tuscany.sca.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.myfaces.config.annotation.DiscoverableLifecycleProvider; -import org.apache.myfaces.shared_impl.util.ClassUtils; - -public class TuscanyAnnotationLifecycleProvider implements DiscoverableLifecycleProvider { - private static final Logger logger = Logger.getLogger(TuscanyAnnotationLifecycleProvider.class.getName()); - - private TuscanyAnnotationProcessor annotationProcessor; - private ServletContext servletContext; - - - public TuscanyAnnotationLifecycleProvider(ExternalContext externalContext) { - this.servletContext = (ServletContext)externalContext.getContext(); - - // TODO: Should this use any existing AnnotationProcessor? - // Tomcat based runtimes may use an org.apache.AnnotationProcessor which - // if exists this could delegate to so as to support both SCA and other annotations - // AnnotationProcessor existingAnnotationProcessor = (AnnotationProcessor) - // servletContext.getAttribute(org.apache.AnnotationProcessor.class.getName()); - // annotationProcessor = new TuscanyAnnotationProcessor(existingAnnotationProcessor); - annotationProcessor = new TuscanyAnnotationProcessor(); - } - - public Object newInstance(String className) throws InstantiationException, IllegalAccessException, InvocationTargetException, NamingException, ClassNotFoundException { - logger.info("Creating instance of " + className); - Class clazz = ClassUtils.classForName(className); - Object object = clazz.newInstance(); - annotationProcessor.processAnnotations(object, servletContext); - annotationProcessor.postConstruct(object); - return object; - } - - public boolean isAvailable() { - return true; - } - - public void destroyInstance(Object o) throws IllegalAccessException, InvocationTargetException { - logger.info("Destroy instance of " + o.getClass().getName()); - annotationProcessor.preDestroy(o); - } - -} +/* + * 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. + */ + +package org.apache.tuscany.sca.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.myfaces.config.annotation.DiscoverableLifecycleProvider; +import org.apache.myfaces.shared_impl.util.ClassUtils; + +public class TuscanyAnnotationLifecycleProvider implements DiscoverableLifecycleProvider { + private static final Logger logger = Logger.getLogger(TuscanyAnnotationLifecycleProvider.class.getName()); + + private TuscanyAnnotationProcessor annotationProcessor; + private ServletContext servletContext; + + + public TuscanyAnnotationLifecycleProvider(ExternalContext externalContext) { + this.servletContext = (ServletContext)externalContext.getContext(); + + // TODO: Should this use any existing AnnotationProcessor? + // Tomcat based runtimes may use an org.apache.AnnotationProcessor which + // if exists this could delegate to so as to support both SCA and other annotations + // AnnotationProcessor existingAnnotationProcessor = (AnnotationProcessor) + // servletContext.getAttribute(org.apache.AnnotationProcessor.class.getName()); + // annotationProcessor = new TuscanyAnnotationProcessor(existingAnnotationProcessor); + annotationProcessor = new TuscanyAnnotationProcessor(); + } + + public Object newInstance(String className) throws InstantiationException, IllegalAccessException, InvocationTargetException, NamingException, ClassNotFoundException { + logger.info("Creating instance of " + className); + Class clazz = ClassUtils.classForName(className); + Object object = clazz.newInstance(); + annotationProcessor.processAnnotations(object, servletContext); + annotationProcessor.postConstruct(object); + return object; + } + + public boolean isAvailable() { + return true; + } + + public void destroyInstance(Object o) throws IllegalAccessException, InvocationTargetException { + logger.info("Destroy instance of " + o.getClass().getName()); + annotationProcessor.preDestroy(o); + } + +} diff --git a/java/sca/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationProcessor.java b/java/sca/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationProcessor.java index aef91bdccb..4a05fa5856 100644 --- a/java/sca/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationProcessor.java +++ b/java/sca/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationProcessor.java @@ -1,53 +1,53 @@ -/* - * 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. - */ - -package org.apache.tuscany.sca.myfaces; - -import java.lang.reflect.InvocationTargetException; - -import javax.naming.NamingException; -import javax.servlet.ServletContext; - -import org.apache.tuscany.sca.implementation.web.runtime.utils.ContextHelper; - -//public class TuscanyAnnotationProcessor implements org.apache.AnnotationProcessor { -public class TuscanyAnnotationProcessor { - -// private AnnotationProcessor annotationProcessor; - - public TuscanyAnnotationProcessor() { - } - - public void postConstruct(Object arg0) throws IllegalAccessException, InvocationTargetException { -// annotationProcessor.postConstruct(arg0); - } - - public void preDestroy(Object arg0) throws IllegalAccessException, InvocationTargetException { -// annotationProcessor.preDestroy(arg0); - } - - public void processAnnotations(Object arg0, ServletContext servletContext) throws IllegalAccessException, InvocationTargetException, NamingException { - ContextHelper.inject(arg0, servletContext); -// annotationProcessor.processAnnotations(arg0); - } - - public void processAnnotations(Object arg0) throws IllegalAccessException, InvocationTargetException, NamingException { -// annotationProcessor.processAnnotations(arg0); - } -} +/* + * 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. + */ + +package org.apache.tuscany.sca.myfaces; + +import java.lang.reflect.InvocationTargetException; + +import javax.naming.NamingException; +import javax.servlet.ServletContext; + +import org.apache.tuscany.sca.implementation.web.runtime.utils.ContextHelper; + +//public class TuscanyAnnotationProcessor implements org.apache.AnnotationProcessor { +public class TuscanyAnnotationProcessor { + +// private AnnotationProcessor annotationProcessor; + + public TuscanyAnnotationProcessor() { + } + + public void postConstruct(Object arg0) throws IllegalAccessException, InvocationTargetException { +// annotationProcessor.postConstruct(arg0); + } + + public void preDestroy(Object arg0) throws IllegalAccessException, InvocationTargetException { +// annotationProcessor.preDestroy(arg0); + } + + public void processAnnotations(Object arg0, ServletContext servletContext) throws IllegalAccessException, InvocationTargetException, NamingException { + ContextHelper.inject(arg0, servletContext); +// annotationProcessor.processAnnotations(arg0); + } + + public void processAnnotations(Object arg0) throws IllegalAccessException, InvocationTargetException, NamingException { +// annotationProcessor.processAnnotations(arg0); + } +} -- cgit v1.2.3