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 435223adfaf3dc7ac83bd2f4edd19d7411175390 Author: Romain Manni-Bucau <rmannibu...@gmail.com> AuthorDate: Wed Dec 8 19:23:19 2021 +0100 s/http/https/ --- LICENSE | 2 +- NOTICE | 2 +- atinject-tck/src/site/site.xml | 6 +++--- .../main/install_scripts/install_owb_tomcat7_myfaces.sh | 2 +- distribution/src/main/resources/LICENSE | 2 +- distribution/src/main/resources/NOTICE | 4 ++-- doap_OpenWebBeans.rdf | 10 +++++----- pom.xml | 11 ++++++----- readme/README.txt | 2 +- readme/README_1_0_0-alpha-1.txt | 4 ++-- readme/README_1_0_0-alpha-2.txt | 4 ++-- readme/README_1_0_0.txt | 4 ++-- readme/README_1_1_0.txt | 4 ++-- readme/README_1_1_1.txt | 4 ++-- readme/README_1_1_2.txt | 4 ++-- readme/README_1_1_3.txt | 4 ++-- readme/README_1_1_4.txt | 4 ++-- readme/README_1_1_5.txt | 4 ++-- readme/README_1_1_6.txt | 4 ++-- readme/README_1_2_0.txt | 4 ++-- readme/README_M4.txt | 4 ++-- samples/conversation-sample/LICENSE | 2 +- samples/conversation-sample/NOTICE | 2 +- samples/guess/LICENSE | 2 +- samples/guess/NOTICE | 2 +- samples/guess/src/site/site.xml | 6 +++--- samples/jsf2sample/LICENSE | 2 +- samples/jsf2sample/NOTICE | 2 +- samples/reservation/LICENSE | 2 +- samples/reservation/NOTICE | 2 +- samples/src/site/site.xml | 6 +++--- samples/standalone-sample/LICENSE | 2 +- samples/standalone-sample/NOTICE | 2 +- samples/tomcat7-sample/LICENSE | 2 +- samples/tomcat7-sample/NOTICE | 2 +- src/site/apt/documentation.apt | 2 +- src/site/apt/trademarks.apt | 4 ++-- src/site/site.xml | 14 +++++++------- webbeans-ee-common/src/site/site.xml | 14 +++++++------- webbeans-ee/src/site/site.xml | 14 +++++++------- webbeans-ejb/src/site/site.xml | 14 +++++++------- webbeans-el22/src/site/site.xml | 14 +++++++------- .../org/apache/webbeans/portable/AbstractProducer.java | 14 +++++++------- webbeans-impl/src/site/site.xml | 14 +++++++------- webbeans-jetty9/src/site/site.xml | 14 +++++++------- webbeans-jms/src/site/site.xml | 14 +++++++------- webbeans-jsf/src/site/site.xml | 14 +++++++------- webbeans-osgi/src/site/site.xml | 14 +++++++------- webbeans-porting/src/site/site.xml | 8 ++++---- webbeans-resource/src/site/site.xml | 14 +++++++------- webbeans-spi/src/site/site.xml | 14 +++++++------- webbeans-tck/src/site/site.xml | 14 +++++++------- webbeans-tomcat7/src/site/site.xml | 14 +++++++------- webbeans-web/src/site/site.xml | 14 +++++++------- 54 files changed, 182 insertions(+), 181 deletions(-) diff --git a/LICENSE b/LICENSE index 57bc88a..ebc1c03 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ Apache License Version 2.0, January 2004 - http://www.apache.org/licenses/ + https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION diff --git a/NOTICE b/NOTICE index 860361e..2388570 100644 --- a/NOTICE +++ b/NOTICE @@ -2,5 +2,5 @@ Apache OpenWebBeans Copyright 2008 - 2020 The Apache Software Foundation This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). diff --git a/atinject-tck/src/site/site.xml b/atinject-tck/src/site/site.xml index 4fb7e75..ac140ba 100644 --- a/atinject-tck/src/site/site.xml +++ b/atinject-tck/src/site/site.xml @@ -23,9 +23,9 @@ <body> <breadcrumbs> - <item name="Apache" href="http://www.apache.org"/> - <item name="OpenWebBeans" href="http://openwebbeans.apache.org"/> - <item name="atinject TCK" href="http://openwebbeans.apache.org/${project.version}/atinject-tck"/> + <item name="Apache" href="https://www.apache.org"/> + <item name="OpenWebBeans" href="https://openwebbeans.apache.org"/> + <item name="atinject TCK" href="https://openwebbeans.apache.org/${project.version}/atinject-tck"/> </breadcrumbs> <menu name="Overview"> diff --git a/distribution/src/main/install_scripts/install_owb_tomcat7_myfaces.sh b/distribution/src/main/install_scripts/install_owb_tomcat7_myfaces.sh index 1c58bcd..a277777 100644 --- a/distribution/src/main/install_scripts/install_owb_tomcat7_myfaces.sh +++ b/distribution/src/main/install_scripts/install_owb_tomcat7_myfaces.sh @@ -25,7 +25,7 @@ # # usage example: # Download the openwebbeans binary distribution from -# http://openwebbeans.apache.org/download.html +# https://openwebbeans.apache.org/download.html # Also download the Apache MyFaces binary distribution from # http://myfaces.apache.org/download.html # diff --git a/distribution/src/main/resources/LICENSE b/distribution/src/main/resources/LICENSE index 669923d..8b31eaf 100644 --- a/distribution/src/main/resources/LICENSE +++ b/distribution/src/main/resources/LICENSE @@ -1,7 +1,7 @@ Apache License Version 2.0, January 2004 - http://www.apache.org/licenses/ + https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION diff --git a/distribution/src/main/resources/NOTICE b/distribution/src/main/resources/NOTICE index 52bf051..b9b59ee 100644 --- a/distribution/src/main/resources/NOTICE +++ b/distribution/src/main/resources/NOTICE @@ -2,13 +2,13 @@ Apache OpenWebBeans Copyright 2008 - 2020 The Apache Software Foundation This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). Apache XBean :: ASM 6 shaded (repackaged) Copyright 2005-2020 The Apache Software Foundation This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). -------------------------------------- diff --git a/doap_OpenWebBeans.rdf b/doap_OpenWebBeans.rdf index 5e62f9b..45dfe18 100644 --- a/doap_OpenWebBeans.rdf +++ b/doap_OpenWebBeans.rdf @@ -21,17 +21,17 @@ See the License for the specific language governing permissions and limitations under the License. --> - <Project rdf:about="http://openwebbeans.apache.org"> + <Project rdf:about="https://openwebbeans.apache.org"> <created>2011-03-06</created> <license rdf:resource="http://usefulinc.com/doap/licenses/asl20" /> <name>Apache OpenWebBeans</name> - <homepage rdf:resource="http://openwebbeans.apache.org" /> - <asfext:pmc rdf:resource="http://openwebbeans.apache.org" /> + <homepage rdf:resource="https://openwebbeans.apache.org" /> + <asfext:pmc rdf:resource="https://openwebbeans.apache.org" /> <shortdesc>Dependency Injection Platform.</shortdesc> <description>OpenWebBeans is an ALv2-licensed implementation of the "Contexts and Dependency Injection for the Java EE platform" specification which is defined as JSR-299.</description> <bug-database rdf:resource="http://issues.apache.org/jira/browse/OWB" /> - <mailing-list rdf:resource="http://openwebbeans.apache.org/community.html" /> - <download-page rdf:resource="http://www.apache.org/dyn/closer.cgi/openwebbeans/" /> + <mailing-list rdf:resource="https://openwebbeans.apache.org/community.html" /> + <download-page rdf:resource="https://www.apache.org/dyn/closer.cgi/openwebbeans/" /> <programming-language>Java</programming-language> <category rdf:resource="http://projects.apache.org/category/javaee" /> <release> diff --git a/pom.xml b/pom.xml index 5abe137..5678bd3 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,7 @@ <groupId>org.apache</groupId> <artifactId>apache</artifactId> <version>23</version> + <relativePath /> </parent> <groupId>org.apache.openwebbeans</groupId> @@ -40,7 +41,7 @@ <organization> <name>The Apache Software Foundation</name> - <url>http://apache.org</url> + <url>https://apache.org</url> </organization> <inceptionYear>2008</inceptionYear> @@ -54,7 +55,7 @@ <issueManagement> <system>jira</system> - <url>http://issues.apache.org/jira/browse/OWB</url> + <url>https://issues.apache.org/jira/browse/OWB</url> </issueManagement> <properties> @@ -92,21 +93,21 @@ <subscribe>dev-subscr...@openwebbeans.apache.org</subscribe> <unsubscribe>dev-unsubscr...@openwebbeans.apache.org</unsubscribe> <post>d...@openwebbeans.apache.org</post> - <archive>http://mail-archives.apache.org/mod_mbox/openwebbeans-dev/</archive> + <archive>https://mail-archives.apache.org/mod_mbox/openwebbeans-dev/</archive> </mailingList> <mailingList> <name>OpenWebBeans User List</name> <subscribe>user-subscr...@openwebbeans.apache.org</subscribe> <unsubscribe>user-unsubscr...@openwebbeans.apache.org</unsubscribe> <post>u...@openwebbeans.apache.org</post> - <archive>http://mail-archives.apache.org/mod_mbox/openwebbeans-user/</archive> + <archive>https://mail-archives.apache.org/mod_mbox/openwebbeans-user/</archive> </mailingList> <mailingList> <name>OpenWebBeans Commits List</name> <subscribe>commits-subscr...@openwebbeans.apache.org</subscribe> <unsubscribe>commits-unsubscr...@openwebbeans.apache.org</unsubscribe> <post>commits@openwebbeans.apache.org</post> - <archive>http://mail-archives.apache.org/mod_mbox/openwebbeans-commits/</archive> + <archive>https://mail-archives.apache.org/mod_mbox/openwebbeans-commits/</archive> </mailingList> <mailingList> <name>OpenWebBeans Private List</name> diff --git a/readme/README.txt b/readme/README.txt index e84089c..e114892 100644 --- a/readme/README.txt +++ b/readme/README.txt @@ -1845,7 +1845,7 @@ Blog : http://blogs.apache.org/owb OpenWebBeans Web Page ---------------------------------------- You can reach the OpenWebBeans web page at -http://openwebbeans.apache.org +https://openwebbeans.apache.org --------------------------------------- Enjoy! diff --git a/readme/README_1_0_0-alpha-1.txt b/readme/README_1_0_0-alpha-1.txt index f412ff2..3f1af8b 100644 --- a/readme/README_1_0_0-alpha-1.txt +++ b/readme/README_1_0_0-alpha-1.txt @@ -14,7 +14,7 @@ What is Apache OpenWebBeans? OpenWebBeans is an ASL 2.0-licensed implementation of the JSR-299, Contexts and Dependency Injection for the Java EE platform. Project's web page can be found at: -"http://openwebbeans.apache.org" +"https://openwebbeans.apache.org" -------------------------------- OpenWebBeans 1.0.0-alpha-1 Release Features @@ -608,7 +608,7 @@ Blog : http://blogs.apache.org/owb OpenWebBeans Web Page ---------------------------------------- You can reach the OpenWebBeans web page at -http://openwebbeans.apache.org +https://openwebbeans.apache.org --------------------------------------- Your OpenWebBeans Team diff --git a/readme/README_1_0_0-alpha-2.txt b/readme/README_1_0_0-alpha-2.txt index 472f486..ae31fdc 100644 --- a/readme/README_1_0_0-alpha-2.txt +++ b/readme/README_1_0_0-alpha-2.txt @@ -14,7 +14,7 @@ What is Apache OpenWebBeans? OpenWebBeans is an ASL 2.0-licensed implementation of the JSR-299, Contexts and Dependency Injection for the Java EE platform. Project's web page can be found at: -"http://openwebbeans.apache.org" +"https://openwebbeans.apache.org" -------------------------------- OpenWebBeans 1.0.0-alpha-2 Release Features @@ -708,7 +708,7 @@ Blog : http://blogs.apache.org/owb OpenWebBeans Web Page ---------------------------------------- You can reach the OpenWebBeans web page at -http://openwebbeans.apache.org +https://openwebbeans.apache.org --------------------------------------- Your OpenWebBeans Team diff --git a/readme/README_1_0_0.txt b/readme/README_1_0_0.txt index c325604..742b378 100644 --- a/readme/README_1_0_0.txt +++ b/readme/README_1_0_0.txt @@ -13,7 +13,7 @@ What is Apache OpenWebBeans? OpenWebBeans is an ASL 2.0-licensed implementation of the JSR-299, Contexts and Dependency Injection for the Java EE platform. Project's web page can be found at: -"http://openwebbeans.apache.org" +"https://openwebbeans.apache.org" The projects WIKI page can be found at: https://cwiki.apache.org/confluence/display/OWB/Index @@ -753,7 +753,7 @@ Blog : http://blogs.apache.org/owb OpenWebBeans Web Page ---------------------------------------- You can reach the OpenWebBeans web page at -http://openwebbeans.apache.org +https://openwebbeans.apache.org --------------------------------------- Your OpenWebBeans Team diff --git a/readme/README_1_1_0.txt b/readme/README_1_1_0.txt index 14fb1ca..555d457 100644 --- a/readme/README_1_1_0.txt +++ b/readme/README_1_1_0.txt @@ -14,7 +14,7 @@ OpenWebBeans is an Apache License V 2.0 licensed implementation of the JSR-299, Contexts and Dependency Injection for the Java EE platform. Our project's web page can be found at: -http://openwebbeans.apache.org +https://openwebbeans.apache.org The projects WIKI page can be found at: https://cwiki.apache.org/confluence/display/OWB/Index @@ -873,7 +873,7 @@ Blog : http://blogs.apache.org/owb OpenWebBeans Web Page ---------------------------------------- You can reach the OpenWebBeans web page at -http://openwebbeans.apache.org +https://openwebbeans.apache.org --------------------------------------- Your OpenWebBeans Team diff --git a/readme/README_1_1_1.txt b/readme/README_1_1_1.txt index 2b36636..fd45a76 100644 --- a/readme/README_1_1_1.txt +++ b/readme/README_1_1_1.txt @@ -14,7 +14,7 @@ OpenWebBeans is an Apache License V 2.0 licensed implementation of the JSR-299, Contexts and Dependency Injection for the Java EE platform. Our project's web page can be found at: -http://openwebbeans.apache.org +https://openwebbeans.apache.org The projects WIKI page can be found at: https://cwiki.apache.org/confluence/display/OWB/Index @@ -935,7 +935,7 @@ Blog : http://blogs.apache.org/owb OpenWebBeans Web Page ---------------------------------------- You can reach the OpenWebBeans web page at -http://openwebbeans.apache.org +https://openwebbeans.apache.org --------------------------------------- Your OpenWebBeans Team diff --git a/readme/README_1_1_2.txt b/readme/README_1_1_2.txt index e1a8339..1c19521 100644 --- a/readme/README_1_1_2.txt +++ b/readme/README_1_1_2.txt @@ -19,7 +19,7 @@ incorporated CDI-1.1 features are mostly parts which are not well defined in the CDI-1.0 specification, like Serialisation checks, etc. Our project's web page can be found at: -http://openwebbeans.apache.org +https://openwebbeans.apache.org The projects WIKI page can be found at: https://cwiki.apache.org/confluence/display/OWB/Index @@ -967,7 +967,7 @@ Blog : http://blogs.apache.org/owb OpenWebBeans Web Page ---------------------------------------- You can reach the OpenWebBeans web page at -http://openwebbeans.apache.org +https://openwebbeans.apache.org --------------------------------------- Your OpenWebBeans Team diff --git a/readme/README_1_1_3.txt b/readme/README_1_1_3.txt index bad89b6..8578da5 100644 --- a/readme/README_1_1_3.txt +++ b/readme/README_1_1_3.txt @@ -19,7 +19,7 @@ incorporated CDI-1.1 features are mostly parts which are not well defined in the CDI-1.0 specification, like Serialisation checks, etc. Our project's web page can be found at: -http://openwebbeans.apache.org +https://openwebbeans.apache.org The projects WIKI page can be found at: https://cwiki.apache.org/confluence/display/OWB/Index @@ -987,7 +987,7 @@ Blog : http://blogs.apache.org/owb OpenWebBeans Web Page ---------------------------------------- You can reach the OpenWebBeans web page at -http://openwebbeans.apache.org +https://openwebbeans.apache.org --------------------------------------- Your OpenWebBeans Team diff --git a/readme/README_1_1_4.txt b/readme/README_1_1_4.txt index d09db0b..e45c7ce 100644 --- a/readme/README_1_1_4.txt +++ b/readme/README_1_1_4.txt @@ -19,7 +19,7 @@ incorporated CDI-1.1 features are mostly parts which are not well defined in the CDI-1.0 specification, like Serialisation checks, etc. Our project's web page can be found at: -http://openwebbeans.apache.org +https://openwebbeans.apache.org The projects WIKI page can be found at: https://cwiki.apache.org/confluence/display/OWB/Index @@ -1026,7 +1026,7 @@ Blog : http://blogs.apache.org/owb OpenWebBeans Web Page ---------------------------------------- You can reach the OpenWebBeans web page at -http://openwebbeans.apache.org +https://openwebbeans.apache.org --------------------------------------- Your Apache OpenWebBeans Team diff --git a/readme/README_1_1_5.txt b/readme/README_1_1_5.txt index a8d05da..fd031ca 100644 --- a/readme/README_1_1_5.txt +++ b/readme/README_1_1_5.txt @@ -19,7 +19,7 @@ incorporated CDI-1.1 features are mostly parts which are not well defined in the CDI-1.0 specification, like Serialisation checks, etc. Our project's web page can be found at: -http://openwebbeans.apache.org +https://openwebbeans.apache.org The projects WIKI page can be found at: https://cwiki.apache.org/confluence/display/OWB/Index @@ -1065,7 +1065,7 @@ Blog : http://blogs.apache.org/owb OpenWebBeans Web Page ---------------------------------------- You can reach the OpenWebBeans web page at -http://openwebbeans.apache.org +https://openwebbeans.apache.org --------------------------------------- Your Apache OpenWebBeans Team diff --git a/readme/README_1_1_6.txt b/readme/README_1_1_6.txt index f484da1..3620d50 100644 --- a/readme/README_1_1_6.txt +++ b/readme/README_1_1_6.txt @@ -19,7 +19,7 @@ incorporated CDI-1.1 features are mostly parts which are not well defined in the CDI-1.0 specification, like Serialisation checks, etc. Our project's web page can be found at: -http://openwebbeans.apache.org +https://openwebbeans.apache.org The projects WIKI page can be found at: https://cwiki.apache.org/confluence/display/OWB/Index @@ -1089,7 +1089,7 @@ Blog : http://blogs.apache.org/owb OpenWebBeans Web Page ---------------------------------------- You can reach the OpenWebBeans web page at -http://openwebbeans.apache.org +https://openwebbeans.apache.org --------------------------------------- Your Apache OpenWebBeans Team diff --git a/readme/README_1_2_0.txt b/readme/README_1_2_0.txt index dd1486a..65af760 100644 --- a/readme/README_1_2_0.txt +++ b/readme/README_1_2_0.txt @@ -20,7 +20,7 @@ incorporated CDI-1.1 features are mostly parts which are not well defined in the CDI-1.0 specification, like Serialisation checks, etc. Our project's web page can be found at: -http://openwebbeans.apache.org +https://openwebbeans.apache.org The projects WIKI page can be found at: https://cwiki.apache.org/confluence/display/OWB/Index @@ -1265,7 +1265,7 @@ Blog : http://blogs.apache.org/owb OpenWebBeans Web Page ---------------------------------------- You can reach the OpenWebBeans web page at -http://openwebbeans.apache.org +https://openwebbeans.apache.org --------------------------------------- Your Apache OpenWebBeans Team diff --git a/readme/README_M4.txt b/readme/README_M4.txt index f7e1d27..6cf6b55 100644 --- a/readme/README_M4.txt +++ b/readme/README_M4.txt @@ -14,7 +14,7 @@ What is Apache OpenWebBeans? OpenWebBeans is an ASL 2.0-licensed implementation of the JSR-299, Contexts and Dependency Injection for the Java EE platform. Project's web page can be found at: -"http://openwebbeans.apache.org" +"https://openwebbeans.apache.org" -------------------------------- OpenWebBeans M4 Release Features @@ -650,7 +650,7 @@ Blog : http://blogs.apache.org/owb OpenWebBeans Web Page ---------------------------------------- You can reach the OpenWebBeans web page at -http://openwebbeans.apache.org +https://openwebbeans.apache.org --------------------------------------- OpenWebBeans Team diff --git a/samples/conversation-sample/LICENSE b/samples/conversation-sample/LICENSE index 86efaae..ec16f24 100644 --- a/samples/conversation-sample/LICENSE +++ b/samples/conversation-sample/LICENSE @@ -1,6 +1,6 @@ Apache License Version 2.0, January 2004 - http://www.apache.org/licenses/ + https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION diff --git a/samples/conversation-sample/NOTICE b/samples/conversation-sample/NOTICE index f5a2e59..ac162fe 100644 --- a/samples/conversation-sample/NOTICE +++ b/samples/conversation-sample/NOTICE @@ -2,5 +2,5 @@ Apache OpenWebBeans Copyright 2008, 2010 The Apache Software Foundation This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). diff --git a/samples/guess/LICENSE b/samples/guess/LICENSE index 261eeb9..b531235 100644 --- a/samples/guess/LICENSE +++ b/samples/guess/LICENSE @@ -1,6 +1,6 @@ Apache License Version 2.0, January 2004 - http://www.apache.org/licenses/ + https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION diff --git a/samples/guess/NOTICE b/samples/guess/NOTICE index f5a2e59..ac162fe 100644 --- a/samples/guess/NOTICE +++ b/samples/guess/NOTICE @@ -2,5 +2,5 @@ Apache OpenWebBeans Copyright 2008, 2010 The Apache Software Foundation This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). diff --git a/samples/guess/src/site/site.xml b/samples/guess/src/site/site.xml index 912b349..a2359d0 100644 --- a/samples/guess/src/site/site.xml +++ b/samples/guess/src/site/site.xml @@ -22,9 +22,9 @@ <body> <breadcrumbs> <item name="Apache" href="http://apache.org"/> - <item name="OpenWebBeans" href="http://openwebbeans.apache.org"/> - <item name="Samples" href="http://openwebbeans.apache.org/${project.version}/samples"/> - <item name="Samples" href="http://openwebbeans.apache.org/${project.version}/samples/guess"/> + <item name="OpenWebBeans" href="https://openwebbeans.apache.org"/> + <item name="Samples" href="https://openwebbeans.apache.org/${project.version}/samples"/> + <item name="Samples" href="https://openwebbeans.apache.org/${project.version}/samples/guess"/> </breadcrumbs> <menu name="Overview"> diff --git a/samples/jsf2sample/LICENSE b/samples/jsf2sample/LICENSE index 261eeb9..b531235 100644 --- a/samples/jsf2sample/LICENSE +++ b/samples/jsf2sample/LICENSE @@ -1,6 +1,6 @@ Apache License Version 2.0, January 2004 - http://www.apache.org/licenses/ + https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION diff --git a/samples/jsf2sample/NOTICE b/samples/jsf2sample/NOTICE index f5a2e59..ac162fe 100644 --- a/samples/jsf2sample/NOTICE +++ b/samples/jsf2sample/NOTICE @@ -2,5 +2,5 @@ Apache OpenWebBeans Copyright 2008, 2010 The Apache Software Foundation This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). diff --git a/samples/reservation/LICENSE b/samples/reservation/LICENSE index 261eeb9..b531235 100644 --- a/samples/reservation/LICENSE +++ b/samples/reservation/LICENSE @@ -1,6 +1,6 @@ Apache License Version 2.0, January 2004 - http://www.apache.org/licenses/ + https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION diff --git a/samples/reservation/NOTICE b/samples/reservation/NOTICE index f5a2e59..ac162fe 100644 --- a/samples/reservation/NOTICE +++ b/samples/reservation/NOTICE @@ -2,5 +2,5 @@ Apache OpenWebBeans Copyright 2008, 2010 The Apache Software Foundation This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). diff --git a/samples/src/site/site.xml b/samples/src/site/site.xml index 01bece5..86570f3 100644 --- a/samples/src/site/site.xml +++ b/samples/src/site/site.xml @@ -21,9 +21,9 @@ <body> <breadcrumbs> - <item name="Apache" href="http://www.apache.org"/> - <item name="OpenWebBeans" href="http://openwebbeans.apache.org"/> - <item name="Samples" href="http://openwebbeans.apache.org/${project.version}/samples"/> + <item name="Apache" href="https://www.apache.org"/> + <item name="OpenWebBeans" href="https://openwebbeans.apache.org"/> + <item name="Samples" href="https://openwebbeans.apache.org/${project.version}/samples"/> </breadcrumbs> <menu ref="modules" /> diff --git a/samples/standalone-sample/LICENSE b/samples/standalone-sample/LICENSE index 261eeb9..b531235 100644 --- a/samples/standalone-sample/LICENSE +++ b/samples/standalone-sample/LICENSE @@ -1,6 +1,6 @@ Apache License Version 2.0, January 2004 - http://www.apache.org/licenses/ + https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION diff --git a/samples/standalone-sample/NOTICE b/samples/standalone-sample/NOTICE index f5a2e59..ac162fe 100644 --- a/samples/standalone-sample/NOTICE +++ b/samples/standalone-sample/NOTICE @@ -2,5 +2,5 @@ Apache OpenWebBeans Copyright 2008, 2010 The Apache Software Foundation This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). diff --git a/samples/tomcat7-sample/LICENSE b/samples/tomcat7-sample/LICENSE index 261eeb9..b531235 100644 --- a/samples/tomcat7-sample/LICENSE +++ b/samples/tomcat7-sample/LICENSE @@ -1,6 +1,6 @@ Apache License Version 2.0, January 2004 - http://www.apache.org/licenses/ + https://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION diff --git a/samples/tomcat7-sample/NOTICE b/samples/tomcat7-sample/NOTICE index f5a2e59..ac162fe 100644 --- a/samples/tomcat7-sample/NOTICE +++ b/samples/tomcat7-sample/NOTICE @@ -2,5 +2,5 @@ Apache OpenWebBeans Copyright 2008, 2010 The Apache Software Foundation This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). +The Apache Software Foundation (https://www.apache.org/). diff --git a/src/site/apt/documentation.apt b/src/site/apt/documentation.apt index 258d66c..5539584 100644 --- a/src/site/apt/documentation.apt +++ b/src/site/apt/documentation.apt @@ -16,7 +16,7 @@ Initial Documentation for OpenWebBeans * Getting Started - * {{{http://openwebbeans.apache.org/1.0.0-SNAPSHOT/documents/userguide.pdf}OpenWebBeans User Guide}} + * {{{https://openwebbeans.apache.org/1.0.0-SNAPSHOT/documents/userguide.pdf}OpenWebBeans User Guide}} * WIKI diff --git a/src/site/apt/trademarks.apt b/src/site/apt/trademarks.apt index ffe6a16..ba65dcb 100644 --- a/src/site/apt/trademarks.apt +++ b/src/site/apt/trademarks.apt @@ -15,13 +15,13 @@ Apache OpenWebBeans Trademark Rules For more information about ASF trademark rules, please visit the official - {{{http://www.apache.org/foundation/marks/}Apache Software Foundation Trademarks}} page. + {{{https://www.apache.org/foundation/marks/}Apache Software Foundation Trademarks}} page. Apache OpenWebBeans Logos The following logos are official project logos and might be used in presentations and articles - according to the {{{http://www.apache.org/foundation/marks/#guidelines}Apache Software Foundation Trademark Rules}}. + according to the {{{https://www.apache.org/foundation/marks/#guidelines}Apache Software Foundation Trademark Rules}}. * {{{./images/logos/openwebbeans_vert.png}Vertical OpenWebBeans Logo}} diff --git a/src/site/site.xml b/src/site/site.xml index eb47128..3a93491 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -20,14 +20,14 @@ <project name="OpenWebBeans"> <bannerLeft> <name>Apache OpenWebBeans</name> - <src>http://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> - <href>http://openwebbeans.apache.org</href> + <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> + <href>https://openwebbeans.apache.org</href> </bannerLeft> <bannerRight> <name>Apache Banner</name> - <src>http://www.apache.org/images/asf-logo.gif</src> - <href>http://www.apache.org</href> + <src>https://www.apache.org/images/asf-logo.gif</src> + <href>https://www.apache.org</href> </bannerRight> <publishDate format="dd MMM yyyy" /> @@ -35,8 +35,8 @@ <body> <breadcrumbs> - <item name="Apache" href="http://www.apache.org"/> - <item name="OpenWebBeans" href="http://openwebbeans.apache.org"/> + <item name="Apache" href="https://www.apache.org"/> + <item name="OpenWebBeans" href="https://openwebbeans.apache.org"/> </breadcrumbs> <menu name="Overview"> @@ -52,7 +52,7 @@ <item name="FAQ" href="faq.html" /> <item name="Extensions" href="extensions/index.html" /> <item name="Logos & Trademarks" href="trademarks.html" /> - <item name="Download Apache OWB" href="http://www.apache.org/dyn/closer.cgi/openwebbeans/" /> + <item name="Download Apache OWB" href="https://www.apache.org/dyn/closer.cgi/openwebbeans/" /> </menu> <menu ref="modules" /> diff --git a/webbeans-ee-common/src/site/site.xml b/webbeans-ee-common/src/site/site.xml index ebd855d..5c66098 100644 --- a/webbeans-ee-common/src/site/site.xml +++ b/webbeans-ee-common/src/site/site.xml @@ -21,14 +21,14 @@ <project name="OpenWebBeans"> <bannerLeft> <name>Apache OpenWebBeans</name> - <src>http://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> - <href>http://openwebbeans.apache.org</href> + <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> + <href>https://openwebbeans.apache.org</href> </bannerLeft> <bannerRight> <name>Apache Banner</name> - <src>http://www.apache.org/images/asf-logo.gif</src> - <href>http://www.apache.org</href> + <src>https://www.apache.org/images/asf-logo.gif</src> + <href>https://www.apache.org</href> </bannerRight> <publishDate format="dd MMM yyyy" /> @@ -36,9 +36,9 @@ <body> <breadcrumbs> - <item name="Apache" href="http://www.apache.org"/> - <item name="OpenWebBeans" href="http://openwebbeans.apache.org"/> - <item name="OWB-EE common" href="http://openwebbeans.apache.org/${project.version}/openwebbeans-ee-common"/> + <item name="Apache" href="https://www.apache.org"/> + <item name="OpenWebBeans" href="https://openwebbeans.apache.org"/> + <item name="OWB-EE common" href="https://openwebbeans.apache.org/${project.version}/openwebbeans-ee-common"/> </breadcrumbs> <menu ref="reports"/> diff --git a/webbeans-ee/src/site/site.xml b/webbeans-ee/src/site/site.xml index a709f84..ff9dd17 100644 --- a/webbeans-ee/src/site/site.xml +++ b/webbeans-ee/src/site/site.xml @@ -21,14 +21,14 @@ <project name="OpenWebBeans"> <bannerLeft> <name>Apache OpenWebBeans</name> - <src>http://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> - <href>http://openwebbeans.apache.org</href> + <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> + <href>https://openwebbeans.apache.org</href> </bannerLeft> <bannerRight> <name>Apache Banner</name> - <src>http://www.apache.org/images/asf-logo.gif</src> - <href>http://www.apache.org</href> + <src>https://www.apache.org/images/asf-logo.gif</src> + <href>https://www.apache.org</href> </bannerRight> <publishDate format="dd MMM yyyy" /> @@ -36,9 +36,9 @@ <body> <breadcrumbs> - <item name="Apache" href="http://www.apache.org"/> - <item name="OpenWebBeans" href="http://openwebbeans.apache.org"/> - <item name="OWB-EE" href="http://openwebbeans.apache.org/${project.version}/openwebbeans-ee"/> + <item name="Apache" href="https://www.apache.org"/> + <item name="OpenWebBeans" href="https://openwebbeans.apache.org"/> + <item name="OWB-EE" href="https://openwebbeans.apache.org/${project.version}/openwebbeans-ee"/> </breadcrumbs> <menu ref="reports"/> </body> diff --git a/webbeans-ejb/src/site/site.xml b/webbeans-ejb/src/site/site.xml index 1510dde..408b286 100644 --- a/webbeans-ejb/src/site/site.xml +++ b/webbeans-ejb/src/site/site.xml @@ -21,14 +21,14 @@ <project name="OpenWebBeans"> <bannerLeft> <name>Apache OpenWebBeans</name> - <src>http://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> - <href>http://openwebbeans.apache.org</href> + <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> + <href>https://openwebbeans.apache.org</href> </bannerLeft> <bannerRight> <name>Apache Banner</name> - <src>http://www.apache.org/images/asf-logo.gif</src> - <href>http://www.apache.org</href> + <src>https://www.apache.org/images/asf-logo.gif</src> + <href>https://www.apache.org</href> </bannerRight> <publishDate format="dd MMM yyyy" /> @@ -36,9 +36,9 @@ <body> <breadcrumbs> - <item name="Apache" href="http://www.apache.org"/> - <item name="OpenWebBeans" href="http://openwebbeans.apache.org"/> - <item name="OWB-EJB" href="http://openwebbeans.apache.org/${project.version}/openwebbeans-ejb"/> + <item name="Apache" href="https://www.apache.org"/> + <item name="OpenWebBeans" href="https://openwebbeans.apache.org"/> + <item name="OWB-EJB" href="https://openwebbeans.apache.org/${project.version}/openwebbeans-ejb"/> </breadcrumbs> <menu ref="reports"/> diff --git a/webbeans-el22/src/site/site.xml b/webbeans-el22/src/site/site.xml index e0b2ca8..26b92e8 100644 --- a/webbeans-el22/src/site/site.xml +++ b/webbeans-el22/src/site/site.xml @@ -21,14 +21,14 @@ <project name="OpenWebBeans"> <bannerLeft> <name>Apache OpenWebBeans</name> - <src>http://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> - <href>http://openwebbeans.apache.org</href> + <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> + <href>https://openwebbeans.apache.org</href> </bannerLeft> <bannerRight> <name>Apache Banner</name> - <src>http://www.apache.org/images/asf-logo.gif</src> - <href>http://www.apache.org</href> + <src>https://www.apache.org/images/asf-logo.gif</src> + <href>https://www.apache.org</href> </bannerRight> <publishDate format="dd MMM yyyy" /> @@ -36,9 +36,9 @@ <body> <breadcrumbs> - <item name="Apache" href="http://www.apache.org"/> - <item name="OpenWebBeans" href="http://openwebbeans.apache.org"/> - <item name="OWB EL-2.2" href="http://openwebbeans.apache.org/${project.version}/openwebbeans-el22"/> + <item name="Apache" href="https://www.apache.org"/> + <item name="OpenWebBeans" href="https://openwebbeans.apache.org"/> + <item name="OWB EL-2.2" href="https://openwebbeans.apache.org/${project.version}/openwebbeans-el22"/> </breadcrumbs> <menu ref="reports"/> diff --git a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java index 89f0ebc..599c493 100644 --- a/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java +++ b/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java @@ -130,13 +130,13 @@ public abstract class AbstractProducer<T> implements Producer<T> Map<Interceptor<?>, Object> interceptorInstances = creationalContextImpl.getWebBeansContext() .getInterceptorResolutionService().createInterceptorInstances(interceptorInfo, creationalContextImpl); creationalContextImpl.putContextual(oldContextual); - - T instance = produce(interceptorInstances, creationalContextImpl); - - if (hasInterceptorInfo() && !(instance instanceof OwbInterceptorProxy)) - { - instance = creationalContextImpl.getWebBeansContext().getInterceptorResolutionService() - .createProxiedInstance(instance, creationalContextImpl, creationalContext, + + T instance = produce(interceptorInstances, creationalContextImpl); + + if (hasInterceptorInfo() && !(instance instanceof OwbInterceptorProxy)) + { + instance = creationalContextImpl.getWebBeansContext().getInterceptorResolutionService() + .createProxiedInstance(instance, creationalContextImpl, creationalContext, interceptorInfo, proxyClass, methodInterceptors, passivationId, interceptorInstances, this::isDelegateInjection, this::filterDecorators); creationalContextImpl.putContextual(oldContextual); diff --git a/webbeans-impl/src/site/site.xml b/webbeans-impl/src/site/site.xml index 2d765bd..1626235 100644 --- a/webbeans-impl/src/site/site.xml +++ b/webbeans-impl/src/site/site.xml @@ -21,14 +21,14 @@ <project name="OpenWebBeans-Impl"> <bannerLeft> <name>Apache OpenWebBeans</name> - <src>http://openwebbeans.apache.org/images/openwebbeans.png</src> - <href>http://openwebbeans.apache.org</href> + <src>https://openwebbeans.apache.org/images/openwebbeans.png</src> + <href>https://openwebbeans.apache.org</href> </bannerLeft> <bannerRight> <name>Apache Banner</name> - <src>http://www.apache.org/images/asf-logo.gif</src> - <href>http://www.apache.org</href> + <src>https://www.apache.org/images/asf-logo.gif</src> + <href>https://www.apache.org</href> </bannerRight> <publishDate format="dd MMM yyyy" /> @@ -36,9 +36,9 @@ <body> <breadcrumbs> - <item name="Apache" href="http://www.apache.org"/> - <item name="OpenWebBeans" href="http://openwebbeans.apache.org"/> - <item name="OWB-Core" href="http://openwebbeans.apache.org/${project.version}/openwebbeans-impl"/> + <item name="Apache" href="https://www.apache.org"/> + <item name="OpenWebBeans" href="https://openwebbeans.apache.org"/> + <item name="OWB-Core" href="https://openwebbeans.apache.org/${project.version}/openwebbeans-impl"/> </breadcrumbs> <menu name="Overview"> diff --git a/webbeans-jetty9/src/site/site.xml b/webbeans-jetty9/src/site/site.xml index 67f36d6..331dedf 100644 --- a/webbeans-jetty9/src/site/site.xml +++ b/webbeans-jetty9/src/site/site.xml @@ -21,14 +21,14 @@ <project name="OpenWebBeans"> <bannerLeft> <name>Apache OpenWebBeans</name> - <src>http://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> - <href>http://openwebbeans.apache.org</href> + <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> + <href>https://openwebbeans.apache.org</href> </bannerLeft> <bannerRight> <name>Apache Banner</name> - <src>http://www.apache.org/images/asf-logo.gif</src> - <href>http://www.apache.org</href> + <src>https://www.apache.org/images/asf-logo.gif</src> + <href>https://www.apache.org</href> </bannerRight> <publishDate format="dd MMM yyyy" /> @@ -36,9 +36,9 @@ <body> <breadcrumbs> - <item name="Apache" href="http://www.apache.org"/> - <item name="OpenWebBeans" href="http://openwebbeans.apache.org"/> - <item name="OWB-Jetty-9" href="http://openwebbeans.apache.org/${project.version}/openwebbeans-jetty9"/> + <item name="Apache" href="https://www.apache.org"/> + <item name="OpenWebBeans" href="https://openwebbeans.apache.org"/> + <item name="OWB-Jetty-9" href="https://openwebbeans.apache.org/${project.version}/openwebbeans-jetty9"/> </breadcrumbs> <menu ref="reports"/> diff --git a/webbeans-jms/src/site/site.xml b/webbeans-jms/src/site/site.xml index ecf618c..0410062 100644 --- a/webbeans-jms/src/site/site.xml +++ b/webbeans-jms/src/site/site.xml @@ -21,14 +21,14 @@ <project name="OpenWebBeans"> <bannerLeft> <name>Apache OpenWebBeans</name> - <src>http://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> - <href>http://openwebbeans.apache.org</href> + <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> + <href>https://openwebbeans.apache.org</href> </bannerLeft> <bannerRight> <name>Apache Banner</name> - <src>http://www.apache.org/images/asf-logo.gif</src> - <href>http://www.apache.org</href> + <src>https://www.apache.org/images/asf-logo.gif</src> + <href>https://www.apache.org</href> </bannerRight> <publishDate format="dd MMM yyyy" /> @@ -36,9 +36,9 @@ <body> <breadcrumbs> - <item name="Apache" href="http://www.apache.org"/> - <item name="OpenWebBeans" href="http://openwebbeans.apache.org"/> - <item name="OWB-JMS" href="http://openwebbeans.apache.org/${project.version}/openwebbeans-jms"/> + <item name="Apache" href="https://www.apache.org"/> + <item name="OpenWebBeans" href="https://openwebbeans.apache.org"/> + <item name="OWB-JMS" href="https://openwebbeans.apache.org/${project.version}/openwebbeans-jms"/> </breadcrumbs> <menu ref="reports"/> diff --git a/webbeans-jsf/src/site/site.xml b/webbeans-jsf/src/site/site.xml index 45258b4..5c3dfb7 100644 --- a/webbeans-jsf/src/site/site.xml +++ b/webbeans-jsf/src/site/site.xml @@ -21,14 +21,14 @@ <project name="OpenWebBeans"> <bannerLeft> <name>Apache OpenWebBeans</name> - <src>http://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> - <href>http://openwebbeans.apache.org</href> + <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> + <href>https://openwebbeans.apache.org</href> </bannerLeft> <bannerRight> <name>Apache Banner</name> - <src>http://www.apache.org/images/asf-logo.gif</src> - <href>http://www.apache.org</href> + <src>https://www.apache.org/images/asf-logo.gif</src> + <href>https://www.apache.org</href> </bannerRight> <publishDate format="dd MMM yyyy" /> @@ -36,9 +36,9 @@ <body> <breadcrumbs> - <item name="Apache" href="http://www.apache.org"/> - <item name="OpenWebBeans" href="http://openwebbeans.apache.org"/> - <item name="OWB-JSF-2" href="http://openwebbeans.apache.org/${project.version}/openwebbeans-jsf"/> + <item name="Apache" href="https://www.apache.org"/> + <item name="OpenWebBeans" href="https://openwebbeans.apache.org"/> + <item name="OWB-JSF-2" href="https://openwebbeans.apache.org/${project.version}/openwebbeans-jsf"/> </breadcrumbs> <menu ref="reports"/> diff --git a/webbeans-osgi/src/site/site.xml b/webbeans-osgi/src/site/site.xml index b423c7e..7c21a85 100644 --- a/webbeans-osgi/src/site/site.xml +++ b/webbeans-osgi/src/site/site.xml @@ -21,14 +21,14 @@ <project name="OpenWebBeans"> <bannerLeft> <name>Apache OpenWebBeans</name> - <src>http://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> - <href>http://openwebbeans.apache.org</href> + <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> + <href>https://openwebbeans.apache.org</href> </bannerLeft> <bannerRight> <name>Apache Banner</name> - <src>http://www.apache.org/images/asf-logo.gif</src> - <href>http://www.apache.org</href> + <src>https://www.apache.org/images/asf-logo.gif</src> + <href>https://www.apache.org</href> </bannerRight> <publishDate format="dd MMM yyyy" /> @@ -36,9 +36,9 @@ <body> <breadcrumbs> - <item name="Apache" href="http://www.apache.org"/> - <item name="OpenWebBeans" href="http://openwebbeans.apache.org"/> - <item name="OWB-OSGi" href="http://openwebbeans.apache.org/${project.version}/openwebbeans-osgi"/> + <item name="Apache" href="https://www.apache.org"/> + <item name="OpenWebBeans" href="https://openwebbeans.apache.org"/> + <item name="OWB-OSGi" href="https://openwebbeans.apache.org/${project.version}/openwebbeans-osgi"/> </breadcrumbs> <menu ref="reports"/> diff --git a/webbeans-porting/src/site/site.xml b/webbeans-porting/src/site/site.xml index aaa593b..2d22064 100644 --- a/webbeans-porting/src/site/site.xml +++ b/webbeans-porting/src/site/site.xml @@ -21,14 +21,14 @@ <project name="OpenWebBeans"> <bannerLeft> <name>Apache OpenWebBeans</name> - <src>http://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> - <href>http://openwebbeans.apache.org</href> + <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> + <href>https://openwebbeans.apache.org</href> </bannerLeft> <bannerRight> <name>Apache Banner</name> - <src>http://www.apache.org/images/asf-logo.gif</src> - <href>http://www.apache.org</href> + <src>https://www.apache.org/images/asf-logo.gif</src> + <href>https://www.apache.org</href> </bannerRight> <publishDate format="dd MMM yyyy" /> diff --git a/webbeans-resource/src/site/site.xml b/webbeans-resource/src/site/site.xml index 166aea8..f27edbe 100644 --- a/webbeans-resource/src/site/site.xml +++ b/webbeans-resource/src/site/site.xml @@ -21,14 +21,14 @@ <project name="OpenWebBeans"> <bannerLeft> <name>Apache OpenWebBeans</name> - <src>http://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> - <href>http://openwebbeans.apache.org</href> + <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> + <href>https://openwebbeans.apache.org</href> </bannerLeft> <bannerRight> <name>Apache Banner</name> - <src>http://www.apache.org/images/asf-logo.gif</src> - <href>http://www.apache.org</href> + <src>https://www.apache.org/images/asf-logo.gif</src> + <href>https://www.apache.org</href> </bannerRight> <publishDate format="dd MMM yyyy" /> @@ -36,9 +36,9 @@ <body> <breadcrumbs> - <item name="Apache" href="http://www.apache.org"/> - <item name="OpenWebBeans" href="http://openwebbeans.apache.org"/> - <item name="OWB-Resource" href="http://openwebbeans.apache.org/${project.version}/openwebbeans-resource"/> + <item name="Apache" href="https://www.apache.org"/> + <item name="OpenWebBeans" href="https://openwebbeans.apache.org"/> + <item name="OWB-Resource" href="https://openwebbeans.apache.org/${project.version}/openwebbeans-resource"/> </breadcrumbs> <menu ref="reports"/> diff --git a/webbeans-spi/src/site/site.xml b/webbeans-spi/src/site/site.xml index 3e7c002..6d6b62f 100644 --- a/webbeans-spi/src/site/site.xml +++ b/webbeans-spi/src/site/site.xml @@ -21,14 +21,14 @@ <project name="OpenWebBeans"> <bannerLeft> <name>Apache OpenWebBeans</name> - <src>http://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> - <href>http://openwebbeans.apache.org</href> + <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> + <href>https://openwebbeans.apache.org</href> </bannerLeft> <bannerRight> <name>Apache Banner</name> - <src>http://www.apache.org/images/asf-logo.gif</src> - <href>http://www.apache.org</href> + <src>https://www.apache.org/images/asf-logo.gif</src> + <href>https://www.apache.org</href> </bannerRight> <publishDate format="dd MMM yyyy" /> @@ -36,9 +36,9 @@ <body> <breadcrumbs> - <item name="Apache" href="http://www.apache.org"/> - <item name="OpenWebBeans" href="http://openwebbeans.apache.org"/> - <item name="OWB-SPI" href="http://openwebbeans.apache.org/${project.version}/openwebbeans-spi"/> + <item name="Apache" href="https://www.apache.org"/> + <item name="OpenWebBeans" href="https://openwebbeans.apache.org"/> + <item name="OWB-SPI" href="https://openwebbeans.apache.org/${project.version}/openwebbeans-spi"/> </breadcrumbs> <menu name="Overview"> diff --git a/webbeans-tck/src/site/site.xml b/webbeans-tck/src/site/site.xml index 8cfa25d..199bdcb 100644 --- a/webbeans-tck/src/site/site.xml +++ b/webbeans-tck/src/site/site.xml @@ -21,14 +21,14 @@ <project name="OpenWebBeans"> <bannerLeft> <name>Apache OpenWebBeans</name> - <src>http://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> - <href>http://openwebbeans.apache.org</href> + <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> + <href>https://openwebbeans.apache.org</href> </bannerLeft> <bannerRight> <name>Apache Banner</name> - <src>http://www.apache.org/images/asf-logo.gif</src> - <href>http://www.apache.org</href> + <src>https://www.apache.org/images/asf-logo.gif</src> + <href>https://www.apache.org</href> </bannerRight> <publishDate format="dd MMM yyyy" /> @@ -36,8 +36,8 @@ <body> <breadcrumbs> - <item name="Apache" href="http://www.apache.org"/> - <item name="OpenWebBeans" href="http://openwebbeans.apache.org"/> + <item name="Apache" href="https://www.apache.org"/> + <item name="OpenWebBeans" href="https://openwebbeans.apache.org"/> </breadcrumbs> <menu name="Overview"> @@ -52,7 +52,7 @@ <item name="IRC" href="irc.html" /> <item name="FAQ" href="faq.html" /> <item name="Extensions" href="extensions/index.html" /> - <item name="Download Apache OWB" href="http://www.apache.org/dyn/closer.cgi/openwebbeans/" /> + <item name="Download Apache OWB" href="https://www.apache.org/dyn/closer.cgi/openwebbeans/" /> </menu> <menu ref="modules" /> diff --git a/webbeans-tomcat7/src/site/site.xml b/webbeans-tomcat7/src/site/site.xml index bc67aed..01c71a5 100644 --- a/webbeans-tomcat7/src/site/site.xml +++ b/webbeans-tomcat7/src/site/site.xml @@ -21,14 +21,14 @@ <project name="OpenWebBeans"> <bannerLeft> <name>Apache OpenWebBeans</name> - <src>http://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> - <href>http://openwebbeans.apache.org</href> + <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> + <href>https://openwebbeans.apache.org</href> </bannerLeft> <bannerRight> <name>Apache Banner</name> - <src>http://www.apache.org/images/asf-logo.gif</src> - <href>http://www.apache.org</href> + <src>https://www.apache.org/images/asf-logo.gif</src> + <href>https://www.apache.org</href> </bannerRight> <publishDate format="dd MMM yyyy" /> @@ -36,9 +36,9 @@ <body> <breadcrumbs> - <item name="Apache" href="http://www.apache.org"/> - <item name="OpenWebBeans" href="http://openwebbeans.apache.org"/> - <item name="OWB-Tomcat-7" href="http://openwebbeans.apache.org/${project.version}/openwebbeans-tomcat7"/> + <item name="Apache" href="https://www.apache.org"/> + <item name="OpenWebBeans" href="https://openwebbeans.apache.org"/> + <item name="OWB-Tomcat-7" href="https://openwebbeans.apache.org/${project.version}/openwebbeans-tomcat7"/> </breadcrumbs> <menu ref="reports"/> diff --git a/webbeans-web/src/site/site.xml b/webbeans-web/src/site/site.xml index 1cfed87..b96600c 100644 --- a/webbeans-web/src/site/site.xml +++ b/webbeans-web/src/site/site.xml @@ -21,14 +21,14 @@ <project name="OpenWebBeans"> <bannerLeft> <name>Apache OpenWebBeans</name> - <src>http://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> - <href>http://openwebbeans.apache.org</href> + <src>https://openwebbeans.apache.org/owb/images/logos/openwebbeans_hor.png</src> + <href>https://openwebbeans.apache.org</href> </bannerLeft> <bannerRight> <name>Apache Banner</name> - <src>http://www.apache.org/images/asf-logo.gif</src> - <href>http://www.apache.org</href> + <src>https://www.apache.org/images/asf-logo.gif</src> + <href>https://www.apache.org</href> </bannerRight> <publishDate format="dd MMM yyyy" /> @@ -36,9 +36,9 @@ <body> <breadcrumbs> - <item name="Apache" href="http://www.apache.org"/> - <item name="OpenWebBeans" href="http://openwebbeans.apache.org"/> - <item name="OWB-Web" href="http://openwebbeans.apache.org/${project.version}/openwebbeans-web"/> + <item name="Apache" href="https://www.apache.org"/> + <item name="OpenWebBeans" href="https://openwebbeans.apache.org"/> + <item name="OWB-Web" href="https://openwebbeans.apache.org/${project.version}/openwebbeans-web"/> </breadcrumbs> <menu ref="reports"/>