[johnzon] branch master updated (3a3e494 -> 384e076)
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/johnzon.git. from 3a3e494 [JOHNZON-340] ensure cdi and servlet are properly shaded new 3e87d9b [maven-release-plugin] prepare release v1.2.11 new 384e076 [maven-release-plugin] prepare for next development iteration 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: johnzon-core/pom.xml | 2 +- johnzon-distribution/pom.xml | 2 +- johnzon-jaxrs/pom.xml| 2 +- johnzon-json-extras/pom.xml | 2 +- johnzon-jsonb/pom.xml| 2 +- johnzon-jsonlogic/pom.xml| 2 +- johnzon-jsonp-strict/pom.xml | 2 +- johnzon-jsonschema/pom.xml | 2 +- johnzon-mapper/pom.xml | 2 +- johnzon-maven-plugin/pom.xml | 2 +- johnzon-osgi/pom.xml | 2 +- johnzon-websocket/pom.xml| 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-)
svn commit: r1074090 - in /websites/production/openwebbeans/content/meecrowave: ./ assets/css/ meecrowave-core/ meecrowave-gradle/ meecrowave-jpa/ meecrowave-jta/ meecrowave-letsencrypt/ meecrowave-ma
Author: rmannibucau
Date: Thu Apr 22 15:28:00 2021
New Revision: 1074090
Log:
Site checkin for project Meecrowave :: Doc
Modified:
websites/production/openwebbeans/content/meecrowave/assets/css/styles.css
websites/production/openwebbeans/content/meecrowave/community.pdf
websites/production/openwebbeans/content/meecrowave/companion-projects.pdf
websites/production/openwebbeans/content/meecrowave/components.pdf
websites/production/openwebbeans/content/meecrowave/download.pdf
websites/production/openwebbeans/content/meecrowave/howto.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-core/cli.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-core/configuration.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-gradle/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-jpa/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-jta/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-letsencrypt/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-maven/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-oauth2/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-proxy/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-websocket/index.pdf
websites/production/openwebbeans/content/meecrowave/start.pdf
websites/production/openwebbeans/content/meecrowave/testing/index.html
websites/production/openwebbeans/content/meecrowave/testing/index.pdf
Modified:
websites/production/openwebbeans/content/meecrowave/assets/css/styles.css
==
--- websites/production/openwebbeans/content/meecrowave/assets/css/styles.css
(original)
+++ websites/production/openwebbeans/content/meecrowave/assets/css/styles.css
Thu Apr 22 15:28:00 2021
@@ -1307,21 +1307,17 @@ pre {
}
.icon-important:before {
content: "\f06a";
-font-family: "Font Awesome 5 Free";
color: #e96065;
}
.icon-note:before {
content: "\f05a";
-font-family: "Font Awesome 5 Free";
color: #0675c1;
}
.icon-tip:before {
content: "\f059";
-font-family: "Font Awesome 5 Free";
color: #6ec01e;
}
.icon-warning:before {
content: "\f071";
-font-family: "Font Awesome 5 Free";
color: #ffc300;
}
\ No newline at end of file
Modified: websites/production/openwebbeans/content/meecrowave/community.pdf
==
Binary files - no diff available.
Modified:
websites/production/openwebbeans/content/meecrowave/companion-projects.pdf
==
Binary files - no diff available.
Modified: websites/production/openwebbeans/content/meecrowave/components.pdf
==
Binary files - no diff available.
Modified: websites/production/openwebbeans/content/meecrowave/download.pdf
==
Binary files - no diff available.
Modified: websites/production/openwebbeans/content/meecrowave/howto.pdf
==
--- websites/production/openwebbeans/content/meecrowave/howto.pdf (original)
+++ websites/production/openwebbeans/content/meecrowave/howto.pdf Thu Apr 22
15:28:00 2021
@@ -4,8 +4,8 @@
<< /Title (Howto)
/Creator (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2)
/Producer (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2)
-/ModDate (D:20210422172546+02'00')
-/CreationDate (D:20210422172546+02'00')
+/ModDate (D:20210422172746+02'00')
+/CreationDate (D:20210422172746+02'00')
>>
endobj
2 0 obj
Modified:
websites/production/openwebbeans/content/meecrowave/meecrowave-core/cli.pdf
==
Binary files - no diff available.
Modified:
websites/production/openwebbeans/content/meecrowave/meecrowave-core/configuration.pdf
==
Binary files - no diff available.
Modified:
websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf
==
---
websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf
(original)
+++
websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf
Thu Apr 22 15:28:00 2021
@@ -4,8 +4,8 @@
<< /Title (Meecrowave and webapps)
/Creator (Ascii
[openwebbeans-meecrowave] branch master updated: fix font-family for the doc
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 9b6bf7d fix font-family for the doc
9b6bf7d is described below
commit 9b6bf7d0a2c102a1a7cea13ec70edcb40d34ba9f
Author: Romain Manni-Bucau
AuthorDate: Thu Apr 22 17:28:03 2021 +0200
fix font-family for the doc
---
meecrowave-doc/src/main/jbake/assets/assets/css/styles.css | 4
1 file changed, 4 deletions(-)
diff --git a/meecrowave-doc/src/main/jbake/assets/assets/css/styles.css
b/meecrowave-doc/src/main/jbake/assets/assets/css/styles.css
index d758f1b..2608b71 100644
--- a/meecrowave-doc/src/main/jbake/assets/assets/css/styles.css
+++ b/meecrowave-doc/src/main/jbake/assets/assets/css/styles.css
@@ -1307,21 +1307,17 @@ pre {
}
.icon-important:before {
content: "\f06a";
-font-family: "Font Awesome 5 Free";
color: #e96065;
}
.icon-note:before {
content: "\f05a";
-font-family: "Font Awesome 5 Free";
color: #0675c1;
}
.icon-tip:before {
content: "\f059";
-font-family: "Font Awesome 5 Free";
color: #6ec01e;
}
.icon-warning:before {
content: "\f071";
-font-family: "Font Awesome 5 Free";
color: #ffc300;
}
svn commit: r1074089 - in /websites/production/openwebbeans/content/meecrowave: ./ meecrowave-core/ meecrowave-gradle/ meecrowave-jpa/ meecrowave-jta/ meecrowave-letsencrypt/ meecrowave-maven/ meecrow
Author: rmannibucau Date: Thu Apr 22 15:26:01 2021 New Revision: 1074089 Log: Site checkin for project Meecrowave :: Doc Modified: websites/production/openwebbeans/content/meecrowave/community.pdf websites/production/openwebbeans/content/meecrowave/companion-projects.pdf websites/production/openwebbeans/content/meecrowave/components.html websites/production/openwebbeans/content/meecrowave/components.pdf websites/production/openwebbeans/content/meecrowave/download.pdf websites/production/openwebbeans/content/meecrowave/howto.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-core/cli.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-core/configuration.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-gradle/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-jpa/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-jta/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-letsencrypt/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-maven/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-oauth2/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-proxy/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-websocket/index.pdf websites/production/openwebbeans/content/meecrowave/start.pdf websites/production/openwebbeans/content/meecrowave/testing/index.html websites/production/openwebbeans/content/meecrowave/testing/index.pdf Modified: websites/production/openwebbeans/content/meecrowave/community.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/companion-projects.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/components.html == --- websites/production/openwebbeans/content/meecrowave/components.html (original) +++ websites/production/openwebbeans/content/meecrowave/components.html Thu Apr 22 15:26:01 2021 @@ -175,6 +175,17 @@ free and easy SSL support on your HTTPS +Meecrowave Websocket + + +This is an experimental module wrapping tomcat-websocket to make it CDI friendly for server endpoints. + + +Websocket module + + + + Going further Modified: websites/production/openwebbeans/content/meecrowave/components.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/download.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/howto.pdf == --- websites/production/openwebbeans/content/meecrowave/howto.pdf (original) +++ websites/production/openwebbeans/content/meecrowave/howto.pdf Thu Apr 22 15:26:01 2021 @@ -4,8 +4,8 @@ << /Title (Howto) /Creator (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) /Producer (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) -/ModDate (D:20210422171129+02'00') -/CreationDate (D:20210422171129+02'00') +/ModDate (D:20210422172546+02'00') +/CreationDate (D:20210422172546+02'00') >> endobj 2 0 obj Modified: websites/production/openwebbeans/content/meecrowave/meecrowave-core/cli.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/meecrowave-core/configuration.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf == --- websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf (original) +++ websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf Thu Apr 22 15:26:01 2021 @@ -4,8 +4,8 @@ << /Title (Meecrowave and webapps) /Creator (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) /Producer (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) -/ModDate (D:20210422171129+02'00') -/CreationDate (D:20210422171129+02'00') +/ModDate (D:20210422172546+02'00') +/CreationDate (D:20210422172546+02'00') >> endobj 2 0 obj Modified: websites/production/openwebbeans/content/meecrowave/mee
[openwebbeans-meecrowave] branch master updated: missing websocket link
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 ebc8f75 missing websocket link
ebc8f75 is described below
commit ebc8f75cd797a9aa140e06f91a869b54ebb9a3ce
Author: Romain Manni-Bucau
AuthorDate: Thu Apr 22 17:19:17 2021 +0200
missing websocket link
---
meecrowave-doc/src/main/jbake/content/components.adoc | 6 ++
1 file changed, 6 insertions(+)
diff --git a/meecrowave-doc/src/main/jbake/content/components.adoc
b/meecrowave-doc/src/main/jbake/content/components.adoc
index b453bf5..48f0c32 100755
--- a/meecrowave-doc/src/main/jbake/content/components.adoc
+++ b/meecrowave-doc/src/main/jbake/content/components.adoc
@@ -69,6 +69,12 @@ free and easy SSL support on your HTTPS connectors.
link:{context_rootpath}/meecrowave-letsencrypt/index.html[Let's Encrypt module]
+== Meecrowave Websocket
+
+This is an experimental module wrapping `tomcat-websocket` to make it CDI
friendly for server endpoints.
+
+link:{context_rootpath}/meecrowave-websocket/index.html[Websocket module]
+
== Going further
Meecrowave scope is not the full scope of microservices (whatever it means) or
at least enterprise needs
svn commit: r1074088 - in /websites/production/openwebbeans/content/meecrowave: ./ assets/css/ assets/js/ meecrowave-core/ meecrowave-gradle/ meecrowave-jpa/ meecrowave-jta/ meecrowave-letsencrypt/ me
Author: rmannibucau
Date: Thu Apr 22 15:11:44 2021
New Revision: 1074088
Log:
Site checkin for project Meecrowave :: Doc
Modified:
websites/production/openwebbeans/content/meecrowave/assets/css/styles.css
websites/production/openwebbeans/content/meecrowave/assets/js/main.js
websites/production/openwebbeans/content/meecrowave/community.pdf
websites/production/openwebbeans/content/meecrowave/companion-projects.pdf
websites/production/openwebbeans/content/meecrowave/components.pdf
websites/production/openwebbeans/content/meecrowave/download.pdf
websites/production/openwebbeans/content/meecrowave/howto.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-core/cli.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-core/configuration.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-gradle/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-jpa/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-jta/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-letsencrypt/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-maven/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-oauth2/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-proxy/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-websocket/index.pdf
websites/production/openwebbeans/content/meecrowave/start.pdf
websites/production/openwebbeans/content/meecrowave/testing/index.html
websites/production/openwebbeans/content/meecrowave/testing/index.pdf
Modified:
websites/production/openwebbeans/content/meecrowave/assets/css/styles.css
==
--- websites/production/openwebbeans/content/meecrowave/assets/css/styles.css
(original)
+++ websites/production/openwebbeans/content/meecrowave/assets/css/styles.css
Thu Apr 22 15:11:44 2021
@@ -1260,4 +1260,68 @@ select {
pre {
padding: 0;
+}
+
+
+}
+.admonitionblock td.content > :first-child {
+ margin: 0;
+}
+.admonitionblock {
+ margin-bottom: 1rem;
+}
+.admonitionblock > table {
+ padding-top: 1rem;
+ padding-bottom: 1rem;
+ width: 100%;
+ height: 100%;
+ position: relative;
+ display: block;
+ /*border: 1px solid #c6c6c6;
+ border-radius: 5px;*/
+}
+.admonitionblock td.content > code {
+ background-color: unset !important;
+ color: unset !important;
+}
+.admonitionblock td.content {
+ display: block;
+ width: 100%;
+ padding: 0.5rem;
+}
+.admonitionblock .icon {
+ padding-right: 0.6rem;
+ padding-top: 0.5rem;
+}
+.admonitionblock .icon i {
+ display: inline-flex;
+ align-items: center;
+ height: 100%;
+}
+.admonitionblock .icon i::after {
+ content: attr(title);
+ hyphens: none;
+}
+.icon-important:before, .icon-note:before, .icon-tip:before,
.icon-warning:before {
+font-size: 1em;
+}
+.icon-important:before {
+content: "\f06a";
+font-family: "Font Awesome 5 Free";
+color: #e96065;
+}
+.icon-note:before {
+content: "\f05a";
+font-family: "Font Awesome 5 Free";
+color: #0675c1;
+}
+.icon-tip:before {
+content: "\f059";
+font-family: "Font Awesome 5 Free";
+color: #6ec01e;
+}
+.icon-warning:before {
+content: "\f071";
+font-family: "Font Awesome 5 Free";
+color: #ffc300;
}
\ No newline at end of file
Modified: websites/production/openwebbeans/content/meecrowave/assets/js/main.js
==
--- websites/production/openwebbeans/content/meecrowave/assets/js/main.js
(original)
+++ websites/production/openwebbeans/content/meecrowave/assets/js/main.js Thu
Apr 22 15:11:44 2021
@@ -46,4 +46,30 @@ $(document).ready(function() {
});
hljs.initHighlightingOnLoad();
+
+// set admonitionblock custom theme
+// drop titles from to not pollute the ui with pointless text
+function setAdmonitionStyle(item, color) {
+ var i = $(item);
+ i.css('border-left', '1.5px solid ' + color);
+ i.css('padding-left', '2rem');
+ i.css('background-color', color + '10');
+ i.css('color', color);
+}
+$('div.admonitionblock td.icon > i.fa').each(function (idx, item) {
+ item.title = '';
+
+ var jItem = $(item);
+ jItem.addClass('fa-lg');
+ var content = jItem.parent().parent().find('td.content');
+ if (jItem.hasClass('icon-important')) {
+ setAdmonitionStyle(content, '#e96065');
+ } else if (jItem.hasClass('icon-note')) {
+ setAdmonitionStyle(content, '#0675c1');
+ } else if (jItem.hasClass('icon-warning')) {
+ setAdmoniti
[openwebbeans-meecrowave] branch master updated: [MEECROWAVE-284] add meecrowave-websocket module
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 0b0c83c [MEECROWAVE-284] add meecrowave-websocket module
0b0c83c is described below
commit 0b0c83ce357c8f4f7874985504ddaf60ca7b9d20
Author: Romain Manni-Bucau
AuthorDate: Thu Apr 22 17:10:48 2021 +0200
[MEECROWAVE-284] add meecrowave-websocket module
---
meecrowave-doc/pom.xml | 4 +-
.../main/java/org/apache/meecrowave/doc/JBake.java | 4 +
.../src/main/jbake/assets/assets/css/styles.css| 64
.../src/main/jbake/assets/assets/js/main.js| 26
.../jbake/content/meecrowave-websocket/index.adoc | 27
meecrowave-websocket/pom.xml | 168 +
.../websocket/CDIServerConfigurator.java | 70 +
...socket.server.ServerEndpointConfig$Configurator | 1 +
pom.xml| 1 +
9 files changed, 364 insertions(+), 1 deletion(-)
diff --git a/meecrowave-doc/pom.xml b/meecrowave-doc/pom.xml
index 89ec459..0d3c100 100644
--- a/meecrowave-doc/pom.xml
+++ b/meecrowave-doc/pom.xml
@@ -164,7 +164,7 @@
org.codehaus.mojo
exec-maven-plugin
-1.6.0
+3.0.0
meecrowave-site
@@ -175,6 +175,8 @@
+ false
+ false
true
org.apache.meecrowave.doc.JBake
diff --git a/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/JBake.java
b/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/JBake.java
index 9746ef4..abf3a2d 100755
--- a/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/JBake.java
+++ b/meecrowave-doc/src/main/java/org/apache/meecrowave/doc/JBake.java
@@ -54,6 +54,7 @@ import
org.apache.meecrowave.doc.generator.LetsEncryptConfiguration;
import org.apache.meecrowave.doc.generator.MavenConfiguration;
import org.apache.meecrowave.doc.generator.OAuth2Configuration;
import org.apache.meecrowave.doc.generator.ProxyConfiguration;
+import org.apache.meecrowave.proxy.servlet.meecrowave.ProxyServletSetup;
import org.jbake.app.Oven;
import org.jbake.app.configuration.ConfigUtil;
import org.jbake.app.configuration.DefaultJBakeConfiguration;
@@ -123,6 +124,7 @@ public class JBake {
add("source-highlighter=highlightjs");
add("highlightjs-theme=idea");
add("context_rootpath=/meecrowave");
+add("icons=font");
}});
}}));
config.addConfiguration(DefaultJBakeConfiguration.class.cast(
@@ -243,8 +245,10 @@ public class JBake {
try (final Meecrowave container = new Meecrowave(new
Meecrowave.Builder() {{
setWebResourceCached(false);
+property("proxy-skip", "true");
}}) {{
start();
+
getTomcat().getServer().setParentClassLoader(Thread.currentThread().getContextClassLoader());
deployWebapp("/meecrowave", destination);
}}) {
System.out.println("Started on http://localhost:; +
container.getConfiguration().getHttpPort() + "/meecrowave");
diff --git a/meecrowave-doc/src/main/jbake/assets/assets/css/styles.css
b/meecrowave-doc/src/main/jbake/assets/assets/css/styles.css
index edb6c74..d758f1b 100644
--- a/meecrowave-doc/src/main/jbake/assets/assets/css/styles.css
+++ b/meecrowave-doc/src/main/jbake/assets/assets/css/styles.css
@@ -1261,3 +1261,67 @@ select {
pre {
padding: 0;
}
+
+
+}
+.admonitionblock td.content > :first-child {
+ margin: 0;
+}
+.admonitionblock {
+ margin-bottom: 1rem;
+}
+.admonitionblock > table {
+ padding-top: 1rem;
+ padding-bottom: 1rem;
+ width: 100%;
+ height: 100%;
+ position: relative;
+ display: block;
+ /*border: 1px solid #c6c6c6;
+ border-radius: 5px;*/
+}
+.admonitionblock td.content > code {
+ background-color: unset !important;
+ color: unset !important;
+}
+.admonitionblock td.content {
+ display: block;
+ width: 100%;
+ padding: 0.5rem;
+}
+.admonitionblock .icon {
+ padding-right: 0.6rem;
+ padding-top: 0.5rem;
+}
+.admonitionblock .icon i {
+ display: inline-flex;
+ align-items: center;
+ height: 100%;
+}
+.admonitionblock .icon i::after {
+ content: attr(title);
+ hyphens: none;
+}
+.icon-important:before, .icon-note:before, .icon-tip:before,
.icon-warning:before {
+font-size: 1em;
+}
+.icon-important:before {
+content: "\f06a";
+font-family: "Font Awesome 5 Free";
+color: #e96065;
+}
+.icon-note:before {
+content: "\f05a&
svn commit: r1074086 - in /websites/production/openwebbeans/content/meecrowave: ./ meecrowave-core/ meecrowave-gradle/ meecrowave-jpa/ meecrowave-jta/ meecrowave-letsencrypt/ meecrowave-maven/ meecrow
Author: rmannibucau Date: Thu Apr 22 14:40:15 2021 New Revision: 1074086 Log: Site checkin for project Meecrowave :: Doc Added: websites/production/openwebbeans/content/meecrowave/meecrowave-websocket/ websites/production/openwebbeans/content/meecrowave/meecrowave-websocket/index.html websites/production/openwebbeans/content/meecrowave/meecrowave-websocket/index.pdf Modified: websites/production/openwebbeans/content/meecrowave/community.pdf websites/production/openwebbeans/content/meecrowave/companion-projects.pdf websites/production/openwebbeans/content/meecrowave/components.pdf websites/production/openwebbeans/content/meecrowave/download.pdf websites/production/openwebbeans/content/meecrowave/howto.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-core/cli.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-core/configuration.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-gradle/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-jpa/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-jta/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-letsencrypt/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-maven/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-oauth2/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-proxy/index.pdf websites/production/openwebbeans/content/meecrowave/start.pdf websites/production/openwebbeans/content/meecrowave/testing/index.html websites/production/openwebbeans/content/meecrowave/testing/index.pdf Modified: websites/production/openwebbeans/content/meecrowave/community.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/companion-projects.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/components.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/download.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/howto.pdf == --- websites/production/openwebbeans/content/meecrowave/howto.pdf (original) +++ websites/production/openwebbeans/content/meecrowave/howto.pdf Thu Apr 22 14:40:15 2021 @@ -4,8 +4,8 @@ << /Title (Howto) /Creator (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) /Producer (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) -/ModDate (D:20210422160858+02'00') -/CreationDate (D:20210422160858+02'00') +/ModDate (D:20210422163959+02'00') +/CreationDate (D:20210422163959+02'00') >> endobj 2 0 obj Modified: websites/production/openwebbeans/content/meecrowave/meecrowave-core/cli.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/meecrowave-core/configuration.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf == --- websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf (original) +++ websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf Thu Apr 22 14:40:15 2021 @@ -4,8 +4,8 @@ << /Title (Meecrowave and webapps) /Creator (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) /Producer (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) -/ModDate (D:20210422160858+02'00') -/CreationDate (D:20210422160858+02'00') +/ModDate (D:20210422163959+02'00') +/CreationDate (D:20210422163959+02'00') >> endobj 2 0 obj Modified: websites/production/openwebbeans/content/meecrowave/meecrowave-gradle/index.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/meecrowave-jpa/index.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/meecrowave-jta/index.pdf =
svn commit: r1074083 [13/13] - in /websites/production/openwebbeans/content/meecrowave: ./ assets/css/ assets/plugins/ assets/plugins/elegant_font/css/ assets/plugins/font-awesome/css/ meecrowave-core
Modified: websites/production/openwebbeans/content/meecrowave/start.html
==
--- websites/production/openwebbeans/content/meecrowave/start.html (original)
+++ websites/production/openwebbeans/content/meecrowave/start.html Thu Apr 22
14:09:32 2021
@@ -18,7 +18,7 @@
-
+
@@ -66,73 +66,124 @@
-
- Your first application
-
-
- Meecrowave relies on JAX-RS and CDI so to start you just need to write a
JAX-RS endpoint:
-
-
-
-@Path("kitchen")
+
+Your first application
+
+
+Dependencies
+
+Just add in any Maven pom.xml - or gradle
build.gradle the following dependency:
+
+
+
+dependency
+ groupIdorg.apache.meecrowave/groupId
+ artifactIdmeecrowave-core/artifactId
+ version${meecrowave.version}/version
+/dependency
+
+
+
+If you intend to reuse our Cli main you should also add:
+
+
+
+dependency
+ groupIdcommons-cli/groupId
+ artifactIdcommons-cli/artifactId
+ version1.4/version
+/dependency
+
+
+
+Finally, if you want to develop against jakarta namespace
instead of javax one, you can use the all in one
jakarta bundle:
+
+
+
+dependency
+ groupIdorg.apache.meecrowave/groupId
+ artifactIdmeecrowave-core/artifactId
+ version1.2.11/version !-- a least 1.2.11 is required
--
+ classifierjakarta/classifier
+ exclusions
+exclusion
+ groupId*/groupId
+ artifactId*/artifactId
+/exclusion
+ /exclusions
+/dependency
+
+
+
+
+Runtime
+
+Meecrowave relies on JAX-RS and CDI so to start you just need to write a
JAX-RS endpoint:
+
+
+
+@Path("kitchen")
@ApplicationScoped
public class HelloKitchen {
@GET
public String getMenu() {
return "good things";
}
-}
-
-
-
- Then booting Meecrowave is as easy as launching:
-
-
-
-try (final Meecrowave meecrowave = new Meecrowave().bake()) {
+}
+
+
+
+Then booting Meecrowave is as easy as launching - or reuse
org.apache.meecrowave.runner.Cli provided main:
+
+
+
+try (final Meecrowave meecrowave = new Meecrowave().bake()) {
new Scanner(System.in).nextLine();
-}
-
-
-
- You should get some output containing:
-
-
-
-[19:54:55.397][INFO][main][.meecrowave.cxf.CxfCdiAutoSetup]
REST Application: / - org.apache.cxf.cdi.DefaultApplication
+}
+
+
+
+You should get some output containing:
+
+
+
+[19:54:55.397][INFO][main][.meecrowave.cxf.CxfCdiAutoSetup] REST
Application: / - org.apache.cxf.cdi.DefaultApplication
[19:54:55.399][INFO][main][.meecrowave.cxf.CxfCdiAutoSetup] Service URI:
/kitchen - org.app.HelloKitchen
-[19:54:55.401][INFO][main][.meecrowave.cxf.CxfCdiAutoSetup] GET
/kitchen/ - String getMenu()
-
-
-
- And you can check it works doing:
-
-
-
-curl
http://localhost:8080/kitchen
-
-
-
-
-
- Youâre in a hurry? Use groovy!
-
-
-
-
-
-
- this feature is supported starting from version
0.3.0 only.
-
-
-
-
-
- Create a file called hello.groovy:
-
-
-
-@Grab('org.apache.meecrowave:meecrowave-core:0.3.0')
+[19:54:55.401][INFO][main][.meecrowave.cxf.CxfCdiAutoSetup] GET
/kitchen/ - String getMenu()
+
+
+
+And you can check it works doing:
+
+
+
+curl
http://localhost:8080/kitchen
+
+
+
+
+
+
+Youre in a hurry? Use groovy!
+
+
+
+
+
+
+
+
+this feature is supported starting from version 0.3.0 only.
+
+
+
+
+
+Create a file called hello.groovy:
+
+
+
+@Grab('org.apache.meecrowave:meecrowave-core:0.3.0')
import org.apache.meecrowave.Meecrowave
@@ -149,34 +200,45 @@ class Hello {
}
}
-new Meecrowave().bake().await()
-
-
-
- then
-
-
-
-groovy hello.groovy
-
-
-
- Finally you can test it:
-
-
-
-curl http://localhost:8080/hello
-
-
-
-
-
- Sample
-
-
- https://github.com/apache/openwebbeans-meecrowave-examples;
class="bare">https://github.com/apache/openwebbeans-meecrowave-examples
contains ready to use examples using meecrowave.
-
-
+new Meecrowave().bake().await()
+
+
+
+then
+
+
+
+groovy hello.groovy
+
+
+
+Finally you can test it:
+
+
+
+curl http://localhost:8080/hello
+
+
+
+
+
+And my war?
+
+
+See How to deploy a war to
see how to use meecrowave to deploy an existing war.
+
+
+
+
+Sample
+
+
+https://github.com/apache/openwebbeans-meecrowave-examples;
class="bare">https://github.com/apache/openwebbeans-meecrowave-examples
contains ready to use examples using meecrowave.
+
+
+You can also find more information on our How To
page.
+
+
@@ -204,8 +266,8 @@ new Meecrowave().bake().await()
-Copyright 2016
-https://www.apache.org/;>The Apache Software
Foundation. All rights reserved.
+Copyright 2016-2020
+http://www.apache.org/;>The
svn commit: r1074083 [3/13] - in /websites/production/openwebbeans/content/meecrowave: ./ assets/css/ assets/plugins/ assets/plugins/elegant_font/css/ assets/plugins/font-awesome/css/ meecrowave-core/
Modified: websites/production/openwebbeans/content/meecrowave/components.html == --- websites/production/openwebbeans/content/meecrowave/components.html (original) +++ websites/production/openwebbeans/content/meecrowave/components.html Thu Apr 22 14:09:32 2021 @@ -18,7 +18,7 @@ - + @@ -66,118 +66,125 @@ - - Meecrowave Core - - - Core component is the backbone of Meecrowave. It is based on Tomcat embedded for Servlet container, CXF for JAX-RS, OpenWebBeans for CDI and Log4j2 for the logging. - - - Read about Meecrowave configuration - - - Read about Meecrowave command line - - - - - Meecrowave JPA - - - Meecrowave JPA provides a thin layer on top of JPA to make it easier to use JPA without requiring to use a full container like JavaEE or Spring. It is just a CDI extension. - - - Read More - - - - - Meecrowave Maven - - - Meecrowave provides a Maven plugin to run meecrowave with your preferred build tool. - - - Read More - - - - - Meecrowave Gradle - - - Meecrowave provides a Gradle plugin to run meecrowave with your preferred build tool. - - - Read More - - - - - Meecrowave and the Testing - - - Meecrowave provides two main testing integration: a JUnit one and an Arquillian Container. - - - Read More - - - - - Meecrowave and Monitoring - - - Meecrowave provides few integration for the monitoring: - - - Jolokia (JMX) - - - - - Meecrowave and JTA - - - This is an experimental integration of geronimo-transaction and meecrowave. - - - JTA module - - - - - Meecrowave and OAuth2 - - - This is an experimental module integrating CXF OAuth2 server in Meecrowave through an embeddable dependency or a directly executable jar. - - - OAuth2 module - - - - - Meecrowave Letâs Encrypt - - - This is an experimental module integrating with Letâs Encrypt to provide you free and easy SSL support on your HTTPS connectors. - - - Letâs Encrypt module - - - - - Going further - - - Meecrowave scope is not the full scope of microservices (whatever it means) or at least enterprise needs cause several Apache projects cover part of them in a very good way. - - - See Companion Projects for more information. - - + +Meecrowave Core + + +Core component is the backbone of Meecrowave. It is based on Tomcat embedded for +Servlet container, CXF for JAX-RS, OpenWebBeans for CDI and Log4j2 for the logging. + + +Read about Meecrowave configuration + + +Read about Meecrowave command line + + +Read about Meecrowave and webapp/wars + + + + +Meecrowave JPA + + +Meecrowave JPA provides a thin layer on top of JPA to make it easier to use JPA +without requiring to use a full container like JavaEE or Spring. It is just a +CDI extension. + + +Read More + + + + +Meecrowave Maven + + +Meecrowave provides a Maven plugin to run meecrowave with your preferred build tool. + + +Read More + + + + +Meecrowave Gradle + + +Meecrowave provides a Gradle plugin to run meecrowave with your preferred build tool. + + +Read More + + + + +Meecrowave and the Testing + + +Meecrowave provides two main testing integration: a JUnit one and an Arquillian Container. + + +Read More + + + + +Meecrowave and Monitoring + + +For monitoring, https://microprofile.io/;>Microprofile can be a neat companion of Apache Meecrowave. +You can have a look to http://geronimo.apache.org/microprofile/;>Geronimo implementation. + + + + +Meecrowave and JTA + + +This is an experimental integration of geronimo-transaction and meecrowave. + + +JTA module + + + + +Meecrowave and OAuth2 + + +This is an experimental module integrating CXF OAuth2 server in Meecrowave +through an embeddable dependency or a directly executable jar. + + +OAuth2 module + + + + +Meecrowave Lets Encrypt + + +This is an experimental module integrating with Lets Encrypt to provide you +free and easy SSL support on your HTTPS connectors. + + +Lets Encrypt module + + + + +Going further + + +Meecrowave scope is not the full scope of microservices (whatever it means) or at least enterprise needs +cause several Apache projects cover part of them in a very good way. + + +See Companion Projects for more information. + + @@ -205,8 +212,8 @@ -Copyright 2016 -https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 2016-2020 +http://www.apache.org/;>The Apache Software Foundation. All rights reserved. @@ -221,10 +228,13 @@ - + + + + + - Modified:
svn commit: r1074083 [6/13] - in /websites/production/openwebbeans/content/meecrowave: ./ assets/css/ assets/plugins/ assets/plugins/elegant_font/css/ assets/plugins/font-awesome/css/ meecrowave-core/
Added: websites/production/openwebbeans/content/meecrowave/howto.pdf == --- websites/production/openwebbeans/content/meecrowave/howto.pdf (added) +++ websites/production/openwebbeans/content/meecrowave/howto.pdf Thu Apr 22 14:09:32 2021 @@ -0,0 +1,29023 @@ +%PDF-1.3 +% +1 0 obj +<< /Title (Howto) +/Creator (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) +/Producer (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) +/ModDate (D:20210422160858+02'00') +/CreationDate (D:20210422160858+02'00') +>> +endobj +2 0 obj +<< /Type /Catalog +/Pages 3 0 R +/Names 12 0 R +/Outlines 67 0 R +/PageLabels 76 0 R +/PageMode /UseOutlines +/OpenAction [7 0 R /FitH 842.89] +/ViewerPreferences << /DisplayDocTitle true +>> +>> +endobj +3 0 obj +<< /Type /Pages +/Count 18 +/Kids [7 0 R 10 0 R 19 0 R 23 0 R 25 0 R 30 0 R 32 0 R 37 0 R 41 0 R 47 0 R 49 0 R 51 0 R 53 0 R 55 0 R 57 0 R 59 0 R 61 0 R 63 0 R] +>> +endobj +4 0 obj +<< /Length 2 +>> +stream +q + +endstream +endobj +5 0 obj +<< /Type /Page +/Parent 3 0 R +/MediaBox [0 0 595.28 841.89] +/CropBox [0 0 595.28 841.89] +/BleedBox [0 0 595.28 841.89] +/TrimBox [0 0 595.28 841.89] +/ArtBox [0 0 595.28 841.89] +/Contents 4 0 R +/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] +>> +>> +endobj +6 0 obj +<< /Length 152 +>> +stream +q +/DeviceRGB cs +0.6 0.6 0.6 scn +/DeviceRGB CS +0.6 0.6 0.6 SCN + +BT +461.747 361.6965 Td +/F1.0 27 Tf +<486f77746f> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +Q + +endstream +endobj +7 0 obj +<< /Type /Page +/Parent 3 0 R +/MediaBox [0 0 595.28 841.89] +/CropBox [0 0 595.28 841.89] +/BleedBox [0 0 595.28 841.89] +/TrimBox [0 0 595.28 841.89] +/ArtBox [0 0 595.28 841.89] +/Contents 6 0 R +/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] +/Font << /F1.0 8 0 R +>> +>> +>> +endobj +8 0 obj +<< /Type /Font +/BaseFont /37ec33+NotoSerif +/Subtype /TrueType +/FontDescriptor 78 0 R +/FirstChar 32 +/LastChar 255 +/Widths 80 0 R +/ToUnicode 79 0 R +>> +endobj +9 0 obj +<< /Length 13180 +>> +stream +q +/DeviceRGB cs +0.2 0.2 0.2 scn +/DeviceRGB CS +0.2 0.2 0.2 SCN + +BT +48.24 782.394 Td +/F2.0 22 Tf +<486f7720746f2063726561746520612073696d706c65206d6176656e2070726f6a656374207573696e67> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +BT +48.24 752.474 Td +/F2.0 22 Tf +<4d656563726f77617665203f> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +1.2346 Tw + +BT +48.24 723.286 Td +/F1.0 10.5 Tf +[<59> 69.8242 <6f752073686f756c64206164642074686520666f6c6c6f77696e6720646570656e64656e6369657320646f2074686520646570656e64656e636965732073656374696f6e206f6620796f757220706f6d2e786d6c202861646a757374>] TJ +ET + + +0.0 Tw +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +BT +48.24 707.506 Td +/F1.0 10.5 Tf +<76657273696f6e20746f2063757272656e7420737461626c652076657273696f6e29> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +q +0.9608 0.9608 0.9608 scn +52.24 691.69 m +543.04 691.69 l +545.2491 691.69 547.04 689.8991 547.04 687.69 c +547.04 408.37 l +547.04 406.1609 545.2491 404.37 543.04 404.37 c +52.24 404.37 l +50.0309 404.37 48.24 406.1609 48.24 408.37 c +48.24 687.69 l +48.24 689.8991 50.0309 691.69 52.24 691.69 c +h +f +0.8 0.8 0.8 SCN +0.75 w +52.24 691.69 m +543.04 691.69 l +545.2491 691.69 547.04 689.8991 547.04 687.69 c +547.04 408.37 l +547.04 406.1609 545.2491 404.37 543.04 404.37 c +52.24 404.37 l +50.0309 404.37 48.24 406.1609 48.24 408.37 c +48.24 687.69 l +48.24 689.8991 50.0309 691.69 52.24 691.69 c +h +S +Q +0.1843 0.4353 0.6235 scn +0.1843 0.4353 0.6235 SCN + +BT +59.24 668.865 Td +/F3.0 11 Tf +<3c646570656e64656e63793e> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +BT +59.24 654.125 Td +/F3.0 11 Tf + Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.1843 0.4353 0.6235 scn +0.1843 0.4353 0.6235 SCN + +BT +81.24 654.125 Td +/F3.0 11 Tf +<3c67726f757049643e> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +BT +130.74 654.125 Td +/F3.0 11 Tf +<6f72672e6170616368652e6d656563726f77617665> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.1843 0.4353 0.6235 scn +0.1843 0.4353 0.6235 SCN + +BT +246.24 654.125 Td +/F3.0 11 Tf +<3c2f67726f757049643e> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +BT +59.24 639.385 Td +/F3.0 11 Tf + Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.1843 0.4353 0.6235 scn +0.1843 0.4353 0.6235 SCN + +BT +81.24 639.385 Td +/F3.0 11 Tf +<3c617274696661637449643e> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +BT +147.24 639.385 Td +/F3.0 11 Tf +<6d656563726f776176652d73706563732d617069> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.1843 0.4353 0.6235 scn +0.1843 0.4353 0.6235 SCN + +BT +257.24 639.385 Td +/F3.0 11 Tf +<3c2f617274696661637449643e> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN +
svn commit: r1074083 [10/13] - in /websites/production/openwebbeans/content/meecrowave: ./ assets/css/ assets/plugins/ assets/plugins/elegant_font/css/ assets/plugins/font-awesome/css/ meecrowave-core
Modified:
websites/production/openwebbeans/content/meecrowave/meecrowave-letsencrypt/index.html
==
---
websites/production/openwebbeans/content/meecrowave/meecrowave-letsencrypt/index.html
(original)
+++
websites/production/openwebbeans/content/meecrowave/meecrowave-letsencrypt/index.html
Thu Apr 22 14:09:32 2021
@@ -18,7 +18,7 @@
-
+
@@ -66,73 +66,74 @@
-
- Meecrowave provides a Letâs Encrypt integration which will grab the
default tomcat connector and reload regularly its certificate based on Letâs
Encrypt protocol.
-
-
- You must configure the domain(s) to include during Letâs Encrypt
discussion to activate that feature.
-
-
-
-
-
-
-
-
- Name
- Description
-
-
-
-
- --letsencrypt-certificate-domain-location
- Where
the domain certificate must be stored
-
-
- --letsencrypt-chain-domain-location
- Where
the domain chain must be stored
-
-
- --letsencrypt-key-domain-location
- Where
the domain key must be stored
-
-
- --letsencrypt-key-domain-size
- Domain
key size
-
-
- --letsencrypt-domains
- Comma
separated list of domains to manage
-
-
- --letsencrypt-endpoint
- Endpoint to use to get the certificates
-
-
- --letsencrypt-refresh-interval
- Number
of second between letâsencrypt refreshes
-
-
- --letsencrypt-retry-count
- How
many retries to do
-
-
- --letsencrypt-retry-timeout-ms
- How
long to wait before retrying to get the certificate, default is 3s
-
-
- --letsencrypt-endpoint-staging
- Ignore
if endpoint is set, otherwise it set the endpoint accordingly
-
-
- --letsencrypt-key-user-location
- Where
the user key must be stored
-
-
- --letsencrypt-key-user-size
- User
key size
-
-
+
+Meecrowave provides a Lets Encrypt integration which will grab the
default tomcat connector
+and reload regularly its certificate based on Lets Encrypt protocol.
+
+
+You must configure the domain(s) to include during Lets Encrypt
discussion to activate that feature.
+
+
+
+
+
+
+
+
+Name
+Description
+
+
+
+
+--letsencrypt-certificate-domain-location
+Where the
domain certificate must be stored
+
+
+--letsencrypt-chain-domain-location
+Where the
domain chain must be stored
+
+
+--letsencrypt-key-domain-location
+Where the
domain key must be stored
+
+
+--letsencrypt-key-domain-size
+Domain key
size
+
+
+--letsencrypt-domains
+Comma
separated list of domains to manage
+
+
+--letsencrypt-endpoint
+Endpoint
to use to get the certificates
+
+
+--letsencrypt-refresh-interval
+Number of
second between letsencrypt refreshes
+
+
+--letsencrypt-retry-count
+How many
retries to do
+
+
+--letsencrypt-retry-timeout-ms
+How long
to wait before retrying to get the certificate, default is 3s
+
+
+--letsencrypt-endpoint-staging
+Ignore if
endpoint is set, otherwise it set the endpoint accordingly
+
+
+--letsencrypt-key-user-location
+Where the
user key must be stored
+
+
+--letsencrypt-key-user-size
+User key
size
+
+
@@ -160,8 +161,8 @@
-Copyright 2016
-https://www.apache.org/;>The Apache Software
Foundation. All rights reserved.
+Copyright 2016-2020
+http://www.apache.org/;>The Apache Software
Foundation. All rights reserved.
@@ -176,10 +177,13 @@
-
+
+
+
+
+
-
Modified:
websites/production/openwebbeans/content/meecrowave/meecrowave-letsencrypt/index.pdf
==
Binary files - no diff available.
Modified:
websites/production/openwebbeans/content/meecrowave/meecrowave-maven/index.html
==
---
websites/production/openwebbeans/content/meecrowave/meecrowave-maven/index.html
(original)
+++
websites/production/openwebbeans/content/meecrowave/meecrowave-maven/index.html
Thu Apr 22 14:09:32 2021
@@ -18,7 +18,7 @@
-
+
@@ -66,480 +66,538 @@
-
-
-
- Coordinates:
-
-
-
-plugin
+
+
+
+Coordinates:
+
+
+
+plugin
groupIdorg.apache.meecrowave/groupId
artifactIdmeecrowave-maven-plugin/artifactId
version${meecrowave.version}/version
-/plugin
-
-
-
-
-
-
-
- most of the configuration is inherited from
meecrowave-core.
-
-
-
-
-
- Here are the available options (see core configuration for the
details):
-
-
-
-
-
-
-
-
-
- Name
- Default
- Property
-
-
-
-
-
svn commit: r1074083 [5/13] - in /websites/production/openwebbeans/content/meecrowave: ./ assets/css/ assets/plugins/ assets/plugins/elegant_font/css/ assets/plugins/font-awesome/css/ meecrowave-core/
Modified: websites/production/openwebbeans/content/meecrowave/download.pdf
==
Binary files - no diff available.
Added: websites/production/openwebbeans/content/meecrowave/howto.html
==
--- websites/production/openwebbeans/content/meecrowave/howto.html (added)
+++ websites/production/openwebbeans/content/meecrowave/howto.html Thu Apr 22
14:09:32 2021
@@ -0,0 +1,951 @@
+
+
+
+
+
+Meecrowave :: the customizable server
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Meecrowave
+
+
+
+
+
+
+
+
+ Howto
+
+
+
+
+
+
+
+
+
+
+
+ Download as PDF
+
+
+
+
+
+
+
+How to create
a simple maven project using Meecrowave ?
+
+
+You should add the following dependencies do the dependencies section of
your pom.xml (adjust version to current stable version)
+
+
+
+dependency
+groupIdorg.apache.meecrowave/groupId
+artifactIdmeecrowave-specs-api/artifactId
+version${meecrowave.version}/version
+/dependency
+dependency
+groupIdorg.apache.meecrowave/groupId
+artifactIdmeecrowave-core/artifactId
+version${meecrowave.version}/version
+/dependency
+
+!-- if you intend to have unit tests (you really should) --
+dependency
+groupIdorg.apache.meecrowave/groupId
+artifactIdmeecrowave-junit/artifactId
+version${meecrowave.version}/version
+scopetest/scope
+/dependency
+
+
+
+and the following plugin configuration to the build/plugins section of your
pom.xml
+
+
+
+plugin
+!--
+For starting meecrowave via Maven. Just run
+$ mvn clean install meecrowave:run
+--
+groupIdorg.apache.meecrowave/groupId
+artifactIdmeecrowave-maven-plugin/artifactId
+version${meecrowave.version}/version
+/plugin
+
+
+
+Then, you can start your app by running
+
+
+
+mvn clean install meecrowave:run
+
+
+
+
+
+How to add a REST Endpoint ?
+
+
+You should declare your endpoint path and verd :
+
+
+
+package org.mypackage;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("mypath")
+@ApplicationScoped
+public class MyEndpoint {
+
+/**
+ * Ping / pong rest GET method, to check backend and replies to queries
+ *
+ * @return
+ */
+@Path("/ping")
+@GET
+public String getPing() {
+return "pong";
+}
+}
+
+
+
+
+
+How to add a filter (simple case)
?
+
+
+Use standard Servlet 4.0 https://docs.oracle.com/javaee/6/api/javax/servlet/annotation/WebFilter.html;>@WebFilter
annotation. A simple example :
+
+
+
+package org.mypackage;
+
+import java.io.IOException;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * A simple CORS filter
+ *
+ */
+@WebFilter(asyncSupported = true, urlPatterns = {"/*"})
+public class CORSFilter implements Filter {
+
+/**
+ * A basic CORS filter, allowing everything
+ */
+@Override
+public void doFilter(ServletRequest servletRequest, ServletResponse
servletResponse, FilterChain chain)
+throws IOException, ServletException {
+
+HttpServletRequest request = (HttpServletRequest) servletRequest;
+
+HttpServletResponse response = (HttpServletResponse) servletResponse;
+response.addHeader("Access-Control-Allow-Origin", "*");
+response.addHeader("Access-Control-Allow-Methods","GET, OPTIONS, HEAD,
PUT, POST, DELETE");
+response.addHeader("Access-Control-Allow-Headers","*");
+
+if (request.getMethod().equals("OPTIONS")) {
+// special case of return code for "OPTIONS" query
+response.setStatus(HttpServletResponse.SC_ACCEPTED);
+return;
+}
+
+// pass the request along the filter chain
+chain.doFilter(request, servletResponse);
+}
+}
+
+
+
+
+
+How to add a servlet ?
+
+
+If your servlet requires no configuration that you would typically put in
the web.xml file, you can use the https://docs.oracle.com/javaee/6/api/javax/servlet/annotation/WebServlet.html;>@WebServlet
annotation from the Servlet 3.0 specification.
+
+
+If you need to configure the servlet, you should use a https://docs.oracle.com/javaee/6/api/javax/servlet/ServletContainerInitializer.html;>ServletContainerInitializer.
+
+
+If you would have a declaration such as :
+
+
+
+servlet
+descriptionMy Servlet/description
+servlet-nameMyServlet/servlet-name
+
svn commit: r1074083 [8/13] - in /websites/production/openwebbeans/content/meecrowave: ./ assets/css/ assets/plugins/ assets/plugins/elegant_font/css/ assets/plugins/font-awesome/css/ meecrowave-core/
Modified: websites/production/openwebbeans/content/meecrowave/meecrowave-core/configuration.html == --- websites/production/openwebbeans/content/meecrowave/meecrowave-core/configuration.html (original) +++ websites/production/openwebbeans/content/meecrowave/meecrowave-core/configuration.html Thu Apr 22 14:09:32 2021 @@ -18,7 +18,7 @@ - + @@ -66,339 +66,359 @@ - - - - Meecrowave configuration is centralized in org.apache.meecrowave.Meecrowave$Builder class. - - - Here are the main properties: - - - - - - - - - Name - Description - - - - - cdiConversation - Should CDI conversation be activated - - - clientAuth - HTTPS keystore client authentication - - - conf - Conf folder to synchronize - - - connectors - Custom connectors - - - cxfServletParams - Init parameters passed to CXF servlet - - - defaultSSLHostConfigName - The name of the default SSLHostConfig that will be used for secure https connections. - - - deleteBaseOnStartup - Should the directory be cleaned on startup if existing - - - dir - Root folder if provided otherwise a fake one is created in tmp-dir - - - host - Default host - - - http2 - Activate HTTP 2 - - - httpPort - HTTP port - - - httpsPort - HTTPS port - - - initializeClientBus - Should the client bus be set. If false the server one will likely be reused. - - - injectServletContainerInitializer - Should ServletContainerInitialize support injections. - - - jaxrsAutoActivateBeanValidation - Should bean validation be activated on JAX-RS endpoint if present in the classpath. - - - jaxrsDefaultProviders - If jaxrsProviderSetup is true the list of default providers to load (or defaulting to johnson jsonb and jsonp ones) - - - jaxrsLogProviders - Should JAX-RS providers be logged - - - jaxrsMapping - Default jaxrs mapping - - - jaxrsProviderSetup - Should default JAX-RS provider be configured - - - jaxwsSupportIfAvailable - Should @WebService CDI beans be deployed if cxf-rt-frontend-jaxws is in the classpath. - - - jsonbBinaryStrategy - Should JSON-B provider prettify the output - - - jsonbEncoding - Which encoding provider JSON-B should use - - - jsonbIJson - Should JSON-B provider comply to I-JSON - - - jsonbNamingStrategy - Should JSON-B provider prettify the output - - - jsonbNulls - Should JSON-B provider serialize nulls - - - jsonbOrderStrategy - Should JSON-B provider prettify the output - - - jsonbPrettify - Should JSON-B provider prettify the output - - - jsonpBufferStrategy - JSON-P JAX-RS provider buffer strategy (see johnzon) - - - jsonpMaxReadBufferLen - JSON-P JAX-RS provider read buffer limit size (see johnzon) - - - jsonpMaxStringLen - JSON-P JAX-RS provider max string limit size (see johnzon) - - - jsonpMaxWriteBufferLen - JSON-P JAX-RS provider write buffer limit size (see johnzon) - - - jsonpPrettify - Should JSON-P JAX-RS provider prettify the outputs (see johnzon) - - - jsonpSupportsComment - Should JSON-P JAX-RS provider support comments (see johnzon) - - - keepServerXmlAsThis - Donât replace ports in server.xml - - - keyAlias - HTTPS keystore alias - - - keystoreFile - HTTPS keystore location - - - keystorePass - HTTPS keystore password - - - keystoreType - HTTPS keystore type - - - loggingGlobalSetup - Should logging be configured to use log4j2 (it is global) - - - loginConfig - web.xml login config - - - meecrowaveProperties - Loads a meecrowave properties, defaults to meecrowave.properties. - - - pidFile - A file path to write the process id if the server starts - - - properties - Passthrough properties - - - quickSession - Should an unsecured but fast session id generator be used - - - realm - realm - - - roles - In memory roles - - - scanningExcludes - A forced exclude list of jar names (comma separated values) - - - scanningIncludes - A forced include list of jar names
svn commit: r1074083 [7/13] - in /websites/production/openwebbeans/content/meecrowave: ./ assets/css/ assets/plugins/ assets/plugins/elegant_font/css/ assets/plugins/font-awesome/css/ meecrowave-core/
Modified: websites/production/openwebbeans/content/meecrowave/index.html == --- websites/production/openwebbeans/content/meecrowave/index.html (original) +++ websites/production/openwebbeans/content/meecrowave/index.html Thu Apr 22 14:09:32 2021 @@ -18,7 +18,7 @@ - + @@ -105,8 +105,8 @@ -Copyright 2016 -https://www.apache.org/;>The Apache Software Foundation. All rights reserved. +Copyright 2016-2020 +http://www.apache.org/;>The Apache Software Foundation. All rights reserved. @@ -121,10 +121,13 @@ - + + + + + - Modified: websites/production/openwebbeans/content/meecrowave/meecrowave-core/cli.html == --- websites/production/openwebbeans/content/meecrowave/meecrowave-core/cli.html (original) +++ websites/production/openwebbeans/content/meecrowave/meecrowave-core/cli.html Thu Apr 22 14:09:32 2021 @@ -18,7 +18,7 @@ - + @@ -66,358 +66,380 @@ - - - - Meecrowave provides a CLI (Command Line Interface) called org.apache.meecrowave.runner.Cli. - - - It can be used to deploy the java classpath or a war. Here are the main options: - - - - - - - - - Name - Description - - - - - --cdi-conversation - Should CDI conversation be activated - - - --client-auth - HTTPS keystore client authentication - - - --conf - Conf folder to synchronize - - - --connector - Custom connectors - - - --cxf-servlet-params - Init parameters passed to CXF servlet - - - --default-ssl-hostconfig-name - The name of the default SSLHostConfig that will be used for secure https connections. - - - --delete-on-startup - Should the directory be cleaned on startup if existing - - - --dir - Root folder if provided otherwise a fake one is created in tmp-dir - - - --host - Default host - - - --http2 - Activate HTTP 2 - - - --http - HTTP port - - - --https - HTTPS port - - - --cxf-initialize-client-bus - Should the client bus be set. If false the server one will likely be reused. - - - --servlet-container-initializer-injection - Should ServletContainerInitialize support injections. - - - --jaxrs-beanvalidation - Should bean validation be activated on JAX-RS endpoint if present in the classpath. - - - --jaxrs-default-providers - If jaxrsProviderSetup is true the list of default providers to load (or defaulting to johnson jsonb and jsonp ones) - - - --jaxrs-log-provider - Should JAX-RS providers be logged - - - --jaxrs-mapping - Default jaxrs mapping - - - --jaxrs-provider-setup - Should default JAX-RS provider be configured - - - --jaxws-support-if-present - Should @WebService CDI beans be deployed if cxf-rt-frontend-jaxws is in the classpath. - - - --jsonb-binary-strategy - Should JSON-B provider prettify the output - - - --jsonb-encoding - Which encoding provider JSON-B should use - - - --jsonb-ijson - Should JSON-B provider comply to I-JSON - - - --jsonb-naming-strategy - Should JSON-B provider prettify the output - - - --jsonb-nulls - Should JSON-B provider serialize nulls - - - --jsonb-order-strategy - Should JSON-B provider prettify the output - - - --jsonb-prettify - Should JSON-B provider prettify the output - - - --jsonp-buffer-strategy - JSON-P JAX-RS provider buffer strategy (see johnzon) - - - --jsonp-read-buffer-length - JSON-P JAX-RS provider read buffer limit size (see johnzon) - - - --jsonp-max-string-length - JSON-P JAX-RS provider max string limit size (see johnzon) - - - --jsonp-write-buffer-length - JSON-P JAX-RS provider write buffer limit size (see johnzon) - - - --jsonp-supports-comment - Should JSON-P JAX-RS provider prettify the outputs (see johnzon) - - - --jsonp-supports-comment - Should JSON-P JAX-RS provider support comments (see johnzon) - - - --keep-server-xml-as-this - Donât replace ports in server.xml - - - --keystore-alias - HTTPS keystore alias - - - --keystore-file - HTTPS
svn commit: r1074083 [11/13] - in /websites/production/openwebbeans/content/meecrowave: ./ assets/css/ assets/plugins/ assets/plugins/elegant_font/css/ assets/plugins/font-awesome/css/ meecrowave-core
Modified:
websites/production/openwebbeans/content/meecrowave/meecrowave-oauth2/index.html
==
---
websites/production/openwebbeans/content/meecrowave/meecrowave-oauth2/index.html
(original)
+++
websites/production/openwebbeans/content/meecrowave/meecrowave-oauth2/index.html
Thu Apr 22 14:09:32 2021
@@ -18,7 +18,7 @@
-
+
@@ -66,310 +66,346 @@
-
-
-
- Starting with version 0.3.0.
-
-
- Coordinates:
-
-
-
-dependency
+
+
+
+Starting with version 0.3.0.
+
+
+Coordinates:
+
+
+
+dependency
groupIdorg.apache.meecrowave/groupId
artifactIdmeecrowave-oauth2/artifactId
version${meecrowave.version}/version
-/dependency
-
-
-
- A small OAuth2 server based on CXF implementation.
-
-
- See https://cxf.apache.org/docs/jax-rs-oauth2.html;
class="bare">https://cxf.apache.org/docs/jax-rs-oauth2.html for more
details.
-
-
- Here is the current configuration (mainly based on CXF one):
-
-
-
-
-
-
-
-
- Name
- Description
-
-
-
-
- --oauth2-access-token-lifetime
- How
long an access token is valid, default to 3600s
-
-
- --oauth2-authorization-code-support
- Is
authorization code flow supported
-
-
- --oauth2-block-unsecure-requests
- Should unsecured requests be blocked
-
-
- --oauth2-client-force
- Is a
client mandatory or can a token be issued without any client
-
-
- --oauth2-default-scopes
- Comma
separated list of default scopes
-
-
- --oauth2-encrypted-algorithm
- The
algorithm for the key for the encrypted provider
-
-
- --oauth2-encrypted-key
- The
key for encrypted provider
-
-
- --oauth2-invisible-scopes
- Comma
separated list of invisible to client scopes
-
-
- --oauth2-jcache-config
- JCache configuration uri for the cache manager (jcache or
provider)
-
-
- --oauth2-jcache-jmx
- Should JCache JMX MBeans be enabled
-
-
- --oauth2-jcache-loader
- The
loader bean or class name
-
-
- --oauth2-jcache-statistics
- Should JCache statistics be enabled
-
-
- --oauth2-jcache-store-jwt-token-key-only
- Should JCache store jwt token key only (jcache
provider)
-
-
- --oauth2-jcache-store-value
- Should JCache store value or not
-
-
- --oauth2-jcache-writer
- The
writer bean or class name
-
-
- --oauth2-jpa-database-driver
- JPA
database driver for jpa provider
-
-
- --oauth2-jpa-database-password
- JPA
database password for jpa provider
-
-
- --oauth2-jpa-database-url
- JPA
database url for jpa provider
-
-
- --oauth2-jpa-database-username
- JPA
database username for jpa provider
-
-
- --oauth2-jpa-max-active
- JPA
max active connections for jpa provider
-
-
- --oauth2-jpa-max-idle
- JPA
max idle connections for jpa provider
-
-
- --oauth2-jpa-max-wait
- JPA
max wait for connections for jpa provider
-
-
- --oauth2-jpa-properties
- JPA
persistence unit properties for jpa provider
-
-
- --oauth2-jpa-test-on-borrow
- should connections be tested on borrow for jpa
provider
-
-
- --oauth2-jpa-test-on-return
- should connections be tested on return for jpa
provider
-
-
- --oauth2-jpa-validation-interval
- validation interval for jpa provider
-
-
- --oauth2-jpa-validation-query
- validation query for jpa provider
-
-
- --oauth2-jwt-access-token-claim-map
- The
jwt claims configuration
-
-
- --oauth2-partial-match-scope-validation
- Is
partial match for scope validation activated
-
-
- --oauth2-provider
- Which
provider type to use: jcache[-code], jpa[-code], encrypted[-code]
-
-
- --oauth2-redirection-match-redirect-uri-with-application-uri
- For
authorization code flow, should redirect uri be matched with application
one
-
-
- --oauth2-redirection-max-default-session-interval
- For
authorization code flow, how long a session can be
-
-
- --oauth2-redirection-scopes-requiring-no-consent
- For
authorization code flow, the scopes using no consent
-
-
- --oauth2-redirection-use-registered-redirect-uri-if-possible
- For
authorization code flow, should the registered uri be used
-
-
- --oauth2-refresh-token
- Is
issuing of access token issuing a refreh token too
-
-
- --oauth2-refresh-token-lifetime
- How
long
svn commit: r1074083 [12/13] - in /websites/production/openwebbeans/content/meecrowave: ./ assets/css/ assets/plugins/ assets/plugins/elegant_font/css/ assets/plugins/font-awesome/css/ meecrowave-core
Added: websites/production/openwebbeans/content/meecrowave/meecrowave-proxy/index.pdf == --- websites/production/openwebbeans/content/meecrowave/meecrowave-proxy/index.pdf (added) +++ websites/production/openwebbeans/content/meecrowave/meecrowave-proxy/index.pdf Thu Apr 22 14:09:32 2021 @@ -0,0 +1,8271 @@ +%PDF-1.3 +% +1 0 obj +<< /Title (Meecrowave Proxy) +/Creator (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) +/Producer (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) +/ModDate (D:20210422160858+02'00') +/CreationDate (D:20210422160858+02'00') +>> +endobj +2 0 obj +<< /Type /Catalog +/Pages 3 0 R +/Names 12 0 R +/Outlines 26 0 R +/PageLabels 31 0 R +/PageMode /UseOutlines +/OpenAction [7 0 R /FitH 842.89] +/ViewerPreferences << /DisplayDocTitle true +>> +>> +endobj +3 0 obj +<< /Type /Pages +/Count 4 +/Kids [7 0 R 10 0 R 20 0 R 22 0 R] +>> +endobj +4 0 obj +<< /Length 2 +>> +stream +q + +endstream +endobj +5 0 obj +<< /Type /Page +/Parent 3 0 R +/MediaBox [0 0 595.28 841.89] +/CropBox [0 0 595.28 841.89] +/BleedBox [0 0 595.28 841.89] +/TrimBox [0 0 595.28 841.89] +/ArtBox [0 0 595.28 841.89] +/Contents 4 0 R +/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] +>> +>> +endobj +6 0 obj +<< /Length 174 +>> +stream +q +/DeviceRGB cs +0.6 0.6 0.6 scn +/DeviceRGB CS +0.6 0.6 0.6 SCN + +BT +300.341 361.6965 Td +/F1.0 27 Tf +<4d656563726f776176652050726f7879> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +Q + +endstream +endobj +7 0 obj +<< /Type /Page +/Parent 3 0 R +/MediaBox [0 0 595.28 841.89] +/CropBox [0 0 595.28 841.89] +/BleedBox [0 0 595.28 841.89] +/TrimBox [0 0 595.28 841.89] +/ArtBox [0 0 595.28 841.89] +/Contents 6 0 R +/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] +/Font << /F1.0 8 0 R +>> +>> +>> +endobj +8 0 obj +<< /Type /Font +/BaseFont /09ff1e+NotoSerif +/Subtype /TrueType +/FontDescriptor 33 0 R +/FirstChar 32 +/LastChar 255 +/Widths 35 0 R +/ToUnicode 34 0 R +>> +endobj +9 0 obj +<< /Length 17126 +>> +stream +q +/DeviceRGB cs +0.2 0.2 0.2 scn +/DeviceRGB CS +0.2 0.2 0.2 SCN + +BT +48.24 791.0774 Td +/F1.0 13 Tf +<436f6f7264696e617465733a> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +q +0.9608 0.9608 0.9608 scn +52.24 774.3529 m +543.04 774.3529 l +545.2491 774.3529 547.04 772.562 547.04 770.3529 c +547.04 682.6529 l +547.04 680.4437 545.2491 678.6529 543.04 678.6529 c +52.24 678.6529 l +50.0309 678.6529 48.24 680.4437 48.24 682.6529 c +48.24 770.3529 l +48.24 772.562 50.0309 774.3529 52.24 774.3529 c +h +f +0.8 0.8 0.8 SCN +0.75 w +52.24 774.3529 m +543.04 774.3529 l +545.2491 774.3529 547.04 772.562 547.04 770.3529 c +547.04 682.6529 l +547.04 680.4437 545.2491 678.6529 543.04 678.6529 c +52.24 678.6529 l +50.0309 678.6529 48.24 680.4437 48.24 682.6529 c +48.24 770.3529 l +48.24 772.562 50.0309 774.3529 52.24 774.3529 c +h +S +Q +0.1843 0.4353 0.6235 scn +0.1843 0.4353 0.6235 SCN + +BT +59.24 751.5279 Td +/F2.0 11 Tf +<3c646570656e64656e63793e> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +BT +59.24 736.7879 Td +/F2.0 11 Tf + Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.1843 0.4353 0.6235 scn +0.1843 0.4353 0.6235 SCN + +BT +70.24 736.7879 Td +/F2.0 11 Tf +<3c67726f757049643e> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +BT +119.74 736.7879 Td +/F2.0 11 Tf +<6f72672e6170616368652e6d656563726f77617665> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.1843 0.4353 0.6235 scn +0.1843 0.4353 0.6235 SCN + +BT +235.24 736.7879 Td +/F2.0 11 Tf +<3c2f67726f757049643e> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +BT +59.24 722.0479 Td +/F2.0 11 Tf + Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.1843 0.4353 0.6235 scn +0.1843 0.4353 0.6235 SCN + +BT +70.24 722.0479 Td +/F2.0 11 Tf +<3c617274696661637449643e> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +BT +136.24 722.0479 Td +/F2.0 11 Tf +<6d656563726f776176652d70726f7879> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.1843 0.4353 0.6235 scn +0.1843 0.4353 0.6235 SCN + +BT +224.24 722.0479 Td +/F2.0 11 Tf +<3c2f617274696661637449643e> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +BT +59.24 707.3079 Td +/F2.0 11 Tf + Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.1843 0.4353 0.6235 scn +0.1843 0.4353 0.6235 SCN + +BT +70.24 707.3079 Td +/F2.0 11 Tf +<3c76657273696f6e3e> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +BT +119.74 707.3079 Td +/F2.0 11 Tf +<247b6d656563726f776176652e76657273696f6e7d> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.1843 0.4353 0.6235 scn +0.1843 0.4353 0.6235 SCN + +BT +235.24 707.3079 Td +/F2.0 11 Tf +<3c2f76657273696f6e3e> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.1843 0.4353 0.6235 scn +0.1843 0.4353 0.6235 SCN + +BT +59.24 692.5679 Td +/F2.0 11 Tf +<3c2f646570656e64656e63793e> Tj +ET + +0.0 0.0 0.0
svn commit: r1074083 [9/13] - in /websites/production/openwebbeans/content/meecrowave: ./ assets/css/ assets/plugins/ assets/plugins/elegant_font/css/ assets/plugins/font-awesome/css/ meecrowave-core/
Added: websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf == --- websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf (added) +++ websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf Thu Apr 22 14:09:32 2021 @@ -0,0 +1,1061 @@ +%PDF-1.3 +% +1 0 obj +<< /Title (Meecrowave and webapps) +/Creator (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) +/Producer (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) +/ModDate (D:20210422160858+02'00') +/CreationDate (D:20210422160858+02'00') +>> +endobj +2 0 obj +<< /Type /Catalog +/Pages 3 0 R +/Names 12 0 R +/Outlines 23 0 R +/PageLabels 28 0 R +/PageMode /UseOutlines +/OpenAction [7 0 R /FitH 842.89] +/ViewerPreferences << /DisplayDocTitle true +>> +>> +endobj +3 0 obj +<< /Type /Pages +/Count 2 +/Kids [7 0 R 10 0 R] +>> +endobj +4 0 obj +<< /Length 2 +>> +stream +q + +endstream +endobj +5 0 obj +<< /Type /Page +/Parent 3 0 R +/MediaBox [0 0 595.28 841.89] +/CropBox [0 0 595.28 841.89] +/BleedBox [0 0 595.28 841.89] +/TrimBox [0 0 595.28 841.89] +/ArtBox [0 0 595.28 841.89] +/Contents 4 0 R +/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] +>> +>> +endobj +6 0 obj +<< /Length 185 +>> +stream +q +/DeviceRGB cs +0.6 0.6 0.6 scn +/DeviceRGB CS +0.6 0.6 0.6 SCN + +BT +204.95 361.6965 Td +/F1.0 27 Tf +<4d656563726f7761766520616e642077656261707073> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +Q + +endstream +endobj +7 0 obj +<< /Type /Page +/Parent 3 0 R +/MediaBox [0 0 595.28 841.89] +/CropBox [0 0 595.28 841.89] +/BleedBox [0 0 595.28 841.89] +/TrimBox [0 0 595.28 841.89] +/ArtBox [0 0 595.28 841.89] +/Contents 6 0 R +/Resources << /ProcSet [/PDF /Text /ImageB /ImageC /ImageI] +/Font << /F1.0 8 0 R +>> +>> +>> +endobj +8 0 obj +<< /Type /Font +/BaseFont /55867a+NotoSerif +/Subtype /TrueType +/FontDescriptor 30 0 R +/FirstChar 32 +/LastChar 255 +/Widths 32 0 R +/ToUnicode 31 0 R +>> +endobj +9 0 obj +<< /Length 8933 +>> +stream +q +/DeviceRGB cs +0.2 0.2 0.2 scn +/DeviceRGB CS +0.2 0.2 0.2 SCN + +2.9617 Tw + +BT +48.24 791.0774 Td +/F1.0 13 Tf +<4d656563726f77617665206973206120646576656c6f706d656e7420656e61626c657220616e642073696d706c6966696572207468616e6b7320746f2069747320636c61737370617468> Tj +ET + + +0.0 Tw +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +3.535 Tw + +BT +48.24 771.5403 Td +/F1.0 13 Tf +[<6465706c6f> 20.0195 <796d656e742e20486f7765766572206974206973207374696c6c206120706c61696e204170616368652054> 29.7852 <6f6d63617420616e6420796f752063616e206465706c6f> 20.0195 <79>] TJ +ET + + +0.0 Tw +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +BT +48.24 752.0031 Td +/F1.0 13 Tf +[<6578697374696e672077656261707020796f7520646576656c6f7065642077697468206e6f20706172746963756c617220636f6e737472> 20.0195 <61696e742e>] TJ +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +BT +48.24 723.3146 Td +/F1.0 10.5 Tf +<46726f6d206e6f77206f6e2c2077652077696c6c20617373756d6520796f752068617665206120536572766c6574206f7220537072696e672077656261707020> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.6941 0.1294 0.2745 scn +0.6941 0.1294 0.2745 SCN + +BT +386.571 723.3146 Td +/F2.0 10.5 Tf +<6d796170702e776172> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +BT +433.821 723.3146 Td +/F1.0 10.5 Tf +<2e> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +BT +48.24 679.2026 Td +/F3.0 22 Tf +[<4465706c6f> 20.0195 <796d656e7420776974682061204d656563726f776176652062756e646c65>] TJ +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +0.4118 Tw + +BT +48.24 650.0146 Td +/F1.0 10.5 Tf +<54686973207061727420617373756d656420796f75206275696c7420612062756e646c65207769746820> Tj +ET + + +0.0 Tw +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2588 0.5451 0.7922 scn +0.2588 0.5451 0.7922 SCN + +0.4118 Tw + +BT +265.2831 650.0146 Td +/F1.0 10.5 Tf +<4d656563726f77617665204d6176656e20506c7567696e> Tj +ET + + +0.0 Tw +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +0.4118 Tw + +BT +401.6617 650.0146 Td +/F1.0 10.5 Tf +<2e20497420676976657320796f752061207a697020776869636820686173> Tj +ET + + +0.0 Tw +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +BT +48.24 634.2346 Td +/F1.0 10.5 Tf +[<6120746f6d636174206c61> 20.0195 <796f7574206f6e6365206578706c6f6465643a>] TJ +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +q +0.9608 0.9608 0.9608 scn +52.24 618.4186 m +543.04 618.4186 l +545.2491 618.4186 547.04 616.6277 547.04 614.4186 c +547.04 526.7186 l +547.04 524.5094 545.2491 522.7186 543.04 522.7186 c +52.24 522.7186 l +50.0309 522.7186 48.24 524.5094 48.24 526.7186 c +48.24 614.4186 l +48.24 616.6277 50.0309 618.4186 52.24 618.4186 c +h +f +0.8 0.8 0.8 SCN +0.75 w +52.24 618.4186 m +543.04 618.4186 l +545.2491 618.4186 547.04
svn commit: r1074083 [4/13] - in /websites/production/openwebbeans/content/meecrowave: ./ assets/css/ assets/plugins/ assets/plugins/elegant_font/css/ assets/plugins/font-awesome/css/ meecrowave-core/
Modified: websites/production/openwebbeans/content/meecrowave/download.html == --- websites/production/openwebbeans/content/meecrowave/download.html (original) +++ websites/production/openwebbeans/content/meecrowave/download.html Thu Apr 22 14:09:32 2021 @@ -18,7 +18,7 @@ - + @@ -66,283 +66,415 @@ - - - - License under Apache License v2 (ALv2). - - - - - - - - - - - - - Name - Version - Date - Size - Type - Links - - - - - Meecrowave Source Release - 1.2.4 - 2018-09-21 09:14:38 - 1 MB 466 kB - zip - https://www.apache.org/dyn/closer.lua/openwebbeans/meecrowave/1.2.4/meecrowave-1.2.4-source-release.zip;> zip https://dist.apache.org/repos/dist/release/openwebbeans/meecrowave/1.2.4/meecrowave-1.2.4-source-release.zip.sha512;>sha512 https://dist.apache.org/repos/dist/release/openwebbeans/meecrowave/1.2.4/meecrowave-1.2.4-source-release.zip.asc;>asc - - - Meecrowave Core runner - 1.2.4 - 2018-09-21 09:16:03 - 9 MB 534 kB - jar - https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.4/meecrowave-core-1.2.4-runner.jar;> jar https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.4/meecrowave-core-1.2.4-runner.jar.sha1;>sha1 https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.4/meecrowave-core-1.2.4-runner.jar.asc;>asc - - - Meecrowave Core - 1.2.4 - 2018-09-21 09:15:51 - 202 kB - jar - https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.4/meecrowave-core-1.2.4.jar;> jar https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.4/meecrowave-core-1.2.4.jar.sha1;>sha1 https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.4/meecrowave-core-1.2.4.jar.asc;>asc - - - Meecrowave Source Release - 1.2.3 - 2018-07-19 09:53:16 - 1 MB 448 kB - zip - https://archive.apache.org/dist/openwebbeans/meecrowave/1.2.3/meecrowave-1.2.3-source-release.zip;> zip https://archive.apache.org/dist/openwebbeans/meecrowave/1.2.3/meecrowave-1.2.3-source-release.zip.sha512;>sha512 https://archive.apache.org/dist/openwebbeans/meecrowave/1.2.3/meecrowave-1.2.3-source-release.zip.asc;>asc - - - Meecrowave Core runner - 1.2.3 - 2018-07-19 09:54:34 - 10 MB 159 kB - jar - https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.3/meecrowave-core-1.2.3-runner.jar;> jar https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.3/meecrowave-core-1.2.3-runner.jar.sha1;>sha1 https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.3/meecrowave-core-1.2.3-runner.jar.asc;>asc - - - Meecrowave Core - 1.2.3 - 2018-07-19 09:54:20 - 199 kB - jar - https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.3/meecrowave-core-1.2.3.jar;> jar https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.3/meecrowave-core-1.2.3.jar.sha1;>sha1 https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.3/meecrowave-core-1.2.3.jar.asc;>asc - - - Meecrowave Source Release - 1.2.2 - 2018-07-14 07:14:12 - 1 MB 448 kB - zip - https://archive.apache.org/dist/openwebbeans/meecrowave/1.2.2/meecrowave-1.2.2-source-release.zip;> zip https://archive.apache.org/dist/openwebbeans/meecrowave/1.2.2/meecrowave-1.2.2-source-release.zip.sha1;>sha1 https://archive.apache.org/dist/openwebbeans/meecrowave/1.2.2/meecrowave-1.2.2-source-release.zip.asc;>asc - - - Meecrowave Core runner - 1.2.2 - 2018-07-14 07:15:41 - 10 MB 177 kB - jar - https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.2/meecrowave-core-1.2.2-runner.jar;> jar https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.2/meecrowave-core-1.2.2-runner.jar.sha1;>sha1 https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.2/meecrowave-core-1.2.2-runner.jar.asc;>asc - - - Meecrowave Core - 1.2.2 - 2018-07-14 07:15:27 - 199 kB - jar - https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.2/meecrowave-core-1.2.2.jar;> jar https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.2/meecrowave-core-1.2.2.jar.sha1;>sha1 https://repo.maven.apache.org/maven2/org/apache/meecrowave/meecrowave-core/1.2.2/meecrowave-core-1.2.2.jar.asc;>asc - - - Meecrowave Source Release - 1.2.1 - 2018-02-26 21:02:45 - 1 MB 425 kB -
svn commit: r1074083 [2/13] - in /websites/production/openwebbeans/content/meecrowave: ./ assets/css/ assets/plugins/ assets/plugins/elegant_font/css/ assets/plugins/font-awesome/css/ meecrowave-core/
Modified:
websites/production/openwebbeans/content/meecrowave/assets/plugins/jquery-1.12.3.min.js
==
---
websites/production/openwebbeans/content/meecrowave/assets/plugins/jquery-1.12.3.min.js
(original)
+++
websites/production/openwebbeans/content/meecrowave/assets/plugins/jquery-1.12.3.min.js
Thu Apr 22 14:09:32 2021
@@ -2,4 +2,4 @@
!function(a,b){"object"==typeof module&&"object"==typeof
module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw
new Error("jQuery requires a window with a document");return
b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var
c=[],d=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="1.12.3",n=function(a,b){return
new
n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return
b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return
e.call(this)},get:function(a){return
null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var
b=n.merge(this.constructor(),a);return
b.prevObject=this,b.context=this.context,b},each:function(a){return
n.each(this,a)},map:function(a){return
this.pushStack(n.map(this,function(b,c){return
a.call(b,c,b)}))},slice:function(){return this.pushStack(e.apply(thi
s,arguments))},first:function(){return this.eq(0)},last:function(){return
this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return
this.pushStack(c>=0&>c?[this[c]]:[])},end:function(){return
this.prevObject||this.constructor()},push:g,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var
a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof
g&&(j=g,g=arguments[h]||{},h++),"object"==typeof
g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d
in
e)a=g[d],c=e[d],g!==c&&(j&&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&(a)?a:[]):f=a&(a)?a:{},g[d]=n.extend(j,f,c)):void
0!==c&&(g[d]=c));return
g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw
new
Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return
null!=
a&==a.window},isNumeric:function(a){var
b=a&();return!n.isArray(a)&(b)+1>=0},isEmptyObject:function(a){var
b;for(b in a)return!1;return!0},isPlainObject:function(a){var
b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!k.call(a,"constructor")&&!k.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(!l.ownFirst)for(b
in a)return k.call(a,b);for(b in a);return void
0===b||k.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof
a||"function"==typeof a?i[j.call(a)]||"object":typeof
a},globalEval:function(b){b&(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return
a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return
a.nodeName&()===b.toLowerCase()},each:function(a,b){var
c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else
for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){retur
n null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return
null!=a&&(s(Object(a))?n.merge(c,"string"==typeof
a?[a]:a):g.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(h)return
h.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in
b&[c]===a)return c}return-1},merge:function(a,b){var
c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void
0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var
d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&(a[f]);return
e},map:function(a,b,c){var
d,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&(e);else
for(g in a)e=b(a[g],g,c),null!=e&(e);return
f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof
b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=e.call(arguments,2),d=function(){return
a.apply(b||this,c.concat(e.call(arguments)))},d.guid=a.guid=a.guid||n.guid++,d):void
0},now:function(){return+new Date},support:l}),"fu
nction"==typeof
Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number
String Function Array Date RegExp Object Error Symbol".split("
"),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var
b=!!a&&"length"in
a&,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"array"===c||0===b||"number"==typeof
b&>0& in a}var t=function(a){var
b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new
Date,v=a.document,w=0,x=0,y=ga(),z=ga(),A=ga(),B=function(a,b){return
a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var
svn commit: r1074083 [1/13] - in /websites/production/openwebbeans/content/meecrowave: ./ assets/css/ assets/plugins/ assets/plugins/elegant_font/css/ assets/plugins/font-awesome/css/ meecrowave-core/
Author: rmannibucau
Date: Thu Apr 22 14:09:32 2021
New Revision: 1074083
Log:
Site checkin for project Meecrowave :: Doc
Added:
websites/production/openwebbeans/content/meecrowave/howto.html
websites/production/openwebbeans/content/meecrowave/howto.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.html
websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-proxy/
websites/production/openwebbeans/content/meecrowave/meecrowave-proxy/index.html
websites/production/openwebbeans/content/meecrowave/meecrowave-proxy/index.pdf
Removed:
websites/production/openwebbeans/content/meecrowave/meecrowave-jolokia/
Modified:
websites/production/openwebbeans/content/meecrowave/assets/css/styles.css
websites/production/openwebbeans/content/meecrowave/assets/plugins/elegant_font/css/style.css
websites/production/openwebbeans/content/meecrowave/assets/plugins/font-awesome/css/font-awesome.min.css
websites/production/openwebbeans/content/meecrowave/assets/plugins/jquery-1.12.3.min.js
websites/production/openwebbeans/content/meecrowave/community.html
websites/production/openwebbeans/content/meecrowave/community.pdf
websites/production/openwebbeans/content/meecrowave/companion-projects.html
websites/production/openwebbeans/content/meecrowave/companion-projects.pdf
websites/production/openwebbeans/content/meecrowave/components.html
websites/production/openwebbeans/content/meecrowave/components.pdf
websites/production/openwebbeans/content/meecrowave/download.html
websites/production/openwebbeans/content/meecrowave/download.pdf
websites/production/openwebbeans/content/meecrowave/index.html
websites/production/openwebbeans/content/meecrowave/meecrowave-core/cli.html
websites/production/openwebbeans/content/meecrowave/meecrowave-core/cli.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-core/configuration.html
websites/production/openwebbeans/content/meecrowave/meecrowave-core/configuration.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-gradle/index.html
websites/production/openwebbeans/content/meecrowave/meecrowave-gradle/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-jpa/index.html
websites/production/openwebbeans/content/meecrowave/meecrowave-jpa/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-jta/index.html
websites/production/openwebbeans/content/meecrowave/meecrowave-jta/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-letsencrypt/index.html
websites/production/openwebbeans/content/meecrowave/meecrowave-letsencrypt/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-maven/index.html
websites/production/openwebbeans/content/meecrowave/meecrowave-maven/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-oauth2/index.html
websites/production/openwebbeans/content/meecrowave/meecrowave-oauth2/index.pdf
websites/production/openwebbeans/content/meecrowave/start.html
websites/production/openwebbeans/content/meecrowave/start.pdf
websites/production/openwebbeans/content/meecrowave/testing/index.html
websites/production/openwebbeans/content/meecrowave/testing/index.pdf
Modified:
websites/production/openwebbeans/content/meecrowave/assets/css/styles.css
==
--- websites/production/openwebbeans/content/meecrowave/assets/css/styles.css
(original)
+++ websites/production/openwebbeans/content/meecrowave/assets/css/styles.css
Thu Apr 22 14:09:32 2021
@@ -1260,4 +1260,4 @@ select {
pre {
padding: 0;
-}
+}
\ No newline at end of file
Modified:
websites/production/openwebbeans/content/meecrowave/assets/plugins/elegant_font/css/style.css
==
---
websites/production/openwebbeans/content/meecrowave/assets/plugins/elegant_font/css/style.css
(original)
+++
websites/production/openwebbeans/content/meecrowave/assets/plugins/elegant_font/css/style.css
Thu Apr 22 14:09:32 2021
@@ -1156,4 +1156,4 @@ text-shadow: none;
font-size: 2em;
}
-
+
\ No newline at end of file
Modified:
websites/production/openwebbeans/content/meecrowave/assets/plugins/font-awesome/css/font-awesome.min.css
==
---
websites/production/openwebbeans/content/meecrowave/assets/plugins/font-awesome/css/font-awesome.min.css
(original)
+++
websites/production/openwebbeans/content/meecrowave/assets/plugins/font-awesome/css/font-awesome.min.css
Thu Apr 22 14:09:32 2021
@@ -1,4 +1,4 @@
/*!
* Font Awesome 4.6.3 by @davegandy - http://fontawesome.io
[johnzon] branch master updated: [JOHNZON-340] ensure javax.websocket is properly shaded
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/johnzon.git The following commit(s) were added to refs/heads/master by this push: new 5820eba [JOHNZON-340] ensure javax.websocket is properly shaded 5820eba is described below commit 5820eba48518b07701951b03128e9cd9d18edd51 Author: Romain Manni-Bucau AuthorDate: Thu Apr 22 13:46:32 2021 +0200 [JOHNZON-340] ensure javax.websocket is properly shaded --- pom.xml | 4 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index 476b905..4d6987c 100644 --- a/pom.xml +++ b/pom.xml @@ -126,6 +126,10 @@ javax.json jakarta.json + +javax.websocket +jakarta.websocket +
[johnzon] branch master updated: [JOHNZON-340] add JSON-B support in websocket module
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/johnzon.git
The following commit(s) were added to refs/heads/master by this push:
new 73eb0fb [JOHNZON-340] add JSON-B support in websocket module
73eb0fb is described below
commit 73eb0fbaac15d837432ca6f6531c5e811ef918b1
Author: Romain Manni-Bucau
AuthorDate: Thu Apr 22 10:08:15 2021 +0200
[JOHNZON-340] add JSON-B support in websocket module
---
johnzon-websocket/pom.xml | 14
.../TypeAwareDecoder.java} | 43 ++-
.../lazy/LazySupplier.java}| 38 +-
.../websocket/internal/mapper/MapperLocator.java | 42 ++-
.../internal/mapper/MapperLocatorDelegate.java | 86 ++
.../servlet/IgnoreIfMissing.java} | 37 +-
.../JsonbLocator.java} | 31 ++--
.../websocket/jsonb/JsonbLocatorDelegate.java | 83 +
.../johnzon/websocket/jsonb/JsonbTextDecoder.java | 70 ++
.../JsonbTextEncoder.java} | 24 +++---
.../websocket/mapper/JohnzonTextDecoder.java | 10 +--
.../websocket/mapper/JohnzonTextEncoder.java | 6 +-
.../apache/johnzon/websocket/MapperCodecTest.java | 4 +-
src/site/markdown/index.md | 17 +
14 files changed, 354 insertions(+), 151 deletions(-)
diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml
index c73c2f1..7568633 100644
--- a/johnzon-websocket/pom.xml
+++ b/johnzon-websocket/pom.xml
@@ -49,9 +49,23 @@
+ org.apache.geronimo.specs
+ geronimo-jsonb_1.0_spec
+ provided
+
+
+
org.apache.johnzon
johnzon-mapper
${project.version}
+ provided
+ true
+
+
+ org.apache.johnzon
+ johnzon-jsonb
+ ${project.version}
+ test
diff --git
a/johnzon-websocket/src/main/java/org/apache/johnzon/websocket/mapper/JohnzonTextDecoder.java
b/johnzon-websocket/src/main/java/org/apache/johnzon/websocket/internal/TypeAwareDecoder.java
similarity index 74%
copy from
johnzon-websocket/src/main/java/org/apache/johnzon/websocket/mapper/JohnzonTextDecoder.java
copy to
johnzon-websocket/src/main/java/org/apache/johnzon/websocket/internal/TypeAwareDecoder.java
index 4530966..0e92215 100644
---
a/johnzon-websocket/src/main/java/org/apache/johnzon/websocket/mapper/JohnzonTextDecoder.java
+++
b/johnzon-websocket/src/main/java/org/apache/johnzon/websocket/internal/TypeAwareDecoder.java
@@ -16,51 +16,29 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.johnzon.websocket.mapper;
+package org.apache.johnzon.websocket.internal;
-import org.apache.johnzon.mapper.Mapper;
-import org.apache.johnzon.websocket.internal.mapper.MapperLocator;
-
-import java.io.Reader;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import javax.websocket.DecodeException;
-import javax.websocket.Decoder;
import javax.websocket.EndpointConfig;
import javax.websocket.OnMessage;
import javax.websocket.Session;
import javax.websocket.server.PathParam;
import javax.websocket.server.ServerEndpointConfig;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
-public class JohnzonTextDecoder implements Decoder.TextStream {
-protected Mapper mapper;
+public abstract class TypeAwareDecoder {
protected Type type;
-public JohnzonTextDecoder() {
+public TypeAwareDecoder() {
// no-op
}
-// for client side no way to guess the type so let the user provide it
easily
-public JohnzonTextDecoder(final Type type) {
-this(null, type);
-}
-
-public JohnzonTextDecoder(final Mapper mapper, final Type type) {
-this.mapper = mapper;
+public TypeAwareDecoder(final Type type) {
this.type = type;
}
-@Override
-public Object decode(final Reader stream) throws DecodeException {
-return mapper.readObject(stream, type);
-}
-
-@Override
-public void init(final EndpointConfig endpointConfig) {
-if (mapper == null) {
-mapper = MapperLocator.locate();
-}
+protected void init(final EndpointConfig endpointConfig) {
if (type != null) {
return;
}
@@ -102,9 +80,4 @@ public class JohnzonTextDecoder implements
Decoder.TextStream {
}
}
}
-
-@Override
-public void destroy() {
-// no-op
-}
}
diff --git
a/johnzon-websocket/src/main/java/org/apache/johnzon/websocket/mapper/JohnzonTextEncoder.java
b/johnzon-websocket/src/main/java/org/apache/johnzon/websocket/internal/lazy/LazySupplier.java
similarity index 53%
copy from
[openwebbeans-meecrowave] branch master updated: [MEECROWAVE-283] meecrowave-junit jakarta shade
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 b958795 [MEECROWAVE-283] meecrowave-junit jakarta shade
b958795 is described below
commit b958795964f67bc79cc9b5163c41ec475f52bd6a
Author: Romain Manni-Bucau
AuthorDate: Thu Apr 22 09:12:23 2021 +0200
[MEECROWAVE-283] meecrowave-junit jakarta shade
---
meecrowave-core/pom.xml | 1 -
meecrowave-junit/pom.xml | 96
pom.xml | 33 ++---
3 files changed, 116 insertions(+), 14 deletions(-)
diff --git a/meecrowave-core/pom.xml b/meecrowave-core/pom.xml
index 41ed427..bce57d1 100644
--- a/meecrowave-core/pom.xml
+++ b/meecrowave-core/pom.xml
@@ -389,7 +389,6 @@
org.apache.maven.plugins
maven-shade-plugin
-3.2.4
bundle
diff --git a/meecrowave-junit/pom.xml b/meecrowave-junit/pom.xml
index dbc80cd..af63c9a 100644
--- a/meecrowave-junit/pom.xml
+++ b/meecrowave-junit/pom.xml
@@ -95,6 +95,102 @@
+
+org.apache.maven.plugins
+maven-shade-plugin
+
+
+package
+
+ shade
+
+
+ true
+ jakarta
+ false
+
+
+ ${project.groupId}:${project.artifactId}
+
+
+
+
+ javax.activation
+ jakarta.activation
+
+
+ javax.annotation
+ jakarta.annotation
+
+
+ javax.el
+ jakarta.el
+
+
+ javax.enterprise
+ jakarta.enterprise
+
+
+ javax.decorator
+ jakarta.decorator
+
+
+ javax.inject
+ jakarta.inject
+
+
+ javax.interceptor
+ jakarta.interceptor
+
+
+ javax.servlet
+ jakarta.servlet
+
+
+ javax.transaction
+ jakarta.transaction
+
+
+ javax.validation
+ jakarta.validation
+
+
+ javax.persistence
+ jakarta.persistence
+
+
+ javax.faces
+ jakarta.faces
+
+
+ javax.ejb
+ jakarta.ejb
+
+
+ javax.ws
+ jakarta.ws
+
+
+ javax.cache
+ jakarta.cache
+
+
+ javax.jms
+ jakarta.jms
+
+
+ javax.json
+ jakarta.json
+
+
+ javax.resource
+ jakarta.resource
+
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index 5b40dbf..2845f69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,8 @@
specific language governing permissions and limitations
under the License.
-->
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="
http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation=" http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
4.0.0
@@ -151,6 +152,12 @@
org.apache.maven.plugins
+maven-shade-plugin
+3.2.4
+
+
+
+org.apache.maven.plugins
maven-jar-plugin
3.0.2
@@ -233,17 +240,17 @@
-
+
[openwebbeans-meecrowave] branch master updated: [MEECROWAVE-283] jakarta bundle of meecrowave-core
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 e56ab60 [MEECROWAVE-283] jakarta bundle of meecrowave-core e56ab60 is described below commit e56ab600f7b481fd1aa4c4b77876ca9660dd59b8 Author: Romain Manni-Bucau AuthorDate: Wed Apr 21 12:51:10 2021 +0200 [MEECROWAVE-283] jakarta bundle of meecrowave-core --- meecrowave-core/pom.xml | 122 +++ meecrowave-doc/src/main/jbake/content/start.adoc | 18 2 files changed, 140 insertions(+) diff --git a/meecrowave-core/pom.xml b/meecrowave-core/pom.xml index 040be53..41ed427 100644 --- a/meecrowave-core/pom.xml +++ b/meecrowave-core/pom.xml @@ -561,6 +561,128 @@ + +package + + shade + + + true + jakarta + false + + + + + org.apache.meecrowave.runner.Cli + + + META-INF/cxf/bus-extensions.txt + + + log4j2.component.properties + + + + + + org.apache.logging.log4j:log4j-api + +META-INF/versions/** + + + + *:* + +OSGI-INF/** +META-INF/cxf/cxf*.xml +META-INF/maven +META-INF/*.SF +META-INF/*.DSA +META-INF/*.RSA +META-INF/LICENSE.txt +META-INF/LICENSE +META-INF/NOTICE.txt +META-INF/NOTICE + + + + + + javax.activation + jakarta.activation + + + javax.annotation + jakarta.annotation + + + javax.el + jakarta.el + + + javax.enterprise + jakarta.enterprise + + + javax.decorator + jakarta.decorator + + + javax.inject + jakarta.inject + + + javax.interceptor + jakarta.interceptor + + + javax.servlet + jakarta.servlet + + + javax.transaction + jakarta.transaction + + + javax.validation + jakarta.validation + + + javax.persistence + jakarta.persistence + + + javax.faces + jakarta.faces + + + javax.ejb + jakarta.ejb + + + javax.ws + jakarta.ws + + + javax.cache + jakarta.cache + + + javax.jms + jakarta.jms + + + javax.json + jakarta.json + + + javax.resource + jakarta.resource + + + + diff --git a/meecrowave-doc/src/main/jbake/content/start.adoc b/meecrowave-doc/src/main/jbake/content/start.adoc index a348d0b..e30f0bb 100755 --- a/meecrowave-doc/src/main/jbake/content/start.adoc +++ b/meecrowave-doc/src/main/jbake/content/start.adoc @@ -32,6 +32,24 @@ If you intend to reuse our `Cli` main you should also add: +Finally, if you want to develop against `jakarta` namespace instead of `javax` one, you can use the all in one `jakarta` bundle: + +[source,xml] + + + org.apache.meecrowave + meecrowave-core + 1.2.11 + jakarta + + + * + * + + + + + === Runtime Meecrowave relies on JAX-RS and CDI so to start you just need to write a JAX-RS endpoint:
[openwebbeans-meecrowave] branch master updated: dropping cxf staging
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 eebbb7a dropping cxf staging eebbb7a is described below commit eebbb7a26350f9aa263015ea1250feed8de48a80 Author: Romain Manni-Bucau AuthorDate: Wed Apr 21 12:36:37 2021 +0200 dropping cxf staging --- pom.xml | 4 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index 2ae12e9..5b40dbf 100644 --- a/pom.xml +++ b/pom.xml @@ -245,9 +245,5 @@ --> - - cxf - https://repository.apache.org/content/repositories/orgapachecxf-1160 -
[johnzon] branch master updated: [JOHNZON-339] johnzon.rejectDuplicateKeys support
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/johnzon.git
The following commit(s) were added to refs/heads/master by this push:
new 6e33ee8 [JOHNZON-339] johnzon.rejectDuplicateKeys support
6e33ee8 is described below
commit 6e33ee81dae81166a18407dd32aa5c75fd6456d5
Author: Romain Manni-Bucau
AuthorDate: Tue Apr 6 20:07:44 2021 +0200
[JOHNZON-339] johnzon.rejectDuplicateKeys support
---
.../apache/johnzon/core/AbstractJsonFactory.java | 8 +--
.../apache/johnzon/core/JohnzonJsonParserImpl.java | 6 +-
.../apache/johnzon/core/JsonArrayBuilderImpl.java | 15 +++--
.../johnzon/core/JsonBuilderFactoryImpl.java | 38 ++--
.../apache/johnzon/core/JsonMergePatchDiff.java| 2 +-
.../apache/johnzon/core/JsonMergePatchImpl.java| 2 +-
.../apache/johnzon/core/JsonObjectBuilderImpl.java | 22 ---
.../org/apache/johnzon/core/JsonProviderImpl.java | 4 +-
.../apache/johnzon/core/JsonReaderFactoryImpl.java | 18 +++---
.../org/apache/johnzon/core/JsonReaderImpl.java| 22 ---
.../johnzon/core/RejectDuplicateKeysMode.java | 71 ++
.../johnzon/core/JsonObjectBuilderImplTest.java| 9 +++
.../apache/johnzon/core/JsonReaderImplTest.java| 10 +++
13 files changed, 165 insertions(+), 62 deletions(-)
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/AbstractJsonFactory.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/AbstractJsonFactory.java
index ded93e3..c851717 100644
---
a/johnzon-core/src/main/java/org/apache/johnzon/core/AbstractJsonFactory.java
+++
b/johnzon-core/src/main/java/org/apache/johnzon/core/AbstractJsonFactory.java
@@ -32,11 +32,11 @@ public abstract class AbstractJsonFactory implements
Serializable {
protected final Map internalConfig = new HashMap();
-protected AbstractJsonFactory(final Map config,
Collection supportedConfigKeys, Collection
defaultSupportedConfigKeys) {
-if(config != null && config.size() > 0) {
-
+protected AbstractJsonFactory(final Map config,
Collection supportedConfigKeys,
+ final Collection
defaultSupportedConfigKeys) {
+if(config != null && !config.isEmpty()) {
if(defaultSupportedConfigKeys != null) {
-supportedConfigKeys = new
ArrayList(supportedConfigKeys);
+supportedConfigKeys = new ArrayList<>(supportedConfigKeys);
supportedConfigKeys.addAll(defaultSupportedConfigKeys);
}
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/JohnzonJsonParserImpl.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/JohnzonJsonParserImpl.java
index cf64a36..6edde73 100644
---
a/johnzon-core/src/main/java/org/apache/johnzon/core/JohnzonJsonParserImpl.java
+++
b/johnzon-core/src/main/java/org/apache/johnzon/core/JohnzonJsonParserImpl.java
@@ -59,7 +59,7 @@ public abstract class JohnzonJsonParserImpl implements
JohnzonJsonParser {
throw new IllegalStateException(current + " doesn't support
getObject()");
}
-JsonReaderImpl jsonReader = new JsonReaderImpl(this, true,
getCharArrayProvider());
+JsonReaderImpl jsonReader = new JsonReaderImpl(this, true,
getCharArrayProvider(), RejectDuplicateKeysMode.DEFAULT);
return jsonReader.readObject();
}
@@ -71,7 +71,7 @@ public abstract class JohnzonJsonParserImpl implements
JohnzonJsonParser {
throw new IllegalStateException(current + " doesn't support
getArray()");
}
-JsonReaderImpl jsonReader = new JsonReaderImpl(this, true,
getCharArrayProvider());
+JsonReaderImpl jsonReader = new JsonReaderImpl(this, true,
getCharArrayProvider(), RejectDuplicateKeysMode.DEFAULT);
return jsonReader.readArray();
}
@@ -81,7 +81,7 @@ public abstract class JohnzonJsonParserImpl implements
JohnzonJsonParser {
switch (current) {
case START_ARRAY:
case START_OBJECT:
-JsonReaderImpl jsonReader = new JsonReaderImpl(this, true,
getCharArrayProvider());
+JsonReaderImpl jsonReader = new JsonReaderImpl(this, true,
getCharArrayProvider(), RejectDuplicateKeysMode.DEFAULT);
return jsonReader.readValue();
case VALUE_TRUE:
return JsonValue.TRUE;
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayBuilderImpl.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayBuilderImpl.java
index 5ea8c65..1ee44fc 100644
---
a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayBuilderImpl.java
+++
b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonArrayBuilderImpl.java
@@ -35,6 +35,7 @@ import java.util.Map;
import org.apache.johnzon.core.util.ArrayU
[maven] branch MNG-7134 updated (abd2858 -> 3a65353)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch MNG-7134 in repository https://gitbox.apache.org/repos/asf/maven.git. from abd2858 [MNG-7128] keep blocked attribute from mirrors in artifact repositories add 3a65353 adjusting @since No new revisions were added by this update. Summary of changes: .../java/org/apache/maven/artifact/repository/ArtifactRepository.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[maven] 05/05: [MNG-7128] keep blocked attribute from mirrors in artifact repositories
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch MNG-7134
in repository https://gitbox.apache.org/repos/asf/maven.git
commit abd28587994ac011754ca43657867bee18d04bf3
Author: Hervé Boutemy
AuthorDate: Thu Mar 25 23:51:26 2021 +0100
[MNG-7128] keep blocked attribute from mirrors in artifact repositories
---
.../maven/artifact/repository/ArtifactRepository.java | 6 ++
.../artifact/repository/DefaultArtifactRepository.java | 12
.../maven/repository/legacy/LegacyRepositorySystem.java| 5 +
.../src/main/java/org/apache/maven/RepositoryUtils.java| 1 +
.../artifact/repository/LegacyLocalRepositoryManager.java | 9 +
.../maven/artifact/repository/MavenArtifactRepository.java | 14 ++
.../org/apache/maven/bridge/MavenRepositorySystem.java | 5 +
7 files changed, 52 insertions(+)
diff --git
a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
index 0b33345..47839ea 100644
---
a/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
+++
b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
@@ -73,6 +73,12 @@ public interface ArtifactRepository
@Deprecated
void setBlacklisted( boolean blackListed );
+/** @since 3.8.1 **/
+boolean isBlocked();
+
+/** @since 3.8.1 **/
+void setBlocked( boolean blocked );
+
//
// New interface methods for the repository system.
//
diff --git
a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
index 16b82c5..ef487b8 100644
---
a/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
+++
b/maven-compat/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java
@@ -54,6 +54,8 @@ public class DefaultArtifactRepository
private List mirroredRepositories =
Collections.emptyList();
+private boolean blocked;
+
/**
* Create a local repository or a test repository.
*
@@ -264,4 +266,14 @@ public class DefaultArtifactRepository
}
}
+public boolean isBlocked()
+{
+return blocked;
+}
+
+public void setBlocked( boolean blocked )
+{
+this.blocked = blocked;
+}
+
}
diff --git
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
index e3e7781..fd62e6c 100644
---
a/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
+++
b/maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
@@ -446,6 +446,8 @@ public class LegacyRepositorySystem
effectiveRepository.setMirroredRepositories( mirroredRepos );
+effectiveRepository.setBlocked( aliasedRepo.isBlocked() );
+
effectiveRepositories.add( effectiveRepository );
}
@@ -502,6 +504,7 @@ public class LegacyRepositorySystem
mirror.setId( repo.getId() );
mirror.setUrl( repo.getUrl() );
mirror.setLayout( repo.getContentType() );
+mirror.setBlocked( repo.isBlocked() );
return mirror;
}
}
@@ -538,6 +541,8 @@ public class LegacyRepositorySystem
{
repository.setLayout( getLayout( mirror.getLayout() ) );
}
+
+repository.setBlocked( mirror.isBlocked() );
}
}
diff --git a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
index c1e21c4..80e5874 100644
--- a/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
+++ b/maven-core/src/main/java/org/apache/maven/RepositoryUtils.java
@@ -210,6 +210,7 @@ public class RepositoryUtils
builder.setAuthentication( toAuthentication(
repo.getAuthentication() ) );
builder.setProxy( toProxy( repo.getProxy() ) );
builder.setMirroredRepositories( toRepos(
repo.getMirroredRepositories() ) );
+builder.setBlocked( repo.isBlocked() );
result = builder.build();
}
return result;
diff --git
a/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
b/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
index 634b63c..acd7d5f 100644
---
a/maven-core/src/main/java/org/apache/maven/artifact/repository/LegacyLocalRepositoryManager.java
+++
b/maven-core/src/main/java/org
[maven] 04/05: [MNG-7117] add support for blocked mirror
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch MNG-7134
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 3e4565774efeb098e8cfbbd6ccb1838517474d4a
Author: Hervé Boutemy
AuthorDate: Sat Mar 13 18:00:59 2021 +0100
[MNG-7117] add support for blocked mirror
---
.../aether/DefaultRepositorySystemSessionFactory.java | 4 ++--
maven-settings/pom.xml | 2 +-
maven-settings/src/main/mdo/settings.mdo| 13 +
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git
a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
index 248a3b6..bda467c 100644
---
a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
+++
b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
@@ -177,8 +177,8 @@ public class DefaultRepositorySystemSessionFactory
DefaultMirrorSelector mirrorSelector = new DefaultMirrorSelector();
for ( Mirror mirror : request.getMirrors() )
{
-mirrorSelector.add( mirror.getId(), mirror.getUrl(),
mirror.getLayout(), false, mirror.getMirrorOf(),
-mirror.getMirrorOfLayouts() );
+mirrorSelector.add( mirror.getId(), mirror.getUrl(),
mirror.getLayout(), false, mirror.isBlocked(),
+mirror.getMirrorOf(),
mirror.getMirrorOfLayouts() );
}
session.setMirrorSelector( mirrorSelector );
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index 86a017c..ac21538 100644
--- a/maven-settings/pom.xml
+++ b/maven-settings/pom.xml
@@ -46,7 +46,7 @@ under the License.
org.codehaus.modello
modello-maven-plugin
- 1.1.0
+ 1.2.0
src/main/mdo/settings.mdo
diff --git a/maven-settings/src/main/mdo/settings.mdo
b/maven-settings/src/main/mdo/settings.mdo
index 333d8bd..b0498df 100644
--- a/maven-settings/src/main/mdo/settings.mdo
+++ b/maven-settings/src/main/mdo/settings.mdo
@@ -633,6 +633,15 @@
of the mirror to repositories with a matching layout (apart from a
matching id). Since Maven 3.
+
+ blocked
+ 1.2.0+
+ boolean
+ false
+
+Whether this mirror should be blocked from any download request
but fail the download process, explaining why.
+
+
@@ -648,6 +657,10 @@
sb.append( ",mirrorOf=" ).append( mirrorOf );
sb.append( ",url=" ).append( this.url );
sb.append( ",name=" ).append( this.name );
+if ( isBlocked() )
+{
+sb.append( ",blocked" );
+}
sb.append( "]" );
return sb.toString();
}
[maven] 01/05: [MNG-7119] Upgrade Maven Wagon to 3.4.3
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a commit to branch MNG-7134 in repository https://gitbox.apache.org/repos/asf/maven.git commit fa46195ab497263a7a12663274057b22b68d8281 Author: Michael Osipov AuthorDate: Tue Mar 16 18:22:04 2021 +0100 [MNG-7119] Upgrade Maven Wagon to 3.4.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a1a1ab8..15b3021 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ under the License. 3.2.1 4.2.1 0.3.4 -3.3.4 +3.4.3 1.12.1 1.4 1.7
[maven] 02/05: use Maven Resolver 1.6.2
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a commit to branch MNG-7134 in repository https://gitbox.apache.org/repos/asf/maven.git commit 0bb649314f3d3ab58800c9a20d2ea2a43d50d5ae Author: Hervé Boutemy AuthorDate: Sun Mar 14 20:52:42 2021 +0100 use Maven Resolver 1.6.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 15b3021..18d0ac9 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ under the License. 1.7 1.11 1.3 -1.4.1 +1.6.2 1.7.29 2.2.1 1.7.4
[maven] branch MNG-7134 created (now abd2858)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch MNG-7134 in repository https://gitbox.apache.org/repos/asf/maven.git. at abd2858 [MNG-7128] keep blocked attribute from mirrors in artifact repositories This branch includes the following new commits: new fa46195 [MNG-7119] Upgrade Maven Wagon to 3.4.3 new 0bb6493 use Maven Resolver 1.6.2 new ec02e31 [MNG-7116] add support for mirrorOf external:http:* new 3e45657 [MNG-7117] add support for blocked mirror new abd2858 [MNG-7128] keep blocked attribute from mirrors in artifact repositories The 5 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.
[maven] 03/05: [MNG-7116] add support for mirrorOf external:http:*
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch MNG-7134
in repository https://gitbox.apache.org/repos/asf/maven.git
commit ec02e31f5d457fcdb94731579fcd9554edd2
Author: Hervé Boutemy
AuthorDate: Sat Mar 13 18:40:48 2021 +0100
[MNG-7116] add support for mirrorOf external:http:*
---
.../maven/repository/DefaultMirrorSelector.java| 51 +++---
.../apache/maven/bridge/MavenRepositorySystem.java | 48 ++--
2 files changed, 89 insertions(+), 10 deletions(-)
diff --git
a/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
b/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
index 6fa2c55..adb562a 100644
---
a/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
+++
b/maven-compat/src/main/java/org/apache/maven/repository/DefaultMirrorSelector.java
@@ -41,6 +41,8 @@ public class DefaultMirrorSelector
private static final String EXTERNAL_WILDCARD = "external:*";
+private static final String EXTERNAL_HTTP_WILDCARD = "external:http:*";
+
public Mirror getMirror( ArtifactRepository repository, List
mirrors )
{
String repoId = repository.getId();
@@ -68,9 +70,14 @@ public class DefaultMirrorSelector
}
/**
- * This method checks if the pattern matches the originalRepository. Valid
patterns: * =
- * everything external:* = everything not on the localhost and not file
based. repo,repo1 = repo
- * or repo1 *,!repo1 = everything except repo1
+ * This method checks if the pattern matches the originalRepository. Valid
patterns:
+ *
+ * {@code *} = everything,
+ * {@code external:*} = everything not on the localhost and not file
based,
+ * {@code external:http:*} = any repository not on the localhost using
HTTP,
+ * {@code repo,repo1} = {@code repo} or {@code repo1},
+ * {@code *,!repo1} = everything except {@code repo1}.
+ *
*
* @param originalRepository to compare for a match.
* @param pattern used for match. Currently only '*' is supported.
@@ -115,6 +122,12 @@ public class DefaultMirrorSelector
result = true;
// don't stop processing in case a future segment
explicitly excludes this repo
}
+// check for external:http:*
+else if ( EXTERNAL_HTTP_WILDCARD.equals( repo ) &&
isExternalHttpRepo( originalRepository ) )
+{
+result = true;
+// don't stop processing in case a future segment
explicitly excludes this repo
+}
else if ( WILDCARD.equals( repo ) )
{
result = true;
@@ -136,8 +149,34 @@ public class DefaultMirrorSelector
try
{
URL url = new URL( originalRepository.getUrl() );
-return !( url.getHost().equals( "localhost" ) ||
url.getHost().equals( "127.0.0.1" )
-|| url.getProtocol().equals( "file" ) );
+return !( isLocal( url.getHost() ) || url.getProtocol().equals(
"file" ) );
+}
+catch ( MalformedURLException e )
+{
+// bad url just skip it here. It should have been validated
already, but the wagon lookup will deal with it
+return false;
+}
+}
+
+private static boolean isLocal( String host )
+{
+return "localhost".equals( host ) || "127.0.0.1".equals( host );
+}
+
+/**
+ * Checks the URL to see if this repository refers to a non-localhost
repository using HTTP.
+ *
+ * @param originalRepository
+ * @return true if external.
+ */
+static boolean isExternalHttpRepo( ArtifactRepository originalRepository )
+{
+try
+{
+URL url = new URL( originalRepository.getUrl() );
+return ( "http".equalsIgnoreCase( url.getProtocol() ) ||
"dav".equalsIgnoreCase( url.getProtocol() )
+|| "dav:http".equalsIgnoreCase( url.getProtocol() )
+|| "dav+http".equalsIgnoreCase( url.getProtocol() ) ) &&
!isLocal( url.getHost() );
}
catch ( MalformedURLException e )
{
@@ -146,7 +185,7 @@ public class DefaultMirrorSelector
}
}
-static boolean matchesLayout( ArtifactRepository repository, Mirror mirror
)
+ static boolean matchesLayout( ArtifactRepository repository, Mirror mirror )
{
return matchesLayout( RepositoryUtils.getLayout( repository ),
mirror.getMirrorOfLayouts() );
}
diff --git
a/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
b/maven-core/src/main/java/org/apache/maven/bridge/MavenRepositorySystem.java
index 730b42
[openjpa] branch master updated: [OPENJPA-2852] marking mojo as threadsafe
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/openjpa.git
The following commit(s) were added to refs/heads/master by this push:
new 9a96e0c [OPENJPA-2852] marking mojo as threadsafe
9a96e0c is described below
commit 9a96e0cd89ee9bac41a39d89388468a0774a519d
Author: Romain Manni-Bucau
AuthorDate: Wed Mar 31 10:18:21 2021 +0200
[OPENJPA-2852] marking mojo as threadsafe
---
.../main/java/org/apache/openjpa/tools/maven/OpenJpaEnhancerMojo.java | 3 ++-
.../main/java/org/apache/openjpa/tools/maven/OpenJpaSchemaMojo.java| 3 ++-
.../src/main/java/org/apache/openjpa/tools/maven/OpenJpaSqlMojo.java | 3 ++-
.../java/org/apache/openjpa/tools/maven/OpenJpaTestEnhancerMojo.java | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git
a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaEnhancerMojo.java
b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaEnhancerMojo.java
index cba95de..fc79dec 100644
---
a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaEnhancerMojo.java
+++
b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaEnhancerMojo.java
@@ -29,6 +29,7 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
* @version $Id: OpenJpaEnhancerMojo.java 10954 2009-10-23 22:05:45Z struberg $
* @since 1.0
*/
-@Mojo(name="enhance", defaultPhase=LifecyclePhase.PROCESS_CLASSES,
requiresDependencyResolution=ResolutionScope.COMPILE)
+@Mojo(name="enhance", defaultPhase=LifecyclePhase.PROCESS_CLASSES,
requiresDependencyResolution=ResolutionScope.COMPILE,
+threadSafe = true)
public class OpenJpaEnhancerMojo extends AbstractOpenJpaEnhancerMojo {
}
diff --git
a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaSchemaMojo.java
b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaSchemaMojo.java
index 186baff..857e22d 100644
---
a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaSchemaMojo.java
+++
b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaSchemaMojo.java
@@ -34,7 +34,8 @@ import org.apache.openjpa.lib.util.Options;
* @version $Id$
* @since 1.0
*/
-@Mojo(name="schema", defaultPhase=LifecyclePhase.PROCESS_CLASSES,
requiresDependencyResolution=ResolutionScope.COMPILE)
+@Mojo(name="schema", defaultPhase=LifecyclePhase.PROCESS_CLASSES,
requiresDependencyResolution=ResolutionScope.COMPILE,
+threadSafe = true)
public class OpenJpaSchemaMojo extends AbstractOpenJpaMappingToolMojo {
/**
diff --git
a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaSqlMojo.java
b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaSqlMojo.java
index 79c1fec..6907f31 100644
---
a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaSqlMojo.java
+++
b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaSqlMojo.java
@@ -34,7 +34,8 @@ import org.apache.openjpa.lib.util.Options;
* @version $Id$
* @since 1.0
*/
-@Mojo(name="sql", defaultPhase=LifecyclePhase.PROCESS_CLASSES,
requiresDependencyResolution=ResolutionScope.COMPILE)
+@Mojo(name="sql", defaultPhase=LifecyclePhase.PROCESS_CLASSES,
requiresDependencyResolution=ResolutionScope.COMPILE,
+threadSafe = true)
public class OpenJpaSqlMojo extends AbstractOpenJpaMappingToolMojo {
/**
diff --git
a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaTestEnhancerMojo.java
b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaTestEnhancerMojo.java
index 28d05e7..3a4e245 100644
---
a/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaTestEnhancerMojo.java
+++
b/openjpa-tools/openjpa-maven-plugin/src/main/java/org/apache/openjpa/tools/maven/OpenJpaTestEnhancerMojo.java
@@ -34,7 +34,7 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
* @since 1.1
*/
@Mojo(name="test-enhance", defaultPhase=LifecyclePhase.PROCESS_TEST_CLASSES,
- requiresDependencyResolution=ResolutionScope.TEST)
+ requiresDependencyResolution=ResolutionScope.TEST, threadSafe = true)
public class OpenJpaTestEnhancerMojo extends AbstractOpenJpaEnhancerMojo {
/**
[openwebbeans] branch master updated: [OWB-1382] specific handling for beanmanager observer injection (speed boost) from user report
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 3ad1739 [OWB-1382] specific handling for beanmanager observer
injection (speed boost) from user report
3ad1739 is described below
commit 3ad1739186c37c7b019b7e33a0a99cd6be73d563
Author: Romain Manni-Bucau
AuthorDate: Thu Mar 25 19:24:20 2021 +0100
[OWB-1382] specific handling for beanmanager observer injection (speed
boost) from user report
---
.../org/apache/webbeans/config/BeansDeployer.java | 2 +-
.../apache/webbeans/config/WebBeansContext.java| 18
.../apache/webbeans/event/ObserverMethodImpl.java | 50 ++
3 files changed, 50 insertions(+), 20 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 576335f..e29302e 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
@@ -232,7 +232,7 @@ public class BeansDeployer
}
// Register Manager built-in component
-
webBeansContext.getBeanManagerImpl().addInternalBean(webBeansContext.getWebBeansUtil().getManagerBean());
+
webBeansContext.getBeanManagerImpl().addInternalBean(webBeansContext.getBeanManagerBean());
// Register built-in RequestContextController
webBeansContext.getBeanManagerImpl().addInternalBean(webBeansContext.getWebBeansUtil().getRequestContextControllerBean());
webBeansContext.getInterceptorsManager().addCdiInterceptor(webBeansContext.getWebBeansUtil().getRequestContextInterceptorBean());
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 2504ed0..500fc8c 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
@@ -32,6 +32,7 @@ import java.util.logging.Level;
import org.apache.webbeans.annotation.AnnotationManager;
import org.apache.webbeans.container.BeanManagerImpl;
+import org.apache.webbeans.container.InjectableBeanManager;
import org.apache.webbeans.container.SerializableBeanVault;
import org.apache.webbeans.context.creational.CreationalContextFactory;
import org.apache.webbeans.conversation.ConversationManager;
@@ -71,6 +72,9 @@ import org.apache.webbeans.util.ClassUtil;
import org.apache.webbeans.util.WebBeansUtil;
import org.apache.webbeans.xml.DefaultBeanArchiveService;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+
/**
* This is the central point to manage the whole CDI container
* for a single application There is one WebBeansContext per BeanManagerImpl.
@@ -103,6 +107,8 @@ public class WebBeansContext
private final InterceptorUtil interceptorUtil = new InterceptorUtil(this);
private final SecurityService securityService;
private final LoaderService loaderService;
+private final InjectableBeanManager injectableBeanManager;
+private final Bean beanManagerBean;
private BeanArchiveService beanArchiveService;
private final InterceptorResolutionService interceptorResolutionService =
new InterceptorResolutionService(this);
private final DeploymentValidationService deploymentValidationService =
new DeploymentValidationService(this);
@@ -172,6 +178,18 @@ public class WebBeansContext
beanManagerImpl.getInjectionResolver().setFastMatching(!"false".equalsIgnoreCase(getOpenWebBeansConfiguration()
.getProperty(OpenWebBeansConfiguration.FAST_MATCHING)));
+injectableBeanManager = new InjectableBeanManager(beanManagerImpl);
+beanManagerBean = getWebBeansUtil().getManagerBean();
+}
+
+public Bean getBeanManagerBean()
+{
+return beanManagerBean;
+}
+
+public InjectableBeanManager getInjectableBeanManager()
+{
+return injectableBeanManager;
}
public static WebBeansContext getInstance()
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java
b/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java
index 7061714..cae44f4 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java
@@ -43,12 +43,14 @@ import javax.enterprise.event.TransactionPhase;
import javax.enterprise.inject.spi.AnnotatedMethod;
import javax.enterprise.inject.spi.AnnotatedParamete
[johnzon] branch master updated: [JOHNZON-338] ensure records don't have to be public to be deserialized
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/johnzon.git
The following commit(s) were added to refs/heads/master by this push:
new 194f02b [JOHNZON-338] ensure records don't have to be public to be
deserialized
194f02b is described below
commit 194f02bf87ad497ef90318e146f5d2615c1c625b
Author: Romain Manni-Bucau
AuthorDate: Thu Mar 25 10:18:40 2021 +0100
[JOHNZON-338] ensure records don't have to be public to be deserialized
---
.../src/main/java/org/apache/johnzon/jsonb/JsonbAccessMode.java | 2 +-
.../main/java/org/apache/johnzon/mapper/access/BaseAccessMode.java| 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JsonbAccessMode.java
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JsonbAccessMode.java
index 363f9b6..cc03e7b 100644
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JsonbAccessMode.java
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JsonbAccessMode.java
@@ -307,7 +307,7 @@ public class JsonbAccessMode implements AccessMode,
Closeable {
Stream.of(clazz.getDeclaredMethods()),
clazz.getSuperclass() == null || clazz.getSuperclass()
== Object.class || clazz.getSuperclass() == clazz ?
Stream.empty() :
-findPotentialFactoryMethods(clazz)));
+
findPotentialFactoryMethods(clazz.getSuperclass(;
}
private Factory methodFactory(final Class clazz, final Method
finalFactory,
diff --git
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/BaseAccessMode.java
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/BaseAccessMode.java
index 7bd011e..071af16 100644
---
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/BaseAccessMode.java
+++
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/access/BaseAccessMode.java
@@ -268,8 +268,8 @@ public abstract class BaseAccessMode implements AccessMode {
};
}
-private Constructor findRecordConstructor(Class clazz) {
-return Stream.of(clazz.getConstructors())
+private Constructor findRecordConstructor(final Class clazz) {
+return Stream.of(clazz.getDeclaredConstructors())
.max(comparing(Constructor::getParameterCount))
.map(c -> {
if (!c.isAccessible()) {
[openwebbeans-meecrowave] branch master updated: minor change to replace deprecated API by up to date ones
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 2508719 minor change to replace deprecated API by up to date ones
2508719 is described below
commit 2508719673a8dc75e8992b20e43aeca595d3a2a4
Author: Romain Manni-Bucau
AuthorDate: Tue Mar 23 20:30:03 2021 +0100
minor change to replace deprecated API by up to date ones
---
.../java/org/apache/meecrowave/Meecrowave.java | 92 +++---
.../meecrowave/johnzon/JohnzonBufferTest.java | 8 +-
.../apache/meecrowave/doc/generator/Downloads.java | 3 +-
.../letencrypt/LetsEncryptReloadLifecycle.java | 42 +-
.../meecrowave/maven/MeecrowaveBundleMojo.java | 67
5 files changed, 103 insertions(+), 109 deletions(-)
diff --git
a/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
b/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
index 450cd79..705567f 100644
--- a/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
+++ b/meecrowave-core/src/main/java/org/apache/meecrowave/Meecrowave.java
@@ -617,8 +617,8 @@ public class Meecrowave implements AutoCloseable {
if (tomcat.getRawConnector() == null && !configuration.isSkipHttp()) {
final Connector connector = createConnector();
connector.setPort(configuration.getHttpPort());
-if (connector.getAttribute("connectionTimeout") == null) {
-connector.setAttribute("connectionTimeout", "3000");
+if (connector.getProperty("connectionTimeout") == null) {
+connector.setProperty("connectionTimeout", "3000");
}
tomcat.getService().addConnector(connector);
@@ -636,7 +636,7 @@ public class Meecrowave implements AutoCloseable {
configuration.getProperties().setProperty("connector.sslhostconfig.sslProtocol",
configuration.getSslProtocol());
}
if
(configuration.getProperties().getProperty("connector.sslhostconfig.hostName")
!= null) {
-httpsConnector.setAttribute("defaultSSLHostConfigName",
configuration.getProperties().getProperty("connector.sslhostconfig.hostName"));
+httpsConnector.setProperty("defaultSSLHostConfigName",
configuration.getProperties().getProperty("connector.sslhostconfig.hostName"));
}
if (configuration.getKeystoreFile() != null) {
configuration.getProperties().setProperty("connector.sslhostconfig.certificateKeystoreFile",
configuration.getKeystoreFile());
@@ -646,7 +646,7 @@ public class Meecrowave implements AutoCloseable {
}
configuration.getProperties().setProperty("connector.sslhostconfig.certificateKeystoreType",
configuration.getKeystoreType());
if (configuration.getClientAuth() != null) {
-httpsConnector.setAttribute("clientAuth",
configuration.getClientAuth());
+httpsConnector.setProperty("clientAuth",
configuration.getClientAuth());
}
if (configuration.getKeyAlias() != null) {
@@ -683,7 +683,7 @@ public class Meecrowave implements AutoCloseable {
buildSslHostConfig.forEach(httpsConnector::addSslHostConfig);
if (configuration.getDefaultSSLHostConfigName() != null) {
-httpsConnector.setAttribute("defaultSSLHostConfigName",
configuration.getDefaultSSLHostConfigName());
+httpsConnector.setProperty("defaultSSLHostConfigName",
configuration.getDefaultSSLHostConfigName());
}
tomcat.getService().addConnector(httpsConnector);
if (configuration.isSkipHttp()) {
@@ -783,8 +783,8 @@ public class Meecrowave implements AutoCloseable {
String::equalsIgnoreCase : String::equals;
return certificate != null && !(new File(certificate).exists())
&& !equals.test(
-
Paths.get(System.getProperty("user.home")).resolve(".keystore").toAbsolutePath().normalize().toString(),
-
Paths.get(certificate).toAbsolutePath().normalize().toString());
+
Paths.get(System.getProperty("user.home")).resolve(".keystore").toAbsolutePath().normalize().toString(),
+
Paths.get(certificate).toAbsolutePath().normalize().toString());
}
private void copyCertificateToConfDir(String certificate) {
@@ -816,6 +816,7 @@ public class Meecrowave implements AutoCloseable {
/**
* Store away the current system p
[openwebbeans-meecrowave] branch master updated: [MEECROWAVE-282][MEECROWAVE-281] owb 2.0.22 and cxf 3.4.3
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 e95fe43 [MEECROWAVE-282][MEECROWAVE-281] owb 2.0.22 and cxf 3.4.3 e95fe43 is described below commit e95fe43b4cef32ef62f66ef22cc6265701ef6c37 Author: Romain Manni-Bucau AuthorDate: Sun Mar 21 18:48:25 2021 +0100 [MEECROWAVE-282][MEECROWAVE-281] owb 2.0.22 and cxf 3.4.3 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index eaa0903..2ae12e9 100644 --- a/pom.xml +++ b/pom.xml @@ -52,8 +52,8 @@ 4.13.1 9.0.44 -2.0.22-SNAPSHOT -3.4.2 +2.0.22 +3.4.3 1.2.8 2.14.0 1.8.2
[openwebbeans-meecrowave] branch master updated: mention in graalvm section how to disable log4j2 and tomcat scanning
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 5a70c4a mention in graalvm section how to disable log4j2 and tomcat scanning 5a70c4a is described below commit 5a70c4ac50c3c98d43d2209bf984828a1ccbbe1b Author: Romain Manni-Bucau AuthorDate: Sun Mar 21 18:45:50 2021 +0100 mention in graalvm section how to disable log4j2 and tomcat scanning --- meecrowave-doc/src/main/jbake/content/howto.adoc | 9 + 1 file changed, 9 insertions(+) diff --git a/meecrowave-doc/src/main/jbake/content/howto.adoc b/meecrowave-doc/src/main/jbake/content/howto.adoc index 6727668..2890ed7 100755 --- a/meecrowave-doc/src/main/jbake/content/howto.adoc +++ b/meecrowave-doc/src/main/jbake/content/howto.adoc @@ -691,6 +691,15 @@ In terms of dependencies you can start with this for example: +Last step is to disable log4j2 and tomcat scanning by default - indeed previous setup works if passed on the command line but since it is always the same settings it is saner to put them in a `meecrowave.properties` in the classpath: + +[source,properties] + +tomcat-scanning = false +logging-global-setup = false +log4j2-jul-bridge = false + + TIP: using a profile or a binary dedicated module you can keep the JVM mode using Log4j2 and the native mode using Yupiik Logging (just tweak dependencies and optionally use arthur exclude configuration). TIP: an Arthur knight can be developed to replace all that configuration, it will auto-setup meecrowave/cxf/tomcat needed reflection, scan present tomcat and cxf bundles, auto register CXF SPI (bus-extensions.txt - optionally filtering them and the not loadable ones) classes for reflection, spec classes (`org.apache.cxf.jaxrs.utils.InjectionUtils.STANDARD_CONTEXT_CLASSES`), and likely inherit from openwebbeans extension CDI integration.
svn commit: r1072582 - in /websites/production/openwebbeans/content/meecrowave: ./ meecrowave-core/ meecrowave-gradle/ meecrowave-jpa/ meecrowave-jta/ meecrowave-letsencrypt/ meecrowave-maven/ meecrow
Author: rmannibucau Date: Wed Mar 17 17:45:16 2021 New Revision: 1072582 Log: Site checkin for project Meecrowave :: Doc Modified: websites/production/openwebbeans/content/meecrowave/community.pdf websites/production/openwebbeans/content/meecrowave/companion-projects.pdf websites/production/openwebbeans/content/meecrowave/components.pdf websites/production/openwebbeans/content/meecrowave/download.pdf websites/production/openwebbeans/content/meecrowave/howto.html websites/production/openwebbeans/content/meecrowave/howto.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-core/cli.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-core/configuration.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-gradle/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-jpa/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-jta/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-letsencrypt/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-maven/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-oauth2/index.pdf websites/production/openwebbeans/content/meecrowave/meecrowave-proxy/index.pdf websites/production/openwebbeans/content/meecrowave/start.pdf websites/production/openwebbeans/content/meecrowave/testing/index.html websites/production/openwebbeans/content/meecrowave/testing/index.pdf Modified: websites/production/openwebbeans/content/meecrowave/community.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/companion-projects.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/components.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/download.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/howto.html == --- websites/production/openwebbeans/content/meecrowave/howto.html (original) +++ websites/production/openwebbeans/content/meecrowave/howto.html Wed Mar 17 17:45:16 2021 @@ -809,6 +809,16 @@ we use https://yupiik.github.io /dependencies + +Last step is to disable log4j2 and tomcat scanning by default - indeed previous setup works if passed on the command line but since it is always the same settings it is saner to put them in a meecrowave.properties in the classpath: + + + +tomcat-scanning = false +logging-global-setup = false +log4j2-jul-bridge = false + + Modified: websites/production/openwebbeans/content/meecrowave/howto.pdf == --- websites/production/openwebbeans/content/meecrowave/howto.pdf (original) +++ websites/production/openwebbeans/content/meecrowave/howto.pdf Wed Mar 17 17:45:16 2021 @@ -4,8 +4,8 @@ << /Title (Howto) /Creator (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) /Producer (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) -/ModDate (D:20210317183408+01'00') -/CreationDate (D:20210317183408+01'00') +/ModDate (D:20210317184443+01'00') +/CreationDate (D:20210317184443+01'00') >> endobj 2 0 obj @@ -25593,7 +25593,7 @@ endobj >> endobj 60 0 obj -<< /Length 16861 +<< /Length 17914 >> stream q @@ -26797,61 +26797,114 @@ ET 0.0 0.0 0.0 SCN 0.0 0.0 0.0 scn -q -0.5 w -0.9333 0.9333 0.9333 SCN -108.24 178.095 m -108.24 122.755 l -S -Q -0.0667 0.0667 0.0667 scn -0.0667 0.0667 0.0667 SCN +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +0.0616 Tw BT -71.388 141.857 Td -/F4.1 24 Tf -<21> Tj +48.24 166.131 Td +/F1.0 10.5 Tf +[<4c617374207374657020697320746f2064697361626c65206c6f67346a3220616e6420746f6d636174207363616e6e696e672062> 20.0195 <792064656661756c74202d20696e646565642070726576696f757320736574757020776f726b7320696620706173736564>] TJ ET + +0.0 Tw 0.0 0.0 0.0 SCN 0.0 0.0 0.0 scn 0.2 0.2 0.2 scn 0.2 0.2 0.2 SCN -1.5298 Tw +3.4279 Tw BT -120.24 162.131 Td +48.24 150.351 Td /F1.0 10.5 Tf -[<7573696e6720612070726f66696c65206f7220612062696e61727920646564696361746564206d6f64756c6520796f752063616e206b> 20.0195 <65657020746865204a564d206d6f6465207573696e67>] TJ +[<6f6e2074686520636f6d6d616e64206c696e65206275742073696e636520697420697320616c7761> 20.0195 <7973207468652073616d652073657474696e67732069742069
svn commit: r1072580 [3/4] - in /websites/production/openwebbeans/content/meecrowave: ./ meecrowave-core/ meecrowave-gradle/ meecrowave-jpa/ meecrowave-jta/ meecrowave-letsencrypt/ meecrowave-maven/ m
Modified: websites/production/openwebbeans/content/meecrowave/meecrowave-core/configuration.pdf == --- websites/production/openwebbeans/content/meecrowave/meecrowave-core/configuration.pdf (original) +++ websites/production/openwebbeans/content/meecrowave/meecrowave-core/configuration.pdf Wed Mar 17 17:35:01 2021 @@ -4,8 +4,8 @@ << /Title (Meecrowave Configuration) /Creator (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) /Producer (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) -/ModDate (D:20201115160336+01'00') -/CreationDate (D:20201115160336+01'00') +/ModDate (D:20210317183408+01'00') +/CreationDate (D:20210317183408+01'00') >> endobj 2 0 obj Modified: websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf == --- websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf (original) +++ websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf Wed Mar 17 17:35:01 2021 @@ -4,8 +4,8 @@ << /Title (Meecrowave and webapps) /Creator (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) /Producer (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) -/ModDate (D:20201115160336+01'00') -/CreationDate (D:20201115160336+01'00') +/ModDate (D:20210317183408+01'00') +/CreationDate (D:20210317183408+01'00') >> endobj 2 0 obj Modified: websites/production/openwebbeans/content/meecrowave/meecrowave-gradle/index.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/meecrowave-jpa/index.pdf == --- websites/production/openwebbeans/content/meecrowave/meecrowave-jpa/index.pdf (original) +++ websites/production/openwebbeans/content/meecrowave/meecrowave-jpa/index.pdf Wed Mar 17 17:35:01 2021 @@ -4,8 +4,8 @@ << /Title (Meecrowave JPA) /Creator (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) /Producer (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) -/ModDate (D:20201115160336+01'00') -/CreationDate (D:20201115160336+01'00') +/ModDate (D:20210317183408+01'00') +/CreationDate (D:20210317183408+01'00') >> endobj 2 0 obj Modified: websites/production/openwebbeans/content/meecrowave/meecrowave-jta/index.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/meecrowave-letsencrypt/index.pdf == Binary files - no diff available. Modified: websites/production/openwebbeans/content/meecrowave/meecrowave-maven/index.pdf == --- websites/production/openwebbeans/content/meecrowave/meecrowave-maven/index.pdf (original) +++ websites/production/openwebbeans/content/meecrowave/meecrowave-maven/index.pdf Wed Mar 17 17:35:01 2021 @@ -4,8 +4,8 @@ << /Title (Meecrowave Maven) /Creator (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) /Producer (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) -/ModDate (D:20201115160336+01'00') -/CreationDate (D:20201115160336+01'00') +/ModDate (D:20210317183408+01'00') +/CreationDate (D:20210317183408+01'00') >> endobj 2 0 obj Modified: websites/production/openwebbeans/content/meecrowave/meecrowave-oauth2/index.pdf == --- websites/production/openwebbeans/content/meecrowave/meecrowave-oauth2/index.pdf (original) +++ websites/production/openwebbeans/content/meecrowave/meecrowave-oauth2/index.pdf Wed Mar 17 17:35:01 2021 @@ -4,8 +4,8 @@ << /Title (Meecrowave OAuth2) /Creator (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) /Producer (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) -/ModDate (D:20201115160336+01'00') -/CreationDate (D:20201115160336+01'00') +/ModDate (D:20210317183408+01'00') +/CreationDate (D:20210317183408+01'00') >> endobj 2 0 obj Modified: websites/production/openwebbeans/content/meecrowave/meecrowave-proxy/index.pdf == --- websites/production/openwebbeans/content/meecrowave/meecrowave-proxy/index.pdf (original) +++ websites/production/openwebbeans/content/meecrowave/meecrowave-proxy/index.pdf Wed Mar 17 17:35:01 2021 @@ -4,8 +4,8 @@ << /Title (Meecrowave Proxy) /Creator (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) /Producer (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) -/ModDate (D:20201115160336+01'00') -/CreationDate (D:20201115160336+01'00') +/ModDate (D:20210317183408+01'00') +/CreationDate
svn commit: r1072580 [1/4] - in /websites/production/openwebbeans/content/meecrowave: ./ meecrowave-core/ meecrowave-gradle/ meecrowave-jpa/ meecrowave-jta/ meecrowave-letsencrypt/ meecrowave-maven/ m
Author: rmannibucau
Date: Wed Mar 17 17:35:01 2021
New Revision: 1072580
Log:
Site checkin for project Meecrowave :: Doc
Modified:
websites/production/openwebbeans/content/meecrowave/community.pdf
websites/production/openwebbeans/content/meecrowave/companion-projects.pdf
websites/production/openwebbeans/content/meecrowave/components.pdf
websites/production/openwebbeans/content/meecrowave/download.pdf
websites/production/openwebbeans/content/meecrowave/howto.html
websites/production/openwebbeans/content/meecrowave/howto.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-core/cli.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-core/configuration.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-core/deploy-webapp.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-gradle/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-jpa/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-jta/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-letsencrypt/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-maven/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-oauth2/index.pdf
websites/production/openwebbeans/content/meecrowave/meecrowave-proxy/index.pdf
websites/production/openwebbeans/content/meecrowave/start.pdf
websites/production/openwebbeans/content/meecrowave/testing/index.html
websites/production/openwebbeans/content/meecrowave/testing/index.pdf
Modified: websites/production/openwebbeans/content/meecrowave/community.pdf
==
Binary files - no diff available.
Modified:
websites/production/openwebbeans/content/meecrowave/companion-projects.pdf
==
Binary files - no diff available.
Modified: websites/production/openwebbeans/content/meecrowave/components.pdf
==
Binary files - no diff available.
Modified: websites/production/openwebbeans/content/meecrowave/download.pdf
==
Binary files - no diff available.
Modified: websites/production/openwebbeans/content/meecrowave/howto.html
==
--- websites/production/openwebbeans/content/meecrowave/howto.html (original)
+++ websites/production/openwebbeans/content/meecrowave/howto.html Wed Mar 17
17:35:01 2021
@@ -412,6 +412,481 @@ public class RewriteValveCustomizer impl
+
+How to compile
a Meecrowave application with GraalVM
+
+
+You can use native-image directly but for this how to, we will
use http://geronimo.apache.org/arthur/;>Apache Arthur which
enables to do it through Apache Maven.
+The trick is to define the Tomcat and Meecrowave resources to use to convert
the Java application in a native binary.
+For a simple application here is how it can be done.
+
+
+
+
+
+
+
+
+we use https://yupiik.github.io/yupiik-logging/;>Yupiik Logging
in this sample to replace Log4j2 which is not GraalVM friendly, this JUL
implementation enables runtime configuration even for Graalified binaries.
+
+
+
+
+
+
+plugin !-- mvn -Parthur arthur:native-image@runtime -e --
+ groupIdorg.apache.geronimo.arthur/groupId
+ artifactIdarthur-maven-plugin/artifactId
+ version${arthur.version}/version !-- = 1.0.3 or
replace openwebbeans extension by openwebbeans 2.0.22 dep + openwebbeans-knight
with arthur v1.0.2 --
+ executions
+execution
+ idgraalify/id
+ phasepackage/phase
+ goals
+goalnative-image/goal
+ /goals
+/execution
+ /executions
+ configuration
+graalVersion21.0.0.2.r11/graalVersion !-- use this
graal version (java 11 here) --
+mainorg.apache.meecrowave.runner.Cli/main !-- set up
meecrowave default main - requires commons-cli --
+buildStaticImagefalse/buildStaticImage !-- up to you
but using arthur docker goals it works fine and avoids some graalvm bugs --
+usePackagedArtifacttrue/usePackagedArtifact !--
optional but enables a more deterministic run generally --
+graalExtensions !-- enable CDI --
+ graalExtensionopenwebbeans/graalExtension
+/graalExtensions
+reflections !-- enable cxf/owb/tomcat main reflection points
--
+ reflection !-- used by meecrowave to test cxf presence --
+nameorg.apache.cxf.BusFactory/name
+ /reflection
+ reflection
+namejavax.ws.rs.core.UriInfo/name
+allPublicMethodstrue/allPublicMethods
+ /reflection
+ reflection
+namejavax.ws.rs.core.HttpHeaders/name
+allPublicMethodstrue/allPublicMethods
+ /reflection
+ reflection
+namejavax.ws.rs.core.Reques
svn commit: r1072580 [2/4] - in /websites/production/openwebbeans/content/meecrowave: ./ meecrowave-core/ meecrowave-gradle/ meecrowave-jpa/ meecrowave-jta/ meecrowave-letsencrypt/ meecrowave-maven/ m
Modified: websites/production/openwebbeans/content/meecrowave/howto.pdf == --- websites/production/openwebbeans/content/meecrowave/howto.pdf (original) +++ websites/production/openwebbeans/content/meecrowave/howto.pdf Wed Mar 17 17:35:01 2021 @@ -4,16 +4,16 @@ << /Title (Howto) /Creator (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) /Producer (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) -/ModDate (D:20201115160336+01'00') -/CreationDate (D:20201115160336+01'00') +/ModDate (D:20210317183408+01'00') +/CreationDate (D:20210317183408+01'00') >> endobj 2 0 obj << /Type /Catalog /Pages 3 0 R /Names 12 0 R -/Outlines 42 0 R -/PageLabels 50 0 R +/Outlines 67 0 R +/PageLabels 76 0 R /PageMode /UseOutlines /OpenAction [7 0 R /FitH 842.89] /ViewerPreferences << /DisplayDocTitle true @@ -22,8 +22,8 @@ endobj endobj 3 0 obj << /Type /Pages -/Count 8 -/Kids [7 0 R 10 0 R 19 0 R 23 0 R 25 0 R 30 0 R 32 0 R 37 0 R] +/Count 18 +/Kids [7 0 R 10 0 R 19 0 R 23 0 R 25 0 R 30 0 R 32 0 R 37 0 R 41 0 R 47 0 R 49 0 R 51 0 R 53 0 R 55 0 R 57 0 R 59 0 R 61 0 R 63 0 R] >> endobj 4 0 obj @@ -86,13 +86,13 @@ endobj endobj 8 0 obj << /Type /Font -/BaseFont /eed107+NotoSerif +/BaseFont /37ec33+NotoSerif /Subtype /TrueType -/FontDescriptor 52 0 R +/FontDescriptor 78 0 R /FirstChar 32 /LastChar 255 -/Widths 54 0 R -/ToUnicode 53 0 R +/Widths 80 0 R +/ToUnicode 79 0 R >> endobj 9 0 obj @@ -1050,7 +1050,7 @@ endobj /F1.0 8 0 R /F3.0 16 0 R >> -/XObject << /Stamp1 40 0 R +/XObject << /Stamp1 65 0 R >> >> >> @@ -1064,7 +1064,7 @@ endobj >> endobj 13 0 obj -<< /Names [(__anchor-top) 11 0 R (_how_to_add_a_filter_simple_case) 20 0 R (_how_to_add_a_rest_endpoint) 17 0 R (_how_to_add_a_servlet) 26 0 R (_how_to_add_a_valve) 33 0 R (_how_to_add_a_web_frontend) 39 0 R (_how_to_create_a_simple_maven_project_using_meecrowave) 14 0 R] +<< /Names [(__anchor-top) 11 0 R (_how_to_add_a_filter_simple_case) 20 0 R (_how_to_add_a_rest_endpoint) 17 0 R (_how_to_add_a_servlet) 26 0 R (_how_to_add_a_valve) 33 0 R (_how_to_add_a_web_frontend) 39 0 R (_how_to_compile_a_meecrowave_application_with_graalvm) 42 0 R (_how_to_create_a_simple_maven_project_using_meecrowave) 14 0 R] >> endobj 14 0 obj @@ -1072,24 +1072,24 @@ endobj endobj 15 0 obj << /Type /Font -/BaseFont /a10755+NotoSerif-Bold +/BaseFont /778825+NotoSerif-Bold /Subtype /TrueType -/FontDescriptor 56 0 R +/FontDescriptor 82 0 R /FirstChar 32 /LastChar 255 -/Widths 58 0 R -/ToUnicode 57 0 R +/Widths 84 0 R +/ToUnicode 83 0 R >> endobj 16 0 obj << /Type /Font -/BaseFont /c32258+mplus1mn-regular +/BaseFont /85c2fa+mplus1mn-regular /Subtype /TrueType -/FontDescriptor 60 0 R +/FontDescriptor 86 0 R /FirstChar 32 /LastChar 255 -/Widths 62 0 R -/ToUnicode 61 0 R +/Widths 88 0 R +/ToUnicode 87 0 R >> endobj 17 0 obj @@ -1928,7 +1928,7 @@ endobj /F2.0 15 0 R /F1.0 8 0 R >> -/XObject << /Stamp2 41 0 R +/XObject << /Stamp2 66 0 R >> >> /Annots [21 0 R] @@ -4571,7 +4571,7 @@ endobj /Font << /F3.0 16 0 R /F1.0 8 0 R >> -/XObject << /Stamp1 40 0 R +/XObject << /Stamp1 65 0 R >> >> >> @@ -5246,7 +5246,7 @@ endobj /F1.0 8 0 R /F3.0 16 0 R >> -/XObject << /Stamp2 41 0 R +/XObject << /Stamp2 66 0 R >> >> /Annots [27 0 R 28 0 R] @@ -7596,7 +7596,7 @@ endobj /Font << /F3.0 16 0 R /F1.0 8 0 R >> -/XObject << /Stamp1 40 0 R +/XObject << /Stamp1 65 0 R >> >> >> @@ -10636,7 +10636,7 @@ endobj /F2.0 15 0 R /F3.0 16 0 R >> -/XObject << /Stamp2 41 0 R +/XObject << /Stamp2 66 0 R >> >> /Annots [34 0 R 35 0 R] @@ -12223,7 +12223,7 @@ endobj /F1.0 8 0 R /F2.0 15 0 R >> -/XObject << /Stamp1 40 0 R +/XObject << /Stamp1 65 0 R >> >> /Annots [38 0 R] @@ -12244,375 +12244,16669 @@ endobj [37 0 R /XYZ 0 477.035 null] endobj 40 0 obj -<< /Type /XObject -/Subtype /Form -/BBox [0 0 595.28 841.89] -/Length 162 +<< /Length 20549 >> stream q /DeviceRGB cs -0.0 0.0 0.0 scn +0.2 0.2 0.2 scn /DeviceRGB CS +0.2 0.2 0.2 SCN + +BT +48.24 782.394 Td +/F2.0 22 Tf +<486f7720746f20636f6d70696c652061204d656563726f77617665206170706c69636174696f6e> Tj +ET + 0.0 0.0 0.0 SCN -1 w -0 J -0 j -[] 0 d +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +BT +48.24 752.474 Td +/F2.0 22 Tf +[<77697468204772> 20.0195 <61616c564d>] TJ +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +0.7372 Tw + +BT +48.24 723.286 Td +/F1.0 10.5 Tf +[<59> 69.8242 <6f752063616e2075736520>] TJ +ET + + +0.0 Tw +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.6941 0.1294 0.2745 scn +0.6941 0.1294 0.2745 SCN + +0.7372 Tw + +BT +112.0045 723.286 Td +/F3.0 10.5 Tf +<6e61746976652d696d616765> Tj +ET + + +0.0 Tw +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +0.7372 Tw + +BT +175.0045 723.286 Td +/F1.0 10.5 Tf +<206469726563746c792062757420666f72207468697320686f7720746f2c2077652077696c6c2075736520> Tj +ET + + +0.0 Tw +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn
svn commit: r1072580 [4/4] - in /websites/production/openwebbeans/content/meecrowave: ./ meecrowave-core/ meecrowave-gradle/ meecrowave-jpa/ meecrowave-jta/ meecrowave-letsencrypt/ meecrowave-maven/ m
Modified: websites/production/openwebbeans/content/meecrowave/testing/index.pdf == --- websites/production/openwebbeans/content/meecrowave/testing/index.pdf (original) +++ websites/production/openwebbeans/content/meecrowave/testing/index.pdf Wed Mar 17 17:35:01 2021 @@ -4,8 +4,8 @@ << /Title (Meecrowave Testing) /Creator (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) /Producer (Asciidoctor PDF 1.5.0.alpha.16, based on Prawn 2.2.2) -/ModDate (D:20201115160336+01'00') -/CreationDate (D:20201115160336+01'00') +/ModDate (D:20210317183408+01'00') +/CreationDate (D:20210317183408+01'00') >> endobj 2 0 obj @@ -86,7 +86,7 @@ endobj endobj 8 0 obj << /Type /Font -/BaseFont /0601d9+NotoSerif +/BaseFont /0a723d+NotoSerif /Subtype /TrueType /FontDescriptor 42 0 R /FirstChar 32 @@ -1290,7 +1290,7 @@ endobj endobj 16 0 obj << /Type /Font -/BaseFont /e290f9+mplus1mn-regular +/BaseFont /73193f+mplus1mn-regular /Subtype /TrueType /FontDescriptor 50 0 R /FirstChar 32 @@ -1303,7 +1303,7 @@ endobj [10 0 R /XYZ 0 614.95 null] endobj 18 0 obj -<< /Length 21967 +<< /Length 22445 >> stream q @@ -2138,10 +2138,10 @@ q 52.24 452.69 m 543.04 452.69 l 545.2491 452.69 547.04 450.8991 547.04 448.69 c -547.04 272.55 l -547.04 270.3409 545.2491 268.55 543.04 268.55 c -52.24 268.55 l -50.0309 268.55 48.24 270.3409 48.24 272.55 c +547.04 257.81 l +547.04 255.6009 545.2491 253.81 543.04 253.81 c +52.24 253.81 l +50.0309 253.81 48.24 255.6009 48.24 257.81 c 48.24 448.69 l 48.24 450.8991 50.0309 452.69 52.24 452.69 c h @@ -2151,10 +2151,10 @@ f 52.24 452.69 m 543.04 452.69 l 545.2491 452.69 547.04 450.8991 547.04 448.69 c -547.04 272.55 l -547.04 270.3409 545.2491 268.55 543.04 268.55 c -52.24 268.55 l -50.0309 268.55 48.24 270.3409 48.24 272.55 c +547.04 257.81 l +547.04 255.6009 545.2491 253.81 543.04 253.81 c +52.24 253.81 l +50.0309 253.81 48.24 255.6009 48.24 257.81 c 48.24 448.69 l 48.24 450.8991 50.0309 452.69 52.24 452.69 c h @@ -2193,11 +2193,55 @@ ET 0.0 0.0 0.0 SCN 0.0 0.0 0.0 scn +0.6 0.6 1.0 scn +0.6 0.6 1.0 SCN + +BT +59.24 415.125 Td +/F3.0 11 Tf +<4054657374496e7374616e6365> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +BT +130.74 415.125 Td +/F3.0 11 Tf +<28> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +BT +136.24 415.125 Td +/F3.0 11 Tf +<5045525f434c415353> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn +0.2 0.2 0.2 scn +0.2 0.2 0.2 SCN + +BT +185.74 415.125 Td +/F3.0 11 Tf +<29> Tj +ET + +0.0 0.0 0.0 SCN +0.0 0.0 0.0 scn 0.0 0.4 0.6 scn 0.0 0.4 0.6 SCN BT -59.24 415.125 Td +59.24 400.385 Td /F3.0 11 Tf <7075626c6963> Tj ET @@ -2208,7 +2252,7 @@ ET 0.2 0.2 0.2 SCN BT -92.24 415.125 Td +92.24 400.385 Td /F3.0 11 Tf <20> Tj ET @@ -2219,7 +2263,7 @@ ET 0.0 0.4667 0.5333 SCN BT -97.74 415.125 Td +97.74 400.385 Td /F3.0 11 Tf <636c617373> Tj ET @@ -2230,7 +2274,7 @@ ET 0.2 0.2 0.2 SCN BT -125.24 415.125 Td +125.24 400.385 Td /F3.0 11 Tf <20> Tj ET @@ -2241,7 +2285,7 @@ ET 0.0 0.6667 0.5333 SCN BT -130.74 415.125 Td +130.74 400.385 Td /F3.0 11 Tf <4d656563726f77617665436f6e66696754657374> Tj ET @@ -2252,7 +2296,7 @@ ET 0.2 0.2 0.2 SCN BT -240.74 415.125 Td +240.74 400.385 Td /F3.0 11 Tf <20> Tj ET @@ -2263,7 +2307,7 @@ ET 0.2 0.2 0.2 SCN BT -246.24 415.125 Td +246.24 400.385 Td /F3.0 11 Tf <7b> Tj ET @@ -2274,7 +2318,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 400.385 Td +59.24 385.645 Td /F3.0 11 Tf Tj ET @@ -2285,7 +2329,7 @@ ET 0.6 0.6 1.0 SCN BT -81.24 400.385 Td +81.24 385.645 Td /F3.0 11 Tf <40436f6e66696775726174696f6e496e6a656374> Tj ET @@ -2296,7 +2340,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 385.645 Td +59.24 370.905 Td /F3.0 11 Tf Tj ET @@ -2307,7 +2351,7 @@ ET 0.0 0.4 0.6 SCN BT -81.24 385.645 Td +81.24 370.905 Td /F3.0 11 Tf <70726976617465> Tj ET @@ -2318,7 +2362,7 @@ ET 0.2 0.2 0.2 SCN BT -119.74 385.645 Td +119.74 370.905 Td /F3.0 11 Tf <20> Tj ET @@ -2329,7 +2373,7 @@ ET 0.2 0.2 0.2 SCN BT -125.24 385.645 Td +125.24 370.905 Td /F3.0 11 Tf <4d656563726f77617665> Tj ET @@ -2340,7 +2384,7 @@ ET 0.2 0.2 0.2 SCN BT -180.24 385.645 Td +180.24 370.905 Td /F3.0 11 Tf <2e> Tj ET @@ -2351,7 +2395,7 @@ ET 0.2 0.2 0.2 SCN BT -185.74 385.645 Td +185.74 370.905 Td /F3.0 11 Tf <4275696c646572> Tj ET @@ -2362,7 +2406,7 @@ ET 0.2 0.2 0.2 SCN BT -224.24 385.645 Td +224.24 370.905 Td /F3.0 11 Tf <20> Tj ET @@ -2373,7 +2417,7 @@ ET 0.2 0.2 0.2 SCN BT -229.74 385.645 Td +229.74 370.905 Td /F3.0 11 Tf <636f6e666967> Tj ET @@ -2384,7 +2428,7 @@ ET 0.2 0.2 0.2 SCN BT -262.74 385.645 Td +262.74 370.905 Td /F3.0 11 Tf <3b> Tj ET @@ -2395,7 +2439,7 @@ ET 0.2 0.2 0.2 SCN BT -59.24 356.165 Td +59.24 341.425 Td /F3.0 11 Tf Tj ET @@ -2406,7 +2450,7 @@ ET 0.6 0.6 1.0 SCN BT -81.24 356.165 Td +81.24 341.425 Td /F3.0 11 Tf
[openwebbeans-meecrowave] branch master updated: basic graal integration - pre-arthur-knight
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 2c4ac61 basic graal integration - pre-arthur-knight
2c4ac61 is described below
commit 2c4ac6113fb318c3eff78f0af2ae5b4d57833b8d
Author: Romain Manni-Bucau
AuthorDate: Wed Mar 17 18:31:40 2021 +0100
basic graal integration - pre-arthur-knight
---
meecrowave-doc/src/main/jbake/content/howto.adoc | 416 +++
1 file changed, 416 insertions(+)
diff --git a/meecrowave-doc/src/main/jbake/content/howto.adoc
b/meecrowave-doc/src/main/jbake/content/howto.adoc
index 11c9285..6727668 100755
--- a/meecrowave-doc/src/main/jbake/content/howto.adoc
+++ b/meecrowave-doc/src/main/jbake/content/howto.adoc
@@ -306,3 +306,419 @@ You should add a element to the meecrowave
plugin configuration. Exampl
will add the content of the "dist" folder to your package and its files will
be available on the application root.
Note that your frontend will be served when executing the app (on a mvn
meecrowave:run or when running a packaged app). It will not be available during
unit tests.
+
+== How to compile a Meecrowave application with GraalVM
+
+You can use `native-image` directly but for this how to, we will use
link:http://geronimo.apache.org/arthur/[Apache Arthur] which enables to do it
through Apache Maven.
+The trick is to define the Tomcat and Meecrowave resources to use to convert
the Java application in a native binary.
+For a simple application here is how it can be done.
+
+TIP: we use link:https://yupiik.github.io/yupiik-logging/[Yupiik Logging] in
this sample to replace Log4j2 which is not GraalVM friendly, this JUL
implementation enables runtime configuration even for Graalified binaries.
+
+[source,xml]
+
+
+ org.apache.geronimo.arthur
+ arthur-maven-plugin
+ ${arthur.version}
+
+
+ graalify
+ package
+
+native-image
+
+
+
+
+21.0.0.2.r11
+org.apache.meecrowave.runner.Cli
+false
+true
+
+ openwebbeans
+
+
+
+org.apache.cxf.BusFactory
+
+
+javax.ws.rs.core.UriInfo
+true
+
+
+javax.ws.rs.core.HttpHeaders
+true
+
+
+javax.ws.rs.core.Request
+true
+
+
+javax.ws.rs.core.SecurityContext
+true
+
+
+javax.ws.rs.ext.Providers
+true
+
+
+javax.ws.rs.ext.ContextResolver
+true
+
+
+javax.servlet.http.HttpServletRequest
+true
+
+
+javax.servlet.http.HttpServletResponse
+true
+
+
+javax.ws.rs.core.Application
+true
+
+
+org.apache.meecrowave.cxf.JAXRSFieldInjectionInterceptor
+true
+true
+
+
+org.apache.cxf.bus.managers.CXFBusLifeCycleManager
+true
+
+
+org.apache.cxf.bus.managers.ClientLifeCycleManagerImpl
+true
+
+
+org.apache.cxf.bus.managers.EndpointResolverRegistryImpl
+true
+
+
+org.apache.cxf.bus.managers.HeaderManagerImpl
+true
+
+
+org.apache.cxf.bus.managers.PhaseManagerImpl
+true
+
+
+org.apache.cxf.bus.managers.ServerLifeCycleManagerImpl
+true
+
+
+org.apache.cxf.bus.managers.ServerRegistryImpl
+true
+
+
+org.apache.cxf.bus.managers.WorkQueueManagerImpl
+true
+
+
+org.apache.cxf.bus.resource.ResourceManagerImpl
+true
+
+
+org.apache.cxf.catalog.OASISCatalogManager
+true
+
+
+org.apache.cxf.common.spi.ClassLoaderProxyService
+true
+
+
+org.apache.cxf.common.util.ASMHelperImpl
+true
+
+
+org.apache.cxf.service.factory.FactoryBeanListenerManager
+true
+
+
+org.apache.cxf.transport.http.HTTPTransportFactory
+true
+
+
+org.apache.cxf.catalog.OASISCatalogManager
+true
+
+
+org.apache.cxf.endpoint.ClientLifeCycleManager
+true
+
+
+org.apache.cxf.buslifecycle.BusLifeCycleManager
+true
+
+
+org.apache.cxf.phase.PhaseManager
+true
+
+
+org.apache.cxf.resource.ResourceManager
+true
+
+
+org.apache.cxf.headers.HeaderManager
+true
+
+
+org.apache.cxf.common.util.ASMHelper
+true
+
+
+org.apache.cxf.common.spi.ClassLoaderService
+true
+
+
+org.apache.cxf.endpoint.EndpointResolv
[openwebbeans] branch master updated: [OWB-1380] ensure annotated mode works with prescanned scanner
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 67bf3ec [OWB-1380] ensure annotated mode works with prescanned scanner
67bf3ec is described below
commit 67bf3ec0019bed9e1d0871f5bee135e2b8486cd7
Author: Romain Manni-Bucau
AuthorDate: Wed Mar 17 15:28:34 2021 +0100
[OWB-1380] ensure annotated mode works with prescanned scanner
---
.../corespi/scanner/xbean/OwbAnnotationFinder.java | 14 ++
1 file changed, 14 insertions(+)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/OwbAnnotationFinder.java
b/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/OwbAnnotationFinder.java
index afd4e44..c3d358e 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/OwbAnnotationFinder.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/xbean/OwbAnnotationFinder.java
@@ -22,6 +22,7 @@ import org.apache.xbean.finder.AnnotationFinder;
import org.apache.xbean.finder.archive.Archive;
import org.apache.xbean.finder.archive.ClassesArchive;
+import java.lang.reflect.Field;
import java.util.stream.Stream;
/**
@@ -43,6 +44,19 @@ public class OwbAnnotationFinder extends AnnotationFinder
public OwbAnnotationFinder(final Class[] classes)
{
super(new ClassesArchive(/*empty since we want to read from
reflection, not from resources*/));
+try
+{
+final Field linking =
AnnotationFinder.class.getDeclaredField("linking");
+if (!linking.isAccessible())
+{
+linking.setAccessible(true);
+}
+linking.set(this, true);
+}
+catch (final Exception e)
+{
+// ignore, will not affect all cases
+}
Stream.of(classes).forEach(c -> super.readClassDef(c));
}
[openwebbeans-meecrowave] branch master updated (be521df -> ed56bb6)
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 be521df [MEECROWAVE-279] tomcat 9.0.44 new 37387f4 fix tests for owb upgrade new ed56bb6 [MEECROWAVE-280] enable to run without default scanner disabling features we can't support 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/tomcat/MeecrowaveContextConfig.java | 42 -- .../apache/meecrowave/tomcat/OWBJarScanner.java| 7 +++- .../java/org/apache/meecrowave/PrincipalTest.java | 2 +- 3 files changed, 30 insertions(+), 21 deletions(-)
[openwebbeans-meecrowave] 01/02: fix tests for owb upgrade
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 37387f473433183f206bd009f6c192951c5515a5
Author: Romain Manni-Bucau
AuthorDate: Wed Mar 17 11:04:47 2021 +0100
fix tests for owb upgrade
---
meecrowave-core/src/test/java/org/apache/meecrowave/PrincipalTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/meecrowave-core/src/test/java/org/apache/meecrowave/PrincipalTest.java
b/meecrowave-core/src/test/java/org/apache/meecrowave/PrincipalTest.java
index 8123971..06e5e40 100644
--- a/meecrowave-core/src/test/java/org/apache/meecrowave/PrincipalTest.java
+++ b/meecrowave-core/src/test/java/org/apache/meecrowave/PrincipalTest.java
@@ -57,7 +57,7 @@ public class PrincipalTest {
.addCollection("secured", "/*")))
.bake()) {
assertEquals(
-"org.apache.meecrowave.PrincipalTest$MyPrincipal_foo
org.apache.webbeans.custom.security.Principal_foo",
+"org.apache.meecrowave.PrincipalTest$MyPrincipal_foo
org.apache.webbeans.custom.Principal_foo",
slurp(new URL("http://localhost:; +
container.getConfiguration().getHttpPort() + "/api/test/principal")));
}
}
[openwebbeans-meecrowave] 02/02: [MEECROWAVE-280] enable to run without default scanner disabling features we can't support
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 ed56bb6e03d0d7bb015b7fc24f1a08299093f8d8
Author: Romain Manni-Bucau
AuthorDate: Wed Mar 17 11:06:10 2021 +0100
[MEECROWAVE-280] enable to run without default scanner disabling features
we can't support
---
.../meecrowave/tomcat/MeecrowaveContextConfig.java | 42 --
.../apache/meecrowave/tomcat/OWBJarScanner.java| 7 +++-
2 files changed, 29 insertions(+), 20 deletions(-)
diff --git
a/meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/MeecrowaveContextConfig.java
b/meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/MeecrowaveContextConfig.java
index ccbb43b..3b13595 100644
---
a/meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/MeecrowaveContextConfig.java
+++
b/meecrowave-core/src/main/java/org/apache/meecrowave/tomcat/MeecrowaveContextConfig.java
@@ -58,6 +58,7 @@ import org.apache.tomcat.util.descriptor.web.WebXml;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.corespi.scanner.xbean.CdiArchive;
import org.apache.webbeans.corespi.scanner.xbean.OwbAnnotationFinder;
+import org.apache.webbeans.spi.ScannerService;
import org.xml.sax.InputSource;
public class MeecrowaveContextConfig extends ContextConfig {
@@ -103,26 +104,29 @@ public class MeecrowaveContextConfig extends
ContextConfig {
final ClassLoader old = thread.getContextClassLoader();
thread.setContextClassLoader(loader);
try {
-final OWBTomcatWebScannerService scannerService =
OWBTomcatWebScannerService.class.cast(WebBeansContext.getInstance().getScannerService());
-
scannerService.setFilter(ofNullable(context.getJarScanner()).map(JarScanner::getJarScanFilter).orElse(null),
context.getServletContext());
-scannerService.setDocBase(context.getDocBase());
-scannerService.setShared(configuration.getSharedLibraries());
-if (configuration.getWatcherBouncing() > 0) { // note that caching
should be disabled with this config in most of the times
-watcher = new ReloadOnChangeController(context,
configuration.getWatcherBouncing());
-scannerService.setFileVisitor(f -> watcher.register(f));
+final ScannerService service =
WebBeansContext.getInstance().getScannerService();
+if (OWBTomcatWebScannerService.class.isInstance(service)) {
+final OWBTomcatWebScannerService scannerService =
OWBTomcatWebScannerService.class.cast(service);
+
scannerService.setFilter(ofNullable(context.getJarScanner()).map(JarScanner::getJarScanFilter).orElse(null),
context.getServletContext());
+scannerService.setDocBase(context.getDocBase());
+scannerService.setShared(configuration.getSharedLibraries());
+if (configuration.getWatcherBouncing() > 0) { // note that
caching should be disabled with this config in most of the times
+watcher = new ReloadOnChangeController(context,
configuration.getWatcherBouncing());
+scannerService.setFileVisitor(f -> watcher.register(f));
+}
+scannerService.scan();
+finder = scannerService.getFinder();
+finder.link();
+final CdiArchive archive =
CdiArchive.class.cast(finder.getArchive());
+Stream.of(WebServlet.class, WebFilter.class, WebListener.class)
+.forEach(marker ->
finder.findAnnotatedClasses(marker).stream()
+.filter(c ->
!Modifier.isAbstract(c.getModifiers()) && Modifier.isPublic(c.getModifiers()))
+.forEach(webComponent ->
webClasses.computeIfAbsent(
+
archive.classesByUrl().entrySet().stream()
+.filter(e ->
e.getValue().getClassNames().contains(webComponent.getName()))
+.findFirst().get().getKey(), k
-> new HashSet<>())
+.add(webComponent)));
}
-scannerService.scan();
-finder = scannerService.getFinder();
-finder.link();
-final CdiArchive archive =
CdiArchive.class.cast(finder.getArchive());
-Stream.of(WebServlet.class, WebFilter.class, WebListener.class)
-.forEach(marker ->
finder.findAnnotatedClasses(marker).stream()
-.filter(c ->
!Modifier.isAbstract(c.getModifiers()) && Modifier.isPublic(c.getModifiers()))
-.forEach(webComponent ->
webClasses.computeIfAbsent(
-
[openwebbeans] branch master updated: upgrading jakarta tck to 3.0.1
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 6462af4 upgrading jakarta tck to 3.0.1 6462af4 is described below commit 6462af4d11e488c67eb6b65f434336e0971e1035 Author: Romain Manni-Bucau AuthorDate: Wed Mar 17 09:04:58 2021 +0100 upgrading jakarta tck to 3.0.1 --- webbeans-tck-jakarta/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webbeans-tck-jakarta/pom.xml b/webbeans-tck-jakarta/pom.xml index c8d021b..cab50a1 100644 --- a/webbeans-tck-jakarta/pom.xml +++ b/webbeans-tck-jakarta/pom.xml @@ -165,7 +165,7 @@ jakarta.enterprise cdi-tck-impl - 3.0.0-M3 + 3.0.1 jakarta.enterprise
[openwebbeans] branch master updated: trying to optimize defineClass lookup strategies
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 e51e11e trying to optimize defineClass lookup strategies
e51e11e is described below
commit e51e11e61d99ef998f985623017dddb4893e203d
Author: Romain Manni-Bucau
AuthorDate: Tue Mar 16 11:41:25 2021 +0100
trying to optimize defineClass lookup strategies
---
pom.xml| 2 +
.../java/org/apache/webbeans/proxy/Unsafe.java | 244 -
2 files changed, 144 insertions(+), 102 deletions(-)
diff --git a/pom.xml b/pom.xml
index 77503e5..1be053d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -476,6 +476,7 @@
**/*TestCase.java
**/*Tests*.java
+false
@@ -507,6 +508,7 @@
openwebbeans/owb-checks-default.xml
openwebbeans/owb-header.txt
true
+**/Unsafe*
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/Unsafe.java
b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/Unsafe.java
index 7ba6d20..724002e 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/Unsafe.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/Unsafe.java
@@ -48,7 +48,7 @@ public class Unsafe
private final AtomicReference unsafeDefineClass = new
AtomicReference<>();
// defineClass method on ClassLoader
-private volatile boolean useDefineClassMethod = true;
+private volatile byte defineClassImpl = 0; // 0 = unset, 1 = classloader,
2 = lookup, 3 = unsafe (unlikely on all jvm)
private volatile Method defineClassMethod = null;
// java 16
@@ -146,131 +146,171 @@ public class Unsafe
Class parent)
throws ProxyGenerationException
{
-
-if (defineClassMethod == null && useDefineClassMethod)
-{
-Method defineClassMethodTmp = null;
-try
-{
-// defineClass is a final method on the abstract base
ClassLoader
-// thus we need to cache it only once
-defineClassMethodTmp =
ClassLoader.class.getDeclaredMethod("defineClass", String.class, byte[].class,
int.class, int.class);
-}
-catch (NoSuchMethodException e)
-{
-// all fine, we just skip over from here
-}
-
-
-if (defineClassMethodTmp == null)
-{
-// This ClassLoader does not have any accessible defineClass
method
-useDefineClassMethod = false;
-}
-else if (!defineClassMethodTmp.isAccessible())
-{
-try
-{
-defineClassMethodTmp.setAccessible(true);
-}
-catch (RuntimeException re)
-{
-// likely j9 or not accessible via security, let's use
unsafe or MethodHandle as fallbacks
-defineClassMethodTmp = null;
-useDefineClassMethod = false;
-}
-}
-
-defineClassMethod = defineClassMethodTmp;
-}
-
+Class definedClass = null;
try
{
-Class definedClass;
-
-if (defineClassMethod != null)
-{
-definedClass = (Class)
defineClassMethod.invoke(classLoader, proxyName, proxyBytes, 0,
proxyBytes.length);
-useDefineClassMethod = Boolean.TRUE;
-}
-else
-{
-definedClass = (Class)
unsafeDefineClass().invoke(internalUnsafe, proxyName, proxyBytes, 0,
proxyBytes.length, classLoader, null);
-}
-
-return (Class) Class.forName(definedClass.getName(), true,
classLoader);
-}
-catch (InvocationTargetException le) // if concurrent calls are done
then ensure to just reload the created one
-{
-if (LinkageError.class.isInstance(le.getCause()))
-{
-try
-{
-return (Class) Class.forName(proxyName.replace('/',
'.'), true, classLoader);
-}
-catch (ClassNotFoundException e)
+// CHECKSTYLE:OFF
+switch (defineClassImpl) {
+case 0: // unset
+case 1: // classloader
{
-// default error handling
+if (defineClassMethod == null)
+{
+Method defineClassMethodTmp;
+
[openwebbeans] branch master updated: [OWB-1378] enable to bypass application scoped lifecycle events in SE mode if org.apache.webbeans.lifecycle.standalone.fireApplicationScopeEvents=false
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 8c2215c [OWB-1378] enable to bypass application scoped lifecycle
events in SE mode if
org.apache.webbeans.lifecycle.standalone.fireApplicationScopeEvents=false
8c2215c is described below
commit 8c2215c5782449d48ec97e629c610e5475a1a976
Author: Romain Manni-Bucau
AuthorDate: Mon Mar 15 20:53:33 2021 +0100
[OWB-1378] enable to bypass application scoped lifecycle events in SE mode
if org.apache.webbeans.lifecycle.standalone.fireApplicationScopeEvents=false
---
.../webbeans/corespi/se/BaseSeContextsService.java | 27 +-
.../webbeans/lifecycle/StandaloneLifeCycle.java| 13 +++
2 files changed, 30 insertions(+), 10 deletions(-)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/BaseSeContextsService.java
b/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/BaseSeContextsService.java
index 9bd65cb..3df8f18 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/BaseSeContextsService.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/BaseSeContextsService.java
@@ -355,26 +355,41 @@ public abstract class BaseSeContextsService extends
AbstractContextsService
{
createSingletonContext();
-webBeansContext.getBeanManagerImpl().fireContextLifecyleEvent(
-new Object(), InitializedLiteral.INSTANCE_SINGLETON_SCOPED);
+if (fireApplicationScopeEvents())
+{
+webBeansContext.getBeanManagerImpl().fireContextLifecyleEvent(
+new Object(),
InitializedLiteral.INSTANCE_SINGLETON_SCOPED);
+}
}
private void stopApplicationContext()
{
if(applicationContext != null && !applicationContext.isDestroyed())
{
-webBeansContext.getBeanManagerImpl().fireContextLifecyleEvent(
-new Object(),
BeforeDestroyedLiteral.INSTANCE_APPLICATION_SCOPED);
+final boolean fireApplicationScopeEvents =
fireApplicationScopeEvents();
+if (fireApplicationScopeEvents)
+{
+webBeansContext.getBeanManagerImpl().fireContextLifecyleEvent(
+new Object(),
BeforeDestroyedLiteral.INSTANCE_APPLICATION_SCOPED);
+}
applicationContext.destroy();
// this is needed to get rid of ApplicationScoped beans which are
cached inside the proxies...
WebBeansContext.currentInstance().getBeanManagerImpl().clearCacheProxies();
-webBeansContext.getBeanManagerImpl().fireContextLifecyleEvent(
-new Object(), DestroyedLiteral.INSTANCE_APPLICATION_SCOPED);
+if (fireApplicationScopeEvents)
+{
+webBeansContext.getBeanManagerImpl().fireContextLifecyleEvent(
+new Object(),
DestroyedLiteral.INSTANCE_APPLICATION_SCOPED);
+}
}
}
+public boolean fireApplicationScopeEvents()
+{
+return
Boolean.parseBoolean(webBeansContext.getOpenWebBeansConfiguration()
+
.getProperty("org.apache.webbeans.lifecycle.standalone.fireApplicationScopeEvents",
"true"));
+}
private void stopConversationContext()
{
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java
b/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java
index 8d90fbf..cfb6e73 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/StandaloneLifeCycle.java
@@ -28,6 +28,7 @@ import java.util.logging.Logger;
import org.apache.webbeans.annotation.InitializedLiteral;
import org.apache.webbeans.config.WebBeansFinder;
+import org.apache.webbeans.corespi.se.BaseSeContextsService;
import org.apache.webbeans.el.ELContextStore;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
import org.apache.webbeans.util.WebBeansUtil;
@@ -58,10 +59,14 @@ public class StandaloneLifeCycle extends AbstractLifeCycle
@Override
protected void afterStartApplication(Object startupObject)
{
-// the ApplicationContext is already started, but we fire
-// the event again as the userland beans are only available now
-webBeansContext.getBeanManagerImpl().fireContextLifecyleEvent(
-new Object(), InitializedLiteral.INSTANCE_APPLICATION_SCOPED);
+if
(!BaseSeContextsService.class.isInstance(webBeansContext.getContextsService())
||
+
BaseSeContextsService.class.cast(webBeansContext.getContextsService()).fireApplicationScopeEvents())
+{
+// the ApplicationContex
[openwebbeans] branch master updated: [OWB-1377][OWB-1375] enable to configure reserved packages for proxies + handle org.apache.webbeans.custom.signed. as org.apache.webbeans.custom.
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 2f54115 [OWB-1377][OWB-1375] enable to configure reserved packages
for proxies + handle org.apache.webbeans.custom.signed. as
org.apache.webbeans.custom.
2f54115 is described below
commit 2f54115c404e40aefd390168f511511649423cc1
Author: Romain Manni-Bucau
AuthorDate: Mon Mar 15 17:25:17 2021 +0100
[OWB-1377][OWB-1375] enable to configure reserved packages for proxies +
handle org.apache.webbeans.custom.signed. as org.apache.webbeans.custom.
---
.../webbeans/config/OpenWebBeansConfiguration.java | 42 ++
.../signed/CustomSignedProxyPackageMarker.java | 23
.../webbeans/proxy/AbstractProxyFactory.java | 10 --
.../java/org/apache/webbeans/proxy/Unsafe.java | 7 ++--
.../META-INF/openwebbeans/openwebbeans.properties | 6
5 files changed, 83 insertions(+), 5 deletions(-)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
b/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
index 3810268..1a5a6d5 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
@@ -31,10 +31,14 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.logging.Level;
+import java.util.stream.Stream;
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
+import static java.util.Arrays.asList;
+import static java.util.stream.Collectors.toList;
+
/**
* Defines configuration for OpenWebBeans.
*
@@ -244,6 +248,15 @@ public class OpenWebBeansConfiguration
*/
private Map> configuredLists = new HashMap<>();
+/**
+ * List of packages which can't be used to generate a proxy.
+ *
+ * Important: changing this default has runtime impacts on proxies name.
+ *It is recommended to not tune it until really needed.
+ *Also ensure it is consistent between generation and runtime
if you use stable proxy names.
+ */
+private volatile List proxyReservedPackages;
+
/**
* you can configure this externally as well.
@@ -556,4 +569,33 @@ public class OpenWebBeansConfiguration
return Boolean.parseBoolean(getProperty(
"org.apache.webbeans.spi.deployer.skipNoClassDefFoundTriggers"));
}
+
+public List getProxyReservedPackages()
+{
+if (proxyReservedPackages == null)
+{
+synchronized (this)
+{
+if (proxyReservedPackages == null)
+{
+final String conf =
getProperty("org.apache.webbeans.generator.proxyReservedPackages");
+if (conf == null)
+{
+proxyReservedPackages = asList("java.", "javax.",
"sun.misc.");
+}
+else
+{
+proxyReservedPackages = Stream.concat(
+Stream.of("java.", "javax.", "sun.misc."),
+Stream.of(conf.split(","))
+.map(String::trim)
+.filter(it -> !it.isEmpty()))
+.distinct()
+.collect(toList());
+}
+}
+}
+}
+return proxyReservedPackages;
+}
}
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/custom/signed/CustomSignedProxyPackageMarker.java
b/webbeans-impl/src/main/java/org/apache/webbeans/custom/signed/CustomSignedProxyPackageMarker.java
new file mode 100644
index 000..70ce1eb
--- /dev/null
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/custom/signed/CustomSignedProxyPackageMarker.java
@@ -0,0 +1,23 @@
+/*
+ * 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"
[openwebbeans] branch master updated: [OWB-1375] first step to use privateLookup for java 16 and drop --add-exports need (still need to optimize the defineClass strategy - ensure it is adapted to the
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 14ee3ef [OWB-1375] first step to use privateLookup for java 16 and
drop --add-exports need (still need to optimize the defineClass strategy -
ensure it is adapted to the runtime and does not rely on fallbacks)
14ee3ef is described below
commit 14ee3ef408c8c1b9962d91f6cb4f882ec61eb1d3
Author: Romain Manni-Bucau
AuthorDate: Mon Mar 15 17:06:38 2021 +0100
[OWB-1375] first step to use privateLookup for java 16 and drop
--add-exports need (still need to optimize the defineClass strategy - ensure it
is adapted to the runtime and does not rely on fallbacks)
---
pom.xml| 19 ---
.../webbeans/custom/CustomProxyPackageMarker.java | 23
.../webbeans/proxy/AbstractProxyFactory.java | 4 +-
.../java/org/apache/webbeans/proxy/Unsafe.java | 65 --
4 files changed, 84 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2ff13a5..54a58ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -848,25 +848,6 @@
-java16-hacks
-
-16
-
-
-
-
-org.apache.maven.plugins
-maven-surefire-plugin
-
---add-exports
java.base/jdk.internal.misc=ALL-UNNAMED
-
-
-
-
-
-
-
-
reporting
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/custom/CustomProxyPackageMarker.java
b/webbeans-impl/src/main/java/org/apache/webbeans/custom/CustomProxyPackageMarker.java
new file mode 100644
index 000..8a14770
--- /dev/null
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/custom/CustomProxyPackageMarker.java
@@ -0,0 +1,23 @@
+/*
+ * 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.custom;
+
+public interface CustomProxyPackageMarker
+{
+}
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
index f66d03b..47c67aa 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
@@ -289,7 +289,7 @@ public abstract class AbstractProxyFactory
if (className.startsWith(forbiddenPackagePrefix))
{
-fixedClassName = "org.apache.webbeans.custom." +
className.substring(forbiddenPackagePrefix.length());
+fixedClassName = "org.apache.webbeans.custom." +
className.substring(className.lastIndexOf('.') + 1);
}
return fixedClassName;
@@ -329,7 +329,7 @@ public abstract class AbstractProxyFactory
{
return definingService.defineAndLoad(proxyClassName, proxyBytes,
classToProxy);
}
-return unsafe.defineAndLoadClass(classLoader, proxyClassName,
proxyBytes);
+return unsafe.defineAndLoadClass(classLoader, proxyClassName,
proxyBytes, classToProxy);
}
protected T newInstance(final Class proxyClass)
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/Unsafe.java
b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/Unsafe.java
index 9beb112..f0b49c3 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/Unsafe.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/Unsafe.java
@@ -18,6 +18,7 @@
*/
package org.apache.webbeans.proxy;
+import java.lang.invoke.MethodHandles;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
@@ -29,6 +30,7 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.IntStream;
i
[openwebbeans] branch master updated: [OWB-1376] fix unsafe usage to define classes
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 8ee9f5f [OWB-1376] fix unsafe usage to define classes
8ee9f5f is described below
commit 8ee9f5fb288131444aeb880fad24cc99f86a9091
Author: Romain Manni-Bucau
AuthorDate: Sat Mar 13 21:04:32 2021 +0100
[OWB-1376] fix unsafe usage to define classes
---
.../java/org/apache/webbeans/proxy/Unsafe.java | 31 ++
1 file changed, 26 insertions(+), 5 deletions(-)
diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/Unsafe.java
b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/Unsafe.java
index 2085883..9beb112 100644
--- a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/Unsafe.java
+++ b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/Unsafe.java
@@ -26,6 +26,7 @@ import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.ProtectionDomain;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.IntStream;
import java.util.stream.Stream;
import org.apache.webbeans.exception.ProxyGenerationException;
@@ -38,8 +39,8 @@ public class Unsafe
* We use it for creating the proxy instance without fully
* initializing the class.
*/
-private Object unsafe;
-private Object internalUnsafe;
+private final Object unsafe;
+private final Object internalUnsafe;
private Method unsafeAllocateInstance;
private final AtomicReference unsafeDefineClass = new
AtomicReference<>();
@@ -66,7 +67,7 @@ public class Unsafe
{
final Field theInternalUnsafe =
unsafeClass.getDeclaredField("theInternalUnsafe");
theInternalUnsafe.setAccessible(true);
-return theInternalUnsafe.get(null).getClass();
+return theInternalUnsafe.get(null);
}
catch (final Exception notJ11OrMore)
{
@@ -172,7 +173,7 @@ public class Unsafe
else
{
-definedClass = (Class) unsafeDefineClass().invoke(unsafe,
proxyName, proxyBytes, 0, proxyBytes.length, classLoader, null);
+definedClass = (Class)
unsafeDefineClass().invoke(internalUnsafe, proxyName, proxyBytes, 0,
proxyBytes.length, classLoader, null);
}
return (Class) Class.forName(definedClass.getName(), true,
classLoader);
@@ -190,7 +191,10 @@ public class Unsafe
// default error handling
}
}
-throw new ProxyGenerationException(le.getCause());
+throw new ProxyGenerationException(
+le.getMessage() + (isJava16OrMore() ? "\n" +
+"On Java 16 ensure to set --add-exports
java.base/jdk.internal.misc=ALL-UNNAMED on the JVM" : ""),
+le.getCause());
}
catch (Throwable e)
{
@@ -198,6 +202,23 @@ public class Unsafe
}
}
+private boolean isJava16OrMore()
+{
+final String version = System.getProperty("java.version", "-1");
+final int end = IntStream.of(version.indexOf('-'),
version.indexOf('.'))
+.filter(i -> i > 0)
+.min()
+.orElseGet(version::length);
+try
+{
+return Integer.parseInt(version.substring(0, end)) >= 16;
+}
+catch (final NumberFormatException nfe)
+{
+return false;
+}
+}
+
private Method unsafeDefineClass()
{
Method value = unsafeDefineClass.get();
[openwebbeans] branch master updated: trying to unify the logic in fixPreservedPackages to isolate the prefixes we handles in a single 'array like' structure
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 044b088 trying to unify the logic in fixPreservedPackages to isolate
the prefixes we handles in a single 'array like' structure
044b088 is described below
commit 044b088d6270c66b338e0f951b00c37e24e39a2d
Author: Romain Manni-Bucau
AuthorDate: Sat Mar 13 19:45:56 2021 +0100
trying to unify the logic in fixPreservedPackages to isolate the prefixes
we handles in a single 'array like' structure
---
.../org/apache/webbeans/proxy/AbstractProxyFactory.java| 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
index 1b156cf..f66d03b 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
@@ -269,15 +269,15 @@ public abstract class AbstractProxyFactory
return "org.apache.webbeans.custom.signed." + classToProxy.getName();
}
-protected String fixPreservedPackages(String proxyClassName)
+protected String fixPreservedPackages(final String proxyClassName)
{
-proxyClassName = fixPreservedPackage(proxyClassName, "java.");
-proxyClassName = fixPreservedPackage(proxyClassName, "javax.");
-proxyClassName = fixPreservedPackage(proxyClassName, "jakarta.");
-proxyClassName = fixPreservedPackage(proxyClassName, "sun.misc.");
-
-return proxyClassName;
+return Stream.of("java.", "javax.", "jakarta.", "sun.misc.")
+.filter(proxyClassName::startsWith)
+.findFirst() // can only be one, you can't start with 2 of them
+.map(it -> fixPreservedPackage(proxyClassName, it))
+.orElse(proxyClassName);
}
+
/**
* Detect if the provided className is in the forbidden package.
* If so, move it to org.apache.webbeans.custom.
[openwebbeans-meecrowave] branch master updated (4a26af8 -> be521df)
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 4a26af8 [MEECROWAVE-278] ensure beans.xml configuration is used with CDI SE API new 004794d fix some changes on owb snapshot new be521df [MEECROWAVE-279] tomcat 9.0.44 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: integration-tests/app-groovy/pom.xml | 2 +- .../apache/meecrowave/openwebbeans/OWBTomcatWebScannerService.java| 4 +--- pom.xml | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-)
[openwebbeans-meecrowave] 02/02: [MEECROWAVE-279] tomcat 9.0.44
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 be521df79e940fab7e225d626ae11983d2e9ac0e
Author: Romain Manni-Bucau
AuthorDate: Wed Mar 10 13:58:34 2021 +0100
[MEECROWAVE-279] tomcat 9.0.44
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f36105e..eaa0903 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
${project.groupId}.${project.artifactId}
4.13.1
-9.0.43
+9.0.44
2.0.22-SNAPSHOT
3.4.2
1.2.8
[openwebbeans-meecrowave] 01/02: fix some changes on owb snapshot
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 004794d4fbbd0f63edd29748e073e44f12d2b2b1
Author: Romain Manni-Bucau
AuthorDate: Wed Mar 10 13:57:59 2021 +0100
fix some changes on owb snapshot
---
integration-tests/app-groovy/pom.xml | 2 +-
.../apache/meecrowave/openwebbeans/OWBTomcatWebScannerService.java| 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/integration-tests/app-groovy/pom.xml
b/integration-tests/app-groovy/pom.xml
index 71888bd..164c3d9 100644
--- a/integration-tests/app-groovy/pom.xml
+++ b/integration-tests/app-groovy/pom.xml
@@ -32,7 +32,7 @@
org.codehaus.groovy
groovy
- 2.5.6
+ 3.0.7
org.apache.meecrowave
diff --git
a/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBTomcatWebScannerService.java
b/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBTomcatWebScannerService.java
index fe93efa..c96ddec 100644
---
a/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBTomcatWebScannerService.java
+++
b/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBTomcatWebScannerService.java
@@ -254,9 +254,7 @@ public class OWBTomcatWebScannerService extends
WebScannerService {
CdiArchive.FoundClasses foundClasses = archive.classesByUrl().get(key);
if (foundClasses == null) {
final BeanArchiveService beanArchiveService =
webBeansContext().getBeanArchiveService();
-foundClasses = CdiArchive.FoundClasses.class.cast(
-
CdiArchive.FoundClasses.class.getConstructor(CdiArchive.class, URL.class,
Collection.class, BeanArchiveService.BeanArchiveInformation.class)
-.newInstance(null, url, new HashSet<>(),
beanArchiveService.getBeanArchiveInformation(url)));
+foundClasses = new CdiArchive.FoundClasses(url, new HashSet<>(),
beanArchiveService.getBeanArchiveInformation(url));
archive.classesByUrl().put(key, foundClasses);
}
[maven-surefire] branch SUREFIRE-1892 updated (e3a1a7b -> 69aa817)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch SUREFIRE-1892 in repository https://gitbox.apache.org/repos/asf/maven-surefire.git. from e3a1a7b [SUREFIRE-1892] ensure systemPropertyVariables values are stringified add 69aa817 style + handle null in systemPropertyVariables values No new revisions were added by this update. Summary of changes: .../java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java | 5 +++-- .../org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-)
[maven-surefire] branch SUREFIRE-1892 created (now e3a1a7b)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch SUREFIRE-1892 in repository https://gitbox.apache.org/repos/asf/maven-surefire.git. at e3a1a7b [SUREFIRE-1892] ensure systemPropertyVariables values are stringified This branch includes the following new commits: new e3a1a7b [SUREFIRE-1892] ensure systemPropertyVariables values are stringified The 1 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.
[maven-surefire] 01/01: [SUREFIRE-1892] ensure systemPropertyVariables values are stringified
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch SUREFIRE-1892
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
commit e3a1a7bb642c1e69b6bd34c2a95820221da368c8
Author: Romain Manni-Bucau
AuthorDate: Sun Mar 7 17:10:33 2021 +0100
[SUREFIRE-1892] ensure systemPropertyVariables values are stringified
---
.../maven/plugin/surefire/AbstractSurefireMojo.java | 15 +--
.../maven/plugin/surefire/AbstractSurefireMojoTest.java | 10 ++
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 4d1af3d..ec6ff73 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -3623,9 +3623,20 @@ public abstract class AbstractSurefireMojo
}
@SuppressWarnings( "UnusedDeclaration" )
-public void setSystemPropertyVariables( Map
systemPropertyVariables )
+public void setSystemPropertyVariables( Map
systemPropertyVariables )
{
-this.systemPropertyVariables = systemPropertyVariables;
+if (systemPropertyVariables != null)
+{
+this.systemPropertyVariables = new HashMap<>();
+for ( final Map.Entry entry :
systemPropertyVariables.entrySet() )
+{
+this.systemPropertyVariables.put( entry.getKey(),
String.valueOf( entry.getValue() ) );
+}
+}
+else
+{
+this.systemPropertyVariables = null;
+}
}
/**
diff --git
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
index 53e7fba..12a7b1b 100644
---
a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
+++
b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java
@@ -94,6 +94,7 @@ import static java.util.Collections.emptyMap;
import static java.util.Collections.emptySet;
import static java.util.Collections.singleton;
import static java.util.Collections.singletonList;
+import static java.util.Collections.singletonMap;
import static
org.apache.maven.artifact.versioning.VersionRange.createFromVersion;
import static
org.apache.maven.artifact.versioning.VersionRange.createFromVersionSpec;
import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_9;
@@ -102,6 +103,7 @@ import static
org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS;
import static
org.codehaus.plexus.languages.java.jpms.ModuleNameSource.MODULEDESCRIPTOR;
import static org.fest.assertions.Assertions.assertThat;
import static org.fest.assertions.MapAssert.entry;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
@@ -1999,6 +2001,14 @@ public class AbstractSurefireMojoTest
mojo.verifyParameters();
}
+@Test
+public void shouldSupportBooleanSystemPropertiesValue()
+{
+AbstractSurefireMojo mojo = new Mojo();
+mojo.setSystemPropertyVariables(singletonMap("offline", true));
+assertEquals(singletonMap("offline", "true"),
mojo.getSystemPropertyVariables());
+}
+
private void setProjectDepedenciesToMojo( Artifact... deps )
{
for ( Artifact dep : deps )
[johnzon] branch master updated: [JOHNZON-337] more refinements on (de)serializers
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/johnzon.git
The following commit(s) were added to refs/heads/master by this push:
new 5e9ee0a [JOHNZON-337] more refinements on (de)serializers
5e9ee0a is described below
commit 5e9ee0a89fb13cf240b3c9ef0d0ed32d801869c5
Author: Romain Manni-Bucau
AuthorDate: Fri Mar 5 18:08:20 2021 +0100
[JOHNZON-337] more refinements on (de)serializers
---
.../apache/johnzon/RecursivePolymorphismTest.java | 52 --
.../johnzon/jsonb/SerializersRoundTripTest.java| 6 +-
.../johnzon/mapper/DynamicMappingGenerator.java| 81 --
.../johnzon/mapper/MappingGeneratorImpl.java | 22 +++---
4 files changed, 121 insertions(+), 40 deletions(-)
diff --git
a/johnzon-jsonb/src/test/java/org/apache/johnzon/RecursivePolymorphismTest.java
b/johnzon-jsonb/src/test/java/org/apache/johnzon/RecursivePolymorphismTest.java
index 75996ca..14e91dd 100644
---
a/johnzon-jsonb/src/test/java/org/apache/johnzon/RecursivePolymorphismTest.java
+++
b/johnzon-jsonb/src/test/java/org/apache/johnzon/RecursivePolymorphismTest.java
@@ -23,6 +23,8 @@ import org.junit.Test;
import javax.json.bind.Jsonb;
import javax.json.bind.JsonbBuilder;
import javax.json.bind.JsonbConfig;
+import javax.json.bind.annotation.JsonbPropertyOrder;
+import javax.json.bind.config.PropertyOrderStrategy;
import javax.json.bind.serializer.DeserializationContext;
import javax.json.bind.serializer.JsonbDeserializer;
import javax.json.bind.serializer.JsonbSerializer;
@@ -30,7 +32,9 @@ import javax.json.bind.serializer.SerializationContext;
import javax.json.stream.JsonGenerator;
import javax.json.stream.JsonParser;
import java.lang.reflect.Type;
+import java.util.List;
+import static java.util.Arrays.asList;
import static javax.json.stream.JsonParser.Event.KEY_NAME;
import static javax.json.stream.JsonParser.Event.START_OBJECT;
import static javax.json.stream.JsonParser.Event.VALUE_NUMBER;
@@ -41,23 +45,54 @@ public class RecursivePolymorphismTest {
public void read() throws Exception {
try (final Jsonb jsonb = JsonbBuilder.create(new JsonbConfig()
.withDeserializers(new PolyDeserializer( {
-final Parent parent =
jsonb.fromJson("{\"type\":1,\"name\":\"first\",\"uno\":true,\"duo\":true}",
Parent.class);
-assertEquals("Child1{name='first', uno=true}", parent.toString());
+final Parent parent =
jsonb.fromJson("{\"type\":1,\"name\":\"first\",\"id\":1,\"duo\":true," +
+
"\"sibling\":{\"type\":1,\"name\":\"second\",\"id\":2,\"duo\":true}," +
+
"\"parents\":[{\"type\":1,\"name\":\"third\",\"id\":3,\"duo\":true}," +
+"{\"type\":2,\"name\":\"fourth\",\"id\":4,\"duo\":true}]" +
+"}", Parent.class);
+assertEquals(
+"Child1{" +
+"name='first', " +
+"id=1, " +
+"sibling=Child1{name='second', id=2, sibling=null,
parents=null}, " +
+"parents=[Child1{name='third', id=3, sibling=null,
parents=null}, Child2{name='fourth', duo=true}]}",
+parent.toString());
}
}
@Test
public void write() throws Exception {
+final Child1 parent1 = new Child1();
+parent1.name = "p1";
+parent1.id = 0;
+
+final Child1 sibling = new Child1();
+sibling.name = "s";
+sibling.id = 2;
+
+final Child2 parent2 = new Child2();
+parent2.name = "p2";
+parent2.duo = true;
+
final Child1 child1 = new Child1();
child1.name = "first";
-child1.uno = true;
+child1.id = 1;
+child1.sibling = sibling;
+child1.parents = asList(parent1, parent2);
+
try (final Jsonb jsonb = JsonbBuilder.create(new JsonbConfig()
.withSerializers(new PolySerializer( {
final String json = jsonb.toJson(child1);
-assertEquals("{\"type\":1,\"name\":\"first\",\"uno\":true}", json);
+assertEquals("{" +
+"\"type\":1,\"id\":1,\"name\":\"first\"," +
+"\"parents\":[" +
+"{\"type\":1,
[johnzon] branch master updated: [JOHNZON-337] avoid jsonb deserializers to loop
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/johnzon.git
The following commit(s) were added to refs/heads/master by this push:
new aaa2af9 [JOHNZON-337] avoid jsonb deserializers to loop
aaa2af9 is described below
commit aaa2af985b51517f6d636d3a28b176f3109c5958
Author: Romain Manni-Bucau
AuthorDate: Fri Mar 5 14:41:14 2021 +0100
[JOHNZON-337] avoid jsonb deserializers to loop
---
.../apache/johnzon/RecursivePolymorphismTest.java | 131 +
.../org/apache/johnzon/mapper/MappingParser.java | 6 +-
.../apache/johnzon/mapper/MappingParserImpl.java | 66 +++
3 files changed, 182 insertions(+), 21 deletions(-)
diff --git
a/johnzon-jsonb/src/test/java/org/apache/johnzon/RecursivePolymorphismTest.java
b/johnzon-jsonb/src/test/java/org/apache/johnzon/RecursivePolymorphismTest.java
new file mode 100644
index 000..75996ca
--- /dev/null
+++
b/johnzon-jsonb/src/test/java/org/apache/johnzon/RecursivePolymorphismTest.java
@@ -0,0 +1,131 @@
+/*
+ * 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.johnzon;
+
+import org.junit.Test;
+
+import javax.json.bind.Jsonb;
+import javax.json.bind.JsonbBuilder;
+import javax.json.bind.JsonbConfig;
+import javax.json.bind.serializer.DeserializationContext;
+import javax.json.bind.serializer.JsonbDeserializer;
+import javax.json.bind.serializer.JsonbSerializer;
+import javax.json.bind.serializer.SerializationContext;
+import javax.json.stream.JsonGenerator;
+import javax.json.stream.JsonParser;
+import java.lang.reflect.Type;
+
+import static javax.json.stream.JsonParser.Event.KEY_NAME;
+import static javax.json.stream.JsonParser.Event.START_OBJECT;
+import static javax.json.stream.JsonParser.Event.VALUE_NUMBER;
+import static org.junit.Assert.assertEquals;
+
+public class RecursivePolymorphismTest {
+@Test
+public void read() throws Exception {
+try (final Jsonb jsonb = JsonbBuilder.create(new JsonbConfig()
+.withDeserializers(new PolyDeserializer( {
+final Parent parent =
jsonb.fromJson("{\"type\":1,\"name\":\"first\",\"uno\":true,\"duo\":true}",
Parent.class);
+assertEquals("Child1{name='first', uno=true}", parent.toString());
+}
+}
+
+@Test
+public void write() throws Exception {
+final Child1 child1 = new Child1();
+child1.name = "first";
+child1.uno = true;
+try (final Jsonb jsonb = JsonbBuilder.create(new JsonbConfig()
+.withSerializers(new PolySerializer( {
+final String json = jsonb.toJson(child1);
+assertEquals("{\"type\":1,\"name\":\"first\",\"uno\":true}", json);
+}
+}
+
+public static class Parent {
+public String name;
+
+@Override
+public String toString() {
+return "Parent{name='" + name + "'}";
+}
+}
+
+public static class Child1 extends Parent {
+public boolean uno;
+
+@Override
+public String toString() {
+return "Child1{name='" + name + "', uno=" + uno + '}';
+}
+}
+
+public static class Child2 extends Parent {
+public boolean duo;
+
+@Override
+public String toString() {
+return "Child2{name='" + name + "', duo=" + duo + '}';
+}
+}
+
+public static class PolySerializer implements JsonbSerializer {
+@Override
+public void serialize(final Parent obj, final JsonGenerator generator,
final SerializationContext ctx) {
+generator.writeStartObject();
+generator.write("type", Child1.class.isInstance(obj) ? 1 : 2);
+ctx.serialize(obj, generator);
+generator.writeEnd();
+}
+}
+
+public static class PolyDeserializer implements JsonbDeserializer {
+@Override
+public Parent deserialize(final
[maven-scripting-plugin] 01/01: basic java scripting engine support
This is an automated email from the ASF dual-hosted git repository.
rmannibucau pushed a commit to branch rmannibucau/java-scripting-draft
in repository https://gitbox.apache.org/repos/asf/maven-scripting-plugin.git
commit 0346ed96d069c6a4edcd6bf980fea7409169e84d
Author: Romain Manni-Bucau
AuthorDate: Fri Feb 26 09:41:24 2021 +0100
basic java scripting engine support
---
pom.xml| 38 ++
src/it/java/pom.xml| 68
src/it/java/verify.bsh | 44 +++
.../plugins/scripting/AbstractScriptEvaluator.java | 22 +-
.../apache/maven/plugins/scripting/EvalMojo.java | 70 +++-
.../plugins/scripting/FileScriptEvaluator.java | 5 +-
.../plugins/scripting/StringScriptEvaluator.java | 4 +-
.../plugins/scripting/engine/JavaScriptEngine.java | 422 +
.../scripting/engine/JavaScriptEngineFactory.java | 133 +++
.../scripting/engine/JavaScriptEngineTest.java | 99 +
10 files changed, 897 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 13fb174..5b20d0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,7 @@ under the License.
3.0
1.8
1.8
+2.8.8
2021-02-24T19:52:25Z
@@ -96,6 +97,42 @@ under the License.
provided
+
+
+ org.codehaus.plexus
+ plexus-compiler-api
+ ${plexus.compiler.version}
+
+
+ org.codehaus.plexus
+ plexus-component-api
+
+
+
+
+ org.codehaus.plexus
+ plexus-compiler-manager
+ ${plexus.compiler.version}
+
+
+ org.codehaus.plexus
+ plexus-component-api
+
+
+
+
+ org.codehaus.plexus
+ plexus-compiler-javac
+ ${plexus.compiler.version}
+ runtime
+
+
+ org.codehaus.plexus
+ plexus-component-api
+
+
+
+
junit
@@ -133,6 +170,7 @@ under the License.
verify
${project.build.directory}/local-repo
src/it/settings.xml
+verify.bsh
scripting:eval
diff --git a/src/it/java/pom.xml b/src/it/java/pom.xml
new file mode 100644
index 000..0db926d
--- /dev/null
+++ b/src/it/java/pom.xml
@@ -0,0 +1,68 @@
+
+
+
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+ 4.0.0
+
+ org.apache.maven.plugins.scripting.its
+ java
+ 1.0.0-SNAPSHOT
+ pom
+
+
+
+
+org.apache.maven.plugins
+maven-scripting-plugin
+@project.version@
+
+ java
+
+MyMain
+1
+2
+3
+4
+5
+6
+
+
+ <![CDATA[
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+
+public class MyMain {
+ public static void main(String... args) throws Exception {
+Path out = Paths.get("target/out");
+Files.createDirectories(out.getParent());
+Files.write(out, String.join(",", args).getBytes(),
+ StandardOpenOption.WRITE, StandardOpenOption.CREATE,
StandardOpenOption.TRUNCATE_EXISTING);
+ }
+}
+ ]]>
+
+
+
+
+
+
diff --git a/src/it/java/verify.bsh b/src/it/java/verify.bsh
new file mode 100644
index 000..a0f3f98
--- /dev/null
+++ b/src/it/java/verify.bsh
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+// beanshell does not like much java.nio.file so let's use java.io which is
more than enough for us
+import java.util.stream.Collectors;
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.File;
+
+File file = new File( basedir, "target/out" );
+
[maven-scripting-plugin] branch rmannibucau/java-scripting-draft created (now 0346ed9)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to branch rmannibucau/java-scripting-draft in repository https://gitbox.apache.org/repos/asf/maven-scripting-plugin.git. at 0346ed9 basic java scripting engine support This branch includes the following new commits: new 0346ed9 basic java scripting engine support The 1 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.
[openwebbeans] branch master updated: [OWB-1370] ensure CdiSeInitializer can be forced to one of the impls
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 05b1d84 [OWB-1370] ensure CdiSeInitializer can be forced to one of
the impls
05b1d84 is described below
commit 05b1d845ed5200dcecdc1b6052ca364bd58cb435
Author: Romain Manni-Bucau
AuthorDate: Sat Feb 20 18:27:59 2021 +0100
[OWB-1370] ensure CdiSeInitializer can be forced to one of the impls
---
.../openwebbeans/se/SeInitializerFacade.java | 184 -
1 file changed, 143 insertions(+), 41 deletions(-)
diff --git
a/webbeans-se/src/main/java/org/apache/openwebbeans/se/SeInitializerFacade.java
b/webbeans-se/src/main/java/org/apache/openwebbeans/se/SeInitializerFacade.java
index 0d44726..59ec6a3 100644
---
a/webbeans-se/src/main/java/org/apache/openwebbeans/se/SeInitializerFacade.java
+++
b/webbeans-se/src/main/java/org/apache/openwebbeans/se/SeInitializerFacade.java
@@ -18,122 +18,224 @@
*/
package org.apache.openwebbeans.se;
+import org.apache.webbeans.conversation.DefaultConversationService;
+import org.apache.webbeans.corespi.se.StandaloneContextsService;
+import org.apache.webbeans.lifecycle.StandaloneLifeCycle;
+import org.apache.webbeans.spi.ContainerLifecycle;
+import org.apache.webbeans.spi.ContextsService;
+import org.apache.webbeans.spi.ConversationService;
+
+import javax.annotation.Priority;
import javax.enterprise.inject.se.SeContainer;
import javax.enterprise.inject.se.SeContainerInitializer;
import javax.enterprise.inject.spi.Extension;
import java.lang.annotation.Annotation;
-import java.util.Iterator;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.Map;
-import java.util.Optional;
import java.util.ServiceLoader;
+import java.util.function.Consumer;
+import java.util.stream.StreamSupport;
+
+import static java.util.Comparator.comparing;
+import static java.util.Optional.ofNullable;
// will allow to plug other impl but reusing most of our logic
public class SeInitializerFacade extends SeContainerInitializer
{
-private final SeContainerInitializer delegate;
+public final static String PROVIDER =
SeContainerInitializer.class.getName() + ".provider";
-public SeInitializerFacade()
-{
-delegate =
Optional.of(ServiceLoader.load(SeContainerSelector.class).iterator())
-.filter(Iterator::hasNext)
-.map(Iterator::next)
-.map(SeContainerSelector::find)
-.orElseGet(OWBInitializer::new);
-}
+private final Collection> initializers =
new ArrayList<>();
+private SeContainerInitializer delegate;
@Override
-public SeContainerInitializer addBeanClasses(Class... classes)
+public SeContainerInitializer addBeanClasses(final Class... classes)
{
-return delegate.addBeanClasses(classes);
+initializers.add(i -> i.addBeanClasses(classes));
+return this;
}
@Override
-public SeContainerInitializer addPackages(Class... packageClasses)
+public SeContainerInitializer addPackages(final Class... packageClasses)
{
-return delegate.addPackages(packageClasses);
+initializers.add(i -> i.addPackages(packageClasses));
+return this;
}
@Override
-public SeContainerInitializer addPackages(boolean scanRecursively,
Class... packageClasses)
+public SeContainerInitializer addPackages(final boolean scanRecursively,
final Class... packageClasses)
{
-return delegate.addPackages(scanRecursively, packageClasses);
+initializers.add(i -> i.addPackages(scanRecursively, packageClasses));
+return this;
}
@Override
-public SeContainerInitializer addPackages(Package... packages)
+public SeContainerInitializer addPackages(final Package... packages)
{
-return delegate.addPackages(packages);
+initializers.add(i -> i.addPackages(packages));
+return this;
}
@Override
-public SeContainerInitializer addPackages(boolean scanRecursively,
Package... packages)
+public SeContainerInitializer addPackages(final boolean scanRecursively,
final Package... packages)
{
-return delegate.addPackages(scanRecursively, packages);
+initializers.add(i -> i.addPackages(scanRecursively, packages));
+return this;
}
@Override
-public SeContainerInitializer addExtensions(Extension... extensions)
+public SeContainerInitializer addExtensions(final Extension... extensions)
{
-return delegate.addExtensions(extensions);
+initializers.add(i -> i.addExtensions(extensions));
+return this;
}
@Override
-public SeContainerInitializer addExtensi
[openwebbeans-meecrowave] branch master updated: [MEECROWAVE-278] ensure beans.xml configuration is used with CDI SE API
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 4a26af8 [MEECROWAVE-278] ensure beans.xml configuration is used with
CDI SE API
4a26af8 is described below
commit 4a26af857bde1810fc86f3323b82ec6dd4f1479b
Author: Romain Manni-Bucau
AuthorDate: Sat Feb 20 18:02:02 2021 +0100
[MEECROWAVE-278] ensure beans.xml configuration is used with CDI SE API
---
.../apache/meecrowave/cdi/MeecrowaveProvider.java | 6 -
.../openwebbeans/OWBTomcatWebScannerService.java | 26 +-
pom.xml| 2 +-
3 files changed, 26 insertions(+), 8 deletions(-)
diff --git
a/meecrowave-core/src/main/java/org/apache/meecrowave/cdi/MeecrowaveProvider.java
b/meecrowave-core/src/main/java/org/apache/meecrowave/cdi/MeecrowaveProvider.java
deleted file mode 100644
index 2ae3228..000
---
a/meecrowave-core/src/main/java/org/apache/meecrowave/cdi/MeecrowaveProvider.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.apache.meecrowave.cdi;
-
-import org.apache.webbeans.container.OwbCDIProvider;
-
-public class MeecrowaveProvider extends OwbCDIProvider {
-}
diff --git
a/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBTomcatWebScannerService.java
b/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBTomcatWebScannerService.java
index b3789b3..fe93efa 100644
---
a/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBTomcatWebScannerService.java
+++
b/meecrowave-core/src/main/java/org/apache/meecrowave/openwebbeans/OWBTomcatWebScannerService.java
@@ -18,13 +18,13 @@
*/
package org.apache.meecrowave.openwebbeans;
-import org.apache.meecrowave.Meecrowave;
import org.apache.meecrowave.configuration.Configuration;
import org.apache.meecrowave.logging.tomcat.LogFacade;
import org.apache.tomcat.JarScanFilter;
import org.apache.webbeans.config.WebBeansContext;
import org.apache.webbeans.corespi.scanner.xbean.CdiArchive;
import org.apache.webbeans.corespi.scanner.xbean.OwbAnnotationFinder;
+import org.apache.webbeans.spi.BDABeansXmlScanner;
import org.apache.webbeans.spi.BdaScannerService;
import org.apache.webbeans.spi.BeanArchiveService;
import org.apache.webbeans.util.WebBeansUtil;
@@ -85,6 +85,30 @@ public class OWBTomcatWebScannerService extends
WebScannerService {
}
@Override
+public Set getBeanXmls() {
+if (delegate == null) {
+return super.getBeanXmls();
+}
+return delegate.getBeanXmls();
+}
+
+@Override
+public boolean isBDABeansXmlScanningEnabled() {
+if (delegate == null) {
+return super.isBDABeansXmlScanningEnabled();
+}
+return delegate.isBDABeansXmlScanningEnabled();
+}
+
+@Override
+public BDABeansXmlScanner getBDABeansXmlScanner() {
+if (delegate == null) {
+return super.getBDABeansXmlScanner();
+}
+return delegate.getBDABeansXmlScanner();
+}
+
+@Override
public OwbAnnotationFinder getFinder() {
if (finderAccessor != null) {
return finderAccessor.get();
diff --git a/pom.xml b/pom.xml
index 07fd87b..f36105e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
4.13.1
9.0.43
-2.0.20
+2.0.22-SNAPSHOT
3.4.2
1.2.8
2.14.0
[openwebbeans] branch master updated: [OWB-1369] ensure there is no conflict between owb-se and owb-web module in SPI registration
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 57ba8a6 [OWB-1369] ensure there is no conflict between owb-se and owb-web module in SPI registration 57ba8a6 is described below commit 57ba8a675c9272566b80b94b26d134274885cdb6 Author: Romain Manni-Bucau AuthorDate: Sat Feb 20 17:56:29 2021 +0100 [OWB-1369] ensure there is no conflict between owb-se and owb-web module in SPI registration --- .../src/main/resources/META-INF/openwebbeans/openwebbeans.properties| 2 +- .../src/main/resources/META-INF/openwebbeans/openwebbeans.properties| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webbeans-jsf/src/main/resources/META-INF/openwebbeans/openwebbeans.properties b/webbeans-jsf/src/main/resources/META-INF/openwebbeans/openwebbeans.properties index 21b0519..d2fc9fe 100644 --- a/webbeans-jsf/src/main/resources/META-INF/openwebbeans/openwebbeans.properties +++ b/webbeans-jsf/src/main/resources/META-INF/openwebbeans/openwebbeans.properties @@ -22,7 +22,7 @@ # #--- -configuration.ordinal=12 +configuration.ordinal=13 Conversation Context Removal Thread Delay## #Converation contexts are removed when the conversation is not used for > timeout. Default timeout is 30 mins. diff --git a/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties b/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties index a83a6f1..7247e01 100644 --- a/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties +++ b/webbeans-web/src/main/resources/META-INF/openwebbeans/openwebbeans.properties @@ -22,7 +22,7 @@ ### WEB SPI CONFIGURATION SECTION ## -configuration.ordinal=11 +configuration.ordinal=12 ### WEB Container Lifecycle #Default implementation of org.apache.webbeans.corespi.ContainerLifecycle.
[johnzon] branch master updated: [JOHNZON-336] jsonpatch operators for jsonlogic
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/johnzon.git
The following commit(s) were added to refs/heads/master by this push:
new a602490 [JOHNZON-336] jsonpatch operators for jsonlogic
a602490 is described below
commit a6024900b68c14e86742dd231ba318d20a18a975
Author: Romain Manni-Bucau
AuthorDate: Wed Feb 17 10:01:22 2021 +0100
[JOHNZON-336] jsonpatch operators for jsonlogic
---
.../apache/johnzon/jsonlogic/JohnzonJsonLogic.java | 49 +-
.../johnzon/jsonlogic/JohnzonJsonLogicTest.java| 74 ++
src/site/markdown/index.md | 2 +
3 files changed, 124 insertions(+), 1 deletion(-)
diff --git
a/johnzon-jsonlogic/src/main/java/org/apache/johnzon/jsonlogic/JohnzonJsonLogic.java
b/johnzon-jsonlogic/src/main/java/org/apache/johnzon/jsonlogic/JohnzonJsonLogic.java
index 9691c82..21e7618 100644
---
a/johnzon-jsonlogic/src/main/java/org/apache/johnzon/jsonlogic/JohnzonJsonLogic.java
+++
b/johnzon-jsonlogic/src/main/java/org/apache/johnzon/jsonlogic/JohnzonJsonLogic.java
@@ -24,8 +24,10 @@ import javax.json.JsonArray;
import javax.json.JsonArrayBuilder;
import javax.json.JsonBuilderFactory;
import javax.json.JsonException;
+import javax.json.JsonMergePatch;
import javax.json.JsonNumber;
import javax.json.JsonObject;
+import javax.json.JsonPatch;
import javax.json.JsonPointer;
import javax.json.JsonString;
import javax.json.JsonStructure;
@@ -37,6 +39,7 @@ import java.util.Objects;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.function.BiPredicate;
import java.util.stream.Collector;
import java.util.stream.DoubleStream;
@@ -49,13 +52,18 @@ import static java.util.stream.Collectors.joining;
public class JohnzonJsonLogic {
private final JsonProvider provider;
private final Map operators = new HashMap<>();
-private final Map pointers = new HashMap<>();
+private final Map pointers = new
ConcurrentHashMap<>();
+private final Map jsonPatches = new
ConcurrentHashMap<>();
+private final Map jsonMergePatches = new
ConcurrentHashMap<>();
private final JsonBuilderFactory builderFactory;
private boolean cachePointers;
+private boolean cacheJsonPatches;
+private boolean cacheJsonMergePatches;
public JohnzonJsonLogic() {
this(JsonProvider.provider());
registerDefaultOperators();
+registerExtensionsOperators();
}
public JohnzonJsonLogic(final JsonProvider provider) {
@@ -68,6 +76,16 @@ public class JohnzonJsonLogic {
return this;
}
+public JohnzonJsonLogic cacheJsonPatches() {
+this.cacheJsonPatches = true;
+return this;
+}
+
+public JohnzonJsonLogic cacheJsonMergePatches() {
+this.cacheJsonMergePatches = true;
+return this;
+}
+
public JohnzonJsonLogic registerOperator(final String name, final Operator
impl) {
operators.put(name, impl);
return this;
@@ -190,6 +208,35 @@ public class JohnzonJsonLogic {
}
}
+public JohnzonJsonLogic registerExtensionsOperators() {
+registerOperator("jsonpatch", (logic, config, params) ->
getJsonPatch(config)
+.apply(JsonStructure.class.cast(params)));
+registerOperator("jsonmergepatch", (logic, config, params) ->
getJsonMergePatch(config)
+.apply(params));
+registerOperator("jsonmergediff", (logic, config, params) -> {
+final JsonArray array = params.asJsonArray();
+if (array.size() != 2) {
+throw new IllegalArgumentException("jsonmergediff should have
2 parameters (in an array): " + array);
+}
+return provider.createMergeDiff(config,
array.get(0)).apply(array.get(1));
+});
+return this;
+}
+
+private JsonPatch getJsonPatch(final JsonValue config) {
+if (!cacheJsonPatches) {
+return provider.createPatch(config.asJsonArray());
+}
+return jsonPatches.computeIfAbsent(config.asJsonArray(),
provider::createPatch);
+}
+
+private JsonMergePatch getJsonMergePatch(final JsonValue config) {
+if (!cacheJsonPatches) {
+return provider.createMergePatch(config);
+}
+return jsonMergePatches.computeIfAbsent(config,
provider::createMergePatch);
+}
+
// to not depend on a logger we don't register "log" operation but it is
trivial to do:
public JohnzonJsonLogic registerDefaultOperators() {
registerOperator("log", (logic, config, params) -> {
diff --git
a/johnzon-jsonlogic/src/test/java/org/apache/johnzon/jsonlogic/JohnzonJsonLog
[johnzon] branch master updated: [JOHNZON-335] workaround for nested JsonbSerializers handling and invalid JSON
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/johnzon.git
The following commit(s) were added to refs/heads/master by this push:
new 1e7c5fd [JOHNZON-335] workaround for nested JsonbSerializers handling
and invalid JSON
1e7c5fd is described below
commit 1e7c5fda86789f78a98b21dfecacb826854819e0
Author: Romain Manni-Bucau
AuthorDate: Thu Feb 4 09:46:20 2021 +0100
[JOHNZON-335] workaround for nested JsonbSerializers handling and invalid
JSON
---
.../org/apache/johnzon/core/JsonGeneratorImpl.java | 2 +-
.../org/apache/johnzon/jsonb/SerializerTest.java | 33 +++
.../johnzon/mapper/DynamicMappingGenerator.java| 232 -
.../johnzon/mapper/MappingGeneratorImpl.java | 6 +-
4 files changed, 265 insertions(+), 8 deletions(-)
diff --git
a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorImpl.java
b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorImpl.java
index 852aa2e..7520243 100644
--- a/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorImpl.java
+++ b/johnzon-core/src/main/java/org/apache/johnzon/core/JsonGeneratorImpl.java
@@ -463,7 +463,7 @@ class JsonGeneratorImpl implements JsonGenerator,
JsonChars, Serializable {
JsonGenerationException ex = null;
final GeneratorState state = currentState();
if (state != GeneratorState.END && state != GeneratorState.ROOT_VALUE)
{
-ex = new JsonGenerationException("Invalid json");
+ex = new JsonGenerationException("Invalid json, state=" + state);
}
try {
if (ex == null) {
diff --git
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/SerializerTest.java
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/SerializerTest.java
index fe658d5..8a7d86b 100644
--- a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/SerializerTest.java
+++ b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/SerializerTest.java
@@ -55,6 +55,12 @@ public class SerializerTest {
public final JsonbRule jsonb = new JsonbRule()
.withPropertyOrderStrategy(PropertyOrderStrategy.LEXICOGRAPHICAL);
+@Test // https://issues.apache.org/jira/browse/JOHNZON-335
+public void testNestedSerializer() {
+final String s = jsonb.toJson(new OuterTestModel());
+assertEquals("{\"foo\":\"generated in outer
serializer\",\"inner\":{\"bar\":\"generated in inner serializer\"}}", s);
+}
+
@Test
public void passthroughSerializer() {
final NameHolder nameHolder = new NameHolder();
@@ -770,4 +776,31 @@ public class SerializerTest {
this.student = student;
}
}
+
+@JsonbTypeSerializer(OuterTestSerializer.class)
+public static class OuterTestModel {
+}
+
+@JsonbTypeSerializer(InnerTestSerializer.class)
+public static class InnerTestModel {
+}
+
+public static class OuterTestSerializer implements
JsonbSerializer {
+@Override
+public void serialize(final OuterTestModel obj, final JsonGenerator
generator, final SerializationContext ctx) {
+generator.writeStartObject();
+generator.write("foo", "generated in outer serializer");
+ctx.serialize("inner", new InnerTestModel(), generator);
+generator.writeEnd();
+}
+}
+
+public static class InnerTestSerializer implements
JsonbSerializer {
+@Override
+public void serialize(final InnerTestModel obj, final JsonGenerator
generator, final SerializationContext ctx) {
+generator.writeStartObject();
+generator.write("bar", "generated in inner serializer");
+generator.writeEnd();
+}
+}
}
diff --git
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/DynamicMappingGenerator.java
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/DynamicMappingGenerator.java
index 35c6c2e..e1f6f0e 100644
---
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/DynamicMappingGenerator.java
+++
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/DynamicMappingGenerator.java
@@ -18,11 +18,10 @@
*/
package org.apache.johnzon.mapper;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
import javax.json.JsonValue;
import javax.json.stream.JsonGenerator;
+import java.math.BigDecimal;
+import java.math.BigInteger;
public class DynamicMappingGenerator implements MappingGenerator {
private final MappingGenerator delegate;
@@ -30,7 +29,7 @@ public class DynamicMappingGenerator implements
MappingGenerator {
private final Runnable writeEnd;
private final String keyName;
-private InObjectOrPrimitiveJsonGenerator generator;
+protected InObjectOrPrimitiv
[openwebbeans] branch master updated: [OWB-1368] adding jakarta boms
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 5b55cbb [OWB-1368] adding jakarta boms
5b55cbb is described below
commit 5b55cbb77897f5908f836d336226c2cefcbdb2ca
Author: Romain Manni-Bucau
AuthorDate: Thu Feb 4 08:09:03 2021 +0100
[OWB-1368] adding jakarta boms
---
bom/openwebbeans-se-bom/pom.xml | 108 +++
bom/openwebbeans-web-bom/pom.xml | 103 +
bom/pom.xml | 38 ++
pom.xml | 1 +
src/site/apt/jakarta.apt | 11
5 files changed, 261 insertions(+)
diff --git a/bom/openwebbeans-se-bom/pom.xml b/bom/openwebbeans-se-bom/pom.xml
new file mode 100644
index 000..f2dfa56
--- /dev/null
+++ b/bom/openwebbeans-se-bom/pom.xml
@@ -0,0 +1,108 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+
+bom
+org.apache.openwebbeans.bom
+2.0.22-SNAPSHOT
+
+ 4.0.0
+
+ openwebbeans-se-bom
+ SE BOM
+ Apache OpenWebBeans SE BOM
+ pom
+
+
+
+ org.apache.geronimo.specs
+ geronimo-annotation_1.3_spec
+ ${geronimo_annotation.version}
+ jakarta
+
+
+ org.apache.geronimo.specs
+ geronimo-jcdi_2.0_spec
+ ${geronimo_cdi.version}
+ jakarta
+
+
+ org.apache.geronimo.specs
+ geronimo-atinject_1.0_spec
+ ${geronimo_atinject.version}
+ jakarta
+
+
+ org.apache.geronimo.specs
+ geronimo-interceptor_1.2_spec
+ ${geronimo_interceptor.version}
+ jakarta
+
+
+
+ org.apache.openwebbeans
+ openwebbeans-spi
+ ${project.version}
+ jakarta
+
+
+ org.apache.openwebbeans
+ *
+
+
+ org.apache.geronimo.specs
+ *
+
+
+
+
+ org.apache.openwebbeans
+ openwebbeans-impl
+ ${project.version}
+ jakarta
+
+
+ org.apache.openwebbeans
+ *
+
+
+ org.apache.geronimo.specs
+ *
+
+
+
+
+ org.apache.openwebbeans
+ openwebbeans-se
+ ${project.version}
+ jakarta
+
+
+ org.apache.openwebbeans
+ *
+
+
+ org.apache.geronimo.specs
+ *
+
+
+
+
+
\ No newline at end of file
diff --git a/bom/openwebbeans-web-bom/pom.xml b/bom/openwebbeans-web-bom/pom.xml
new file mode 100644
index 000..d8108ca
--- /dev/null
+++ b/bom/openwebbeans-web-bom/pom.xml
@@ -0,0 +1,103 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+
+bom
+org.apache.openwebbeans.bom
+2.0.22-SNAPSHOT
+
+ 4.0.0
+
+ openwebbeans-web-bom
+ Web BOM
+ Apache OpenWebBeans Web BOM
+ pom
+
+
+
+
+
+ org.apache.openwebbeans
+ openwebbeans-spi
+ ${project.version}
+ jakarta
+
+
+ org.apache.openwebbeans
+ *
+
+
+ org.apache.geronimo.specs
+ *
+
+
+
+
+ org.apache.openwebbeans
+ openwebbeans-impl
+ ${project.version}
+ jakarta
+
+
+ org.apache.openwebbeans
+ *
+
+
+ org.apache.geronimo.specs
+ *
+
+
+
+
+ org.apache.openwebbeans
+ openwebbeans-el22
+ ${project.version}
+ jakarta
+
+
+ org.apache.openwebbeans
+ *
+
+
+ org.apache.geronimo.specs
+ *
+
+
+
+
+ org.apache.openwebbeans
+ openwebbeans-web
+ ${project.version}
+ jakarta
+
+
+ org.apache.openwebbeans
+ *
+
+
+ org.apache.geronimo.specs
+ *
+
+
+
+
+
\ No newline at end of file
diff --git a/bom/pom.xml b/bom/pom.xml
new file mode 100644
index 000..70d9e61
--- /dev/null
+++ b/bom/pom.xml
@@ -0,0 +1,38 @@
+
+
+http://maven.apache.org/POM/4.0.0;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+
+openwebbeans
+org.apache.openwebbeans
+2.0.22-SNAPSHOT
+
+ 4.0.0
+
+ org.apache.openwebbeans.bom
+ bom
+ BOM
+ Apache OpenWebBeans BOM parent, mainly to simplify jakarta
stack consumption
[openwebbeans-meecrowave] branch master updated: [MEECROWAVE-277] tomcat 9.0.43
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 02c0e8f [MEECROWAVE-277] tomcat 9.0.43
02c0e8f is described below
commit 02c0e8f4b02c643c88f1265727a1ef78c49f2f02
Author: Romain Manni-Bucau
AuthorDate: Wed Feb 3 08:35:02 2021 +0100
[MEECROWAVE-277] tomcat 9.0.43
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7dbc148..07fd87b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
${project.groupId}.${project.artifactId}
4.13.1
-9.0.41
+9.0.43
2.0.20
3.4.2
1.2.8
[johnzon] branch master updated: [JOHNZON-333] align both writePrimitives methods of MappingGeneratorImpl
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/johnzon.git
The following commit(s) were added to refs/heads/master by this push:
new f96fcea [JOHNZON-333] align both writePrimitives methods of
MappingGeneratorImpl
f96fcea is described below
commit f96fceae0316cdf5f7cf406def46486d48c4805c
Author: Romain Manni-Bucau
AuthorDate: Tue Jan 26 08:56:04 2021 +0100
[JOHNZON-333] align both writePrimitives methods of MappingGeneratorImpl
---
.../apache/johnzon/jsonb/DefaultMappingTest.java | 2 +-
.../org/apache/johnzon/jsonb/JsonbWriteTest.java | 22 +
.../java/org/apache/johnzon/mapper/Mapper.java | 37 ++
.../johnzon/mapper/MappingGeneratorImpl.java | 6 +++-
4 files changed, 37 insertions(+), 30 deletions(-)
diff --git
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/DefaultMappingTest.java
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/DefaultMappingTest.java
index c930b44..5c7f4e2 100644
---
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/DefaultMappingTest.java
+++
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/DefaultMappingTest.java
@@ -151,7 +151,7 @@ public class DefaultMappingTest {
@Test
public void simpleValues() {
-assertEquals("\"\"strValue\"\"", JSONB.toJson("\"strValue\""));
+assertEquals("\"\\\"strValue\\\"\"", JSONB.toJson("\"strValue\""));
assertEquals("\"true\"", JSONB.toJson("true"));
assertEquals("\"false\"", JSONB.toJson("false"));
assertEquals("\"null\"", JSONB.toJson("null"));
diff --git
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbWriteTest.java
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbWriteTest.java
index 36b41a5..60fbfdb 100644
--- a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbWriteTest.java
+++ b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbWriteTest.java
@@ -23,6 +23,7 @@ import org.junit.Test;
import javax.json.bind.Jsonb;
import javax.json.bind.JsonbBuilder;
import javax.json.bind.JsonbConfig;
+import javax.json.bind.adapter.JsonbAdapter;
import javax.json.bind.annotation.JsonbCreator;
import javax.json.bind.annotation.JsonbDateFormat;
import javax.json.bind.annotation.JsonbProperty;
@@ -44,6 +45,27 @@ import static org.junit.Assert.assertEquals;
public class JsonbWriteTest {
@Test
+public void rawAdapter() throws Exception {
+try (final Jsonb jsonb = JsonbBuilder.create(new JsonbConfig()
+.withAdapters(new JsonbAdapter() {
+@Override
+public String adaptToJson(final SimpleProperty obj) {
+return obj.getValue();
+}
+
+@Override
+public SimpleProperty adaptFromJson(final String obj) {
+throw new UnsupportedOperationException();
+}
+}))) {
+final SimpleProperty property = new SimpleProperty();
+property.setValue("ok");
+final String json = jsonb.toJson(property, Throwable.class);
+assertEquals("\"ok\"", json);
+}
+}
+
+@Test
public void throwable() throws Exception {
try (final Jsonb jsonb = JsonbBuilder.create(new JsonbConfig()
.withPropertyOrderStrategy(PropertyOrderStrategy.LEXICOGRAPHICAL))){
diff --git a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java
index 775e7b6..3e7aaf7 100644
--- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/Mapper.java
@@ -168,45 +168,26 @@ public class Mapper implements Closeable {
}
public void writeObject(final Object object, final Writer stream) {
-if (JsonValue.class.isInstance(object)
-|| Boolean.class.isInstance(object) ||
String.class.isInstance(object) || Number.class.isInstance(object)
-|| object == null) {
-try {
-final String valueOf = String.valueOf(object);
-if (object instanceof String) {
-stream.write('"');
-stream.write(valueOf);
-stream.write('"');
-} else {
-stream.write(valueOf);
-}
+if (object == null) {
+try (final Writer w = stream) {
+w.write("null");
} catch (final IOException e) {
throw new
[johnzon] 03/03: [JOHNZON-332] merge jsonb builder with new skipAccessModeWrapper toggle for consistency
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/johnzon.git
commit 343c8318c0236a7fa04f308261c4a4b59cd60745
Author: Romain Manni-Bucau
AuthorDate: Mon Jan 25 11:54:35 2021 +0100
[JOHNZON-332] merge jsonb builder with new skipAccessModeWrapper toggle for
consistency
---
.../org/apache/johnzon/jsonb/JohnzonBuilder.java | 41 ++
1 file changed, 19 insertions(+), 22 deletions(-)
diff --git
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
index 52878dc..0b749a4 100644
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
@@ -38,7 +38,6 @@ import org.apache.johnzon.mapper.ObjectConverter;
import org.apache.johnzon.mapper.SerializeValueFilter;
import org.apache.johnzon.mapper.access.AccessMode;
import org.apache.johnzon.mapper.access.FieldAndMethodAccessMode;
-import org.apache.johnzon.mapper.access.KnownNotOpenedJavaTypesAccessMode;
import org.apache.johnzon.mapper.converter.LocaleConverter;
import org.apache.johnzon.mapper.internal.AdapterKey;
@@ -212,29 +211,27 @@ public class JohnzonBuilder implements JsonbBuilder {
throw new IllegalArgumentException("Unsupported factory: " + val);
}).orElseGet(() -> findFactory(skipCdi));
+ofNullable(config.getProperty("johnzon.skip-exception-serialization"))
+.map(v -> Boolean.parseBoolean(String.valueOf(v)))
+.ifPresent(builder::setSkipAccessModeWrapper);
+
final AccessMode accessMode = config.getProperty("johnzon.accessMode")
.map(this::toAccessMode)
-.orElseGet(() -> {
-final AccessMode access = new JsonbAccessMode(
-propertyNamingStrategy, orderValue,
visibilityStrategy,
-
!namingStrategyValue.orElse("").equals(PropertyNamingStrategy.CASE_INSENSITIVE),
-builder.getAdapters(),
-factory, jsonp, builderFactorySupplier,
parserFactoryProvider,
-config.getProperty("johnzon.accessModeDelegate")
-.map(this::toAccessMode)
-.orElseGet(() -> new
FieldAndMethodAccessMode(true, true, false, true)),
-
config.getProperty("johnzon.failOnMissingCreatorValues")
-.map(this::toBool)
-.orElse(true) /*spec 1.0 requirement*/,
-isNillable,
-config.getProperty("johnzon.supportsPrivateAccess")
-.map(this::toBool)
-.orElse(false));
-return
ofNullable(config.getProperty("johnzon.enable-exception-serialization"))
-.map(v -> Boolean.parseBoolean(String.valueOf(v)))
-.map(it -> it ? new
KnownNotOpenedJavaTypesAccessMode(access) : access)
-.orElseGet(() -> new
KnownNotOpenedJavaTypesAccessMode(access));
-});
+.orElseGet(() -> new JsonbAccessMode(
+propertyNamingStrategy, orderValue, visibilityStrategy,
+
!namingStrategyValue.orElse("").equals(PropertyNamingStrategy.CASE_INSENSITIVE),
+builder.getAdapters(),
+factory, jsonp, builderFactorySupplier,
parserFactoryProvider,
+config.getProperty("johnzon.accessModeDelegate")
+.map(this::toAccessMode)
+.orElseGet(() -> new
FieldAndMethodAccessMode(true, true, false, true)),
+
config.getProperty("johnzon.failOnMissingCreatorValues")
+.map(this::toBool)
+.orElse(true) /*spec 1.0 requirement*/,
+isNillable,
+config.getProperty("johnzon.supportsPrivateAccess")
+.map(this::toBool)
+.orElse(false)));
builder.setAccessMode(accessMode);
// user adapters
[johnzon] 02/03: [JOHNZON-332] add skipAccessModeWrapper toggle for backward compatibility
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/johnzon.git
commit 0d06bd02fb9e8e3d9cc26dc90dd004e20b0b3b0a
Author: Romain Manni-Bucau
AuthorDate: Mon Jan 25 11:51:16 2021 +0100
[JOHNZON-332] add skipAccessModeWrapper toggle for backward compatibility
---
.../src/main/java/org/apache/johnzon/mapper/MapperBuilder.java| 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git
a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MapperBuilder.java
b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MapperBuilder.java
index cbb2213..9646a90 100644
--- a/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MapperBuilder.java
+++ b/johnzon-mapper/src/main/java/org/apache/johnzon/mapper/MapperBuilder.java
@@ -106,6 +106,7 @@ public class MapperBuilder {
private boolean useBigDecimalForObjectNumbers;
private boolean supportEnumContainerDeserialization = true;
private Function, MapperConfig.CustomEnumConverter>
enumConverterFactory = type -> new EnumConverter(type);
+private boolean skipAccessModeWrapper;
// @experimental polymorphic api
private Function> typeLoader;
@@ -200,7 +201,7 @@ public class MapperBuilder {
throw new IllegalStateException("AccessMode is not an
BaseAccessMode");
}
}
-if (!KnownNotOpenedJavaTypesAccessMode.class.isInstance(accessMode)) {
+if (!skipAccessModeWrapper &&
!KnownNotOpenedJavaTypesAccessMode.class.isInstance(accessMode)) {
accessMode = new KnownNotOpenedJavaTypesAccessMode(accessMode);
}
@@ -561,4 +562,9 @@ public class MapperBuilder {
this.discriminator = value;
return this;
}
+
+public MapperBuilder setSkipAccessModeWrapper(final boolean
skipAccessModeWrapper) {
+this.skipAccessModeWrapper = skipAccessModeWrapper;
+return this;
+}
}
[johnzon] 01/03: [JOHNZON-332] exception de/serialization
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/johnzon.git
commit 4f53103f64c9f7c0ec645c1b0d04c1d34f9a8dcf
Author: Romain Manni-Bucau
AuthorDate: Mon Jan 25 11:48:36 2021 +0100
[JOHNZON-332] exception de/serialization
---
.../org/apache/johnzon/jsonb/JohnzonBuilder.java | 37 +-
.../org/apache/johnzon/jsonb/JsonbWriteTest.java | 31 ++
.../org/apache/johnzon/mapper/MapperBuilder.java | 4 +
.../access/KnownNotOpenedJavaTypesAccessMode.java | 415 +
.../johnzon/mapper/CircularExceptionTest.java | 4 +-
5 files changed, 475 insertions(+), 16 deletions(-)
diff --git
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
index ab82053..52878dc 100644
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonBuilder.java
@@ -38,6 +38,7 @@ import org.apache.johnzon.mapper.ObjectConverter;
import org.apache.johnzon.mapper.SerializeValueFilter;
import org.apache.johnzon.mapper.access.AccessMode;
import org.apache.johnzon.mapper.access.FieldAndMethodAccessMode;
+import org.apache.johnzon.mapper.access.KnownNotOpenedJavaTypesAccessMode;
import org.apache.johnzon.mapper.converter.LocaleConverter;
import org.apache.johnzon.mapper.internal.AdapterKey;
@@ -213,21 +214,27 @@ public class JohnzonBuilder implements JsonbBuilder {
final AccessMode accessMode = config.getProperty("johnzon.accessMode")
.map(this::toAccessMode)
-.orElseGet(() -> new JsonbAccessMode(
-propertyNamingStrategy, orderValue, visibilityStrategy,
-
!namingStrategyValue.orElse("").equals(PropertyNamingStrategy.CASE_INSENSITIVE),
-builder.getAdapters(),
-factory, jsonp, builderFactorySupplier,
parserFactoryProvider,
-config.getProperty("johnzon.accessModeDelegate")
-.map(this::toAccessMode)
-.orElseGet(() -> new
FieldAndMethodAccessMode(true, true, false, true)),
-
config.getProperty("johnzon.failOnMissingCreatorValues")
- .map(this::toBool)
- .orElse(true) /*spec 1.0 requirement*/,
-isNillable,
-config.getProperty("johnzon.supportsPrivateAccess")
-.map(this::toBool)
-.orElse(false)));
+.orElseGet(() -> {
+final AccessMode access = new JsonbAccessMode(
+propertyNamingStrategy, orderValue,
visibilityStrategy,
+
!namingStrategyValue.orElse("").equals(PropertyNamingStrategy.CASE_INSENSITIVE),
+builder.getAdapters(),
+factory, jsonp, builderFactorySupplier,
parserFactoryProvider,
+config.getProperty("johnzon.accessModeDelegate")
+.map(this::toAccessMode)
+.orElseGet(() -> new
FieldAndMethodAccessMode(true, true, false, true)),
+
config.getProperty("johnzon.failOnMissingCreatorValues")
+.map(this::toBool)
+.orElse(true) /*spec 1.0 requirement*/,
+isNillable,
+config.getProperty("johnzon.supportsPrivateAccess")
+.map(this::toBool)
+.orElse(false));
+return
ofNullable(config.getProperty("johnzon.enable-exception-serialization"))
+.map(v -> Boolean.parseBoolean(String.valueOf(v)))
+.map(it -> it ? new
KnownNotOpenedJavaTypesAccessMode(access) : access)
+.orElseGet(() -> new
KnownNotOpenedJavaTypesAccessMode(access));
+});
builder.setAccessMode(accessMode);
// user adapters
diff --git
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbWriteTest.java
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbWriteTest.java
index 95541ee..36b41a5 100644
--- a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbWriteTest.java
+++ b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbWriteTest.java
@@ -22,8 +22,11 @@ import org.junit.Test;
import javax.json.bind.Jsonb;
import javax.json.bind.JsonbBuilder;
+import javax.json.bind.
[johnzon] branch master updated: 1.2.10 download page update
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/johnzon.git The following commit(s) were added to refs/heads/master by this push: new a6e569e 1.2.10 download page update a6e569e is described below commit a6e569e87f0466d7fb211326718c0866303933db Author: Romain Manni-Bucau AuthorDate: Mon Jan 25 09:25:51 2021 +0100 1.2.10 download page update --- src/site/markdown/download.md | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/site/markdown/download.md b/src/site/markdown/download.md index f321303..df5ef3b 100644 --- a/src/site/markdown/download.md +++ b/src/site/markdown/download.md @@ -41,16 +41,16 @@ Apache Johnzon 1.1.x implements the JSON-P 1.1 and JSON-B 1.0 specifications whi Binaries The binary distribution contains all Johnzon modules. -* [apache-johnzon-1.2.8-bin.zip](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-1.2.8/apache-johnzon-1.2.8-bin.zip) -* [apache-johnzon-1.2.8-bin.zip.sha1](https://www.apache.org/dist/johnzon/johnzon-1.2.8/apache-johnzon-1.2.8-bin.zip.sha1) -* [apache-johnzon-1.2.8-bin.zip.asc](https://www.apache.org/dist/johnzon/johnzon-1.2.8/apache-johnzon-1.2.8-bin.zip.asc) +* [apache-johnzon-1.2.10-bin.zip](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-1.2.10/apache-johnzon-1.2.10-bin.zip) +* [apache-johnzon-1.2.10-bin.zip.sha1](https://www.apache.org/dist/johnzon/johnzon-1.2.10/apache-johnzon-1.2.10-bin.zip.sha1) +* [apache-johnzon-1.2.10-bin.zip.asc](https://www.apache.org/dist/johnzon/johnzon-1.2.10/apache-johnzon-1.2.10-bin.zip.asc) Source Should you want to build any of the above binaries, this source bundle is the right one and covers them all. -* [johnzon-1.2.8-source-release.zip](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-1.2.8/johnzon-1.2.8-source-release.zip) -* [johnzon-1.2.8-source-release.zip.sha1](https://www.apache.org/dist/johnzon/johnzon-1.2.8/johnzon-1.2.8-source-release.zip.sha1) -* [johnzon-1.2.8-source-release.zip.asc](https://www.apache.org/dist/johnzon/johnzon-1.2.8/johnzon-1.2.8-source-release.zip.asc) +* [johnzon-1.2.10-source-release.zip](https://www.apache.org/dyn/closer.lua/johnzon/johnzon-1.2.10/johnzon-1.2.10-source-release.zip) +* [johnzon-1.2.10-source-release.zip.sha1](https://www.apache.org/dist/johnzon/johnzon-1.2.10/johnzon-1.2.10-source-release.zip.sha1) +* [johnzon-1.2.10-source-release.zip.asc](https://www.apache.org/dist/johnzon/johnzon-1.2.10/johnzon-1.2.10-source-release.zip.asc) ## Johnzon-1.0.x
svn commit: r1885876 - in /johnzon/site/publish: ./ apidocs/ apidocs/org/apache/johnzon/core/ apidocs/org/apache/johnzon/core/class-use/ apidocs/org/apache/johnzon/core/spi/ apidocs/org/apache/johnzon
Author: rmannibucau Date: Sun Jan 24 12:56:05 2021 New Revision: 1885876 URL: http://svn.apache.org/viewvc?rev=1885876=rev Log: Site checkin for project Apache Johnzon [This commit notification would consist of 83 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r45558 - in /dev/johnzon: apache-johnzon-1.2.10-src.zip apache-johnzon-1.2.10-src.zip.asc apache-johnzon-1.2.10-src.zip.sha512
Author: rmannibucau Date: Sun Jan 24 12:45:52 2021 New Revision: 45558 Log: johnzon dev cleanup of 1.2.10 artifacts Removed: dev/johnzon/apache-johnzon-1.2.10-src.zip dev/johnzon/apache-johnzon-1.2.10-src.zip.asc dev/johnzon/apache-johnzon-1.2.10-src.zip.sha512
svn commit: r45557 - in /release/johnzon: johnzon-1.2.10/ johnzon-1.2.10/apache-johnzon-1.2.10-src.zip johnzon-1.2.10/apache-johnzon-1.2.10-src.zip.asc johnzon-1.2.10/apache-johnzon-1.2.10-src.zip.sha
Author: rmannibucau Date: Sun Jan 24 12:45:40 2021 New Revision: 45557 Log: johnzon release 1.2.10 artifacts Added: release/johnzon/johnzon-1.2.10/ release/johnzon/johnzon-1.2.10/apache-johnzon-1.2.10-src.zip (with props) release/johnzon/johnzon-1.2.10/apache-johnzon-1.2.10-src.zip.asc release/johnzon/johnzon-1.2.10/apache-johnzon-1.2.10-src.zip.sha512 Removed: release/johnzon/johnzon-1.2.9/ Added: release/johnzon/johnzon-1.2.10/apache-johnzon-1.2.10-src.zip == Binary file - no diff available. Propchange: release/johnzon/johnzon-1.2.10/apache-johnzon-1.2.10-src.zip -- svn:mime-type = application/octet-stream Added: release/johnzon/johnzon-1.2.10/apache-johnzon-1.2.10-src.zip.asc == --- release/johnzon/johnzon-1.2.10/apache-johnzon-1.2.10-src.zip.asc (added) +++ release/johnzon/johnzon-1.2.10/apache-johnzon-1.2.10-src.zip.asc Sun Jan 24 12:45:40 2021 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEz4CgVaKtKOnvv5QqcxKfWN5h7L0FAl/9yYwACgkQcxKfWN5h +7L08yAf+Ibx2aG8fE9Prc8dnb1YaqgrQb2CWObiPYGqUWTA6y3zf8j0gmijf4iHd +BeLW2RK/xJn04DXEn50MU/Hr0ets+U3ioVQkGTye4/nl5ghyYMc+wDNpOcfWkBlj +AZYAer43IzevKd2lf5iutLP+vzRU9iYz5tHdgBuuh1kg/X7zDqrXJbqzIlLTIUQK +7msHnqTYus0/quut8/1KRN8rljizukGVqrUhINc7bBC3SoP9RRHmbDmlTGiui8qE +uxK0P4RUDhF3K3ZwamooaD1QxMOj/0Br4Us4CvY6Wd3rkWtbghXIdBMghjBWxLRh +B3dDVmgeaDU/eZPKvpYimiqEBowTqQ== +=sZgc +-END PGP SIGNATURE- Added: release/johnzon/johnzon-1.2.10/apache-johnzon-1.2.10-src.zip.sha512 == --- release/johnzon/johnzon-1.2.10/apache-johnzon-1.2.10-src.zip.sha512 (added) +++ release/johnzon/johnzon-1.2.10/apache-johnzon-1.2.10-src.zip.sha512 Sun Jan 24 12:45:40 2021 @@ -0,0 +1 @@ +71bee67605d2e7920c61b1ecedafd243792e46c03a684860ee9971c7e31d2d57835abe8495663cd6d37c0e55b81b084bffd8db8f8b21d733ff3f35e5cf7ac962 apache-johnzon-1.2.10-src.zip
[johnzon] branch master updated: [JOHNZON-331] handle toJson(object, type) properly for list case
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/johnzon.git
The following commit(s) were added to refs/heads/master by this push:
new 15a4cc6 [JOHNZON-331] handle toJson(object,type) properly for list
case
15a4cc6 is described below
commit 15a4cc69344b3a0dd7ee80326cc064fa0972a779
Author: Romain Manni-Bucau
AuthorDate: Sat Jan 23 18:03:10 2021 +0100
[JOHNZON-331] handle toJson(object,type) properly for list case
---
.../org/apache/johnzon/jsonb/JohnzonJsonb.java | 6 +-
.../org/apache/johnzon/jsonb/JsonbWriteTest.java | 25 +-
2 files changed, 29 insertions(+), 2 deletions(-)
diff --git
a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonJsonb.java
b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonJsonb.java
index 9850262..1d6f1b1 100644
--- a/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonJsonb.java
+++ b/johnzon-jsonb/src/main/java/org/apache/johnzon/jsonb/JohnzonJsonb.java
@@ -44,11 +44,14 @@ import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.math.BigInteger;
import java.util.Collection;
+import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.OptionalDouble;
import java.util.OptionalInt;
import java.util.OptionalLong;
+import java.util.Set;
+import java.util.SortedSet;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Consumer;
import java.util.function.Supplier;
@@ -449,7 +452,8 @@ public class JohnzonJsonb implements Jsonb, AutoCloseable,
JsonbExtension {
private boolean isCollection(final Type runtimeType) {
if (!ParameterizedType.class.isInstance(runtimeType)) {
-return false;
+return runtimeType == List.class || runtimeType == Set.class ||
+runtimeType == SortedSet.class || runtimeType ==
Collection.class;
}
final Type rawType =
ParameterizedType.class.cast(runtimeType).getRawType();
return Class.class.isInstance(rawType) &&
Collection.class.isAssignableFrom(Class.class.cast(rawType));
diff --git
a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbWriteTest.java
b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbWriteTest.java
index cec22a1..95541ee 100644
--- a/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbWriteTest.java
+++ b/johnzon-jsonb/src/test/java/org/apache/johnzon/jsonb/JsonbWriteTest.java
@@ -21,22 +21,45 @@ package org.apache.johnzon.jsonb;
import org.junit.Test;
import javax.json.bind.Jsonb;
+import javax.json.bind.JsonbBuilder;
import javax.json.bind.annotation.JsonbDateFormat;
import javax.json.bind.annotation.JsonbProperty;
import javax.json.bind.spi.JsonbProvider;
-
import java.io.ByteArrayOutputStream;
import java.io.StringWriter;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import java.util.TreeMap;
import static java.util.Arrays.asList;
import static org.junit.Assert.assertEquals;
public class JsonbWriteTest {
@Test
+public void mapOfSimple() throws Exception {
+final Map list = new TreeMap<>();
+list.put("1", new Simple());
+list.put("2", new Simple());
+try (final Jsonb jsonb = JsonbBuilder.create()){
+assertEquals("{\"1\":{},\"2\":{}}", jsonb.toJson(list, Map.class));
+}
+}
+
+@Test
+public void listOfSimple() throws Exception {
+final List list = new ArrayList<>();
+list.add(new Simple());
+list.add(new Simple());
+try (final Jsonb jsonb = JsonbBuilder.create()){
+assertEquals("[{},{}]", jsonb.toJson(list, List.class));
+}
+}
+
+@Test
public void boolAsString() {
assertEquals("true",
JsonbProvider.provider().create().build().toJson(Boolean.TRUE));
}
svn commit: r45380 - in /dev/johnzon: apache-johnzon-1.2.10-src.zip apache-johnzon-1.2.10-src.zip.asc apache-johnzon-1.2.10-src.zip.sha512 johnzon-1.2.9-source-release.zip johnzon-1.2.9-source-release
Author: rmannibucau Date: Tue Jan 12 16:10:36 2021 New Revision: 45380 Log: johnzon 1.2.10 vote artifacts Added: dev/johnzon/apache-johnzon-1.2.10-src.zip (with props) dev/johnzon/apache-johnzon-1.2.10-src.zip.asc dev/johnzon/apache-johnzon-1.2.10-src.zip.sha512 Removed: dev/johnzon/johnzon-1.2.9-source-release.zip dev/johnzon/johnzon-1.2.9-source-release.zip.asc dev/johnzon/johnzon-1.2.9-source-release.zip.sha512 Added: dev/johnzon/apache-johnzon-1.2.10-src.zip == Binary file - no diff available. Propchange: dev/johnzon/apache-johnzon-1.2.10-src.zip -- svn:mime-type = application/octet-stream Added: dev/johnzon/apache-johnzon-1.2.10-src.zip.asc == --- dev/johnzon/apache-johnzon-1.2.10-src.zip.asc (added) +++ dev/johnzon/apache-johnzon-1.2.10-src.zip.asc Tue Jan 12 16:10:36 2021 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEz4CgVaKtKOnvv5QqcxKfWN5h7L0FAl/9yYwACgkQcxKfWN5h +7L08yAf+Ibx2aG8fE9Prc8dnb1YaqgrQb2CWObiPYGqUWTA6y3zf8j0gmijf4iHd +BeLW2RK/xJn04DXEn50MU/Hr0ets+U3ioVQkGTye4/nl5ghyYMc+wDNpOcfWkBlj +AZYAer43IzevKd2lf5iutLP+vzRU9iYz5tHdgBuuh1kg/X7zDqrXJbqzIlLTIUQK +7msHnqTYus0/quut8/1KRN8rljizukGVqrUhINc7bBC3SoP9RRHmbDmlTGiui8qE +uxK0P4RUDhF3K3ZwamooaD1QxMOj/0Br4Us4CvY6Wd3rkWtbghXIdBMghjBWxLRh +B3dDVmgeaDU/eZPKvpYimiqEBowTqQ== +=sZgc +-END PGP SIGNATURE- Added: dev/johnzon/apache-johnzon-1.2.10-src.zip.sha512 == --- dev/johnzon/apache-johnzon-1.2.10-src.zip.sha512 (added) +++ dev/johnzon/apache-johnzon-1.2.10-src.zip.sha512 Tue Jan 12 16:10:36 2021 @@ -0,0 +1 @@ +71bee67605d2e7920c61b1ecedafd243792e46c03a684860ee9971c7e31d2d57835abe8495663cd6d37c0e55b81b084bffd8db8f8b21d733ff3f35e5cf7ac962 apache-johnzon-1.2.10-src.zip
[johnzon] 01/02: [maven-release-plugin] prepare release v1.2.10
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/johnzon.git commit 7e1013bef9b3f38cb9d587b9a3dcb418f8937130 Author: Romain Manni-Bucau AuthorDate: Tue Jan 12 17:07:07 2021 +0100 [maven-release-plugin] prepare release v1.2.10 --- johnzon-core/pom.xml | 2 +- johnzon-distribution/pom.xml | 2 +- johnzon-jaxrs/pom.xml| 2 +- johnzon-json-extras/pom.xml | 2 +- johnzon-jsonb/pom.xml| 2 +- johnzon-jsonlogic/pom.xml| 2 +- johnzon-jsonp-strict/pom.xml | 2 +- johnzon-jsonschema/pom.xml | 2 +- johnzon-mapper/pom.xml | 2 +- johnzon-maven-plugin/pom.xml | 2 +- johnzon-osgi/pom.xml | 2 +- johnzon-websocket/pom.xml| 2 +- pom.xml | 4 ++-- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml index c13961d..4f1fdaa 100644 --- a/johnzon-core/pom.xml +++ b/johnzon-core/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.10-SNAPSHOT +1.2.10 4.0.0 diff --git a/johnzon-distribution/pom.xml b/johnzon-distribution/pom.xml index 43ef518..52c3637 100644 --- a/johnzon-distribution/pom.xml +++ b/johnzon-distribution/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.10-SNAPSHOT +1.2.10 4.0.0 diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml index 59be69e..b5a8cc2 100644 --- a/johnzon-jaxrs/pom.xml +++ b/johnzon-jaxrs/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.10-SNAPSHOT +1.2.10 4.0.0 diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml index 0a1f625..1d5c8bb 100644 --- a/johnzon-json-extras/pom.xml +++ b/johnzon-json-extras/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.10-SNAPSHOT +1.2.10 4.0.0 diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml index 0e3b819..3b93649 100644 --- a/johnzon-jsonb/pom.xml +++ b/johnzon-jsonb/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.10-SNAPSHOT +1.2.10 4.0.0 diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml index bc9e968..f844ed9 100644 --- a/johnzon-jsonlogic/pom.xml +++ b/johnzon-jsonlogic/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.10-SNAPSHOT +1.2.10 4.0.0 diff --git a/johnzon-jsonp-strict/pom.xml b/johnzon-jsonp-strict/pom.xml index d66ff36..65257fa 100644 --- a/johnzon-jsonp-strict/pom.xml +++ b/johnzon-jsonp-strict/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.10-SNAPSHOT +1.2.10 4.0.0 diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml index 94e8f4f..a274038 100644 --- a/johnzon-jsonschema/pom.xml +++ b/johnzon-jsonschema/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.10-SNAPSHOT +1.2.10 4.0.0 diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml index cb340f1..d71fe56 100644 --- a/johnzon-mapper/pom.xml +++ b/johnzon-mapper/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.10-SNAPSHOT +1.2.10 4.0.0 diff --git a/johnzon-maven-plugin/pom.xml b/johnzon-maven-plugin/pom.xml index 6373765..c2701b8 100644 --- a/johnzon-maven-plugin/pom.xml +++ b/johnzon-maven-plugin/pom.xml @@ -23,7 +23,7 @@ johnzon org.apache.johnzon -1.2.10-SNAPSHOT +1.2.10 johnzon-maven-plugin diff --git a/johnzon-osgi/pom.xml b/johnzon-osgi/pom.xml index 9f5b54b..207f87a 100644 --- a/johnzon-osgi/pom.xml +++ b/johnzon-osgi/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.10-SNAPSHOT +1.2.10 4.0.0 diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml index 5112640..8ac928b 100644 --- a/johnzon-websocket/pom.xml +++ b/johnzon-websocket/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.10-SNAPSHOT +1.2.10 4.0.0 diff --git a/pom.xml b/pom.xml index 6a44f98..03ee663 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.johnzon johnzon pom - 1.2.10-SNAPSHOT + 1.2.10 Apache Johnzon Apache Johnzon is an implementation of JSR-353 (JavaTM API for JSON Processing). 2014 @@ -471,7 +471,7 @@ scm:git:https://git-wip-us.apache.org/repos/asf/johnzon.git scm:git:https://git-wip-us.apache.org/repos/asf/johnzon.git https://git-wip-us.apache.org/repos/asf?p=johnzon.git -HEAD +v1.2.10
[johnzon] 02/02: [maven-release-plugin] prepare for next development iteration
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/johnzon.git commit cfd94f9c47e0242f383ee645519748da4206e4fc Author: Romain Manni-Bucau AuthorDate: Tue Jan 12 17:07:17 2021 +0100 [maven-release-plugin] prepare for next development iteration --- johnzon-core/pom.xml | 2 +- johnzon-distribution/pom.xml | 2 +- johnzon-jaxrs/pom.xml| 2 +- johnzon-json-extras/pom.xml | 2 +- johnzon-jsonb/pom.xml| 2 +- johnzon-jsonlogic/pom.xml| 2 +- johnzon-jsonp-strict/pom.xml | 2 +- johnzon-jsonschema/pom.xml | 2 +- johnzon-mapper/pom.xml | 2 +- johnzon-maven-plugin/pom.xml | 2 +- johnzon-osgi/pom.xml | 2 +- johnzon-websocket/pom.xml| 2 +- pom.xml | 4 ++-- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/johnzon-core/pom.xml b/johnzon-core/pom.xml index 4f1fdaa..ebb9452 100644 --- a/johnzon-core/pom.xml +++ b/johnzon-core/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.10 +1.2.11-SNAPSHOT 4.0.0 diff --git a/johnzon-distribution/pom.xml b/johnzon-distribution/pom.xml index 52c3637..a2dc861 100644 --- a/johnzon-distribution/pom.xml +++ b/johnzon-distribution/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.10 +1.2.11-SNAPSHOT 4.0.0 diff --git a/johnzon-jaxrs/pom.xml b/johnzon-jaxrs/pom.xml index b5a8cc2..867e5c3 100644 --- a/johnzon-jaxrs/pom.xml +++ b/johnzon-jaxrs/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.10 +1.2.11-SNAPSHOT 4.0.0 diff --git a/johnzon-json-extras/pom.xml b/johnzon-json-extras/pom.xml index 1d5c8bb..375e483 100644 --- a/johnzon-json-extras/pom.xml +++ b/johnzon-json-extras/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.10 +1.2.11-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonb/pom.xml b/johnzon-jsonb/pom.xml index 3b93649..a936cb7 100644 --- a/johnzon-jsonb/pom.xml +++ b/johnzon-jsonb/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.10 +1.2.11-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonlogic/pom.xml b/johnzon-jsonlogic/pom.xml index f844ed9..f51b2fd 100644 --- a/johnzon-jsonlogic/pom.xml +++ b/johnzon-jsonlogic/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.10 +1.2.11-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonp-strict/pom.xml b/johnzon-jsonp-strict/pom.xml index 65257fa..87a3469 100644 --- a/johnzon-jsonp-strict/pom.xml +++ b/johnzon-jsonp-strict/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.10 +1.2.11-SNAPSHOT 4.0.0 diff --git a/johnzon-jsonschema/pom.xml b/johnzon-jsonschema/pom.xml index a274038..db369aa 100644 --- a/johnzon-jsonschema/pom.xml +++ b/johnzon-jsonschema/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.10 +1.2.11-SNAPSHOT 4.0.0 diff --git a/johnzon-mapper/pom.xml b/johnzon-mapper/pom.xml index d71fe56..f42764a 100644 --- a/johnzon-mapper/pom.xml +++ b/johnzon-mapper/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.10 +1.2.11-SNAPSHOT 4.0.0 diff --git a/johnzon-maven-plugin/pom.xml b/johnzon-maven-plugin/pom.xml index c2701b8..926c3d1 100644 --- a/johnzon-maven-plugin/pom.xml +++ b/johnzon-maven-plugin/pom.xml @@ -23,7 +23,7 @@ johnzon org.apache.johnzon -1.2.10 +1.2.11-SNAPSHOT johnzon-maven-plugin diff --git a/johnzon-osgi/pom.xml b/johnzon-osgi/pom.xml index 207f87a..1355d5a 100644 --- a/johnzon-osgi/pom.xml +++ b/johnzon-osgi/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.10 +1.2.11-SNAPSHOT 4.0.0 diff --git a/johnzon-websocket/pom.xml b/johnzon-websocket/pom.xml index 8ac928b..c73c2f1 100644 --- a/johnzon-websocket/pom.xml +++ b/johnzon-websocket/pom.xml @@ -21,7 +21,7 @@ johnzon org.apache.johnzon -1.2.10 +1.2.11-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 03ee663..476b905 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.johnzon johnzon pom - 1.2.10 + 1.2.11-SNAPSHOT Apache Johnzon Apache Johnzon is an implementation of JSR-353 (JavaTM API for JSON Processing). 2014 @@ -471,7 +471,7 @@ scm:git:https://git-wip-us.apache.org/repos/asf/johnzon.git scm:git:https://git-wip-us.apache.org/repos/asf/johnzon.git https://git-wip-us.apache.org/repos/asf?p=johnzon.git -v1.2.10 +HEAD
[johnzon] branch master updated (f6c4c3c -> cfd94f9)
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/johnzon.git. from f6c4c3c [JOHNZON-330] add jsonschema generator new 7e1013b [maven-release-plugin] prepare release v1.2.10 new cfd94f9 [maven-release-plugin] prepare for next development iteration 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: johnzon-core/pom.xml | 2 +- johnzon-distribution/pom.xml | 2 +- johnzon-jaxrs/pom.xml| 2 +- johnzon-json-extras/pom.xml | 2 +- johnzon-jsonb/pom.xml| 2 +- johnzon-jsonlogic/pom.xml| 2 +- johnzon-jsonp-strict/pom.xml | 2 +- johnzon-jsonschema/pom.xml | 2 +- johnzon-mapper/pom.xml | 2 +- johnzon-maven-plugin/pom.xml | 2 +- johnzon-osgi/pom.xml | 2 +- johnzon-websocket/pom.xml| 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-)
[johnzon] annotated tag v1.2.10 created (now 3bdbad4)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to annotated tag v1.2.10 in repository https://gitbox.apache.org/repos/asf/johnzon.git. at 3bdbad4 (tag) tagging 7e1013bef9b3f38cb9d587b9a3dcb418f8937130 (commit) replaces v1.2.9 by Romain Manni-Bucau on Tue Jan 12 17:07:17 2021 +0100 - Log - [maven-release-plugin] copy for tag v1.2.10 --- This annotated tag includes the following new commits: new 7e1013b [maven-release-plugin] prepare release v1.2.10 The 1 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.
[openwebbeans-meecrowave] branch master updated: [MEECROWAVE-276] fix meecrowave-junit for @MeecrowaveConfig case
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 8a596d2 [MEECROWAVE-276] fix meecrowave-junit for @MeecrowaveConfig
case
8a596d2 is described below
commit 8a596d21f7d6786b9149b10b96ca76576da4d63e
Author: Romain Manni-Bucau
AuthorDate: Tue Jan 12 14:40:27 2021 +0100
[MEECROWAVE-276] fix meecrowave-junit for @MeecrowaveConfig case
---
.../src/main/jbake/content/testing/index.adoc | 6 ++
.../meecrowave/junit5/MeecrowaveExtension.java | 111 +++--
.../junit5/MeecrowaveTestLifecycleTest.java| 3 +
pom.xml| 2 +-
4 files changed, 68 insertions(+), 54 deletions(-)
diff --git a/meecrowave-doc/src/main/jbake/content/testing/index.adoc
b/meecrowave-doc/src/main/jbake/content/testing/index.adoc
index b112ae1..b229045 100644
--- a/meecrowave-doc/src/main/jbake/content/testing/index.adoc
+++ b/meecrowave-doc/src/main/jbake/content/testing/index.adoc
@@ -83,6 +83,7 @@ which is close to `MonoMeecrowave.Runner` in term of usage.
[source,java]
@MeecrowaveConfig /*(some config)*/
+@TestInstance(PER_CLASS)
public class MeecrowaveConfigTest {
@ConfigurationInject
private Meecrowave.Builder config;
@@ -109,6 +110,11 @@ TIP: JUnit 5 integration provides an
`@AfterFirstInjection` method and `@AfterLa
which can be used to setup/reset some environment using injections once for a
set of test methods.
The methods must not have any parameter.
+IMPORTANT: when not using `@TestInstance(PER_CLASS)`, container is started per
test method. Generally speaking you should try to align the scope of your
container to the scope of validity of your beans.
+For a library it is generally the class (so `@MeecrowaveConfig
@TestInstance(PER_CLASS)`) and for an application the whole test set (so
`@MonoMeecrowaveConfig`).
+Note that using an `Extension` you can adjust mocks or spy beans dynamically
without a container restart.
+Having the longest life time for the container will make your test suite
faster to execute.
+
== Arquillian Container
Container dependency:
diff --git
a/meecrowave-junit/src/main/java/org/apache/meecrowave/junit5/MeecrowaveExtension.java
b/meecrowave-junit/src/main/java/org/apache/meecrowave/junit5/MeecrowaveExtension.java
index 18aaeea..2464188 100644
---
a/meecrowave-junit/src/main/java/org/apache/meecrowave/junit5/MeecrowaveExtension.java
+++
b/meecrowave-junit/src/main/java/org/apache/meecrowave/junit5/MeecrowaveExtension.java
@@ -18,17 +18,6 @@
*/
package org.apache.meecrowave.junit5;
-import static java.util.Optional.ofNullable;
-import static org.junit.platform.commons.util.AnnotationUtils.findAnnotation;
-
-import java.io.File;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Optional;
-
-import javax.enterprise.context.spi.CreationalContext;
-
import org.apache.meecrowave.Meecrowave;
import org.apache.meecrowave.configuration.Configuration;
import org.apache.meecrowave.testing.Injector;
@@ -38,32 +27,68 @@ import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
+import javax.enterprise.context.spi.CreationalContext;
+import java.io.File;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Optional;
+
+import static java.util.Optional.ofNullable;
+import static org.junit.platform.commons.util.AnnotationUtils.findAnnotation;
+
public class MeecrowaveExtension extends BaseLifecycle
implements BeforeAllCallback, AfterAllCallback, BeforeEachCallback,
AfterEachCallback {
-
- private static final ExtensionContext.Namespace NAMESPACE =
ExtensionContext.Namespace.create(MeecrowaveExtension.class.getName());
-
+
+private static final ExtensionContext.Namespace NAMESPACE =
ExtensionContext.Namespace.create(MeecrowaveExtension.class.getName());
+
private final ScopesExtension scopes = new ScopesExtension() {
@Override
protected Optional[]> getScopes(final
ExtensionContext context) {
return context.getElement()
- .map(e -> findAnnotation(context.getElement(),
MeecrowaveConfig.class)
- .orElseGet(() -> context.getParent()
-
.flatMap(ExtensionContext::getElement)
- .flatMap(it ->
findAnnotation(it, MeecrowaveConfig.class))
- .orElse(null)))
- .map(MeecrowaveCo
svn commit: r1885212 - /openwebbeans/cms-site/trunk/content/download.mdtext
Author: rmannibucau Date: Wed Jan 6 20:08:16 2021 New Revision: 1885212 URL: http://svn.apache.org/viewvc?rev=1885212=rev Log: 2.0.21 download links Modified: openwebbeans/cms-site/trunk/content/download.mdtext Modified: openwebbeans/cms-site/trunk/content/download.mdtext URL: http://svn.apache.org/viewvc/openwebbeans/cms-site/trunk/content/download.mdtext?rev=1885212=1885211=1885212=diff == --- openwebbeans/cms-site/trunk/content/download.mdtext (original) +++ openwebbeans/cms-site/trunk/content/download.mdtext Wed Jan 6 20:08:16 2021 @@ -38,19 +38,19 @@ It uses a shaded version of ASM-8 (Java1 Binaries The binary distribution contains all OpenWebBeans modules. -* [openwebbeans-distribution-2.0.20-binary.zip](https://www.apache.org/dyn/closer.lua/openwebbeans/2.0.20/openwebbeans-distribution-2.0.20-binary.zip) -* [openwebbeans-distribution-2.0.20-binary.zip.sha512](https://www.apache.org/dist/openwebbeans/2.0.20/openwebbeans-distribution-2.0.20-binary.zip.sha512) -* [openwebbeans-distribution-2.0.20-binary.zip.asc](https://www.apache.org/dist/openwebbeans/2.0.20/openwebbeans-distribution-2.0.20-binary.zip.asc) -* [openwebbeans-distribution-2.0.20-binary.tar.gz](https://www.apache.org/dyn/closer.lua/openwebbeans/2.0.20/openwebbeans-distribution-2.0.20-binary.tar.gz) -* [openwebbeans-distribution-2.0.20-binary.tar.gz.sha512](https://www.apache.org/dist/openwebbeans/2.0.20/openwebbeans-distribution-2.0.20-binary.tar.gz.sha512) -* [openwebbeans-distribution-2.0.20-binary.tar.gz.asc](https://www.apache.org/dist/openwebbeans/2.0.20/openwebbeans-distribution-2.0.20-binary.tar.gz.asc) +* [openwebbeans-distribution-2.0.21-binary.zip](https://www.apache.org/dyn/closer.lua/openwebbeans/2.0.21/openwebbeans-distribution-2.0.21-binary.zip) +* [openwebbeans-distribution-2.0.21-binary.zip.sha512](https://www.apache.org/dist/openwebbeans/2.0.21/openwebbeans-distribution-2.0.21-binary.zip.sha512) +* [openwebbeans-distribution-2.0.21-binary.zip.asc](https://www.apache.org/dist/openwebbeans/2.0.21/openwebbeans-distribution-2.0.21-binary.zip.asc) +* [openwebbeans-distribution-2.0.21-binary.tar.gz](https://www.apache.org/dyn/closer.lua/openwebbeans/2.0.21/openwebbeans-distribution-2.0.21-binary.tar.gz) +* [openwebbeans-distribution-2.0.21-binary.tar.gz.sha512](https://www.apache.org/dist/openwebbeans/2.0.21/openwebbeans-distribution-2.0.21-binary.tar.gz.sha512) +* [openwebbeans-distribution-2.0.21-binary.tar.gz.asc](https://www.apache.org/dist/openwebbeans/2.0.21/openwebbeans-distribution-2.0.21-binary.tar.gz.asc) Source Should you want to build any of the above binaries, this source bundle is the right one and covers them all. -* [openwebbeans-2.0.20-source-release.zip](https://www.apache.org/dyn/closer.lua/openwebbeans/2.0.20/openwebbeans-2.0.20-source-release.zip) -* [openwebbeans-2.0.20-source-release.zip.sha512](https://www.apache.org/dist/openwebbeans/2.0.20/openwebbeans-2.0.20-source-release.zip.sha512) -* [openwebbeans-2.0.20-source-release.zip.asc](https://www.apache.org/dist/openwebbeans/2.0.20/openwebbeans-2.0.20-source-release.zip.asc) +* [openwebbeans-2.0.21-source-release.zip](https://www.apache.org/dyn/closer.lua/openwebbeans/2.0.21/openwebbeans-2.0.21-source-release.zip) +* [openwebbeans-2.0.21-source-release.zip.sha512](https://www.apache.org/dist/openwebbeans/2.0.21/openwebbeans-2.0.21-source-release.zip.sha512) +* [openwebbeans-2.0.21-source-release.zip.asc](https://www.apache.org/dist/openwebbeans/2.0.21/openwebbeans-2.0.21-source-release.zip.asc) --
svn commit: r45205 - in /dev/openwebbeans/owb: openwebbeans-2.0.21-source-release.zip openwebbeans-2.0.21-source-release.zip.asc openwebbeans-2.0.21-source-release.zip.sha512
Author: rmannibucau Date: Wed Jan 6 20:07:47 2021 New Revision: 45205 Log: OWB 2.0.21 vote passed Removed: dev/openwebbeans/owb/openwebbeans-2.0.21-source-release.zip dev/openwebbeans/owb/openwebbeans-2.0.21-source-release.zip.asc dev/openwebbeans/owb/openwebbeans-2.0.21-source-release.zip.sha512
svn commit: r45204 - in /release/openwebbeans: 2.0.20/ 2.0.21/ 2.0.21/openwebbeans-2.0.21-source-release.zip 2.0.21/openwebbeans-2.0.21-source-release.zip.asc 2.0.21/openwebbeans-2.0.21-source-release
Author: rmannibucau Date: Wed Jan 6 20:07:36 2021 New Revision: 45204 Log: OWB 2.0.21 vote passed Added: release/openwebbeans/2.0.21/ release/openwebbeans/2.0.21/openwebbeans-2.0.21-source-release.zip (with props) release/openwebbeans/2.0.21/openwebbeans-2.0.21-source-release.zip.asc release/openwebbeans/2.0.21/openwebbeans-2.0.21-source-release.zip.sha512 Removed: release/openwebbeans/2.0.20/ Added: release/openwebbeans/2.0.21/openwebbeans-2.0.21-source-release.zip == Binary file - no diff available. Propchange: release/openwebbeans/2.0.21/openwebbeans-2.0.21-source-release.zip -- svn:mime-type = application/octet-stream Added: release/openwebbeans/2.0.21/openwebbeans-2.0.21-source-release.zip.asc == --- release/openwebbeans/2.0.21/openwebbeans-2.0.21-source-release.zip.asc (added) +++ release/openwebbeans/2.0.21/openwebbeans-2.0.21-source-release.zip.asc Wed Jan 6 20:07:36 2021 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEz4CgVaKtKOnvv5QqcxKfWN5h7L0FAl/yHiAACgkQcxKfWN5h +7L3kaQf+P/n/hkDsfeSGTLJgc70MV/jeZekbb9upRg+T+d66B/BwjAjnOvw2Bq5q +UNAEMRZ+64kL21IeQlLghsgLNvktaGEHbo5gt/urClIP+6zvWIPF84N1MIjlzAwQ +1DzsQZAM8cV0aa6EZ/3zaOG0E3UTapF32j67nF8C/MqgJInrGFpbfvBXpnZToaDk +3qX+MRGDhWVXQr1XaramZWBXAEf8e5Fs8O8Z0mO0mm1tZH0y9eAl3N4hLGwMg471 +Dv2g5aoFYQR7FwKFxf761QDKzQRfyG/PtMa0B9FUkSurgSX2O8NxObeb3RycH6Bv +wmHMpW0OacdmVnIaF5ACQTEkIawkzg== +=/GWM +-END PGP SIGNATURE- Added: release/openwebbeans/2.0.21/openwebbeans-2.0.21-source-release.zip.sha512 == --- release/openwebbeans/2.0.21/openwebbeans-2.0.21-source-release.zip.sha512 (added) +++ release/openwebbeans/2.0.21/openwebbeans-2.0.21-source-release.zip.sha512 Wed Jan 6 20:07:36 2021 @@ -0,0 +1 @@ +69152984e407879afdadb90893ebd8737eeb8a461dd09ae1c279966d457a97970c8fe7bd3c35e015970db016b80dfe0113e9725d62f11c272ce565e0dd278363 openwebbeans-2.0.21-source-release.zip
[openwebbeans] branch master updated: [OWB-1366] since we should never have errors there ensure to create a logger only if there is an error in WB logger facade static block
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 2274603 [OWB-1366] since we should never have errors there ensure to
create a logger only if there is an error in WB logger facade static block
2274603 is described below
commit 2274603e24cdbf39e3c414b05ac4f054ba4895f6
Author: Romain Manni-Bucau
AuthorDate: Tue Jan 5 14:27:44 2021 +0100
[OWB-1366] since we should never have errors there ensure to create a
logger only if there is an error in WB logger facade static block
---
.../main/java/org/apache/webbeans/logger/WebBeansLoggerFacade.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLoggerFacade.java
b/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLoggerFacade.java
index fc47060..5796fc5 100644
---
a/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLoggerFacade.java
+++
b/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLoggerFacade.java
@@ -90,10 +90,10 @@ public final class WebBeansLoggerFacade
.orElseGet(JULLoggerFactory::new);
}
-Logger logger = FACTORY.getLogger(WebBeansLoggerFacade.class);
-if (error != null && logger.isLoggable(Level.SEVERE))
+// ensure to not create any logger if there is no error
+if (error != null &&
FACTORY.getLogger(WebBeansLoggerFacade.class).isLoggable(Level.SEVERE))
{
-logger.log(Level.SEVERE, OWBLogConst.ERROR_0028, error);
+FACTORY.getLogger(WebBeansLoggerFacade.class).log(Level.SEVERE,
OWBLogConst.ERROR_0028, error);
}
}
[openwebbeans] branch master updated: [OWB-1365] enforce to create interceptor stack if validation is skipped
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 e3315a6 [OWB-1365] enforce to create interceptor stack if validation
is skipped
e3315a6 is described below
commit e3315a66ce71bf6fdbdac82566c97dc2bb7951d4
Author: Romain Manni-Bucau
AuthorDate: Mon Jan 4 08:03:59 2021 +0100
[OWB-1365] enforce to create interceptor stack if validation is skipped
---
.../org/apache/webbeans/config/BeansDeployer.java | 45 ++
.../webbeans/test/config/BeansDeployerTest.java| 25 +++-
2 files changed, 69 insertions(+), 1 deletion(-)
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 5eaf2c3..576335f 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
@@ -331,6 +331,51 @@ public class BeansDeployer
validateNames();
}
+else
+{
+
webBeansContext.getBeanManagerImpl().getBeans().forEach(bean -> {
+if (BuiltInOwbBean.class.isInstance(bean))
+{
+Class proxyable =
BuiltInOwbBean.class.cast(bean).proxyableType();
+if (proxyable != null)
+{
+AbstractProducer producer =
AbstractProducer.class.cast(OwbBean.class.cast(bean).getProducer());
+AnnotatedType annotatedType =
webBeansContext.getAnnotatedElementFactory()
+.newAnnotatedType(proxyable);
+producer.defineInterceptorStack(bean,
annotatedType, webBeansContext);
+}
+}
+else if (bean instanceof OwbBean &&
+!(bean instanceof Interceptor) &&
+!(bean instanceof Decorator))
+{
+AbstractProducer producer = null;
+OwbBean owbBean = (OwbBean) bean;
+if (ManagedBean.class.isInstance(bean)) // in this
case don't use producer which can be wrapped
+{
+producer =
ManagedBean.class.cast(bean).getOriginalInjectionTarget();
+}
+if (producer == null && owbBean.getProducer()
instanceof AbstractProducer)
+{
+producer = (AbstractProducer)
owbBean.getProducer();
+}
+if (producer != null)
+{
+AnnotatedType annotatedType;
+if (owbBean instanceof InjectionTargetBean)
+{
+annotatedType = ((InjectionTargetBean)
owbBean).getAnnotatedType();
+}
+else
+{
+annotatedType =
webBeansContext.getAnnotatedElementFactory()
+
.newAnnotatedType(owbBean.getReturnType());
+}
+producer.defineInterceptorStack(owbBean,
annotatedType, webBeansContext);
+}
+}
+});
+}
if
(webBeansContext.getNotificationManager().getObserverMethods().stream()
.anyMatch(ObserverMethod::isAsync))
diff --git
a/webbeans-impl/src/test/java/org/apache/webbeans/test/config/BeansDeployerTest.java
b/webbeans-impl/src/test/java/org/apache/webbeans/test/config/BeansDeployerTest.java
index eae8d86..f0b6b49 100644
---
a/webbeans-impl/src/test/java/org/apache/webbeans/test/config/BeansDeployerTest.java
+++
b/webbeans-impl/src/test/java/org/apache/webbeans/test/config/BeansDeployerTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.webbeans.test.config;
+import static java.util.Arrays.asList;
import static java.util.Collections.singletonList;
import static java.util.logging.Level.FINE;
import static org.junit.Assert.assertEquals;
@@ -32,6 +33,7 @@ import java.util.logging.LogRecord;
import java.util.logging.Logger;
import javax.annotation.Priority;
+import javax.enterprise.context.ApplicationScoped;
import javax.interceptor.AroundInvoke;
import javax.inter
svn commit: r45160 - in /dev/openwebbeans/owb: openwebbeans-2.0.21-source-release.zip openwebbeans-2.0.21-source-release.zip.asc openwebbeans-2.0.21-source-release.zip.sha512
Author: rmannibucau Date: Sun Jan 3 19:53:23 2021 New Revision: 45160 Log: OWB 2.0.21 vote artifacts Added: dev/openwebbeans/owb/openwebbeans-2.0.21-source-release.zip (with props) dev/openwebbeans/owb/openwebbeans-2.0.21-source-release.zip.asc dev/openwebbeans/owb/openwebbeans-2.0.21-source-release.zip.sha512 Added: dev/openwebbeans/owb/openwebbeans-2.0.21-source-release.zip == Binary file - no diff available. Propchange: dev/openwebbeans/owb/openwebbeans-2.0.21-source-release.zip -- svn:mime-type = application/octet-stream Added: dev/openwebbeans/owb/openwebbeans-2.0.21-source-release.zip.asc == --- dev/openwebbeans/owb/openwebbeans-2.0.21-source-release.zip.asc (added) +++ dev/openwebbeans/owb/openwebbeans-2.0.21-source-release.zip.asc Sun Jan 3 19:53:23 2021 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEz4CgVaKtKOnvv5QqcxKfWN5h7L0FAl/yHiAACgkQcxKfWN5h +7L3kaQf+P/n/hkDsfeSGTLJgc70MV/jeZekbb9upRg+T+d66B/BwjAjnOvw2Bq5q +UNAEMRZ+64kL21IeQlLghsgLNvktaGEHbo5gt/urClIP+6zvWIPF84N1MIjlzAwQ +1DzsQZAM8cV0aa6EZ/3zaOG0E3UTapF32j67nF8C/MqgJInrGFpbfvBXpnZToaDk +3qX+MRGDhWVXQr1XaramZWBXAEf8e5Fs8O8Z0mO0mm1tZH0y9eAl3N4hLGwMg471 +Dv2g5aoFYQR7FwKFxf761QDKzQRfyG/PtMa0B9FUkSurgSX2O8NxObeb3RycH6Bv +wmHMpW0OacdmVnIaF5ACQTEkIawkzg== +=/GWM +-END PGP SIGNATURE- Added: dev/openwebbeans/owb/openwebbeans-2.0.21-source-release.zip.sha512 == --- dev/openwebbeans/owb/openwebbeans-2.0.21-source-release.zip.sha512 (added) +++ dev/openwebbeans/owb/openwebbeans-2.0.21-source-release.zip.sha512 Sun Jan 3 19:53:23 2021 @@ -0,0 +1 @@ +69152984e407879afdadb90893ebd8737eeb8a461dd09ae1c279966d457a97970c8fe7bd3c35e015970db016b80dfe0113e9725d62f11c272ce565e0dd278363 openwebbeans-2.0.21-source-release.zip
[openwebbeans] 02/02: [maven-release-plugin] prepare for next development iteration
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 commit a3c6d4ea73828768312c941bda45bf1c85802550 Author: Romain Manni-Bucau AuthorDate: Sun Jan 3 20:42:17 2021 +0100 [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-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-jakarta/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 da07c90..d2bd0cd 100644 --- a/atinject-tck/pom.xml +++ b/atinject-tck/pom.xml @@ -23,7 +23,7 @@ org.apache.openwebbeans openwebbeans -2.0.21 +2.0.22-SNAPSHOT ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index 9763374..6ddb4ed 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -24,7 +24,7 @@ org.apache.openwebbeans openwebbeans -2.0.21 +2.0.22-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index b9969a8..ad188d5 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ openwebbeans Apache OpenWebBeans pom -2.0.21 +2.0.22-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.21 + openwebbeans-2.0.19 diff --git a/samples/conversation-sample/pom.xml b/samples/conversation-sample/pom.xml index 4d1ad71..343f336 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.21 +2.0.22-SNAPSHOT ../pom.xml diff --git a/samples/guess/pom.xml b/samples/guess/pom.xml index 1a16c87..dbc0c3b 100644 --- a/samples/guess/pom.xml +++ b/samples/guess/pom.xml @@ -21,7 +21,7 @@ under the License. org.apache.openwebbeans samples -2.0.21 +2.0.22-SNAPSHOT ../pom.xml diff --git a/samples/jsf2sample/pom.xml b/samples/jsf2sample/pom.xml index 329187d..743eee8 100644 --- a/samples/jsf2sample/pom.xml +++ b/samples/jsf2sample/pom.xml @@ -22,7 +22,7 @@ under the License. samples org.apache.openwebbeans -2.0.21 +2.0.22-SNAPSHOT ../pom.xml diff --git a/samples/pom.xml b/samples/pom.xml index 1cf61cb..e802f95 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.openwebbeans openwebbeans -2.0.21 +2.0.22-SNAPSHOT ../pom.xml diff --git a/samples/reservation/pom.xml b/samples/reservation/pom.xml index 3359fe8..41a24a2 100644 --- a/samples/reservation/pom.xml +++ b/samples/reservation/pom.xml @@ -21,7 +21,7 @@ under the License
[openwebbeans] 01/02: [maven-release-plugin] prepare release openwebbeans-2.0.21
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 commit cb11ec2cb48443220ef8b04c633073b7f7c88916 Author: Romain Manni-Bucau AuthorDate: Sun Jan 3 20:42:16 2021 +0100 [maven-release-plugin] prepare release openwebbeans-2.0.21 --- 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-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-jakarta/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 6394d25..da07c90 100644 --- a/atinject-tck/pom.xml +++ b/atinject-tck/pom.xml @@ -23,7 +23,7 @@ org.apache.openwebbeans openwebbeans -2.0.21-SNAPSHOT +2.0.21 ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index 08de508..9763374 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -24,7 +24,7 @@ org.apache.openwebbeans openwebbeans -2.0.21-SNAPSHOT +2.0.21 ../pom.xml diff --git a/pom.xml b/pom.xml index 3d672d1..b9969a8 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ openwebbeans Apache OpenWebBeans pom -2.0.21-SNAPSHOT +2.0.21 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.19 + openwebbeans-2.0.21 diff --git a/samples/conversation-sample/pom.xml b/samples/conversation-sample/pom.xml index e792886..4d1ad71 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.21-SNAPSHOT +2.0.21 ../pom.xml diff --git a/samples/guess/pom.xml b/samples/guess/pom.xml index 54e53f4..1a16c87 100644 --- a/samples/guess/pom.xml +++ b/samples/guess/pom.xml @@ -21,7 +21,7 @@ under the License. org.apache.openwebbeans samples -2.0.21-SNAPSHOT +2.0.21 ../pom.xml diff --git a/samples/jsf2sample/pom.xml b/samples/jsf2sample/pom.xml index 156db25..329187d 100644 --- a/samples/jsf2sample/pom.xml +++ b/samples/jsf2sample/pom.xml @@ -22,7 +22,7 @@ under the License. samples org.apache.openwebbeans -2.0.21-SNAPSHOT +2.0.21 ../pom.xml diff --git a/samples/pom.xml b/samples/pom.xml index 9b52aba..1cf61cb 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -22,7 +22,7 @@ under the License. org.apache.openwebbeans openwebbeans -2.0.21-SNAPSHOT +2.0.21 ../pom.xml diff --git a/samples/reservation/pom.xml b/samples/reservation/pom.xml index e3af672..3359fe8 100644 --- a/samples/reservation/pom.xml +++ b/samples/reservation/pom.xml @@ -21,7 +21,7 @@ under the License
[openwebbeans] annotated tag openwebbeans-2.0.21 created (now c56c54d)
This is an automated email from the ASF dual-hosted git repository. rmannibucau pushed a change to annotated tag openwebbeans-2.0.21 in repository https://gitbox.apache.org/repos/asf/openwebbeans.git. at c56c54d (tag) tagging cb11ec2cb48443220ef8b04c633073b7f7c88916 (commit) replaces openwebbeans-2.0.20 by Romain Manni-Bucau on Sun Jan 3 20:42:16 2021 +0100 - Log - [maven-release-plugin] copy for tag openwebbeans-2.0.21 --- This annotated tag includes the following new commits: new cb11ec2 [maven-release-plugin] prepare release openwebbeans-2.0.21 The 1 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.
[openwebbeans] branch master updated (42a9bb7 -> a3c6d4e)
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.git. from 42a9bb7 better casting for some jvm v8 new cb11ec2 [maven-release-plugin] prepare release openwebbeans-2.0.21 new a3c6d4e [maven-release-plugin] prepare for next development iteration 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: atinject-tck/pom.xml | 2 +- distribution/pom.xml | 2 +- pom.xml | 2 +- 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-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-jakarta/pom.xml | 2 +- webbeans-tck/pom.xml | 2 +- webbeans-tomcat7/pom.xml | 2 +- webbeans-web/pom.xml | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-)
[openwebbeans] branch master updated: better casting for some jvm v8
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 42a9bb7 better casting for some jvm v8 42a9bb7 is described below commit 42a9bb73acb79e712ca09db89830921eb1de171d Author: Romain Manni-Bucau AuthorDate: Sun Jan 3 20:38:24 2021 +0100 better casting for some jvm v8 --- .../src/main/java/org/apache/openwebbeans/se/OWBInitializer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBInitializer.java b/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBInitializer.java index 5a35d44..8d969a4 100644 --- a/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBInitializer.java +++ b/webbeans-se/src/main/java/org/apache/openwebbeans/se/OWBInitializer.java @@ -246,7 +246,8 @@ public class OWBInitializer extends SeContainerInitializer selectAlternativeStereotypes(list(value, this::loadClass).toArray(Class[]::new)); break; case "openwebbeans.extensions": -addExtensions(list(value, this::loadClass).toArray(Class[]::new)); +final Class[] extensions = list(value, this::loadClass).toArray(Class[]::new); +addExtensions(extensions); break; case "openwebbeans.packages": addPackages(list(value, this::loadPackage).toArray(Package[]::new));
