cocoon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Grzegorz Kossakowski <gkossakow...@apache.org>
Subject 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...
Date Tue, 01 May 2007 16:55:05 GMT
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

Mime
View raw message