LOGCXX-497: Changed lots of hard coded http://-targets to HTTPS.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/f5be57e7 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/f5be57e7 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/f5be57e7 Branch: refs/heads/release_scripts Commit: f5be57e71e766ffdc8714e8b4e45d359a9182a52 Parents: 6157b42 Author: Thorsten Schöning <[email protected]> Authored: Sat Jan 27 12:28:47 2018 +0100 Committer: Thorsten Schöning <[email protected]> Committed: Sat Jan 27 12:28:47 2018 +0100 ---------------------------------------------------------------------- src/site/apt/building/ant.apt | 12 ++++++------ src/site/apt/building/autotools.apt | 2 +- src/site/apt/building/maven.apt | 6 +++--- src/site/apt/building/vstudio.apt | 2 +- src/site/apt/building/xcode.apt | 2 +- src/site/apt/community/issue-tracking.apt | 6 +++--- src/site/apt/index.apt | 8 ++++---- src/site/resources/.htaccess | 24 ++++++++++++------------ src/site/site.vm | 8 ++++---- src/site/site.xml | 14 +++++++------- 10 files changed, 42 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/f5be57e7/src/site/apt/building/ant.apt ---------------------------------------------------------------------- diff --git a/src/site/apt/building/ant.apt b/src/site/apt/building/ant.apt index a7842f2..ceb2838 100644 --- a/src/site/apt/building/ant.apt +++ b/src/site/apt/building/ant.apt @@ -20,7 +20,7 @@ Building Apache log4cxx with Apache Ant - {{{http://ant.apache.org}Apache Ant}} with cpptasks from the + {{{https://ant.apache.org}Apache Ant}} with cpptasks from the {{{http://ant-contrib.sourceforge.net}Ant-Contrib}} project can be used to build log4cxx with supported compilers and is also used to generate the IDE project files included in the releases. The Apache Maven build which is used to generate the site documentation @@ -29,7 +29,7 @@ Building Apache log4cxx with Apache Ant * Quick start: - * Install {{{http://ant.apache.org}Apache Ant}} 1.6.5 or later. + * Install {{{https://ant.apache.org}Apache Ant}} 1.6.5 or later. * Install cpptasks 1.0b5 or later from the {{{http://ant-contrib.sourceforge.net}Ant-Contrib Project}}. ant-contribs 1.0b3 or later is needed for some less frequent build targets. @@ -156,7 +156,7 @@ $ ant -Dcompiler=xyz Combining -Dlib.type=shared and -Druntime=static is unsafe. Properties may also be placed in a build.properties file in the log4cxx directory. The file has - to be in the default format for {{{http://en.wikipedia.org/wiki/.properties}Java properties files}}, + to be in the default format for {{{https://en.wikipedia.org/wiki/.properties}Java properties files}}, especially one must not provide options using the syntax -Dxy=z like on the shell, but only as xy=z per line. @@ -166,14 +166,14 @@ $ ant -Dcompiler=xyz {{{http://gnuwin32.sourceforge.net}GnuWin32}} provides binary versions of sed, gzip and zip. Alternative, - the bin directory of {{{http://www.cygwin.com}Cygwin}} may be placed on the path. + the bin directory of {{{https://www.cygwin.com}Cygwin}} may be placed on the path. If -Dwith-SMTP=libesmtp is specified, the build will attempt to build libesmtp from source, unfortunately libesmtp depends on poll.h and will not build. APR 1.2.12 has a known issue that will prevent compilation with Visual Studio 6 unless a later Platform SDK is installed. - See APR bug {{{http://issues.apache.org/bugzilla/show_bug.cgi?44327}44327}}. + See APR bug {{{https://issues.apache.org/bugzilla/show_bug.cgi?44327}44327}}. APR 1.2.11 and the corresponding APR-Util 1.2.10 will compile with Visual Studio 6. If your are using Visual Studio, vsvars32.bat from the directory ...\Common7\Tools needs to be @@ -207,7 +207,7 @@ $ ..\..\..\target\debug\shared\stream Running "ant check" was observed to fail with unexpected exceptions in streamtestcase and datetimedateformattestcase. - See {{{http://issues.apache.org/jira/browse/LOGCXX-244}LOGCXX-244}}. + See {{{https://issues.apache.org/jira/browse/LOGCXX-244}LOGCXX-244}}. ** Debian: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/f5be57e7/src/site/apt/building/autotools.apt ---------------------------------------------------------------------- diff --git a/src/site/apt/building/autotools.apt b/src/site/apt/building/autotools.apt index 9f025f3..b222bf4 100644 --- a/src/site/apt/building/autotools.apt +++ b/src/site/apt/building/autotools.apt @@ -138,4 +138,4 @@ $ make install Running "make check" was observed to fail with unexpected exceptions in streamtestcase and datetimedateformattestcase. - See {{{http://issues.apache.org/jira/browse/LOGCXX-244}LOGCXX-244}}. + See {{{https://issues.apache.org/jira/browse/LOGCXX-244}LOGCXX-244}}. http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/f5be57e7/src/site/apt/building/maven.apt ---------------------------------------------------------------------- diff --git a/src/site/apt/building/maven.apt b/src/site/apt/building/maven.apt index ac33da7..a090497 100644 --- a/src/site/apt/building/maven.apt +++ b/src/site/apt/building/maven.apt @@ -20,7 +20,7 @@ Building Apache log4cxx with Apache Maven 2 - {{{http://maven.apache.org}Apache Maven 2}} is used to generate the release assemblies and generate + {{{https://maven.apache.org}Apache Maven 2}} is used to generate the release assemblies and generate product documentation. It delegates to the {{{./ant.html}Apache Ant build}} to build and test log4cxx and can be used as an alternate front end to the Ant build process since it can automatically download and use ant-contrib, @@ -29,7 +29,7 @@ Building Apache log4cxx with Apache Maven 2 * Quick start: - *Install {{{http://maven.apache.org}Apache Maven}} 2.0.8 or later. + *Install {{{https://maven.apache.org}Apache Maven}} 2.0.8 or later. *Install APR and APR-Util or place source in apr and apr-util directories in same parent directory as log4cxx directory. @@ -75,7 +75,7 @@ $ mvn package It is not possible to directly pass options to the Ant build, however the ant build will read any build.properties file in the log4cxx directory. The file has to be in the default format - for {{{http://en.wikipedia.org/wiki/.properties}Java properties files}}, especially one must not + for {{{https://en.wikipedia.org/wiki/.properties}Java properties files}}, especially one must not provide options using the syntax -Dxy=z like on the shell, but only as xy=z per line. SMTP and ODBC options can depend on libraries that that have different licenses. You should http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/f5be57e7/src/site/apt/building/vstudio.apt ---------------------------------------------------------------------- diff --git a/src/site/apt/building/vstudio.apt b/src/site/apt/building/vstudio.apt index 0e7211a..8305838 100644 --- a/src/site/apt/building/vstudio.apt +++ b/src/site/apt/building/vstudio.apt @@ -77,7 +77,7 @@ configure-aprutil *APR 1.2.12 has a known issue that will prevent compilation with Visual Studio 6 unless a later Platform SDK is installed. - See APR bug {{{http://issues.apache.org/bugzilla/show_bug.cgi?44327}44327}}. + See APR bug {{{https://issues.apache.org/bugzilla/show_bug.cgi?44327}44327}}. APR 1.2.11 and the corresponding APR-Util 1.2.10 will compile with Visual Studio 6. *APR-Util requires later LDAP headers than provided with Visual Studio 6 http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/f5be57e7/src/site/apt/building/xcode.apt ---------------------------------------------------------------------- diff --git a/src/site/apt/building/xcode.apt b/src/site/apt/building/xcode.apt index ff1cb2c..33a163a 100644 --- a/src/site/apt/building/xcode.apt +++ b/src/site/apt/building/xcode.apt @@ -58,7 +58,7 @@ open projects/log4cxx.xcodeproj and drop on the "Link Binary with Libraries" folder under Targets. - See issue {{{http://issues.apache.org/jira/browse/LOGCXX-245}LOGCXX-245}} for further information. + See issue {{{https://issues.apache.org/jira/browse/LOGCXX-245}LOGCXX-245}} for further information. The projects provided in the release target Mac OS/X 10.5 which provides preinstalled APR and APR-Util libraries. To generate XCode projects to target Mac OS/X 10.4, http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/f5be57e7/src/site/apt/community/issue-tracking.apt ---------------------------------------------------------------------- diff --git a/src/site/apt/community/issue-tracking.apt b/src/site/apt/community/issue-tracking.apt index 62933a1..745923b 100644 --- a/src/site/apt/community/issue-tracking.apt +++ b/src/site/apt/community/issue-tracking.apt @@ -20,7 +20,7 @@ Issue Tracking Overview - This project uses {{{http://www.atlassian.com/software/jira}JIRA}}, a J2EE-based issue tracking + This project uses {{{https://www.atlassian.com/software/jira}JIRA}}, a J2EE-based issue tracking and project management application. Issue Tracking @@ -33,7 +33,7 @@ Issue Tracking <<Please don't just open bugs only because things don't work for you>>, some issues simply don't are bugs in the code base of the project or it's build tools, but may have a lot of different other reasons. If things don't work for you and you need some help, please subscribe - to the {{{http://logging.apache.org/log4cxx/mail-lists.html}users mailing list}} and describe + to the {{{https://logging.apache.org/log4cxx/mail-lists.html}users mailing list}} and describe the issue you have, the more detailed the better. The mailing list is a far better place to discuss things than JIRA, besides that there are more users than developers of the project and issues created in JIRA are only forwarded to the latter. There's always the chance to create an @@ -42,7 +42,7 @@ Issue Tracking As a rule of thumb, if you already digged through the code and found a problem in it or its build tools, feel free to directly create a bug in {{{https://issues.apache.org/jira/browse/LOGCXX}JIRA}}. - But if things really only don't work and you don't have any clue why, please use the {{{http://logging.apache.org/log4cxx/mail-lists.html}users mailing listt}} + But if things really only don't work and you don't have any clue why, please use the {{{https://logging.apache.org/log4cxx/mail-lists.html}users mailing listt}} instead. Thanks! \ No newline at end of file http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/f5be57e7/src/site/apt/index.apt ---------------------------------------------------------------------- diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt index 7d53f3b..4eb49dd 100644 --- a/src/site/apt/index.apt +++ b/src/site/apt/index.apt @@ -21,11 +21,11 @@ Short introduction to Apache log4cxx Short introduction to Apache log4cxx Apache log4cxx is a logging framework for C++ patterned after - {{{http://logging.apache.org/log4j}Apache log4j}}, which uses - {{{http://apr.apache.org}Apache Portable Runtime}} for most platform-specific code and should + {{{https://logging.apache.org/log4j}Apache log4j}}, which uses + {{{https://apr.apache.org}Apache Portable Runtime}} for most platform-specific code and should be usable on any platform supported by APR. Apache log4cxx is licensed under the - {{{http://www.apache.org/licenses}Apache License}}, an open source license certified by the - {{{http://www.opensource.org}Open Source Initiative}}. + {{{https://www.apache.org/licenses}Apache License}}, an open source license certified by the + {{{https://www.opensource.org}Open Source Initiative}}. Almost every large application includes its own logging or tracing API. Inserting log statements into code is a low-tech method for debugging it. It may also be the only way because http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/f5be57e7/src/site/resources/.htaccess ---------------------------------------------------------------------- diff --git a/src/site/resources/.htaccess b/src/site/resources/.htaccess index fd861ac..6a46dec 100644 --- a/src/site/resources/.htaccess +++ b/src/site/resources/.htaccess @@ -18,16 +18,16 @@ # # rewrite site requests to equivalent new URLs # - RewriteRule ^contributing\.html$ http://logging.apache.org/log4cxx/issue-tracking.html [R=permanent,L] - RewriteRule ^roadmap\.html$ http://logging.apache.org/log4cxx/issue-tracking.html [R=permanent,L] - RewriteRule ^support\.html$ http://logging.apache.org/log4cxx/index.html [R=permanent,L] - RewriteRule ^team\.html$ http://logging.apache.org/team-list.html [R=permanent,L] - RewriteRule ^performance\.html$ http://logging.apache.org/log4cxx/index.html [R=permanent,L] - RewriteRule ^ChangeLog$ http://logging.apache.org/log4cxx/changes-report.html [R=permanent,L] - RewriteRule ^news$ http://logging.apache.org/log4cxx/changes-report.html [R=permanent,L] - RewriteRule ^manual\.html$ http://logging.apache.org/log4cxx/index.html [R=permanent,L] - RewriteRule ^manual/index\.html$ http://logging.apache.org/log4cxx/manual.html [R=permanent,L] - RewriteRule ^manual/(.*)$ http://logging.apache.org/log4cxx/apidocs/$1 [R=permanent,L] - RewriteRule ^manual\.html/index\.html$ http://logging.apache.org/log4cxx/manual.html [R=permanent,L] - RewriteRule ^manual\.html/(.*)$ http://logging.apache.org/log4cxx/apidocs/$1 [R=permanent,L] + RewriteRule ^contributing\.html$ https://logging.apache.org/log4cxx/issue-tracking.html [R=permanent,L] + RewriteRule ^roadmap\.html$ https://logging.apache.org/log4cxx/issue-tracking.html [R=permanent,L] + RewriteRule ^support\.html$ https://logging.apache.org/log4cxx/index.html [R=permanent,L] + RewriteRule ^team\.html$ https://logging.apache.org/team-list.html [R=permanent,L] + RewriteRule ^performance\.html$ https://logging.apache.org/log4cxx/index.html [R=permanent,L] + RewriteRule ^ChangeLog$ https://logging.apache.org/log4cxx/changes-report.html [R=permanent,L] + RewriteRule ^news$ https://logging.apache.org/log4cxx/changes-report.html [R=permanent,L] + RewriteRule ^manual\.html$ https://logging.apache.org/log4cxx/index.html [R=permanent,L] + RewriteRule ^manual/index\.html$ https://logging.apache.org/log4cxx/manual.html [R=permanent,L] + RewriteRule ^manual/(.*)$ https://logging.apache.org/log4cxx/apidocs/$1 [R=permanent,L] + RewriteRule ^manual\.html/index\.html$ https://logging.apache.org/log4cxx/manual.html [R=permanent,L] + RewriteRule ^manual\.html/(.*)$ https://logging.apache.org/log4cxx/apidocs/$1 [R=permanent,L] </IfModule> http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/f5be57e7/src/site/site.vm ---------------------------------------------------------------------- diff --git a/src/site/site.vm b/src/site/site.vm index d88236f..d6aeca9 100644 --- a/src/site/site.vm +++ b/src/site/site.vm @@ -363,7 +363,7 @@ #set ( $href = $PathTool.calculateLink( $item.href, $relativePath ) ) #set ( $href = $href.replaceAll( '\\', '/' ) ) #else - #set ( $href="http://maven.apache.org/"; ) + #set ( $href="https://maven.apache.org/"; ) #end ## #if( $item.name ) @@ -414,12 +414,12 @@ </a> #end #if( $poweredBy.isEmpty() ) - <a href="http://maven.apache.org/"; title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy"> + <a href="https://maven.apache.org/"; title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy"> <img class="poweredBy" alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png" /> </a> #end #else - <a href="http://maven.apache.org/"; title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy"> + <a href="https://maven.apache.org/"; title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy"> <img class="poweredBy" alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png" /> </a> #end @@ -512,7 +512,7 @@ #set ( $currentYear = ${currentDate.year} + 1900 ) <p>Copyright � ${project.inceptionYear}-${currentYear} <a class="external" href="$project.organization.url">${project.organization.name}</a>. All Rights Reserved.</p> <p>Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, and the Apache Logging project logo are trademarks of The Apache Software Foundation.</p> - <p>Site powered by <a class="external" href="http://getbootstrap.com/";>Twitter Bootstrap</a>. Icons from <a class="external" href="http://glyphicons.com/";>Glyphicons Free</a>.</p> + <p>Site powered by <a class="external" href="https://getbootstrap.com/";>Twitter Bootstrap</a>. Icons from <a class="external" href="https://glyphicons.com/";>Glyphicons Free</a>.</p> </div> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/f5be57e7/src/site/site.xml ---------------------------------------------------------------------- diff --git a/src/site/site.xml b/src/site/site.xml index ddb3cfa..c33ae73 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -17,7 +17,7 @@ --> <project xmlns="http://maven.apache.org/DECORATION/1.4.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"; + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 https://maven.apache.org/xsd/decoration-1.4.0.xsd"; name="log4cxx"> <publishDate position="right" /> @@ -26,7 +26,7 @@ <bannerLeft> <name>Logging Services</name> <src>images/logos/ls-logo.jpg</src> - <href>http://logging.apache.org</href> + <href>https://logging.apache.org</href> <title>Open the Apache Logging homepage</title> </bannerLeft> @@ -94,7 +94,7 @@ href="/community/issue-tracking.html" /> <item name="Wiki" - href="http://wiki.apache.org/logging-log4cxx"; + href="https://wiki.apache.org/logging-log4cxx"; /> </menu> @@ -129,16 +129,16 @@ <menu name="Apache" img="icon-info-sign"> <item name="Home" - href="http://www.apache.org"; + href="https://www.apache.org"; /> <item name="Sponsorship" - href="http://www.apache.org/foundation/sponsorship.html"; + href="https://www.apache.org/foundation/sponsorship.html"; /> <item name="Thanks" - href="http://www.apache.org/foundation/thanks.html"; + href="https://www.apache.org/foundation/thanks.html"; /> <item name="Conferences" - href="http://www.apachecon.com"; + href="https://www.apachecon.com"; /> </menu> </body>
