openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r732803 [1/17] - in /incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: ./ annotation/ component/ component/ejb/ component/jms/ component/xml/ config/ container/ context/ context/type/ decorator/ decorator/xml/ de...
Date Thu, 08 Jan 2009 19:41:33 GMT
Author: gerdogdu
Date: Thu Jan  8 11:41:30 2009
New Revision: 732803

URL: http://svn.apache.org/viewvc?rev=732803&view=rev
Log:
Formatting tabs to space.

Modified:
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/WebBeans.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/WebBeansConstants.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/CurrentLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeProductionLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeStandartLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/InitializedManagerLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ProductionLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/RequestedScopeLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/StandardLiteral.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractObservesComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/Component.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationComponent.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagerComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/NewComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservesMethodsOwner.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/WebBeansType.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ejb/EJBComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/jms/JMSComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerComponentImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/EJBWebBeansConfigurator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/SimpleWebBeansConfigurator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansScanner.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerObjectFactory.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ResolutionUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContextReference.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContextManager.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/WebBeansContext.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/type/ContextTypes.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorComparator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorsManager.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecoratorConfig.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/xml/WebBeansXMLDecorator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/DeploymentTypeManager.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeManager.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/stereotype/IStereoTypeModel.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/ejb/EJBConfig.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/ejb/EJBLookUp.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/ejb/EJBUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/ejb/orm/ORMUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/TransactionalNotifier.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/TransactionalObserverType.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/xml/BeanObserverXMLImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/ComponentNotFoundException.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/ContextRemoveException.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/ResolutionByNameException.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansConfigurationException.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansCreationException.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansDeploymentException.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansException.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/Injectable.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableConstructor.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableField.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableMethods.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectionPointModel.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorData.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataComparator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorType.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/WebBeansInterceptorConfig.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/ejb/EJBInterceptorConfig.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jpa/JPAUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/ConversationImpl.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/ConversationManager.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/WebBeansJSFFilter.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/WebBeansLifeCycle.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLogger.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/transaction/TransactionUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/Asserts.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/JNDIUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/JSFUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/StringUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansErrorHandler.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansNameSpaceContainer.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansResolver.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLAnnotationTypeManager.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLDefinitionUtil.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLSpecializesManager.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLUtil.java

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/WebBeans.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/WebBeans.java?rev=732803&r1=732802&r2=732803&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/WebBeans.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/WebBeans.java Thu Jan  8 11:41:30 2009
@@ -1,24 +1,20 @@
 /*
- *  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.
+ * 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.webbeans;
 
 /**
  * @author Administrator
- * 
  */
 public final class WebBeans
 {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/WebBeansConstants.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/WebBeansConstants.java?rev=732803&r1=732802&r2=732803&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/WebBeansConstants.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/WebBeansConstants.java Thu Jan  8 11:41:30 2009
@@ -1,91 +1,89 @@
 /*
- *  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.
+ * 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.webbeans;
 
 /**
  * Web beans related constants.
+ * 
  * @author <a href="mailto:gurkanerdogdu@yahoo.com">Gurkan Erdogdu</a>
  * @since 1.0
  */
 public final class WebBeansConstants
 {
 
-	private WebBeansConstants()
-	{
-		throw new UnsupportedOperationException();
-	}
-
-	/**Prefix of the web beans package*/
-	public static final String WEB_BEANS_PREFIX = "javax.webbeans";
-	
-	/**Webbeans systemId URL*/
-	public static final String WEB_BEANS_XML_SYSID = "http://java.sun.com/jee/web-beans-1.0.xsd";
-	
-	/**Classpath systemId*/
-	public static final String CLASSPATH_URI_SCHEMA = "classpath:";
-	
-	/**WebBeans namespace*/
-	public static final String WEB_BEANS_NAMESPACE = "urn:java:javax.webbeans";
-	
-	/**<Deploy> XML Element*/
-	public static final String WEB_BEANS_XML_DEPLOY_ELEMENT = "Deploy";
-	
-	/**<Interceptors> XML Element*/
-	public static final String WEB_BEANS_XML_INTERCEPTORS_ELEMENT = "Interceptors";
-	
-	public static final String WEB_BEANS_XML_INTERCEPTOR_ELEMENT = "Interceptor";
-	
-	/**<Decorators>  XML Element*/
-	public static final String WEB_BEANS_XML_DECORATORS_ELEMENT = "Decorators";
-	
-	public static final String WEB_BEANS_XML_DECORATOR_ELEMENT = "Decorator";
-	
-	/**<Queue> XML Element*/
-	public static final String WEB_BEANS_XML_TOPIC_ELEMENT = "Queue";
-	
-	/**<Topic> XML Element*/
-	public static final String WEB_BEANS_XML_QUEUE_ELEMENT = "Topic";
-	
-	public static final String WEB_BEANS_XML_INITIALIZER_ELEMENT = "Initializer";
-	
-	public static final String WEB_BEANS_XML_DESTRUCTOR_ELEMENT = "Destructor";
-	
-	public static final String WEB_BEANS_XML_PRODUCES_ELEMENT = "Produces";
-	
-	public static final String WEB_BEANS_XML_DISPOSES_ELEMENT = "Disposes";
-	
-	public static final String WEB_BEANS_XML_OBSERVES_ELEMENT = "Observers";
-	
-	public static final String WEB_BEANS_XML_DECORATES_ELEMENT = "Decorates";
-	
-	public static final String WEB_BEANS_XML_STANDART_ELEMENT = "Standard";
-	
-	public static final String WEB_BEANS_XML_BINDING_TYPE = "BindingType";
-	
-	public static final String WEB_BEANS_XML_INTERCEPTOR_BINDING_TYPE = "InterceptorBindingType";
-	
-	public static final String WEB_BEANS_XML_STEREOTYPE = "StereoType";
-	
-	public static final String WEB_BEANS_XML_VALUE_ELEMENT = "value";
-	
-	public static final String WEB_BEANS_XML_NAMED_ELEMENT = "Named";
-	
-	public static final String WEB_BEANS_XML_ARRAY_ELEMENT = "Array"; 
-	
-	public static final String WEB_BEANS_MANAGER_JNDI_NAME = "java:comp/Manager";
-	
+    private WebBeansConstants()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    /** Prefix of the web beans package */
+    public static final String WEB_BEANS_PREFIX = "javax.webbeans";
+
+    /** Webbeans systemId URL */
+    public static final String WEB_BEANS_XML_SYSID = "http://java.sun.com/jee/web-beans-1.0.xsd";
+
+    /** Classpath systemId */
+    public static final String CLASSPATH_URI_SCHEMA = "classpath:";
+
+    /** WebBeans namespace */
+    public static final String WEB_BEANS_NAMESPACE = "urn:java:javax.webbeans";
+
+    /** <Deploy> XML Element */
+    public static final String WEB_BEANS_XML_DEPLOY_ELEMENT = "Deploy";
+
+    /** <Interceptors> XML Element */
+    public static final String WEB_BEANS_XML_INTERCEPTORS_ELEMENT = "Interceptors";
+
+    public static final String WEB_BEANS_XML_INTERCEPTOR_ELEMENT = "Interceptor";
+
+    /** <Decorators> XML Element */
+    public static final String WEB_BEANS_XML_DECORATORS_ELEMENT = "Decorators";
+
+    public static final String WEB_BEANS_XML_DECORATOR_ELEMENT = "Decorator";
+
+    /** <Queue> XML Element */
+    public static final String WEB_BEANS_XML_TOPIC_ELEMENT = "Queue";
+
+    /** <Topic> XML Element */
+    public static final String WEB_BEANS_XML_QUEUE_ELEMENT = "Topic";
+
+    public static final String WEB_BEANS_XML_INITIALIZER_ELEMENT = "Initializer";
+
+    public static final String WEB_BEANS_XML_DESTRUCTOR_ELEMENT = "Destructor";
+
+    public static final String WEB_BEANS_XML_PRODUCES_ELEMENT = "Produces";
+
+    public static final String WEB_BEANS_XML_DISPOSES_ELEMENT = "Disposes";
+
+    public static final String WEB_BEANS_XML_OBSERVES_ELEMENT = "Observers";
+
+    public static final String WEB_BEANS_XML_DECORATES_ELEMENT = "Decorates";
+
+    public static final String WEB_BEANS_XML_STANDART_ELEMENT = "Standard";
+
+    public static final String WEB_BEANS_XML_BINDING_TYPE = "BindingType";
+
+    public static final String WEB_BEANS_XML_INTERCEPTOR_BINDING_TYPE = "InterceptorBindingType";
+
+    public static final String WEB_BEANS_XML_STEREOTYPE = "StereoType";
+
+    public static final String WEB_BEANS_XML_VALUE_ELEMENT = "value";
+
+    public static final String WEB_BEANS_XML_NAMED_ELEMENT = "Named";
+
+    public static final String WEB_BEANS_XML_ARRAY_ELEMENT = "Array";
+
+    public static final String WEB_BEANS_MANAGER_JNDI_NAME = "java:comp/Manager";
+
 }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java?rev=732803&r1=732802&r2=732803&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ApplicationScopeLiteral.java Thu Jan  8 11:41:30 2009
@@ -1,18 +1,15 @@
 /*
- *  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.
+ * 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.webbeans.annotation;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/CurrentLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/CurrentLiteral.java?rev=732803&r1=732802&r2=732803&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/CurrentLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/CurrentLiteral.java Thu Jan  8 11:41:30 2009
@@ -1,18 +1,15 @@
 /*
- *  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.
+ * 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.webbeans.annotation;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java?rev=732803&r1=732802&r2=732803&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DependentScopeLiteral.java Thu Jan  8 11:41:30 2009
@@ -1,18 +1,15 @@
 /*
- *  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.
+ * 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.webbeans.annotation;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeProductionLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeProductionLiteral.java?rev=732803&r1=732802&r2=732803&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeProductionLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeProductionLiteral.java Thu Jan  8 11:41:30 2009
@@ -1,18 +1,15 @@
 /*
- *  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.
+ * 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.webbeans.annotation;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeStandartLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeStandartLiteral.java?rev=732803&r1=732802&r2=732803&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeStandartLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/DeploymentTypeStandartLiteral.java Thu Jan  8 11:41:30 2009
@@ -1,18 +1,15 @@
 /*
- *  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.
+ * 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.webbeans.annotation;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/InitializedManagerLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/InitializedManagerLiteral.java?rev=732803&r1=732802&r2=732803&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/InitializedManagerLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/InitializedManagerLiteral.java Thu Jan  8 11:41:30 2009
@@ -1,18 +1,15 @@
 /*
- *  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.
+ * 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.webbeans.annotation;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java?rev=732803&r1=732802&r2=732803&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java Thu Jan  8 11:41:30 2009
@@ -1,18 +1,15 @@
 /*
- *  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.
+ * 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.webbeans.annotation;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ProductionLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ProductionLiteral.java?rev=732803&r1=732802&r2=732803&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ProductionLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/ProductionLiteral.java Thu Jan  8 11:41:30 2009
@@ -1,18 +1,15 @@
 /*
- *  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.
+ * 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.webbeans.annotation;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/RequestedScopeLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/RequestedScopeLiteral.java?rev=732803&r1=732802&r2=732803&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/RequestedScopeLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/RequestedScopeLiteral.java Thu Jan  8 11:41:30 2009
@@ -1,18 +1,15 @@
 /*
- *  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.
+ * 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.webbeans.annotation;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.java?rev=732803&r1=732802&r2=732803&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/SessionScopeLiteral.java Thu Jan  8 11:41:30 2009
@@ -1,18 +1,15 @@
 /*
- *  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.
+ * 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.webbeans.annotation;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/StandardLiteral.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/StandardLiteral.java?rev=732803&r1=732802&r2=732803&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/StandardLiteral.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/StandardLiteral.java Thu Jan  8 11:41:30 2009
@@ -1,18 +1,15 @@
 /*
- *  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.
+ * 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.webbeans.annotation;
 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java?rev=732803&r1=732802&r2=732803&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java Thu Jan  8 11:41:30 2009
@@ -1,18 +1,15 @@
 /*
- *  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.
+ * 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.webbeans.annotation;
 
@@ -30,208 +27,205 @@
 import org.apache.webbeans.util.Asserts;
 
 /**
- * Defines the {@link Annotation} implementation. It is used
- * for creating annotations from the XML configuration files.
+ * Defines the {@link Annotation} implementation. It is used for creating
+ * annotations from the XML configuration files.
  * 
  * @author <a href="mailto:gurkanerdogdu@yahoo.com">Gurkan Erdogdu</a>
  * @since 1.0
  */
 public class WebBeansAnnotation implements Annotation, MethodHandler
-{	
-	/**Annotation class type for this annotation*/
-	private Class<? extends Annotation> annotationType = null;
-	
-	/**Annotation members map values*/
-	private Map<String, Object> annotationMembersValueMap = new HashMap<String, Object>();
-	
-	/**Annotation type class methods members*/
-	private Method[] members = null;
-	
-	/**
-	 * Creates new annotation type object from given annotation type
-	 * @param annotationType annotation class type
-	 */
-	public WebBeansAnnotation(Class<? extends Annotation> annotationType)
-	{
-		this.annotationType = annotationType;
-		this.members = annotationType.getDeclaredMethods();
-		
-		/*Set default method values*/
-		setDefaultValues();
-	}
-	
-	/**
-	 * Javassist proxy object method handler. It is used
-	 * in equality comparison with {@link Annotation} types.
-	 * 
-	 * <p>
-	 * If method is not implemented by this proxy, then proceed method is null.
-	 * So, if the method is in the implemented annotation member method, then it is
-	 * taken from the map values of this annotation member values.
-	 * </p>
-	 * 
-	 * @param self proxy object
-	 * @param m method invoked method
-	 * @param proceed actual method on this proxy object self
-	 * @param args method arguments
-	 * 
-	 * @throws Throwable if any exception occurs
-	 */
-	public Object invoke(Object self, Method m, Method proceed, Object[] args) throws Throwable
-	{
-		WebBeansAnnotation anno = (WebBeansAnnotation)self;
-		
-		if(isMethodExist(m) && proceed == null)
-		{
-			return anno.getAnnotationMembersValueMap().get(m.getName());
-		}
-		
-		return proceed.invoke(self, args);
-	}	
-	
-	/**
-	 * Gets 
-	 * 
-	 * @return the unmodifiable map
-	 */
-	public Map<String, Object> getAnnotationMembersValueMap()
-	{
-		return Collections.unmodifiableMap(this.annotationMembersValueMap);
-	}
-	
-	public Class<? extends Annotation> annotationType()
-	{
-		return annotationType;
-	}
-	
-	public void setMemberValue(String memberName, Object memberValue)
-	{
-		Asserts.assertNotNull(memberValue,"memberName parameter can not be null");
-		Asserts.assertNotNull(memberValue,"memberValue parameter can not be null");
-		
-		this.annotationMembersValueMap.put(memberName, memberValue);
-	}
-
-	@Override
-	public String toString()
-	{
-		
-		String string = "@" + annotationType().getName() + "(";
-		for (int i = 0; i < members.length; i++)
-		{
-			string += members[i].getName() + "=";
-			string += this.invoke(members[i]);
-			if (i < members.length - 1)
-			{
-				string += ",";
-			}
-		}
-		return string + ")";
-	}
-
-	@Override
-	public boolean equals(Object other)
-	{
-		if (other instanceof Annotation)
-		{
-			Annotation that = (Annotation) other;
-			if (this.annotationType().equals(that.annotationType()))
-			{
-				for (Method member : members)
-				{
-					Object thisValue = this.invoke(member);
-					Object thatValue = invoke(member,that);
-					if (!thisValue.equals(thatValue))
-					{
-						return false;
-					}
-				}
-				return true;
-			}
-		}
-		else if(other instanceof WebBeansAnnotation)
-		{
-			WebBeansAnnotation that = (WebBeansAnnotation) other;
-			if (this.annotationType().equals(that.annotationType()))
-			{
-				for (Method member : members)
-				{
-					Object thisValue = this.invoke(member);
-					Object thatValue = that.invoke(member);
-					if (!thisValue.equals(thatValue))
-					{
-						return false;
-					}
-				}
-				return true;
-			}
-			
-		}
-		return false;
-	}
-
-	@Override
-	public int hashCode()
-	{
-		int hashCode = 0;
-		for (Method member : members)
-		{
-			int memberNameHashCode = 127 * member.getName().hashCode();
-			int memberValueHashCode = invoke(member).hashCode();
-			hashCode += memberNameHashCode ^ memberValueHashCode;
-		}
-		return hashCode;
-	}
-
-	private  Object invoke(Method method)
-	{
-		String memberName = method.getName();
-		
-		return this.annotationMembersValueMap.get(memberName);
-	}	
-	
-	private static Object invoke(Method method, Object instance)
-	{
-		try
-		{
-			return method.invoke(instance);
-			
-		} catch (IllegalArgumentException e)
-		{
-			throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e);
-		} catch (IllegalAccessException e)
-		{
-			throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e);
-		} catch (InvocationTargetException e)
-		{
-			throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e);
-		}
-	}
-
-	private boolean isMethodExist(Method method)
-	{
-		for(Method m : members)
-		{
-			if(m.equals(method))
-			{
-				return true;
-			}
-		}
-		
-		return false;
-	}
-	
-	private void setDefaultValues()
-	{
-		for(Method m : members)
-		{
-			Object defValue = m.getDefaultValue();
-			if(defValue != null)
-			{
-				this.annotationMembersValueMap.put(m.getName(), defValue);
-			}
-		}
-	}
-		
+{
+    /** Annotation class type for this annotation */
+    private Class<? extends Annotation> annotationType = null;
+
+    /** Annotation members map values */
+    private Map<String, Object> annotationMembersValueMap = new HashMap<String, Object>();
+
+    /** Annotation type class methods members */
+    private Method[] members = null;
+
+    /**
+     * Creates new annotation type object from given annotation type
+     * 
+     * @param annotationType annotation class type
+     */
+    public WebBeansAnnotation(Class<? extends Annotation> annotationType)
+    {
+        this.annotationType = annotationType;
+        this.members = annotationType.getDeclaredMethods();
+
+        /* Set default method values */
+        setDefaultValues();
+    }
+
+    /**
+     * Javassist proxy object method handler. It is used in equality comparison
+     * with {@link Annotation} types.
+     * <p>
+     * If method is not implemented by this proxy, then proceed method is null.
+     * So, if the method is in the implemented annotation member method, then it
+     * is taken from the map values of this annotation member values.
+     * </p>
+     * 
+     * @param self proxy object
+     * @param m method invoked method
+     * @param proceed actual method on this proxy object self
+     * @param args method arguments
+     * @throws Throwable if any exception occurs
+     */
+    public Object invoke(Object self, Method m, Method proceed, Object[] args) throws Throwable
+    {
+        WebBeansAnnotation anno = (WebBeansAnnotation) self;
+
+        if (isMethodExist(m) && proceed == null)
+        {
+            return anno.getAnnotationMembersValueMap().get(m.getName());
+        }
+
+        return proceed.invoke(self, args);
+    }
+
+    /**
+     * Gets
+     * 
+     * @return the unmodifiable map
+     */
+    public Map<String, Object> getAnnotationMembersValueMap()
+    {
+        return Collections.unmodifiableMap(this.annotationMembersValueMap);
+    }
+
+    public Class<? extends Annotation> annotationType()
+    {
+        return annotationType;
+    }
+
+    public void setMemberValue(String memberName, Object memberValue)
+    {
+        Asserts.assertNotNull(memberValue, "memberName parameter can not be null");
+        Asserts.assertNotNull(memberValue, "memberValue parameter can not be null");
+
+        this.annotationMembersValueMap.put(memberName, memberValue);
+    }
+
+    @Override
+    public String toString()
+    {
+
+        String string = "@" + annotationType().getName() + "(";
+        for (int i = 0; i < members.length; i++)
+        {
+            string += members[i].getName() + "=";
+            string += this.invoke(members[i]);
+            if (i < members.length - 1)
+            {
+                string += ",";
+            }
+        }
+        return string + ")";
+    }
+
+    @Override
+    public boolean equals(Object other)
+    {
+        if (other instanceof Annotation)
+        {
+            Annotation that = (Annotation) other;
+            if (this.annotationType().equals(that.annotationType()))
+            {
+                for (Method member : members)
+                {
+                    Object thisValue = this.invoke(member);
+                    Object thatValue = invoke(member, that);
+                    if (!thisValue.equals(thatValue))
+                    {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        } else if (other instanceof WebBeansAnnotation)
+        {
+            WebBeansAnnotation that = (WebBeansAnnotation) other;
+            if (this.annotationType().equals(that.annotationType()))
+            {
+                for (Method member : members)
+                {
+                    Object thisValue = this.invoke(member);
+                    Object thatValue = that.invoke(member);
+                    if (!thisValue.equals(thatValue))
+                    {
+                        return false;
+                    }
+                }
+                return true;
+            }
+
+        }
+        return false;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        int hashCode = 0;
+        for (Method member : members)
+        {
+            int memberNameHashCode = 127 * member.getName().hashCode();
+            int memberValueHashCode = invoke(member).hashCode();
+            hashCode += memberNameHashCode ^ memberValueHashCode;
+        }
+        return hashCode;
+    }
+
+    private Object invoke(Method method)
+    {
+        String memberName = method.getName();
+
+        return this.annotationMembersValueMap.get(memberName);
+    }
+
+    private static Object invoke(Method method, Object instance)
+    {
+        try
+        {
+            return method.invoke(instance);
+
+        } catch (IllegalArgumentException e)
+        {
+            throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e);
+        } catch (IllegalAccessException e)
+        {
+            throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e);
+        } catch (InvocationTargetException e)
+        {
+            throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e);
+        }
+    }
+
+    private boolean isMethodExist(Method method)
+    {
+        for (Method m : members)
+        {
+            if (m.equals(method))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private void setDefaultValues()
+    {
+        for (Method m : members)
+        {
+            Object defValue = m.getDefaultValue();
+            if (defValue != null)
+            {
+                this.annotationMembersValueMap.put(m.getName(), defValue);
+            }
+        }
+    }
 
 }
\ No newline at end of file

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java?rev=732803&r1=732802&r2=732803&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java Thu Jan  8 11:41:30 2009
@@ -1,18 +1,15 @@
 /*
- *  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.
+ * 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.webbeans.component;
 
@@ -35,15 +32,12 @@
 import org.apache.webbeans.intercept.InterceptorData;
 
 /**
- * 
  * Abstract implementation of the {@link Component} contract. There are several
  * different implementation of this abtract class, including
- * 
  * <ul>
  * <li>Bean Implementation Class Component,</li>
  * <li>Producer Method Component</li>
  * </ul>
- * 
  * <p>
  * Each subclass is responsible for overriding
  * {@link AbstractComponent#createInstance()} and
@@ -55,436 +49,427 @@
  */
 public abstract class AbstractComponent<T> extends Component<T>
 {
-	/** Name of the component */
-	protected String name;
+    /** Name of the component */
+    protected String name;
 
-	/** Deployment type of the component */
-	protected Annotation type;
+    /** Deployment type of the component */
+    protected Annotation type;
 
-	/** Scope type of the component */
-	protected Annotation implScopeType;
+    /** Scope type of the component */
+    protected Annotation implScopeType;
 
-	/** Binding types of the component */
-	protected Set<Annotation> implBindingTypes = new HashSet<Annotation>();
-
-	/** Api types of the component */
-	protected Set<Class<?>> apiTypes = new HashSet<Class<?>>();
-
-	/** Web Beans type */
-	protected WebBeansType webBeansType;
-
-	/** Return type of the component */
-	protected Class<T> returnType;
-	
-	/**Dependent object map of the component*/
-	protected Map<Object, Bean<?>> dependentObjects = new WeakHashMap<Object, Bean<?>>();
-	
-	/**Stereotypes of the component*/
-	protected Set<Annotation> stereoTypes = new HashSet<Annotation>();
-	
-	/**
-	 * Holds the all of the interceptor related data, contains around-invoke,
-	 * post-construct and pre-destroy
-	 */
-	protected List<InterceptorData> interceptorStack = new ArrayList<InterceptorData>();
-
-	/** Holds decorator stack */
-	protected List<Object> decoratorStack = new ArrayList<Object>();
-	
-	/**The bean is serializable or not*/
-	protected boolean serializable;
-	
-	/**The bean allows nullable object*/
-	protected boolean nullable = true;
-
-	/**
-	 * Constructor definiton. Each subclass redefines its own constructor with
-	 * calling this.
-	 * 
-	 * @param name
-	 *            name of the component
-	 * @param webBeansType
-	 *            web beans type
-	 */
-	protected AbstractComponent(WebBeansType webBeansType, Class<T> returnType)
-	{
-		super(ManagerImpl.getManager());
-		this.webBeansType = webBeansType;
-		this.returnType = returnType;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.webbeans.component.Component#create()
-	 */
-	public T create()
-	{
-		DependentContext context = (DependentContext)getManager().getContext(Dependent.class);
-		boolean isActiveSet = false;
-		T instance = null;
-		try
-		{
-			if(!context.isActive())
-			{
-				context.setActive(true);
-				isActiveSet = true;
-			}
-			
-			instance = createInstance();	
-			
-		}catch(Throwable e)
-		{
-			if(Exception.class.isAssignableFrom(e.getClass()))
-			{
-				throw new CreationException(e);
-			}
-		}
-		finally
-		{
-			if(isActiveSet)
-			{
-				context.setActive(false);	
-			}
-		}
-		
-		return instance;
-	}
-
-	/**
-	 * Creates the instance of the component that has a specific implementation
-	 * type. Each subclass must define its own create mechanism.
-	 * 
-	 * @return instance of the component
-	 */
-	protected abstract T createInstance();
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.webbeans.component.Component#destroy(java.lang.Object)
-	 */
-	public void destroy(T instance)
-	{
-		DependentContext context = (DependentContext)getManager().getContext(Dependent.class);
-		boolean isActiveSet = false;
-
-		try
-		{
-			if(!context.isActive())
-			{
-				context.setActive(true);
-				isActiveSet = true;
-			}
-
-			destroyInstance(instance);
-			destroyDependents();
-			
-			
-		}finally
-		{
-			if(isActiveSet)
-			{
-				context.setActive(false);	
-			}
-		}
-		
-	}
-
-	/**
-	 * Destroy the instance of the component. Each subclass must define its own
-	 * destroy mechanism.
-	 * 
-	 * @param instance
-	 *            instance that is being destroyed
-	 */
-	protected abstract void destroyInstance(T instance);
-
-	/**
-	 * Get component type.
-	 * 
-	 * @return component type
-	 */
-	public Annotation getType()
-	{
-		return type;
-	}
-
-	/**
-	 * Set component type.
-	 * 
-	 * @param type
-	 *            component type
-	 */
-	public void setType(Annotation type)
-	{
-		this.type = type;
-	}
-
-	/**
-	 * Get scope type.
-	 * 
-	 * @return scope type
-	 */
-	public Annotation getImplScopeType()
-	{
-		return implScopeType;
-	}
-
-	/**
-	 * Set scope type.
-	 * 
-	 * @param scopeType
-	 *            scope type
-	 */
-	public void setImplScopeType(Annotation scopeType)
-	{
-		this.implScopeType = scopeType;
-	}
-
-	/**
-	 * Name of the component.
-	 * 
-	 * @return name of the component
-	 */
-	public String getName()
-	{
-		return name;
-	}
-
-	/**
-	 * Get web bean type of the component.
-	 * 
-	 * @return web beans type
-	 */
-	public WebBeansType getWebBeansType()
-	{
-		return webBeansType;
-	}
-
-	/**
-	 * Add new binding type.
-	 * 
-	 * @param bindingType
-	 *            new binding type
-	 */
-	public void addBindingType(Annotation bindingType)
-	{
-		this.implBindingTypes.add(bindingType);
-	}
-	
-	/**
-	 * Add new stereotype.
-	 * 
-	 * @param stereoType new stereotype annotation
-	 */
-	public void addStereoType(Annotation stereoType)
-	{
-		this.stereoTypes.add(stereoType);
-	}
-
-	/**
-	 * Add new api type.
-	 * 
-	 * @param apiType
-	 *            new api type
-	 */
-	public void addApiType(Class<?> apiType)
-	{
-		this.apiTypes.add(apiType);
-	}
-
-	/**
-	 * Get binding types.
-	 * 
-	 * @return binding types
-	 */
-	public Set<Annotation> getImplBindingTypes()
-	{
-		return implBindingTypes;
-	}
-	
-	/**
-	 * Gets the stereotypes.
-	 * 
-	 * @return stereotypes of the component
-	 */
-	public Set<Annotation> getStereoTypes()
-	{
-		return this.stereoTypes;
-	}
-
-	/**
-	 * Set name.
-	 * 
-	 * @param name
-	 *            new name
-	 */
-	public void setName(String name)
-	{
-		if (this.name == null)
-			this.name = name;
-		else
-			throw new UnsupportedOperationException("Component name is not null, is " + this.name);
-	}
-
-	/**
-	 * Gets predecence of the component.
-	 * 
-	 * @return precedence
-	 */
-	public int getPrecedence()
-	{
-		return DeploymentTypeManager.getInstance().getPrecedence(getDeploymentType());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.webbeans.manager.Bean#getBindingTypes()
-	 */
-	@Override
-	public Set<Annotation> getBindingTypes()
-	{
-		return this.implBindingTypes;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.webbeans.manager.Bean#getDeploymentType()
-	 */
-	@Override
-	public Class<? extends Annotation> getDeploymentType()
-	{
-		return this.type.annotationType();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.webbeans.manager.Bean#getScopeType()
-	 */
-	@Override
-	public Class<? extends Annotation> getScopeType()
-	{
-		return this.implScopeType.annotationType();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.webbeans.manager.Bean#getTypes()
-	 */
-	@Override
-	@SuppressWarnings("unchecked")
-	public Set<Class<?>> getTypes()
-	{
-		return this.apiTypes;
-	}
-
-	/**
-	 * Gets type of the producer method.
-	 * 
-	 * @return type of the producer method
-	 */
-	public Class<T> getReturnType()
-	{
-		return returnType;
-	}
-
-	/**
-	 * Gets the dependent component instance.
-	 * 
-	 * @param dependentComponent
-	 *            dependent web beans component
-	 * @return the dependent component instance
-	 */
-	public Object getDependent(Component<?> dependentComponent)
-	{
-		Object object = null;
-		DependentContext context = (DependentContext)getManager().getContext(Dependent.class);
-		
-		object = context.get(dependentComponent, true);
-		
-		this.dependentObjects.put(object, dependentComponent);
-			
-		return object;
-	}
-
-	/**
-	 * Gets the interceptor stack.
-	 * 
-	 * @return the interceptor stack
-	 */
-	public List<InterceptorData> getInterceptorStack()
-	{
-		return this.interceptorStack;
-	}
-
-	public List<Object> getDecoratorStack()
-	{
-		return this.decoratorStack;
-	}
-	
-	
-	
-	/* (non-Javadoc)
-	 * @see org.apache.webbeans.component.Component#setNullable()
-	 */
-	@Override
-	public void setNullable(boolean nullable)
-	{
-		this.nullable = nullable;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.webbeans.component.Component#setSerializable()
-	 */
-	@Override
-	public void setSerializable(boolean serializable)
-	{
-		this.serializable = serializable;
-		
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.webbeans.manager.Bean#isNullable()
-	 */
-	@Override
-	public boolean isNullable()
-	{
-
-		return this.nullable;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see javax.webbeans.manager.Bean#isSerializable()
-	 */
-	@Override
-	public boolean isSerializable()
-	{
-		return this.serializable;
-	}
-	
-	@SuppressWarnings("unchecked")
-	protected <K> void destroyDependents()
-	{
-		Set<Object> keySet = this.dependentObjects.keySet();
-		Iterator<Object> it = keySet.iterator();
-		
-		K instance = null;
-		
-		while(it.hasNext())
-		{
-			instance = (K)it.next();
-			Bean<K> bean = (Bean<K>)this.dependentObjects.get(instance);
-			bean.destroy(instance);
-		}
-	}
+    /** Binding types of the component */
+    protected Set<Annotation> implBindingTypes = new HashSet<Annotation>();
+
+    /** Api types of the component */
+    protected Set<Class<?>> apiTypes = new HashSet<Class<?>>();
+
+    /** Web Beans type */
+    protected WebBeansType webBeansType;
+
+    /** Return type of the component */
+    protected Class<T> returnType;
+
+    /** Dependent object map of the component */
+    protected Map<Object, Bean<?>> dependentObjects = new WeakHashMap<Object, Bean<?>>();
+
+    /** Stereotypes of the component */
+    protected Set<Annotation> stereoTypes = new HashSet<Annotation>();
+
+    /**
+     * Holds the all of the interceptor related data, contains around-invoke,
+     * post-construct and pre-destroy
+     */
+    protected List<InterceptorData> interceptorStack = new ArrayList<InterceptorData>();
+
+    /** Holds decorator stack */
+    protected List<Object> decoratorStack = new ArrayList<Object>();
+
+    /** The bean is serializable or not */
+    protected boolean serializable;
+
+    /** The bean allows nullable object */
+    protected boolean nullable = true;
+
+    /**
+     * Constructor definiton. Each subclass redefines its own constructor with
+     * calling this.
+     * 
+     * @param name name of the component
+     * @param webBeansType web beans type
+     */
+    protected AbstractComponent(WebBeansType webBeansType, Class<T> returnType)
+    {
+        super(ManagerImpl.getManager());
+        this.webBeansType = webBeansType;
+        this.returnType = returnType;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.webbeans.component.Component#create()
+     */
+    public T create()
+    {
+        DependentContext context = (DependentContext) getManager().getContext(Dependent.class);
+        boolean isActiveSet = false;
+        T instance = null;
+        try
+        {
+            if (!context.isActive())
+            {
+                context.setActive(true);
+                isActiveSet = true;
+            }
+
+            instance = createInstance();
+
+        } catch (Throwable e)
+        {
+            if (Exception.class.isAssignableFrom(e.getClass()))
+            {
+                throw new CreationException(e);
+            }
+        } finally
+        {
+            if (isActiveSet)
+            {
+                context.setActive(false);
+            }
+        }
+
+        return instance;
+    }
+
+    /**
+     * Creates the instance of the component that has a specific implementation
+     * type. Each subclass must define its own create mechanism.
+     * 
+     * @return instance of the component
+     */
+    protected abstract T createInstance();
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.webbeans.component.Component#destroy(java.lang.Object)
+     */
+    public void destroy(T instance)
+    {
+        DependentContext context = (DependentContext) getManager().getContext(Dependent.class);
+        boolean isActiveSet = false;
+
+        try
+        {
+            if (!context.isActive())
+            {
+                context.setActive(true);
+                isActiveSet = true;
+            }
+
+            destroyInstance(instance);
+            destroyDependents();
+
+        } finally
+        {
+            if (isActiveSet)
+            {
+                context.setActive(false);
+            }
+        }
+
+    }
+
+    /**
+     * Destroy the instance of the component. Each subclass must define its own
+     * destroy mechanism.
+     * 
+     * @param instance instance that is being destroyed
+     */
+    protected abstract void destroyInstance(T instance);
+
+    /**
+     * Get component type.
+     * 
+     * @return component type
+     */
+    public Annotation getType()
+    {
+        return type;
+    }
+
+    /**
+     * Set component type.
+     * 
+     * @param type component type
+     */
+    public void setType(Annotation type)
+    {
+        this.type = type;
+    }
+
+    /**
+     * Get scope type.
+     * 
+     * @return scope type
+     */
+    public Annotation getImplScopeType()
+    {
+        return implScopeType;
+    }
+
+    /**
+     * Set scope type.
+     * 
+     * @param scopeType scope type
+     */
+    public void setImplScopeType(Annotation scopeType)
+    {
+        this.implScopeType = scopeType;
+    }
+
+    /**
+     * Name of the component.
+     * 
+     * @return name of the component
+     */
+    public String getName()
+    {
+        return name;
+    }
+
+    /**
+     * Get web bean type of the component.
+     * 
+     * @return web beans type
+     */
+    public WebBeansType getWebBeansType()
+    {
+        return webBeansType;
+    }
+
+    /**
+     * Add new binding type.
+     * 
+     * @param bindingType new binding type
+     */
+    public void addBindingType(Annotation bindingType)
+    {
+        this.implBindingTypes.add(bindingType);
+    }
+
+    /**
+     * Add new stereotype.
+     * 
+     * @param stereoType new stereotype annotation
+     */
+    public void addStereoType(Annotation stereoType)
+    {
+        this.stereoTypes.add(stereoType);
+    }
+
+    /**
+     * Add new api type.
+     * 
+     * @param apiType new api type
+     */
+    public void addApiType(Class<?> apiType)
+    {
+        this.apiTypes.add(apiType);
+    }
+
+    /**
+     * Get binding types.
+     * 
+     * @return binding types
+     */
+    public Set<Annotation> getImplBindingTypes()
+    {
+        return implBindingTypes;
+    }
+
+    /**
+     * Gets the stereotypes.
+     * 
+     * @return stereotypes of the component
+     */
+    public Set<Annotation> getStereoTypes()
+    {
+        return this.stereoTypes;
+    }
+
+    /**
+     * Set name.
+     * 
+     * @param name new name
+     */
+    public void setName(String name)
+    {
+        if (this.name == null)
+            this.name = name;
+        else
+            throw new UnsupportedOperationException("Component name is not null, is " + this.name);
+    }
+
+    /**
+     * Gets predecence of the component.
+     * 
+     * @return precedence
+     */
+    public int getPrecedence()
+    {
+        return DeploymentTypeManager.getInstance().getPrecedence(getDeploymentType());
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.webbeans.manager.Bean#getBindingTypes()
+     */
+    @Override
+    public Set<Annotation> getBindingTypes()
+    {
+        return this.implBindingTypes;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.webbeans.manager.Bean#getDeploymentType()
+     */
+    @Override
+    public Class<? extends Annotation> getDeploymentType()
+    {
+        return this.type.annotationType();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.webbeans.manager.Bean#getScopeType()
+     */
+    @Override
+    public Class<? extends Annotation> getScopeType()
+    {
+        return this.implScopeType.annotationType();
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.webbeans.manager.Bean#getTypes()
+     */
+    @Override
+    @SuppressWarnings("unchecked")
+    public Set<Class<?>> getTypes()
+    {
+        return this.apiTypes;
+    }
+
+    /**
+     * Gets type of the producer method.
+     * 
+     * @return type of the producer method
+     */
+    public Class<T> getReturnType()
+    {
+        return returnType;
+    }
+
+    /**
+     * Gets the dependent component instance.
+     * 
+     * @param dependentComponent dependent web beans component
+     * @return the dependent component instance
+     */
+    public Object getDependent(Component<?> dependentComponent)
+    {
+        Object object = null;
+        DependentContext context = (DependentContext) getManager().getContext(Dependent.class);
+
+        object = context.get(dependentComponent, true);
+
+        this.dependentObjects.put(object, dependentComponent);
+
+        return object;
+    }
+
+    /**
+     * Gets the interceptor stack.
+     * 
+     * @return the interceptor stack
+     */
+    public List<InterceptorData> getInterceptorStack()
+    {
+        return this.interceptorStack;
+    }
+
+    public List<Object> getDecoratorStack()
+    {
+        return this.decoratorStack;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.webbeans.component.Component#setNullable()
+     */
+    @Override
+    public void setNullable(boolean nullable)
+    {
+        this.nullable = nullable;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.webbeans.component.Component#setSerializable()
+     */
+    @Override
+    public void setSerializable(boolean serializable)
+    {
+        this.serializable = serializable;
+
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.webbeans.manager.Bean#isNullable()
+     */
+    @Override
+    public boolean isNullable()
+    {
+
+        return this.nullable;
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see javax.webbeans.manager.Bean#isSerializable()
+     */
+    @Override
+    public boolean isSerializable()
+    {
+        return this.serializable;
+    }
+
+    @SuppressWarnings("unchecked")
+    protected <K> void destroyDependents()
+    {
+        Set<Object> keySet = this.dependentObjects.keySet();
+        Iterator<Object> it = keySet.iterator();
+
+        K instance = null;
+
+        while (it.hasNext())
+        {
+            instance = (K) it.next();
+            Bean<K> bean = (Bean<K>) this.dependentObjects.get(instance);
+            bean.destroy(instance);
+        }
+    }
 
 }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractObservesComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractObservesComponent.java?rev=732803&r1=732802&r2=732803&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractObservesComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractObservesComponent.java Thu Jan  8 11:41:30 2009
@@ -1,18 +1,15 @@
 /*
- *  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.
+ * 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.webbeans.component;
 
@@ -20,31 +17,33 @@
 import java.util.HashSet;
 import java.util.Set;
 
-
 public abstract class AbstractObservesComponent<T> extends AbstractComponent<T> implements ObservesMethodsOwner<T>
 {
-	private Set<Method> observableMethods = new HashSet<Method>();
-	
-	
-	protected AbstractObservesComponent(WebBeansType webBeansType, Class<T> returnType)
-	{
-		super(webBeansType, returnType);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.webbeans.component.ObservableComponent#addObservableMethod(java.lang.reflect.Method)
-	 */
-	public void addObservableMethod(Method observerMethod)
-	{
-		this.observableMethods.add(observerMethod);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.webbeans.component.ObservableComponent#getObservableMethods()
-	 */
-	public Set<Method> getObservableMethods()
-	{
-		return this.observableMethods;
-	}
+    private Set<Method> observableMethods = new HashSet<Method>();
+
+    protected AbstractObservesComponent(WebBeansType webBeansType, Class<T> returnType)
+    {
+        super(webBeansType, returnType);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.webbeans.component.ObservableComponent#addObservableMethod(java.lang.reflect.Method)
+     */
+    public void addObservableMethod(Method observerMethod)
+    {
+        this.observableMethods.add(observerMethod);
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.apache.webbeans.component.ObservableComponent#getObservableMethods()
+     */
+    public Set<Method> getObservableMethods()
+    {
+        return this.observableMethods;
+    }
 
 }



Mime
View raw message