You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gk...@apache.org on 2007/05/01 18:49:46 UTC
svn commit: r534153 [2/2] - in /cocoon/trunk/blocks/cocoon-forms:
cocoon-forms-impl/ cocoon-forms-impl/src/main/resources/COB-INF/
cocoon-forms-impl/src/main/resources/META-INF/cocoon/avalon/
cocoon-forms-impl/src/main/resources/META-INF/cocoon/spring/...
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/sitemap.xmap?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/sql/sitemap.xmap Tue May 1 09:49:43 2007
@@ -29,7 +29,7 @@
<map:transformer name="browser-update" src="org.apache.cocoon.ajax.BrowserUpdateTransformer"/>
<map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
<catalogues default="forms">
- <catalogue id="forms" name="messages" location="resource://org/apache/cocoon/forms/system/i18n"/>
+ <catalogue id="forms" name="messages" location="servlet:forms:/resource/internal/i18n"/>
</catalogues>
</map:transformer>
</map:transformers>
@@ -56,17 +56,6 @@
<map:call continuation="{request-param:continuation-id}"/>
</map:match>
- <!-- Static resource, read either locally or from the jars -->
- <map:match pattern="resources/*/**">
- <map:select type="resource-exists">
- <map:when test="{0}">
- <map:read src="{0}"/>
- </map:when>
- <map:otherwise>
- <map:read src="resource://org/apache/cocoon/{1}/resources/{2}"/>
- </map:otherwise>
- </map:select>
- </map:match>
</map:pipeline>
<!-- Internal URLs -->
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/swan/flow/swan.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/swan/flow/swan.js?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/swan/flow/swan.js (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/swan/flow/swan.js Tue May 1 09:49:43 2007
@@ -21,7 +21,7 @@
importPackage(org.apache.cocoon.forms.formmodel);
-cocoon.load("resource://org/apache/cocoon/forms/flow/javascript/Form.js");
+cocoon.load("servlet:forms:/resource/internal/flow/javascript/Form.js");
function binding_gui(form) {
editor_gui(form, "binding");
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/swan/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/swan/sitemap.xmap?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/swan/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/COB-INF/swan/sitemap.xmap Tue May 1 09:49:43 2007
@@ -24,7 +24,7 @@
<map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
<catalogues default="other">
<catalogue id="other" name="OtherMessages" location="messages"/>
- <catalogue id="forms" name="messages" location="resource://org/apache/cocoon/forms/system/i18n"/>
+ <catalogue id="forms" name="messages" location="servlet:forms:/resource/internal/i18n"/>
</catalogues>
</map:transformer>
</map:transformers>
@@ -113,10 +113,6 @@
<map:parameter name="file" value="forms/{1}_success_jx.xml"/>
</map:call>
<map:serialize/>
- </map:match>
-
- <map:match pattern="resources/*/**">
- <map:read src="resource://org/apache/cocoon/{1}/{2}"/>
</map:match>
<map:match pattern="swan/resources/**">
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-forms-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-forms-sample-blockServlet.xml?view=diff&rev=534153&r1=534152&r2=534153
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-forms-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-forms-sample-blockServlet.xml Tue May 1 09:49:43 2007
@@ -1,29 +1,34 @@
-<?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.
--->
-
-<!-- @version $Id$ -->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:servlet="http://cocoon.apache.org/schema/servlet"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
-
- <bean id="org.apache.cocoon.forms.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
- <servlet:context mount-path="/cocoon-forms-sample" context-path="blockcontext:/cocoon-forms-sample/"/>
- </bean>
+<?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.
+-->
+
+<!-- @version $Id$ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:servlet="http://cocoon.apache.org/schema/servlet"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
+
+ <bean id="org.apache.cocoon.forms.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-forms-sample" context-path="blockcontext:/cocoon-forms-sample/">
+ <servlet:connections>
+ <entry key="ajax" value-ref="org.apache.cocoon.ajax.impl.servlet"/>
+ <entry key="forms" value-ref="org.apache.cocoon.forms.impl.servlet"/>
+ </servlet:connections>
+ </servlet:context>
+ </bean>
</beans>
Propchange: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-forms-sample-blockServlet.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-sample/src/main/resources/META-INF/cocoon/spring/cocoon-forms-sample-blockServlet.xml
------------------------------------------------------------------------------
svn:keywords = Id