cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r568909 - in /cocoon/trunk/core/cocoon-expression-language: cocoon-expression-language-api/src/main/java/org/apache/cocoon/objectmodel/ cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/ cocoon-expression-l...
Date Thu, 23 Aug 2007 09:43:59 GMT
Author: cziegeler
Date: Thu Aug 23 02:43:58 2007
New Revision: 568909

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

Added:
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/JavaEntryObjectModelProvider.java
      - copied, changed from r568906, cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/JavaEntryObjectModelProvider.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/ObjectModelImpl.java
      - copied, changed from r568906, cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/ObjectModelImpl.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/PackagesEntryObjectModelProvider.java
      - copied, changed from r568906, cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/PackagesEntryObjectModelProvider.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/UnmodifiableMultiMap.java
      - copied, changed from r568870, cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/UnmodifiableMultiMap.java
Removed:
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-api/src/main/java/org/apache/cocoon/objectmodel/
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/ObjectModelImpl.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/UnmodifiableMultiMap.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/JavaEntryObjectModelProvider.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/PackagesEntryObjectModelProvider.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/util/
Modified:
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/el/impl/DefaultExpressionFactoryTestCase.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/el/impl/javascript/JavaScriptTestCase.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/el/impl/jexl/JexlTestCase.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/el/impl/jxpath/JXPathTestCase.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/objectmodel/ObjectModelImplTestCase.java

Copied: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/JavaEntryObjectModelProvider.java
(from r568906, cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/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?p2=cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/JavaEntryObjectModelProvider.java&p1=cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/JavaEntryObjectModelProvider.java&r1=568906&r2=568909&rev=568909&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/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 02:43:58 2007
@@ -1,7 +1,7 @@
-package org.apache.cocoon.objectmodel.provider;
+package org.apache.cocoon.el.impl.objectmodel;
 
-import org.apache.cocoon.objectmodel.ObjectModelProvider;
-import org.apache.cocoon.objectmodel.PackagesEntryObjectModelProvider;
+import org.apache.cocoon.el.impl.objectmodel.ObjectModelProvider;
+import org.apache.cocoon.el.impl.objectmodel.PackagesEntryObjectModelProvider;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.ScriptableObject;

Copied: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/ObjectModelImpl.java
(from r568906, cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/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?p2=cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/ObjectModelImpl.java&p1=cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/ObjectModelImpl.java&r1=568906&r2=568909&rev=568909&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/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 02:43:58 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.objectmodel;
+package org.apache.cocoon.el.impl.objectmodel;
 
 import java.beans.PropertyDescriptor;
 import java.lang.reflect.Method;

Copied: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/PackagesEntryObjectModelProvider.java
(from r568906, cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/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?p2=cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/PackagesEntryObjectModelProvider.java&p1=cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/PackagesEntryObjectModelProvider.java&r1=568906&r2=568909&rev=568909&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/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 02:43:58 2007
@@ -1,7 +1,7 @@
-package org.apache.cocoon.objectmodel.provider;
+package org.apache.cocoon.el.impl.objectmodel;
 
-import org.apache.cocoon.objectmodel.JavaEntryObjectModelProvider;
-import org.apache.cocoon.objectmodel.ObjectModelProvider;
+import org.apache.cocoon.el.impl.objectmodel.JavaEntryObjectModelProvider;
+import org.apache.cocoon.el.impl.objectmodel.ObjectModelProvider;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.NativeJavaPackage;
 import org.mozilla.javascript.Scriptable;

Copied: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/UnmodifiableMultiMap.java
(from r568870, cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/UnmodifiableMultiMap.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/UnmodifiableMultiMap.java?p2=cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/UnmodifiableMultiMap.java&p1=cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/UnmodifiableMultiMap.java&r1=568870&r2=568909&rev=568909&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/UnmodifiableMultiMap.java
(original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/el/impl/objectmodel/UnmodifiableMultiMap.java
Thu Aug 23 02:43:58 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.objectmodel;
+package org.apache.cocoon.el.impl.objectmodel;
 
 import java.util.Collection;
 import java.util.Map;

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/el/impl/DefaultExpressionFactoryTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/el/impl/DefaultExpressionFactoryTestCase.java?rev=568909&r1=568908&r2=568909&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/el/impl/DefaultExpressionFactoryTestCase.java
(original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/el/impl/DefaultExpressionFactoryTestCase.java
Thu Aug 23 02:43:58 2007
@@ -27,7 +27,7 @@
 import org.apache.cocoon.el.impl.javascript.JavaScriptCompiler;
 import org.apache.cocoon.el.impl.jexl.JexlCompiler;
 import org.apache.cocoon.el.impl.jxpath.JXPathCompiler;
-import org.apache.cocoon.objectmodel.ObjectModelImpl;
+import org.apache.cocoon.el.impl.objectmodel.ObjectModelImpl;
 
 public class DefaultExpressionFactoryTestCase extends TestCase {
     

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/el/impl/javascript/JavaScriptTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/el/impl/javascript/JavaScriptTestCase.java?rev=568909&r1=568908&r2=568909&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/el/impl/javascript/JavaScriptTestCase.java
(original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/el/impl/javascript/JavaScriptTestCase.java
Thu Aug 23 02:43:58 2007
@@ -24,8 +24,8 @@
 import org.apache.cocoon.el.ExpressionException;
 import org.apache.cocoon.el.impl.helpers.RhinoScopeFactory;
 import org.apache.cocoon.el.impl.javascript.JavaScriptCompiler;
+import org.apache.cocoon.el.impl.objectmodel.ObjectModelImpl;
 import org.apache.cocoon.el.objectmodel.ObjectModel;
-import org.apache.cocoon.objectmodel.ObjectModelImpl;
 
 /**
  * @version $Id$

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/el/impl/jexl/JexlTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/el/impl/jexl/JexlTestCase.java?rev=568909&r1=568908&r2=568909&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/el/impl/jexl/JexlTestCase.java
(original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/el/impl/jexl/JexlTestCase.java
Thu Aug 23 02:43:58 2007
@@ -24,8 +24,8 @@
 import org.apache.cocoon.el.ExpressionCompiler;
 import org.apache.cocoon.el.ExpressionException;
 import org.apache.cocoon.el.impl.jexl.JexlCompiler;
+import org.apache.cocoon.el.impl.objectmodel.ObjectModelImpl;
 import org.apache.cocoon.el.objectmodel.ObjectModel;
-import org.apache.cocoon.objectmodel.ObjectModelImpl;
 
 public class JexlTestCase extends TestCase {
 

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/el/impl/jxpath/JXPathTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/el/impl/jxpath/JXPathTestCase.java?rev=568909&r1=568908&r2=568909&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/el/impl/jxpath/JXPathTestCase.java
(original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/el/impl/jxpath/JXPathTestCase.java
Thu Aug 23 02:43:58 2007
@@ -22,7 +22,7 @@
 import org.apache.cocoon.el.ExpressionCompiler;
 import org.apache.cocoon.el.ExpressionException;
 import org.apache.cocoon.el.impl.jxpath.JXPathCompiler;
-import org.apache.cocoon.objectmodel.ObjectModelImpl;
+import org.apache.cocoon.el.impl.objectmodel.ObjectModelImpl;
 
 public class JXPathTestCase extends TestCase {
 

Modified: cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/objectmodel/ObjectModelImplTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/objectmodel/ObjectModelImplTestCase.java?rev=568909&r1=568908&r2=568909&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/objectmodel/ObjectModelImplTestCase.java
(original)
+++ cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/objectmodel/ObjectModelImplTestCase.java
Thu Aug 23 02:43:58 2007
@@ -19,6 +19,7 @@
 import java.util.Collection;
 import java.util.Map;
 
+import org.apache.cocoon.el.impl.objectmodel.ObjectModelImpl;
 import org.apache.cocoon.el.objectmodel.ObjectModel;
 
 import junit.framework.TestCase;



Mime
View raw message