[openwebbeans] 01/03: [maven-release-plugin] prepare release openwebbeans-2.0.17
This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwebbeans.git commit f02a77b6d4ee9ef409980bf4bc5213f8dd3bebbe Author: Mark Struberg AuthorDate: Sun Jun 7 23:07:25 2020 +0200 [maven-release-plugin] prepare release openwebbeans-2.0.17 --- atinject-tck/pom.xml | 2 +- distribution/pom.xml | 2 +- pom.xml | 4 ++-- samples/conversation-sample/pom.xml | 2 +- samples/guess/pom.xml | 2 +- samples/jsf2sample/pom.xml| 2 +- samples/pom.xml | 2 +- samples/reservation/pom.xml | 2 +- samples/standalone-sample/pom.xml | 2 +- samples/tomcat7-sample/pom.xml| 2 +- webbeans-arquillian/owb-arquillian-standalone/pom.xml | 2 +- webbeans-arquillian/pom.xml | 2 +- webbeans-ee-common/pom.xml| 2 +- webbeans-ee/pom.xml | 2 +- webbeans-ejb/pom.xml | 2 +- webbeans-el22/pom.xml | 2 +- webbeans-gradle/pom.xml | 2 +- webbeans-impl/pom.xml | 2 +- webbeans-jetty9/pom.xml | 2 +- webbeans-jms/pom.xml | 2 +- webbeans-jsf/pom.xml | 2 +- webbeans-junit5/pom.xml | 2 +- webbeans-maven/pom.xml| 2 +- webbeans-osgi/pom.xml | 2 +- webbeans-porting/pom.xml | 2 +- webbeans-resource/pom.xml | 2 +- webbeans-se/pom.xml | 2 +- webbeans-slf4j/pom.xml| 2 +- webbeans-spi/pom.xml | 2 +- webbeans-tck/pom.xml | 2 +- webbeans-tomcat7/pom.xml | 2 +- webbeans-web/pom.xml | 2 +- 32 files changed, 33 insertions(+), 33 deletions(-) diff --git a/atinject-tck/pom.xml b/atinject-tck/pom.xml index 2820206..4afb706 100644 --- a/atinject-tck/pom.xml +++ b/atinject-tck/pom.xml @@ -23,7 +23,7 @@ org.apache.openwebbeans openwebbeans -2.0.17-SNAPSHOT +2.0.17 ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index 46bc937..c0c9e11 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -24,7 +24,7 @@ org.apache.openwebbeans openwebbeans -2.0.17-SNAPSHOT +2.0.17 ../pom.xml diff --git a/pom.xml b/pom.xml index 847227e..c28f156 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ openwebbeans Apache OpenWebBeans pom -2.0.17-SNAPSHOT +2.0.17 openwebbeans.apache.org @@ -49,7 +49,7 @@ scm:git:https://gitbox.apache.org/repos/asf/openwebbeans.git scm:git:https://gitbox.apache.org/repos/asf/openwebbeans.git https://github.com/apache/openwebbeans - HEAD + openwebbeans-2.0.17 diff --git a/samples/conversation-sample/pom.xml b/samples/conversation-sample/pom.xml index 29b4702..bb1e937 100644 --- a/samples/conversation-sample/pom.xml +++ b/samples/conversation-sample/pom.xml @@ -23,7 +23,7 @@ under the License. samples org.apache.openwebbeans -2.0.17-SNAPSHOT +2.0.17 ../pom.xml diff --git a/samples/guess/pom.xml b/samples/guess/pom.xml index e32f5ab..c25f35b 100644 --- a/samples/guess/pom.xml +++ b/samples/guess/pom.xml @@ -21,7 +21,7 @@ under the License. org.apache.openwebbeans samples -2.0.17-SNAPSHOT +2.0.17 ../pom.xml diff --git a/samples/jsf2sample/pom.xml b/samples/jsf2sample/pom.xml index 04ba74e..614e48d 100644 --- a/samples/jsf2sample/pom.xml +++ b/samples/jsf2sample/pom.xml @@ -22,7 +22,7 @@ under the License. samples org.apache.openwebbeans -2.0.17-SNAPSHOT +2.0.17 ../pom.xml diff --git a/samples/pom.xml b/samples/pom.xml index 67240af..e90b616 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.openwebbeans openwebbeans -2.0.17-SNAPSHOT +2.0.17 ../pom.xml diff --git a/samples/reservation/pom.xml b/samples/reservation/pom.xml index 616c229..b5157aa 100644 --- a/samples/reservation/pom.xml +++ b/samples/reservation/pom.xml @@ -21,7 +21,7 @@ under the License. org.apache.openwebbeans
[openwebbeans] 03/03: update readme for owb 2.0.17
This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwebbeans.git commit 20d2b83390996007873abb2338a8b1fb61a55ceb Author: Mark Struberg AuthorDate: Sun Jun 7 23:29:25 2020 +0200 update readme for owb 2.0.17 --- readme/README.txt | 18 -- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/readme/README.txt b/readme/README.txt index a9897e3..4c69234 100644 --- a/readme/README.txt +++ b/readme/README.txt @@ -1,5 +1,5 @@ --- -Apache OpenWebBeans 2.0.8 +Apache OpenWebBeans 2.0.17 --- Welcome! @@ -24,7 +24,7 @@ https://openwebbeans.apache.org -OpenWebBeans 2.0.8 Release Features +OpenWebBeans 2.0.17 Release Features - The 2.0.8 release supports the following features @@ -64,6 +64,20 @@ for the whole Application. --- +Release Notes - OpenWebBeans - Version 2.0.17 +--- +Bug +[OWB-1214] - Package annotation access is fragile + +Task +[OWB-1322] - SLF4J integration workaround for log4j2-slf4j implementation which can fail in NPE on java >= 9 +[OWB-1323] - Upgrade to asm8 +[OWB-1324] - Support maven shade 3.2.3 +[OWB-1325] - Provide a spy flavor of ClassDefiningService +[OWB-1326] - Bean#isNullable is ignored since CDI-1.1. + + +--- Release Notes - OpenWebBeans - Version 2.0.8 ---
[openwebbeans] branch master updated (9b04c5e -> 20d2b83)
This is an automated email from the ASF dual-hosted git repository. struberg pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openwebbeans.git. from 9b04c5e various java8 simplifications new f02a77b [maven-release-plugin] prepare release openwebbeans-2.0.17 new 5eb68fa [maven-release-plugin] prepare for next development iteration new 20d2b83 update readme for owb 2.0.17 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: atinject-tck/pom.xml | 2 +- distribution/pom.xml | 2 +- pom.xml | 2 +- readme/README.txt | 18 -- samples/conversation-sample/pom.xml | 2 +- samples/guess/pom.xml | 2 +- samples/jsf2sample/pom.xml| 2 +- samples/pom.xml | 2 +- samples/reservation/pom.xml | 2 +- samples/standalone-sample/pom.xml | 2 +- samples/tomcat7-sample/pom.xml| 2 +- webbeans-arquillian/owb-arquillian-standalone/pom.xml | 2 +- webbeans-arquillian/pom.xml | 2 +- webbeans-ee-common/pom.xml| 2 +- webbeans-ee/pom.xml | 2 +- webbeans-ejb/pom.xml | 2 +- webbeans-el22/pom.xml | 2 +- webbeans-gradle/pom.xml | 2 +- webbeans-impl/pom.xml | 2 +- webbeans-jetty9/pom.xml | 2 +- webbeans-jms/pom.xml | 2 +- webbeans-jsf/pom.xml | 2 +- webbeans-junit5/pom.xml | 2 +- webbeans-maven/pom.xml| 2 +- webbeans-osgi/pom.xml | 2 +- webbeans-porting/pom.xml | 2 +- webbeans-resource/pom.xml | 2 +- webbeans-se/pom.xml | 2 +- webbeans-slf4j/pom.xml| 2 +- webbeans-spi/pom.xml | 2 +- webbeans-tck/pom.xml | 2 +- webbeans-tomcat7/pom.xml | 2 +- webbeans-web/pom.xml | 2 +- 33 files changed, 48 insertions(+), 34 deletions(-)
[openwebbeans] 02/03: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwebbeans.git commit 5eb68fa64ea93c7a43e8954f0a17e24022552bad Author: Mark Struberg AuthorDate: Sun Jun 7 23:07:35 2020 +0200 [maven-release-plugin] prepare for next development iteration --- atinject-tck/pom.xml | 2 +- distribution/pom.xml | 2 +- pom.xml | 4 ++-- samples/conversation-sample/pom.xml | 2 +- samples/guess/pom.xml | 2 +- samples/jsf2sample/pom.xml| 2 +- samples/pom.xml | 2 +- samples/reservation/pom.xml | 2 +- samples/standalone-sample/pom.xml | 2 +- samples/tomcat7-sample/pom.xml| 2 +- webbeans-arquillian/owb-arquillian-standalone/pom.xml | 2 +- webbeans-arquillian/pom.xml | 2 +- webbeans-ee-common/pom.xml| 2 +- webbeans-ee/pom.xml | 2 +- webbeans-ejb/pom.xml | 2 +- webbeans-el22/pom.xml | 2 +- webbeans-gradle/pom.xml | 2 +- webbeans-impl/pom.xml | 2 +- webbeans-jetty9/pom.xml | 2 +- webbeans-jms/pom.xml | 2 +- webbeans-jsf/pom.xml | 2 +- webbeans-junit5/pom.xml | 2 +- webbeans-maven/pom.xml| 2 +- webbeans-osgi/pom.xml | 2 +- webbeans-porting/pom.xml | 2 +- webbeans-resource/pom.xml | 2 +- webbeans-se/pom.xml | 2 +- webbeans-slf4j/pom.xml| 2 +- webbeans-spi/pom.xml | 2 +- webbeans-tck/pom.xml | 2 +- webbeans-tomcat7/pom.xml | 2 +- webbeans-web/pom.xml | 2 +- 32 files changed, 33 insertions(+), 33 deletions(-) diff --git a/atinject-tck/pom.xml b/atinject-tck/pom.xml index 4afb706..35c2531 100644 --- a/atinject-tck/pom.xml +++ b/atinject-tck/pom.xml @@ -23,7 +23,7 @@ org.apache.openwebbeans openwebbeans -2.0.17 +2.0.18-SNAPSHOT ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index c0c9e11..b1d4377 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -24,7 +24,7 @@ org.apache.openwebbeans openwebbeans -2.0.17 +2.0.18-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index c28f156..edced5f 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ openwebbeans Apache OpenWebBeans pom -2.0.17 +2.0.18-SNAPSHOT openwebbeans.apache.org @@ -49,7 +49,7 @@ scm:git:https://gitbox.apache.org/repos/asf/openwebbeans.git scm:git:https://gitbox.apache.org/repos/asf/openwebbeans.git https://github.com/apache/openwebbeans - openwebbeans-2.0.17 + HEAD diff --git a/samples/conversation-sample/pom.xml b/samples/conversation-sample/pom.xml index bb1e937..2c07f2c 100644 --- a/samples/conversation-sample/pom.xml +++ b/samples/conversation-sample/pom.xml @@ -23,7 +23,7 @@ under the License. samples org.apache.openwebbeans -2.0.17 +2.0.18-SNAPSHOT ../pom.xml diff --git a/samples/guess/pom.xml b/samples/guess/pom.xml index c25f35b..4d882e7 100644 --- a/samples/guess/pom.xml +++ b/samples/guess/pom.xml @@ -21,7 +21,7 @@ under the License. org.apache.openwebbeans samples -2.0.17 +2.0.18-SNAPSHOT ../pom.xml diff --git a/samples/jsf2sample/pom.xml b/samples/jsf2sample/pom.xml index 614e48d..821b5a3 100644 --- a/samples/jsf2sample/pom.xml +++ b/samples/jsf2sample/pom.xml @@ -22,7 +22,7 @@ under the License. samples org.apache.openwebbeans -2.0.17 +2.0.18-SNAPSHOT ../pom.xml diff --git a/samples/pom.xml b/samples/pom.xml index e90b616..2bfcd67 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.openwebbeans openwebbeans -2.0.17 +2.0.18-SNAPSHOT ../pom.xml diff --git a/samples/reservation/pom.xml b/samples/reservation/pom.xml index b5157aa..59a98a7 100644 --- a/samples/reservation/pom.xml +++ b/samples/reservation/pom.xml @@ -21,7 +21,7 @@ under the License. org.apache.openwebbeans
[openwebbeans] branch master updated: various java8 simplifications
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 9b04c5e various java8 simplifications
9b04c5e is described below
commit 9b04c5e906294bcad7c61f30b5c5fcc8956b2f17
Author: Mark Struberg
AuthorDate: Sun Jun 7 23:03:11 2020 +0200
various java8 simplifications
no funcational change
---
.../standalone/OwbArquillianScannerService.java| 7 +-
.../java/org/apache/webbeans/boot/Bootstrap.java | 10 +---
.../component/creation/BeanAttributesBuilder.java | 9 +--
.../component/creation/DecoratorBeanBuilder.java | 10 +---
.../org/apache/webbeans/config/BeansDeployer.java | 10 +---
.../org/apache/webbeans/config/PropertyLoader.java | 13 ++
.../AnnotatedConstructorConfiguratorImpl.java | 2 +-
.../AnnotatedMethodConfiguratorImpl.java | 2 +-
.../apache/webbeans/container/BeanManagerImpl.java | 4 ++--
.../corespi/se/DefaultBDABeansXmlScanner.java | 28 --
.../apache/webbeans/event/NotificationManager.java | 7 +-
.../intercept/InterceptorResolutionService.java| 4 ++--
.../webbeans/intercept/InterceptorsManager.java| 9 ++-
.../webbeans/portable/AbstractAnnotated.java | 10 +---
.../java/org/apache/webbeans/util/ClassUtil.java | 10 +---
.../org/apache/webbeans/util/PriorityClass.java| 2 +-
.../apache/webbeans/util/SpecializationUtil.java | 11 +
.../AnnotatedTypeConfiguratorImplTest.java | 8 ++-
.../BeanAttributesConfiguratorImplTest.java| 8 ++-
...erMethodConfiguratorAfterBeanDiscoveryTest.java | 12 +++---
.../InterceptorDecoratorProxyFactoryTest.java | 8 +--
21 files changed, 32 insertions(+), 152 deletions(-)
diff --git
a/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java
b/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java
index a1fcb23..c42aa5b 100644
---
a/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java
+++
b/webbeans-arquillian/owb-arquillian-standalone/src/main/java/org/apache/webbeans/arquillian/standalone/OwbArquillianScannerService.java
@@ -225,12 +225,7 @@ public class OwbArquillianScannerService implements
BdaScannerService
private void scanClasses(BeanArchiveService.BeanArchiveInformation info,
Map classes, String
classBasePath)
{
-Set> bdaClasses = beanClassesPerBda.get(info);
-if (bdaClasses == null)
-{
-bdaClasses = new HashSet<>();
-beanClassesPerBda.put(info, bdaClasses);
-}
+Set> bdaClasses = beanClassesPerBda.computeIfAbsent(info, k
-> new HashSet<>());
if (info != null && info.getBeanDiscoveryMode() ==
BeanArchiveService.BeanDiscoveryMode.NONE)
{
// this jar should not get scanned at all.
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/boot/Bootstrap.java
b/webbeans-impl/src/main/java/org/apache/webbeans/boot/Bootstrap.java
index 83e3ac0..1435763 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/boot/Bootstrap.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/boot/Bootstrap.java
@@ -54,15 +54,7 @@ public class Bootstrap
long begin = System.currentTimeMillis();
containerLifecycle.startApplication(properties);
-Runtime.getRuntime().addShutdownHook(new Thread(){
-
-@Override
-public void run()
-{
-latch.countDown();
-}
-
-});
+Runtime.getRuntime().addShutdownHook(new Thread(() ->
latch.countDown()));
log.log(Level.INFO, OWBLogConst.INFO_0001,
Long.toString(System.currentTimeMillis() - begin));
latch.await();
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java
index 22853d2..db00d22 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/BeanAttributesBuilder.java
@@ -187,14 +187,7 @@ public abstract class BeanAttributesBuilder
Set ignored =
webBeansContext.getOpenWebBeansConfiguration().getIgnoredInterfaces();
if (!ignored.isEmpty())
{
-for (Iterator i = this.types.iterator(); i.hasNext(); )
-{
-Type t = i.next();
-if (t
[openwebbeans] branch master updated: collapse likewise catches
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 7d0264b collapse likewise catches
7d0264b is described below
commit 7d0264ba9a981160d13e224a2bf32efcda314bb3
Author: Mark Struberg
AuthorDate: Sun Jun 7 22:49:50 2020 +0200
collapse likewise catches
no funcational change
---
.../apache/webbeans/ee/event/TransactionalEventNotifier.java | 9 +
.../main/java/org/apache/webbeans/config/BeansDeployer.java | 12 ++--
.../java/org/apache/webbeans/config/WebBeansContext.java | 6 +-
.../java/org/apache/webbeans/container/BeanManagerImpl.java | 10 +-
.../webbeans/corespi/security/ManagedSecurityService.java| 6 +-
.../org/apache/webbeans/proxy/NormalScopeProxyFactory.java | 10 +-
.../factory/InterceptorDecoratorProxyFactoryTest.java| 6 +-
.../test/interceptors/lifecycle/InterceptorExtension.java| 4 +---
.../webbeans/web/tomcat7/ContextLifecycleListener.java | 6 +-
9 files changed, 10 insertions(+), 59 deletions(-)
diff --git
a/webbeans-ee/src/main/java/org/apache/webbeans/ee/event/TransactionalEventNotifier.java
b/webbeans-ee/src/main/java/org/apache/webbeans/ee/event/TransactionalEventNotifier.java
index 18d7ad9..0c339f9 100644
---
a/webbeans-ee/src/main/java/org/apache/webbeans/ee/event/TransactionalEventNotifier.java
+++
b/webbeans-ee/src/main/java/org/apache/webbeans/ee/event/TransactionalEventNotifier.java
@@ -119,14 +119,7 @@ public final class TransactionalEventNotifier
{
transaction.registerSynchronization(synchronization);
}
-catch (RollbackException re)
-{
-if (immediateOnError)
-{
-synchronization.notifyObserver();
-}
-}
-catch (IllegalStateException ise)
+catch (RollbackException | IllegalStateException re)
{
if (immediateOnError)
{
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
b/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
index 370a8fe..d3fdf09 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
@@ -330,19 +330,11 @@ public class BeansDeployer
webBeansContext.getAnnotationManager().clearCaches();
}
}
-catch (UnsatisfiedResolutionException e)
+catch (UnsatisfiedResolutionException | UnproxyableResolutionException
| AmbiguousResolutionException e)
{
throw new WebBeansDeploymentException(e);
}
-catch (AmbiguousResolutionException e)
-{
-throw new WebBeansDeploymentException(e);
-}
-catch (UnproxyableResolutionException e)
-{
-// the tck expects a DeploymentException, but it really should be
a DefinitionException, see i.e. https://issues.jboss.org/browse/CDITCK-346
-throw new WebBeansDeploymentException(e);
-}
+// the tck expects a DeploymentException, but it really should be a
DefinitionException, see i.e. https://issues.jboss.org/browse/CDITCK-346
catch (IllegalArgumentException e)
{
throw new WebBeansConfigurationException(e);
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
b/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
index c12eff6..8d4976e 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
@@ -600,11 +600,7 @@ public class WebBeansContext
throw new WebBeansException("No suitable constructor : " +
clazz.getName(), e.getCause());
}
}
-catch (InstantiationException e)
-{
-throw new WebBeansException("Unable to instantiate class : " +
clazz.getName(), e.getCause());
-}
-catch (InvocationTargetException e)
+catch (InstantiationException | InvocationTargetException e)
{
throw new WebBeansException("Unable to instantiate class : " +
clazz.getName(), e.getCause());
}
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
b/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
index 93e416b..22ee614 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
@@ -1252,15 +1252,7 @@ public class BeanManagerImpl implements BeanManager,
Referenceable
[openwebbeans] 01/02: remove unused imports
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
commit 46b13cc6285f900e94d043d5832059bc1c18c5e8
Author: Mark Struberg
AuthorDate: Sun Jun 7 22:28:05 2020 +0200
remove unused imports
---
.../main/java/org/apache/webbeans/portable/InjectionTargetImpl.java| 3 ++-
.../apache/webbeans/corespi/scanner/AbstractMetaDataDiscoveryTest.java | 1 -
.../src/test/java/org/apache/webbeans/test/AbstractUnitTest.java | 3 ---
.../webbeans/test/component/decorator/clean/ServiceDecorator.java | 1 -
.../webbeans/test/configurator/AnnotatedTypeConfiguratorImplTest.java | 2 --
.../test/java/org/apache/webbeans/test/contexts/SerializationTest.java | 1 -
.../webbeans/test/contexts/conversation/ConversationScopedTest.java| 1 -
.../webbeans/test/decorators/tests/ConversationDecoratorTest.java | 1 -
.../webbeans/test/decorators/tests/ExtendedGenericDecoratorTest.java | 1 -
.../test/java/org/apache/webbeans/test/injection/generics/MyBean.java | 2 --
.../test/interceptors/extension/BeforeBeanDiscoveryImplTest.java | 1 -
.../test/interceptors/factory/beans/ClassInterceptedClass.java | 1 -
.../org/apache/webbeans/test/lifecycle/ExceptionOnCallbackTest.java| 1 -
.../org/apache/webbeans/test/portable/events/PortableAddBeanTest.java | 1 -
.../java/org/apache/webbeans/test/producer/AmbigousProducerTest.java | 1 -
.../webbeans/test/producer/specializes/SpecializesProducer1Test.java | 3 ---
.../org/apache/webbeans/test/proxy/unproxyable/AllowProxyingTest.java | 1 -
.../org/apache/webbeans/test/tests/MultipleTimeTheSameBindingTest.java | 2 --
.../src/test/java/org/apache/webbeans/test/util/GenericsUtilTest.java | 1 -
.../java/org/apache/webbeans/web/tests/ConversationLoggingTest.java| 3 ---
20 files changed, 2 insertions(+), 29 deletions(-)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
b/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
index 3ad9c38..0134846 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/portable/InjectionTargetImpl.java
@@ -34,6 +34,7 @@ import
org.apache.webbeans.intercept.LifecycleInterceptorInvocationContext;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
import org.apache.webbeans.proxy.InterceptorDecoratorProxyFactory;
import org.apache.webbeans.proxy.InterceptorHandler;
+import org.apache.webbeans.proxy.NormalScopeProxyFactory;
import org.apache.webbeans.proxy.OwbInterceptorProxy;
import org.apache.webbeans.proxy.OwbNormalScopeProxy;
import org.apache.webbeans.spi.ResourceInjectionService;
@@ -330,7 +331,7 @@ public class InjectionTargetImpl extends
AbstractProducer implements Injec
{
if (instance instanceof OwbNormalScopeProxy)
{
-instance =
webBeansContext.getNormalScopeProxyFactory().unwrapInstance(instance);
+instance = NormalScopeProxyFactory.unwrapInstance(instance);
}
Map, ?> interceptorInstances = null;
diff --git
a/webbeans-impl/src/test/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscoveryTest.java
b/webbeans-impl/src/test/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscoveryTest.java
index 91772b0..3e047c6 100644
---
a/webbeans-impl/src/test/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscoveryTest.java
+++
b/webbeans-impl/src/test/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscoveryTest.java
@@ -42,7 +42,6 @@ import java.nio.charset.StandardCharsets;
import java.util.Enumeration;
import java.util.Properties;
import java.util.Set;
-import java.util.function.Consumer;
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
diff --git
a/webbeans-impl/src/test/java/org/apache/webbeans/test/AbstractUnitTest.java
b/webbeans-impl/src/test/java/org/apache/webbeans/test/AbstractUnitTest.java
index 054f1af..3323a6f 100644
--- a/webbeans-impl/src/test/java/org/apache/webbeans/test/AbstractUnitTest.java
+++ b/webbeans-impl/src/test/java/org/apache/webbeans/test/AbstractUnitTest.java
@@ -20,7 +20,6 @@ package org.apache.webbeans.test;
import static java.util.stream.Collectors.toMap;
-import org.apache.webbeans.config.OpenWebBeansConfiguration;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.config.WebBeansFinder;
import org.apache.webbeans.corespi.DefaultSingletonService;
@@ -41,7 +40,6 @@ import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.Extension;
import java.lang.annotation.Annotation;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Arrays;
@@ -51,7 +49,6 @@ import
[openwebbeans] 02/02: replace ancient iterator loops with java6 for
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
commit 9d1082c410f800a47bfa006eb5f9d6efc72cdacd
Author: Mark Struberg
AuthorDate: Sun Jun 7 22:44:41 2020 +0200
replace ancient iterator loops with java6 for
no functional change
---
.../main/java/org/apache/webbeans/config/BeansDeployer.java| 5 +
.../java/org/apache/webbeans/container/InjectionResolver.java | 10 +++---
.../apache/webbeans/portable/events/discovery/ErrorStack.java | 6 ++
.../InterceptorWithSuperClassInterceptedComponent.java | 5 +
.../test/component/intercept/MultipleInterceptedComponent.java | 5 +
5 files changed, 8 insertions(+), 23 deletions(-)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
b/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
index 057db3d..370a8fe 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
@@ -1617,12 +1617,9 @@ public class BeansDeployer
logger.fine("Deploying configurations from XML files has started.");
Set bdaLocations = scanner.getBeanXmls();
-Iterator it = bdaLocations.iterator();
-while (it.hasNext())
+for (URL url : bdaLocations)
{
-URL url = it.next();
-
logger.fine("OpenWebBeans BeansDeployer configuring: " +
url.toExternalForm());
BeanArchiveInformation beanArchiveInformation =
beanArchiveService.getBeanArchiveInformation(url);
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
b/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
index ca3cf36..8154c30 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
@@ -377,11 +377,9 @@ public class InjectionResolver
resolvedComponents = new HashSet<>();
Set> deployedComponents =
webBeansContext.getBeanManagerImpl().getBeans();
-Iterator> it = deployedComponents.iterator();
//Finding all beans with given name
-while (it.hasNext())
+for (Bean component : deployedComponents)
{
-Bean component = it.next();
if (component.getName() != null)
{
if (component.getName().equals(name))
@@ -802,10 +800,8 @@ public class InjectionResolver
int i = 0;
for (Annotation annot : annotations)
{
-Iterator itQualifiers = qTypes.iterator();
-while (itQualifiers.hasNext())
+for (Annotation qualifier : qTypes)
{
-Annotation qualifier = itQualifiers.next();
if
(annot.annotationType().equals(qualifier.annotationType()))
{
AnnotatedType at =
findQualifierModel(qualifier.annotationType());
@@ -817,7 +813,7 @@ public class InjectionResolver
}
}
else
-{
+{
if (AnnotationUtil.isCdiAnnotationEqual(at,
qualifier, annot))
{
i++;
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/ErrorStack.java
b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/ErrorStack.java
index 753d45b..95cef69 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/ErrorStack.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/ErrorStack.java
@@ -50,17 +50,15 @@ public class ErrorStack
{
if(!errorStack.isEmpty())
{
-Iterator it = errorStack.iterator();
-while(it.hasNext())
+for (Throwable t : errorStack)
{
-Throwable t = it.next();
String message = t.getMessage();
if (message != null && message.length() > 0)
{
logger.log(Level.SEVERE, t.getMessage(), t);
}
else
-{
+{
logger.log(Level.SEVERE, "unknown error", t);
}
}
diff --git
a/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptorWithSuperClassInterceptedComponent.java
b/webbeans-impl/src/test/java/org/apache/webbeans/test/component/intercept/InterceptorWithSuperClassInterceptedComponent.java
index ee87ed2..de17d8d 100644
---
[openwebbeans] branch master updated (b3b9cb8 -> 9d1082c)
This is an automated email from the ASF dual-hosted git repository. struberg pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openwebbeans.git. from b3b9cb8 simplify a few statements new 46b13cc remove unused imports new 9d1082c replace ancient iterator loops with java6 for The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../main/java/org/apache/webbeans/config/BeansDeployer.java| 5 + .../java/org/apache/webbeans/container/InjectionResolver.java | 10 +++--- .../java/org/apache/webbeans/portable/InjectionTargetImpl.java | 3 ++- .../apache/webbeans/portable/events/discovery/ErrorStack.java | 6 ++ .../corespi/scanner/AbstractMetaDataDiscoveryTest.java | 1 - .../test/java/org/apache/webbeans/test/AbstractUnitTest.java | 3 --- .../test/component/decorator/clean/ServiceDecorator.java | 1 - .../InterceptorWithSuperClassInterceptedComponent.java | 5 + .../test/component/intercept/MultipleInterceptedComponent.java | 5 + .../test/configurator/AnnotatedTypeConfiguratorImplTest.java | 2 -- .../org/apache/webbeans/test/contexts/SerializationTest.java | 1 - .../test/contexts/conversation/ConversationScopedTest.java | 1 - .../test/decorators/tests/ConversationDecoratorTest.java | 1 - .../test/decorators/tests/ExtendedGenericDecoratorTest.java| 1 - .../org/apache/webbeans/test/injection/generics/MyBean.java| 2 -- .../interceptors/extension/BeforeBeanDiscoveryImplTest.java| 1 - .../test/interceptors/factory/beans/ClassInterceptedClass.java | 1 - .../webbeans/test/lifecycle/ExceptionOnCallbackTest.java | 1 - .../webbeans/test/portable/events/PortableAddBeanTest.java | 1 - .../apache/webbeans/test/producer/AmbigousProducerTest.java| 1 - .../test/producer/specializes/SpecializesProducer1Test.java| 3 --- .../webbeans/test/proxy/unproxyable/AllowProxyingTest.java | 1 - .../webbeans/test/tests/MultipleTimeTheSameBindingTest.java| 2 -- .../java/org/apache/webbeans/test/util/GenericsUtilTest.java | 1 - .../org/apache/webbeans/web/tests/ConversationLoggingTest.java | 3 --- 25 files changed, 10 insertions(+), 52 deletions(-)
[openwebbeans] branch master updated: simplify a few statements
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
The following commit(s) were added to refs/heads/master by this push:
new b3b9cb8 simplify a few statements
b3b9cb8 is described below
commit b3b9cb800da3d366b1d0df8111a530190cd3a0c7
Author: Mark Struberg
AuthorDate: Sun Jun 7 21:57:52 2020 +0200
simplify a few statements
no funcational change, just cleanup
---
.../webbeans/sample/dependent/LoginCheck.java | 7 +--
.../webbeans/ejb/common/component/BaseEjbBean.java | 7 +--
.../webbeans/component/AbstractProducerBean.java | 7 +--
.../apache/webbeans/container/BeanCacheKey.java| 2 +-
.../webbeans/test/injection/generics/BazEnum.java | 2 +-
.../beans/PropertyHolderFactory.java | 2 +-
.../test/unittests/inject/TypedComponentTest.java | 2 +-
.../intercept/EJBInterceptComponentTest.java | 2 +-
.../webbeans/WebBeansInterceptComponentTest.java | 2 +-
.../apache/webbeans/web/jetty9/JettyWebPlugin.java | 14 +-
.../java/org/apache/webbeans/jms/util/JmsUtil.java | 54 ++
.../apache/webbeans/spi/api/ResourceReference.java | 7 +--
.../webbeans/web/tomcat7/TomcatWebPlugin.java | 14 +-
13 files changed, 28 insertions(+), 94 deletions(-)
diff --git
a/samples/guess/src/main/java/org/apache/webbeans/sample/dependent/LoginCheck.java
b/samples/guess/src/main/java/org/apache/webbeans/sample/dependent/LoginCheck.java
index 5c1ba05..931656f 100644
---
a/samples/guess/src/main/java/org/apache/webbeans/sample/dependent/LoginCheck.java
+++
b/samples/guess/src/main/java/org/apache/webbeans/sample/dependent/LoginCheck.java
@@ -27,11 +27,6 @@ public class LoginCheck
public boolean checkLogin(String userName, String password)
{
-if(userName.equals("admin") && password.equals("admin"))
-{
-return true;
-}
-
-return false;
+return userName.equals("admin") && password.equals("admin");
}
}
diff --git
a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java
b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java
index 9aed502..3dec0b2 100644
---
a/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java
+++
b/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/component/BaseEjbBean.java
@@ -83,12 +83,7 @@ public abstract class BaseEjbBean extends
InjectionTargetBean implements E
@Override
public boolean isPassivationCapable()
{
-if(getEjbType() == SessionBeanType.STATEFUL)
-{
-return true;
-}
-
-return false;
+return getEjbType() == SessionBeanType.STATEFUL;
}
/**
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
b/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
index 64ab944..3e72d17 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
@@ -118,12 +118,7 @@ public class AbstractProducerBean extends
AbstractOwbBean
protected boolean isPassivationCapable(Class returnType, Integer
modifiers)
{
-if(Modifier.isFinal(modifiers) &&
!(Serializable.class.isAssignableFrom(returnType)))
-{
-return false;
-}
-
-return true;
+return !Modifier.isFinal(modifiers) ||
Serializable.class.isAssignableFrom(returnType);
}
}
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanCacheKey.java
b/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanCacheKey.java
index 74fb6c6..9b12895 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanCacheKey.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanCacheKey.java
@@ -40,7 +40,7 @@ public final class BeanCacheKey
private final Type type;
private final String path;
private final Annotation qualifier;
-private final Annotation qualifiers[];
+private final Annotation[] qualifiers;
private final int hashCode;
private volatile LazyAnnotatedTypes lazyAnnotatedTypes; // only needed for
the "main" key
private final Function, AnnotatedType> lazyAtLoader;
diff --git
a/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/BazEnum.java
b/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/BazEnum.java
index 614e19d..d030a8d 100644
---
a/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/BazEnum.java
+++
b/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/BazEnum.java
@@ -23,5 +23,5 @@ package org.apache.webbeans.test.injection.generics;
*/
[openwebbeans] branch master updated: [OWB-1325] better impl of stable names for proxies
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 234c0fc [OWB-1325] better impl of stable names for proxies
234c0fc is described below
commit 234c0fcf2015f815fd6aa2ab0c8acdf5f8574408
Author: Romain Manni-Bucau
AuthorDate: Sun Jun 7 16:31:06 2020 +0200
[OWB-1325] better impl of stable names for proxies
---
.../java/org/apache/webbeans/hash/XxHash64.java| 174 +
.../webbeans/proxy/AbstractProxyFactory.java | 36 +
.../proxy/InterceptorDecoratorProxyFactory.java| 8 +-
.../webbeans/proxy/NormalScopeProxyFactory.java| 9 +-
.../org/apache/webbeans/hash/XxHash64Test.java | 32
.../webbeans/test/managed/ProxyFactoryTest.java| 92 ++-
6 files changed, 340 insertions(+), 11 deletions(-)
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/hash/XxHash64.java
b/webbeans-impl/src/main/java/org/apache/webbeans/hash/XxHash64.java
new file mode 100644
index 000..2f19ad2
--- /dev/null
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/hash/XxHash64.java
@@ -0,0 +1,174 @@
+/*
+ * 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.
+ */
+
+// original header
+/*
+ * Copyright 2015 Higher Frequency Trading
http://www.higherfrequencytrading.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.webbeans.hash;
+
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+
+// forked from
@OpenHFT/Zero-Allocation-Hashing/blob/master/src/main/java/net/openhft/hashing/XxHash.java
+// (ASFv2 license)
+public final class XxHash64
+{
+private static final long PRIME64_1 = 0x9E3779B185EBCA87L;
+private static final long PRIME64_2 = 0xC2B2AE3D27D4EB4FL;
+private static final long PRIME64_3 = 0x165667B19E3779F9L;
+private static final long PRIME64_4 = 0x85EBCA77C2b2AE63L;
+private static final long PRIME64_5 = 0x27D4EB2F165667C5L;
+
+private XxHash64()
+{
+// no-op
+}
+
+public static long apply(final String input)
+{
+return apply(ByteBuffer.wrap(input.getBytes(StandardCharsets.UTF_8)));
+}
+
+public static long apply(final ByteBuffer input)
+{
+int length = input.remaining();
+long remaining = length;
+
+long hash;
+int off = 0;
+if (remaining >= 32)
+{
+long v1 = PRIME64_1 + PRIME64_2;
+long v2 = PRIME64_2;
+long v3 = 0;
+long v4 = -PRIME64_1;
+
+do
+{
+v1 += input.getLong(off) * PRIME64_2;
+v1 = Long.rotateLeft(v1, 31);
+v1 *= PRIME64_1;
+
+v2 += input.getLong(off + 8) * PRIME64_2;
+v2 = Long.rotateLeft(v2, 31);
+v2 *= PRIME64_1;
+
+v3 += input.getLong(off + 16) * PRIME64_2;
+v3 = Long.rotateLeft(v3, 31);
+v3 *= PRIME64_1;
+
+v4 += input.getLong(off + 24) * PRIME64_2;
+v4 = Long.rotateLeft(v4, 31);
+v4 *= PRIME64_1;
+
+off += 32;
+remaining -= 32;
+}
+while (remaining >= 32);
+
+hash = Long.rotateLeft(v1, 1)
++ Long.rotateLeft(v2, 7)
++ Long.rotateLeft(v3, 12)
++ Long.rotateLeft(v4, 18);
+
+v1 *= PRIME64_2;
+v1 = Long.rotateLeft(v1, 31);
+v1 *= PRIME64_1;
+hash ^= v1;
+hash = hash *
svn commit: r1061571 - in /websites: production/openwebbeans/content/index.html staging/openwebbeans/trunk/content/index.html
Author: buildbot Date: Sun Jun 7 10:35:08 2020 New Revision: 1061571 Log: Dynamic update by buildbot for openwebbeans Modified: websites/production/openwebbeans/content/index.html websites/staging/openwebbeans/trunk/content/index.html Modified: websites/production/openwebbeans/content/index.html == (empty) Modified: websites/staging/openwebbeans/trunk/content/index.html == (empty)
