svn commit: r648147 - in /cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver: ./ pom.xml src/main/java/org/apache/cocoon/core/xml/resolver/CocoonSystemResolver.java

[re...@apache.org]

Author: reinhard
Date: Tue Apr 15 00:44:49 2008
New Revision: 648147

URL: http://svn.apache.org/viewvc?rev=648147&view=rev
Log:
. use the new DeploymentUtil class which is hosted by the SSF (for now)
. svn:ignore

Modified:
    cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/   (props changed)
    cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml
    cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/src/main/java/org/apache/cocoon/core/xml/resolver/CocoonSystemResolver.java

Propchange: cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Apr 15 00:44:49 2008
@@ -6,3 +6,5 @@
 .deployables
 build.properties
 .settings
+maven-eclipse.xml
+.externalToolBuilders

Modified: cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml?rev=648147&r1=648146&r2=648147&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml (original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/pom.xml Tue Apr 15 00:44:49 2008
@@ -21,7 +21,7 @@
     | @version $Id$
     +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  
+
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
   <parent>
@@ -36,24 +36,29 @@
   <description>
     The Cocoon system resolver component together with default enteties.
   </description>
-  <url>http://cocoon.apache.org/${docs.m.xml-resolver.relPath}</url>    
-  
+  <url>http://cocoon.apache.org/${docs.m.xml-resolver.relPath}</url>
+
   <properties>
-    <docs.name>${project.name}</docs.name>    
+    <docs.name>${project.name}</docs.name>
     <docs.version>${docs.m.xml-resolver.version}</docs.version>
-  </properties>  
-  
+  </properties>
+
   <distributionManagement>
     <site>
       <id>website</id>
       <url>${docs.deploymentBaseUrl}/${docs.m.xml-resolver.relPath}</url>
     </site>
   </distributionManagement>
-  
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-spring-configurator</artifactId>
+    </dependency>
+    <!-- Temporarily introduce a dependency on the SSF. (Later this should be replaced by a 'cocoon-block-deployment' reference.)-->
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-servlet-service-impl</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/src/main/java/org/apache/cocoon/core/xml/resolver/CocoonSystemResolver.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/src/main/java/org/apache/cocoon/core/xml/resolver/CocoonSystemResolver.java?rev=648147&r1=648146&r2=648147&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/src/main/java/org/apache/cocoon/core/xml/resolver/CocoonSystemResolver.java (original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/src/main/java/org/apache/cocoon/core/xml/resolver/CocoonSystemResolver.java Tue Apr 15 00:44:49 2008
@@ -18,12 +18,12 @@
 
 import java.io.File;
 
+import org.apache.cocoon.blockdeployment.DeploymentUtil;
 import org.apache.cocoon.configuration.Settings;
 import org.apache.cocoon.core.xml.impl.DefaultEntityResolver;
-import org.apache.cocoon.spring.configurator.impl.DeploymentUtil;
 
 /**
- * 
+ *
  * @version $Id$
  * @since 2.2
  */