Merge branch 'master' into roller-6.0.x
# Conflicts:
# LICENSE.txt
# NOTICE.txt
diff --git a/Dockerfile b/Dockerfile
index 53affc4..28570de 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,7 +31,7 @@
RUN apt-get update && apt-get install -y git
RUN git clone https://github.com/apache/roller.git
WORKDIR /tmp/roller
-RUN git checkout bootstrap-ui; \
+RUN git checkout master; \
mvn -Duser.home=/builder/home -DskipTests=true -B clean install
@@ -62,7 +62,7 @@
# install Roller WAR as ROOT.war, create data dirs
WORKDIR /usr/local/roller
-COPY --from=builder /project/app/target/roller.war /usr/local/tomcat/webapps/ROOT.war
+COPY --from=builder /tmp/roller/app/target/roller.war /usr/local/tomcat/webapps/ROOT.war
RUN mkdir -p data/mediafiles data/searchindex
# download PostgreSQL and MySQL drivers plus Mail and Activation JARs
@@ -81,4 +81,4 @@
RUN chmod -R g+rw /usr/local/tomcat
WORKDIR /usr/local/tomcat
-ENTRYPOINT /usr/local/tomcat/bin/entry-point.sh
\ No newline at end of file
+ENTRYPOINT /usr/local/tomcat/bin/entry-point.sh
diff --git a/LICENSE.txt b/LICENSE.txt
index 89d78e0..83b89fc 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -339,4 +339,32 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
+
+-------------------------------------------------------------------------------
+This product bundles Summernote WYSIWYG editor, which is available under a
+"MIT" license. For details, see
+/webjars/summernote/0.8.11/dist/summernote.min.js
+https://github.com/summernote/summernote/blob/develop/LICENSE
+
+The MIT License (MIT)
+
+Copyright (c) 2015~ Summernote Team (https://github.com/orgs/summernote/people)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/app/pom.xml b/app/pom.xml
index 36a421b..1d6cd03 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -49,7 +49,7 @@
<guice.version>4.2.2</guice.version>
<log4j.version>1.2.17</log4j.version>
<log4j2.version>2.10.0</log4j2.version>
- <lucene.version>4.10.4</lucene.version>
+ <lucene.version>8.1.1</lucene.version>
<oauth-core.version>20100527</oauth-core.version>
<maven-war.version>3.1.0</maven-war.version>
<maven-surefire.version>2.17</maven-surefire.version>
diff --git a/app/src/main/java/org/apache/roller/weblogger/business/search/FieldConstants.java b/app/src/main/java/org/apache/roller/weblogger/business/search/FieldConstants.java
index fc90002..7b19361 100644
--- a/app/src/main/java/org/apache/roller/weblogger/business/search/FieldConstants.java
+++ b/app/src/main/java/org/apache/roller/weblogger/business/search/FieldConstants.java
@@ -18,7 +18,6 @@
/* Created on Jul 19, 2003 */
package org.apache.roller.weblogger.business.search;
-import org.apache.lucene.util.Version;
/**
* Field constants for indexing blog entries and comments.
@@ -27,9 +26,6 @@
*/
public final class FieldConstants {
- // Set what version we are on
- public static final Version LUCENE_VERSION = Version.LUCENE_44;
-
public static final String ANCHOR = "anchor";
public static final String UPDATED = "updated";
public static final String ID = "id";
diff --git a/app/src/main/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java b/app/src/main/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java
index e835c4f..aa2cb5d 100644
--- a/app/src/main/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java
+++ b/app/src/main/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java
@@ -22,6 +22,7 @@
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
+import java.nio.file.Path;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -37,9 +38,6 @@
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
-import org.apache.lucene.store.IOContext;
-import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.util.Version;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.InitializationException;
import org.apache.roller.weblogger.business.Weblogger;
@@ -49,7 +47,6 @@
import org.apache.roller.weblogger.business.search.operations.RebuildWebsiteIndexOperation;
import org.apache.roller.weblogger.business.search.operations.RemoveEntryOperation;
import org.apache.roller.weblogger.business.search.operations.RemoveWebsiteIndexOperation;
-import org.apache.roller.weblogger.business.search.operations.WriteToIndexOperation;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.config.WebloggerConfig;
@@ -79,15 +76,11 @@
File indexConsistencyMarker;
- private boolean useRAMIndex = false;
-
- private RAMDirectory fRAMindex;
-
private String indexDir = null;
private boolean inconsistentAtStartup = false;
- private ReadWriteLock rwl = new ReentrantReadWriteLock();
+ private final ReadWriteLock rwl = new ReentrantReadWriteLock();
// ~ Constructors
// ===========================================================
@@ -126,6 +119,7 @@
/**
* @inheritDoc
*/
+ @Override
public void initialize() throws InitializationException {
// only initialize the index if search is enabled
@@ -155,23 +149,22 @@
}
if (indexExists()) {
- if (useRAMIndex) {
- Directory filesystem = getFSDirectory(false);
- try {
- fRAMindex = new RAMDirectory(filesystem, IOContext.DEFAULT);
- } catch (IOException e) {
- mLogger.error("Error creating in-memory index", e);
+
+ // test if the index is readable, if the version is outdated or it fails we rebuild.
+ try {
+ synchronized(this) {
+ reader = DirectoryReader.open(getFSDirectory(false));
}
+ } catch (IOException ex) {
+ mLogger.warn("Error opening search index, scheduling rebuild.", ex);
+ getFSDirectory(true);
+ inconsistentAtStartup = true;
}
} else {
mLogger.debug("Creating index");
inconsistentAtStartup = true;
- if (useRAMIndex) {
- fRAMindex = new RAMDirectory();
- createIndex(fRAMindex);
- } else {
- createIndex(getFSDirectory(true));
- }
+
+ createIndex(getFSDirectory(true));
}
if (isInconsistentAtStartup()) {
@@ -191,27 +184,32 @@
// ~ Methods
// ================================================================
+ @Override
public void rebuildWebsiteIndex() throws WebloggerException {
scheduleIndexOperation(new RebuildWebsiteIndexOperation(roller, this,
null));
}
+ @Override
public void rebuildWebsiteIndex(Weblog website) throws WebloggerException {
scheduleIndexOperation(new RebuildWebsiteIndexOperation(roller, this,
website));
}
+ @Override
public void removeWebsiteIndex(Weblog website) throws WebloggerException {
scheduleIndexOperation(new RemoveWebsiteIndexOperation(roller, this,
website));
}
+ @Override
public void addEntryIndexOperation(WeblogEntry entry)
throws WebloggerException {
AddEntryOperation addEntry = new AddEntryOperation(roller, this, entry);
scheduleIndexOperation(addEntry);
}
+ @Override
public void addEntryReIndexOperation(WeblogEntry entry)
throws WebloggerException {
ReIndexEntryOperation reindex = new ReIndexEntryOperation(roller, this,
@@ -219,6 +217,7 @@
scheduleIndexOperation(reindex);
}
+ @Override
public void removeEntryIndexOperation(WeblogEntry entry)
throws WebloggerException {
RemoveEntryOperation removeOp = new RemoveEntryOperation(roller, this,
@@ -230,6 +229,7 @@
return rwl;
}
+ @Override
public boolean isInconsistentAtStartup() {
return inconsistentAtStartup;
}
@@ -240,25 +240,25 @@
* @return Analyzer to be used in manipulating the database.
*/
public static final Analyzer getAnalyzer() {
- return instantiateAnalyzer(FieldConstants.LUCENE_VERSION);
+ return instantiateAnalyzer();
}
- private static Analyzer instantiateAnalyzer(final Version luceneVersion) {
+ private static Analyzer instantiateAnalyzer() {
final String className = WebloggerConfig.getProperty("lucene.analyzer.class");
try {
final Class<?> clazz = Class.forName(className);
- return (Analyzer) ConstructorUtils.invokeConstructor(clazz, luceneVersion);
+ return (Analyzer) ConstructorUtils.invokeConstructor(clazz, null);
} catch (final ClassNotFoundException e) {
mLogger.error("failed to lookup analyzer class: " + className, e);
- return instantiateDefaultAnalyzer(luceneVersion);
+ return instantiateDefaultAnalyzer();
} catch (final NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
mLogger.error("failed to instantiate analyzer: " + className, e);
- return instantiateDefaultAnalyzer(luceneVersion);
+ return instantiateDefaultAnalyzer();
}
}
- private static Analyzer instantiateDefaultAnalyzer(final Version luceneVersion) {
- return new StandardAnalyzer(luceneVersion);
+ private static Analyzer instantiateDefaultAnalyzer() {
+ return new StandardAnalyzer();
}
private void scheduleIndexOperation(final IndexOperation op) {
@@ -277,6 +277,7 @@
/**
* @param op
*/
+ @Override
public void executeIndexOperationNow(final IndexOperation op) {
try {
// only if search is enabled
@@ -298,7 +299,9 @@
if (reader == null) {
try {
reader = DirectoryReader.open(getIndexDirectory());
- } catch (IOException e) {
+ } catch (IOException ex) {
+ mLogger.error("Error opening DirectoryReader", ex);
+ throw new RuntimeException(ex);
}
}
return reader;
@@ -306,17 +309,12 @@
/**
* Get the directory that is used by the lucene index. This method will
- * return null if there is no index at the directory location. If we are
- * using a RAM index, the directory will be a ram directory.
+ * return null if there is no index at the directory location.
*
* @return Directory The directory containing the index, or null if error.
*/
public Directory getIndexDirectory() {
- if (useRAMIndex) {
- return fRAMindex;
- } else {
- return getFSDirectory(false);
- }
+ return getFSDirectory(false);
}
private boolean indexExists() {
@@ -328,13 +326,13 @@
return false;
}
- private Directory getFSDirectory(boolean delete) {
+ private FSDirectory getFSDirectory(boolean delete) {
- Directory directory = null;
+ FSDirectory directory = null;
try {
- directory = FSDirectory.open(new File(indexDir));
+ directory = FSDirectory.open(Path.of(indexDir));
if (delete && directory != null) {
// clear old files
@@ -361,72 +359,40 @@
try {
IndexWriterConfig config = new IndexWriterConfig(
- FieldConstants.LUCENE_VERSION, new LimitTokenCountAnalyzer(
- IndexManagerImpl.getAnalyzer(),
- IndexWriterConfig.DEFAULT_TERM_INDEX_INTERVAL));
+ new LimitTokenCountAnalyzer(
+ IndexManagerImpl.getAnalyzer(), 128));
writer = new IndexWriter(dir, config);
} catch (IOException e) {
mLogger.error("Error creating index", e);
} finally {
- try {
- if (writer != null) {
+ if (writer != null) {
+ try {
writer.close();
+ } catch (IOException ex) {
+ mLogger.warn("Unable to close IndexWriter.", ex);
}
- } catch (IOException e) {
}
}
}
- private IndexOperation getSaveIndexOperation() {
- return new WriteToIndexOperation(this) {
- public void doRun() {
- Directory dir = getIndexDirectory();
- Directory fsdir = getFSDirectory(true);
- IndexWriter writer = null;
- try {
- IndexWriterConfig config = new IndexWriterConfig(FieldConstants.LUCENE_VERSION,
- new LimitTokenCountAnalyzer(IndexManagerImpl.getAnalyzer(),
- IndexWriterConfig.DEFAULT_TERM_INDEX_INTERVAL));
- writer = new IndexWriter(fsdir, config);
- writer.addIndexes(new Directory[] { dir });
- writer.commit();
- indexConsistencyMarker.delete();
- } catch (IOException e) {
- mLogger.error("Problem saving index to disk", e);
- // Delete the directory, since there was a problem saving the RAM contents
- getFSDirectory(true);
- } finally {
- try {
- if (writer != null) {
- writer.close();
- }
- } catch (IOException e1) {
- mLogger.warn("Unable to close IndexWriter.");
- }
- }
- }
- };
- }
-
+ @Override
public void release() {
// no-op
}
+ @Override
public void shutdown() {
- if (useRAMIndex) {
- scheduleIndexOperation(getSaveIndexOperation());
- } else {
- indexConsistencyMarker.delete();
- }
+
+ indexConsistencyMarker.delete();
- try {
- if (reader != null) {
+ if (reader != null) {
+ try {
reader.close();
+ } catch (IOException ex) {
+ mLogger.error("Unable to close reader.", ex);
}
- } catch (IOException e) {
- // won't happen, since it was
}
}
diff --git a/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java b/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java
index a851327..22d8d7c 100644
--- a/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java
+++ b/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java
@@ -26,10 +26,12 @@
import org.apache.lucene.analysis.miscellaneous.LimitTokenCountAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.SortedDocValuesField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.util.BytesRef;
import org.apache.roller.weblogger.business.search.FieldConstants;
import org.apache.roller.weblogger.business.search.IndexManagerImpl;
import org.apache.roller.weblogger.config.WebloggerConfig;
@@ -135,8 +137,8 @@
// keyword
if (data.getPubTime() != null) {
- doc.add(new StringField(FieldConstants.PUBLISHED, data.getPubTime()
- .toString(), Field.Store.YES));
+ // SearchOperation sorts results by date
+ doc.add(new SortedDocValuesField(FieldConstants.PUBLISHED, new BytesRef(data.getPubTime().toString())));
}
// index Category, needs to be in lower case as it is used in a term
@@ -173,8 +175,7 @@
IndexManagerImpl.getAnalyzer(),
WebloggerConfig.getIntProperty("lucene.analyzer.maxTokenCount"));
- IndexWriterConfig config = new IndexWriterConfig(
- FieldConstants.LUCENE_VERSION, analyzer);
+ IndexWriterConfig config = new IndexWriterConfig(analyzer);
writer = new IndexWriter(manager.getIndexDirectory(), config);
@@ -201,6 +202,7 @@
/**
* @see java.lang.Runnable#run()
*/
+ @Override
public void run() {
doRun();
}
diff --git a/app/src/main/java/org/apache/roller/weblogger/business/search/operations/ReadFromIndexOperation.java b/app/src/main/java/org/apache/roller/weblogger/business/search/operations/ReadFromIndexOperation.java
index 787fb4f..e45ac3b 100644
--- a/app/src/main/java/org/apache/roller/weblogger/business/search/operations/ReadFromIndexOperation.java
+++ b/app/src/main/java/org/apache/roller/weblogger/business/search/operations/ReadFromIndexOperation.java
@@ -32,13 +32,14 @@
private static Log mLogger = LogFactory.getFactory().getInstance(
ReadFromIndexOperation.class);
+ @Override
public final void run() {
try {
manager.getReadWriteLock().readLock().lock();
doRun();
} catch (Exception e) {
- mLogger.info("Error acquiring read lock on index", e);
+ mLogger.error("Error acquiring read lock on index", e);
} finally {
manager.getReadWriteLock().readLock().unlock();
}
diff --git a/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java b/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java
index 73dc2e6..165313d 100644
--- a/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java
+++ b/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java
@@ -52,11 +52,11 @@
private static Log mLogger = LogFactory.getFactory().getInstance(
SearchOperation.class);
- private static String[] SEARCH_FIELDS = new String[] {
+ private static final String[] SEARCH_FIELDS = new String[] {
FieldConstants.CONTENT, FieldConstants.TITLE,
FieldConstants.C_CONTENT };
- private static Sort SORTER = new Sort(new SortField(
+ private static final Sort SORTER = new Sort(new SortField(
FieldConstants.PUBLISHED, SortField.Type.STRING, true));
// ~ Instance fields
@@ -95,6 +95,7 @@
*
* @see java.lang.Runnable#run()
*/
+ @Override
public void doRun() {
final int docLimit = 500;
searchresults = null;
@@ -105,8 +106,7 @@
searcher = new IndexSearcher(reader);
MultiFieldQueryParser multiParser = new MultiFieldQueryParser(
- FieldConstants.LUCENE_VERSION, SEARCH_FIELDS,
- IndexManagerImpl.getAnalyzer());
+ SEARCH_FIELDS, IndexManagerImpl.getAnalyzer());
// Make it an AND by default. Comment this out for an or (default)
multiParser.setDefaultOperator(MultiFieldQueryParser.Operator.AND);
@@ -118,32 +118,30 @@
websiteHandle);
if (tUsername != null) {
- BooleanQuery bQuery = new BooleanQuery();
- bQuery.add(query, BooleanClause.Occur.MUST);
- bQuery.add(new TermQuery(tUsername), BooleanClause.Occur.MUST);
- query = bQuery;
+ query = new BooleanQuery.Builder()
+ .add(query, BooleanClause.Occur.MUST)
+ .add(new TermQuery(tUsername), BooleanClause.Occur.MUST)
+ .build();
}
if (category != null) {
Term tCategory = new Term(FieldConstants.CATEGORY, category.toLowerCase());
- BooleanQuery bQuery = new BooleanQuery();
- bQuery.add(query, BooleanClause.Occur.MUST);
- bQuery.add(new TermQuery(tCategory), BooleanClause.Occur.MUST);
- query = bQuery;
+ query = new BooleanQuery.Builder()
+ .add(query, BooleanClause.Occur.MUST)
+ .add(new TermQuery(tCategory), BooleanClause.Occur.MUST)
+ .build();
}
- Term tLocale = IndexUtil.getTerm(FieldConstants.LOCALE,
- locale);
+ Term tLocale = IndexUtil.getTerm(FieldConstants.LOCALE, locale);
if (tLocale != null) {
- BooleanQuery bQuery = new BooleanQuery();
- bQuery.add(query, BooleanClause.Occur.MUST);
- bQuery.add(new TermQuery(tLocale), BooleanClause.Occur.MUST);
- query = bQuery;
+ query = new BooleanQuery.Builder()
+ .add(query, BooleanClause.Occur.MUST)
+ .add(new TermQuery(tLocale), BooleanClause.Occur.MUST)
+ .build();
}
- searchresults = searcher.search(query, null/* Filter */, docLimit,
- SORTER);
+ searchresults = searcher.search(query, docLimit, SORTER);
} catch (IOException e) {
mLogger.error("Error searching index", e);
@@ -193,7 +191,7 @@
if (searchresults == null) {
return -1;
}
- return searchresults.totalHits;
+ return (int) searchresults.totalHits.value;
}
/**
diff --git a/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java b/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java
index 0430538..dcb2ed1 100644
--- a/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java
+++ b/app/src/main/java/org/apache/roller/weblogger/config/PingConfig.java
@@ -36,8 +36,7 @@
/**
* Thin wrapper around WebloggerConfig and WebloggerRuntimeConfig for centralizing access to the many configurable
* settings for pings.
- *
- *
+ *
* @author <a href="mailto:anil@busybuddha.org">Anil Gangolli</a>
*/
public final class PingConfig {
@@ -80,12 +79,12 @@
// commenting out this property in the config file.
private static final String PINGS_INITIAL_COMMON_TARGETS_PROP = "pings.initialCommonTargets";
-
// PingConfig property determining the known WeblogUpdates.ping variants/bugs
// in popular ping targets, which we are used when invoking pings on those targets.
// The value takes the form of a comma separated list of ping target urls and
// variant options, where each one is in the form {{pingurl}{option[[,option]...]}}.
private static final String PINGS_VARIANT_OPTIONS_PROP = "pings.variantOptions";
+
// Map of configured ping variants. Maps a ping target hostname to a set of
// Strings representing variant options to be used when pinging this target.
// This was introduced in order to support certain buggy (but popular) ping
@@ -111,7 +110,8 @@
* @return the configured (or default) maximum number of ping attempts
*/
public static int getMaxPingAttempts() {
- return getIntegerProperty(MAX_PING_ATTEMPTS_PROP, MAX_PING_ATTEMPTS_DEFAULT, MAX_PING_ATTEMPTS_MIN, MAX_PING_ATTEMPTS_MAX);
+ return getIntegerProperty(MAX_PING_ATTEMPTS_PROP, MAX_PING_ATTEMPTS_DEFAULT,
+ MAX_PING_ATTEMPTS_MIN, MAX_PING_ATTEMPTS_MAX);
}
/**
@@ -120,7 +120,8 @@
* @return the configured (or default) queue processing interval in minutes.
*/
public static int getQueueProcessingIntervalMins() {
- return getIntegerProperty(QUEUE_PROCESSING_INTERVAL_PROP, QUEUE_PROCESSING_INTERVAL_DEFAULT, QUEUE_PROCESSING_INTERVAL_MIN, QUEUE_PROCESSING_INTERVAL_MAX);
+ return getIntegerProperty(QUEUE_PROCESSING_INTERVAL_PROP, QUEUE_PROCESSING_INTERVAL_DEFAULT,
+ QUEUE_PROCESSING_INTERVAL_MIN, QUEUE_PROCESSING_INTERVAL_MAX);
}
@@ -236,10 +237,13 @@
if (!variantOptions.isEmpty()) {
CONFIGURED_VARIANTS.put(url, variantOptions);
} else {
- LOGGER.warn("Ping variant entry for url '" + url + "' has an empty variant options list. Ignored.");
+ LOGGER.warn("Ping variant entry for url '" + url
+ + "' has an empty variant options list. Ignored.");
}
} else {
- LOGGER.error("Unable to parse configured ping variant '" + thisVariant + "'. Skipping this variant. Check your setting of the property " + PINGS_VARIANT_OPTIONS_PROP);
+ LOGGER.error("Unable to parse configured ping variant '"
+ + thisVariant + "'. Skipping this variant. Check your setting of the property "
+ + PINGS_VARIANT_OPTIONS_PROP);
}
}
}
@@ -276,7 +280,8 @@
String configuredVal = WebloggerConfig.getProperty(propName);
if (configuredVal == null) {
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("PingConfig property '" + propName + "' is not present in the configuration. Using default value: " + defaultValue);
+ LOGGER.debug("PingConfig property '" + propName
+ + "' is not present in the configuration. Using default value: " + defaultValue);
}
return defaultValue;
}
@@ -285,12 +290,15 @@
try {
val = Integer.parseInt(configuredVal);
} catch (NumberFormatException ex) {
- LOGGER.error("ERROR: PingConfig property '" + propName + "' is not an integer value. Using default value: " + defaultValue);
+ LOGGER.error("ERROR: PingConfig property '" + propName
+ + "' is not an integer value. Using default value: " + defaultValue);
return defaultValue;
}
if (val < min || val > max) {
- LOGGER.error("ERROR: PingConfig property '" + propName + "' is outside the required range (" + min + ", " + max + "). Using default value: " + defaultValue);
+ LOGGER.error("ERROR: PingConfig property '" + propName
+ + "' is outside the required range ("
+ + min + ", " + max + "). Using default value: " + defaultValue);
return defaultValue;
}
@@ -308,7 +316,8 @@
String configuredVal = WebloggerConfig.getProperty(propName);
if (configuredVal == null) {
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("PingConfig property '" + propName + "' is not present in the configuration. Using default value: " + defaultValue);
+ LOGGER.debug("PingConfig property '" + propName
+ + "' is not present in the configuration. Using default value: " + defaultValue);
}
return defaultValue;
}
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java
index 73d5b01..2cb4399 100644
--- a/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java
+++ b/app/src/main/java/org/apache/roller/weblogger/ui/struts2/admin/UserEdit.java
@@ -203,16 +203,12 @@
mgr.grantRole("admin", user);
}
WebloggerFactory.getWeblogger().flush();
- if (isAdd()) {
- // now that user is saved we have an id value
- // store it back in bean for use in next action
- bean.setId(user.getId());
- // route to edit mode, saveFirst() provides the success message.
- return SUCCESS;
- } else {
- addMessage("userAdmin.userSaved");
- return INPUT;
- }
+
+ // successful add or edit: send user back to user admin page
+ bean = new CreateUserBean();
+ addMessage("userAdmin.userSaved");
+ return SUCCESS;
+
} catch (WebloggerException ex) {
log.error("ERROR in action", ex);
addError("generic.error.check.logs");
diff --git a/app/src/main/resources/struts.xml b/app/src/main/resources/struts.xml
index f03c745..63d5bb3 100644
--- a/app/src/main/resources/struts.xml
+++ b/app/src/main/resources/struts.xml
@@ -220,10 +220,7 @@
<param name="actionName">createUser</param>
<param name="pageTitle">userAdmin.title.createNewUser</param>
<result name="input" type="tiles">.UserEdit</result>
- <result name="success" type="redirectAction">
- <param name="actionName">modifyUser!firstSave</param>
- <param name="bean.id">${bean.id}</param>
- </result>
+ <result name="success" type="tiles">.UserAdmin</result>
<allowed-methods>execute,firstSave,save</allowed-methods>
</action>
@@ -236,6 +233,7 @@
<result name="cancel" type="redirectAction">
<param name="actionName">userAdmin</param>
</result>
+ <result name="success" type="tiles">.UserAdmin</result>
<allowed-methods>execute,firstSave,save</allowed-methods>
</action>
diff --git a/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp b/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
index 10a91fc..5f91f8d 100644
--- a/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/admin/GlobalConfig.jsp
@@ -40,7 +40,7 @@
<%-- special case for front page blog --%>
<s:elseif test="#pd.name == 'site.frontpage.weblog.handle'">
<s:select name="%{#pd.name}" label="%{getText(#pd.key)}" value="%{properties[#pd.name].value}"
- list="weblogs" listKey="name" listValueKey="handle"/>
+ list="weblogs" listKey="handle" listValueKey="name"/>
</s:elseif>
<%-- "string" type means use a simple textbox --%>
@@ -59,12 +59,10 @@
<s:elseif test="#pd.type == 'boolean'">
<s:if test="properties[#pd.name].value == 'true'">
- <s:checkbox name="%{#pd.name}" label="%{getText(#pd.key)}"
- fieldValue="true" checked="true" onchange="formChanged()"/>
+ <s:checkbox name="%{#pd.name}" label="%{getText(#pd.key)}" checked="true" onchange="formChanged()"/>
</s:if>
<s:if test="properties[#pd.name].value != 'true'">
- <s:checkbox name="%{#pd.name}" label="%{getText(#pd.key)}"
- fieldValue="false" onchange="formChanged()"/>
+ <s:checkbox name="%{#pd.name}" label="%{getText(#pd.key)}" onchange="formChanged()"/>
</s:if>
</s:elseif>
diff --git a/app/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp b/app/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp
index 6310997..59fd609 100644
--- a/app/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/admin/UserAdmin.jsp
@@ -55,4 +55,14 @@
</s:if>
-<script> document.getElementById('userName').focus(); </script>
+<script>
+
+
+$(document).ready(function () {
+
+ document.getElementById('userName').focus();
+ onUserNameFocus(false);
+
+});
+
+</script>
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
index 6374a79..288fb65 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/Entries.jsp
@@ -64,7 +64,6 @@
<tr>
<th class="rollertable" width="5%"> </th>
- <th class="rollertable" width="5%"> </th>
<th class="rollertable" width="5%">
<s:text name="weblogEntryQuery.pubTime" />
</th>
@@ -74,9 +73,10 @@
<th class="rollertable">
<s:text name="weblogEntryQuery.title" />
</th>
- <th class="rollertable" width="5%">
+ <th class="rollertable" width="15%">
<s:text name="weblogEntryQuery.category" />
</th>
+ <th class="rollertable" width="5%"> </th>
</tr>
<s:iterator var="post" value="pager.items">
@@ -99,18 +99,14 @@
<s:param name="weblog" value="%{actionWeblog.handle}" />
<s:param name="bean.id" value="#post.id" />
</s:url>
- <s:a href="%{editUrl}"><span class="glyphicon glyphicon-edit"></s:a>
+ <s:a href="%{editUrl}">
+ <span class="glyphicon glyphicon-edit" data-toggle="tooltip" data-placement="top"
+ title="<s:text name='generic.edit'/>">
+ </span>
+ </s:a>
</td>
<td>
- <s:set var="postId" value="#post.id" />
- <s:set var="postTitle" value="#post.title" />
- <a href="#"
- onclick="showDeleteModal('<s:property value="postId" />', '<s:property value="postTitle"/>' )">
- <span class="glyphicon glyphicon-trash"></span></a>
- </td>
-
- <td>
<s:if test="#post.pubTime != null">
<s:text name="weblogEntryQuery.date.toStringFormat">
<s:param value="#post.pubTime" />
@@ -141,6 +137,17 @@
<s:property value="#post.category.name" />
</td>
+ <td>
+ <s:set var="postId" value="#post.id" />
+ <s:set var="postTitle" value="#post.title" />
+ <a href="#"
+ onclick="showDeleteModal('<s:property value="postId" />', '<s:property value="postTitle"/>' )">
+ <span class="glyphicon glyphicon-trash"
+ data-toggle="tooltip" data-placement="top" title="<s:text name='generic.delete'/>">
+ </span>
+ </a>
+ </td>
+
</tr>
</s:iterator>
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp
index 51079e6..05548ce 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/EntryEditor.jsp
@@ -140,7 +140,8 @@
['color', ['color']],
['para', ['ul', 'ol', 'paragraph']],
['height', ['height']],
- ['misc', ['codeview']]
+ ['misc', ['codeview']],
+ ['insert', ['link']]
],
height: 400
}
diff --git a/app/src/main/webapp/roller-ui/scripts/ajax-user.js b/app/src/main/webapp/roller-ui/scripts/ajax-user.js
index 1cb578c..f3bbfb2 100644
--- a/app/src/main/webapp/roller-ui/scripts/ajax-user.js
+++ b/app/src/main/webapp/roller-ui/scripts/ajax-user.js
@@ -16,7 +16,7 @@
* directory of this distribution.
*/
-// Used in: InviteMember.jsp, UserAdmin.jsp
+// Used in: MemberInvite.jsp, UserAdmin.jsp
function createRequestObject() {
var ro;
@@ -41,6 +41,7 @@
if (enabled != null) u = u + "&enabled=" + enabled;
sendUserRequest(u);
} else {
+ userSubmitButton = document.getElementById("user-submit");
userSubmitButton.disabled = true;
}
}
diff --git a/binary-includes/LICENSE.txt b/binary-includes/LICENSE.txt
new file mode 100644
index 0000000..558b7e3
--- /dev/null
+++ b/binary-includes/LICENSE.txt
@@ -0,0 +1,449 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
+-------------------------------------------------------------------------------
+This product bundles JDOM XML parser library, which is available under a
+"JDOM" license. For details, see http://www.jdom.org/.
+
+ Copyright (C) 2000-2012 Jason Hunter & Brett McLaughlin.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions, and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions, and the disclaimer that follows
+ these conditions in the documentation and/or other materials
+ provided with the distribution.
+
+ 3. The name "JDOM" must not be used to endorse or promote products
+ derived from this software without prior written permission. For
+ written permission, please contact <request_AT_jdom_DOT_org>.
+
+ 4. Products derived from this software may not be called "JDOM", nor
+ may "JDOM" appear in their name, without prior written permission
+ from the JDOM Project Management <request_AT_jdom_DOT_org>.
+
+ In addition, we request (but do not require) that you include in the
+ end-user documentation provided with the redistribution and/or in the
+ software itself an acknowledgement equivalent to the following:
+ "This product includes software developed by the
+ JDOM Project (http://www.jdom.org/)."
+ Alternatively, the acknowledgment may be graphical using the logos
+ available at http://www.jdom.org/images/logos.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the JDOM Project and was originally
+ created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
+ Brett McLaughlin <brett_AT_jdom_DOT_org>. For more information
+ on the JDOM Project, please see <http://www.jdom.org/>.
+
+
+-------------------------------------------------------------------------------
+This product bundles YUI, which is available under a "BSD" license.
+For details, see
+app/src/main/webapp/roller-ui/yui3
+http://yuilibrary.com/license/
+
+Software License Agreement (BSD License)
+========================================
+
+Copyright (c) 2013, Yahoo! Inc. All rights reserved.
+----------------------------------------------------
+
+Redistribution and use of this software in source and binary forms, with or
+without modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of Yahoo! Inc. nor the names of YUI's contributors may be
+ used to endorse or promote products derived from this software without
+ specific prior written permission of Yahoo! Inc.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+-------------------------------------------------------------------------------
+This product bundles jQuery and jQuery plugins, which are available under a "MIT" license.
+For details, see
+roller-ui/scripts/jquery-2.1.1.min.js.
+roller-ui/jquery-ui-1.11.0/jquery-ui.min.js
+
+-------------------------------------------------------------------------------
+
+This product bundles some snippets of code from the Blojsom and Pebble
+blog servers, which are both licensed under the terms of the BSD license
+(http://www.opensource.org/licenses/bsd-license.php).
+
+-------------------------------------------------------------------------------
+
+This product bundles some themes which use Font Awesome by Dave Gandy
+(http://fontawesome.io), whose licensing is subject to the SIL OFL 1.1:
+http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL
+
+-------------------------------------------------------------------------------
+
+This product bundles some themes which use the MIT-licensed Bootstrap:
+For details, see
+themes/gaurav/js/bootstrap.js
+https://github.com/twbs/bootstrap/blob/master/LICENSE
+
+The MIT License (MIT)
+
+Copyright (c) 2011-2019 Twitter, Inc.
+Copyright (c) 2011-2019 The Bootstrap Authors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-------------------------------------------------------------------------------
+This product bundles Summernote WYSIWYG editor, which is available under a
+"MIT" license. For details, see
+/webjars/summernote/0.8.11/dist/summernote.min.js
+https://github.com/summernote/summernote/blob/develop/LICENSE
+
+The MIT License (MIT)
+
+Copyright (c) 2015~ Summernote Team (https://github.com/orgs/summernote/people)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+Binary distribution specific license
+-------------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+
+This product bundles Spring Framework 4.1.4.RELEASE, which is available under a
+"Apache 2.0" license. For details, see
+https://github.com/spring-projects/spring-framework
+
+-------------------------------------------------------------------------------
+
+This product bundles Google Guice 4.2.2, which is available under a
+"Apache 2.0" license. For details, see
+https://github.com/google/guice/blob/master/COPYING
+
+-------------------------------------------------------------------------------
+
+This product bundles SLF4J 1.7.26, which is available under a
+"MIT" license. For details, see
+https://www.slf4j.org/license.html
+
+-------------------------------------------------------------------------------
+
+This product bundles struts2-bootstrap 2.5.2, which is available under a
+"Apache 2.0" license. For details, see
+https://github.com/struts-community-plugins/struts2-bootstrap/blob/release/2.5.x/LICENSE
+
+-------------------------------------------------------------------------------
+
+This product bundles romtools 1.12.0, which is available under a
+"Apache 2.0" license. For details, see
+https://github.com/rometools/rome/blob/master/LICENSE
+
+-------------------------------------------------------------------------------
+
+This product bundles webjars-servlet-2.x 1.5, which is available under a
+"MIT" license. For details, see
+https://github.com/webjars/webjars-servlet-2.x/blob/master/LICENSE
+
+The MIT License (MIT)
+
+Copyright (c) 2015 Angel Ruiz Calvo
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+-------------------------------------------------------------------------------
+
+This product bundles oauth-provider 20100527, which is available under a
+"Apache 2.0" license. For details, see
+https://mvnrepository.com/artifact/net.oauth.core/oauth-provider
+
+-------------------------------------------------------------------------------
+
+This product bundles Apache Ant 1.10.5 , which is available under a
+"Apache 2.0" license. For details, see
+https://ant.apache.org/license.html
+-------------------------------------------------------------------------------
+
+This product bundles Apache Derby 10.11.1.1 , which is available under a
+"Apache 2.0" license. For details, see
+https://db.apache.org/derby/license.html
+
+-------------------------------------------------------------------------------
diff --git a/binary-includes/NOTICE.txt b/binary-includes/NOTICE.txt
new file mode 100644
index 0000000..0dd038d
--- /dev/null
+++ b/binary-includes/NOTICE.txt
@@ -0,0 +1,27 @@
+Apache Roller
+Copyright 2001-2019 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+The product includes snippets of code from the Blojsom blog server
+Copyright 2003 David A. Czarnecki & Mark Lussier. All rights reserved.
+
+The product includes snippets of code from the Pebble blog server
+Copyright 2003 Simon Brown, All rights reserved.
+
+The product includes snippets of code written by Sun Microsystems, Inc.
+Copyright 2009 Sun Microsystems, Inc.
+
+The product includes snippets of code written by Dave Johnson for RSS and Atom in Action
+Copyright 2005 David M Johnson (For RSS and Atom In Action)
+
+The product includes snippets of code from Spring Mobile
+Copyright (c) 2010-2014 Pivotal, Inc. All Rights Reserved.
+
+The product includes icons by Mark James (http://www.famfamfam.com/lab/icons)
+
+The product includes snippets of code from the JavaMail
+COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
+Copyright (c) 1997-2011 Oracle and/or its affiliates. All rights reserved.
+https://glassfish.java.net/public/CDDL+GPL_1_1.html
diff --git a/doap_roller.rdf b/doap_roller.rdf
index 235e577..b3ea7f1 100644
--- a/doap_roller.rdf
+++ b/doap_roller.rdf
@@ -32,12 +32,19 @@
<description>Apache Roller is a full-featured, multi-user and group-blog server suitable for blog sites large and small. It runs as a Java web application that should be able to run on most any Java EE server and relational database. Roller's installation guide covers deployment on Tomcat, GlassFish, and JBoss application servers using a MySQL, Derby, or PostgreSQL database. Users however have reported success running Roller on other app servers and databases.
- Multi-user blogging: can support tens of thousands of users and blogs
- - Group blogging with three permisson levels (editor, author and limited)
+
+ - Group blogging with three permission levels (editor, author and limited)
+
- Support for comment moderation and comment spam prevention measures
+
- Bloggers have complete control over blog layout/style via Apache Velocity-driven templates
+
- Built-in search engine indexes weblog entry content
+
- Pluggable cache and rendering system
+
- Support for blog clients that support MetaWeblog API
+
- All blogs have entry and comment feeds in both RSS 2.0 and Atom 1.0 formats</description>
<bug-database rdf:resource="https://issues.apache.org/jira/browse/ROL" />
<mailing-list rdf:resource="https://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists" />
@@ -47,8 +54,8 @@
<release>
<Version>
<name>Current</name>
- <created>2014-06-27</created>
- <revision>5.0.4</revision>
+ <created>2019-07-22</created>
+ <revision>5.2.4</revision>
</Version>
</release>
<repository>
@@ -64,4 +71,4 @@
</foaf:Person>
</maintainer>
</Project>
-</rdf:RDF>
\ No newline at end of file
+</rdf:RDF>
diff --git a/docker-compose.yml b/docker-compose.yml
index 0288882..ba5c7b8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,10 +16,10 @@
# directory of this distribution.
-# Example Docker Compose setup for running Roller and PostreSQL locally
+# Example Docker Compose setup for running Roller and PostgreSQL locally
-version: '3.2'
+version: '3.7'
services:
@@ -37,8 +37,7 @@
- POSTGRES_PASSWORD=tiger
roller:
- image:
- build: .
+ build: .
ports:
- "8080:8080"
volumes:
