openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rsandt...@apache.org
Subject svn commit: r1697484 [1/2] - in /openwebbeans/branches/cdi-2.0: ./ distribution/ distribution/src/assembly/ distribution/src/main/ readme/ samples/ webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/ w...
Date Mon, 24 Aug 2015 19:16:41 GMT
Author: rsandtner
Date: Mon Aug 24 19:16:40 2015
New Revision: 1697484

URL: http://svn.apache.org/r1697484
Log:
merged from trunk -> my working-copy was not up to date

Added:
    openwebbeans/branches/cdi-2.0/distribution/src/main/
      - copied from r1697479, openwebbeans/trunk/distribution/src/main/
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/intercept/RequestScopedBeanInterceptorHandler.java
      - copied unchanged from r1697479, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/RequestScopedBeanInterceptorHandler.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/intercept/SessionScopedBeanInterceptorHandler.java
      - copied unchanged from r1697479, openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/SessionScopedBeanInterceptorHandler.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/ServiceDecoratorWithCtInjectionPoint.java
      - copied unchanged from r1697479, openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/component/decorator/clean/ServiceDecoratorWithCtInjectionPoint.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/test/java/org/apache/webbeans/test/events/extensionevents/
      - copied from r1697479, openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/events/extensionevents/
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/MyAbstract.java
      - copied unchanged from r1697479, openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/MyAbstract.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/MyBean.java
      - copied unchanged from r1697479, openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/MyBean.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/MyInterface.java
      - copied unchanged from r1697479, openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/MyInterface.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/StringBean.java
      - copied unchanged from r1697479, openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/StringBean.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/StringBeanAbstract.java
      - copied unchanged from r1697479, openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/StringBeanAbstract.java
Removed:
    openwebbeans/branches/cdi-2.0/webbeans-spi/src/main/java/org/apache/webbeans/spi/plugins/OpenWebBeansWebPlugin.java
    openwebbeans/branches/cdi-2.0/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatContainerListener.java
    openwebbeans/branches/cdi-2.0/webbeans-web/src/main/java/org/apache/webbeans/servlet/BeginWebBeansConfigurationListener.java
    openwebbeans/branches/cdi-2.0/webbeans-web/src/main/java/org/apache/webbeans/servlet/EndWebBeansConfigurationListener.java
    openwebbeans/branches/cdi-2.0/webbeans-web/src/main/java/org/apache/webbeans/web/intercept/RequestScopedBeanInterceptorHandler.java
    openwebbeans/branches/cdi-2.0/webbeans-web/src/test/resources/
Modified:
    openwebbeans/branches/cdi-2.0/   (props changed)
    openwebbeans/branches/cdi-2.0/distribution/pom.xml
    openwebbeans/branches/cdi-2.0/distribution/src/assembly/dist-binary.xml
    openwebbeans/branches/cdi-2.0/pom.xml
    openwebbeans/branches/cdi-2.0/readme/README.txt
    openwebbeans/branches/cdi-2.0/samples/pom.xml
    openwebbeans/branches/cdi-2.0/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/UrlSet.java
    openwebbeans/branches/cdi-2.0/webbeans-ee/src/main/java/org/apache/webbeans/ee/event/TransactionalEventNotifier.java
    openwebbeans/branches/cdi-2.0/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BaseProducerFactory.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/DecoratorBeanBuilder.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/DefaultAnnotation.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/OWBLogConst.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DecoratorHandler.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLoggerFacade.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/portable/BaseProducerProducer.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/portable/BeanMetadataProducer.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/portable/EventProducer.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessInjectionPoint.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/proxy/SubclassProxyFactory.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/util/Asserts.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/util/GenericsUtil.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/util/UrlSet.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/xml/DefaultBeanArchiveService.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/test/java/org/apache/webbeans/test/events/generics/GenericObserverTest.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/GenericsTest.java
    openwebbeans/branches/cdi-2.0/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/Decorator1Test.java
    openwebbeans/branches/cdi-2.0/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsProxyHandler.java
    openwebbeans/branches/cdi-2.0/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java
    openwebbeans/branches/cdi-2.0/webbeans-spi/pom.xml
    openwebbeans/branches/cdi-2.0/webbeans-spi/src/main/java/org/apache/webbeans/spi/plugins/OpenWebBeansJavaEEPlugin.java
    openwebbeans/branches/cdi-2.0/webbeans-tck/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
    openwebbeans/branches/cdi-2.0/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatUtil.java
    openwebbeans/branches/cdi-2.0/webbeans-tomcat6/src/main/java/org/apache/webbeans/web/tomcat/TomcatWebPlugin.java
    openwebbeans/branches/cdi-2.0/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/ContextLifecycleListener.java
    openwebbeans/branches/cdi-2.0/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatUtil.java
    openwebbeans/branches/cdi-2.0/webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7/TomcatWebPlugin.java
    openwebbeans/branches/cdi-2.0/webbeans-web/src/it/webcdiapp/pom.xml
    openwebbeans/branches/cdi-2.0/webbeans-web/src/it/webcdiapp/src/main/webapp/WEB-INF/web.xml
    openwebbeans/branches/cdi-2.0/webbeans-web/src/main/java/org/apache/webbeans/servlet/WebBeansConfigurationListener.java
    openwebbeans/branches/cdi-2.0/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
    openwebbeans/branches/cdi-2.0/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebConversationService.java
    openwebbeans/branches/cdi-2.0/webbeans-web/src/main/java/org/apache/webbeans/web/lifecycle/WebContainerLifecycle.java
    openwebbeans/branches/cdi-2.0/webbeans-web/src/main/java/org/apache/webbeans/web/util/ServletCompatibilityUtil.java
    openwebbeans/branches/cdi-2.0/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties

Propchange: openwebbeans/branches/cdi-2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 24 19:16:40 2015
@@ -1 +1,2 @@
 /openwebbeans/branches/owb_1.2.x:1640945,1641609,1641684
+/openwebbeans/trunk:1681165-1697479

Modified: openwebbeans/branches/cdi-2.0/distribution/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/distribution/pom.xml?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/distribution/pom.xml (original)
+++ openwebbeans/branches/cdi-2.0/distribution/pom.xml Mon Aug 24 19:16:40 2015
@@ -40,34 +40,52 @@
 
     <properties>
         <skipReports>true</skipReports>
+        <noAssembly>true</noAssembly>
     </properties>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <skipAssembly>${noAssembly}</skipAssembly>
+                    <tarLongFileMode>gnu</tarLongFileMode>
+                    <descriptors>
+                        <descriptor>src/assembly/dist-binary.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <profiles>
         <profile>
+            <!-- for quickly building a local distrbution package -->
+            <id>build-dist</id>
+            <properties>
+                <noAssembly>false</noAssembly>
+            </properties>
+        </profile>
+
+        <profile>
             <id>apache-release</id>
+            <properties>
+                <noAssembly>false</noAssembly>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <version>2.4</version>
-                        <configuration>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <descriptors>
-                                <descriptor>src/assembly/dist-binary.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-install-plugin</artifactId>
                         <configuration>
                             <createChecksum>true</createChecksum>
@@ -97,6 +115,8 @@
         into this 'distribution' module.
     -->
     <dependencies>
+
+        <!-- spec APIs -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-atinject_1.0_spec</artifactId>
@@ -106,6 +126,30 @@
             <artifactId>geronimo-jcdi_2.0_spec</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.2_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-el_2.2_spec</artifactId>
+        </dependency>
+
+        <!-- scanner and ASM-->
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-finder-shaded</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-asm5-shaded</artifactId>
+        </dependency>
+
+
+        <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>openwebbeans-impl</artifactId>
             <version>${project.version}</version>

Modified: openwebbeans/branches/cdi-2.0/distribution/src/assembly/dist-binary.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/distribution/src/assembly/dist-binary.xml?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/distribution/src/assembly/dist-binary.xml (original)
+++ openwebbeans/branches/cdi-2.0/distribution/src/assembly/dist-binary.xml Mon Aug 24 19:16:40 2015
@@ -29,11 +29,11 @@ under the License.
 
     <files>
         <file>
-            <source>../LICENSE</source>
+            <source>src/main/resources/LICENSE</source>
         </file>
 
         <file>
-            <source>../NOTICE</source>
+            <source>src/main/resources/NOTICE</source>
         </file>
 
         <file>
@@ -49,141 +49,31 @@ under the License.
             <source>../samples/guess/src/main/webapp/WEB-INF/web.xml</source>
         </file>
 
-       <file>
-           <outputDirectory>config</outputDirectory>
-           <source>../webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties</source>
-       </file>
+        <file>
+            <outputDirectory>config</outputDirectory>
+            <source>../webbeans-impl/src/main/resources/META-INF/openwebbeans/openwebbeans.properties</source>
+        </file>
     </files>
 
-   <fileSets>
-        <fileSet>
-            <directory>../samples/guess</directory>
-            <useDefaultExcludes>true</useDefaultExcludes>
-            <outputDirectory>samples/guess</outputDirectory>
-            <excludes>
-                <exclude>**/target/**</exclude>
-                <exclude>**/.classpath</exclude>
-                <exclude>**/.project</exclude>
-                <exclude>**/.settings/**</exclude>
-                <exclude>**/.git/**</exclude>
-                <exclude>**/.svn/**</exclude>
-                <exclude>**/.metadata/**</exclude>
-                <exclude>**/.gitignore</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>../samples/reservation</directory>
-            <useDefaultExcludes>true</useDefaultExcludes>
-            <outputDirectory>samples/reservation</outputDirectory>
-            <excludes>
-                <exclude>**/target/**</exclude>
-                <exclude>**/.classpath</exclude>
-                <exclude>**/.project</exclude>
-                <exclude>**/.settings/**</exclude>
-                <exclude>**/.git/**</exclude>
-                <exclude>**/.svn/**</exclude>
-                <exclude>**/.metadata/**</exclude>
-                <exclude>**/.gitignore</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>../samples/ejb-sample</directory>
-            <useDefaultExcludes>true</useDefaultExcludes>
-            <outputDirectory>samples/ejb-sample</outputDirectory>
-            <excludes>
-                <exclude>**/target/**</exclude>
-                <exclude>**/.classpath</exclude>
-                <exclude>**/.project</exclude>
-                <exclude>**/.settings/**</exclude>
-                <exclude>**/.git/**</exclude>
-                <exclude>**/.svn/**</exclude>
-                <exclude>**/.metadata/**</exclude>
-                <exclude>**/.gitignore</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>../samples/ejb-telephone</directory>
-            <useDefaultExcludes>true</useDefaultExcludes>
-            <outputDirectory>samples/ejb-telephone</outputDirectory>
-            <excludes>
-                <exclude>**/target/**</exclude>
-                <exclude>**/.classpath</exclude>
-                <exclude>**/.project</exclude>
-                <exclude>**/.settings/**</exclude>
-                <exclude>**/.git/**</exclude>
-                <exclude>**/.svn/**</exclude>
-                <exclude>**/.metadata/**</exclude>
-                <exclude>**/.gitignore</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>../samples/conversation-sample</directory>
-            <useDefaultExcludes>true</useDefaultExcludes>
-            <outputDirectory>samples/conversation-sample</outputDirectory>
-            <excludes>
-                <exclude>**/target/**</exclude>
-                <exclude>**/.classpath</exclude>
-                <exclude>**/.project</exclude>
-                <exclude>**/.settings/**</exclude>
-                <exclude>**/.git/**</exclude>
-                <exclude>**/.svn/**</exclude>
-                <exclude>**/.metadata/**</exclude>
-                <exclude>**/.gitignore</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>../samples/jms-sample</directory>
-            <useDefaultExcludes>true</useDefaultExcludes>
-            <outputDirectory>samples/jms-sample</outputDirectory>
-            <excludes>
-                <exclude>**/target/**</exclude>
-                <exclude>**/.classpath</exclude>
-                <exclude>**/.project</exclude>
-                <exclude>**/.settings/**</exclude>
-                <exclude>**/.git/**</exclude>
-                <exclude>**/.svn/**</exclude>
-                <exclude>**/.metadata/**</exclude>
-                <exclude>**/.gitignore</exclude>
-            </excludes>
-        </fileSet>
+    <fileSets>
         <fileSet>
-            <directory>../samples/jsf2sample</directory>
-            <useDefaultExcludes>true</useDefaultExcludes>
-            <outputDirectory>samples/jsf2sample</outputDirectory>
-            <excludes>
-                <exclude>**/target/**</exclude>
-                <exclude>**/.classpath</exclude>
-                <exclude>**/.project</exclude>
-                <exclude>**/.settings/**</exclude>
-                <exclude>**/.git/**</exclude>
-                <exclude>**/.svn/**</exclude>
-                <exclude>**/.metadata/**</exclude>
-                <exclude>**/.gitignore</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>../samples/standalone-sample</directory>
-            <useDefaultExcludes>true</useDefaultExcludes>
-            <outputDirectory>samples/standalone-sample</outputDirectory>
-            <excludes>
-                <exclude>**/target/**</exclude>
-                <exclude>**/.classpath</exclude>
-                <exclude>**/.project</exclude>
-                <exclude>**/.settings/**</exclude>
-                <exclude>**/.git/**</exclude>
-                <exclude>**/.svn/**</exclude>
-                <exclude>**/.metadata/**</exclude>
-                <exclude>**/.gitignore</exclude>
-            </excludes>
+            <outputDirectory>/</outputDirectory>
+            <directory>src/main/install_scripts</directory>
+            <fileMode>0777</fileMode>
+            <includes>
+                <include>*.sh</include>
+                <include>*.bat</include>
+            </includes>
         </fileSet>
     </fileSets>
-
     <dependencySets>
 
         <dependencySet>
             <outputDirectory></outputDirectory>
             <includes>
-                <include>org.apache.openwebbeans:openwebbeans-impl:jar:${project.version}</include>
+                <include>org.apache.openwebbeans:openwebbeans-impl:jar</include>
+                <include>org.apache.xbean:xbean-finder-shaded:jar</include>
+                <include>org.apache.xbean:xbean-asm5-shaded:jar</include>
             </includes>
         </dependencySet>
 
@@ -194,6 +84,7 @@ under the License.
                 <include>org.apache.geronimo.specs:geronimo-jcdi_1.1_spec:jar</include>
                 <include>org.apache.geronimo.specs:geronimo-interceptor_1.2_spec:jar</include>
                 <include>org.apache.geronimo.specs:geronimo-annotation_1.2_spec:jar</include>
+                <include>org.apache.geronimo.specs:geronimo-el_2.2_spec:jar</include>
             </includes>
         </dependencySet>
 
@@ -212,6 +103,7 @@ under the License.
                 <include>org.apache.openwebbeans:openwebbeans-resource</include>
                 <include>org.apache.openwebbeans:openwebbeans-osgi</include>
                 <include>org.apache.openwebbeans:openwebbeans-web</include>
+                <include>org.apache.openwebbeans:openwebbeans-tomcat6</include>
                 <include>org.apache.openwebbeans:openwebbeans-tomcat7</include>
             </includes>
 

Modified: openwebbeans/branches/cdi-2.0/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/pom.xml?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/pom.xml (original)
+++ openwebbeans/branches/cdi-2.0/pom.xml Mon Aug 24 19:16:40 2015
@@ -81,7 +81,7 @@
         <tomcat7.version>7.0.61</tomcat7.version>
         <openejb.version>3.1.4</openejb.version>
         <myfaces.version>2.0.23</myfaces.version>
-        <xbean.version>4.1</xbean.version>
+        <xbean.version>4.3</xbean.version>
         <arquillian.version>1.1.2.Final</arquillian.version>
         <cdi.tck.version>1.2.4.Final</cdi.tck.version>
         <httpclient.version>4.2.1</httpclient.version>

Modified: openwebbeans/branches/cdi-2.0/readme/README.txt
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/readme/README.txt?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/readme/README.txt (original)
+++ openwebbeans/branches/cdi-2.0/readme/README.txt Mon Aug 24 19:16:40 2015
@@ -1,12 +1,12 @@
 -------------------------------
-Apache OpenWebBeans 1.5.0
+Apache OpenWebBeans 1.6.2
 -------------------------------
 Welcome!
 
 Thanks for downloading and using OpenWebBeans. 
 This document is a "Getting Started Guide" for OpenWebBeans.
 
-This document is based on the 1.5.0 release of Apache OpenWebBeans.
+This document is based on the 1.6.2 release of Apache OpenWebBeans.
 
 --------------------------------
 What is Apache OpenWebBeans?
@@ -21,11 +21,14 @@ Our project's web page can be found at:
 http://openwebbeans.apache.org
 
 
+
+
+
 --------------------------------
-OpenWebBeans 1.5.0 Release Features
+OpenWebBeans 1.6.2 Release Features
 --------------------------------
 
-- The 1.5.0 release supports the following features
+- The 1.6.2 release supports the following features
 -----------------------------------
 * Managed Beans Support
 * Producer Method Support
@@ -42,7 +45,7 @@ OpenWebBeans 1.5.0 Release Features
 * @Alternative support
 * OSGi environment support with an own plugable bundle ClassPath scanner
 * plugable SecurityManager integration doubles speed if no SecurityManager is being used
-* support for direct CDI usage in tomcat-6 and tomcat-7 environments
+* support for direct CDI usage in tomcat-6, tomcat-7, tomcat-8 and other Servlet environments
 
 
 
@@ -56,11 +59,106 @@ This mainly concerns the area of section
 out when it comes to OSGi containers and likes.
 In Apache OpenWebBeans, a settings configured in a beans.xml file of a BDA is not
 only effective for this very bean archive but for the whole BeanManager in control
-of the Application. This is especially the case for <alternatives> and
+of the Application. This is especially the case for <alternatives>, <decorators> and
 <interceptors>! An Alternative, Interceptor or Decorator enabled in one BDA is active
 for the whole Application.
 
 
+-------------------------------------------
+Release Notes - OpenWebBeans - Version 1.6.2
+-------------------------------------------
+
+Bug
+
+    [OWB-948] - Type of @New bean does not respect parameter
+    [OWB-1084] - destory session event can used the wrong payload
+
+
+
+-------------------------------------------
+Release Notes - OpenWebBeans - Version 1.6.1
+-------------------------------------------
+
+Bug
+
+    [OWB-1082] - WebContext BeanManager not longer serializable
+    [OWB-1083] - WebContextsService errors when servlet session invalidated during request lifecycle
+
+Improvement
+
+    [OWB-1081] - check Reception.IF_EXISTS in case of an inactive context
+
+
+
+-------------------------------------------
+Release Notes - OpenWebBeans - Version 1.6.0
+-------------------------------------------
+
+Bug
+
+    [OWB-626] - Conversation Scope isn't accessible after RENDER_RESPONSE phase
+    [OWB-654] - manual lookups of beans with generics fail
+    [OWB-758] - session backed session context
+    [OWB-771] - Invocation​ContextImpl cleans target field if occurs an exception
+    [OWB-844] - [PERFORMANCE] OWB conversation.ConversationImpl.isTransient() needs improvement
+    [OWB-900] - Documentation Links are broken
+    [OWB-906] - Check failover for custom scopes -> e.g. JSF 2.2 ViewScope
+    [OWB-907] - ClassUtil fails with ArrayIndexOutOfBoundsException if WildcardType.getUpperBound() returns empty array
+    [OWB-933] - @Delegate with constructor injection fails
+    [OWB-986] - CreationalContextImpl.toString throws NullPointerException
+    [OWB-989] - Clean info issue on Sonar
+    [OWB-1035] - WebBeansELResolver broken in case of multiple beans
+    [OWB-1040] - Lifecycle events fired during bean discovery do not follow specification sequence
+    [OWB-1047] - Guess sample currently not working due to missing javax.annotation.Priority
+    [OWB-1056] - interceptor and annotations spec jars missing in distribution
+    [OWB-1059] - empty beans.xml file should result in BeanDiscoveryMode.ALL
+    [OWB-1061] - Surplus and missing @Initialized and @Destroyed events
+    [OWB-1062] - JspFactory.getDefault() returns null
+    [OWB-1064] - Split ApplicationContext destroyal for custom beans and CDI internal beans like Extensions
+    [OWB-1065] - Incorrect matching of parameterized events
+    [OWB-1066] - Stack overflow on firing parameterized event
+    [OWB-1067] - Download pages must link to KEYS file and describe how to use sigs
+    [OWB-1069] - Propagate SessionContext to end of request only if a manual Session.invalidate() was called
+    [OWB-1071] - WEB-INF/beans.xml is partly broken
+    [OWB-1076] - remove sample sources from our binary distribution
+    [OWB-1077] - create install scripts for our binary distribution
+
+Improvement
+
+    [OWB-609] - refactor conversation handling
+    [OWB-762] - improve error message for "duplicated" configs
+    [OWB-786] - available implementations of SecurityService need an improved error-handling
+    [OWB-798] - expensive check in EventUtil#checkEventBindings
+    [OWB-821] - reduce the number of string creations
+    [OWB-851] - improve registration of default ee-beans
+    [OWB-915] - re-visit tomcat modules
+    [OWB-1044] - Cache whether @Initialized and @Destroyed get used at all in an app
+    [OWB-1048] - Store @SessionScoped beans in real HttpSession if available
+    [OWB-1049] - Remove FailOver service and related handling
+    [OWB-1050] - Store the Map<conversationId, conversationContexts> in the SessionContext
+    [OWB-1051] - Use RequestScopedBeanInterceptorHandler by default
+    [OWB-1055] - Review splitting WebBeansConfigurationListener in Begin and End listeners
+    [OWB-1073] - improve OpenWebBeansConfiguration lookup handling
+    [OWB-1075] - improve annotation check
+    [OWB-1080] - Use the JVMs java version for our generated proxies
+
+New Feature
+
+    [OWB-1070] - eager session creation configuration
+    [OWB-1072] - CDI 1.2 spec requires a "CDI Conversation Filter" which eagerly touches the Conversation
+
+Task
+
+    [OWB-1060] - upgrade to latest apache-parent
+    [OWB-1068] - Remove ContextsService#activateContext and #deactivateContext
+    [OWB-1079] - upgrade ASM to 5.0.4
+
+Test
+
+    [OWB-1052] - improve our test coverage for the owb-web module
+    [OWB-1053] - improve event performance
+
+
 
 -------------------------------------------
 Release Notes - OpenWebBeans - Version 1.5.0
@@ -990,8 +1088,8 @@ Test
 ----------------------------------------------
 Required Platform
 ----------------------------------------------
-Java Version : Java SE >= 5.0
-Java EE Must : Java EE >= 5.0
+Java Version : Java SE >= 1.6
+
 
 ---------------------------------------------
 How to Configure OpenWebBeans

Modified: openwebbeans/branches/cdi-2.0/samples/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/samples/pom.xml?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/samples/pom.xml (original)
+++ openwebbeans/branches/cdi-2.0/samples/pom.xml Mon Aug 24 19:16:40 2015
@@ -33,7 +33,7 @@ under the License.
 
     <properties>
         <deploy.skip>false</deploy.skip>
-        <myfaces2.version>2.0.7</myfaces2.version>
+        <myfaces2.version>2.2.8</myfaces2.version>
     </properties>
 
     <build>

Modified: openwebbeans/branches/cdi-2.0/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/UrlSet.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/UrlSet.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/UrlSet.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/UrlSet.java Mon Aug 24 19:16:40 2015
@@ -87,7 +87,7 @@ public class UrlSet implements Set<URL>
     @Override
     public boolean remove(Object o)
     {
-        if (o instanceof URL && o != null)
+        if (o instanceof URL)
         {
             return urlMap.remove(((URL) o).toExternalForm()) != null;
         }

Modified: openwebbeans/branches/cdi-2.0/webbeans-ee/src/main/java/org/apache/webbeans/ee/event/TransactionalEventNotifier.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-ee/src/main/java/org/apache/webbeans/ee/event/TransactionalEventNotifier.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-ee/src/main/java/org/apache/webbeans/ee/event/TransactionalEventNotifier.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-ee/src/main/java/org/apache/webbeans/ee/event/TransactionalEventNotifier.java Mon Aug 24 19:16:40 2015
@@ -35,7 +35,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 @SuppressWarnings("unchecked")
-public class TransactionalEventNotifier
+public final class TransactionalEventNotifier
 {
     private static final Logger logger = WebBeansLoggerFacade.getLogger(TransactionalEventNotifier.class);
 

Modified: openwebbeans/branches/cdi-2.0/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/EjbBeanBuilder.java Mon Aug 24 19:16:40 2015
@@ -48,7 +48,7 @@ public abstract class EjbBeanBuilder<T,
 
     public EjbBeanBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType, BeanAttributes<T> beanAttributes)
     {
-        Asserts.assertNotNull(webBeansContext, "webBeansContext");
+        Asserts.assertNotNull(webBeansContext, Asserts.PARAM_NAME_WEBBEANSCONTEXT);
         Asserts.assertNotNull(annotatedType, "annotated type");
         Asserts.assertNotNull(beanAttributes, "beanAttributes");
         this.webBeansContext = webBeansContext;

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java Mon Aug 24 19:16:40 2015
@@ -30,6 +30,7 @@ import org.apache.webbeans.util.ArrayUti
 import org.apache.webbeans.util.Asserts;
 
 import javax.enterprise.context.NormalScope;
+import javax.enterprise.inject.Any;
 import javax.enterprise.inject.Default;
 import javax.enterprise.inject.Disposes;
 import javax.enterprise.inject.New;
@@ -187,7 +188,7 @@ public final class AnnotationManager
      */
     public boolean hasInterceptorBindingMetaAnnotation(Annotation[] anns)
     {
-        Asserts.assertNotNull(anns, "anns");
+        Asserts.assertNotNull(anns, Asserts.PARAM_NAME_ANNOTATION);
 
         for (Annotation ann : anns)
         {
@@ -219,7 +220,7 @@ public final class AnnotationManager
      */
     public Annotation[] getInterceptorBindingMetaAnnotations(Annotation[] anns)
     {
-        Asserts.assertNotNull(anns, "anns");
+        Asserts.assertNotNull(anns, Asserts.PARAM_NAME_ANNOTATION);
         List<Annotation> interAnns = new ArrayList<Annotation>();
 
         for (final Annotation ann : anns)
@@ -365,21 +366,21 @@ public final class AnnotationManager
     /**
      * Gets the array of qualifier annotations on the given array.
      *
-     * @param annotations annotation array
+     * @param anns annotation array
      * @return array containing qualifier anns
      */
-    public Set<Annotation> getQualifierAnnotations(Collection<Annotation> annotations)
+    public Set<Annotation> getQualifierAnnotations(Collection<Annotation> anns)
     {
-        Asserts.assertNotNull(annotations, "annotations");
+        Asserts.assertNotNull(anns, Asserts.PARAM_NAME_ANNOTATION);
 
-        if (annotations.isEmpty())
+        if (anns.isEmpty())
         {
             return DefaultLiteral.SET;
         }
 
         Set<Annotation> set = new HashSet<Annotation>();
 
-        for (Annotation annot : annotations)
+        for (Annotation annot : anns)
         {
             if (isQualifierAnnotation(annot.annotationType()))
             {
@@ -398,6 +399,17 @@ public final class AnnotationManager
 
     public void checkQualifierConditions(Annotation... qualifierAnnots)
     {
+        if (qualifierAnnots == null || qualifierAnnots.length == 0)
+        {
+            return;
+        }
+
+        if (qualifierAnnots.length == 1)
+        {
+            // performance hack to avoid Set creation
+            checkQualifierConditions(qualifierAnnots[0]);
+        }
+
         Set<Annotation> annSet = ArrayUtil.asSet(qualifierAnnots);
 
         //check for duplicate annotations
@@ -425,6 +437,14 @@ public final class AnnotationManager
 
     private void checkQualifierConditions(Annotation ann)
     {
+        if (ann == DefaultLiteral.INSTANCE || ann == AnyLiteral.INSTANCE ||
+            ann.annotationType().equals(Default.class) || ann.annotationType().equals(Any.class) ||
+            ann.annotationType().equals(Named.class))
+        {
+            // special performance boost for some known Qualifiers
+            return;
+        }
+
         Method[] methods = webBeansContext.getSecurityService().doPrivilegedGetDeclaredMethods(ann.annotationType());
 
         for (Method method : methods)
@@ -500,7 +520,7 @@ public final class AnnotationManager
 
     public boolean hasStereoTypeMetaAnnotation(Set<Class<? extends Annotation>> anns)
     {
-        Asserts.assertNotNull(anns, "anns");
+        Asserts.assertNotNull(anns, Asserts.PARAM_NAME_ANNOTATION);
 
         for (Class<? extends Annotation> ann : anns)
         {
@@ -515,7 +535,7 @@ public final class AnnotationManager
 
     public boolean hasStereoTypeMetaAnnotation(Annotation[] anns)
     {
-        Asserts.assertNotNull(anns, "anns");
+        Asserts.assertNotNull(anns, Asserts.PARAM_NAME_ANNOTATION);
 
         for (Annotation ann : anns)
         {
@@ -530,7 +550,7 @@ public final class AnnotationManager
 
     public Annotation[] getStereotypeMetaAnnotations(Annotation[] anns)
     {
-        Asserts.assertNotNull(anns, "anns");
+        Asserts.assertNotNull(anns, Asserts.PARAM_NAME_ANNOTATION);
         List<Annotation> interAnns = new ArrayList<Annotation>();
 
         for (Annotation ann : anns)
@@ -556,7 +576,7 @@ public final class AnnotationManager
      */
     public Set<Class<? extends Annotation>> getStereotypeMetaAnnotations(Set<Class<? extends Annotation>> stereotypes)
     {
-        Asserts.assertNotNull(stereotypes, "anns");
+        Asserts.assertNotNull(stereotypes, Asserts.PARAM_NAME_ANNOTATION);
         Set<Class<? extends Annotation>> interAnns = new HashSet<Class<? extends Annotation>>();
 
         for (Class<? extends Annotation> ann : stereotypes)
@@ -588,7 +608,7 @@ public final class AnnotationManager
      */
     public Set<Class<? extends Annotation>> getStereotypes(Set<Class<? extends Annotation>> anns)
     {
-        Asserts.assertNotNull(anns, "bean");
+        Asserts.assertNotNull(anns, Asserts.PARAM_NAME_ANNOTATION);
         if (hasStereoTypeMetaAnnotation(anns))
         {
             return getStereotypeMetaAnnotations(anns);

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractProducerBeanBuilder.java Mon Aug 24 19:16:40 2015
@@ -44,7 +44,7 @@ public abstract class AbstractProducerBe
 
     public AbstractProducerBeanBuilder(InjectionTargetBean<?> parent, A annotated, BeanAttributes<T> beanAttributes)
     {
-        Asserts.assertNotNull(parent, "webBeansContext");
+        Asserts.assertNotNull(parent, Asserts.PARAM_NAME_WEBBEANSCONTEXT);
         Asserts.assertNotNull(annotated, "annotated");
         Asserts.assertNotNull(beanAttributes, "beanAttributes");
         this.parent = parent;

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BaseProducerFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BaseProducerFactory.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BaseProducerFactory.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BaseProducerFactory.java Mon Aug 24 19:16:40 2015
@@ -54,7 +54,7 @@ public abstract class BaseProducerFactor
 
     public BaseProducerFactory(Bean<P> parent, WebBeansContext webBeansContext)
     {
-        Asserts.assertNotNull(webBeansContext, "WebBeansContext");
+        Asserts.assertNotNull(webBeansContext, Asserts.PARAM_NAME_WEBBEANSCONTEXT);
         this.parent = parent;
         this.webBeansContext = webBeansContext;
     }

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java Mon Aug 24 19:16:40 2015
@@ -552,7 +552,7 @@ public abstract class BeanAttributesBuil
 
         private BeanAttributesBuilderFactory(WebBeansContext webBeansContext)
         {
-            Asserts.assertNotNull(webBeansContext, "webBeansContext");
+            Asserts.assertNotNull(webBeansContext, Asserts.PARAM_NAME_WEBBEANSCONTEXT);
             this.webBeansContext = webBeansContext;
         }
         

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/DecoratorBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/DecoratorBeanBuilder.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/DecoratorBeanBuilder.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/DecoratorBeanBuilder.java Mon Aug 24 19:16:40 2015
@@ -83,7 +83,7 @@ public class DecoratorBeanBuilder<T> ext
 
     public DecoratorBeanBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType, BeanAttributes<T> beanAttributes)
     {
-        Asserts.assertNotNull(webBeansContext, "webBeansContext");
+        Asserts.assertNotNull(webBeansContext, Asserts.PARAM_NAME_WEBBEANSCONTEXT);
         Asserts.assertNotNull(annotatedType, "annotated type");
         Asserts.assertNotNull(beanAttributes, "beanAttributes");
         this.webBeansContext = webBeansContext;

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ExtensionBeanBuilder.java Mon Aug 24 19:16:40 2015
@@ -31,7 +31,7 @@ public class ExtensionBeanBuilder<T>
 
     public ExtensionBeanBuilder(WebBeansContext webBeansContext, Class<T> type)
     {
-        Asserts.assertNotNull(webBeansContext, "webBeansContext");
+        Asserts.assertNotNull(webBeansContext, Asserts.PARAM_NAME_WEBBEANSCONTEXT);
         Asserts.assertNotNull(type, "type");
         this.webBeansContext = webBeansContext;
         annotatedType = webBeansContext.getAnnotatedElementFactory().newAnnotatedType(type);

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/InterceptorBeanBuilder.java Mon Aug 24 19:16:40 2015
@@ -66,7 +66,7 @@ public abstract class InterceptorBeanBui
 
     protected InterceptorBeanBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType, BeanAttributes<T> beanAttributes)
     {
-        Asserts.assertNotNull(webBeansContext, "webBeansContext");
+        Asserts.assertNotNull(webBeansContext, Asserts.PARAM_NAME_WEBBEANSCONTEXT);
         Asserts.assertNotNull(annotatedType, "annotated type");
         Asserts.assertNotNull(beanAttributes, "beanAttributes");
         this.webBeansContext = webBeansContext;

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanBuilder.java Mon Aug 24 19:16:40 2015
@@ -48,7 +48,7 @@ public class ManagedBeanBuilder<T, M ext
      */
     public ManagedBeanBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType, BeanAttributes<T> beanAttributes)
     {
-        Asserts.assertNotNull(webBeansContext, "WebBeansContext");
+        Asserts.assertNotNull(webBeansContext, Asserts.PARAM_NAME_WEBBEANSCONTEXT);
         Asserts.assertNotNull(annotatedType, "annotated type");
         Asserts.assertNotNull(beanAttributes, "beanAttributes");
         this.webBeansContext = webBeansContext;

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ObserverMethodsBuilder.java Mon Aug 24 19:16:40 2015
@@ -59,7 +59,7 @@ public class ObserverMethodsBuilder<T>
      */
     public ObserverMethodsBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType)
     {
-        Asserts.assertNotNull(webBeansContext, "WebBeansContext");
+        Asserts.assertNotNull(webBeansContext, Asserts.PARAM_NAME_WEBBEANSCONTEXT);
         Asserts.assertNotNull(annotatedType, "annotated type");
         this.webBeansContext = webBeansContext;
         this.annotatedType = annotatedType;

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerFieldBeansBuilder.java Mon Aug 24 19:16:40 2015
@@ -55,7 +55,7 @@ public class ProducerFieldBeansBuilder<T
      */
     public ProducerFieldBeansBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType)
     {
-        Asserts.assertNotNull(webBeansContext, "WebBeansContext");
+        Asserts.assertNotNull(webBeansContext, Asserts.PARAM_NAME_WEBBEANSCONTEXT);
         Asserts.assertNotNull(annotatedType, "annotated type");
         this.webBeansContext = webBeansContext;
         this.annotatedType = annotatedType;

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ProducerMethodBeansBuilder.java Mon Aug 24 19:16:40 2015
@@ -54,7 +54,7 @@ public class ProducerMethodBeansBuilder<
      */
     public ProducerMethodBeansBuilder(WebBeansContext webBeansContext, AnnotatedType<T> annotatedType)
     {
-        Asserts.assertNotNull(webBeansContext, "WebBeansContext");
+        Asserts.assertNotNull(webBeansContext, Asserts.PARAM_NAME_WEBBEANSCONTEXT);
         Asserts.assertNotNull(annotatedType, "annotated type");
         this.webBeansContext = webBeansContext;
         this.annotatedType = annotatedType;

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java Mon Aug 24 19:16:40 2015
@@ -74,7 +74,6 @@ import org.apache.webbeans.spi.BeanArchi
 import org.apache.webbeans.spi.JNDIService;
 import org.apache.webbeans.spi.ScannerService;
 import org.apache.webbeans.spi.plugins.OpenWebBeansJavaEEPlugin;
-import org.apache.webbeans.spi.plugins.OpenWebBeansWebPlugin;
 import org.apache.webbeans.util.AnnotationUtil;
 import org.apache.webbeans.util.ClassUtil;
 import org.apache.webbeans.util.ExceptionUtil;
@@ -278,6 +277,8 @@ public class BeansDeployer
                 validateDecoratorDecoratedTypes();
                 validateDecoratorGenericTypes();
 
+                webBeansContext.getBeanManagerImpl().getNotificationManager().clearCaches();
+
                 // fire event
                 fireAfterDeploymentValidationEvent();
 
@@ -531,17 +532,10 @@ public class BeansDeployer
         
         //REgister Provider Beans
         OpenWebBeansJavaEEPlugin beanEeProvider = webBeansContext.getPluginLoader().getJavaEEPlugin();
-        OpenWebBeansWebPlugin beanWebProvider = webBeansContext.getPluginLoader().getWebPlugin();
-        
+
         if(beanEeProvider != null)
         {
-            addDefaultBean(webBeansContext, "org.apache.webbeans.ee.beans.ValidatorBean");
-            addDefaultBean(webBeansContext, "org.apache.webbeans.ee.beans.ValidatorFactoryBean");
-            addDefaultBean(webBeansContext, "org.apache.webbeans.ee.beans.UserTransactionBean");
-        }
-        else if(beanWebProvider != null)
-        {
-            addDefaultBean(webBeansContext, "org.apache.webbeans.ee.common.beans.PrincipalBean");
+            beanEeProvider.registerEEBeans();
         }
             
     }

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/DefaultAnnotation.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/DefaultAnnotation.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/DefaultAnnotation.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/DefaultAnnotation.java Mon Aug 24 19:16:40 2015
@@ -29,7 +29,7 @@ import java.lang.reflect.Proxy;
  * The annotation literal gets filled with the default values.
  * TODO implement class caching!
  */
-public class DefaultAnnotation implements InvocationHandler, Annotation
+public final class DefaultAnnotation implements InvocationHandler, Annotation
 {
     
     private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/OWBLogConst.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/OWBLogConst.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/OWBLogConst.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/OWBLogConst.java Mon Aug 24 19:16:40 2015
@@ -22,7 +22,7 @@ package org.apache.webbeans.config;
  * import org.apache.webbeans.config.OWBLogConst;
  */
 
-public class OWBLogConst
+public final class OWBLogConst
 {
     private OWBLogConst()
     {

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java Mon Aug 24 19:16:40 2015
@@ -49,12 +49,6 @@ public class OpenWebBeansConfiguration
     /**Logger instance*/
     private static final Logger logger = WebBeansLoggerFacade.getLogger(OpenWebBeansConfiguration.class);
 
-    /**Default configuration files*/
-    private static final String DEFAULT_CONFIG_PROPERTIES_NAME = "META-INF/openwebbeans/openwebbeans.properties";
-    
-    /**Property of application*/
-    private final Properties configProperties = new Properties();
-        
     /**Conversation periodic delay in ms.*/
     public static final String CONVERSATION_PERIODIC_DELAY = "org.apache.webbeans.conversation.Conversation.periodicDelay";
     
@@ -144,6 +138,23 @@ public class OpenWebBeansConfiguration
      */
     public static final String EAGER_SESSION_INITIALISATION = "org.apache.webbeans.web.eagerSessionInitialisation";
 
+    /**
+     * The Java Version to use for the generated proxy classes.
+     * If "auto" then we will pick the version of the current JVM.
+     * The default is set to "1.6" as some tools in jetty/tomcat/etc still
+     * cannot properly handle Java8 (mostly due to older Eclipse JDT versions).
+     */
+    public static final String GENERATOR_JAVA_VERSIN = "org.apache.webbeans.generator.javaVersion";
+
+
+    /**Default configuration files*/
+    private static final String DEFAULT_CONFIG_PROPERTIES_NAME = "META-INF/openwebbeans/openwebbeans.properties";
+
+    private static final String AUTO_CONFIG = "auto";
+
+    /**Property of application*/
+    private final Properties configProperties = new Properties();
+
 
     private Set<String> ignoredInterfaces;
 
@@ -221,15 +232,15 @@ public class OpenWebBeansConfiguration
     private Properties doPrivilegedGetSystemProperties()
     {
         return AccessController.doPrivileged(
-                new PrivilegedAction<Properties>()
+            new PrivilegedAction<Properties>()
+            {
+                @Override
+                public Properties run()
                 {
-                    @Override
-                    public Properties run()
-                    {
-                        return System.getProperties();
-                    }
-
+                    return System.getProperties();
                 }
+
+            }
         );
     }
 
@@ -310,4 +321,15 @@ public class OpenWebBeansConfiguration
     {
         return "true".equals(getProperty(PRODUCER_INTERCEPTION_SUPPORT, "true"));
     }
+
+    public String getGeneratorJavaVersion()
+    {
+        String generatorJavaVersion = getProperty(GENERATOR_JAVA_VERSIN);
+        if (generatorJavaVersion == null || AUTO_CONFIG.equals(generatorJavaVersion))
+        {
+            return System.getProperty("java.version");
+        }
+
+        return generatorJavaVersion;
+    }
 }

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java Mon Aug 24 19:16:40 2015
@@ -38,7 +38,7 @@ import java.util.logging.Logger;
  * greather than 100.</p>
  *
  */
-public class PropertyLoader
+public final class PropertyLoader
 {
     public static final int CONFIGURATION_ORDINAL_DEFAULT_VALUE = 100;
 

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java Mon Aug 24 19:16:40 2015
@@ -76,9 +76,9 @@ public class WebBeansContext
     private final DecoratorsManager decoratorsManager = new DecoratorsManager(this);
     private final ExtensionLoader extensionLoader = new ExtensionLoader(this);
     private final InterceptorsManager interceptorsManager = new InterceptorsManager(this);
-    private final InterceptorDecoratorProxyFactory interceptorDecoratorProxyFactory = new InterceptorDecoratorProxyFactory(this);
-    private final NormalScopeProxyFactory normalScopeProxyFactory = new NormalScopeProxyFactory(this);
-    private final SubclassProxyFactory subclassProxyFactory = new SubclassProxyFactory(this);
+    private final InterceptorDecoratorProxyFactory interceptorDecoratorProxyFactory;
+    private final NormalScopeProxyFactory normalScopeProxyFactory;
+    private final SubclassProxyFactory subclassProxyFactory;
     private final OpenWebBeansConfiguration openWebBeansConfiguration;
     private final PluginLoader pluginLoader = new PluginLoader();
     private final SerializableBeanVault serializableBeanVault = new SerializableBeanVault();
@@ -141,6 +141,11 @@ public class WebBeansContext
         loaderService = getService(LoaderService.class);
         securityService = getService(SecurityService.class);
         applicationBoundaryService = getService(ApplicationBoundaryService.class);
+
+        interceptorDecoratorProxyFactory = new InterceptorDecoratorProxyFactory(this);
+        normalScopeProxyFactory = new NormalScopeProxyFactory(this);
+        subclassProxyFactory = new SubclassProxyFactory(this);
+
         beanArchiveService = getService(BeanArchiveService.class);
         conversationManager = new ConversationManager(this);
 

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java Mon Aug 24 19:16:40 2015
@@ -460,6 +460,17 @@ public class BeanManagerImpl implements
     }
 
     /**
+     * Fire &#064;Initialized and &#064Destroyed events, but only IF any observers do exist.
+     */
+    public void fireContextLifecyleEvent(Object payload, Annotation lifecycleQualifier)
+    {
+        if (notificationManager.hasContextLifecycleObserver(lifecycleQualifier))
+        {
+            fireEvent(payload, lifecycleQualifier);
+        }
+    }
+
+    /**
      * Like {@link #fireEvent(Object, java.lang.annotation.Annotation...)} but intended for
      * internal CDI Container lifecycle events. The difference is that those
      * events must only be delivered to CDI Extensions and not to normal beans.
@@ -720,7 +731,8 @@ public class BeanManagerImpl implements
             final boolean isProducer = AbstractProducerBean.class.isInstance(bean);
             if(!isProducer && // we have different rules for producers
                !isBeanTypeAssignableToGivenType(bean.getTypes(), beanType, bean instanceof NewBean, isProducer) &&
-               !GenericsUtil.satisfiesDependency(false, isProducer, beanType, bean.getBeanClass()))
+               !GenericsUtil.satisfiesDependency(false, isProducer, beanType, bean.getBeanClass()) &&
+               !GenericsUtil.satisfiesDependencyRaw(false, isProducer, beanType, bean.getBeanClass()))
             {
                 throw new IllegalArgumentException("Given bean type : " + beanType + " is not applicable for the bean instance : " + bean);
             }

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java Mon Aug 24 19:16:40 2015
@@ -489,9 +489,16 @@ public class InjectionResolver
             resolvedComponents = findByQualifier(resolvedComponents, injectionPointType, qualifiers);
 
             // have an additional round of checks for assignability of parameterized types.
-            resolvedComponents = findByParameterizedType(resolvedComponents, injectionPointType, isDelegate);
+            Set<Bean<?>> byParameterizedType = findByParameterizedType(resolvedComponents, injectionPointType, isDelegate);
+            if (byParameterizedType.isEmpty())
+            {
+                resolvedComponents = findByBeanType(resolvedComponents, injectionPointType, isDelegate);
+            }
+            else
+            {
+                resolvedComponents = byParameterizedType;
+            }
         }
-
         resolvedBeansByType.put(cacheKey, resolvedComponents);
         if (logger.isLoggable(Level.FINE))
         {
@@ -501,6 +508,29 @@ public class InjectionResolver
         return resolvedComponents;
     }
 
+    private Set<Bean<?>> findByBeanType(Set<Bean<?>> allComponents, Type injectionPointType, boolean isDelegate)
+    {
+        Set<Bean<?>> resolved = new HashSet<Bean<?>>();
+        for (Bean<?> bean : allComponents)
+        {
+            boolean isProducer = AbstractProducerBean.class.isInstance(bean);
+            for (Type type : bean.getTypes())
+            {
+                if (GenericsUtil.satisfiesDependency(isDelegate, isProducer, injectionPointType, type))
+                {
+                    resolved.add(bean);
+                }
+
+                if (!ClassUtil.isParametrizedType(injectionPointType)
+                        && ClassUtil.isRawClassEquals(injectionPointType, type))
+                {
+                    resolved.add(bean);
+                }
+            }
+        }
+        return resolved;
+    }
+
     private Set<Bean<?>> findByParameterizedType(Set<Bean<?>> allComponents, Type injectionPointType, boolean isDelegate)
     {
         Bean<?> rawProducerBean = null;

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionTargetFactoryImpl.java Mon Aug 24 19:16:40 2015
@@ -46,7 +46,7 @@ public class InjectionTargetFactoryImpl<
     public InjectionTargetFactoryImpl(AnnotatedType<T> annotatedType, WebBeansContext webBeansContext)
     {
         Asserts.assertNotNull(annotatedType, "AnnotatedType");
-        Asserts.assertNotNull(webBeansContext, "WebBeansContext");
+        Asserts.assertNotNull(webBeansContext, Asserts.PARAM_NAME_WEBBEANSCONTEXT);
         this.annotatedType = annotatedType;
         this.webBeansContext = webBeansContext;
     }

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java Mon Aug 24 19:16:40 2015
@@ -166,6 +166,14 @@ public abstract class AbstractContext im
     @Override
     public void destroy(Contextual<?> contextual)
     {
+        destroyInstance(contextual);
+    }
+
+    /**
+     * Internal destroy method.
+     */
+    public void destroyInstance(Contextual<?> contextual)
+    {
         
         BeanInstanceBag<?> instance = componentInstanceMap.get(contextual);
         if (instance == null)
@@ -207,7 +215,7 @@ public abstract class AbstractContext im
         Set<Contextual<?>> keySet = new HashSet<Contextual<?>>(componentInstanceMap.keySet());
         for (Contextual<?> contextual: keySet)
         {
-            destroy(contextual);
+            destroyInstance(contextual);
         }
         setActive(false);
     }

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java Mon Aug 24 19:16:40 2015
@@ -36,6 +36,12 @@ public class ApplicationContext extends
 {
     private static final long serialVersionUID = -8254441824647652312L;
 
+    /**
+     * used to prevent us firing the Destroyed event twice.
+     * We cannot just use setActive(false) as this would trash &#064;BeforeShutdown
+     */
+    private boolean destroyed = false;
+
     public ApplicationContext()
     {
         super(ApplicationScoped.class);
@@ -64,8 +70,10 @@ public class ApplicationContext extends
                 continue;
             }
 
-            destroy(contextual);
+            destroyInstance(contextual);
         }
+
+        destroyed = true;
     }
 
     /**
@@ -78,5 +86,11 @@ public class ApplicationContext extends
         setActive(false);
     }
 
-
+    /**
+     * @return @{code true} if custom beans already got destroyed
+     */
+    public boolean isDestroyed()
+    {
+        return destroyed;
+    }
 }

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java Mon Aug 24 19:16:40 2015
@@ -24,6 +24,7 @@ import javax.enterprise.context.RequestS
 import javax.enterprise.context.spi.Contextual;
 
 import org.apache.webbeans.context.creational.BeanInstanceBag;
+import org.apache.webbeans.intercept.RequestScopedBeanInterceptorHandler;
 
 /**
  * Request context implementation.
@@ -39,6 +40,11 @@ public class RequestContext extends Abst
      */
     private SessionContext propagatedSessionContext;
 
+    /**
+     * if propagatedSessionContext != null the event instance to use (http session can be no more accessible)
+     */
+    private Object httpSession;
+
     /*
     * Constructor
     */
@@ -82,4 +88,20 @@ public class RequestContext extends Abst
         return propagatedSessionContext;
     }
 
+    public Object getHttpSession()
+    {
+        return httpSession;
+    }
+
+    public void setHttpSession(final Object httpSession)
+    {
+        this.httpSession = httpSession;
+    }
+
+    @Override
+    public void destroy(Contextual<?> contextual)
+    {
+        super.destroy(contextual);
+        RequestScopedBeanInterceptorHandler.removeThreadLocals();
+    }
 }

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java Mon Aug 24 19:16:40 2015
@@ -25,6 +25,7 @@ import javax.enterprise.context.SessionS
 import javax.enterprise.context.spi.Contextual;
 
 import org.apache.webbeans.context.creational.BeanInstanceBag;
+import org.apache.webbeans.intercept.SessionScopedBeanInterceptorHandler;
 
 /**
  * Session context implementation.
@@ -44,4 +45,10 @@ public class SessionContext extends Pass
         componentInstanceMap = new ConcurrentHashMap<Contextual<?>, BeanInstanceBag<?>>();
     }
 
+    @Override
+    public void destroy(Contextual<?> contextual)
+    {
+        super.destroy(contextual);
+        SessionScopedBeanInterceptorHandler.removeThreadLocals();
+    }
 }

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java Mon Aug 24 19:16:40 2015
@@ -195,7 +195,8 @@ public class ConversationManager
     public void destroyConversationContext(ConversationContext ctx)
     {
         ctx.destroy();
-        webBeansContext.getBeanManagerImpl().fireEvent(getLifecycleEventPayload(ctx), DestroyedLiteral.INSTANCE_CONVERSATION_SCOPED);
+        webBeansContext.getBeanManagerImpl().fireEvent(
+            getLifecycleEventPayload(ctx), DestroyedLiteral.INSTANCE_CONVERSATION_SCOPED);
     }
 
     public Object getLifecycleEventPayload(ConversationContext ctx)
@@ -208,7 +209,8 @@ public class ConversationManager
 
         if (payLoad == null)
         {
-            RequestContext requestContext = (RequestContext) webBeansContext.getContextsService().getCurrentContext(RequestScoped.class);
+            RequestContext requestContext
+                = (RequestContext) webBeansContext.getContextsService().getCurrentContext(RequestScoped.class);
             if (requestContext != null)
             {
                 payLoad = requestContext.getRequestObject();

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java Mon Aug 24 19:16:40 2015
@@ -145,7 +145,7 @@ public abstract class AbstractMetaDataDi
         }
     }
 
-    abstract protected void configure();
+    protected abstract void configure();
 
     /**
      * Since CDI-1.1 this is actually more a 'findBdaBases' as it also

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java Mon Aug 24 19:16:40 2015
@@ -42,6 +42,8 @@ import org.apache.webbeans.context.Reque
 import org.apache.webbeans.context.SessionContext;
 import org.apache.webbeans.context.SingletonContext;
 import org.apache.webbeans.conversation.ConversationManager;
+import org.apache.webbeans.intercept.RequestScopedBeanInterceptorHandler;
+import org.apache.webbeans.intercept.SessionScopedBeanInterceptorHandler;
 
 
 public class DefaultContextsService extends AbstractContextsService
@@ -193,6 +195,7 @@ public class DefaultContextsService exte
         if (requestCtx != null)
         {
             requestCtx.destroy();
+            RequestScopedBeanInterceptorHandler.removeThreadLocals();
             requestContext.set(null);
             requestContext.remove();
         }
@@ -201,6 +204,7 @@ public class DefaultContextsService exte
         if (sessionCtx != null)
         {
             sessionCtx.destroy();
+            SessionScopedBeanInterceptorHandler.removeThreadLocals();
             sessionContext.set(null);
             sessionContext.remove();
         }
@@ -292,7 +296,7 @@ public class DefaultContextsService exte
     
     private void startApplicationContext()
     {
-        if (applicationContext != null)
+        if (applicationContext != null && !applicationContext.isDestroyed())
         {
             // applicationContext is already started
             return;
@@ -303,10 +307,12 @@ public class DefaultContextsService exte
 
         applicationContext = ctx;
 
-        // We do ALSO send the @Initialized(ApplicationScoped.class) at this location but this is WAY to early for userland apps
+        // We do ALSO send the @Initialized(ApplicationScoped.class) at this
+        // location but this is WAY to early for userland apps
         // This also gets sent in the application startup code after AfterDeploymentValidation got fired.
         // see AbstractLifecycle#afterStartApplication
-        webBeansContext.getBeanManagerImpl().fireEvent(new Object(), InitializedLiteral.INSTANCE_APPLICATION_SCOPED);
+        webBeansContext.getBeanManagerImpl().fireContextLifecyleEvent(
+            new Object(), InitializedLiteral.INSTANCE_APPLICATION_SCOPED);
     }
 
     
@@ -319,7 +325,8 @@ public class DefaultContextsService exte
 
         if (ctx.getConversation().isTransient())
         {
-            webBeansContext.getBeanManagerImpl().fireEvent(conversationManager.getLifecycleEventPayload(ctx), InitializedLiteral.INSTANCE_CONVERSATION_SCOPED);
+            webBeansContext.getBeanManagerImpl().fireContextLifecyleEvent(
+                conversationManager.getLifecycleEventPayload(ctx), InitializedLiteral.INSTANCE_CONVERSATION_SCOPED);
         }
     }
 
@@ -331,7 +338,8 @@ public class DefaultContextsService exte
         ctx.setActive(true);
         
         requestContext.set(ctx);
-        webBeansContext.getBeanManagerImpl().fireEvent(new Object(), InitializedLiteral.INSTANCE_REQUEST_SCOPED);
+        webBeansContext.getBeanManagerImpl().fireContextLifecyleEvent(
+            new Object(), InitializedLiteral.INSTANCE_REQUEST_SCOPED);
     }
 
     
@@ -341,7 +349,8 @@ public class DefaultContextsService exte
         ctx.setActive(true);
         
         sessionContext.set(ctx);
-        webBeansContext.getBeanManagerImpl().fireEvent(new Object(), InitializedLiteral.INSTANCE_SESSION_SCOPED);
+        webBeansContext.getBeanManagerImpl().fireContextLifecyleEvent(
+            new Object(), InitializedLiteral.INSTANCE_SESSION_SCOPED);
     }
 
     
@@ -352,19 +361,21 @@ public class DefaultContextsService exte
         ctx.setActive(true);
         
         singletonContext.set(ctx);
-        webBeansContext.getBeanManagerImpl().fireEvent(new Object(), InitializedLiteral.INSTANCE_SINGLETON_SCOPED);
+        webBeansContext.getBeanManagerImpl().fireContextLifecyleEvent(
+            new Object(), InitializedLiteral.INSTANCE_SINGLETON_SCOPED);
     }
 
     
     private void stopApplicationContext()
     {
-        if(applicationContext != null)
+        if(applicationContext != null && !applicationContext.isDestroyed())
         {
             applicationContext.destroy();
 
             // this is needed to get rid of ApplicationScoped beans which are cached inside the proxies...
             WebBeansContext.currentInstance().getBeanManagerImpl().clearCacheProxies();
-            webBeansContext.getBeanManagerImpl().fireEvent(new Object(), DestroyedLiteral.INSTANCE_APPLICATION_SCOPED);
+            webBeansContext.getBeanManagerImpl().fireContextLifecyleEvent(
+                new Object(), DestroyedLiteral.INSTANCE_APPLICATION_SCOPED);
         }
     }
 
@@ -399,7 +410,9 @@ public class DefaultContextsService exte
 
         requestContext.set(null);
         requestContext.remove();
-        webBeansContext.getBeanManagerImpl().fireEvent(new Object(), DestroyedLiteral.INSTANCE_REQUEST_SCOPED);
+        RequestScopedBeanInterceptorHandler.removeThreadLocals();
+        webBeansContext.getBeanManagerImpl().fireContextLifecyleEvent(
+            new Object(), DestroyedLiteral.INSTANCE_REQUEST_SCOPED);
     }
 
     
@@ -412,7 +425,9 @@ public class DefaultContextsService exte
 
         sessionContext.set(null);
         sessionContext.remove();
-        webBeansContext.getBeanManagerImpl().fireEvent(new Object(), DestroyedLiteral.INSTANCE_SESSION_SCOPED);
+        SessionScopedBeanInterceptorHandler.removeThreadLocals();
+        webBeansContext.getBeanManagerImpl().fireContextLifecyleEvent(
+            new Object(), DestroyedLiteral.INSTANCE_SESSION_SCOPED);
     }
 
     
@@ -425,7 +440,8 @@ public class DefaultContextsService exte
 
         singletonContext.set(null);
         singletonContext.remove();
-        webBeansContext.getBeanManagerImpl().fireEvent(new Object(), DestroyedLiteral.INSTANCE_SINGLETON_SCOPED);
+        webBeansContext.getBeanManagerImpl().fireContextLifecyleEvent(
+            new Object(), DestroyedLiteral.INSTANCE_SINGLETON_SCOPED);
     }
 
 

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java Mon Aug 24 19:16:40 2015
@@ -42,7 +42,7 @@ import javax.enterprise.inject.spi.Bean;
  *  </li>
  * </ol>
  */
-public class ELContextStore
+public final class ELContextStore
 {
     private static ThreadLocal<ELContextStore> contextStores = new ThreadLocal<ELContextStore>();
 

Modified: openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java?rev=1697484&r1=1697483&r2=1697484&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java (original)
+++ openwebbeans/branches/cdi-2.0/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java Mon Aug 24 19:16:40 2015
@@ -36,7 +36,7 @@ public final class EventUtil
 {
     private EventUtil()
     {
-
+        // avoid construction for utility class
     }
 
     //expensive check needed by the TCK (EventBindingTypesTest#testFireEventWithNonRuntimeBindingTypeFails) - see OWB-798



Mime
View raw message