You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2007/05/01 03:08:45 UTC
svn commit: r533900 - in /tapestry/tapestry5/trunk/tapestry-project:
LICENSE-2.0.txt NOTICE.txt build.xml pom.xml support/sign-and-upload.rb
Author: hlship
Date: Mon Apr 30 18:08:44 2007
New Revision: 533900
URL: http://svn.apache.org/viewvc?view=rev&rev=533900
Log:
Roll version numbers up to 2.0.4
Added:
tapestry/tapestry5/trunk/tapestry-project/LICENSE-2.0.txt
tapestry/tapestry5/trunk/tapestry-project/NOTICE.txt
tapestry/tapestry5/trunk/tapestry-project/build.xml
tapestry/tapestry5/trunk/tapestry-project/support/sign-and-upload.rb (with props)
Modified:
tapestry/tapestry5/trunk/tapestry-project/pom.xml
Added: tapestry/tapestry5/trunk/tapestry-project/LICENSE-2.0.txt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-project/LICENSE-2.0.txt?view=auto&rev=533900
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-project/LICENSE-2.0.txt (added)
+++ tapestry/tapestry5/trunk/tapestry-project/LICENSE-2.0.txt Mon Apr 30 18:08:44 2007
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
Added: tapestry/tapestry5/trunk/tapestry-project/NOTICE.txt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-project/NOTICE.txt?view=auto&rev=533900
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-project/NOTICE.txt (added)
+++ tapestry/tapestry5/trunk/tapestry-project/NOTICE.txt Mon Apr 30 18:08:44 2007
@@ -0,0 +1,5 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+Please refer to the NOTICE.txt for each sub-module to
+identify further dependencies.
Added: tapestry/tapestry5/trunk/tapestry-project/build.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-project/build.xml?view=auto&rev=533900
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-project/build.xml (added)
+++ tapestry/tapestry5/trunk/tapestry-project/build.xml Mon Apr 30 18:08:44 2007
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<project default="assemble">
+
+ <!-- Requires Ant 1.7.0 to execute! -->
+
+ <property name="target.dir" value="target" />
+ <!-- Binary and source distributions, in .zip and .tar.gz formats, go here. -->
+ <property name="dists.dir" value="${target.dir}/dist" />
+
+
+ <!-- Read the Maven POM ... -->
+ <xmlproperty file="pom.xml" prefix="pom" keeproot="false"/>
+
+ <!-- ... to obtain the version number. -->
+ <property name="version" value="${pom.version}" />
+
+ <property name="licenses" value="LICENSE*,*.txt"/>
+ <property name="sources" value="${licenses},pom.xml,src/**"/>
+
+ <property name="bin.zip" value="${dists.dir}/tapestry-bin-${version}.zip"/>
+ <property name="src.zip" value="${dists.dir}/tapestry-src-${version}.zip"/>
+
+ <!-- This has to be kept synchronized with the modules, as they change. We include just the "runtime" modules,
+ no the ones used only within a Maven build; if the user is using Maven, they know how to (let Maven) get
+ the code. -->
+
+ <target name="assemble" description="Build distribution files.">
+ <mkdir dir="${dists.dir}" />
+
+ <echo>*** Building distribution for project version ${version} ***</echo>
+
+ <echo>Building binary distribution</echo>
+
+ <zip destfile="${bin.zip}">
+ <fileset dir="." includes="LICENSE*,*.txt" />
+
+ <!-- Folds the licences and the JARs into the subfolder. Repetitive but such is life. -->
+
+ <zipfileset prefix="tapestry-core" dir="../tapestry-core" includes="${licenses}" />
+ <zipfileset prefix="tapestry-core" dir="../tapestry-core/target" includes="*.jar" />
+
+ <zipfileset prefix="tapestry-hibernate" dir="../tapestry-hibernate" includes="${licenses}" />
+ <zipfileset prefix="tapestry-hibernate" dir="../tapestry-hibernate/target" includes="*.jar" />
+
+ <zipfileset prefix="tapestry-ioc" dir="../tapestry-ioc" includes="${licenses}" />
+ <zipfileset prefix="tapestry-ioc" dir="../tapestry-ioc/target" includes="*.jar" />
+
+ <zipfileset prefix="tapestry-spring" dir="../tapestry-spring" includes="${licenses}" />
+ <zipfileset prefix="tapestry-spring" dir="../tapestry-spring/target" includes="*.jar" />
+
+ <zipfileset prefix="tapestry-test" dir="../tapestry-test" includes="${licenses}" />
+ <zipfileset prefix="tapestry-test" dir="../tapestry-test/target" includes="*.jar" />
+
+ </zip>
+
+ <!-- Build the other formats from the .zip -->
+
+ <tar destfile="${dists.dir}/tapestry-bin-${version}.tar.gz" compression="gzip">
+ <zipfileset src="${bin.zip}"/>
+ </tar>
+
+ <tar destfile="${dists.dir}/tapestry-bin-${version}.tar.bz2" compression="bzip2">
+ <zipfileset src="${bin.zip}"/>
+ </tar>
+
+ <echo>Building source distribution</echo>
+
+ <!-- Now on to the source files. -->
+
+ <zip destfile="${src.zip}">
+ <fileset dir="." includes="${licenses}"/>
+
+ <zipfileset prefix="tapestry-core" dir="../tapestry-core" includes="${sources}"/>
+ <zipfileset prefix="tapestry-hibernate" dir="../tapestry-hibernate" includes="${sources}"/>
+ <zipfileset prefix="tapestry-ioc" dir="../tapestry-ioc" includes="${sources}"/>
+ <zipfileset prefix="tapestry-spring" dir="../tapestry-spring" includes="${sources}"/>
+ <zipfileset prefix="tapestry-test" dir="../tapestry-spring" includes="${sources}"/>
+
+ <zipfileset prefix="tapestry-project" dir="." includes="${sources}"/>
+ <zipfileset prefix="quickstart" dir="../quickstart" includes="${sources}"/>
+ <zipfileset prefix="tapestry-component-report" dir="../tapestry-component-report" includes="${sources}"/>
+
+ </zip>
+
+ <tar destfile="${dists.dir}/tapestry-src-${version}.tar.gz" compression="gzip" longfile="gnu">
+ <zipfileset src="${src.zip}"/>
+ </tar>
+
+ <tar destfile="${dists.dir}/tapestry-src-${version}.tar.bz2" compression="bzip2" longfile="gnu">
+ <zipfileset src="${src.zip}"/>
+ </tar>
+
+ <echo>Generating MD5 Checksums</echo>
+
+ <checksum fileext=".md5">
+ <fileset dir="${dists.dir}" includes="*.bz2,*.gz,*.zip"/>
+ </checksum>
+
+ <echo>*** Please sign the distributions using GPG before uploading the files. ***</echo>
+
+ </target>
+
+ <target name="clean" description="Remove distribution directory.">
+ <delete dir="${dists.dir}" quiet="true"/>
+ </target>
+
+</project>
\ No newline at end of file
Modified: tapestry/tapestry5/trunk/tapestry-project/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-project/pom.xml?view=diff&rev=533900&r1=533899&r2=533900
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-project/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-project/pom.xml Mon Apr 30 18:08:44 2007
@@ -5,7 +5,7 @@
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-project</artifactId>
<packaging>pom</packaging>
- <version>5.0.4-SNAPSHOT</version>
+ <version>5.0.4</version>
<name>Tapestry 5 Project</name>
<inceptionYear>2006</inceptionYear>
<url>http://tapestry.apache.org/tapestry5/</url>
@@ -21,8 +21,7 @@
<url>http://www.apache.org</url>
</organization>
<scm>
- <connection>
- scm:svn:https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk/tapestry-project </connection>
+ <connection> scm:svn:https://svn.apache.org/repos/asf/tapestry/tapestry5/trunk/tapestry-project </connection>
<url> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-project </url>
</scm>
<developers>
@@ -139,6 +138,19 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptorRefs>
@@ -192,6 +204,19 @@
</plugins>
</pluginManagement>
</build>
+ <profiles>
+ <profile>
+ <id>deploy</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
<reporting>
<plugins>
<plugin>
@@ -214,8 +239,8 @@
</reporting>
<repositories>
<repository>
- <id>tapestry-snapshots</id>
- <url>http://people.apache.org/~hlship/tapestry-snapshot-repository/</url>
+ <id>tapestrys</id>
+ <url>http://people.apache.org/~hlship/tapestry-repository/</url>
</repository>
<repository>
<id>codehaus.snapshots</id>
@@ -230,8 +255,8 @@
</repositories>
<pluginRepositories>
<pluginRepository>
- <id>tapestry-snapshots</id>
- <url>http://people.apache.org/~hlship/tapestry-snapshot-repository</url>
+ <id>tapestrys</id>
+ <url>http://people.apache.org/~hlship/tapestry-repository</url>
</pluginRepository>
<!-- I believe a version of the surefire plugin lives here. -->
<pluginRepository>
@@ -273,12 +298,12 @@
</repository>
<snapshotRepository>
<id>tapestry</id>
- <url>scpexe://people.apache.org/home/hlship/public_html/tapestry-snapshot-repository</url>
+ <url>scpexe://people.apache.org/home/hlship/public_html/tapestry-repository</url>
</snapshotRepository>
</distributionManagement>
<properties>
- <!-- Version 2.1-SNAPSHOT lists everything as 100% covered, wierd. -->
+ <!-- Version 2.1 lists everything as 100% covered, wierd. -->
<cobertura-plugin-version>2.0</cobertura-plugin-version>
</properties>
Added: tapestry/tapestry5/trunk/tapestry-project/support/sign-and-upload.rb
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-project/support/sign-and-upload.rb?view=auto&rev=533900
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-project/support/sign-and-upload.rb (added)
+++ tapestry/tapestry5/trunk/tapestry-project/support/sign-and-upload.rb Mon Apr 30 18:08:44 2007
@@ -0,0 +1,13 @@
+#!/usr/bin/ruby
+
+DIST_DIR="target/dist"
+
+Dir.glob("#{DIST_DIR}/*.{zip,gz,bz2}") do |filename|
+ puts filename
+ # ... and you have to provide your passphrase again and again!
+ system "gpg --armor --output #{filename}.asc --detach-sig #{filename}"
+end
+
+puts "Uploading distributions ..."
+
+system 'scp target/dists/* hlship@people.apache.org:public_html/tapestry-releases'
\ No newline at end of file
Propchange: tapestry/tapestry5/trunk/tapestry-project/support/sign-and-upload.rb
------------------------------------------------------------------------------
svn:executable = *