cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r568913 - in /cocoon/trunk: blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/flow/javascript/ blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/ blocks/cocoon-javaflow/cocoo...
Date Thu, 23 Aug 2007 10:00:14 GMT
Author: cziegeler
Date: Thu Aug 23 03:00:13 2007
New Revision: 568913

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

Added:
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/el/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/el/impl/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/
      - copied from r568909, cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/objectmodel/provider/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/CocoonEntryObjectModelProvider.java
      - copied, changed from r568912, cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/objectmodel/provider/CocoonEntryObjectModelProvider.java
Removed:
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/java/org/apache/cocoon/components/expression/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/objectmodel/provider/
Modified:
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/flow/javascript/Form.js
    cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.java
    cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/components/flow/java/AbstractContinuable.java
    cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/forms/flow/java/FormInstance.java
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.spring.xml
    cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.spring.xml
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/JavaEntryObjectModelProvider.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/ObjectModelImpl.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/PackagesEntryObjectModelProvider.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelProviders.xml
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelTemplate.xml
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/resources/META-INF/cocoon/spring/ObjectModel.xml
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/CocoonEntryObjectModelProvider.xml
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/StringTemplateParserVariableResolver.xml
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/test/resources/org/apache/cocoon/environment/FOMTestCase.spring.xml

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/flow/javascript/Form.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/flow/javascript/Form.js?rev=568913&r1=568912&r2=568913&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/flow/javascript/Form.js
(original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/flow/javascript/Form.js
Thu Aug 23 03:00:13 2007
@@ -130,7 +130,7 @@
     // (the same is done by cocoon.sendPage())
     // FIXME : hack needed because FOM doesn't provide access to the object model
     var objectModel = org.apache.cocoon.components.ContextHelper.getObjectModel(this.avalonContext);
-    var newObjectModel = cocoon.getComponent(org.apache.cocoon.objectmodel.ObjectModel.ROLE);
+    var newObjectModel = cocoon.getComponent(org.apache.cocoon.el.objectmodel.ObjectModel.ROLE);
     org.apache.cocoon.components.flow.FlowHelper.setContextObject(objectModel, newObjectModel,
viewdata);
 
     if (this.restoreHook) {
@@ -198,7 +198,7 @@
         // (the same is done by cocoon.sendPage())
         // FIXME : hack needed because FOM doesn't provide access to the object model
         var objectModel = org.apache.cocoon.components.ContextHelper.getObjectModel(this.avalonContext);
-        var newObjectModel = cocoon.getComponent(org.apache.cocoon.objectmodel.ObjectModel.ROLE);
+        var newObjectModel = cocoon.getComponent(org.apache.cocoon.el.objectmodel.ObjectModel.ROLE);
         org.apache.cocoon.components.flow.FlowHelper.setContextObject(objectModel, newObjectModel,
viewdata);
 
         finished = this.form.process(formContext);

Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.java?rev=568913&r1=568912&r2=568913&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.java
(original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/test/java/org/apache/cocoon/forms/datatype/FlowJXPathSelectionListTestCase.java
Thu Aug 23 03:00:13 2007
@@ -31,8 +31,8 @@
 import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.environment.mock.MockRequest;
 import org.apache.cocoon.forms.FormsConstants;
-import org.apache.cocoon.objectmodel.ObjectModel;
-import org.apache.cocoon.objectmodel.ObjectModelImpl;
+import org.apache.cocoon.el.objectmodel.ObjectModel;
+import org.apache.cocoon.el.impl.objectmodel.ObjectModelImpl;
 import org.apache.cocoon.xml.dom.DOMBuilder;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.impl.ResourceSource;

Modified: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/components/flow/java/AbstractContinuable.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/components/flow/java/AbstractContinuable.java?rev=568913&r1=568912&r2=568913&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/components/flow/java/AbstractContinuable.java
(original)
+++ cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/components/flow/java/AbstractContinuable.java
Thu Aug 23 03:00:13 2007
@@ -26,7 +26,7 @@
 import org.apache.cocoon.components.flow.FlowHelper;
 import org.apache.cocoon.components.flow.util.PipelineUtil;
 import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.objectmodel.ObjectModel;
+import org.apache.cocoon.el.objectmodel.ObjectModel;
 import org.apache.commons.javaflow.Continuation;
 import org.apache.excalibur.source.SourceUtil;
 

Modified: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/forms/flow/java/FormInstance.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/forms/flow/java/FormInstance.java?rev=568913&r1=568912&r2=568913&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/forms/flow/java/FormInstance.java
(original)
+++ cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-impl/src/main/java/org/apache/cocoon/forms/flow/java/FormInstance.java
Thu Aug 23 03:00:13 2007
@@ -29,7 +29,7 @@
 import org.apache.cocoon.forms.formmodel.Form;
 import org.apache.cocoon.forms.formmodel.Widget;
 import org.apache.cocoon.forms.transformation.FormsPipelineConfig;
-import org.apache.cocoon.objectmodel.ObjectModel;
+import org.apache.cocoon.el.objectmodel.ObjectModel;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceResolver;
 import org.w3c.dom.Element;

Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java?rev=568913&r1=568912&r2=568913&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java
(original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/template/JXTemplateGenerator.java
Thu Aug 23 03:00:13 2007
@@ -143,15 +143,15 @@
 
     public void performGeneration(Event startEvent, Event endEvent) throws SAXException {
         newObjectModel.markLocalContext();
-        
+
         newObjectModel.putAt(ObjectModel.PARAMETERS_PATH, new ParametersMap(parameters));
-        
+
         XMLConsumer consumer = new AttributeAwareXMLConsumerImpl(new RedundantNamespacesFilter(this.xmlConsumer));
         //not sure why this is needed
         newObjectModel.putAt("cocoon/consumer", consumer);
         Invoker.execute(consumer, this.newObjectModel, new ExecutionContext(this.definitions,
this.scriptManager,
                 this.manager), null, namespaces, startEvent, null);
-        
+
         newObjectModel.cleanupLocalContext();
     }
 

Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.spring.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.spring.xml?rev=568913&r1=568912&r2=568913&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.spring.xml
(original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/test/resources/org/apache/cocoon/template/jxtg/JXTemplateGeneratorTestCase.spring.xml
Thu Aug 23 03:00:13 2007
@@ -31,7 +31,7 @@
   <import resource="classpath:META-INF/cocoon/spring/LegacyStringTemplateParser.xml"/>
   <import resource="classpath:META-INF/cocoon/spring/ObjectModelTemplate.xml"/>
   
-  <bean name="org.apache.cocoon.objectmodel.ObjectModel" class="org.apache.cocoon.objectmodel.ObjectModelImpl"
-        parent="org.apache.cocoon.objectmodel.ObjectModel.template"/>
+  <bean name="org.apache.cocoon.el.objectmodel.ObjectModel" class="org.apache.cocoon.el.impl.objectmodel.ObjectModelImpl"
+        parent="org.apache.cocoon.el.objectmodel.ObjectModel.template"/>
   
 </beans>

Modified: cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.spring.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.spring.xml?rev=568913&r1=568912&r2=568913&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.spring.xml
(original)
+++ cocoon/trunk/core/cocoon-core/src/test/resources/org/apache/cocoon/components/treeprocessor/variables/PreparedVariableResolverTestCase.spring.xml
Thu Aug 23 03:00:13 2007
@@ -28,7 +28,7 @@
   <import resource="classpath:META-INF/cocoon/spring/RhinoScope.xml"/>
   <import resource="classpath:META-INF/cocoon/spring/ObjectModelTemplate.xml"/>
   
-  <bean name="org.apache.cocoon.objectmodel.ObjectModel" class="org.apache.cocoon.objectmodel.ObjectModelImpl"
-        parent="org.apache.cocoon.objectmodel.ObjectModel.template"/>
+  <bean name="org.apache.cocoon.el.objectmodel.ObjectModel" class="org.apache.cocoon.el.impl.objectmodel.ObjectModelImpl"
+        parent="org.apache.cocoon.el.objectmodel.ObjectModel.template"/>
   
 </beans>

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/JavaEntryObjectModelProvider.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/objectmodel/JavaEntryObjectModelProvider.java?rev=568913&r1=568912&r2=568913&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/JavaEntryObjectModelProvider.java
(original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/JavaEntryObjectModelProvider.java
Thu Aug 23 03:00:13 2007
@@ -1,18 +1,17 @@
 package org.apache.cocoon.el.impl.objectmodel;
 
-import org.apache.cocoon.el.impl.objectmodel.ObjectModelProvider;
-import org.apache.cocoon.el.impl.objectmodel.PackagesEntryObjectModelProvider;
+import org.apache.cocoon.el.objectmodel.ObjectModelProvider;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.ScriptableObject;
 
 /**
  * Adds java packages to {@link org.apache.cocoon.el.objectmodel.ObjectModel ObjectModel}.
Allows to construct java objects.
- * 
+ *
  * @see PackagesEntryObjectModelProvider
  */
 public class JavaEntryObjectModelProvider implements ObjectModelProvider {
-    
+
     private Scriptable rootScope;
 
     //FIXME: This method is duplicated in PackagesEntryObjectModelProvider

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/ObjectModelImpl.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/objectmodel/ObjectModelImpl.java?rev=568913&r1=568912&r2=568913&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/ObjectModelImpl.java
(original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/ObjectModelImpl.java
Thu Aug 23 03:00:13 2007
@@ -42,19 +42,19 @@
  */
 public class ObjectModelImpl extends AbstractMapDecorator implements ObjectModel {
     //FIXME: It seems that there is no easy way to reuse MuliValueMap
-    
+
     private static final String SEGMENT_SEPARATOR = "/";
-    
+
     private ArrayStack localContexts;
     private Map singleValueMap;
     private MultiMap multiValueMap;
     private MultiMap multiValueMapForLocated;
     private Map initialEntries = null;
-    
-    
+
+
     //FIXME: This is a temporary solution
     private boolean modified;
-    
+
     public ObjectModelImpl() {
         singleValueMap = new HashMap();
         //FIXME: Not sure if this makes sense
@@ -67,38 +67,38 @@
     }
 
     public static class StackReversedIteration extends ArrayStack {
-        
+
         public Iterator iterator() {
             return new ReverseListIterator(this);
         }
-        
+
         public ListIterator listIterator() {
             throw new UnsupportedOperationException();
         }
     }
-    
+
     public Object get(Object key) {
         //FIXME: This should be done more elegantly
         if ("this".equals(key))
             return this;
         return super.get(key);
     }
-    
+
     public MultiMap getAll() {
         return UnmodifiableMultiMap.decorate(multiValueMap);
     }
-    
+
     public Object put(Object key, Object value) {
         modified = true;
         if (!localContexts.empty())
             ((ArrayStack) localContexts.peek()).push(new DefaultKeyValue(key, value));
-        
+
         singleValueMap.put(key, value);
         multiValueMap.put(key, value);
-        
+
         return value;
     }
-    
+
     public void putAll(Map mapToCopy) {
         modified = true;
         if (!localContexts.empty()) {
@@ -108,11 +108,11 @@
                 entries.push(new DefaultKeyValue(key, mapToCopy.get(key)));
             }
         }
-        
+
         singleValueMap.putAll(mapToCopy);
         multiValueMap.putAll(mapToCopy);
     }
-    
+
     /**
      * Locates map at given path
      * @param path where Map can be found
@@ -122,7 +122,7 @@
     private Map locateMapAt(String path, boolean createIfNeeded) {
         if (path.lastIndexOf(SEGMENT_SEPARATOR) == -1)
             return this;
-        
+
         Map map = this;
         int segmentBegin = 0;
         int segmentEnd = path.indexOf(SEGMENT_SEPARATOR);
@@ -145,26 +145,26 @@
         }
         return map;
     }
-    
+
     public void putAt(String path, Object value) {
         if (path == null)
             throw new NullPointerException("Path cannot be null.");
         if (path.length() == 0)
             throw new IllegalArgumentException("Path cannot be empty");
-        
+
         Map map = locateMapAt(path, true);
         String key = path.substring(path.lastIndexOf(SEGMENT_SEPARATOR) + 1, path.length());
         if (!localContexts.empty())
             ((ArrayStack) localContexts.peek()).push(new PathValue(path, value));
         map.put(key, value);
     }
-    
+
     private void removeAt(String path, Object value) {
         if (path == null)
             throw new NullPointerException("Path cannot be null.");
         if (path.length() == 0)
             throw new IllegalArgumentException("Path cannot be empty");
-        
+
         Map map = locateMapAt(path, false);
         String key = path.substring(path.lastIndexOf(SEGMENT_SEPARATOR) + 1, path.length());
         if (map == null)
@@ -182,13 +182,13 @@
         ArrayStack removeEntries = (ArrayStack)localContexts.pop();
         while (!removeEntries.isEmpty()) {
             if (removeEntries.peek() instanceof PathValue) {
-                PathValue entry = (PathValue)removeEntries.pop(); 
+                PathValue entry = (PathValue)removeEntries.pop();
                 removeAt(entry.getPath(), entry.getValue());
             } else {
                 KeyValue entry = (KeyValue)removeEntries.pop();
                 Object key = entry.getKey();
                 Object value = entry.getValue();
-            
+
                 multiValueMap.remove(key, value);
                 if (multiValueMap.containsKey(key))
                     singleValueMap.put(key, ((StackReversedIteration)multiValueMap.get(key)).peek());
@@ -224,7 +224,7 @@
         if (contextObject == null)
             //nothing to do
             return;
-        
+
         final JXPathBeanInfo bi =
             JXPathIntrospector.getBeanInfo(contextObject.getClass());
         if (bi.isDynamic()) {
@@ -260,28 +260,28 @@
             }
         }
     }
-    
+
     private final class PathValue {
         private String path;
         private Object value;
-        
+
         public PathValue(String path, Object value) {
             this.path = path;
             this.value = value;
         }
-        
-        public String getPath() { 
-            return this.path; 
+
+        public String getPath() {
+            return this.path;
         };
-        
+
         public Object getValue() {
             return this.value;
         }
-        
+
     }
 
     /* (non-Javadoc)
-     * @see org.apache.cocoon.objectmodel.ObjectModel#setParent(org.apache.cocoon.objectmodel.ObjectModel)
+     * @see org.apache.cocoon.el.objectmodel.ObjectModel#setParent(org.apache.cocoon.el.objectmodel.ObjectModel)
      */
     public void setParent(ObjectModel parentObjectModel) {
         if (this.modified)
@@ -289,5 +289,5 @@
         singleValueMap.putAll(parentObjectModel);
         multiValueMap.putAll(parentObjectModel.getAll());
     };
-    
+
 }

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/PackagesEntryObjectModelProvider.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/objectmodel/PackagesEntryObjectModelProvider.java?rev=568913&r1=568912&r2=568913&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/PackagesEntryObjectModelProvider.java
(original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/PackagesEntryObjectModelProvider.java
Thu Aug 23 03:00:13 2007
@@ -1,7 +1,6 @@
 package org.apache.cocoon.el.impl.objectmodel;
 
-import org.apache.cocoon.el.impl.objectmodel.JavaEntryObjectModelProvider;
-import org.apache.cocoon.el.impl.objectmodel.ObjectModelProvider;
+import org.apache.cocoon.el.objectmodel.ObjectModelProvider;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.NativeJavaPackage;
 import org.mozilla.javascript.Scriptable;
@@ -9,11 +8,11 @@
 
 /**
  * Adds java packages to {@link org.apache.cocoon.el.objectmodel.ObjectModel ObjectModel}.
Allows to construct java objects.
- * 
+ *
  * @see JavaEntryObjectModelProvider
  */
 public class PackagesEntryObjectModelProvider implements ObjectModelProvider {
-    
+
     private Scriptable rootScope;
 
     //FIXME: This method is duplicated in JavaEntryObjectModelProvider

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelProviders.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelProviders.xml?rev=568913&r1=568912&r2=568913&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelProviders.xml
(original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelProviders.xml
Thu Aug 23 03:00:13 2007
@@ -21,14 +21,14 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
     
     <!-- ObjectModelEntry provider for 'Packages' -->
-    <bean name="org.apache.cocoon.objectmodel.provider.PackagesEntryObjectModelProvider"
-          class="org.apache.cocoon.objectmodel.provider.PackagesEntryObjectModelProvider">
+    <bean name="org.apache.cocoon.el.impl.objectmodel.PackagesEntryObjectModelProvider"
+          class="org.apache.cocoon.el.impl.objectmodel.PackagesEntryObjectModelProvider">
       <property name="rootScope" ref="org.mozilla.javascript.Scriptable/rootScope"/>
     </bean>
     
     <!-- ObjectModelEntry provider for 'java' -->
-    <bean name="org.apache.cocoon.objectmodel.provider.JavaEntryObjectModelProvider"
-          class="org.apache.cocoon.objectmodel.provider.JavaEntryObjectModelProvider">
+    <bean name="org.apache.cocoon.el.impl.objectmodel.JavaEntryObjectModelProvider"
+          class="org.apache.cocoon.el.impl.objectmodel.JavaEntryObjectModelProvider">
       <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/ObjectModelTemplate.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelTemplate.xml?rev=568913&r1=568912&r2=568913&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelTemplate.xml
(original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelTemplate.xml
Thu Aug 23 03:00:13 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:aop="http://www.springframework.org/schema/aop"
@@ -24,14 +24,14 @@
 
     <!-- Default implementation of ObjectModel interface. This bean definition, is a template
actually because it has
          abstract attribute set to "true". It enables Object Model to be defined as scoped
bean elsewhere. -->
-    <bean name="org.apache.cocoon.objectmodel.ObjectModel.template"
-          class="org.apache.cocoon.objectmodel.ObjectModelImpl"
+    <bean name="org.apache.cocoon.el.objectmodel.ObjectModel.template"
+          class="org.apache.cocoon.el.impl.objectmodel.ObjectModelImpl"
           abstract="true">
         <property name="initialEntries">
           <map>
-            <entry key="cocoon" value-ref="org.apache.cocoon.objectmodel.provider.CocoonEntryObjectModelProvider"/>
-            <entry key="Packages" value-ref="org.apache.cocoon.objectmodel.provider.PackagesEntryObjectModelProvider"/>
-            <entry key="java" value-ref="org.apache.cocoon.objectmodel.provider.JavaEntryObjectModelProvider"/>
+            <entry key="cocoon" value-ref="org.apache.cocoon.el.impl.objectmodel.CocoonEntryObjectModelProvider"/>
+            <entry key="Packages" value-ref="org.apache.cocoon.el.impl.objectmodel.PackagesEntryObjectModelProvider"/>
+            <entry key="java" value-ref="org.apache.cocoon.el.impl.objectmodel.JavaEntryObjectModelProvider"/>
           </map>
         </property>        
     </bean>

Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/resources/META-INF/cocoon/spring/ObjectModel.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/resources/META-INF/cocoon/spring/ObjectModel.xml?rev=568913&r1=568912&r2=568913&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/resources/META-INF/cocoon/spring/ObjectModel.xml
(original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/resources/META-INF/cocoon/spring/ObjectModel.xml
Thu Aug 23 03:00:13 2007
@@ -23,8 +23,8 @@
   http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
   
   <!-- Default implementation of ObjectModel interface in pipelineComponent scope. -->
-  <bean name="org.apache.cocoon.objectmodel.ObjectModel" class="org.apache.cocoon.objectmodel.ObjectModelImpl"

-        scope="pipelineComponent" parent="org.apache.cocoon.objectmodel.ObjectModel.template">
+  <bean name="org.apache.cocoon.el.objectmodel.ObjectModel" class="org.apache.cocoon.el.impl.objectmodel.ObjectModelImpl"

+        scope="pipelineComponent" parent="org.apache.cocoon.el.objectmodel.ObjectModel.template">
     <aop:scoped-proxy proxy-target-class="false"/>
   </bean>
   

Copied: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/CocoonEntryObjectModelProvider.java
(from r568912, cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/objectmodel/provider/CocoonEntryObjectModelProvider.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/CocoonEntryObjectModelProvider.java?p2=cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/CocoonEntryObjectModelProvider.java&p1=cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/objectmodel/provider/CocoonEntryObjectModelProvider.java&r1=568912&r2=568913&rev=568913&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/objectmodel/provider/CocoonEntryObjectModelProvider.java
(original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/CocoonEntryObjectModelProvider.java
Thu Aug 23 03:00:13 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.objectmodel.provider;
+package org.apache.cocoon.el.impl.objectmodel;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/CocoonEntryObjectModelProvider.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/CocoonEntryObjectModelProvider.xml?rev=568913&r1=568912&r2=568913&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/CocoonEntryObjectModelProvider.xml
(original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/CocoonEntryObjectModelProvider.xml
Thu Aug 23 03:00:13 2007
@@ -21,8 +21,8 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
     <!-- ObjectModelEntry provider for 'cocoon' -->
-    <bean name="org.apache.cocoon.objectmodel.provider.CocoonEntryObjectModelProvider"
-          class="org.apache.cocoon.objectmodel.provider.CocoonEntryObjectModelProvider">
+    <bean name="org.apache.cocoon.el.impl.objectmodel.CocoonEntryObjectModelProvider"
+          class="org.apache.cocoon.el.impl.objectmodel.CocoonEntryObjectModelProvider">
         <property name="settings" ref="org.apache.cocoon.configuration.Settings"/>
         <property name="processInfoProvider" ref="org.apache.cocoon.processing.ProcessInfoProvider"/>
     </bean>

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/StringTemplateParserVariableResolver.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/StringTemplateParserVariableResolver.xml?rev=568913&r1=568912&r2=568913&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/StringTemplateParserVariableResolver.xml
(original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/StringTemplateParserVariableResolver.xml
Thu Aug 23 03:00:13 2007
@@ -23,7 +23,7 @@
   <bean name="org.apache.cocoon.components.treeprocessor.variables.StringTemplateParserVariableResolver"
     class="org.apache.cocoon.components.treeprocessor.variables.StringTemplateParserVariableResolver"
scope="prototype">
     <property name="stringTemplateParser" ref="org.apache.cocoon.el.parsing.StringTemplateParser/legacySitemap"/>
-    <property name="objectModel" ref="org.apache.cocoon.objectmodel.ObjectModel"/>
+    <property name="objectModel" ref="org.apache.cocoon.el.objectmodel.ObjectModel"/>
   </bean>
   
 </beans>

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/test/resources/org/apache/cocoon/environment/FOMTestCase.spring.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/test/resources/org/apache/cocoon/environment/FOMTestCase.spring.xml?rev=568913&r1=568912&r2=568913&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/test/resources/org/apache/cocoon/environment/FOMTestCase.spring.xml
(original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/test/resources/org/apache/cocoon/environment/FOMTestCase.spring.xml
Thu Aug 23 03:00:13 2007
@@ -28,12 +28,12 @@
   <import resource="classpath:META-INF/cocoon/spring/RhinoScope.xml"/>
   
   <!-- Redefining this bean instead of importing because originally it is in "call" scope
-->
-  <bean name="org.apache.cocoon.objectmodel.ObjectModel" class="org.apache.cocoon.objectmodel.ObjectModelImpl">
+  <bean name="org.apache.cocoon.el.objectmodel.ObjectModel" class="org.apache.cocoon.el.impl.objectmodel.ObjectModelImpl">
     <property name="initialEntries">
       <map>
-        <entry key="cocoon" value-ref="org.apache.cocoon.objectmodel.provider.CocoonEntryObjectModelProvider"/>
-        <entry key="Packages" value-ref="org.apache.cocoon.objectmodel.provider.PackagesEntryObjectModelProvider"/>
-        <entry key="java" value-ref="org.apache.cocoon.objectmodel.provider.JavaEntryObjectModelProvider"/>
+        <entry key="cocoon" value-ref="org.apache.cocoon.el.impl.objectmodel.CocoonEntryObjectModelProvider"/>
+        <entry key="Packages" value-ref="org.apache.cocoon.el.impl.objectmodel.PackagesEntryObjectModelProvider"/>
+        <entry key="java" value-ref="org.apache.cocoon.el.impl.objectmodel.JavaEntryObjectModelProvider"/>
       </map>
     </property>        
   </bean>



Mime
View raw message