velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r998264 [2/2] - in /velocity/sandbox/maven-reorg/engine/trunk: ./ src/changes/ velocity-engine-commons-logging/src/main/java/ velocity-engine-commons-logging/src/main/java/org/apache/velocity/runtime/log/ velocity-engine-commons-logging/src...
Date Fri, 17 Sep 2010 19:13:03 GMT
Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler2.java
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler2.java?rev=998264&r1=998263&r2=998264&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler2.java
(original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/eventhandler/Handler2.java
Fri Sep 17 19:13:02 2010
@@ -46,7 +46,7 @@ public class Handler2
     /**
      * print the exception
      */
-    public Object methodException(Class claz, String method, Exception e) throws Exception
+    public Object methodException(Class claz, String method, Exception e)
     {
         return "Exception: " + e;
     }

Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingEventHandler.java
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingEventHandler.java?rev=998264&r1=998263&r2=998264&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingEventHandler.java
(original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/ExceptionGeneratingEventHandler.java
Fri Sep 17 19:13:02 2010
@@ -40,7 +40,7 @@ public class ExceptionGeneratingEventHan
         throw new RuntimeException("exception");
     }
 
-    public Object methodException(Class claz, String method, Exception e) throws Exception
+    public Object methodException(Class claz, String method, Exception e)
     {
         throw new RuntimeException("exception");
     }

Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestLogChute.java
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestLogChute.java?rev=998264&r1=998263&r2=998264&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestLogChute.java
(original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/misc/TestLogChute.java
Fri Sep 17 19:13:02 2010
@@ -57,7 +57,6 @@ public class TestLogChute extends System
     }
     
     public void init(RuntimeServices rs)
-        throws Exception
     {
         super.init(rs);
 

Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/EventExample.java
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/EventExample.java?rev=998264&r1=998263&r2=998264&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/EventExample.java
(original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-examples/src/main/java/org/apache/velocity/example/EventExample.java
Fri Sep 17 19:13:02 2010
@@ -279,9 +279,7 @@ public class EventExample implements Ref
         return true;
     }
 
-    public Object methodException( Class claz, String method, Exception e )
-         throws Exception
-    {
+    public Object methodException( Class claz, String method, Exception e )   {
         /*
          *  only do processing if the switch is on
          */
@@ -291,7 +289,7 @@ public class EventExample implements Ref
             return "Hello from the methodException() event handler method.";
         }
 
-        throw e;
+        throw new RuntimeException(e);
     }
 
 	/**

Propchange: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-log4j/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Sep 17 19:13:02 2010
@@ -0,0 +1,3 @@
+/velocity/engine/branches/2.0_Exp/src/java:991637-995742
+/velocity/engine/branches/2.0_Exp/velocity-engine-log4j/src/main/java:958513,991637-995742
+/velocity/engine/trunk/velocity-engine-log4j/src/main/java:992133

Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-log4j/src/main/java/org/apache/velocity/runtime/log/Log4JLogChute.java
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-log4j/src/main/java/org/apache/velocity/runtime/log/Log4JLogChute.java?rev=998264&r1=998263&r2=998264&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-log4j/src/main/java/org/apache/velocity/runtime/log/Log4JLogChute.java
(original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-log4j/src/main/java/org/apache/velocity/runtime/log/Log4JLogChute.java
Fri Sep 17 19:13:02 2010
@@ -25,9 +25,9 @@ import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PatternLayout;
 import org.apache.log4j.RollingFileAppender;
+import org.apache.velocity.exception.VelocityException;
 import org.apache.velocity.runtime.RuntimeConstants;
 import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.util.ExceptionUtils;
 
 /**
  * Implementation of a simple log4j system that will either latch onto
@@ -59,7 +59,7 @@ public class Log4JLogChute implements Lo
     /**
      * @see org.apache.velocity.runtime.log.LogChute#init(org.apache.velocity.runtime.RuntimeServices)
      */
-    public void init(RuntimeServices rs) throws Exception
+    public void init(RuntimeServices rs)
     {
         rsvc = rs;
 
@@ -109,7 +109,7 @@ public class Log4JLogChute implements Lo
     }
 
     // This tries to create a file appender for the specified file name.
-    private void initAppender(String file) throws Exception
+    private void initAppender(String file)
     {
         try
         {
@@ -130,7 +130,7 @@ public class Log4JLogChute implements Lo
         catch (IOException ioe)
         {
             rsvc.getLog().error("Could not create file appender '"+file+'\'', ioe);
-            throw ExceptionUtils.createRuntimeException("Error configuring Log4JLogChute
: ", ioe);
+            throw new VelocityException("Error configuring Log4JLogChute : ", ioe);
         }
     }
 

Propchange: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/src/main/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Sep 17 19:13:02 2010
@@ -0,0 +1,3 @@
+/velocity/engine/branches/2.0_Exp/src/java:991637-995742
+/velocity/engine/branches/2.0_Exp/velocity-engine-servlet/src/main/java:958513,991637-995742
+/velocity/engine/trunk/velocity-engine-servlet/src/main/java:992133

Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/src/main/java/org/apache/velocity/runtime/log/ServletLogChute.java
URL: http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/src/main/java/org/apache/velocity/runtime/log/ServletLogChute.java?rev=998264&r1=998263&r2=998264&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/src/main/java/org/apache/velocity/runtime/log/ServletLogChute.java
(original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine-servlet/src/main/java/org/apache/velocity/runtime/log/ServletLogChute.java
Fri Sep 17 19:13:02 2010
@@ -65,7 +65,7 @@ public class ServletLogChute implements 
      * @throws IllegalStateException if the ServletContext is not available
      *         in the application attributes under the appropriate key.
      */
-    public void init(RuntimeServices rs) throws Exception
+    public void init(RuntimeServices rs)
     {
         Object obj = rs.getApplicationAttribute(ServletContext.class.getName());
         if (obj == null)



Mime
View raw message