You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by sebb <se...@gmail.com> on 2008/04/03 22:21:02 UTC
Re: svn commit: r644463 - in /jakarta/cactus/trunk: ./ cactus-site/ cactus-site/src/site/xdoc/ framework/framework-uberjars/javaEE-12-uberjar/src/assemble/ framework/framework-uberjars/javaEE-13-uberjar/src/assemble/ framework/framework-uberjars/java
On 03/04/2008, ptahchiev@apache.org <pt...@apache.org> wrote:
> Author: ptahchiev
> Date: Thu Apr 3 13:04:11 2008
> New Revision: 644463
>
> URL: http://svn.apache.org/viewvc?rev=644463&view=rev
> Log:
> Changes regarding the failed vote so that we can fix the things up.
>
> Modified:
> jakarta/cactus/trunk/cactus-bin-assembly.xml
> jakarta/cactus/trunk/cactus-site/pom.xml
> jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml
The AL header has been removed again from the above file ...
> jakarta/cactus/trunk/cactus-src-assembly.xml
> jakarta/cactus/trunk/framework/framework-uberjars/javaEE-12-uberjar/src/assemble/main.xml
> jakarta/cactus/trunk/framework/framework-uberjars/javaEE-13-uberjar/src/assemble/main.xml
> jakarta/cactus/trunk/framework/framework-uberjars/javaEE-14-uberjar/src/assemble/main.xml
> jakarta/cactus/trunk/framework/framework-uberjars/javaEE-15-uberjar/src/assemble/main.xml
> jakarta/cactus/trunk/pom.xml
>
> Modified: jakarta/cactus/trunk/cactus-bin-assembly.xml
> URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-bin-assembly.xml?rev=644463&r1=644462&r2=644463&view=diff
> ==============================================================================
> --- jakarta/cactus/trunk/cactus-bin-assembly.xml (original)
> +++ jakarta/cactus/trunk/cactus-bin-assembly.xml Thu Apr 3 13:04:11 2008
> @@ -69,7 +69,7 @@
> </includes>
> </fileSet>
> <fileSet>
> - <directory>cactus-site/src/site/resources/api</directory>
> + <directory>cactus-site/src/site/resources/apidocs</directory>
> <outputDirectory>cactus-site</outputDirectory>
> <includes>
> <include>**/*</include>
>
> Modified: jakarta/cactus/trunk/cactus-site/pom.xml
> URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-site/pom.xml?rev=644463&r1=644462&r2=644463&view=diff
> ==============================================================================
> --- jakarta/cactus/trunk/cactus-site/pom.xml (original)
> +++ jakarta/cactus/trunk/cactus-site/pom.xml Thu Apr 3 13:04:11 2008
> @@ -226,7 +226,7 @@
> <reportSet>
> <reports>
> <report>changes-report</report>
> - <report>jira-report</report>
> + <!--report>jira-report</report-->
> </reports>
> </reportSet>
> </reportSets>
> @@ -256,11 +256,11 @@
> <smtpHost>mail.yourhost.com</smtpHost>
> <smtpPort implementation="java.lang.Integer">25</smtpPort>
> <toAddresses>
> - <toAddress implementation="java.lang.String">dev@cactus.org</toAddress>
> + <toAddress implementation="java.lang.String">cactus-dev@jakarta.apache.org</toAddress>
> </toAddresses>
> </configuration>
> </plugin>
> - <plugin>
> + <!--plugin>
> <groupId>org.codehaus.mojo</groupId>
> <artifactId>xml-maven-plugin</artifactId>
> <version>1.0-beta-2</version>
> @@ -285,7 +285,7 @@
> </transformationSets>
> <extension>xml</extension>
> </configuration>
> - </plugin>
> + </plugin-->
> </plugins>
> </build>
> </project>
>
> Modified: jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml
> URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml?rev=644463&r1=644462&r2=644463&view=diff
> ==============================================================================
> --- jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml (original)
> +++ jakarta/cactus/trunk/cactus-site/src/site/xdoc/news.xml Thu Apr 3 13:04:11 2008
> @@ -1,22 +1,4 @@
> <?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.
> --->
> <document id="news" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
> <properties>
> <title>Jakarta Cactus News</title>
>
> Modified: jakarta/cactus/trunk/cactus-src-assembly.xml
> URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/cactus-src-assembly.xml?rev=644463&r1=644462&r2=644463&view=diff
> ==============================================================================
> --- jakarta/cactus/trunk/cactus-src-assembly.xml (original)
> +++ jakarta/cactus/trunk/cactus-src-assembly.xml Thu Apr 3 13:04:11 2008
> @@ -43,7 +43,6 @@
> <exclude>**/.svn/**</exclude>
> <exclude>**/xref/**</exclude>
> <exclude>**/apidocs/**</exclude>
> - <exclude>descriptors/**</exclude>
> </excludes>
> </fileSet>
> </fileSets>
>
> Modified: jakarta/cactus/trunk/framework/framework-uberjars/javaEE-12-uberjar/src/assemble/main.xml
> URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-uberjars/javaEE-12-uberjar/src/assemble/main.xml?rev=644463&r1=644462&r2=644463&view=diff
> ==============================================================================
> --- jakarta/cactus/trunk/framework/framework-uberjars/javaEE-12-uberjar/src/assemble/main.xml (original)
> +++ jakarta/cactus/trunk/framework/framework-uberjars/javaEE-12-uberjar/src/assemble/main.xml Thu Apr 3 13:04:11 2008
> @@ -33,6 +33,7 @@
> <unpackOptions>
> <excludes>
> <exclude>META-INF/**</exclude>
> + <exclude>builddef.lst</exclude>
> </excludes>
> </unpackOptions>
> <unpack>true</unpack>
>
> Modified: jakarta/cactus/trunk/framework/framework-uberjars/javaEE-13-uberjar/src/assemble/main.xml
> URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-uberjars/javaEE-13-uberjar/src/assemble/main.xml?rev=644463&r1=644462&r2=644463&view=diff
> ==============================================================================
> --- jakarta/cactus/trunk/framework/framework-uberjars/javaEE-13-uberjar/src/assemble/main.xml (original)
> +++ jakarta/cactus/trunk/framework/framework-uberjars/javaEE-13-uberjar/src/assemble/main.xml Thu Apr 3 13:04:11 2008
> @@ -34,6 +34,7 @@
> <unpackOptions>
> <excludes>
> <exclude>META-INF/**</exclude>
> + <exclude>builddef.lst</exclude>
> </excludes>
> </unpackOptions>
> <unpack>true</unpack>
>
> Modified: jakarta/cactus/trunk/framework/framework-uberjars/javaEE-14-uberjar/src/assemble/main.xml
> URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-uberjars/javaEE-14-uberjar/src/assemble/main.xml?rev=644463&r1=644462&r2=644463&view=diff
> ==============================================================================
> --- jakarta/cactus/trunk/framework/framework-uberjars/javaEE-14-uberjar/src/assemble/main.xml (original)
> +++ jakarta/cactus/trunk/framework/framework-uberjars/javaEE-14-uberjar/src/assemble/main.xml Thu Apr 3 13:04:11 2008
> @@ -34,6 +34,7 @@
> <unpackOptions>
> <excludes>
> <exclude>META-INF/**</exclude>
> + <exclude>builddef.lst</exclude>
> </excludes>
> </unpackOptions>
> <unpack>true</unpack>
>
> Modified: jakarta/cactus/trunk/framework/framework-uberjars/javaEE-15-uberjar/src/assemble/main.xml
> URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/framework/framework-uberjars/javaEE-15-uberjar/src/assemble/main.xml?rev=644463&r1=644462&r2=644463&view=diff
> ==============================================================================
> --- jakarta/cactus/trunk/framework/framework-uberjars/javaEE-15-uberjar/src/assemble/main.xml (original)
> +++ jakarta/cactus/trunk/framework/framework-uberjars/javaEE-15-uberjar/src/assemble/main.xml Thu Apr 3 13:04:11 2008
> @@ -34,6 +34,7 @@
> <unpackOptions>
> <excludes>
> <exclude>META-INF/**</exclude>
> + <exclude>builddef.lst</exclude>
> </excludes>
> </unpackOptions>
> <unpack>true</unpack>
>
> Modified: jakarta/cactus/trunk/pom.xml
> URL: http://svn.apache.org/viewvc/jakarta/cactus/trunk/pom.xml?rev=644463&r1=644462&r2=644463&view=diff
> ==============================================================================
> --- jakarta/cactus/trunk/pom.xml (original)
> +++ jakarta/cactus/trunk/pom.xml Thu Apr 3 13:04:11 2008
> @@ -503,9 +503,6 @@
> <plugin>
> <artifactId>maven-site-plugin</artifactId>
> <version>2.0-beta-6</version>
> - <configuration>
> - <siteDirectory>cactus-site/src/site</siteDirectory>
> - </configuration>
> </plugin>
> <plugin>
> <groupId>org.apache.maven.plugins</groupId>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: cactus-dev-help@jakarta.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org