cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject svn commit: r448457 - in /cocoon/trunk/core: cocoon-blocks-fw/cocoon-blocks-fw-demo1/src/main/resources/META-INF/spring/ cocoon-blocks-fw/cocoon-blocks-fw-demo2/src/main/resources/META-INF/spring/ cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/or...
Date Thu, 21 Sep 2006 04:31:00 GMT
Author: crossley
Date: Wed Sep 20 21:30:59 2006
New Revision: 448457

URL: http://svn.apache.org/viewvc?view=rev&rev=448457
Log:
Fix DOS line-endings and svn:eol-style

Modified:
    cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo1/src/main/resources/META-INF/spring/cocoon-blocks-fw-demo1-blockServlet.xml
  (contents, props changed)
    cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo2/src/main/resources/META-INF/spring/cocoon-blocks-fw-demo2-blockServlet.xml
  (contents, props changed)
    cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/DispatcherServlet.java
  (contents, props changed)
    cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.handlers   (contents,
props changed)
    cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.schemas   (contents,
props changed)
    cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/avalon/avalon.xsd
  (contents, props changed)
    cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd
  (contents, props changed)

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo1/src/main/resources/META-INF/spring/cocoon-blocks-fw-demo1-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo1/src/main/resources/META-INF/spring/cocoon-blocks-fw-demo1-blockServlet.xml?view=diff&rev=448457&r1=448456&r2=448457
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo1/src/main/resources/META-INF/spring/cocoon-blocks-fw-demo1-blockServlet.xml
(original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo1/src/main/resources/META-INF/spring/cocoon-blocks-fw-demo1-blockServlet.xml
Wed Sep 20 21:30:59 2006
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2006 The Apache Software Foundation
-
-  Licensed 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.
--->
-
-<!-- @version $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.xsd">
-	<bean id="org.apache.cocoon.blocks.demo1.block" class="org.apache.cocoon.blocks.BlockServlet">
-		<property name="mountPath" value="/test1"/>
-		<property name="blockServletClass" value="org.apache.cocoon.blocks.demo1.DemoServlet"/>
-		<property name="properties">
-			<map>
-				<entry key="foo" value="baz"/>
-			</map>
-		</property>
-		<property name="connections">
-			<map>
-				<entry key="demo2" value-ref="org.apache.cocoon.blocks.demo1.block"/>
-			</map>
-		</property>
-	</bean>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2006 The Apache Software Foundation
+
+  Licensed 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.
+-->
+
+<!-- @version $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.xsd">
+	<bean id="org.apache.cocoon.blocks.demo1.block" class="org.apache.cocoon.blocks.BlockServlet">
+		<property name="mountPath" value="/test1"/>
+		<property name="blockServletClass" value="org.apache.cocoon.blocks.demo1.DemoServlet"/>
+		<property name="properties">
+			<map>
+				<entry key="foo" value="baz"/>
+			</map>
+		</property>
+		<property name="connections">
+			<map>
+				<entry key="demo2" value-ref="org.apache.cocoon.blocks.demo1.block"/>
+			</map>
+		</property>
+	</bean>
 </beans>

Propchange: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo1/src/main/resources/META-INF/spring/cocoon-blocks-fw-demo1-blockServlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo2/src/main/resources/META-INF/spring/cocoon-blocks-fw-demo2-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo2/src/main/resources/META-INF/spring/cocoon-blocks-fw-demo2-blockServlet.xml?view=diff&rev=448457&r1=448456&r2=448457
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo2/src/main/resources/META-INF/spring/cocoon-blocks-fw-demo2-blockServlet.xml
(original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo2/src/main/resources/META-INF/spring/cocoon-blocks-fw-demo2-blockServlet.xml
Wed Sep 20 21:30:59 2006
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2006 The Apache Software Foundation
-
-  Licensed 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.
--->
-
-<!-- @version $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.xsd">
-  <bean id="org.apache.cocoon.blocks.demo2.block" class="org.apache.cocoon.blocks.BlockServlet">
-    <property name="mountPath" value="/test2"/>
-    <property name="blockServletClass" value="org.apache.cocoon.blocks.demo2.DemoServlet"/>
-  </bean>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2006 The Apache Software Foundation
+
+  Licensed 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.
+-->
+
+<!-- @version $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.xsd">
+  <bean id="org.apache.cocoon.blocks.demo2.block" class="org.apache.cocoon.blocks.BlockServlet">
+    <property name="mountPath" value="/test2"/>
+    <property name="blockServletClass" value="org.apache.cocoon.blocks.demo2.DemoServlet"/>
+  </bean>
 </beans>

Propchange: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-demo2/src/main/resources/META-INF/spring/cocoon-blocks-fw-demo2-blockServlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/DispatcherServlet.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/DispatcherServlet.java?view=diff&rev=448457&r1=448456&r2=448457
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/DispatcherServlet.java
(original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/DispatcherServlet.java
Wed Sep 20 21:30:59 2006
@@ -1,89 +1,89 @@
-/*
- * Copyright 2006 The Apache Software Foundation.
- *
- * Licensed 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.
- */
-package org.apache.cocoon.blocks;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.DirectFieldAccessor;
-import org.springframework.beans.factory.BeanFactoryUtils;
-import org.springframework.beans.factory.ListableBeanFactory;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-
-/**
- * A servlet that dispatch to managed sevlets from the context Spring container.
- * It dispatch to servlets that has the property mountPath, and dispatches to the
- * servlet with the longest prefix of the request pathInfo.
- *
- * @version $Id$
- */
-public class DispatcherServlet
-    extends HttpServlet {
-
-    private static final String MOUNT_PATH = "mountPath";
-
-    /** All registered mountable servlets. */
-    private Map mountableServlets = new HashMap();
-
-    private ListableBeanFactory beanFactory;
- 
-    /* (non-Javadoc)
-     * @see javax.servlet.GenericServlet#init()
-     */
-    public void init() throws ServletException {
-        this.beanFactory =
-            WebApplicationContextUtils.getRequiredWebApplicationContext(this.getServletContext());
-        // the returned map contains the bean names as key and the beans as values
-        final Map servlets = 
-            BeanFactoryUtils.beansOfTypeIncludingAncestors(this.beanFactory, Servlet.class);
-        final Iterator i = servlets.values().iterator();
-        while ( i.hasNext() ) {
-            final Servlet servlet = (Servlet) i.next();
-            DirectFieldAccessor accessor = new DirectFieldAccessor(servlet);
-            if (accessor.isReadableProperty(MOUNT_PATH)) {
-                this.mountableServlets.put(accessor.getPropertyValue(MOUNT_PATH), servlet);
-            }
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServlet#service(javax.servlet.http.HttpServletRequest,
javax.servlet.http.HttpServletResponse)
-     */
-    protected void service(HttpServletRequest req, HttpServletResponse res) throws ServletException,
IOException {
-        String path = req.getPathInfo();
-        int index = path.length();
-        Servlet servlet = null;
-        while (servlet == null && index != -1) {
-            path = path.substring(0, index);
-            servlet = (Servlet) mountableServlets.get(path);
-            index = path.lastIndexOf('/');
-        }
-        if (servlet == null) {
-            throw new ServletException("No block for " + req.getPathInfo());
-        }
-        // FIXME: the request object should be modified so that pathInfo
-        // and the rest of the parts of the request uri are correct 
-        servlet.service(req, res);
-    }
-}
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+package org.apache.cocoon.blocks;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.servlet.Servlet;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.DirectFieldAccessor;
+import org.springframework.beans.factory.BeanFactoryUtils;
+import org.springframework.beans.factory.ListableBeanFactory;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+/**
+ * A servlet that dispatch to managed sevlets from the context Spring container.
+ * It dispatch to servlets that has the property mountPath, and dispatches to the
+ * servlet with the longest prefix of the request pathInfo.
+ *
+ * @version $Id$
+ */
+public class DispatcherServlet
+    extends HttpServlet {
+
+    private static final String MOUNT_PATH = "mountPath";
+
+    /** All registered mountable servlets. */
+    private Map mountableServlets = new HashMap();
+
+    private ListableBeanFactory beanFactory;
+ 
+    /* (non-Javadoc)
+     * @see javax.servlet.GenericServlet#init()
+     */
+    public void init() throws ServletException {
+        this.beanFactory =
+            WebApplicationContextUtils.getRequiredWebApplicationContext(this.getServletContext());
+        // the returned map contains the bean names as key and the beans as values
+        final Map servlets = 
+            BeanFactoryUtils.beansOfTypeIncludingAncestors(this.beanFactory, Servlet.class);
+        final Iterator i = servlets.values().iterator();
+        while ( i.hasNext() ) {
+            final Servlet servlet = (Servlet) i.next();
+            DirectFieldAccessor accessor = new DirectFieldAccessor(servlet);
+            if (accessor.isReadableProperty(MOUNT_PATH)) {
+                this.mountableServlets.put(accessor.getPropertyValue(MOUNT_PATH), servlet);
+            }
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see javax.servlet.http.HttpServlet#service(javax.servlet.http.HttpServletRequest,
javax.servlet.http.HttpServletResponse)
+     */
+    protected void service(HttpServletRequest req, HttpServletResponse res) throws ServletException,
IOException {
+        String path = req.getPathInfo();
+        int index = path.length();
+        Servlet servlet = null;
+        while (servlet == null && index != -1) {
+            path = path.substring(0, index);
+            servlet = (Servlet) mountableServlets.get(path);
+            index = path.lastIndexOf('/');
+        }
+        if (servlet == null) {
+            throw new ServletException("No block for " + req.getPathInfo());
+        }
+        // FIXME: the request object should be modified so that pathInfo
+        // and the rest of the parts of the request uri are correct 
+        servlet.service(req, res);
+    }
+}

Propchange: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/DispatcherServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.handlers
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.handlers?view=diff&rev=448457&r1=448456&r2=448457
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.handlers (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.handlers Wed Sep 20 21:30:59
2006
@@ -1,20 +1,20 @@
-#  Copyright 2005 The Apache Software Foundation
-#
-#  Licensed 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.
-#
-# This file contains the default settings for Cocoon.
-# You should NOT change this file directly. Create your own properties
-# file and put it in the sub directories for the mode you are running
-# Cocoon in.
-http\://org.apache.cocoon/core=org.apache.cocoon.core.container.spring.CocoonNamespaceHandler
-http\://org.apache.cocoon/avalon=org.apache.cocoon.core.container.spring.avalon.AvalonNamespaceHandler
+#  Copyright 2005 The Apache Software Foundation
+#
+#  Licensed 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.
+#
+# This file contains the default settings for Cocoon.
+# You should NOT change this file directly. Create your own properties
+# file and put it in the sub directories for the mode you are running
+# Cocoon in.
+http\://org.apache.cocoon/core=org.apache.cocoon.core.container.spring.CocoonNamespaceHandler
+http\://org.apache.cocoon/avalon=org.apache.cocoon.core.container.spring.avalon.AvalonNamespaceHandler

Propchange: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.handlers
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.schemas?view=diff&rev=448457&r1=448456&r2=448457
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.schemas (original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.schemas Wed Sep 20 21:30:59
2006
@@ -1,20 +1,20 @@
-#  Copyright 2005 The Apache Software Foundation
-#
-#  Licensed 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.
-#
-# This file contains the default settings for Cocoon.
-# You should NOT change this file directly. Create your own properties
-# file and put it in the sub directories for the mode you are running
-# Cocoon in.
-http\://org.apache.cocoon/core.xsd=org/apache/cocoon/core/container/spring/cocoon.xsd
-http\://org.apache.cocoon/avalon.xsd=org/apache/cocoon/core/container/spring/avalon/avalon.xsd
+#  Copyright 2005 The Apache Software Foundation
+#
+#  Licensed 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.
+#
+# This file contains the default settings for Cocoon.
+# You should NOT change this file directly. Create your own properties
+# file and put it in the sub directories for the mode you are running
+# Cocoon in.
+http\://org.apache.cocoon/core.xsd=org/apache/cocoon/core/container/spring/cocoon.xsd
+http\://org.apache.cocoon/avalon.xsd=org/apache/cocoon/core/container/spring/avalon/avalon.xsd

Propchange: cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.schemas
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/avalon/avalon.xsd
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/avalon/avalon.xsd?view=diff&rev=448457&r1=448456&r2=448457
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/avalon/avalon.xsd
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/avalon/avalon.xsd
Wed Sep 20 21:30:59 2006
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2006 The Apache Software Foundation
-
-  Licensed 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.
--->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        targetNamespace="http://org.apache.cocoon/avalon"
-        xmlns:tns="http://org.apache.cocoon/avalon">
+<!--
+  Copyright 2006 The Apache Software Foundation
+
+  Licensed 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.
+-->
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        targetNamespace="http://org.apache.cocoon/avalon"
+        xmlns:tns="http://org.apache.cocoon/avalon">
 
     <xsd:element name="avalon" type="tns:avalonType"/>
-    <xsd:element name="sitemap" type="tns:sitemapType"/>
+    <xsd:element name="sitemap" type="tns:sitemapType"/>
 
     <xsd:complexType name="avalonType">
-    	<xsd:attribute name="location" type="xsd:string"></xsd:attribute>
-    	<xsd:attribute name="loggingConfiguration" type="xsd:string" use="optional"></xsd:attribute>
+    	<xsd:attribute name="location" type="xsd:string"></xsd:attribute>
+    	<xsd:attribute name="loggingConfiguration" type="xsd:string" use="optional"></xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:complexType name="sitemapType">
+        <xsd:attribute name="location" type="xsd:string"></xsd:attribute>
+    	<xsd:attribute name="uriPrefix" type="xsd:string"></xsd:attribute>
     </xsd:complexType>
-
-    <xsd:complexType name="sitemapType">
-        <xsd:attribute name="location" type="xsd:string"></xsd:attribute>
-    	<xsd:attribute name="uriPrefix" type="xsd:string"></xsd:attribute>
-    </xsd:complexType>
 </xsd:schema>

Propchange: cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/avalon/avalon.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd?view=diff&rev=448457&r1=448456&r2=448457
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd
(original)
+++ cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd
Wed Sep 20 21:30:59 2006
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2006 The Apache Software Foundation
-
-  Licensed 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.
--->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="http://org.apache.cocoon/core"
-            xmlns:tns="http://org.apache.cocoon/core">
-
-    <xsd:element name="settings" type="tns:settingsType"/>
-
-    <xsd:complexType name="settingsType">
-    	<xsd:attribute name="processorClassName" type="xsd:string" use="optional"></xsd:attribute>
-    </xsd:complexType>
-
-    <xsd:element name="sitemap" type="tns:sitemapType"/>
-    <xsd:complexType name="sitemapType">
-         <xsd:attribute name="location" type="xsd:string" use="required"></xsd:attribute>
-    </xsd:complexType>
+<!--
+  Copyright 2006 The Apache Software Foundation
+
+  Licensed 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.
+-->
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            targetNamespace="http://org.apache.cocoon/core"
+            xmlns:tns="http://org.apache.cocoon/core">
+
+    <xsd:element name="settings" type="tns:settingsType"/>
+
+    <xsd:complexType name="settingsType">
+    	<xsd:attribute name="processorClassName" type="xsd:string" use="optional"></xsd:attribute>
+    </xsd:complexType>
+
+    <xsd:element name="sitemap" type="tns:sitemapType"/>
+    <xsd:complexType name="sitemapType">
+         <xsd:attribute name="location" type="xsd:string" use="required"></xsd:attribute>
+    </xsd:complexType>
 </xsd:schema>

Propchange: cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message