You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2025/05/09 17:57:37 UTC
(jspwiki) branch master updated (f7d8573f5 -> 8f92f38ca)
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
from f7d8573f5 2.12.3-git-06
new 835e5664c Introduce CachingManager#registerListener(..) so that caching providers are able to register expired cache listeners - closes #362
new c8ecc2324 Upgrade dependencies - closes #379, closes #382, closes #383
new 05d4a079f upgrade tomcat portable binaries
new 3bce33ddd Extract suitable jspwiki.woas.version property for portable build from project.version instead of hard coding it into build.xml
new 8f92f38ca 2.12.3-git-07
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ChangeLog.md | 15 ++++++++++++
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
.../java/org/apache/wiki/cache/CachingManager.java | 9 +++++++
.../apache/wiki/cache/EhcacheCachingManager.java | 19 +++++++++++++++
.../wiki/providers/CachingAttachmentProvider.java | 8 ++++---
.../org/apache/wiki/providers/CachingProvider.java | 8 ++++---
jspwiki-portable/build.xml | 3 ++-
jspwiki-portable/pom.xml | 26 +++++++++++++++++----
.../launchers/tomcat/woas.app/Contents/Info.plist | 2 +-
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 35459 -> 35726 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 52799 -> 52593 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3892373 -> 3903275 bytes
pom.xml | 17 ++++++++++----
13 files changed, 91 insertions(+), 18 deletions(-)
(jspwiki) 05/05: 2.12.3-git-07
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 8f92f38ca4ec609a34f27fdc0b6e7545823a25b5
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri May 9 19:57:02 2025 +0200
2.12.3-git-07
---
ChangeLog.md | 15 +++++++++++++++
.../src/main/java/org/apache/wiki/api/Release.java | 2 +-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/ChangeLog.md b/ChangeLog.md
index 71be2334a..38ea7b2f5 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,21 @@ specific language governing permissions and limitations
under the License.
-->
+**2025-05-09 Juan Pablo Santos (juanpablo AT apache DOT org)**
+
+* _2.12.3-git-07_
+
+* [PR #362](https://github.com/apache/jspwiki/pull/362) `CachingProvider#getAllPages()` returns all pages after cache ttl has expired, by Albrecht Striffler
+
+* Extract suitable `jspwiki.woas.version` property for portable build from `project.version` instead of hard coding it into `build.xml`
+
+* Dependency updates
+ * Apache Parent POM to 34
+ * Commons Collections to 4.5.0
+ * Gson to 2.13.1 (closes [PR #383](https://github.com/apache/jspwiki/pull/383), thanks to Dependabot)
+ * Log4J2 to 2.24.3 (closes [PR #379](https://github.com/apache/jspwiki/pull/379), thanks to Dependabot)
+ * Mockito to 5.17.0 (closes [PR #382](https://github.com/apache/jspwiki/pull/382), thanks to Dependabot)
+
**2025-04-13 Juan Pablo Santos (juanpablo AT apache DOT org)**
* _2.12.3-git-06_
diff --git a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
index 662dbb233..e404cbd60 100644
--- a/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
+++ b/jspwiki-api/src/main/java/org/apache/wiki/api/Release.java
@@ -69,7 +69,7 @@ public final class Release {
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "06";
+ public static final String BUILD = "07";
/**
* This is the generic version string you should use when printing out the version. It is of
(jspwiki) 04/05: Extract suitable jspwiki.woas.version property for portable build from project.version instead of hard coding it into build.xml
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 3bce33ddd68feb044b3dd2aad0d4d84c3ea86e21
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri May 9 19:54:40 2025 +0200
Extract suitable jspwiki.woas.version property for portable build from project.version instead of hard coding it into build.xml
---
jspwiki-portable/build.xml | 3 ++-
jspwiki-portable/pom.xml | 26 ++++++++++++++++++++++----
pom.xml | 7 +++++++
3 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/jspwiki-portable/build.xml b/jspwiki-portable/build.xml
index 1d50df3f9..8775ed86e 100644
--- a/jspwiki-portable/build.xml
+++ b/jspwiki-portable/build.xml
@@ -26,7 +26,7 @@
<property environment="env"/>
<!-- the build version if not overwritten by the caller -->
- <property name="jspwiki.woas.version" value="2.12.0" />
+ <property name="jspwiki.woas.version" value="${jspwiki.woas.version}" />
<!-- define the temporary build directory -->
<property name="jspwiki.woas.target.dir" value="${basedir}/target" />
@@ -139,6 +139,7 @@
<!-- ############################################################## -->
<target name="woas:create-windows-app" description="Create an windows application wrapper">
+ <echo>jspwiki.woas.version = ${jspwiki.woas.version} ****************************************************</echo>
<taskdef
name="launch4j"
classname="net.sf.launch4j.ant.Launch4jTask"
diff --git a/jspwiki-portable/pom.xml b/jspwiki-portable/pom.xml
index 1911a8a49..be226988f 100644
--- a/jspwiki-portable/pom.xml
+++ b/jspwiki-portable/pom.xml
@@ -49,6 +49,24 @@
</filesets>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>regex-property</id>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>woas.version</name>
+ <regex>-SNAPSHOT</regex>
+ <value>${project.version}</value>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
@@ -106,7 +124,7 @@
<phase>process-resources</phase>
<configuration>
<target>
- <property name="jspwiki.woas.version" value="${project.version}" />
+ <property name="jspwiki.woas.version" value="${woas.version}" />
<property name="jspwiki.tomcat.version" value="${tomcat.version}" />
<ant antfile="${basedir}/build.xml" target="woas:info" />
<ant antfile="${basedir}/build.xml" target="woas:copy-woas" />
@@ -121,7 +139,7 @@
<phase>prepare-package</phase>
<configuration>
<target>
- <property name="jspwiki.woas.version" value="${project.version}" />
+ <property name="jspwiki.woas.version" value="${woas.version}" />
<property name="jspwiki.tomcat.version" value="${tomcat.version}" />
<ant antfile="${basedir}/build.xml" target="woas:copy-tomcat" />
</target>
@@ -135,7 +153,7 @@
<phase>prepare-package</phase>
<configuration>
<target>
- <property name="jspwiki.woas.version" value="${project.version}" />
+ <property name="jspwiki.woas.version" value="${woas.version}" />
<property name="jspwiki.tomcat.version" value="${tomcat.version}" />
<ant antfile="${basedir}/build.xml" target="woas:info" />
<ant antfile="${basedir}/build.xml" target="woas:copy-tomcat-launchers" />
@@ -311,7 +329,7 @@
<phase>package</phase>
<configuration>
<target>
- <!-- <property name="jspwiki.woas.version" value="${project.version}" /> -->
+ <property name="jspwiki.woas.version" value="${woas.version}" />
<property name="jspwiki.tomcat.version" value="${tomcat.version}" />
<ant antfile="${basedir}/build.xml" target="woas:info" />
<ant antfile="${basedir}/build.xml" target="${jspwiki.native-launchers.macos.download}" />
diff --git a/pom.xml b/pom.xml
index 8e245d39a..33c2589f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,6 +103,7 @@
<plugin.war.version>3.4.0</plugin.war.version>
<plugin.inmemdb.version>1.4.3</plugin.inmemdb.version>
<plugin.jspc.version>3.2.2</plugin.jspc.version>
+ <plugin.build-helper.version>3.6.0</plugin.build-helper.version>
<plugin.checksum.version>1.11</plugin.checksum.version>
<plugin.jslint.version>1.0.1</plugin.jslint.version>
<plugin.cargo.version>1.10.15</plugin.cargo.version>
@@ -763,6 +764,12 @@
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>${plugin.build-helper.version}</version>
+ </plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jslint-maven-plugin</artifactId>
(jspwiki) 02/05: Upgrade dependencies - closes #379, closes #382, closes #383
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit c8ecc2324c231575324fd84800c2d910c6caf253
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri May 9 19:49:50 2025 +0200
Upgrade dependencies - closes #379, closes #382, closes #383
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 47f43b8cb..8e245d39a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>33</version>
+ <version>34</version>
</parent>
<groupId>org.apache.jspwiki</groupId>
@@ -47,7 +47,7 @@
<akismet-java.version>1.02</akismet-java.version>
<awaitility.version>4.2.1</awaitility.version>
<aws-java-sdk-kendra.version>1.12.565</aws-java-sdk-kendra.version>
- <commons-collections.version>4.4</commons-collections.version>
+ <commons-collections.version>4.5.0</commons-collections.version>
<commons-fileupload.version>1.5</commons-fileupload.version>
<commons-httpclient.version>3.1</commons-httpclient.version>
<commons-io.version>2.19.0</commons-io.version>
@@ -56,7 +56,7 @@
<ehcache.version>2.10.9.2</ehcache.version>
<flexmark.version>0.64.8</flexmark.version>
<freshcookies-security.version>0.60</freshcookies-security.version>
- <gson.version>2.11.0</gson.version>
+ <gson.version>2.13.1</gson.version>
<hsqldb.version>2.7.4</hsqldb.version>
<jamm.version>0.4.0</jamm.version>
<jaxen.version>2.0.0</jaxen.version>
@@ -68,9 +68,9 @@
<jetty.version>9.4.54.v20240208</jetty.version>
<jrcs-diff.version>0.4.2</jrcs-diff.version>
<junit.version>5.12.2</junit.version>
- <log4j2.version>2.24.2</log4j2.version>
+ <log4j2.version>2.24.3</log4j2.version>
<lucene.version>9.12.0</lucene.version>
- <mockito.version>5.16.0</mockito.version>
+ <mockito.version>5.17.0</mockito.version>
<nekohtml.version>2.1.2</nekohtml.version>
<oro.version>2.0.8</oro.version>
<sandler.version>0.5</sandler.version>
(jspwiki) 01/05: Introduce CachingManager#registerListener(..) so that caching providers are able to register expired cache listeners - closes #362
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 835e5664c3f9fb2024bb3fac378fad54888101d6
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri May 9 19:48:32 2025 +0200
Introduce CachingManager#registerListener(..) so that caching providers are able to register expired cache listeners - closes #362
---
.../java/org/apache/wiki/cache/CachingManager.java | 9 +++++++++
.../org/apache/wiki/cache/EhcacheCachingManager.java | 19 +++++++++++++++++++
.../wiki/providers/CachingAttachmentProvider.java | 8 +++++---
.../org/apache/wiki/providers/CachingProvider.java | 8 +++++---
4 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/jspwiki-cache/src/main/java/org/apache/wiki/cache/CachingManager.java b/jspwiki-cache/src/main/java/org/apache/wiki/cache/CachingManager.java
index 245e1efe7..2062bd97e 100644
--- a/jspwiki-cache/src/main/java/org/apache/wiki/cache/CachingManager.java
+++ b/jspwiki-cache/src/main/java/org/apache/wiki/cache/CachingManager.java
@@ -121,4 +121,13 @@ public interface CachingManager {
*/
void remove( String cacheName, Serializable key );
+ /**
+ * Register a listener associated with the given cache and type of listener.
+ * @param cacheName the name of the cache where the listener will be registered.
+ * @param listener the kind of listener to be registered
+ * @param args arguments needed to instantiate and register the listener.
+ * @return {@code true} if the listener is created & registered, {@code false} otherwise.
+ */
+ default boolean registerListener( String cacheName, String listener, Object... args ) { return false; }
+
}
diff --git a/jspwiki-cache/src/main/java/org/apache/wiki/cache/EhcacheCachingManager.java b/jspwiki-cache/src/main/java/org/apache/wiki/cache/EhcacheCachingManager.java
index a624f0734..cb6009d13 100644
--- a/jspwiki-cache/src/main/java/org/apache/wiki/cache/EhcacheCachingManager.java
+++ b/jspwiki-cache/src/main/java/org/apache/wiki/cache/EhcacheCachingManager.java
@@ -20,7 +20,9 @@ package org.apache.wiki.cache;
import net.sf.ehcache.Cache;
import net.sf.ehcache.CacheManager;
+import net.sf.ehcache.Ehcache;
import net.sf.ehcache.Element;
+import net.sf.ehcache.event.CacheEventListenerAdapter;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.wiki.api.core.Engine;
@@ -36,6 +38,7 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
/**
@@ -159,6 +162,22 @@ public class EhcacheCachingManager implements CachingManager, Initializable {
}
}
+ /** {@inheritDoc} */
+ @Override
+ public boolean registerListener( final String cacheName, final String listener, final Object... args ) {
+ if( enabled( cacheName ) && "expired".equals( listener ) ) {
+ final AtomicBoolean allRequested = ( AtomicBoolean )args[0];
+ final CacheEventListenerAdapter expiredCacheListenerAdapter = new CacheEventListenerAdapter() {
+ @Override
+ public void notifyElementExpired( final Ehcache cache, final Element element ) {
+ allRequested.set( false ); // signal that the cache no longer contains all elements...
+ }
+ };
+ return cacheMap.get( cacheName ).getCacheEventNotificationService().registerListener( expiredCacheListenerAdapter );
+ }
+ return false;
+ }
+
boolean keyAndCacheAreNotNull( final String cacheName, final Serializable key ) {
return enabled( cacheName ) && key != null;
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java
index e8523d071..eda06dadd 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingAttachmentProvider.java
@@ -44,6 +44,7 @@ import java.util.Date;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.Properties;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
@@ -59,7 +60,7 @@ public class CachingAttachmentProvider implements AttachmentProvider {
private AttachmentProvider provider;
private CachingManager cachingManager;
- private boolean allRequested;
+ private final AtomicBoolean allRequested = new AtomicBoolean();
private final AtomicLong attachments = new AtomicLong( 0L );
/**
@@ -69,6 +70,7 @@ public class CachingAttachmentProvider implements AttachmentProvider {
public void initialize( final Engine engine, final Properties properties ) throws NoRequiredPropertyException, IOException {
LOG.info( "Initing CachingAttachmentProvider" );
cachingManager = engine.getManager( CachingManager.class );
+ cachingManager.registerListener( CachingManager.CACHE_ATTACHMENTS, "expired", allRequested );
// Find and initialize real provider.
final String classname;
@@ -137,7 +139,7 @@ public class CachingAttachmentProvider implements AttachmentProvider {
@Override
public List< Attachment > listAllChanged( final Date timestamp ) throws ProviderException {
final List< Attachment > all;
- if ( !allRequested ) {
+ if ( !allRequested.get() ) {
all = provider.listAllChanged( timestamp );
// Make sure that all attachments are in the cache.
@@ -146,7 +148,7 @@ public class CachingAttachmentProvider implements AttachmentProvider {
cachingManager.put( CachingManager.CACHE_ATTACHMENTS, att.getName(), att );
}
if( timestamp.getTime() == 0L ) { // all attachments requested
- allRequested = true;
+ allRequested.set( true );
attachments.set( all.size() );
}
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingProvider.java b/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingProvider.java
index 5b1260f46..eeb1db3ab 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingProvider.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/providers/CachingProvider.java
@@ -44,6 +44,7 @@ import java.util.List;
import java.util.NoSuchElementException;
import java.util.Properties;
import java.util.TreeSet;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
@@ -67,7 +68,7 @@ public class CachingProvider implements PageProvider {
private PageProvider provider;
private Engine engine;
- private boolean allRequested;
+ private final AtomicBoolean allRequested = new AtomicBoolean();
private final AtomicLong pages = new AtomicLong( 0L );
/**
@@ -80,6 +81,7 @@ public class CachingProvider implements PageProvider {
// engine is used for getting the search engine
this.engine = engine;
cachingManager = this.engine.getManager( CachingManager.class );
+ cachingManager.registerListener( CachingManager.CACHE_PAGES, "expired", allRequested );
// Find and initialize real provider.
final String classname;
@@ -240,14 +242,14 @@ public class CachingProvider implements PageProvider {
@Override
public Collection< Page > getAllPages() throws ProviderException {
final Collection< Page > all;
- if ( !allRequested ) {
+ if ( !allRequested.get() ) {
all = provider.getAllPages();
// Make sure that all pages are in the cache.
synchronized( this ) {
for( final Page p : all ) {
cachingManager.put( CachingManager.CACHE_PAGES, p.getName(), p );
}
- allRequested = true;
+ allRequested.set( true );
}
pages.set( all.size() );
} else {
(jspwiki) 03/05: upgrade tomcat portable binaries
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 05d4a079ff90f2ecf143c1f0ca4a2ea2eadddd2b
Author: Juan Pablo Santos Rodríguez <ju...@gmail.com>
AuthorDate: Fri May 9 19:51:01 2025 +0200
upgrade tomcat portable binaries
---
.../launchers/tomcat/woas.app/Contents/Info.plist | 2 +-
.../tomcat/woas.app/Contents/Java/bootstrap.jar | Bin 35459 -> 35726 bytes
.../tomcat/woas.app/Contents/Java/tomcat-juli.jar | Bin 52799 -> 52593 bytes
.../src/overlay/launchers/tomcat/woas.exe | Bin 3892373 -> 3903275 bytes
4 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist
index 14ddf6bff..4b988c9b0 100644
--- a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist
+++ b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Info.plist
@@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
-<string>2.12.0</string>
+<string>2.12.3</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>CFBundleSignature</key>
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar
index 161d613eb..3dada160c 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/bootstrap.jar differ
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar
index f3ac2afee..99e78994f 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.app/Contents/Java/tomcat-juli.jar differ
diff --git a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe
index f447f1cc0..5fec3cd05 100644
Binary files a/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe and b/jspwiki-portable/src/overlay/launchers/tomcat/woas.exe differ