cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gkossakow...@apache.org
Subject svn commit: r565592 - in /cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl: ./ src/main/java/org/apache/cocoon/objectmodel/ src/main/java/org/apache/cocoon/objectmodel/helper/ src/main/java/org/apache/cocoon/objectmodel/provider/ src/main/java/org/...
Date Tue, 14 Aug 2007 00:51:32 GMT
Author: gkossakowski
Date: Mon Aug 13 17:51:31 2007
New Revision: 565592

URL: http://svn.apache.org/viewvc?view=rev&rev=565592
Log:
* Moved CocoonEntryObjectModelProvider and FOMTestCase from cocoon-expression-language-impl
to cocoon-sitemap-impl. Following Daniel's suggestion here.
* Adapted other test cases configuration.
* Moved NamespacesTablePointer to the cocoon-expression-language-impl module as it seems to
be used only there.
* cleaned up dependencies

Added:
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/objectmodel/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/objectmodel/helper/
      - copied from r565558, cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/helper/
    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/objectmodel/provider/CocoonEntryObjectModelProvider.java
      - copied unchanged from r565558, cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/CocoonEntryObjectModelProvider.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/CocoonEntryObjectModelProvider.xml
  (with props)
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/test/java/org/apache/cocoon/environment/FOMTestCase.java
      - copied unchanged from r565558, cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/environment/FOMTestCase.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/test/resources/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/test/resources/org/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/test/resources/org/apache/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/test/resources/org/apache/cocoon/
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/test/resources/org/apache/cocoon/environment/
      - copied from r565558, cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/resources/org/apache/cocoon/environment/
Removed:
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/util/jxpath/NamespacesTablePointer.java
Modified:
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml?view=diff&rev=565592&r1=565591&r2=565592
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/pom.xml Mon Aug 13 17:51:31 2007
@@ -78,6 +78,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-expression-language-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
       <version>1.0.0</version>
     </dependency>

Added: 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?view=auto&rev=565592
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/CocoonEntryObjectModelProvider.xml
(added)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/CocoonEntryObjectModelProvider.xml
Mon Aug 13 17:51:31 2007
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- SVN $Id$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       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">
+
+    <!-- ObjectModelEntry provider for 'cocoon' -->
+    <bean name="org.apache.cocoon.objectmodel.provider.CocoonEntryObjectModelProvider"
+          class="org.apache.cocoon.objectmodel.provider.CocoonEntryObjectModelProvider">
+        <property name="settings" ref="org.apache.cocoon.configuration.Settings"/>
+        <property name="processInfoProvider" ref="org.apache.cocoon.processing.ProcessInfoProvider"/>
+    </bean>
+
+</beans>
\ No newline at end of file

Propchange: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/CocoonEntryObjectModelProvider.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/CocoonEntryObjectModelProvider.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/resources/META-INF/cocoon/spring/CocoonEntryObjectModelProvider.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message