cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gkossakow...@apache.org
Subject svn commit: r552219 - in /cocoon/trunk: blocks/cocoon-template/cocoon-template-impl/ blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/ blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache...
Date Sat, 30 Jun 2007 22:26:08 GMT
Author: gkossakowski
Date: Sat Jun 30 15:26:03 2007
New Revision: 552219

URL: http://svn.apache.org/viewvc?view=rev&rev=552219
Log:
COCOON-2081: Moving expression language API and implementations to their own modules.

Added:
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-api/src/main/java/org/
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-api/src/main/java/org/apache/
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-api/src/main/java/org/apache/cocoon/
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-api/src/main/java/org/apache/cocoon/components/
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-api/src/main/java/org/apache/cocoon/components/expression/
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-api/src/main/java/org/apache/cocoon/components/expression/Expression.java
      - copied unchanged from r552111, cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/Expression.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-api/src/main/java/org/apache/cocoon/components/expression/ExpressionContext.java
      - copied unchanged from r552111, cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/ExpressionContext.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-api/src/main/java/org/apache/cocoon/components/expression/ExpressionException.java
      - copied, changed from r552111, cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/ExpressionException.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/components/
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/components/expression/
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/components/expression/AbstractExpression.java
      - copied unchanged from r552111, cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/AbstractExpression.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/components/expression/DefaultExpressionFactory.java
      - copied unchanged from r552111, cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/DefaultExpressionFactory.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/components/expression/ExpressionCompiler.java
      - copied unchanged from r552111, cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/ExpressionCompiler.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/components/expression/ExpressionFactory.java
      - copied unchanged from r552111, cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/ExpressionFactory.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/components/expression/javascript/
      - copied from r552111, cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/javascript/
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/components/expression/jexl/
      - copied from r552111, cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/jexl/
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/components/expression/jxpath/
      - copied from r552111, cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/jxpath/
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/environment/
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/template/environment/FlowObjectModelHelper.java
      - copied unchanged from r552111, cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/environment/FlowObjectModelHelper.java
Removed:
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/AbstractExpression.java
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/DefaultExpressionFactory.java
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/Expression.java
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/ExpressionCompiler.java
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/ExpressionContext.java
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/ExpressionException.java
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/ExpressionFactory.java
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/javascript/
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/jexl/
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/jxpath/
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/environment/FlowObjectModelHelper.java
Modified:
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-api/pom.xml
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/pom.xml

Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml?view=diff&rev=552219&r1=552218&r2=552219
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml Sat Jun 30 15:26:03 2007
@@ -55,6 +55,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-expression-language-impl</artifactId>
+      <version>1.0.0-M1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
       <type>test-jar</type>
       <scope>test</scope>

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-api/pom.xml?view=diff&rev=552219&r1=552218&r2=552219
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-api/pom.xml Sat
Jun 30 15:26:03 2007
@@ -52,5 +52,9 @@
   </distributionManagement>
 
   <dependencies>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-pipeline-impl</artifactId>
+     </dependency>
   </dependencies>
 </project>

Copied: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-api/src/main/java/org/apache/cocoon/components/expression/ExpressionException.java
(from r552111, cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/ExpressionException.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-api/src/main/java/org/apache/cocoon/components/expression/ExpressionException.java?view=diff&rev=552219&p1=cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/ExpressionException.java&r1=552111&p2=cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-api/src/main/java/org/apache/cocoon/components/expression/ExpressionException.java&r2=552219
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/ExpressionException.java
(original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-api/src/main/java/org/apache/cocoon/components/expression/ExpressionException.java
Sat Jun 30 15:26:03 2007
@@ -18,45 +18,22 @@
 
 import java.io.IOException;
 
-import org.apache.avalon.framework.CascadingThrowable;
-
 /**
  * @version $Id$
  */
-public class ExpressionException
-    extends IOException implements CascadingThrowable {
-
-    /**
-     * The Throwable that caused this exception to be thrown.
-     */
-    private final Throwable throwable;
-
-    /**
-     * Construct a new <code>ExpressionException</code> instance.
-     *
-     * @param message the detail message for this exception.
-     */
-    public ExpressionException(final String message) {
-        this(message, null);
-    }
+public class ExpressionException extends IOException {
 
     /**
-     * Construct a new <code>ExpressionException</code> instance.
-     *
-     * @param message the detail message for this exception.
-     * @param throwable the root cause of the exception.
+     * 
      */
-    public ExpressionException(final String message, final Throwable throwable) {
+    private static final long serialVersionUID = 1L;
+    
+    public ExpressionException(String message) {
         super(message);
-        this.throwable = throwable;
     }
     
-    /**
-     * Retrieve the cause of the exception.
-     *
-     * @return the cause.
-     */
-    public final Throwable getCause() {
-        return this.throwable;
+    public ExpressionException(String message, Throwable cause) {
+        super(message, cause);
     }
+
 }

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/pom.xml?view=diff&rev=552219&r1=552218&r2=552219
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/pom.xml Sat
Jun 30 15:26:03 2007
@@ -52,5 +52,14 @@
   </distributionManagement>
 
   <dependencies>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-expression-language-api</artifactId>
+      <version>1.0.0-M1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-flowscript-impl</artifactId>
+    </dependency>
   </dependencies>
 </project>



Mime
View raw message