cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gkossakow...@apache.org
Subject svn commit: r565586 - in /cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl: ./ src/main/java/org/apache/cocoon/objectmodel/provider/ src/main/java/org/apache/cocoon/util/ src/main/java/org/apache/cocoon/util/jxpath/ src/main...
Date Tue, 14 Aug 2007 00:41:46 GMT
Author: gkossakowski
Date: Mon Aug 13 17:41:45 2007
New Revision: 565586

URL: http://svn.apache.org/viewvc?view=rev&rev=565586
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-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/util/
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/util/jxpath/
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/util/jxpath/NamespacesTablePointer.java
      - copied unchanged from r565558, cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/util/jxpath/NamespacesTablePointer.java
Removed:
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/java/org/apache/cocoon/objectmodel/provider/CocoonEntryObjectModelProvider.java
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/test/java/org/apache/cocoon/environment/FOMTestCase.java
Modified:
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/pom.xml
    cocoon/trunk/core/cocoon-expression-language/cocoon-expression-language-impl/src/main/resources/META-INF/cocoon/spring/ObjectModelProviders.xml

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=565586&r1=565585&r2=565586
==============================================================================
--- 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 Mon
Aug 13 17:41:45 2007
@@ -65,16 +65,6 @@
       <artifactId>cocoon-pipeline-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-sitemap-impl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-sitemap-impl</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>
@@ -98,12 +88,6 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
       <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-core</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

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?view=diff&rev=565586&r1=565585&r2=565586
==============================================================================
--- 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
Mon Aug 13 17:41:45 2007
@@ -15,17 +15,10 @@
   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"
        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>
     
     <!-- ObjectModelEntry provider for 'Packages' -->
     <bean name="org.apache.cocoon.objectmodel.provider.PackagesEntryObjectModelProvider"



Mime
View raw message