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/03/13 17:53:27 UTC
svn commit: r517769 - in
/cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl: ./
src/main/resources/COB-INF/ src/main/resources/COB-INF/system/
src/main/resources/META-INF/ src/main/resources/META-INF/cocoon/
src/main/resources/META-...
Author: gkossakowski
Date: Tue Mar 13 09:53:26 2007
New Revision: 517769
URL: http://svn.apache.org/viewvc?view=rev&rev=517769
Log:
COCOON-1992: Make Ajax resources loaded directly from cocoon-ajax-impl
Added:
cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/
cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/sitemap.xmap (with props)
cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/system/
cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/system/System.JSON.js
- copied unchanged from r517385, cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/system/System.JSON.js
cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/system/System.Upload.js
- copied unchanged from r517385, cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/system/System.Upload.js
cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/system/sitemap.xmap
- copied unchanged from r517385, cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/system/sitemap.xmap
cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/
cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/
cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/spring/
cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-impl-blockServlet.xml (with props)
Modified:
cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/pom.xml
cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/resources/manifest.js
Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/pom.xml?view=diff&rev=517769&r1=517768&r2=517769
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/pom.xml (original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/pom.xml Tue Mar 13 09:53:26 2007
@@ -40,6 +40,11 @@
<artifactId>cocoon-core</artifactId>
<version>2.2.0-RC1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-servlet-service-components</artifactId>
+ <version>1.0.0-RC1-SNAPSHOT</version>
+ </dependency>
</dependencies>
<distributionManagement>
Added: cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/sitemap.xmap?view=auto&rev=517769
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/sitemap.xmap (added)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/sitemap.xmap Tue Mar 13 09:53:26 2007
@@ -0,0 +1,36 @@
+<?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:$ -->
+
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
+ <map:pipelines>
+ <map:pipeline>
+
+ <map:match pattern="resources/dojo/**">
+ <map:read src="resource://org/apache/cocoon/dojo/resources/{1}"/>
+ </map:match>
+
+ <map:match pattern="resources/ajax/**">
+ <map:read src="resource://org/apache/cocoon/ajax/resources/{1}" type="servletLinkRewriter"/>
+ </map:match>
+
+ </map:pipeline>
+ </map:pipelines>
+</map:sitemap>
Propchange: cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/sitemap.xmap
------------------------------------------------------------------------------
svn:eol-style = native
Added: cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-impl-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-impl-blockServlet.xml?view=auto&rev=517769
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-impl-blockServlet.xml (added)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-impl-blockServlet.xml Tue Mar 13 09:53:26 2007
@@ -0,0 +1,32 @@
+<?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.ajax.impl.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-ajax-impl" context-path="blockcontext:/cocoon-ajax-impl/"/>
+ </bean>
+ <bean id="org.apache.cocoon.ajax.impl.system.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-ajax-impl/system" context-path="blockcontext:/cocoon-ajax-impl/system/"/>
+ </bean>
+</beans>
Propchange: cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-impl-blockServlet.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/resources/manifest.js
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/resources/manifest.js?view=diff&rev=517769&r1=517768&r2=517769
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/resources/manifest.js (original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/resources/manifest.js Tue Mar 13 09:53:26 2007
@@ -51,7 +51,7 @@
return map[domain][name];
}
- dojo.registerModulePath("cocoon.ajax", "../ajax/js");
+ dojo.registerModulePath("cocoon.ajax", "servlet:/resources/ajax/js");
dojo.registerNamespace("ajax", "cocoon.ajax", ajaxResolver);
})();