You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2021/04/13 14:10:26 UTC
svn commit: r1888734 - in /turbine/fulcrum/trunk: ./ cache/ cache/src/test/
cache/src/test/org/apache/fulcrum/cache/ resourcemanager/ script/ upload/
xmlrpc/ xmlrpc/xdocs/ yaafi/ yaafi/src/test/org/apache/fulcrum/yaafi/service/
Author: gk
Date: Tue Apr 13 14:10:26 2021
New Revision: 1888734
URL: http://svn.apache.org/viewvc?rev=1888734&view=rev
Log:
- Fulcrum module scripts/yaafi/xmlrpc: update commons-codec to 1.15, xerxesImpl to 2.12.1, groovy to 3.0.7, commons-io 2.8.0, turbine-parent 8-SNAPSHOT, cleanup test.
- Fulcrum module resourcemanager lang3 to 3.12.0
- Fulcrum module cache: reactivate Fulcrum module cache, use tags to skip long running tests, minor fixes in log4j2 configuration and test assertion.
- Fulcrum module upload move to not dormant.
Modified:
turbine/fulcrum/trunk/cache/pom.xml
turbine/fulcrum/trunk/cache/src/test/TestComponentConfig.xml
turbine/fulcrum/trunk/cache/src/test/log4j2-test.xml
turbine/fulcrum/trunk/cache/src/test/org/apache/fulcrum/cache/CacheTest.java
turbine/fulcrum/trunk/pom.xml
turbine/fulcrum/trunk/resourcemanager/pom.xml
turbine/fulcrum/trunk/script/pom.xml
turbine/fulcrum/trunk/upload/pom.xml
turbine/fulcrum/trunk/xmlrpc/pom.xml
turbine/fulcrum/trunk/xmlrpc/xdocs/changes.xml
turbine/fulcrum/trunk/yaafi/pom.xml
turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/service/AdviceServiceTest.java
Modified: turbine/fulcrum/trunk/cache/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/cache/pom.xml?rev=1888734&r1=1888733&r2=1888734&view=diff
==============================================================================
--- turbine/fulcrum/trunk/cache/pom.xml (original)
+++ turbine/fulcrum/trunk/cache/pom.xml Tue Apr 13 14:10:26 2021
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
- <version>7</version>
+ <version>8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -129,12 +129,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <systemProperties>
- <property>
- <name>fulcrum.cache.skip.long.tests</name>
- <value>true</value>
- </property>
- </systemProperties>
+ <excludedGroups>LongRunning</excludedGroups>
<additionalClasspathElements>
<additionalClasspathElement>${basedir}/src/test</additionalClasspathElement>
</additionalClasspathElements>
Modified: turbine/fulcrum/trunk/cache/src/test/TestComponentConfig.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/cache/src/test/TestComponentConfig.xml?rev=1888734&r1=1888733&r2=1888734&view=diff
==============================================================================
--- turbine/fulcrum/trunk/cache/src/test/TestComponentConfig.xml (original)
+++ turbine/fulcrum/trunk/cache/src/test/TestComponentConfig.xml Tue Apr 13 14:10:26 2021
@@ -20,6 +20,7 @@
<componentConfig>
<cache cacheInitialSize="20" cacheCheckFrequency="5"/>
<ehcache>
+ <!-- in millisecs -->
<cacheCheckFrequency>5000</cacheCheckFrequency>
<cacheName>fulcrum</cacheName>
<!-- configurationFile>ehcache.xml</configurationFile -->
Modified: turbine/fulcrum/trunk/cache/src/test/log4j2-test.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/cache/src/test/log4j2-test.xml?rev=1888734&r1=1888733&r2=1888734&view=diff
==============================================================================
--- turbine/fulcrum/trunk/cache/src/test/log4j2-test.xml (original)
+++ turbine/fulcrum/trunk/cache/src/test/log4j2-test.xml Tue Apr 13 14:10:26 2021
@@ -39,9 +39,12 @@
<Logger name="net.sf.ehcache" level="debug" additivity="false">
<AppenderRef ref="fulcrum-cache"/>
</Logger>
- <Root level="error">
+ <Logger name="org.apache.fulcrum.yaafi" level="debug" additivity="false">
+ <AppenderRef ref="avalon"/>
+ </Logger>
+ <Root level="warn">
<AppenderRef ref="console"/>
- <AppenderRef ref="fulcrum"/>
+ <AppenderRef ref="fulcrum-cache"/>
</Root>
</Loggers>
</Configuration>
\ No newline at end of file
Modified: turbine/fulcrum/trunk/cache/src/test/org/apache/fulcrum/cache/CacheTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/cache/src/test/org/apache/fulcrum/cache/CacheTest.java?rev=1888734&r1=1888733&r2=1888734&view=diff
==============================================================================
--- turbine/fulcrum/trunk/cache/src/test/org/apache/fulcrum/cache/CacheTest.java (original)
+++ turbine/fulcrum/trunk/cache/src/test/org/apache/fulcrum/cache/CacheTest.java Tue Apr 13 14:10:26 2021
@@ -37,6 +37,7 @@ import org.apache.logging.log4j.LogManag
import org.apache.logging.log4j.Logger;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
/**
@@ -56,18 +57,17 @@ public class CacheTest extends BaseUnit5
protected static final String cacheKey_2 = "CacheKey_2";
- public static final String SKIP_TESTS_KEY = "fulcrum.cache.skip.long.tests";
-
- protected final Logger log = LogManager.getLogger( getClass().getName() );
+ protected static final Logger log = LogManager.getLogger( CacheTest.class );
static {
String logSystem = System.getProperty("jcs.logSystem", null);
if (logSystem == null) {
System.setProperty("jcs.logSystem", "log4j2" );
- System.out.println( "Setting jcs.logSystem to: log4j2");
+ log.info( "Setting jcs.logSystem to: log4j2");
logSystem = System.getProperty("jcs.logSystem", null);
}
- System.out.println( "What is the value of the jcs.logSystem: "+ logSystem);
+ log.warn( "What is the value of the jcs.logSystem: "+ logSystem);
+
}
/**
@@ -83,6 +83,7 @@ public class CacheTest extends BaseUnit5
@BeforeEach
protected void setUp() throws Exception
{
+ System.out.println( "Testing service: "+ getClass().getName() + "for "+ getCacheRoleName());
//if (globalCache == null) {
try
{
@@ -344,6 +345,7 @@ public class CacheTest extends BaseUnit5
*
* @throws Exception
*/
+ @Tag("LongRunning")
@Test
public void testRefreshableObject() throws Exception
{
@@ -438,24 +440,10 @@ public class CacheTest extends BaseUnit5
*
* @throws Exception
*/
+ @Tag("LongRunning")
@Test
public void testRefreshableTimeToLive() throws Exception
{
- String skipTestsProperty = System.getProperty(SKIP_TESTS_KEY, "false");
- log.info("What is the value of the skipTestsProperty: "
- + skipTestsProperty);
- if (Boolean.valueOf(skipTestsProperty).booleanValue())
- {
- log.warn("Skipping testRefreshableTimeToLive test due to property "
- + SKIP_TESTS_KEY + " being true.");
- return;
- }
- else
- {
- log.warn("Running testRefreshableTimeToLive test due to property "
- + SKIP_TESTS_KEY + " being false.");
- }
-
CachedObject<RefreshableObject> retrievedObject = null;
RefreshableCachedObject<RefreshableObject> cacheObject = null;
// Create and add Object that expires in TEST_EXPIRETIME millis.
Modified: turbine/fulcrum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pom.xml?rev=1888734&r1=1888733&r2=1888734&view=diff
==============================================================================
--- turbine/fulcrum/trunk/pom.xml (original)
+++ turbine/fulcrum/trunk/pom.xml Tue Apr 13 14:10:26 2021
@@ -33,11 +33,9 @@
<modules>
- <!-- turbine/torque dependencies -->
-
- <!-- FIXME: cache is broken -->
- <!-- <module>cache</module> -->
+ <!-- turbine / torque dependencies -->
+ <module>cache</module>
<module>crypto</module>
<module>factory</module>
<module>intake</module>
@@ -50,6 +48,7 @@
<module>security</module>
<module>servicemanager</module>
<module>testcontainer</module>
+ <module>upload</module>
<module>yaafi-crypto</module>
<module>yaafi</module>
<module>xslt</module>
@@ -57,16 +56,15 @@
<!-- Potentially dormant modules -->
<module>commonsemail</module>
<module>configuration/impl</module>
- <module>hsqldb</module>
- <!-- needs upgrade to eclipse jetty -->
- <!--module>jetty</module-->
+ <module>hsqldb</module>
<module>pbe</module>
<module>resourcemanager</module>
<module>groovy</module>
<module>script</module>
<module>spring</module>
- <module>upload</module>
<module>xmlrpc</module>
+ <!-- needs upgrade to eclipse jetty -->
+ <!--module>jetty</module-->
</modules>
Modified: turbine/fulcrum/trunk/resourcemanager/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/resourcemanager/pom.xml?rev=1888734&r1=1888733&r2=1888734&view=diff
==============================================================================
--- turbine/fulcrum/trunk/resourcemanager/pom.xml (original)
+++ turbine/fulcrum/trunk/resourcemanager/pom.xml Tue Apr 13 14:10:26 2021
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.9</version>
+ <version>3.12.0</version>
</dependency>
<dependency>
<groupId>org.apache.avalon.framework</groupId>
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.8</version>
+ <version>1.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -94,7 +94,7 @@
<!-- get test coverage for regression tests -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.3</version>
+ <version>2.7</version>
</plugin>
</plugins>
</reporting>
Modified: turbine/fulcrum/trunk/script/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/script/pom.xml?rev=1888734&r1=1888733&r2=1888734&view=diff
==============================================================================
--- turbine/fulcrum/trunk/script/pom.xml (original)
+++ turbine/fulcrum/trunk/script/pom.xml Tue Apr 13 14:10:26 2021
@@ -21,7 +21,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>7</version>
+ <version>8-SNAPSHOT</version>
<relativePath /><!-- ignore default value -->
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -68,13 +68,13 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy</artifactId>
- <version>2.5.14</version>
+ <version>3.0.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-jsr223</artifactId>
- <version>2.5.14</version>
+ <version>3.0.7</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -100,20 +100,6 @@
<build>
<sourceDirectory>${basedir}/src/java</sourceDirectory>
<testSourceDirectory>${basedir}/src/test</testSourceDirectory>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <dependencies>
- <!-- activates JUnit4 platform suite filtering, in IDE may need explicit configuration, e.g. in eclipse set Test runner=Junit4 -->
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-junit47</artifactId>
- <version>3.0.0-M4</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
</build>
<properties>
Modified: turbine/fulcrum/trunk/upload/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/upload/pom.xml?rev=1888734&r1=1888733&r2=1888734&view=diff
==============================================================================
--- turbine/fulcrum/trunk/upload/pom.xml (original)
+++ turbine/fulcrum/trunk/upload/pom.xml Tue Apr 13 14:10:26 2021
@@ -114,7 +114,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.8</version>
+ <version>1.0.9-SNAPSHOT</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: turbine/fulcrum/trunk/xmlrpc/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/xmlrpc/pom.xml?rev=1888734&r1=1888733&r2=1888734&view=diff
==============================================================================
--- turbine/fulcrum/trunk/xmlrpc/pom.xml (original)
+++ turbine/fulcrum/trunk/xmlrpc/pom.xml Tue Apr 13 14:10:26 2021
@@ -21,7 +21,7 @@
<parent>
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
- <version>7</version>
+ <version>8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -92,7 +92,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.13</version>
+ <version>1.15</version>
</dependency>
<dependency>
<groupId>xmlrpc</groupId>
@@ -103,7 +103,7 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.12.0</version>
+ <version>2.12.1</version>
</dependency>
<!-- testing dependencies -->
Modified: turbine/fulcrum/trunk/xmlrpc/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/xmlrpc/xdocs/changes.xml?rev=1888734&r1=1888733&r2=1888734&view=diff
==============================================================================
--- turbine/fulcrum/trunk/xmlrpc/xdocs/changes.xml (original)
+++ turbine/fulcrum/trunk/xmlrpc/xdocs/changes.xml Tue Apr 13 14:10:26 2021
@@ -27,6 +27,10 @@
<body>
<release version="1.0.6-dev" date="as in SVN">
+ <action dev="gk" type="update">
+ xercesImpl to 2.12.11
+ commons-io to 1.15
+ </action>
<action dev="sgoeschl" type="fix">
Fixed Eclipse compiler warnings
</action>
Modified: turbine/fulcrum/trunk/yaafi/pom.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/pom.xml?rev=1888734&r1=1888733&r2=1888734&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/pom.xml (original)
+++ turbine/fulcrum/trunk/yaafi/pom.xml Tue Apr 13 14:10:26 2021
@@ -71,12 +71,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.9</version>
+ <version>3.11</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.6</version>
+ <version>2.8.0</version>
</dependency>
<!-- Avalon depedencies -->
Modified: turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/service/AdviceServiceTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/service/AdviceServiceTest.java?rev=1888734&r1=1888733&r2=1888734&view=diff
==============================================================================
--- turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/service/AdviceServiceTest.java (original)
+++ turbine/fulcrum/trunk/yaafi/src/test/org/apache/fulcrum/yaafi/service/AdviceServiceTest.java Tue Apr 13 14:10:26 2021
@@ -1,5 +1,6 @@
package org.apache.fulcrum.yaafi.service;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -135,7 +136,7 @@ public class AdviceServiceTest implemen
CharSequence advicedObject = (CharSequence) this.service.advice("first advice", interceptorList, unadvicedObject);
CharSequence advicedAdvicedObject = (CharSequence) this.service.advice("second advice", interceptorList, advicedObject );
- advicedAdvicedObject.length();
+ assertEquals(3, advicedAdvicedObject.length());
assertTrue(this.service.isAdviced(advicedAdvicedObject));
}