svn commit: r1828977 - in /turbine/core/trunk: README.txt src/java/org/apache/turbine/annotation/AnnotationProcessor.java src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java

[gk...@apache.org]

Author: gk
Date: Thu Apr 12 13:23:30 2018
New Revision: 1828977

URL: http://svn.apache.org/viewvc?rev=1828977&view=rev
Log:
- Update README.txt add more exact information concerning site generation
- add comments in code

Modified:
    turbine/core/trunk/README.txt
    turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java
    turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java

Modified: turbine/core/trunk/README.txt
URL: http://svn.apache.org/viewvc/turbine/core/trunk/README.txt?rev=1828977&r1=1828976&r2=1828977&view=diff
==============================================================================
--- turbine/core/trunk/README.txt (original)
+++ turbine/core/trunk/README.txt Thu Apr 12 13:23:30 2018
@@ -44,14 +44,17 @@ compile, run the unit tests, and build t
 
 mvn site   - generate the site documention
 
+- test site
+mvn site scm-publish:publish-scm -Dscmpublish.dryRun=true
+- deploy site
 mvn clean site scm-publish:publish-scm    - deploy 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)
 
 Find more about release related command hints in 
 - https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/README.txt
-- Update turbine.site.path in pom.xml to the new production path 
-(e.g. turbine/turbine-4.0 for version 4.0) BEFORE release and the new SNAPSHOT version to the new 
-development path (e.g. turbine/development/turbine-4.1 for version 4.1-SNAPSHOT) AFTER the release, 
-cft. the site structure https://svn.apache.org/repos/infra/websites/production/turbine/content/turbine/.
+- If major.minor changed, do update turbine.site.path in pom.xml to the new production path 
+(e.g. turbine/turbine-4.0 for version 4.0) removing also the "/development/"-part of the path BEFORE release.
+- if updating the site for the new SNAPSHOT version add the new development path (e.g. turbine/development/turbine-4.1 for version 4.1-SNAPSHOT) AFTER the release.
+- cft. the site structure 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

Modified: turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java?rev=1828977&r1=1828976&r2=1828977&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/annotation/AnnotationProcessor.java Thu Apr 12 13:23:30 2018
@@ -81,6 +81,7 @@ public class AnnotationProcessor
      * The method will return false if one of the annotations denies execution
      *
      * @param object the object
+     * @param acl
      * @return true if the execution is allowed
      */
     public static <A extends TurbineAccessControlList> boolean isAuthorized(AccessibleObject object, A acl)

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java?rev=1828977&r1=1828976&r2=1828977&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java Thu Apr 12 13:23:30 2018
@@ -254,7 +254,7 @@ public class DefaultTurbineRunData
 
         String charset = defaultCharSet;
 
-        if (StringUtils.isEmpty(charset))
+        if (StringUtils.isEmpty(charset)) // this might not occur actually, as a default is always set
         {
             log.debug("charset is empty!");
             /* Default charset isn't specified, get the locale specific one. */