From d1a96a1d9f189ec86d51fc9e4a315879b35be1d0 Mon Sep 17 00:00:00 2001 From: antelder Date: Fri, 31 Jul 2009 10:49:22 +0000 Subject: Rename 2.0 M3 final RC tag git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@799570 13f79535-47bb-0310-9956-ffa450edef68 --- tags/java/sca/2.0-M3-RC5/modules/myfaces/LICENSE | 241 --------------------- .../modules/myfaces/META-INF/MANIFEST.MF | 20 -- tags/java/sca/2.0-M3-RC5/modules/myfaces/NOTICE | 12 - tags/java/sca/2.0-M3-RC5/modules/myfaces/pom.xml | 76 ------- .../TuscanyAnnotationLifecycleProvider.java | 69 ------ .../sca/myfaces/TuscanyAnnotationProcessor.java | 53 ----- 6 files changed, 471 deletions(-) delete mode 100644 tags/java/sca/2.0-M3-RC5/modules/myfaces/LICENSE delete mode 100644 tags/java/sca/2.0-M3-RC5/modules/myfaces/META-INF/MANIFEST.MF delete mode 100644 tags/java/sca/2.0-M3-RC5/modules/myfaces/NOTICE delete mode 100644 tags/java/sca/2.0-M3-RC5/modules/myfaces/pom.xml delete mode 100644 tags/java/sca/2.0-M3-RC5/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationLifecycleProvider.java delete mode 100644 tags/java/sca/2.0-M3-RC5/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationProcessor.java (limited to 'tags/java/sca/2.0-M3-RC5/modules/myfaces') diff --git a/tags/java/sca/2.0-M3-RC5/modules/myfaces/LICENSE b/tags/java/sca/2.0-M3-RC5/modules/myfaces/LICENSE deleted file mode 100644 index c77d3fe856..0000000000 --- a/tags/java/sca/2.0-M3-RC5/modules/myfaces/LICENSE +++ /dev/null @@ -1,241 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. - -=============================================================================== - -Apache Tuscany SCA for Java Subcomponents -=========================================: - -The Tuscany SCA for Java release includes a number of subcomponents with -separate copyright notices and license terms. Your use of the source -code for the these subcomponents is subject to the terms and -conditions of the following licenses. - -=============================================================================== -The module host-webapp includes files under the following license: - -Permission to copy, display and distribute the Service Component Architecture Specification and/or -portions thereof, without modification, in any medium without fee or royalty is hereby granted, provided -that you include the following on ALL copies of the Service Component Architecture Specification, or -portions thereof, that you make: - -1. A link or URL to the Service Component Architecture Specification at this location: -· http://www.osoa.org/display/Main/Service+Component+Architecture+Specifications - -2. The full text of the copyright notice as shown in the Service Component Architecture Specification. - -BEA, Cape Clear, IBM, Interface21, IONA, Oracle, Primeton, Progress Software, Red Hat, Rogue Wave, -SAP, Siemens, Software AG., Sun, Sybase, TIBCO (collectively, the "Authors") agree to grant you a -royalty-free license, under reasonable, non-discriminatory terms and conditions to patents that they deem -necessary to implement the Service Component Architecture Specification. -THE Service Component Architecture SPECIFICATION IS PROVIDED "AS IS," AND THE -AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, -REGARDING THIS SPECIFICATION AND THE IMPLEMENTATION OF ITS CONTENTS, -INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A -PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE. -THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL -OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR -DISTRIBUTION OF THE Service Components Architecture SPECIFICATION. -The name and trademarks of the Authors may NOT be used in any manner, including advertising or -publicity pertaining to the Service Component Architecture Specification or its contents without specific, - diff --git a/tags/java/sca/2.0-M3-RC5/modules/myfaces/META-INF/MANIFEST.MF b/tags/java/sca/2.0-M3-RC5/modules/myfaces/META-INF/MANIFEST.MF deleted file mode 100644 index 2b52b751b9..0000000000 --- a/tags/java/sca/2.0-M3-RC5/modules/myfaces/META-INF/MANIFEST.MF +++ /dev/null @@ -1,20 +0,0 @@ -Manifest-Version: 1.0 -Tool: Bnd-0.0.255 -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 MyFaces JSF Integration -Import-Package: javax.naming, - javax.servlet, - 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" -Bundle-SymbolicName: org.apache.tuscany.sca.myfaces -Bundle-DocURL: http://www.apache.org/ -Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 diff --git a/tags/java/sca/2.0-M3-RC5/modules/myfaces/NOTICE b/tags/java/sca/2.0-M3-RC5/modules/myfaces/NOTICE deleted file mode 100644 index dfde08644b..0000000000 --- a/tags/java/sca/2.0-M3-RC5/modules/myfaces/NOTICE +++ /dev/null @@ -1,12 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2008 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - -This product also includes software under the Service Component Architecture specification license -(see the LICENSE file contained in this distribution) with the following copyright - -(c) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA -Technologies, Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens -AG., Software AG., Sun Microsystems, Inc., Sybase Inc., TIBCO Software Inc., 2005, 2008. All rights reserved. diff --git a/tags/java/sca/2.0-M3-RC5/modules/myfaces/pom.xml b/tags/java/sca/2.0-M3-RC5/modules/myfaces/pom.xml deleted file mode 100644 index b0129133aa..0000000000 --- a/tags/java/sca/2.0-M3-RC5/modules/myfaces/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-modules - 2.0-M3 - ../pom.xml - - - tuscany-myfaces - Apache Tuscany SCA MyFaces JSF Integration - - - - org.apache.tuscany.sca - tuscany-host-webapp - 2.0-M3 - - - - org.apache.tuscany.sca - tuscany-implementation-web-runtime - 2.0-M3 - - - - 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/tags/java/sca/2.0-M3-RC5/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationLifecycleProvider.java b/tags/java/sca/2.0-M3-RC5/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationLifecycleProvider.java deleted file mode 100644 index 1ab88d722f..0000000000 --- a/tags/java/sca/2.0-M3-RC5/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationLifecycleProvider.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * 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/tags/java/sca/2.0-M3-RC5/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationProcessor.java b/tags/java/sca/2.0-M3-RC5/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationProcessor.java deleted file mode 100644 index aef91bdccb..0000000000 --- a/tags/java/sca/2.0-M3-RC5/modules/myfaces/src/main/java/org/apache/tuscany/sca/myfaces/TuscanyAnnotationProcessor.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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