cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gkossakow...@apache.org
Subject svn commit: r517779 - in /cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl: ./ src/main/resources/COB-INF/ src/main/resources/META-INF/cocoon/spring/ src/main/resources/org/apache/cocoon/forms/resources/ src/main/resources/org/ap...
Date Tue, 13 Mar 2007 17:11:09 GMT
Author: gkossakowski
Date: Tue Mar 13 10:11:07 2007
New Revision: 517779

URL: http://svn.apache.org/viewvc?view=rev&rev=517779
Log:
COCOON-1993: Make Forms resources loaded directly

Added:
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap
  (with props)
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/META-INF/cocoon/spring/
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/META-INF/cocoon/spring/cocoon-forms-impl-blockServlet.xml
  (with props)
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/manifest.js
  (with props)
Removed:
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/manifest.js
Modified:
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/pom.xml
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-htmlarea-styling.xsl
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-page-styling.xsl
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/DropdownDateTimePicker.js
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/InfoPopup.js
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/MultiValueEditor.js
    cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/templates/MultiValueEditor.html

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/pom.xml?view=diff&rev=517779&r1=517778&r2=517779
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/pom.xml (original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/pom.xml Tue Mar
13 10:11:07 2007
@@ -107,6 +107,11 @@
       <version>1.0.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>
+    <dependency>
       <groupId>org.outerj.daisy</groupId>
       <artifactId>daisy-htmlcleaner</artifactId>
       <version>1.4.1</version>

Added: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap?view=auto&rev=517779
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap
(added)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap
Tue Mar 13 10:11:07 2007
@@ -0,0 +1,44 @@
+<?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="system/i18n/*">
+      	<map:read src="resource://org/apache/cocoon/forms/system/i18n/{1}"/>
+      </map:match>
+    
+      <map:match pattern="system/**.xsl">
+      	<map:read src="resource://org/apache/cocoon/forms/resources/{1}.xsl"/>
+      </map:match>
+    
+      <map:match pattern="resources/forms/**.js">
+      	<map:read src="resource://org/apache/cocoon/forms/resources/{1}.js" type="servletLinkRewriter"/>
+      </map:match>
+    
+      <map:match pattern="resources/forms/**">
+      	<map:read src="resource://org/apache/cocoon/forms/resources/{1}"/>
+      </map:match>
+
+    </map:pipeline>
+  </map:pipelines>
+</map:sitemap>

Propchange: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/COB-INF/sitemap.xmap
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/META-INF/cocoon/spring/cocoon-forms-impl-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/META-INF/cocoon/spring/cocoon-forms-impl-blockServlet.xml?view=auto&rev=517779
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/META-INF/cocoon/spring/cocoon-forms-impl-blockServlet.xml
(added)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/META-INF/cocoon/spring/cocoon-forms-impl-blockServlet.xml
Tue Mar 13 10:11:07 2007
@@ -0,0 +1,33 @@
+<?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.impl.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+        <servlet:context mount-path="/cocoon-forms-impl" context-path="blockcontext:/cocoon-forms-impl/">
+   			<servlet:connections>
+				<entry key="ajax" value-ref="org.apache.cocoon.ajax.impl.servlet"/>
+			</servlet:connections>
+        </servlet:context>
+    </bean>
+</beans>

Propchange: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/META-INF/cocoon/spring/cocoon-forms-impl-blockServlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/META-INF/cocoon/spring/cocoon-forms-impl-blockServlet.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl?view=diff&rev=517779&r1=517778&r2=517779
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-advanced-field-styling.xsl
Tue Mar 13 10:11:07 2007
@@ -29,13 +29,15 @@
   <xsl:import href="resource://org/apache/cocoon/forms/resources/forms-field-styling.xsl"/>
   <xsl:include href="resource://org/apache/cocoon/forms/resources/forms-calendar-styling.xsl"/>
   <xsl:include href="resource://org/apache/cocoon/forms/resources/forms-htmlarea-styling.xsl"/>
+  
+  <xsl:param name="forms-resources">servlet:forms:/resources/forms</xsl:param>
 
   <xsl:template match="head" mode="forms-field">
     <xsl:apply-imports/>
-    <script src="{$resources-uri}/forms/mattkruse-lib/AnchorPosition.js" type="text/javascript"/>
-    <script src="{$resources-uri}/forms/mattkruse-lib/PopupWindow.js" type="text/javascript"/>
-    <script src="{$resources-uri}/forms/mattkruse-lib/OptionTransfer.js" type="text/javascript"/>
-    <script src="{$resources-uri}/forms/mattkruse-lib/selectbox.js" type="text/javascript"/>
+    <script src="{$forms-resources}/mattkruse-lib/AnchorPosition.js" type="text/javascript"/>
+    <script src="{$forms-resources}/mattkruse-lib/PopupWindow.js" type="text/javascript"/>
+    <script src="{$forms-resources}/mattkruse-lib/OptionTransfer.js" type="text/javascript"/>
+    <script src="{$forms-resources}/mattkruse-lib/selectbox.js" type="text/javascript"/>
     <xsl:apply-templates select="." mode="forms-htmlarea"/>
   </xsl:template>
 

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl?view=diff&rev=517779&r1=517778&r2=517779
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-field-styling.xsl
Tue Mar 13 10:11:07 2007
@@ -81,25 +81,26 @@
       var cocoon;
       if (!cocoon)
         cocoon = {};
-      cocoon.resourcesUri = "<xsl:value-of select="$resources-uri"/>";
+      cocoon.formsResourcesUri = "<xsl:value-of select="$forms-resources"/>";
     </script>
-    <script src="{$resources-uri}/dojo/dojo.js" type="text/javascript"/>          
<!-- load dojo -->
+    <script src="{$dojo-resources}/dojo.js" type="text/javascript"/>           <!--
load dojo -->
     <script type="text/javascript">dojo.require("dojo.widget.*");</script>  
      <!-- require dojo.widget for auto-loading -->
     <xsl:if test="$dojo-debug = 'true'">                                          
<!-- require console etc. for dojo debug, if requested -->
         <script type="text/javascript">dojo.require("dojo.debug.console"); dojo.require("dojo.widget.Tree");</script>
     </xsl:if>
-    <script src="{$resources-uri}/forms/js/forms-lib.js" type="text/javascript"/> 
<!-- load legacy scripts -->
+    <script src="{$forms-resources}/js/forms-lib.js" type="text/javascript"/>  <!--
load legacy scripts -->
     <!-- load forms library -->
     <script type="text/javascript">
-    dojo.registerModulePath("cocoon.forms", "../forms/js");                        <!--
tell dojo how to find our forms module. NB: (since 2.1.11, replaces cocoon.js) -->
+    dojo.registerModulePath("cocoon.forms", "<xsl:value-of select='concat($forms-resources,
"/js")'/>");                        <!-- tell dojo how to find our forms module. NB:
(since 2.1.11, replaces cocoon.js) -->
     dojo.require("cocoon.forms.common");                                           <!--
tell dojo we require the commons library -->
+    dojo.require("cocoon.forms.manifest");                                         <!--
tell dojo we require cocoon.forms.manifest registering namespace handler -->
     dojo.addOnLoad(cocoon.forms.callOnLoadHandlers);                               <!--
ask dojo to run our onLoad handlers -->
     </script>    
     <xsl:copy-of select="fi:init/node()"/>                                        
<!-- copy optional initialisation from form template -->    
     <xsl:if test="/*/fi:googlemap">                                               
<!-- googlemap-key TODO: This looks broken to me (JQ) -->
       <script src="/*/fi:googlemap/fi:key" type="text/javascript"/>
     </xsl:if>
-    <link rel="stylesheet" type="text/css" href="{$resources-uri}/forms/css/forms.css"/>
+    <link rel="stylesheet" type="text/css" href="{$forms-resources}/css/forms.css"/>
   </xsl:template>
   
   <xsl:template match="fi:init"/>                                                 
<!-- ignore, was handled above -->

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-htmlarea-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-htmlarea-styling.xsl?view=diff&rev=517779&r1=517778&r2=517779
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-htmlarea-styling.xsl
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-htmlarea-styling.xsl
Tue Mar 13 10:11:07 2007
@@ -24,13 +24,14 @@
       +-->
 
   <xsl:param name="htmlarea-lang">en</xsl:param>
+  <xsl:param name="forms-resources">servlet:forms:/resources/forms</xsl:param>
 
   <xsl:template match="head" mode="forms-htmlarea">
     <script type="text/javascript">
-      _editor_url = "<xsl:value-of select="concat($resources-uri, '/forms/htmlarea/')"/>";
+      _editor_url = "<xsl:value-of select="concat($forms-resources, '/htmlarea/')"/>";
       _editor_lang = "<xsl:value-of select="$htmlarea-lang"/>";
     </script>
-    <script type="text/javascript" src="{$resources-uri}/forms/htmlarea/htmlarea.js"></script>
+    <script type="text/javascript" src="{$forms-resources}/htmlarea/htmlarea.js"></script>
   </xsl:template>
 
   <xsl:template match="body" mode="forms-htmlarea"/>

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-page-styling.xsl
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-page-styling.xsl?view=diff&rev=517779&r1=517778&r2=517779
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-page-styling.xsl
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/forms-page-styling.xsl
Tue Mar 13 10:11:07 2007
@@ -19,6 +19,8 @@
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:fi="http://apache.org/cocoon/forms/1.0#instance"
                 exclude-result-prefixes="fi">
+  <xsl:param name="forms-resources">servlet:forms:/resources/forms</xsl:param>
+  
   <!--+
       | This stylesheet is designed to be included by 'forms-samples-styling.xsl'.
       +-->
@@ -85,7 +87,7 @@
             </xsl:attribute>
             <xsl:copy-of select="fi:label/node()"/>
             <xsl:if test="fi:items/*//fi:validation-message">
-              <span class="forms-validation-message forms validation-message">&#160;<img
src="{$resources-uri}/forms/js/templates/images/validation-message.gif"/>&#160;</span>
+              <span class="forms-validation-message forms validation-message">&#160;<img
src="{$forms-resources}/js/templates/images/validation-message.gif"/>&#160;</span>
             </xsl:if>
           </span>
         </xsl:for-each>
@@ -161,7 +163,7 @@
           </xsl:for-each>
         </select>
         <xsl:if test="fi:items/*//fi:validation-message">
-          <span class="forms-validation-message forms validation-message">&#160;<img
src="{$resources-uri}/forms/js/templates/images/validation-message.gif"/>&#160;</span>
+          <span class="forms-validation-message forms validation-message">&#160;<img
src="{$forms-resources}/js/templates/images/validation-message.gif"/>&#160;</span>
         </xsl:if>
       </legend>
       <!-- a div for each of the items -->

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/DropdownDateTimePicker.js
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/DropdownDateTimePicker.js?view=diff&rev=517779&r1=517778&r2=517779
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/DropdownDateTimePicker.js
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/DropdownDateTimePicker.js
Tue Mar 13 10:11:07 2007
@@ -41,9 +41,9 @@
 
         isContainer: true,
 
-        dateIconURL: cocoon.resourcesUri + "/forms/js/templates/images/dateIcon.gif",
+        dateIconURL: cocoon.formsResourcesUri + "/js/templates/images/dateIcon.gif",
 
-        timeIconURL: cocoon.resourcesUri + "/forms/js/templates/images/timeIcon.gif",
+        timeIconURL: cocoon.formsResourcesUri + "/js/templates/images/timeIcon.gif",
 
         containerToggle: "plain", /* plain, explode, wipe, fade */
 

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/InfoPopup.js
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/InfoPopup.js?view=diff&rev=517779&r1=517778&r2=517779
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/InfoPopup.js
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/InfoPopup.js
Tue Mar 13 10:11:07 2007
@@ -36,10 +36,10 @@
         isContainer: true,
         icon: "",
 
-        templatePath: cocoon.resourcesUri + "/forms/js/templates/InfoPopup.html",
-        templateCssPath: cocoon.resourcesUri + "/forms/js/templates/InfoPopup.css",
+        templatePath: cocoon.formsResourcesUri + "/js/templates/InfoPopup.html",
+        templateCssPath: cocoon.formsResourcesUri + "/js/templates/InfoPopup.css",
 
-        closeIconURL: cocoon.resourcesUri + "/forms/js/templates/images/close.gif",
+        closeIconURL: cocoon.formsResourcesUri + "/js/templates/images/close.gif",
 
         containerToggle: "plain", /* plain, explode, wipe, fade */
 
@@ -48,7 +48,7 @@
         postMixInProperties: function(args, frag, parent) {
             cocoon.forms.InfoPopup.superclass.postMixInProperties(this, args, frag, parent);
 
-            this.iconURL = cocoon.resourcesUri + "/forms/js/templates/images/" + this.icon;
+            this.iconURL = cocoon.formsResourcesUri + "/js/templates/images/" + this.icon;
         },
 
         attachTemplateNodes: function(){

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/MultiValueEditor.js
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/MultiValueEditor.js?view=diff&rev=517779&r1=517778&r2=517779
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/MultiValueEditor.js
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/MultiValueEditor.js
Tue Mar 13 10:11:07 2007
@@ -39,9 +39,9 @@
 
         cformsIdPrefix: "id-prefix-not-set",
 
-        resourcesUri: cocoon.resourcesUri, // to make this available to the template
+        formsResourcesUri: cocoon.formsResourcesUri, // to make this available to the template
 
-        templatePath: cocoon.resourcesUri + "/forms/js/templates/MultiValueEditor.html",
+        templatePath: cocoon.formsResourcesUri + "/js/templates/MultiValueEditor.html",
 
         fillInTemplate: function(args, frag) {
             cocoon.forms.MultiValueEditor.superclass.fillInTemplate(this, args, frag);

Added: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/manifest.js
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/manifest.js?view=auto&rev=517779
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/manifest.js
(added)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/manifest.js
Tue Mar 13 10:11:07 2007
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ */
+
+ 
+ /*
+  * Mapping of all widget short names to their full package names
+  * This is used for widget autoloading - no dojo.require() is necessary.
+  * If you use a widget in markup or create one dynamically, then this
+  * mapping is used to find and load any dependencies not already loaded.
+  * You should use your own namespace for any custom widgets (remember to register it).
+  * For extra widgets you use, dojo.require() may still be used to explicitly load them.
+  *
+  * NOTE: Introduced in 2.1.11, replaces functionality in cocoon.js
+  *
+  * @version $Id$
+  */
+  
+dojo.provide("cocoon.forms.manifest");
+
+(function(){
+    var map = {
+        html: {
+            "cformsdraganddroprepeater" : "cocoon.forms.CFormsDragAndDropRepeater",
+            "cformsform"                : "cocoon.forms.CFormsForm",
+            "simpleform"                : "cocoon.forms.SimpleForm",
+            "ajaxform"                  : "cocoon.forms.AjaxForm",
+            "cformsrepeater"            : "cocoon.forms.CFormsRepeater",
+            "cformssuggest"             : "cocoon.forms.CFormsSuggest",
+            "dropdowndatetimepicker"    : "cocoon.forms.DropdownDateTimePicker",
+            "infopopup"                 : "cocoon.forms.InfoPopup",
+            "multivalueeditor"          : "cocoon.forms.MultiValueEditor"
+            // register new Widgets in the cocoon.forms namespace here
+        },
+        svg: {
+            // register svg widgets here
+        },
+        vml: {
+            // register vml widgets here
+        }
+    };
+
+    function formsResolver(name, domain){
+        if(!domain){ domain="html"; }
+        if(!map[domain]){ return null; }
+        return map[domain][name];
+    };
+
+
+    dojo.registerModulePath("cocoon.ajax", "servlet:ajax:/resources/ajax/js"); // cocoon.forms
has a dependency on the cocoon.ajax module libraries
+
+    dojo.registerModulePath("cocoon.forms", "servlet:/resources/forms/js");
+    dojo.registerNamespace("forms", "cocoon.forms", formsResolver);
+    
+})();

Propchange: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/manifest.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/manifest.js
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/templates/MultiValueEditor.html
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/templates/MultiValueEditor.html?view=diff&rev=517779&r1=517778&r2=517779
==============================================================================
--- cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/templates/MultiValueEditor.html
(original)
+++ cocoon/whiteboard/ajax-forms-refactoring/cocoon-forms/cocoon-forms-impl/src/main/resources/org/apache/cocoon/forms/resources/js/templates/MultiValueEditor.html
Tue Mar 13 10:11:07 2007
@@ -9,11 +9,11 @@
         </select>
       </td>
       <td width="20px">
-        <input dojoAttachPoint="deleteButton" type="image" src="${this.resourcesUri}/forms/img/delete.gif"/>
+        <input dojoAttachPoint="deleteButton" type="image" src="${this.formsResourcesUri}/img/delete.gif"/>
         <br/>
-        <input dojoAttachPoint="moveUpButton" type="image" src="${this.resourcesUri}/forms/img/move_up.gif"/>
+        <input dojoAttachPoint="moveUpButton" type="image" src="${this.formsResourcesUri}/img/move_up.gif"/>
         <br/>
-        <input dojoAttachPoint="moveDownButton" type="image" src="${this.resourcesUri}/forms/img/move_down.gif"/>
+        <input dojoAttachPoint="moveDownButton" type="image" src="${this.formsResourcesUri}/img/move_down.gif"/>
         <br/>
       </td>
     </tr>



Mime
View raw message