[openwebbeans-meecrowave] 01/02: ensure cxf does not leak undesired dependencies
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-meecrowave.git
commit 5886a015a99f9e7303c2c4b57007a206bf42bea0
Author: Romain Manni-Bucau
AuthorDate: Mon Oct 26 20:24:43 2020 +0100
ensure cxf does not leak undesired dependencies
---
meecrowave-core/pom.xml | 8
1 file changed, 8 insertions(+)
diff --git a/meecrowave-core/pom.xml b/meecrowave-core/pom.xml
index 141388f..9156053 100644
--- a/meecrowave-core/pom.xml
+++ b/meecrowave-core/pom.xml
@@ -115,6 +115,14 @@
${cxf.version}
+ org.apache.geronimo.specs
+ geronimo-jta_1.1_spec
+
+
+ org.jboss.spec.javax.rmi
+ jboss-rmi-api_1.0_spec
+
+
jakarta.xml.ws
*
[openwebbeans-meecrowave] 02/02: [MEECROWAVE-265] fix meecrowave and its config bean scopes
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-meecrowave.git
commit 994a8a3e2a1d6c10194bf5e071b612f38fdc14a3
Author: Romain Manni-Bucau
AuthorDate: Mon Oct 26 20:24:57 2020 +0100
[MEECROWAVE-265] fix meecrowave and its config bean scopes
---
.../main/java/org/apache/meecrowave/openwebbeans/OWBAutoSetup.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBAutoSetup.java
b/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBAutoSetup.java
index e6f78fb..78d82dc 100644
---
a/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBAutoSetup.java
+++
b/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBAutoSetup.java
@@ -26,7 +26,7 @@ import org.apache.webbeans.configurator.BeanConfiguratorImpl;
import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.servlet.WebBeansConfigurationListener;
-import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.Dependent;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.configurator.BeanConfigurator;
@@ -89,14 +89,14 @@ public class OWBAutoSetup implements
ServletContainerInitializer {
beanManager.addInternalBean(newBean(instance, configurator ->
configurator.beanClass(Meecrowave.Builder.class)
-.scope(ApplicationScoped.class)
+.scope(Dependent.class)
.qualifiers(DefaultLiteral.INSTANCE)
.types(Configuration.class,
Meecrowave.Builder.class, Object.class)
.createWith(cc -> meecrowave.getConfiguration(;
beanManager.addInternalBean(newBean(instance, configurator ->
configurator.beanClass(Meecrowave.class)
-.scope(ApplicationScoped.class)
+.scope(Dependent.class)
.qualifiers(DefaultLiteral.INSTANCE)
.types(Meecrowave.class, AutoCloseable.class,
Object.class)
.createWith(cc -> meecrowave)));
[openwebbeans-meecrowave] branch master updated (0d576c2 -> 994a8a3)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openwebbeans-meecrowave.git. from 0d576c2 [MEECROWAVE-264] we need next owb release to be able to fix owb logging new 5886a01 ensure cxf does not leak undesired dependencies new 994a8a3 [MEECROWAVE-265] fix meecrowave and its config bean scopes 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: meecrowave-core/pom.xml | 8 .../java/org/apache/meecrowave/openwebbeans/OWBAutoSetup.java | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-)
[openwebbeans] branch master updated: [OWB-1352] SimpleApplicationBoundaryService
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 a7932dc [OWB-1352] SimpleApplicationBoundaryService
a7932dc is described below
commit a7932dc118b61e58f6b53966182ece8eef2ab3f5
Author: Romain Manni-Bucau
AuthorDate: Mon Oct 26 20:09:36 2020 +0100
[OWB-1352] SimpleApplicationBoundaryService
---
.../se/SimpleApplicationBoundaryService.java | 45 ++
1 file changed, 45 insertions(+)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/SimpleApplicationBoundaryService.java
b/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/SimpleApplicationBoundaryService.java
new file mode 100644
index 000..aa52592
--- /dev/null
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/SimpleApplicationBoundaryService.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.webbeans.corespi.se;
+
+import org.apache.webbeans.spi.ApplicationBoundaryService;
+
+// simplified version targeting applications with a single classloaders (wars,
flat classpaths etc)
+// but setting the app loader during startup
+public class SimpleApplicationBoundaryService implements
ApplicationBoundaryService
+{
+private final ClassLoader appLoader;
+
+public SimpleApplicationBoundaryService()
+{
+appLoader = Thread.currentThread().getContextClassLoader();
+}
+
+@Override
+public ClassLoader getApplicationClassLoader()
+{
+return appLoader;
+}
+
+@Override
+public ClassLoader getBoundaryClassLoader(final Class classToProxy)
+{
+return getApplicationClassLoader();
+}
+}
[openwebbeans] branch master updated: [MEECROWAVE-264] ensure we don't init the propertyloader logger and skip it when used in standalone mode
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 d33c61c [MEECROWAVE-264] ensure we don't init the propertyloader
logger and skip it when used in standalone mode
d33c61c is described below
commit d33c61cf1fa2e25fe8e6cde99bda7854e2bee545
Author: Romain Manni-Bucau
AuthorDate: Mon Oct 26 19:14:55 2020 +0100
[MEECROWAVE-264] ensure we don't init the propertyloader logger and skip it
when used in standalone mode
---
.../src/main/java/org/apache/webbeans/config/PropertyLoader.java| 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
b/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
index 0b46eb0..f96f04b 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
@@ -103,8 +103,7 @@ public final class PropertyLoader
private static void onMissingConfiguration(final String propertyFileName)
{
-final Logger logger = getLogger();
-if (logger.isLoggable(Level.INFO))
+if (logger != null && logger.isLoggable(Level.INFO))
{
logger.info("could not find any property files with name " +
propertyFileName);
}
@@ -119,7 +118,6 @@ public final class PropertyLoader
public static List loadAllProperties(String propertyFileName,
Runnable onMissing)
throws IOException
{
-final Logger logger = getLogger();
ClassLoader cl = WebBeansUtil.getCurrentClassLoader();
Enumeration propertyUrls = cl.getResources(propertyFileName);
if (propertyUrls == null || !propertyUrls.hasMoreElements())
@@ -141,7 +139,7 @@ public final class PropertyLoader
// a bit debugging output
int ordinal = getConfigurationOrdinal(prop);
-if (logger.isLoggable(Level.FINE))
+if (logger != null && logger.isLoggable(Level.FINE))
{
logger.fine("loading properties with ordinal " + ordinal +
" from file " + propertyUrl.getFile());
}
[openwebbeans] branch master updated: [MEECROWAVE-264] ensure we don't init the propertyloader logger until we actually need it otherwise it can be wrongly initialized if used to load configuration
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 d08def3 [MEECROWAVE-264] ensure we don't init the propertyloader
logger until we actually need it otherwise it can be wrongly initialized if
used to load configuration
d08def3 is described below
commit d08def38f8968096782ba3938b1499cd3a7530b3
Author: Romain Manni-Bucau
AuthorDate: Mon Oct 26 19:10:17 2020 +0100
[MEECROWAVE-264] ensure we don't init the propertyloader logger until we
actually need it otherwise it can be wrongly initialized if used to load
configuration
---
.../org/apache/webbeans/config/PropertyLoader.java | 23 --
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
b/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
index 5a59ff0..0b46eb0 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
@@ -44,10 +44,7 @@ public final class PropertyLoader
public static final int CONFIGURATION_ORDINAL_DEFAULT_VALUE = 100;
public static final String CONFIGURATION_ORDINAL_PROPERTY_NAME =
"configuration.ordinal";
-
-
-private static final Logger logger =
WebBeansLoggerFacade.getLogger(PropertyLoader.class);
-
+private static Logger logger; // don't eager init it otherwise
properlyloader can't be reused (meecrowave)
private PropertyLoader()
{
@@ -92,7 +89,8 @@ public final class PropertyLoader
}
catch (IOException e)
{
-logger.log(Level.SEVERE, "Error while loading the propertyFile " +
propertyFileName, e);
+getLogger()
+.log(Level.SEVERE, "Error while loading the propertyFile "
+ propertyFileName, e);
return null;
}
}
@@ -105,6 +103,7 @@ public final class PropertyLoader
private static void onMissingConfiguration(final String propertyFileName)
{
+final Logger logger = getLogger();
if (logger.isLoggable(Level.INFO))
{
logger.info("could not find any property files with name " +
propertyFileName);
@@ -120,6 +119,7 @@ public final class PropertyLoader
public static List loadAllProperties(String propertyFileName,
Runnable onMissing)
throws IOException
{
+final Logger logger = getLogger();
ClassLoader cl = WebBeansUtil.getCurrentClassLoader();
Enumeration propertyUrls = cl.getResources(propertyFileName);
if (propertyUrls == null || !propertyUrls.hasMoreElements())
@@ -200,7 +200,8 @@ public final class PropertyLoader
}
catch(NumberFormatException nfe)
{
-logger.severe(CONFIGURATION_ORDINAL_PROPERTY_NAME + " must be
an integer value!");
+getLogger()
+.severe(CONFIGURATION_ORDINAL_PROPERTY_NAME + " must
be an integer value!");
throw nfe;
}
}
@@ -208,6 +209,16 @@ public final class PropertyLoader
return configOrder;
}
+// we don't care to synchronize here, we just don't want to do it again
and again after some init
+private static Logger getLogger()
+{
+if (logger == null)
+{
+logger = WebBeansLoggerFacade.getLogger(PropertyLoader.class);
+}
+return logger;
+}
+
/**
* Merge the given Properties in order of appearance.
* @param sortedProperties
[openwebbeans-meecrowave] branch master updated: [MEECROWAVE-264] we need next owb release to be able to fix owb logging
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-meecrowave.git The following commit(s) were added to refs/heads/master by this push: new 0d576c2 [MEECROWAVE-264] we need next owb release to be able to fix owb logging 0d576c2 is described below commit 0d576c2b2e05523f5aa851b1e0e775cf398a6657 Author: Romain Manni-Bucau AuthorDate: Mon Oct 26 19:09:14 2020 +0100 [MEECROWAVE-264] we need next owb release to be able to fix owb logging --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4a33e94..ba45563 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ 9.0.39 2.0.19 3.4.0 -2.0.19 +2.0.20-SNAPSHOT 3.4.1-SNAPSHOT 1.2.8 2.13.3
[openwebbeans-meecrowave] branch master updated: [MEECROWAVE-263] enable to run with ClassLoaderProxyService of owb
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-meecrowave.git
The following commit(s) were added to refs/heads/master by this push:
new 0a37475 [MEECROWAVE-263] enable to run with ClassLoaderProxyService
of owb
0a37475 is described below
commit 0a3747527c61c697758bbec8c4744877a56a4df4
Author: Romain Manni-Bucau
AuthorDate: Mon Oct 26 18:33:25 2020 +0100
[MEECROWAVE-263] enable to run with ClassLoaderProxyService of owb
---
.../src/main/java/org/apache/meecrowave/jpa/internal/JpaExtension.java | 2 +-
.../src/main/java/org/apache/meecrowave/jta/TransactionContext.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/meecrowave-jpa/src/main/java/org/apache/meecrowave/jpa/internal/JpaExtension.java
b/meecrowave-jpa/src/main/java/org/apache/meecrowave/jpa/internal/JpaExtension.java
index 2a2d161..4da2009 100644
---
a/meecrowave-jpa/src/main/java/org/apache/meecrowave/jpa/internal/JpaExtension.java
+++
b/meecrowave-jpa/src/main/java/org/apache/meecrowave/jpa/internal/JpaExtension.java
@@ -168,7 +168,7 @@ public class JpaExtension implements Extension {
return builder.toInfo();
}
-EntityManagerContext getEntityManagerContext() {
+public EntityManagerContext getEntityManagerContext() {
return entityManagerContext;
}
diff --git
a/meecrowave-jta/src/main/java/org/apache/meecrowave/jta/TransactionContext.java
b/meecrowave-jta/src/main/java/org/apache/meecrowave/jta/TransactionContext.java
index 70230e5..77a5dac 100755
---
a/meecrowave-jta/src/main/java/org/apache/meecrowave/jta/TransactionContext.java
+++
b/meecrowave-jta/src/main/java/org/apache/meecrowave/jta/TransactionContext.java
@@ -38,7 +38,7 @@ public class TransactionContext implements AlterableContext,
Synchronization {
private TransactionManager transactionManager;
private Map, BeanInstanceBag> componentInstanceMap;
-void init(final TransactionManager transactionManager, final
TransactionSynchronizationRegistry transactionSynchronizationRegistry) {
+public void init(final TransactionManager transactionManager, final
TransactionSynchronizationRegistry transactionSynchronizationRegistry) {
this.transactionManager = transactionManager;
this.componentInstanceMap = Map.class.cast(Proxy.newProxyInstance(
Thread.currentThread().getContextClassLoader(), new
Class[]{Map.class},
svn commit: r1067151 - in /websites: production/openwebbeans/content/index.html staging/openwebbeans/trunk/content/index.html
Author: buildbot Date: Mon Oct 26 10:35:07 2020 New Revision: 1067151 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)
