cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r568867 - in /cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main: java/org/apache/cocoon/components/ java/org/apache/cocoon/el/impl/jexl/ resources/META-INF/cocoon/spring/
Date Thu, 23 Aug 2007 07:45:59 GMT
Author: cziegeler
Date: Thu Aug 23 00:45:58 2007
New Revision: 568867

URL: http://svn.apache.org/viewvc?rev=568867&view=rev
Log:
Refactoring of expression language to use o.a.c.el package names (part 4)

Removed:
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/components/
Modified:
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/jexl/JexlExpression.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/DefaultExpressionFactory.xml
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/JXPathCompiler.xml
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/JavaScriptCompiler.xml
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/JexlCompiler.xml
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/RhinoScope.xml

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/jexl/JexlExpression.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/jexl/JexlExpression.java?rev=568867&r1=568866&r2=568867&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/jexl/JexlExpression.java
(original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/jexl/JexlExpression.java
Thu Aug 23 00:45:58 2007
@@ -20,7 +20,6 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.cocoon.components.expression.JSIntrospector;
 import org.apache.cocoon.objectmodel.ObjectModel;
 import org.apache.cocoon.el.ExpressionException;
 import org.apache.cocoon.el.impl.AbstractExpression;

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/DefaultExpressionFactory.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/DefaultExpressionFactory.xml?rev=568867&r1=568866&r2=568867&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/DefaultExpressionFactory.xml
(original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/DefaultExpressionFactory.xml
Thu Aug 23 00:45:58 2007
@@ -22,7 +22,7 @@
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
   http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd">
   
-  <bean id="org.apache.cocoon.el.ExpressionFactory" class="org.apache.cocoon.components.expression.DefaultExpressionFactory">
+  <bean id="org.apache.cocoon.el.ExpressionFactory" class="org.apache.cocoon.el.impl.DefaultExpressionFactory">
     <property name="expressionCompilers">
       <configurator:bean-map type="org.apache.cocoon.el.ExpressionCompiler"/>
     </property>

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/JXPathCompiler.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/JXPathCompiler.xml?rev=568867&r1=568866&r2=568867&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/JXPathCompiler.xml
(original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/JXPathCompiler.xml
Thu Aug 23 00:45:58 2007
@@ -20,11 +20,11 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-  <bean name="org.apache.cocoon.el.ExpressionCompiler/jxpath" class="org.apache.cocoon.components.expression.jxpath.JXPathCompiler"/>
+  <bean name="org.apache.cocoon.el.ExpressionCompiler/jxpath" class="org.apache.cocoon.el.impl.jxpath.JXPathCompiler"/>
   
   <!-- JXPath is our default language so second bean is defined
        FIXME: I think that it would be better to use alias for bean defined above, see:
        http://thread.gmane.org/gmane.text.xml.cocoon.devel/73907 -->
-  <bean name="org.apache.cocoon.el.ExpressionCompiler/default" class="org.apache.cocoon.components.expression.jxpath.JXPathCompiler"/>
+  <bean name="org.apache.cocoon.el.ExpressionCompiler/default" class="org.apache.cocoon.el.impl.jxpath.JXPathCompiler"/>
 
 </beans>

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/JavaScriptCompiler.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/JavaScriptCompiler.xml?rev=568867&r1=568866&r2=568867&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/JavaScriptCompiler.xml
(original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/JavaScriptCompiler.xml
Thu Aug 23 00:45:58 2007
@@ -21,7 +21,7 @@
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
   <bean name="org.apache.cocoon.el.ExpressionCompiler/js" 
-        class="org.apache.cocoon.components.expression.javascript.JavaScriptCompiler">
+        class="org.apache.cocoon.el.impl.javascript.JavaScriptCompiler">
     <property name="rootScope" ref="org.mozilla.javascript.Scriptable/rootScope"/>
   </bean>
 

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/JexlCompiler.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/JexlCompiler.xml?rev=568867&r1=568866&r2=568867&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/JexlCompiler.xml
(original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/JexlCompiler.xml
Thu Aug 23 00:45:58 2007
@@ -20,6 +20,6 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-  <bean name="org.apache.cocoon.el.ExpressionCompiler/jexl" class="org.apache.cocoon.components.expression.jexl.JexlCompiler"/>
+  <bean name="org.apache.cocoon.el.ExpressionCompiler/jexl" class="org.apache.cocoon.el.impl.jexl.JexlCompiler"/>
 
 </beans>

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/RhinoScope.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/RhinoScope.xml?rev=568867&r1=568866&r2=568867&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/RhinoScope.xml
(original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/RhinoScope.xml
Thu Aug 23 00:45:58 2007
@@ -15,7 +15,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!-- SVN $Id: $ -->
+<!-- SVN $Id$ -->
 <beans xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:configurator="http://cocoon.apache.org/schema/configurator"
@@ -23,7 +23,7 @@
   http://cocoon.apache.org/schema/configurator http://cocoon.apache.org/schema/configurator/cocoon-configurator-1.0.1.xsd">
   
   <bean name="org.mozilla.javascript.Scriptable/rootScope" 
-        class="org.apache.cocoon.components.expression.helpers.RhinoScopeFactory" factory-method="createRhinoScope">
+        class="org.apache.cocoon.el.impl.helpers.RhinoScopeFactory" factory-method="createRhinoScope">
   </bean>
   
 </beans>



Mime
View raw message