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:32:14 UTC
svn commit: r534148 - in /cocoon/trunk/blocks/cocoon-ajax: cocoon-ajax-impl/
cocoon-ajax-impl/src/main/resources/COB-INF/
cocoon-ajax-impl/src/main/resources/COB-INF/system/
cocoon-ajax-impl/src/main/resources/META-INF/cocoon/
cocoon-ajax-impl/src/main...
Author: gkossakowski
Date: Tue May 1 09:32:12 2007
New Revision: 534148
URL: http://svn.apache.org/viewvc?view=rev&rev=534148
Log:
Merged whiteboard/ajax-forms-refactoring/cocoon-ajax/ changes r517383:534146 into the trunk.
Added:
cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/
- copied from r534096, cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/
cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/sitemap.xmap
- copied unchanged from r534096, cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/sitemap.xmap
cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/system/
- copied from r534096, cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/system/
cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/system/System.JSON.js
- copied unchanged from r534096, cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/system/System.JSON.js
cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/system/System.Upload.js
- copied unchanged from r534096, cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/system/System.Upload.js
cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/system/sitemap.xmap
- copied unchanged from r534096, cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/COB-INF/system/sitemap.xmap
cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/
- copied from r534096, cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/
cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/spring/
- copied from r534096, cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/spring/
cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-impl-blockServlet.xml
- copied unchanged from r534096, cocoon/whiteboard/ajax-forms-refactoring/cocoon-ajax/cocoon-ajax-impl/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-impl-blockServlet.xml
Removed:
cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/system/System.JSON.js
cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/system/System.Upload.js
cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/system/sitemap.xmap
Modified:
cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml
cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/resources/js/FormUploadProgress.js
cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/resources/manifest.js
cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/linked-updater.xml
cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/sitemap.xmap
cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml (contents, props changed)
Modified: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml?view=diff&rev=534148&r1=534147&r2=534148
==============================================================================
--- cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml Tue May 1 09:32:12 2007
@@ -33,6 +33,7 @@
<version>1.0.0-RC1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Cocoon Ajax Block Implementation</name>
+ <url>http://cocoon.apache.org/${docs.m.ajax.relPath}</url>
<dependencies>
<dependency>
@@ -40,14 +41,19 @@
<artifactId>cocoon-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-servlet-service-components</artifactId>
+ <version>1.0.0-RC1-SNAPSHOT</version>
+ </dependency>
</dependencies>
<distributionManagement>
<site>
<id>website</id>
- <url>${docs.deploymentBaseUrl}/blocks/ajax/${docs.version}/</url>
+ <url>${docs.deploymentBaseUrl}/${docs.m.ajax.relPath}</url>
</site>
- </distributionManagement>
+ </distributionManagement>
<properties>
<docs.name>Cocoon Ajax</docs.name>
Modified: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/resources/js/FormUploadProgress.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/resources/js/FormUploadProgress.js?view=diff&rev=534148&r1=534147&r2=534148
==============================================================================
--- cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/resources/js/FormUploadProgress.js (original)
+++ cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/resources/js/FormUploadProgress.js Tue May 1 09:32:12 2007
@@ -110,7 +110,7 @@
_getStatus: function() {
if (this._busy) return; // only one request at a time
dojo.io.bind({
- url: new dojo.uri.Uri(djConfig["baseRelativePath"], "../../../_cocoon/system/ajax/upload/status"),
+ url: new dojo.uri.Uri("servlet:/system/upload/status"),
mimetype: "text/json",
handle: dojo.lang.hitch(this, function(type, data, evt) {
if (type == "load") {
Modified: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/resources/manifest.js
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/resources/manifest.js?view=diff&rev=534148&r1=534147&r2=534148
==============================================================================
--- cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/resources/manifest.js (original)
+++ cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/src/main/resources/org/apache/cocoon/ajax/resources/manifest.js Tue May 1 09:32:12 2007
@@ -51,7 +51,7 @@
return map[domain][name];
}
- dojo.registerModulePath("cocoon.ajax", "../ajax/js");
+ dojo.registerModulePath("cocoon.ajax", "servlet://resource/external/ajax/js");
dojo.registerNamespace("ajax", "cocoon.ajax", ajaxResolver);
})();
Modified: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/linked-updater.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/linked-updater.xml?view=diff&rev=534148&r1=534147&r2=534148
==============================================================================
--- cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/linked-updater.xml (original)
+++ cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/linked-updater.xml Tue May 1 09:32:12 2007
@@ -21,7 +21,7 @@
<script type="text/javascript">
// djConfig = { isDebug: true };
</script>
- <script type="text/javascript" src="${cocoon.request.contextPath}/_cocoon/resources/dojo/dojo.js"/>
+ <script type="text/javascript" src="servlet:ajax:/resource/external/dojo/dojo.js"/>
<!--<script type="text/javascript" src="${cocoon.request.contextPath}/_cocoon/resources/ajax/cocoon.js"/>-->
<script type="text/javascript">
dojo.require("dojo.widget.*");
Modified: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/sitemap.xmap?view=diff&rev=534148&r1=534147&r2=534148
==============================================================================
--- cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/COB-INF/sitemap.xmap Tue May 1 09:32:12 2007
@@ -53,6 +53,7 @@
<map:match pattern="*.html">
<map:generate type="jx" src="{1}.xml"/>
<map:call resource="simple-page2html"/>
+ <map:transform type="servletLinkRewriter"/>
<map:serialize type="html"/>
</map:match>
@@ -66,17 +67,6 @@
<map:serialize type="html"/>
</map:match>
- <!-- Generic pipeline to load resources in 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>
</map:pipelines>
</map:sitemap>
Modified: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml?view=diff&rev=534148&r1=534147&r2=534148
==============================================================================
--- cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml (original)
+++ cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml Tue May 1 09:32:12 2007
@@ -1,29 +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.ajax.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
- <servlet:context mount-path="/cocoon-ajax-sample" context-path="blockcontext:/cocoon-ajax-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.ajax.sample.servlet" class="org.apache.cocoon.sitemap.SitemapServlet">
+ <servlet:context mount-path="/cocoon-ajax-sample" context-path="blockcontext:/cocoon-ajax-sample/">
+ <servlet:connections>
+ <entry key="ajax" value-ref="org.apache.cocoon.ajax.impl.servlet"/>
+ </servlet:connections>
+ </servlet:context>
+ </bean>
</beans>
Propchange: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-sample/src/main/resources/META-INF/cocoon/spring/cocoon-ajax-sample-blockServlet.xml
------------------------------------------------------------------------------
svn:keywords = Id
Re: svn commit: r534148 - in /cocoon/trunk/blocks/cocoon-ajax: cocoon-ajax-impl/
cocoon-ajax-impl/src/main/resources/COB-INF/ cocoon-ajax-impl/src/main/resources/COB-INF/system/
cocoon-ajax-impl/src/main/resources/META-INF/cocoon/ cocoon-ajax-impl/src/main...
Posted by Reinhard Poetz <re...@apache.org>.
Grzegorz Kossakowski wrote:
> I'm not sure why svn merge produced this changes. Do they harm and should be reverted?
no, please merge them.
--
Reinhard Pötz Independent Consultant, Trainer & (IT)-Coach
{Software Engineering, Open Source, Web Applications, Apache Cocoon}
web(log): http://www.poetz.cc
--------------------------------------------------------------------
___________________________________________________________
Der fr�he Vogel f�ngt den Wurm. Hier gelangen Sie zum neuen Yahoo! Mail: http://mail.yahoo.de
Re: svn commit: r534148 - in /cocoon/trunk/blocks/cocoon-ajax: cocoon-ajax-impl/
cocoon-ajax-impl/src/main/resources/COB-INF/ cocoon-ajax-impl/src/main/resources/COB-INF/system/
cocoon-ajax-impl/src/main/resources/META-INF/cocoon/ cocoon-ajax-impl/src/main...
Posted by Grzegorz Kossakowski <gk...@apache.org>.
gkossakowski@apache.org napisał(a):
> Author: gkossakowski
> Date: Tue May 1 09:32:12 2007
> New Revision: 534148
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=534148
> Log:
> Merged whiteboard/ajax-forms-refactoring/cocoon-ajax/ changes r517383:534146 into the trunk.
>
<snip/>
> Modified: cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml
> URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml?view=diff&rev=534148&r1=534147&r2=534148
> ==============================================================================
> --- cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml (original)
> +++ cocoon/trunk/blocks/cocoon-ajax/cocoon-ajax-impl/pom.xml Tue May 1 09:32:12 2007
> @@ -33,6 +33,7 @@
> <version>1.0.0-RC1-SNAPSHOT</version>
> <packaging>jar</packaging>
> <name>Cocoon Ajax Block Implementation</name>
> + <url>http://cocoon.apache.org/${docs.m.ajax.relPath}</url>
>
<snip/>
> <distributionManagement>
> <site>
> <id>website</id>
> - <url>${docs.deploymentBaseUrl}/blocks/ajax/${docs.version}/</url>
> + <url>${docs.deploymentBaseUrl}/${docs.m.ajax.relPath}</url>
> </site>
> - </distributionManagement>
> + </distributionManagement>
>
I'm not sure why svn merge produced this changes. Do they harm and should be reverted?
--
Grzegorz Kossakowski