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/04/13 20:43:39 UTC
svn commit: r528581 - in
/cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources:
COB-INF/sitemap.xmap org/apache/cocoon/ajax/resources/manifest.js
Author: gkossakowski
Date: Fri Apr 13 11:43:38 2007
New Revision: 528581
URL: http://svn.apache.org/viewvc?view=rev&rev=528581
Log:
Make Ajax follow convention on resource URLs discussed in this thread: http://thread.gmane.org/gmane.text.xml.cocoon.devel/71697
Modified:
cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/sitemap.xmap
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/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=diff&rev=528581&r1=528580&r2=528581
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/sitemap.xmap Fri Apr 13 11:43:38 2007
@@ -21,16 +21,18 @@
<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:pipeline id="external-resource">
+
+ <map:match pattern="resource/external/ajax/**.js">
+ <map:read src="resource://org/apache/cocoon/ajax/resources/{1}.js" type="servletLinkRewriter"/>
</map:match>
- <map:match pattern="resources/ajax/**">
- <map:read src="resource://org/apache/cocoon/ajax/resources/{1}" type="servletLinkRewriter"/>
+ <map:match pattern="resource/external/dojo/**">
+ <map:read src="resource://org/apache/cocoon/dojo/resources/{1}"/>
</map:match>
-
+
</map:pipeline>
+
</map:pipelines>
</map:sitemap>
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=528581&r1=528580&r2=528581
==============================================================================
--- 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 Fri Apr 13 11:43:38 2007
@@ -51,7 +51,7 @@
return map[domain][name];
}
- dojo.registerModulePath("cocoon.ajax", "servlet:/resources/ajax/js");
+ dojo.registerModulePath("cocoon.ajax", "servlet://resource/external/ajax/js");
dojo.registerNamespace("ajax", "cocoon.ajax", ajaxResolver);
})();