Author: gk
Date: Mon Nov 7 15:13:26 2016
New Revision: 1768528
URL: http://svn.apache.org/viewvc?rev=1768528&view=rev
Log:
- log thrown TurbineException in ClassMapper (eg. from AnnotationProcessor)
- update junit4patch.patch
- add links in how-to-help.xml
Modified:
turbine/core/trunk/pom.xml
turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java
turbine/core/trunk/xdocs/how-to-help.xml
Modified: turbine/core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1768528&r1=1768527&r2=1768528&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Mon Nov 7 15:13:26 2016
@@ -1022,7 +1022,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.11</version>
+ <version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java?rev=1768528&r1=1768527&r2=1768528&view=diff
==============================================================================
---
turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java
(original)
+++
turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ClassMapper.java
Mon Nov 7 15:13:26 2016
@@ -31,6 +31,7 @@ import org.apache.commons.logging.LogFac
import org.apache.turbine.modules.Assembler;
import org.apache.turbine.modules.Loader;
import org.apache.turbine.services.template.TemplateService;
+import org.apache.turbine.util.TurbineException;
/**
* This mapper tries to map Template names to class names. If no direct match
@@ -97,7 +98,8 @@ public class ClassMapper
* @param template The template name.
* @return A class name for the given template.
*/
- public String doMapping(String template)
+ @Override
+ public String doMapping(String template)
{
log.debug("doMapping(" + template + ")");
@@ -148,6 +150,10 @@ public class ClassMapper
log.debug("Found it, returning " + testName);
return testName.toString();
}
+ catch (TurbineException e)
+ {
+ log.error("Turbine Exception Class mapping ",e);
+ }
catch (Exception e)
{
// Not found. Go on.
Modified: turbine/core/trunk/xdocs/how-to-help.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/how-to-help.xml?rev=1768528&r1=1768527&r2=1768528&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/how-to-help.xml (original)
+++ turbine/core/trunk/xdocs/how-to-help.xml Mon Nov 7 15:13:26 2016
@@ -56,9 +56,9 @@
and attach the patch files (or new files).
</li>
<li>
- Mailing list - The archives of [email protected] and
- [email protected] are an excellent source of information
- for the project. Answering questions that are asked on the
mailing list
+ Mailing list - The archives of <a
href="https://lists.apache.org/[email protected]";>[email protected]</a>
and
+ <a
href="https://lists.apache.org/[email protected]";>[email protected]</a>
are an excellent source of information
+ for the project. Answering questions that are asked on the mailing
list
or simply posting information that might be of use to other
Turbine users
would be very welcome contribution to the project.
</li>
