Author: gk
Date: Fri May 28 14:10:45 2021
New Revision: 1890285
URL: http://svn.apache.org/viewvc?rev=1890285&view=rev
Log:
- fixing relativePath in poms cache, intake, quartz, parser, security,
testcontainer
- intake: update parser, use in test pool2, add log4j2 for next testcontainer
- parser: formatting, dependency fixes, site skin update
- testcontainer: add and use log4j2 avalon adapter in yaafi testcontainer, use
more JUnit 5
- moved README.txt to READMe.md in root
Added:
turbine/fulcrum/trunk/README.md
turbine/fulcrum/trunk/intake/src/test/log4j2-test.xml
turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/avalon/
turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/avalon/logger/
turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/avalon/logger/Log4J2Logger.java
Removed:
turbine/fulcrum/trunk/README.txt
Modified:
turbine/fulcrum/trunk/cache/pom.xml
turbine/fulcrum/trunk/intake/pom.xml
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
turbine/fulcrum/trunk/intake/src/test/TestComponentConfig.xml
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeServiceTest.java
turbine/fulcrum/trunk/jetty/src/java/org/apache/fulcrum/jetty/impl/JettyServiceImpl.java
turbine/fulcrum/trunk/parser/pom.xml
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/BaseValueParser.java
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java
turbine/fulcrum/trunk/parser/src/site/site.xml
turbine/fulcrum/trunk/parser/src/test/TestComponentConfig.xml
turbine/fulcrum/trunk/parser/src/test/TestComponentConfigWithFulcrumPool.xml
turbine/fulcrum/trunk/pool/src/test/TestComponentConfig.xml
turbine/fulcrum/trunk/quartz/pom.xml
turbine/fulcrum/trunk/security/pom.xml
turbine/fulcrum/trunk/testcontainer/pom.xml
turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/BaseUnit5Test.java
turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/ECMContainer.java
turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/YAAFIContainer.java
turbine/fulcrum/trunk/testcontainer/src/test/log4j2.xml
turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/EcmContainerTest.java
turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerJunit5Test.java
turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerTest.java
turbine/fulcrum/trunk/xmlrpc/xdocs/changes.xml
Added: turbine/fulcrum/trunk/README.md
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/README.md?rev=1890285&view=auto
==============================================================================
--- turbine/fulcrum/trunk/README.md (added)
+++ turbine/fulcrum/trunk/README.md Fri May 28 14:10:45 2021
@@ -0,0 +1,214 @@
+--------------------------------------------------------------------------
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+--------------------------------------------------------------------------
+
+# F U L C R U M
+--------------------------------------------------------------------------
+
+Fulcrum is a collection of components originally part of the Turbine core
+project that are suitable for use in any environment. They are designed to
+be used within any Avalon-compatible container.
+
+
+### B U I L D I N G
+--------------------------------------------------------------------------
+You must have Maven 3.x
+
+Building the Fulcrum from SVN is very easy. Fulcrum has been
+Maven-enabled. Please refer to the Maven Getting Started document for
+instructions on building. This document is available here:
+
+https://maven.apache.org/guides/getting-started/
+
+-------------------------------------------
+### GIT READONLY
+-------------------------------------------
+
+You could use git to checkout current trunk:
+
+ git clone https://github.com/apache/turbine-fulcrum.git
+
+ git checkout -b remote-trunk remotes/origin/trunk
+
+--------------------------------------------------------------------------
+## COMPONENT DEVELOPMENT
+--------------------------------------------------------------------------
+### Publishing Workflow
+
+#### Prerequisites
+
+Deploy jars
+
+ mvn deploy -Papache-release
+
+More Information:
+ - https://www.apache.org/dev/publishing-maven-artifacts.html#prepare-poms
+ -
http://maven.apache.org/developers/website/deploy-component-reference-documentation.html
+
+##### Steps
+
+1. Local Testing
+
+ Verify gpg.homedir, gpg.useagent, gpg.passphrase. Check, if
-Dgpg.useagent=false is needed, see below comment to pinentry.
+ You may need to add additional profiles, e.g. -Papache-release,java8 or
add -Dgpg.passphrase=<xx>
+
+```sh
+mvn clean site install -Papache-release
+```
+
+**Multi Module**
+
+ mvn release:prepare -DdryRun=true -DautoVersionSubmodules=true
-Papache-release
+
+Optional security check after mvn clean install:
+
+ mvn org.owasp:dependency-check-maven:aggregate
-Ddependency.check.skip=false -DskipTests=true.
+
+**Single**
+
+If dependency check is skipped by default, do mvn
org.owasp:dependency-check-maven:check -Ddependency.check.skip=false
+Since Turbine Parent 8 security check is enabled by default.
+
+ mvn release:prepare -DdryRun=true -Papache-release
+
+And finally:
+
+ mvn release:clean
+
+2. Remote Testing
+
+- May require explicit authentication with -Dusername=<username>
-Dpassword=<pw>
+
+**Multi Module**
+
+ mvn release:prepare -DautoVersionSubmodules=true -P apache-release
+
+
+Important: Success will be on the master build, the others are skipped.
+
+**Single**
+
+ mvn release:prepare -Papache-release
+
+Helpful hint from Apache Website: If you're located in Europe then
release:prepare may fail with 'Unable to tag SCM' and ' svn: No such revision X
'.
+ Wait 10 seconds and run mvn release:prepare again.
+
+3. Release Preparing
+
+If you get a 401 error on the upload to repository.apache.org, make sure
+that your mvn security settings are in place ~/.m2/settings.xml and
~/.m2/settings-security.xml
+
+For more information on setting up security see the encryption guide:
+ - [GUIDE
ENCRYPTION](http://maven.apache.org/guides/mini/guide-encryption.html).
+
+This performs an upload to
repository.apache.org/service/local/staging/deploy/maven2/
+
+Hint: Add -Dgpg.useagent=false helps, if running from a windows machine to
avoid hanging while gpg plugin signing process
+ .. this may happen, if you do not define the pinentry-program in
gpg-agent.conf correctly ..
+
+ mvn release:perform
+
+You could find more information here: [Book Reference
Staging](http://www.sonatype.com/books/nexus-book/reference/staging.html)
+
+4. Close the staging
+
+Login and close in Nexus Repo:
+
+ - [Staging](https://repository.apache.org/index.html#stagingRepositories)
+
+ More information available: [CLOSE
STAGE](https://www.apache.org/dev/publishing-maven-artifacts.html#close-stage).
+
+ Fetch the URL for the tagged Repo from target/checkout with
+
+ svn info
+
+
+5. Prepare Voting Information and Voting
+
+ ....
+
+6. Either Promote / Publish or Drop and Restage
+
+ - [PROMOTE
INFO](http://www.apache.org/dev/publishing-maven-artifacts.html#promote)
+ - [DROP INFO](http://www.apache.org/dev/publishing-maven-artifacts.html#drop)
+
+6a Promote / Release
+
+- Release staged repository in nexus and proceed with next step.
+
+6b Revert
+
+- Drop "reverse merge" the release prepare. If backup files (from
release:prepare) are still there:
+
+ mvn release:rollback
+
+which will delete the tag in svn repo (since version 3.0.0.-M1, that is does a
svn delete ..) and revert to the pre-release state.
+Otherwise revert the commits in your checked out workspace and delete the tag
manually.
+
+- Drop staged repository in nexus and start again with step 1.
+
+
+- Don't forget to refer to the failed vote Message-ID in the commit messages
(svn, nexus).
+
+
+7. Distribution
+
+ - (http://www.apache.org/dev/release#upload-ci),
+ - http://www.apache.org/dev/release.html#host-GA and
+ - http://www.apache.org/dev/release-publishing.html#distribution
+ - SVN checkout target distribution from
https://dist.apache.org/repos/dist/release/turbine/<...>/<...>
+ - SVN checkout released source from
https://svn.apache.org/repos/asf/turbine/<..>/tags/<..>
+ - Generate artifacts (check local repo and target for artifacts) from
released version:
+
+Checkout the tagged released release and run:
+
+ mvn clean install package -Papache-release
+
+
+Generate checksums with UNIX tool shasum, Windows certutil or other tools and
+copy artifacts and sha-files to dist source/binaries folder.
+
+If not all jars are included (assembly plugin _SHOULD_ run after jar
generation), run a second time without clean.
+If no sha1 files are in the target folder, check local repo.
+
+- SVN Add <binaries>, <sources> artifacts (jar/zip/tar.gz,asc,sha1,sha512
files) to target repo
+- SVN Remove old releases binaries and sources
+
+ After repos/dist is updated an automatic email will be generated, if no
update of the release database is done:
+
+ - [ADD TO TURBINE RELEASE
APACHE](https://reporter.apache.org/addrelease.html?turbine)
+
+
+ 8. Stage the latest documentation
+
+- [DEPLOY
DOCU](http://maven.apache.org/developers/website/deploy-component-reference-documentation.html)
+
+SVN Checkout <tagged release version> source. Generate and Publish Site:
+IMPORTANT: You may have to clean up the checkoutDirectory of
maven-scm-publish-plugin plugin after doing a dry run!
+
+**Multi Module**
+
+ mvn site site:stage scm-publish:publish-scm -Dscmpublish.dryRun=true
+
+**Single**
+
+Omit site:stage, which reqires site element definition in
distributionManagement
+
+ mvn site scm-publish:publish-scm -Dscmpublish.dryRun=true
+ mvn clean site scm-publish:publish-scm -Dusername=<username>
-Dpassword=<pw>
+
Modified: turbine/fulcrum/trunk/cache/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/cache/pom.xml?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
--- turbine/fulcrum/trunk/cache/pom.xml (original)
+++ turbine/fulcrum/trunk/cache/pom.xml Fri May 28 14:10:45 2021
@@ -20,6 +20,7 @@
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
<version>8</version>
+ <relativePath></relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -99,7 +100,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>2.14.1</version>
+ <version>${turbine.log4j2.version}</version>
<scope>test</scope>
</dependency>
<!-- testing dependencies -->
Modified: turbine/fulcrum/trunk/intake/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/pom.xml?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/pom.xml (original)
+++ turbine/fulcrum/trunk/intake/pom.xml Fri May 28 14:10:45 2021
@@ -20,6 +20,7 @@
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
<version>8</version>
+ <relativePath></relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -102,14 +103,25 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-parser</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ <version>2.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-pool</artifactId>
+ <version>1.0.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ <scope>provided</scope>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
- <scope>provided</scope>
- </dependency>
<!-- testing dependencies -->
<dependency>
@@ -124,6 +136,13 @@
<version>1.0.8</version>
<scope>test</scope>
</dependency>
+ <!-- log4j2 only usable in testcontainer 1.0.10 -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${turbine.log4j2.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -145,6 +164,17 @@
</includes>
</resource>
</resources>
+
+ <testResources>
+ <testResource>
+ <directory>src/test</directory>
+ <includes>
+ <include>**/*.*</include>
+ </includes>
+ </testResource>
+ </testResources>
+
+
</build>
<properties>
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
Fri May 28 14:10:45 2021
@@ -736,6 +736,8 @@ public class IntakeServiceImpl extends A
Set<File> xmlFiles = new HashSet<File>();
long timeStamp = 0;
+
+ getLogger().debug("logger is " +
getLogger().getClass().getSimpleName());
for (String xmlPath : xmlPathes)
{
Modified: turbine/fulcrum/trunk/intake/src/test/TestComponentConfig.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/test/TestComponentConfig.xml?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
--- turbine/fulcrum/trunk/intake/src/test/TestComponentConfig.xml (original)
+++ turbine/fulcrum/trunk/intake/src/test/TestComponentConfig.xml Fri May 28
14:10:45 2021
@@ -22,12 +22,18 @@
<parser>
<parameterEncoding>utf-8</parameterEncoding>
<automaticUpload>true</automaticUpload>
+ <pool2>
+ <!-- cft. defaults in
org.apache.commons.pool2.impl.BaseObjectPoolConfig and
GenericKeyedObjectPoolConfig -->
+ <maxTotal>2048</maxTotal>
+ <blockWhenExhausted>false</blockWhenExhausted>
+ <maxWaitMillis>100</maxWaitMillis>
+ </pool2>
</parser>
<intake>
<serialDataPath>target/appData.ser</serialDataPath>
<xmlPaths>
- <xmlPath>src/test/intake1.xml</xmlPath>
- <xmlPath>src/test/intake2.xml</xmlPath>
+ <xmlPath>src/test/intake1.xml</xmlPath>
+ <xmlPath>src/test/intake2.xml</xmlPath>
</xmlPaths>
</intake>
</componentConfig>
Added: turbine/fulcrum/trunk/intake/src/test/log4j2-test.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/test/log4j2-test.xml?rev=1890285&view=auto
==============================================================================
--- turbine/fulcrum/trunk/intake/src/test/log4j2-test.xml (added)
+++ turbine/fulcrum/trunk/intake/src/test/log4j2-test.xml Fri May 28 14:10:45
2021
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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.
+-->
+<Configuration status="info" verbose="false">
+ <Appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+ </Console>
+ <File name="fulcrum-intake" fileName="./target/fulcrum-intake.log">
+ <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+ </File>
+ <File name="avalon" fileName="./target/avalon.log">
+ <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+ </File>
+ </Appenders>
+ <Loggers>
+ <Logger name="org.apache.fulcrum" level="debug" additivity="false">
+ <AppenderRef ref="fulcrum-intake"/>
+ </Logger>
+ <Logger name="org.apache.fulcrum.yaafi" level="debug"
additivity="false">
+ <AppenderRef ref="avalon"/>
+ </Logger>
+ <Logger name="avalon" level="debug" additivity="false">
+ <AppenderRef ref="avalon"/>
+ </Logger>
+ <Root level="error">
+ <AppenderRef ref="console"/>
+ <AppenderRef ref="fulcrum-intake"/>
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
Modified:
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeServiceTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeServiceTest.java?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeServiceTest.java
(original)
+++
turbine/fulcrum/trunk/intake/src/test/org/apache/fulcrum/intake/IntakeServiceTest.java
Fri May 28 14:10:45 2021
@@ -28,6 +28,8 @@ import java.io.File;
import org.apache.fulcrum.intake.model.Group;
import org.apache.fulcrum.testcontainer.BaseUnit5Test;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
@@ -43,6 +45,8 @@ public class IntakeServiceTest extends B
{
private static final File BASEDIR = new File(".");
private IntakeService intakeService = null;
+
+ protected static final Logger log = LogManager.getLogger(
IntakeServiceTest.class );
/**
* Defines the testcase for JUnit5.
Modified:
turbine/fulcrum/trunk/jetty/src/java/org/apache/fulcrum/jetty/impl/JettyServiceImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/jetty/src/java/org/apache/fulcrum/jetty/impl/JettyServiceImpl.java?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
---
turbine/fulcrum/trunk/jetty/src/java/org/apache/fulcrum/jetty/impl/JettyServiceImpl.java
(original)
+++
turbine/fulcrum/trunk/jetty/src/java/org/apache/fulcrum/jetty/impl/JettyServiceImpl.java
Fri May 28 14:10:45 2021
@@ -187,7 +187,7 @@ public class JettyServiceImpl
* @param applicationDir the directory where to start the search
* @param location the location of the source to be loaded
* @return the input stream of the resource
- * @exception IOException the operation failed
+ * @throws IOException the operation failed
*/
private InputStream locate( File applicationDir, String location ) throws
IOException
{
Modified: turbine/fulcrum/trunk/parser/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/pom.xml?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parser/pom.xml (original)
+++ turbine/fulcrum/trunk/parser/pom.xml Fri May 28 14:10:45 2021
@@ -20,6 +20,7 @@
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
<version>8</version>
+ <relativePath></relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -115,18 +116,17 @@
<artifactId>commons-lang3</artifactId>
<version>3.9</version>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-pool2</artifactId>
- <version>2.7.0</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-pool2</artifactId>
+ <version>2.7.0</version>
+ </dependency>
+ <!-- fulcrum-pool is required even if not used due to optional fall-back
-->
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-pool</artifactId>
<version>1.0.5</version>
- <optional>true</optional>
</dependency>
-
<!-- testing dependencies -->
<dependency>
<groupId>org.apache.fulcrum</groupId>
Modified:
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/BaseValueParser.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/BaseValueParser.java?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
---
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/BaseValueParser.java
(original)
+++
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/BaseValueParser.java
Fri May 28 14:10:45 2021
@@ -81,10 +81,10 @@ public class BaseValueParser
private Logger logger;
/** String values which would evaluate to Boolean.TRUE */
- private static final String[] trueValues = {"TRUE","T","YES","Y","1","ON"};
+ private static final String[] TRUE_VALUES =
{"TRUE","T","YES","Y","1","ON"};
/** String values which would evaluate to Boolean.FALSE */
- private static final String[] falseValues =
{"FALSE","F","NO","N","0","OFF"};
+ private static final String[] FALSE_VALUES =
{"FALSE","F","NO","N","0","OFF"};
/**
* The character encoding to use when converting to byte arrays
@@ -167,7 +167,7 @@ public class BaseValueParser
/**
* Recycles the parser.
*/
- public void recycle()
+ public final void recycle()
{
recycle(DEFAULT_CHARACTER_ENCODING);
}
@@ -177,7 +177,7 @@ public class BaseValueParser
*
* @param characterEncoding the character encoding.
*/
- public void recycle(String characterEncoding)
+ public final void recycle(String characterEncoding)
{
setCharacterEncoding(characterEncoding);
}
@@ -205,7 +205,7 @@ public class BaseValueParser
* Set the character encoding that will be used by this ValueParser.
*/
@Override
- public void setCharacterEncoding(String s)
+ public final void setCharacterEncoding(String s)
{
characterEncoding = s;
}
@@ -223,7 +223,7 @@ public class BaseValueParser
* Set the locale that will be used by this ValueParser.
*/
@Override
- public void setLocale(Locale l)
+ public final void setLocale(Locale l)
{
locale = l;
setDateFormat(DateFormat.getDateInstance(DateFormat.SHORT, locale));
@@ -234,7 +234,7 @@ public class BaseValueParser
* Get the locale that will be used by this ValueParser.
*/
@Override
- public Locale getLocale()
+ public final Locale getLocale()
{
return locale;
}
@@ -243,7 +243,7 @@ public class BaseValueParser
* Set the date format that will be used by this ValueParser.
*/
@Override
- public void setDateFormat(DateFormat df)
+ public final void setDateFormat(DateFormat df)
{
dateFormat = df;
}
@@ -462,18 +462,18 @@ public class BaseValueParser
if (StringUtils.isNotEmpty(value))
{
for (int cnt = 0;
- cnt < Math.max(trueValues.length, falseValues.length); cnt++)
+ cnt < Math.max(TRUE_VALUES.length, FALSE_VALUES.length); cnt++)
{
// Short-cut evaluation or bust!
- if (cnt < trueValues.length &&
- value.equalsIgnoreCase(trueValues[cnt]))
+ if (cnt < TRUE_VALUES.length &&
+ value.equalsIgnoreCase(TRUE_VALUES[cnt]))
{
result = Boolean.TRUE;
break;
}
- if (cnt < falseValues.length &&
- value.equalsIgnoreCase(falseValues[cnt]))
+ if (cnt < FALSE_VALUES.length &&
+ value.equalsIgnoreCase(FALSE_VALUES[cnt]))
{
result = Boolean.FALSE;
break;
@@ -1406,7 +1406,7 @@ public class BaseValueParser
* the bean property and the parameter is looked for.
*
* @param bean An Object.
- * @exception Exception a generic exception.
+ * @throws Exception a generic exception.
*/
@Override
public void setProperties(Object bean) throws Exception
@@ -1486,7 +1486,7 @@ public class BaseValueParser
*
* @param bean An Object.
* @param prop A PropertyDescriptor.
- * @exception Exception a generic exception.
+ * @@throws Exception a generic exception.
*/
protected void setProperty(Object bean,
PropertyDescriptor prop)
Modified:
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
---
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java
(original)
+++
turbine/fulcrum/trunk/parser/src/java/org/apache/fulcrum/parser/DefaultCookieParser.java
Fri May 28 14:10:45 2021
@@ -140,7 +140,7 @@ public class DefaultCookieParser
* Set a persistent cookie on the client that will expire
* after a maximum age (given in seconds).
*/
- public void set(String name, String value, int seconds_age)
+ public void set(String name, String value, int secondsAge)
{
if (response == null)
{
@@ -148,7 +148,7 @@ public class DefaultCookieParser
}
Cookie cookie = new Cookie(name, value);
- cookie.setMaxAge(seconds_age);
+ cookie.setMaxAge(secondsAge);
cookie.setPath(request.getServletPath());
response.addCookie(cookie);
}
Modified: turbine/fulcrum/trunk/parser/src/site/site.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/site/site.xml?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parser/src/site/site.xml (original)
+++ turbine/fulcrum/trunk/parser/src/site/site.xml Fri May 28 14:10:45 2021
@@ -17,11 +17,27 @@
specific language governing permissions and limitations
under the License.
-->
-<project name="Fulcrum Parser">
+<project xmlns="http://maven.apache.org/DECORATION/1.4.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0
http://maven.apache.org/xsd/decoration-1.4.0.xsd";
+ name="Fulcrum Parser">
+ <skin>
+ <groupId>org.apache.maven.skins</groupId>
+ <artifactId>maven-fluido-skin</artifactId>
+ <version>1.8</version>
+ </skin>
+
<body>
<menu name="Overview">
<item name="Main" href="/index.html"/>
</menu>
</body>
+
+ <custom>
+ <fluidoSkin>
+ <topBarEnabled>false</topBarEnabled>
+ <sideBarEnabled>true</sideBarEnabled>
+ </fluidoSkin>
+ </custom>
</project>
Modified: turbine/fulcrum/trunk/parser/src/test/TestComponentConfig.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/test/TestComponentConfig.xml?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
--- turbine/fulcrum/trunk/parser/src/test/TestComponentConfig.xml (original)
+++ turbine/fulcrum/trunk/parser/src/test/TestComponentConfig.xml Fri May 28
14:10:45 2021
@@ -19,13 +19,13 @@
-->
<componentConfig>
<parser>
- <parameterEncoding>utf-8</parameterEncoding>
- <automaticUpload>true</automaticUpload>
- <pool2>
+ <parameterEncoding>utf-8</parameterEncoding>
+ <automaticUpload>true</automaticUpload>
+ <pool2>
<!-- cft. defaults in
org.apache.commons.pool2.impl.BaseObjectPoolConfig and
GenericKeyedObjectPoolConfig -->
- <maxTotal>2048</maxTotal>
- <blockWhenExhausted>false</blockWhenExhausted>
- <maxWaitMillis>100</maxWaitMillis>
- </pool2>
+ <maxTotal>2048</maxTotal>
+ <blockWhenExhausted>false</blockWhenExhausted>
+ <maxWaitMillis>100</maxWaitMillis>
+ </pool2>
</parser>
</componentConfig>
Modified:
turbine/fulcrum/trunk/parser/src/test/TestComponentConfigWithFulcrumPool.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/parser/src/test/TestComponentConfigWithFulcrumPool.xml?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
---
turbine/fulcrum/trunk/parser/src/test/TestComponentConfigWithFulcrumPool.xml
(original)
+++
turbine/fulcrum/trunk/parser/src/test/TestComponentConfigWithFulcrumPool.xml
Fri May 28 14:10:45 2021
@@ -19,8 +19,8 @@
-->
<componentConfig>
<parser>
- <parameterEncoding>utf-8</parameterEncoding>
- <automaticUpload>true</automaticUpload>
- <fulcrumPool>true</fulcrumPool>
+ <parameterEncoding>utf-8</parameterEncoding>
+ <automaticUpload>true</automaticUpload>
+ <fulcrumPool>true</fulcrumPool>
</parser>
</componentConfig>
Modified: turbine/fulcrum/trunk/pool/src/test/TestComponentConfig.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/pool/src/test/TestComponentConfig.xml?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
--- turbine/fulcrum/trunk/pool/src/test/TestComponentConfig.xml (original)
+++ turbine/fulcrum/trunk/pool/src/test/TestComponentConfig.xml Fri May 28
14:10:45 2021
@@ -19,7 +19,7 @@
-->
<componentConfig>
<pool>
- <configuration>
+ <configuration>
<capacity default="256"/>
</configuration>
</pool>
Modified: turbine/fulcrum/trunk/quartz/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/quartz/pom.xml?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
--- turbine/fulcrum/trunk/quartz/pom.xml (original)
+++ turbine/fulcrum/trunk/quartz/pom.xml Fri May 28 14:10:45 2021
@@ -16,22 +16,23 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <parent>
- <artifactId>turbine-parent</artifactId>
- <groupId>org.apache.turbine</groupId>
- <version>8</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-quartz</artifactId>
- <version>1.1.2-SNAPSHOT</version>
- <name>Fulcrum Quartz</name>
- <inceptionYear>2004</inceptionYear>
- <description>A wrapper around the Quartz Scheduler.</description>
- <url>http://turbine.apache.org/fulcrum/fulcrum-quartz/</url>
+ <parent>
+ <artifactId>turbine-parent</artifactId>
+ <groupId>org.apache.turbine</groupId>
+ <version>8</version>
+ <relativePath></relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-quartz</artifactId>
+ <version>1.1.2-SNAPSHOT</version>
+ <name>Fulcrum Quartz</name>
+ <inceptionYear>2004</inceptionYear>
+ <description>A wrapper around the Quartz Scheduler.</description>
+ <url>https://turbine.apache.org/fulcrum/fulcrum-quartz/</url>
- <!-- Required for staging to work -->
+ <!-- Required for staging to work -->
<distributionManagement>
<site>
<id>turbine.apache.org</id>
@@ -146,7 +147,7 @@
- </build>
+ </build>
<properties>
<turbine.site.path>fulcrum/fulcrum-quartz</turbine.site.path>
Modified: turbine/fulcrum/trunk/security/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/pom.xml?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/pom.xml (original)
+++ turbine/fulcrum/trunk/security/pom.xml Fri May 28 14:10:45 2021
@@ -22,6 +22,7 @@
<artifactId>turbine-parent</artifactId>
<groupId>org.apache.turbine</groupId>
<version>8</version>
+ <relativePath></relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.fulcrum</groupId>
@@ -40,9 +41,9 @@
</distributionManagement>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/</connection>
+
<connection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/security/</developerConnection>
- <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/</url>
+
<url>https://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/</url>
</scm>
<developers>
Modified: turbine/fulcrum/trunk/testcontainer/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/pom.xml?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
--- turbine/fulcrum/trunk/testcontainer/pom.xml (original)
+++ turbine/fulcrum/trunk/testcontainer/pom.xml Fri May 28 14:10:45 2021
@@ -10,151 +10,152 @@
OF ANY KIND, either express or implied. See the License for the
specific
language governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <parent>
- <artifactId>turbine-parent</artifactId>
- <groupId>org.apache.turbine</groupId>
- <version>8</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-testcontainer</artifactId>
- <version>1.0.10-SNAPSHOT</version>
- <name>Fulcrum Test Container</name>
- <inceptionYear>2004</inceptionYear>
- <description>A test framework for Avalon components</description>
- <url>https://turbine.apache.org/fulcrum/fulcrum-testcontainer</url>
-
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/testcontainer</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/testcontainer</developerConnection>
-
<url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer</url>
- </scm>
-
- <distributionManagement>
- <site>
- <id>apache.website</id>
- <name>Fulcrum Website</name>
-
<url>http://turbine.apache.org/fulcrum/fulcrum-testcontainer/</url>
- </site>
- </distributionManagement>
-
- <developers>
- <developer>
- <name>Siegfried Goeschl</name>
- <id>sgoeschl</id>
- <email>[email protected]</email>
- <organization />
- <roles>
- <role>Java Developer</role>
- </roles>
- </developer>
- </developers>
-
- <dependencies>
- <!-- we still need this dependency to compile -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.1</version>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <version>${junit.jupiter.version}</version>
- <!--scope>test</scope -->
- </dependency>
- <!-- use Junit 4 within Junit 5 -->
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <version>${junit.jupiter.version}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- Needed if testing with YAAFI -->
- <dependency>
- <groupId>org.apache.fulcrum</groupId>
- <artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.8</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>3.5.13</version>
- </dependency>
- <!-- Needed if testing with ECM -->
- <dependency>
- <groupId>org.apache.excalibur.component</groupId>
- <artifactId>excalibur-component</artifactId>
- <version>2.2.1</version>
- <type>jar</type>
- <optional>true</optional>
- </dependency>
- <!-- Log4j2 may be better used by default -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${turbine.log4j2.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${turbine.log4j2.version}</version>
- <optional>true</optional>
- </dependency>
- <!-- log4j1.2 bridge instead of log4j -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- <version>${turbine.log4j2.version}</version>
- <optional>true</optional>
- </dependency>
-
- </dependencies>
-
- <build>
- <sourceDirectory>${basedir}/src/java</sourceDirectory>
- <testSourceDirectory>${basedir}/src/test</testSourceDirectory>
- <testResources>
- <testResource>
- <directory>${basedir}/src/test</directory>
- <includes>
- <include>*.xml</include>
- </includes>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <!-- JUnit 5 requires Surefire version 2.22.0
or higher -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- setting the default:
forkCount=1/reuseForks=true -->
- <forkCount>1</forkCount>
- <!-- setting this to false (highest
isolation: each test class has its
- own jvm process) let maven test
ignore all tests? -->
- <reuseForks>true</reuseForks>
- </configuration>
- <dependencies>
- <!-- need no
junit-platform-surefire-provider dependency -->
- </dependencies>
- </plugin>
- </plugins>
- </build>
-
- <properties>
-
<turbine.site.path>fulcrum/fulcrum-testcontainer</turbine.site.path>
-
<turbine.scmPubCheckoutDirectory>${turbine.site.cache}/fulcrum/testcontainer</turbine.scmPubCheckoutDirectory>
- <junit.jupiter.version>5.7.1</junit.jupiter.version>
- <junit.platform>1.7.1</junit.platform>
- </properties>
+ <parent>
+ <artifactId>turbine-parent</artifactId>
+ <groupId>org.apache.turbine</groupId>
+ <version>8</version>
+ <relativePath></relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-testcontainer</artifactId>
+ <version>1.0.10-SNAPSHOT</version>
+ <name>Fulcrum Test Container</name>
+ <inceptionYear>2004</inceptionYear>
+ <description>A test framework for Avalon components</description>
+ <url>https://turbine.apache.org/fulcrum/fulcrum-testcontainer</url>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/turbine/fulcrum/trunk/testcontainer</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/testcontainer</developerConnection>
+ <url>http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer</url>
+ </scm>
+
+ <distributionManagement>
+ <site>
+ <id>apache.website</id>
+ <name>Fulcrum Website</name>
+ <url>http://turbine.apache.org/fulcrum/fulcrum-testcontainer/</url>
+ </site>
+ </distributionManagement>
+
+ <developers>
+ <developer>
+ <name>Siegfried Goeschl</name>
+ <id>sgoeschl</id>
+ <email>[email protected]</email>
+ <organization />
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ </developers>
+
+ <dependencies>
+ <!-- we still need this dependency to compile -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${junit.jupiter.version}</version>
+ <!--scope>test</scope -->
+ </dependency>
+ <!-- use Junit 4 within Junit 5 -->
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit.jupiter.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Needed if testing with YAAFI -->
+ <dependency>
+ <groupId>org.apache.fulcrum</groupId>
+ <artifactId>fulcrum-yaafi</artifactId>
+ <version>1.0.8</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>3.5.13</version>
+ </dependency>
+ <!-- Needed if testing with ECM -->
+ <dependency>
+ <groupId>org.apache.excalibur.component</groupId>
+ <artifactId>excalibur-component</artifactId>
+ <version>2.2.1</version>
+ <type>jar</type>
+ <optional>true</optional>
+ </dependency>
+ <!-- Log4j2 may be better used by default -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${turbine.log4j2.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${turbine.log4j2.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <!-- log4j1.2 bridge instead of log4j -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ <version>${turbine.log4j2.version}</version>
+ <optional>true</optional>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <sourceDirectory>${basedir}/src/java</sourceDirectory>
+ <testSourceDirectory>${basedir}/src/test</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <directory>${basedir}/src/test</directory>
+ <includes>
+ <include>*.xml</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <!-- JUnit 5 requires Surefire version 2.22.0 or higher -->
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- setting the default: forkCount=1/reuseForks=true -->
+ <forkCount>1</forkCount>
+ <!-- setting this to false (highest isolation: each test class
has its
+ own jvm process) let maven test ignore all tests? -->
+ <reuseForks>true</reuseForks>
+ </configuration>
+ <dependencies>
+ <!-- need no junit-platform-surefire-provider dependency -->
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+ <properties>
+ <turbine.site.path>fulcrum/fulcrum-testcontainer</turbine.site.path>
+
<turbine.scmPubCheckoutDirectory>${turbine.site.cache}/fulcrum/testcontainer</turbine.scmPubCheckoutDirectory>
+ <junit.jupiter.version>5.7.1</junit.jupiter.version>
+ <junit.platform>1.7.1</junit.platform>
+ </properties>
</project>
Modified:
turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/BaseUnit5Test.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/BaseUnit5Test.java?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
---
turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/BaseUnit5Test.java
(original)
+++
turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/BaseUnit5Test.java
Fri May 28 14:10:45 2021
@@ -29,13 +29,16 @@ import static org.mockito.Mockito.when;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
+import java.util.Objects;
import java.util.Vector;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.ConsoleLogger;
+import org.apache.avalon.framework.logger.Logger;
import org.junit.jupiter.api.AfterEach;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -121,6 +124,11 @@ public class BaseUnit5Test {
{
this.logLevel = logLevel;
}
+
+ public int getLogLevel()
+ {
+ return logLevel;
+ }
/**
* Constructor for test.
Modified:
turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/ECMContainer.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/ECMContainer.java?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
---
turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/ECMContainer.java
(original)
+++
turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/ECMContainer.java
Fri May 28 14:10:45 2021
@@ -64,6 +64,7 @@ public class ECMContainer extends Abstra
public void startup(String configFileName, String roleFileName,String
parametersFileName)
{
getLogger().debug("Starting container...");
+ getLogger().debug( "with logger: " +
getLogger().getClass().getSimpleName());
this.configFileName = configFileName;
this.roleFileName = roleFileName;
File configFile = new File(configFileName);
Modified:
turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/YAAFIContainer.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/YAAFIContainer.java?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
---
turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/YAAFIContainer.java
(original)
+++
turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/YAAFIContainer.java
Fri May 28 14:10:45 2021
@@ -25,9 +25,13 @@ import org.apache.avalon.framework.compo
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.ConsoleLogger;
+import org.apache.fulcrum.testcontainer.avalon.logger.Log4J2Logger;
import org.apache.fulcrum.yaafi.framework.container.ServiceContainer;
import
org.apache.fulcrum.yaafi.framework.factory.ServiceContainerConfiguration;
import org.apache.fulcrum.yaafi.framework.factory.ServiceContainerFactory;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.config.Configurator;
/**
* This is a simple YAAFI based container that can be used in unit test
@@ -44,26 +48,50 @@ public class YAAFIContainer extends Abst
private ServiceContainer manager;
/** The log level for the ConsoleLogger */
- private int logLevel = ConsoleLogger.LEVEL_DEBUG;
+ //private int logLevel = ConsoleLogger.LEVEL_DEBUG;
+ private Level logLevel = Level.DEBUG;
+
+ org.apache.logging.log4j.Logger logger;
/**
* Constructor.
*/
public YAAFIContainer()
{
- this.enableLogging( new ConsoleLogger( logLevel ) );
+ //this.enableLogging( new ConsoleLogger( logLevel ) );
+ logger = LogManager.getLogger( "avalon" );
+ Configurator.setLevel( "avalon",logLevel );
+ this.enableLogging( new Log4J2Logger( logger ) );
this.config = new ServiceContainerConfiguration();
}
/**
* Constructor.
*
- * @param logLevel the log level to be used
+ * @param logLevel the log level to be used: {@link ConsoleLogger} LEVEL_*.
*/
public YAAFIContainer(int logLevel)
{
- this.logLevel = logLevel;
- this.enableLogging( new ConsoleLogger( logLevel ) );
+ logger = LogManager.getLogger( "avalon" );
+ if (logLevel == ConsoleLogger.LEVEL_DEBUG) {
+ this.logLevel = Level.DEBUG;
+ } else if (logLevel == ConsoleLogger.LEVEL_DEBUG) {
+ this.logLevel = Level.DEBUG;
+ } else if (logLevel == ConsoleLogger.LEVEL_INFO) {
+ this.logLevel = Level.INFO;
+ } else if (logLevel == ConsoleLogger.LEVEL_WARN) {
+ this.logLevel = Level.WARN;
+ } else if (logLevel == ConsoleLogger.LEVEL_ERROR) {
+ this.logLevel = Level.ERROR;
+ } else if (logLevel == ConsoleLogger.LEVEL_FATAL) {
+ this.logLevel = Level.FATAL;
+ } else if (logLevel == ConsoleLogger.LEVEL_DISABLED) {
+ this.logLevel = Level.OFF;
+ } else {
+ this.logLevel = Level.INFO;
+ }
+ Configurator.setLevel( "avalon", this.logLevel );
+ this.enableLogging( new Log4J2Logger( logger ) );
this.config = new ServiceContainerConfiguration();
}
@@ -78,12 +106,13 @@ public class YAAFIContainer extends Abst
String roleFileName,
String parametersFileName )
{
- getLogger().debug("Starting container...");
+ getLogger().debug("Starting YAAFI container... ");
+ getLogger().debug( "with logger: " + getLogger().getClass().getName());
this.config.setComponentConfigurationLocation( configFileName );
this.config.setComponentRolesLocation( roleFileName );
this.config.setParametersLocation( parametersFileName );
- this.config.setLogger( new ConsoleLogger( logLevel ) );
+ this.config.setLogger( new Log4J2Logger( logger ) );
File configFile = new File(configFileName);
Added:
turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/avalon/logger/Log4J2Logger.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/avalon/logger/Log4J2Logger.java?rev=1890285&view=auto
==============================================================================
---
turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/avalon/logger/Log4J2Logger.java
(added)
+++
turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/avalon/logger/Log4J2Logger.java
Fri May 28 14:10:45 2021
@@ -0,0 +1,221 @@
+package org.apache.fulcrum.testcontainer.avalon.logger;
+
+import java.util.Objects;
+
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.logging.log4j.Level;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+
+import org.apache.logging.log4j.LogManager;
+
+/**
+ * A Log4J2 wrapper class for Logger.
+ *
+ * - supports only minimal logging mechanism, without suppliers or objects.
+ *
+ * @author <a href="mailto:[email protected]";>Turbine Development
Team</a>
+ * @version $Id$
+ */
+public final class Log4J2Logger
+ implements Logger
+{
+
+ //underlying implementation
+ private final org.apache.logging.log4j.Logger m_logger;
+
+ /**
+ * Create a logger that delegates to specified category.
+ *
+ * @param logImpl the category to delegate to
+ */
+ public Log4J2Logger( final org.apache.logging.log4j.Logger logImpl )
+ {
+ Objects.requireNonNull( logImpl, "Log4J2 logger must not be null" );
+ m_logger = logImpl;
+ }
+
+ /**
+ * Log a debug message.
+ *
+ * @param message the message
+ */
+ public final void debug( final String message )
+ {
+ m_logger.log( Level.DEBUG, message );
+ }
+
+ /**
+ * Log a debug message.
+ *
+ * @param message the message
+ * @param throwable the throwable
+ */
+ public final void debug( final String message, final Throwable throwable )
+ {
+ m_logger.log( Level.DEBUG, message, throwable );
+ }
+
+ /**
+ * Determine if messages of priority "debug" will be logged.
+ *
+ * @return true if "debug" messages will be logged
+ */
+ public final boolean isDebugEnabled()
+ {
+ return m_logger.isDebugEnabled();
+ }
+
+ /**
+ * Log a info message.
+ *
+ * @param message the message
+ */
+ public final void info( final String message )
+ {
+ m_logger.log( Level.INFO, message );
+ }
+
+ /**
+ * Log a info message.
+ *
+ * @param message the message
+ * @param throwable the throwable
+ */
+ public final void info( final String message, final Throwable throwable )
+ {
+ m_logger.log( Level.INFO, message, throwable );
+ }
+
+ /**
+ * Determine if messages of priority "info" will be logged.
+ *
+ * @return true if "info" messages will be logged
+ */
+ public final boolean isInfoEnabled()
+ {
+ return m_logger.isInfoEnabled();
+ }
+
+ /**
+ * Log a warn message.
+ *
+ * @param message the message
+ */
+ public final void warn( final String message )
+ {
+ m_logger.log( Level.WARN, message );
+ }
+
+ /**
+ * Log a warn message.
+ *
+ * @param message the message
+ * @param throwable the throwable
+ */
+ public final void warn( final String message, final Throwable throwable )
+ {
+ m_logger.log( Level.WARN, message, throwable );
+ }
+
+ /**
+ * Determine if messages of priority "warn" will be logged.
+ *
+ * @return true if "warn" messages will be logged
+ */
+ public final boolean isWarnEnabled()
+ {
+ return m_logger.isEnabled( Level.WARN );
+ }
+
+ /**
+ * Log a error message.
+ *
+ * @param message the message
+ */
+ public final void error( final String message )
+ {
+ m_logger.log( Level.ERROR, message );
+ }
+
+ /**
+ * Log a error message.
+ *
+ * @param message the message
+ * @param throwable the throwable
+ */
+ public final void error( final String message, final Throwable throwable )
+ {
+ m_logger.log( Level.ERROR, message, throwable );
+ }
+
+ /**
+ * Determine if messages of priority "error" will be logged.
+ *
+ * @return true if "error" messages will be logged
+ */
+ public final boolean isErrorEnabled()
+ {
+ return m_logger.isEnabled( Level.ERROR );
+ }
+
+ /**
+ * Log a fatalError message.
+ *
+ * @param message the message
+ */
+ public final void fatalError( final String message )
+ {
+ m_logger.log( Level.FATAL, message );
+ }
+
+ /**
+ * Log a fatalError message.
+ *
+ * @param message the message
+ * @param throwable the throwable
+ */
+ public final void fatalError( final String message, final Throwable
throwable )
+ {
+ m_logger.log( Level.ERROR, message, throwable );
+ }
+
+ /**
+ * Determine if messages of priority "fatalError" will be logged.
+ *
+ * @return true if "fatalError" messages will be logged
+ */
+ public final boolean isFatalErrorEnabled()
+ {
+ return m_logger.isEnabled( Level.FATAL );
+ }
+
+ /**
+ * Create a new child logger.
+ * The name of the child logger is [current-loggers-name].[passed-in-name]
+ * Throws <code>IllegalArgumentException</code> if name has an empty
element name
+ *
+ * @param name the subname of this logger
+ * @return the new logger
+ */
+ public final Logger getChildLogger( final String name )
+ {
+ return new Log4J2Logger( LogManager.getLogger( m_logger.getName() +
"." + name ) );
+ }
+}
Modified: turbine/fulcrum/trunk/testcontainer/src/test/log4j2.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/src/test/log4j2.xml?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
--- turbine/fulcrum/trunk/testcontainer/src/test/log4j2.xml (original)
+++ turbine/fulcrum/trunk/testcontainer/src/test/log4j2.xml Fri May 28 14:10:45
2021
@@ -25,8 +25,13 @@
<Logger name="org.apache.fulcrum" level="debug"
additivity="false">
<AppenderRef ref="console" />
- <AppenderRef ref="avalonfile" />
+ <AppenderRef ref="logfile" />
</Logger>
+ <Logger name="org.apache.fulcrum.yaafi" level="debug"
+ additivity="false">
+ <AppenderRef ref="console" />
+ <AppenderRef ref="avalonfile" />
+ </Logger>
<Logger name="avalon" level="debug" additivity="false">
<AppenderRef ref="avalonfile" />
</Logger>
Modified:
turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/EcmContainerTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/EcmContainerTest.java?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
---
turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/EcmContainerTest.java
(original)
+++
turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/EcmContainerTest.java
Fri May 28 14:10:45 2021
@@ -27,8 +27,9 @@ import static org.junit.jupiter.api.Asse
import java.io.File;
import org.apache.avalon.framework.component.ComponentException;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
/**
* Basic testing of the Container
@@ -37,7 +38,7 @@ import org.junit.Test;
* @version $Id$
*/
-public class EcmContainerTest extends BaseUnit4Test
+public class EcmContainerTest extends BaseUnit5Test
{
/**
* Constructor for test.
@@ -46,7 +47,7 @@ public class EcmContainerTest extends Ba
{
}
- @Before
+ @BeforeEach
public void setUp() throws Exception{
setContainerType( CONTAINER_ECM);
}
Modified:
turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerJunit5Test.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerJunit5Test.java?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
---
turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerJunit5Test.java
(original)
+++
turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerJunit5Test.java
Fri May 28 14:10:45 2021
@@ -28,6 +28,7 @@ import java.io.File;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.logger.ConsoleLogger;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
@@ -40,12 +41,20 @@ import org.junit.jupiter.api.Test;
@DisplayName("Yaafi Container Test JUnit5")
public class YaafiContainerJunit5Test extends BaseUnit5Test
{
+
/**
* Constructor for test.
*/
public YaafiContainerJunit5Test()
{
}
+
+ @BeforeEach
+ public void setup() {
+ setContainerType( CONTAINER_YAAFI);
+ this.setLogLevel(ConsoleLogger.LEVEL_INFO);
+ }
+
@Test
public void testInitialization()
@@ -56,6 +65,7 @@ public class YaafiContainerJunit5Test ex
@Test
public void testComponentUsage()
{
+ this.setLogLevel(ConsoleLogger.LEVEL_DEBUG);
SimpleComponent sc = null;
try
{
Modified:
turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerTest.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerTest.java?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
---
turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerTest.java
(original)
+++
turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerTest.java
Fri May 28 14:10:45 2021
@@ -2,6 +2,7 @@ package org.apache.fulcrum.testcontainer
/*
* Licensed to the Apache Software Foundation (ASF) under one
+
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
Modified: turbine/fulcrum/trunk/xmlrpc/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/xmlrpc/xdocs/changes.xml?rev=1890285&r1=1890284&r2=1890285&view=diff
==============================================================================
--- turbine/fulcrum/trunk/xmlrpc/xdocs/changes.xml (original)
+++ turbine/fulcrum/trunk/xmlrpc/xdocs/changes.xml Fri May 28 14:10:45 2021
@@ -26,7 +26,7 @@
</properties>
<body>
- <release version="1.0.6-dev" date="as in SVN">
+ <release version="1.0.6-SNAPSHOT" date="as in SVN">
<action dev="gk" type="update">
xercesImpl to 2.12.11
commons-io to 1.15
