svn commit: r543988 - in /roller/branches/roller_guice/components/core: build.xml src/java/org/apache/roller/RollerException.java src/java/org/apache/roller/business/

[snoopdave]

Author: snoopdave
Date: Sun Jun  3 13:56:49 2007
New Revision: 543988

URL: http://svn.apache.org/viewvc?view=rev&rev=543988
Log:
Merging from trunk

Removed:
    
roller/branches/roller_guice/components/core/src/java/org/apache/roller/business/
Modified:
    roller/branches/roller_guice/components/core/build.xml
    
roller/branches/roller_guice/components/core/src/java/org/apache/roller/RollerException.java

Modified: roller/branches/roller_guice/components/core/build.xml
URL: 
http://svn.apache.org/viewvc/roller/branches/roller_guice/components/core/build.xml?view=diff&rev=543988&r1=543987&r2=543988
==============================================================================
--- roller/branches/roller_guice/components/core/build.xml (original)
+++ roller/branches/roller_guice/components/core/build.xml Sun Jun  3 13:56:49 
2007
@@ -35,36 +35,7 @@
     <property name="build.lib"              value="${build}/lib"/>
     
     <fileset id="core-jars" dir="${tools}">
-        <!-- General dependencies -->
-        <include name="lib/jdom.jar"/>
-        <include name="lib/commons-codec-1.3.jar"/>
-        <include name="lib/log4j-1.2.11.jar"/>
-        <include name="lib/jaxen-full.jar"/>
-        <include name="lib/saxpath.jar"/>
-        <include name="lib/commons-lang-2.1.jar"/>
-        <include name="lib/commons-logging-1.0.4.jar"/>
-        <include name="struts-2.0.5/lib/antlr-2.7.2.jar"/>
-        <include name="struts-1.2.4/lib/commons-fileupload.jar"/>
-        <include name="struts-1.2.4/lib/commons-validator.jar"/>
-        <include name="struts-1.2.4/lib/commons-collections.jar"/>
         <include name="lib/commons-id-0.1-SNAPSHOT.jar"/>
-        <include name="buildtime/activation.jar"/>
-        <include name="buildtime/mail.jar"/>
-        
-        <!-- needed for Hibernate -->
-        <include name="hibernate-3.1/hibernate3.jar"/>
-        <include name="hibernate-3.1/lib/antlr.jar"/>
-        <include name="hibernate-3.1/lib/asm.jar"/>
-        <include name="hibernate-3.1/lib/asm-attrs.jar"/>
-        <include name="hibernate-3.1/lib/cglib-2.1.3.jar"/>
-        <include name="hibernate-3.1/lib/ehcache-1.1.jar"/>
-        <include name="hibernate-3.1/lib/dom4j-1.6.1.jar"/>
-        <include name="hibernate-3.1/lib/jta.jar"/>
-        <include name="hibernate-3.1/lib/jdbc2_0-stdext.jar"/>
-
-        <!-- needed for JPA -->
-        <include name="openjpa-0.9.7/*.jar" />
-
     </fileset>
     
     <path id="core.path">

Modified: 
roller/branches/roller_guice/components/core/src/java/org/apache/roller/RollerException.java
URL: 
http://svn.apache.org/viewvc/roller/branches/roller_guice/components/core/src/java/org/apache/roller/RollerException.java?view=diff&rev=543988&r1=543987&r2=543988
==============================================================================
--- 
roller/branches/roller_guice/components/core/src/java/org/apache/roller/RollerException.java
 (original)
+++ 
roller/branches/roller_guice/components/core/src/java/org/apache/roller/RollerException.java
 Sun Jun  3 13:56:49 2007
@@ -25,9 +25,9 @@
 /**
  * Base Roller exception class.
  */
-public class RollerException extends Exception {
+public abstract class RollerException extends Exception {
     
-    private Throwable mRootCause = null;
+    private final Throwable mRootCause;
     
     
     /**
@@ -35,6 +35,7 @@
      */
     public RollerException() {
         super();
+        mRootCause = null;
     }
     
     
@@ -44,6 +45,7 @@
      */
     public RollerException(String s) {
         super(s);
+        mRootCause = null;
     }