You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2018/05/28 21:48:08 UTC
[1/5] roller git commit: Convert docs README to Markdown
Repository: roller
Updated Branches:
refs/heads/bootstrap-ui f8ee9d7f2 -> 9b7d562ec
Convert docs README to Markdown
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/7f4ac300
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/7f4ac300
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/7f4ac300
Branch: refs/heads/bootstrap-ui
Commit: 7f4ac300d0782335f3937c53f1f10165d8f208b0
Parents: 94cb260
Author: Dave Johnson <sn...@gmail.com>
Authored: Sun Feb 25 17:43:39 2018 -0500
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sun Feb 25 17:43:39 2018 -0500
----------------------------------------------------------------------
docs/README.md | 10 ++++++++++
docs/README.txt | 9 ---------
2 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/7f4ac300/docs/README.md
----------------------------------------------------------------------
diff --git a/docs/README.md b/docs/README.md
new file mode 100644
index 0000000..686b079
--- /dev/null
+++ b/docs/README.md
@@ -0,0 +1,10 @@
+# docs/README.md
+
+In this directory you'll find Roller docs in Open Office (ODF) format, various examples and test plans.
+
+* `roller-install-guide.odt` - How to install Roller
+* `roller-user-guide.odt` - How to use Roller
+* `roller-template-guide.odt` - How to create Roller templates and themes
+* `examples/` - example configuration and script files
+* `testing/` - Various test scripts
+
http://git-wip-us.apache.org/repos/asf/roller/blob/7f4ac300/docs/README.txt
----------------------------------------------------------------------
diff --git a/docs/README.txt b/docs/README.txt
deleted file mode 100644
index a92ba2d..0000000
--- a/docs/README.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-In this directory you'll find Roller docs in ODF format, various examples and
-test plans.
-
- roller-install-guide.odt - How to install Roller
- roller-user-guide.odt - How to use Roller
- roller-template-guide.odt - How to create Roller templates and themes
- examples/ - example configuration and script files
- testing/ - Various test scripts
-
[3/5] roller git commit: master is no longer 5.2.0
Posted by sn...@apache.org.
master is no longer 5.2.0
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/76672cec
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/76672cec
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/76672cec
Branch: refs/heads/bootstrap-ui
Commit: 76672cecbb5f943739c152cd6acc2e558430fc9b
Parents: c6459e5
Author: Dave Johnson <sn...@gmail.com>
Authored: Sat May 19 08:49:44 2018 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sat May 19 08:49:44 2018 -0400
----------------------------------------------------------------------
app/pom.xml | 2 +-
assembly-release/pom.xml | 2 +-
assembly-release/sign-release.sh | 2 +-
it-selenium/pom.xml | 2 +-
it-selenium/src/test/resources/roller-jettyrun.properties | 2 +-
pom.xml | 4 ++--
6 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/76672cec/app/pom.xml
----------------------------------------------------------------------
diff --git a/app/pom.xml b/app/pom.xml
index 4739e4c..3493026 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.2.0</version>
+ <version>5.3.0-SNAPSHOT/</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/roller/blob/76672cec/assembly-release/pom.xml
----------------------------------------------------------------------
diff --git a/assembly-release/pom.xml b/assembly-release/pom.xml
index 77dac0d..b958cd1 100644
--- a/assembly-release/pom.xml
+++ b/assembly-release/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.2.0</version>
+ <version>5.3.0-SNAPSHOT/</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/roller/blob/76672cec/assembly-release/sign-release.sh
----------------------------------------------------------------------
diff --git a/assembly-release/sign-release.sh b/assembly-release/sign-release.sh
index 77fdd59..3ccc5d5 100755
--- a/assembly-release/sign-release.sh
+++ b/assembly-release/sign-release.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
export rcstring=""
-export vstring="5.2.0"
+export vstring="5.3.0"
# for rc releases we rename the release files
if [ rcstring != "" ]; then
http://git-wip-us.apache.org/repos/asf/roller/blob/76672cec/it-selenium/pom.xml
----------------------------------------------------------------------
diff --git a/it-selenium/pom.xml b/it-selenium/pom.xml
index 2854584..104dd9c 100644
--- a/it-selenium/pom.xml
+++ b/it-selenium/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.2.0</version>
+ <version>5.3.0-SNAPSHOT/</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/roller/blob/76672cec/it-selenium/src/test/resources/roller-jettyrun.properties
----------------------------------------------------------------------
diff --git a/it-selenium/src/test/resources/roller-jettyrun.properties b/it-selenium/src/test/resources/roller-jettyrun.properties
index 643e0c5..9380aae 100644
--- a/it-selenium/src/test/resources/roller-jettyrun.properties
+++ b/it-selenium/src/test/resources/roller-jettyrun.properties
@@ -23,7 +23,7 @@ hibernate.transaction.factory_class=org.hibernate.transaction.JDBCTransactionFac
passwds.encryption.enabled=false
# use src copy of themes for read-only access
-themes.dir=target/roller-selenium-tests-5.2.0/themes
+themes.dir=target/roller-selenium-tests-5.3.0-SNAPSHOT/themes
# put work in work dir
search.index.dir =target/work/search-index
http://git-wip-us.apache.org/repos/asf/roller/blob/76672cec/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 408d530..c60f42c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@ limitations under the License.
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.2.0</version>
+ <version>5.3.0-SNAPSHOT/</version>
<packaging>pom</packaging>
<prerequisites>
@@ -47,7 +47,7 @@ limitations under the License.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<derby.version>10.11.1.1</derby.version>
- <roller.version>5.2.0</roller.version>
+ <roller.version>5.3.0-SNAPSHOT/</roller.version>
</properties>
<modules>
[4/5] roller git commit: master is no longer 5.2.0
Posted by sn...@apache.org.
master is no longer 5.2.0
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/870e9332
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/870e9332
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/870e9332
Branch: refs/heads/bootstrap-ui
Commit: 870e9332ed3f0bf57eea9bf37518bea577ac1f43
Parents: 76672ce
Author: Dave Johnson <sn...@gmail.com>
Authored: Sat May 19 14:46:41 2018 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sat May 19 14:46:41 2018 -0400
----------------------------------------------------------------------
app/pom.xml | 2 +-
assembly-release/pom.xml | 2 +-
it-selenium/pom.xml | 2 +-
pom.xml | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/870e9332/app/pom.xml
----------------------------------------------------------------------
diff --git a/app/pom.xml b/app/pom.xml
index 3493026..6d7df1c 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -24,7 +24,7 @@ limitations under the License.
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.3.0-SNAPSHOT/</version>
+ <version>5.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/roller/blob/870e9332/assembly-release/pom.xml
----------------------------------------------------------------------
diff --git a/assembly-release/pom.xml b/assembly-release/pom.xml
index b958cd1..d7370f2 100644
--- a/assembly-release/pom.xml
+++ b/assembly-release/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.3.0-SNAPSHOT/</version>
+ <version>5.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/roller/blob/870e9332/it-selenium/pom.xml
----------------------------------------------------------------------
diff --git a/it-selenium/pom.xml b/it-selenium/pom.xml
index 104dd9c..6e21406 100644
--- a/it-selenium/pom.xml
+++ b/it-selenium/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.3.0-SNAPSHOT/</version>
+ <version>5.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/roller/blob/870e9332/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c60f42c..2919ae1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@ limitations under the License.
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.roller</groupId>
<artifactId>roller-project</artifactId>
- <version>5.3.0-SNAPSHOT/</version>
+ <version>5.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<prerequisites>
@@ -47,7 +47,7 @@ limitations under the License.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<derby.version>10.11.1.1</derby.version>
- <roller.version>5.3.0-SNAPSHOT/</roller.version>
+ <roller.version>5.3.0-SNAPSHOT</roller.version>
</properties>
<modules>
[5/5] roller git commit: Merge branch 'master' into bootstrap-ui
Posted by sn...@apache.org.
Merge branch 'master' into bootstrap-ui
# Conflicts:
# app/pom.xml
# assembly-release/pom.xml
# assembly-release/sign-release.sh
# it-selenium/pom.xml
# it-selenium/src/test/resources/roller-jettyrun.properties
# pom.xml
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/9b7d562e
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/9b7d562e
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/9b7d562e
Branch: refs/heads/bootstrap-ui
Commit: 9b7d562ec9ae4ae1cf43080a6dbc01cc68e38411
Parents: f8ee9d7 870e933
Author: Dave Johnson <sn...@gmail.com>
Authored: Mon May 28 17:48:04 2018 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Mon May 28 17:48:04 2018 -0400
----------------------------------------------------------------------
.../ui/rendering/WeblogRequestMapper.java | 20 ++++++++++++++------
docs/README.md | 10 ++++++++++
docs/README.txt | 9 ---------
3 files changed, 24 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
[2/5] roller git commit: With a multi-host blog setup,
use hostname to determine match instead of URL.
Posted by sn...@apache.org.
With a multi-host blog setup, use hostname to determine match instead of URL.
Using the URL is problematic when HTTPS s enabled and originally requesed URL was redirected from http:// to https://
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/c6459e5c
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/c6459e5c
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/c6459e5c
Branch: refs/heads/bootstrap-ui
Commit: c6459e5c707cf4f4903b2b408a6ac3fb8f6b5adc
Parents: 7f4ac30
Author: Dave Johnson <sn...@gmail.com>
Authored: Wed Mar 14 17:09:16 2018 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Wed Mar 14 17:09:16 2018 -0400
----------------------------------------------------------------------
.../ui/rendering/WeblogRequestMapper.java | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/c6459e5c/app/src/main/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java
----------------------------------------------------------------------
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java
index cf3ec65..ad8c170 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/WeblogRequestMapper.java
@@ -19,6 +19,7 @@
package org.apache.roller.weblogger.ui.rendering;
import java.io.IOException;
+import java.net.URL;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
@@ -133,12 +134,19 @@ public class WeblogRequestMapper implements RequestMapper {
return false;
}
- String weblogAbsoluteURL =
- WebloggerConfig.getProperty("weblog.absoluteurl." + weblogHandle);
- // If an absolute URL is specified for this weblog, make sure request URL matches
- if (weblogAbsoluteURL != null && !request.getRequestURL().toString().startsWith(weblogAbsoluteURL)) {
- log.debug("SKIPPED " + weblogHandle);
- return false;
+ // is there a special hostname for the specified hostname?
+ String multiHostNameURL = WebloggerConfig.getProperty("weblog.absoluteurl." + weblogHandle);
+ if ( multiHostNameURL != null ) {
+
+ // there is, so check that configured hostname matches the one in the request
+ URL weblogAbsoluteURL = new URL( multiHostNameURL );
+ String headerHost = request.getHeader("Host");
+ String configHost = weblogAbsoluteURL.getHost();
+
+ if (headerHost != null && configHost != null && !headerHost.equals(configHost)) {
+ log.debug("SKIPPED " + weblogHandle);
+ return false;
+ }
}
log.debug("WEBLOG_URL "+request.getServletPath());