Author: gk
Date: Wed Aug 4 08:35:47 2021
New Revision: 1892011
URL: http://svn.apache.org/viewvc?rev=1892011&view=rev
Log:
- update jackson libs to v2.12.3, cache to v2.0.0, testcontainer to 1.15.3,
remove duplicate entry
- rename README.txt to README.md
- deprecate Log4j2Logger
- sync getPermstorage in DefaultUserImpl
Added:
turbine/core/trunk/README.md
Removed:
turbine/core/trunk/README.txt
Modified:
turbine/core/trunk/pom.xml
turbine/core/trunk/src/changes/changes.xml
turbine/core/trunk/src/java/org/apache/turbine/om/security/DefaultUserImpl.java
turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/Log4j2Logger.java
turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineYaafiComponentService.java
turbine/core/trunk/src/java/org/apache/turbine/services/urlmapper/TurbineURLMapperService.java
Added: turbine/core/trunk/README.md
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/README.md?rev=1892011&view=auto
==============================================================================
--- turbine/core/trunk/README.md (added)
+++ turbine/core/trunk/README.md Wed Aug 4 08:35:47 2021
@@ -0,0 +1,63 @@
+
+# Apache Turbine
+
+Turbine Top Level README
+--------------------------------------------------------------------------
+
+Welcome to Turbine. For more information about Turbine, please look
+at the HTML documentation in the docs/ directory.
+
+Here is a description of what each of the top level directories
+contains. Please consult the documentation in each of the lower level
+directories for information that is specific to their contents.
+
+conf/ This is where the sample configurations live.
+xdocs/ This is where the documentation and database schemas live.
+ All of the files in this directory are mirrored onto
+ the live website.
+src/ This is where all of the source code to Turbine lives.
+target/ This is a temporary directory for building the project.
+
+## Building
+
+In order to get started with Turbine, you must build it first.
+Turbine uses Maven for its build environment. You can find installation
+information about Maven online at http://maven.apache.org/ .
+
+Once Maven has been installed, just type 'mvn package'. The default behavior
+is to compile, run the unit tests, and build the jar.
+
+Some other useful goals:
+
+ mvn site - generate the site documention
+
+* test site
+
+ mvn site scm-publish:publish-scm -Dscmpublish.dryRun=true -Papache-release
+
+Activating Maven profile apache-release is not required, und may require a
signing process (you need a gpg key).
+
+* deploy site
+
+ mvn clean site scm-publish:publish-scm -Papache-release
+
+* Deploys Turbine release site to the Apache web site (cft. to
https://svn.apache.org/repos/asf/turbine/site how to deploy main Turbine web
site).
+CAVEAT: If you make a dry run or decide to rebuild a new site when publishing,
delete the cache folder to avoid that no site might be deployt!
+By default this folder is user.home/turbine-sites/turbine, configured in
Turbine parent property turbine.site.cache.
+
+### More about Releases
+
+Find more about release related command hints in
+* https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/README.txt
+* IMPORTANT: BEFORE running release, i.e. if the major.minor versino numbers
changed, you have to update turbine.site.path in pom.xml to the new production
path
+(e.g. turbine/turbine-4.0 for version 4.0) removing the "development/"-part
of the path.
+* if updating the site for the new SNAPSHOT version add the new development
path (e.g. turbine/development/turbine-5.1 for version 5.1-SNAPSHOT) AFTER the
release.
+* Find the site structure here:
https://svn.apache.org/repos/infra/websites/production/turbine/content/turbine/.
+
+As of Turbine 2.3, you must also have the Torque plugin for Maven installed
+to build Turbine. Information on how to install the plugin is available
+at
http://db.apache.org/torque/torque-5.0/documentation/modules/maven-plugin/index.html
.
+
+-------------
+
+-The Turbine Team
Modified: turbine/core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1892011&r1=1892010&r2=1892011&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Wed Aug 4 08:35:47 2021
@@ -895,7 +895,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
- <version>2.11.2</version>
+ <version>${jackson2.version}</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -906,7 +906,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-cache</artifactId>
- <version>1.1.0</version>
+ <version>2.0.0</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -937,7 +937,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
- <version>1.0.8</version>
+ <version>${fulcrum.yaafi}</version>
<optional>true</optional>
</dependency>
<dependency>
@@ -1002,7 +1002,7 @@
<dependency>
<groupId>org.apache.fulcrum</groupId>
<artifactId>fulcrum-quartz</artifactId>
- <version>1.1.2-SNAPSHOT</version>
+ <version>1.1.2</version>
</dependency>
<!-- suppress owasp CVE-2018-11771, CVE-2018-1324, as jython-standalone is
optional.-->
<dependency>
@@ -1284,7 +1284,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
- <version>2.11.2</version>
+ <version>${jackson2.version}</version>
</dependency>
</dependencies>
</profile>
@@ -1296,10 +1296,12 @@
<turbine.site.path>turbine/development/turbine-5.1</turbine.site.path>
<fulcrum.intake>2.0.0</fulcrum.intake>
<fulcrum.parser>2.0.1</fulcrum.parser>
- <fulcrum.security>2.0.0</fulcrum.security>
+ <fulcrum.security>2.0.1-SNAPSHOT</fulcrum.security>
+ <fulcrum.yaafi>1.0.8</fulcrum.yaafi>
<torque.version>5.0</torque.version>
+ <jackson2.version>2.12.3</jackson2.version>
<doclint>none</doclint>
- <docker.testcontainers.version>1.15.1</docker.testcontainers.version>
+ <docker.testcontainers.version>1.15.3</docker.testcontainers.version>
<jacoco.skip>true</jacoco.skip>
<argLine></argLine>
</properties>
Modified: turbine/core/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/changes/changes.xml?rev=1892011&r1=1892010&r2=1892011&view=diff
==============================================================================
--- turbine/core/trunk/src/changes/changes.xml (original)
+++ turbine/core/trunk/src/changes/changes.xml Wed Aug 4 08:35:47 2021
@@ -38,7 +38,7 @@
<action type="update" dev="tv">
Add reasonable hashCode(), equals() and toString() methods to
URIParam class
</action>
- <action type="update" dev="gk">
+ <action type="update" dev="gk">
Update testcontainers to 1.14.3, mysql 8.0.20,
use dbcp2 dsfactory, add velocity 2.1 default backwards props in test
props, update dependencies: commons-codec 1.15, comonsconfiguration2 2.7,
commons-lang3 3.11, commons-test 1.9, torque 5.0, docker testcontainer to
1.15.0-rc2 to be able to use junit jupiter 2.7.0
</action>
@@ -53,11 +53,7 @@
</action>
<action type="update" dev="painter">
Update turbine-parent 6 and fulcrum-parser 2.0.1
- </action>
- <action type="update" dev="tv">
- Add reasonable hashCode(), equals() and toString() methods to
URIParam class
- </action>
-
+ </action>
</release>
<release version="5.0" date="2019-05-28">
<action type="update" dev="tv">
Modified:
turbine/core/trunk/src/java/org/apache/turbine/om/security/DefaultUserImpl.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/om/security/DefaultUserImpl.java?rev=1892011&r1=1892010&r2=1892011&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/om/security/DefaultUserImpl.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/om/security/DefaultUserImpl.java
Wed Aug 4 08:35:47 2021
@@ -446,7 +446,7 @@ public class DefaultUserImpl implements
* @return A Map.
*/
@Override
- public Map<String, Object> getPermStorage()
+ public synchronized Map<String, Object> getPermStorage()
{
if (permStorage == null)
{
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/Log4j2Logger.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/Log4j2Logger.java?rev=1892011&r1=1892010&r2=1892011&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/Log4j2Logger.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/Log4j2Logger.java
Wed Aug 4 08:35:47 2021
@@ -23,8 +23,11 @@ import org.apache.logging.log4j.LogManag
/**
* A Log4J2 wrapper class for Logger.
*
+ * Use org.apache.fulcrum.yaafi.framework.logger.Log4j2Logger instead.
+ *
* @author <a href="mailto:[email protected]";>Thomas Vandahl</a>
*/
+@Deprecated
public final class Log4j2Logger
implements Logger
{
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineYaafiComponentService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineYaafiComponentService.java?rev=1892011&r1=1892010&r2=1892011&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineYaafiComponentService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/avaloncomponent/TurbineYaafiComponentService.java
Wed Aug 4 08:35:47 2021
@@ -252,7 +252,7 @@ public class TurbineYaafiComponentServic
}
/**
- * Create the Avalon logger to be passed to YAAFI
+ * Create the Avalon logger to be passed to YAAFI.
* @return an Avalon Logger
*/
protected Logger createAvalonLogger()
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/urlmapper/TurbineURLMapperService.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/urlmapper/TurbineURLMapperService.java?rev=1892011&r1=1892010&r2=1892011&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/urlmapper/TurbineURLMapperService.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/urlmapper/TurbineURLMapperService.java
Wed Aug 4 08:35:47 2021
@@ -204,6 +204,8 @@ public class TurbineURLMapperService
break;
}
}
+
+ log.debug("mapped to uri: {} ", uri);
}
/**
@@ -239,6 +241,8 @@ public class TurbineURLMapperService
// remove ignore parameters
urlMap.getIgnoreParameters().keySet().forEach(k ->
pp.remove(k));
+
+ log.debug("mapped {} params from url {} ",
pp.getKeys().length, url);
break;
}
