wink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mart...@apache.org
Subject svn commit: r802522 - in /incubator/wink/trunk: ./ src/licences/ src/pks/ wink-scripts/wink-dist/
Date Sun, 09 Aug 2009 11:42:38 GMT
Author: martins
Date: Sun Aug  9 11:42:37 2009
New Revision: 802522

URL: http://svn.apache.org/viewvc?rev=802522&view=rev
Log:
Fix the following release issues:
* Sources/binaries distributions now include RELEASE-NOTES
* Licenses of the included binaries (lib/*.jar) are added to sources & binaries distributions 
* sources/javadoc jars are missing default implementation and specification entries in manifest 
* move KYES to root directory
* update BUILDING notes

Added:
    incubator/wink/trunk/KEYS
      - copied, changed from r802483, incubator/wink/trunk/src/pks/KEYS
    incubator/wink/trunk/src/licences/
    incubator/wink/trunk/src/licences/apache-2.0.txt
    incubator/wink/trunk/src/licences/cddl.txt
    incubator/wink/trunk/src/licences/jason.txt
    incubator/wink/trunk/src/licences/slf4j.txt
Removed:
    incubator/wink/trunk/src/pks/
Modified:
    incubator/wink/trunk/BUILDING.txt
    incubator/wink/trunk/NOTICE
    incubator/wink/trunk/pom.xml
    incubator/wink/trunk/wink-scripts/wink-dist/build.xml
    incubator/wink/trunk/wink-scripts/wink-dist/src.xml

Modified: incubator/wink/trunk/BUILDING.txt
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/BUILDING.txt?rev=802522&r1=802521&r2=802522&view=diff
==============================================================================
--- incubator/wink/trunk/BUILDING.txt (original)
+++ incubator/wink/trunk/BUILDING.txt Sun Aug  9 11:42:37 2009
@@ -35,6 +35,6 @@
 Building distribution archives
 ------------
 1) From top level, run
-         $> mvn -Dbuild=CI install
+         $> mvn install -PCIBuild
    This will build an Apache Wink distribution archives under "wink-scripts/wink-dist/target"
    directory.

Copied: incubator/wink/trunk/KEYS (from r802483, incubator/wink/trunk/src/pks/KEYS)
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/KEYS?p2=incubator/wink/trunk/KEYS&p1=incubator/wink/trunk/src/pks/KEYS&r1=802483&r2=802522&rev=802522&view=diff
==============================================================================
--- incubator/wink/trunk/src/pks/KEYS (original)
+++ incubator/wink/trunk/KEYS Sun Aug  9 11:42:37 2009
@@ -9,42 +9,43 @@
              && gpg --armor --export <your name>) >> this file.
              
 
-pub   1024D/9C7FE9DE 2009-07-30
+pub   1024D/5E67E108 2009-07-30
 uid                  Martin Snitkovsky (martins@apache.org) <martins@apache.org>
-sig 3        9C7FE9DE 2009-07-30  Martin Snitkovsky (martins@apache.org) <martins@apache.org>
-sub   2048g/24A4870F 2009-07-30
-sig          9C7FE9DE 2009-07-30  Martin Snitkovsky (martins@apache.org) <martins@apache.org>
+sig 3        5E67E108 2009-07-30  Martin Snitkovsky (martins@apache.org) <martins@apache.org>
+sub   2048g/1B3AAEF0 2009-07-30
+sig          5E67E108 2009-07-30  Martin Snitkovsky (martins@apache.org) <martins@apache.org>
 
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v2.0.11 (FreeBSD)
+Version: GnuPG v1.4.9 (MingW32)
 
-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
+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
-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
-=eyhP
+Zz6IYAQTEQIAIAUCSnGZQwIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEPRp
+4YpeZ+EIXfAAn3fjUkLB9Iy1RqC2BlfFhiv39WfVAJ4pD7h/OTdoU5djk20SxtUl
+jpEr17kCDQRKcZlDEAgA1IvKPw7PH4wlcrf+ZPF5sGIH+Mf4qKuP89qgCal6pScc
+DixTjo66zNvWmMGYTI++kopj6UqlLFUn6iwAoxJmQUC0OBPeLVnLeyznQsDy1XmZ
+/uB6i3bBI24FvlDXM8gA+QWFdk6vJteUsb1N5zVK+3Wz6q6GpJJLL/p3rlTqzKRi
+dHQvqbCHeYnxlaXDUq4I+HN/fCU0rmK5SmiMlbZ4LXX7QpYHTapfJTSb2Cq1Pw9T
+UR9he/el5tEjDCFRsZlACJAhAoYu0DpWMuWcdZgLVpf6YC4H77KYpe4CO9QKg/Zh
+2wlOHmpNri2ZosRRV/714tJaOnhBq+dQWsYGKjWBnwADBQgAtFfnjbFK9s+hp6ZQ
+xou3EtPRxATAojcz7GDd3LQjcUMSC91mztkLkf2oailtCIDQiharUUqBNF5QPKsx
+DnGLnuGfFQTrRq0PJqYTvRdJWRJ8QWh+YiOc1ElO2iZ5q4Zjvu/uieJGQ8RozhVJ
+SK0ZPYhv+H73pMY+or9g9/stFUnciFDLnhCcz1zRk1JLD3e5qq664LTnvX/tUtM0
+p+rG0KQu7aGw6hv30rxLhhONmkvjsH1MzKtE9Ir96jXrRRUiUGJk/EkLP+teNPcx
+Rb5FRaOWfsL4NHmII71jysFRy6gl/9S98NuyZgG0jHWNfDidncSq+KZxrz3+CO0g
+iq4tkYhJBBgRAgAJBQJKcZlDAhsMAAoJEPRp4YpeZ+EIr8EAoOlHvUgi4I3SOEez
+oWqdN3EpboLBAKDBUwa9hDvdAdSR3gvjJzK7G1Dy/Q==
+=ctJW
 -----END PGP PUBLIC KEY BLOCK-----
+
 pub   1024D/67B04C22 2009-07-30
 uid                  Michael Elman <elman@apache.org>
 sig 3        67B04C22 2009-07-30  Michael Elman <elman@apache.org>

Modified: incubator/wink/trunk/NOTICE
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/NOTICE?rev=802522&r1=802521&r2=802522&view=diff
==============================================================================
--- incubator/wink/trunk/NOTICE (original)
+++ incubator/wink/trunk/NOTICE Sun Aug  9 11:42:37 2009
@@ -4,16 +4,16 @@
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
-This product includes software developed by the JSON.org
+This product includes software developed by the JSON.org distributed under jason license  
 
-This product includes/uses software, StAX API (http://stax.codehaus.org/)
+This product includes/uses software, StAX API (http://stax.codehaus.org/) distributed under apache-2.0 license
 
-This product includes software developed for the JAXB Reference Implementation project. (https://jaxb.dev.java.net/)
+This product includes software developed for the JAXB Reference Implementation project (https://jaxb.dev.java.net/) distributed under CDDL Version 1.0 license 
 
-This product includes/uses software, Xerces (http://xerces.apache.org)
+This product includes/uses software, Xerces (http://xerces.apache.org) distributed under apache-2.0 license
 
-This product includes/uses software, JSR-311 (https://jsr311.dev.java.net/)
+This product includes/uses software, JSR-311 (https://jsr311.dev.java.net/) distributed under CDDL Version 1.0 license
  
-This product includes/uses software, JavaBeans Activation Framework (http://java.sun.com/javase/technologies/desktop/javabeans/jaf/)
+This product includes/uses software, JavaBeans Activation Framework (http://java.sun.com/javase/technologies/desktop/javabeans/jaf/) distributed under CDDL Version 1.0 license
  
-This product includes/uses software, SLF4J(http://www.slf4j.org/)
\ No newline at end of file
+This product includes/uses software, SLF4J(http://www.slf4j.org/) distributed under slf4j license
\ No newline at end of file

Modified: incubator/wink/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/pom.xml?rev=802522&r1=802521&r2=802522&view=diff
==============================================================================
--- incubator/wink/trunk/pom.xml (original)
+++ incubator/wink/trunk/pom.xml Sun Aug  9 11:42:37 2009
@@ -16,7 +16,8 @@
         and limitations under the License.
     -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.wink</groupId>
     <artifactId>wink</artifactId>
@@ -32,6 +33,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <javadoc.aggregate>true</javadoc.aggregate>
         <javadoc.exclude.patterns>*.internal:org.apache.wink.example.*</javadoc.exclude.patterns>
+        <maven.compile.source>1.5</maven.compile.source>
+        <maven.compile.target>1.5</maven.compile.target>
     </properties>
     <modules>
         <module>wink-component-test-support</module>
@@ -107,7 +110,6 @@
                 </executions>
             </plugin>
         </plugins>
-
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -150,40 +152,12 @@
                         </dependency>
                     </dependencies>
                 </plugin>
-
-                <!--
-                    Build number plug in, should be un comment when
-                    defining SVN <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>buildnumber-maven-plugin</artifactId>
-                    <version>1.0-beta-2</version> <configuration>
-                    <doCheck>false</doCheck> <doUpdate>false</doUpdate>
-                    </configuration> </plugin>
-                -->
-                <!-- Write the revision to the Manifest -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.1</version>
-                    <configuration>
-                        <archive>
-                            <manifest>
-                                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            </manifest>
-                            <manifestEntries>
-                                <Implementation-Revision>${buildNumber}</Implementation-Revision>
-                                <BuildSystemVersion>${buildVersion}</BuildSystemVersion>
-                                <BuildBranchName>${buildBranch}</BuildBranchName>
-                            </manifestEntries>
-                        </archive>
-                    </configuration>
-                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
+                        <source>${maven.compile.source}</source>
+                        <target>${maven.compile.target}</target>
                         <encoding>UTF-8</encoding>
                         <showDeprecation>true</showDeprecation>
                         <showWarnings>true</showWarnings>
@@ -253,6 +227,51 @@
                         <autoVersionSubmodules>true</autoVersionSubmodules>
                     </configuration>
                 </plugin>
+
+                <!-- Add manifest configuration since it is not defined in apache pom-->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>2.1</version>
+                    <configuration>
+                        <archive>
+                            <manifest>
+                                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            </manifest>
+                        </archive>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>attach-sources</id>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+
+                <!-- Add manifest configuration since it is not defined in apache pom-->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <configuration>
+                        <archive>
+                            <manifest>
+                                <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                                <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            </manifest>
+                        </archive>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>attach-javadocs</id>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>
@@ -449,15 +468,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -503,7 +513,8 @@
             <!--
                 properties>
                 <distribution.deploy.directory>ast</distribution.deploy.directory>
-                </properties -->
+                </properties
+            -->
         </profile>
     </profiles>
     <inceptionYear>2009</inceptionYear>

Added: incubator/wink/trunk/src/licences/apache-2.0.txt
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/src/licences/apache-2.0.txt?rev=802522&view=auto
==============================================================================
--- incubator/wink/trunk/src/licences/apache-2.0.txt (added)
+++ incubator/wink/trunk/src/licences/apache-2.0.txt Sun Aug  9 11:42:37 2009
@@ -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: incubator/wink/trunk/src/licences/cddl.txt
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/src/licences/cddl.txt?rev=802522&view=auto
==============================================================================
--- incubator/wink/trunk/src/licences/cddl.txt (added)
+++ incubator/wink/trunk/src/licences/cddl.txt Sun Aug  9 11:42:37 2009
@@ -0,0 +1,380 @@
+	COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+
+	1. Definitions.
+	
+		1.1. "Contributor" means each individual or entity that
+		creates or contributes to the creation of Modifications.
+		
+		1.2. "Contributor Version" means the combination of the
+		Original Software, prior Modifications used by a
+		Contributor (if any), and the Modifications made by that
+		particular Contributor.
+		
+		1.3. "Covered Software" means (a) the Original Software, or
+		(b) Modifications, or (c) the combination of files
+		containing Original Software with files containing
+		Modifications, in each case including portions thereof.
+		
+		1.4. "Executable" means the Covered Software in any form
+		other than Source Code.
+		
+		1.5. "Initial Developer" means the individual or entity
+		that first makes Original Software available under this
+		License.
+		
+		1.6. "Larger Work" means a work which combines Covered
+		Software or portions thereof with code not governed by the
+		terms of this License.
+		
+		1.7. "License" means this document.
+		
+		1.8. "Licensable" means having the right to grant, to the
+		maximum extent possible, whether at the time of the initial
+		grant or subsequently acquired, any and all of the rights
+		conveyed herein.
+		
+		1.9. "Modifications" means the Source Code and Executable
+		form of any of the following:
+		
+			A. Any file that results from an addition to,
+			deletion from or modification of the contents of a
+			file containing Original Software or previous
+			Modifications;
+			
+			B. Any new file that contains any part of the
+			Original Software or previous Modification; or
+			
+			C. Any new file that is contributed or otherwise made
+			available under the terms of this License.
+			
+		1.10. "Original Software" means the Source Code and
+		Executable form of computer software code that is
+		originally released under this License.
+		
+		1.11. "Patent Claims" means any patent claim(s), now owned
+		or hereafter acquired, including without limitation,
+		method, process, and apparatus claims, in any patent
+		Licensable by grantor.
+		
+		1.12. "Source Code" means (a) the common form of computer
+		software code in which modifications are made and (b)
+		associated documentation included in or with such code.
+		
+		1.13. "You" (or "Your") means an individual or a legal
+		entity exercising rights under, and complying with all of
+		the terms of, this License. For legal entities, "You"
+		includes any entity which controls, is controlled by, or is
+		under common control with You. For purposes of this
+		definition, "control" means (a) the power, direct or
+		indirect, to cause the direction or management of such
+		entity, whether by contract or otherwise, or (b) ownership
+		of more than fifty percent (50%) of the outstanding shares
+		or beneficial ownership of such entity.
+		
+	2. License Grants.
+	
+		2.1. The Initial Developer Grant.
+		
+		Conditioned upon Your compliance with Section 3.1 below and
+		subject to third party intellectual property claims, the
+		Initial Developer hereby grants You a world-wide,
+		royalty-free, non-exclusive license:
+		
+			(a) under intellectual property rights (other than
+			patent or trademark) Licensable by Initial Developer,
+			to use, reproduce, modify, display, perform,
+			sublicense and distribute the Original Software (or
+			portions thereof), with or without Modifications,
+			and/or as part of a Larger Work; and
+			
+			(b) under Patent Claims infringed by the making,
+			using or selling of Original Software, to make, have
+			made, use, practice, sell, and offer for sale, and/or
+			otherwise dispose of the Original Software (or
+			portions thereof).
+			
+			(c) The licenses granted in Sections 2.1(a) and (b)
+			are effective on the date Initial Developer first
+			distributes or otherwise makes the Original Software
+			available to a third party under the terms of this
+			License.
+			
+			(d) Notwithstanding Section 2.1(b) above, no patent
+			license is granted: (1) for code that You delete from
+			the Original Software, or (2) for infringements
+			caused by: (i) the modification of the Original
+			Software, or (ii) the combination of the Original
+			Software with other software or devices.
+		
+		2.2. Contributor Grant.
+		
+		Conditioned upon Your compliance with Section 3.1 below and
+		subject to third party intellectual property claims, each
+		Contributor hereby grants You a world-wide, royalty-free,
+		non-exclusive license:
+		
+			(a) under intellectual property rights (other than
+			patent or trademark) Licensable by Contributor to
+			use, reproduce, modify, display, perform, sublicense
+			and distribute the Modifications created by such
+			Contributor (or portions thereof), either on an
+			unmodified basis, with other Modifications, as
+			Covered Software and/or as part of a Larger Work; and
+			
+			(b) under Patent Claims infringed by the making,
+			using, or selling of Modifications made by that
+			Contributor either alone and/or in combination with
+			its Contributor Version (or portions of such
+			combination), to make, use, sell, offer for sale,
+			have made, and/or otherwise dispose of: (1)
+			Modifications made by that Contributor (or portions
+			thereof); and (2) the combination of Modifications
+			made by that Contributor with its Contributor Version
+			(or portions of such combination).
+			
+			(c) The licenses granted in Sections 2.2(a) and
+			2.2(b) are effective on the date Contributor first
+			distributes or otherwise makes the Modifications
+			available to a third party.
+			
+			(d) Notwithstanding Section 2.2(b) above, no patent
+			license is granted: (1) for any code that Contributor
+			has deleted from the Contributor Version; (2) for
+			infringements caused by: (i) third party
+			modifications of Contributor Version, or (ii) the
+			combination of Modifications made by that Contributor
+			with other software (except as part of the
+			Contributor Version) or other devices; or (3) under
+			Patent Claims infringed by Covered Software in the
+			absence of Modifications made by that Contributor.
+		
+	3. Distribution Obligations.
+	
+		3.1. Availability of Source Code.
+		
+		Any Covered Software that You distribute or otherwise make
+		available in Executable form must also be made available in
+		Source Code form and that Source Code form must be
+		distributed only under the terms of this License. You must
+		include a copy of this License with every copy of the
+		Source Code form of the Covered Software You distribute or
+		otherwise make available. You must inform recipients of any
+		such Covered Software in Executable form as to how they can
+		obtain such Covered Software in Source Code form in a
+		reasonable manner on or through a medium customarily used
+		for software exchange.
+		
+		3.2. Modifications.
+		
+		The Modifications that You create or to which You
+		contribute are governed by the terms of this License. You
+		represent that You believe Your Modifications are Your
+		original creation(s) and/or You have sufficient rights to
+		grant the rights conveyed by this License.
+		
+		3.3. Required Notices.
+		
+		You must include a notice in each of Your Modifications
+		that identifies You as the Contributor of the Modification.
+		You may not remove or alter any copyright, patent or
+		trademark notices contained within the Covered Software, or
+		any notices of licensing or any descriptive text giving
+		attribution to any Contributor or the Initial Developer.
+		
+		3.4. Application of Additional Terms.
+		
+		You may not offer or impose any terms on any Covered
+		Software in Source Code form that alters or restricts the
+		applicable version of this License or the recipients'
+		rights hereunder. You may choose to offer, and to charge a
+		fee for, warranty, support, indemnity or liability
+		obligations to one or more recipients of Covered Software.
+		However, you may do so only on Your own behalf, and not on
+		behalf of the Initial Developer or any Contributor. You
+		must make it absolutely clear that any such warranty,
+		support, indemnity or liability obligation is offered by
+		You alone, and You hereby agree to indemnify the Initial
+		Developer and every Contributor for any liability incurred
+		by the Initial Developer or such Contributor as a result of
+		warranty, support, indemnity or liability terms You offer.
+		
+		3.5. Distribution of Executable Versions.
+		
+		You may distribute the Executable form of the Covered
+		Software under the terms of this License or under the terms
+		of a license of Your choice, which may contain terms
+		different from this License, provided that You are in
+		compliance with the terms of this License and that the
+		license for the Executable form does not attempt to limit
+		or alter the recipient's rights in the Source Code form
+		from the rights set forth in this License. If You
+		distribute the Covered Software in Executable form under a
+		different license, You must make it absolutely clear that
+		any terms which differ from this License are offered by You
+		alone, not by the Initial Developer or Contributor. You
+		hereby agree to indemnify the Initial Developer and every
+		Contributor for any liability incurred by the Initial
+		Developer or such Contributor as a result of any such terms
+		You offer.
+		
+		3.6. Larger Works.
+		
+		You may create a Larger Work by combining Covered Software
+		with other code not governed by the terms of this License
+		and distribute the Larger Work as a single product. In such
+		a case, You must make sure the requirements of this License
+		are fulfilled for the Covered Software.
+		
+	4. Versions of the License.
+	
+		4.1. New Versions.
+		
+		Sun Microsystems, Inc. is the initial license steward and
+		may publish revised and/or new versions of this License
+		from time to time. Each version will be given a
+		distinguishing version number. Except as provided in
+		Section 4.3, no one other than the license steward has the
+		right to modify this License.
+		
+		4.2. Effect of New Versions.
+		
+		You may always continue to use, distribute or otherwise
+		make the Covered Software available under the terms of the
+		version of the License under which You originally received
+		the Covered Software. If the Initial Developer includes a
+		notice in the Original Software prohibiting it from being
+		distributed or otherwise made available under any
+		subsequent version of the License, You must distribute and
+		make the Covered Software available under the terms of the
+		version of the License under which You originally received
+		the Covered Software. Otherwise, You may also choose to
+		use, distribute or otherwise make the Covered Software
+		available under the terms of any subsequent version of the
+		License published by the license steward.
+		
+		4.3. Modified Versions.
+		
+		When You are an Initial Developer and You want to create a
+		new license for Your Original Software, You may create and
+		use a modified version of this License if You: (a) rename
+		the license and remove any references to the name of the
+		license steward (except to note that the license differs
+		from this License); and (b) otherwise make it clear that
+		the license contains terms which differ from this License.
+		
+	5. DISCLAIMER OF WARRANTY.
+	
+	COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
+	BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+	INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
+	SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
+	PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND
+	PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY
+	COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
+	INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF
+	ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF
+	WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+	ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
+	DISCLAIMER.
+	
+	6. TERMINATION.
+	
+		6.1. This License and the rights granted hereunder will
+		terminate automatically if You fail to comply with terms
+		herein and fail to cure such breach within 30 days of
+		becoming aware of the breach. Provisions which, by their
+		nature, must remain in effect beyond the termination of
+		this License shall survive.
+		
+		6.2. If You assert a patent infringement claim (excluding
+		declaratory judgment actions) against Initial Developer or
+		a Contributor (the Initial Developer or Contributor against
+		whom You assert such claim is referred to as "Participant")
+		alleging that the Participant Software (meaning the
+		Contributor Version where the Participant is a Contributor
+		or the Original Software where the Participant is the
+		Initial Developer) directly or indirectly infringes any
+		patent, then any and all rights granted directly or
+		indirectly to You by such Participant, the Initial
+		Developer (if the Initial Developer is not the Participant)
+		and all Contributors under Sections 2.1 and/or 2.2 of this
+		License shall, upon 60 days notice from Participant
+		terminate prospectively and automatically at the expiration
+		of such 60 day notice period, unless if within such 60 day
+		period You withdraw Your claim with respect to the
+		Participant Software against such Participant either
+		unilaterally or pursuant to a written agreement with
+		Participant.
+		
+		6.3. In the event of termination under Sections 6.1 or 6.2
+		above, all end user licenses that have been validly granted
+		by You or any distributor hereunder prior to termination
+		(excluding licenses granted to You by any distributor)
+		shall survive termination.
+	
+	7. LIMITATION OF LIABILITY.
+	
+	UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+	(INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
+	INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
+	COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
+	LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
+	CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
+	LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
+	STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+	COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+	INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+	LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
+	INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
+	APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
+	NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
+	CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
+	APPLY TO YOU.
+	
+	8. U.S. GOVERNMENT END USERS.
+	
+	The Covered Software is a "commercial item," as that term is
+	defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
+	computer software" (as that term is defined at 48 C.F.R. ยค
+	252.227-7014(a)(1)) and "commercial computer software
+	documentation" as such terms are used in 48 C.F.R. 12.212 (Sept.
+	1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
+	through 227.7202-4 (June 1995), all U.S. Government End Users
+	acquire Covered Software with only those rights set forth herein.
+	This U.S. Government Rights clause is in lieu of, and supersedes,
+	any other FAR, DFAR, or other clause or provision that addresses
+	Government rights in computer software under this License.
+	
+	9. MISCELLANEOUS.
+	
+	This License represents the complete agreement concerning subject
+	matter hereof. If any provision of this License is held to be
+	unenforceable, such provision shall be reformed only to the
+	extent necessary to make it enforceable. This License shall be
+	governed by the law of the jurisdiction specified in a notice
+	contained within the Original Software (except to the extent
+	applicable law, if any, provides otherwise), excluding such
+	jurisdiction's conflict-of-law provisions. Any litigation
+	relating to this License shall be subject to the jurisdiction of
+	the courts located in the jurisdiction and venue specified in a
+	notice contained within the Original Software, with the losing
+	party responsible for costs, including, without limitation, court
+	costs and reasonable attorneys' fees and expenses. The
+	application of the United Nations Convention on Contracts for the
+	International Sale of Goods is expressly excluded. Any law or
+	regulation which provides that the language of a contract shall
+	be construed against the drafter shall not apply to this License.
+	You agree that You alone are responsible for compliance with the
+	United States export administration regulations (and the export
+	control laws and regulation of any other countries) when You use,
+	distribute or otherwise make available any Covered Software.
+	
+	10. RESPONSIBILITY FOR CLAIMS.
+	
+	As between Initial Developer and the Contributors, each party is
+	responsible for claims and damages arising, directly or
+	indirectly, out of its utilization of rights under this License
+	and You agree to work with Initial Developer and Contributors to
+	distribute such responsibility on an equitable basis. Nothing
+	herein is intended or shall be deemed to constitute any admission
+	of liability.

Added: incubator/wink/trunk/src/licences/jason.txt
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/src/licences/jason.txt?rev=802522&view=auto
==============================================================================
--- incubator/wink/trunk/src/licences/jason.txt (added)
+++ incubator/wink/trunk/src/licences/jason.txt Sun Aug  9 11:42:37 2009
@@ -0,0 +1,21 @@
+	Copyright (c) 2002 JSON.org
+	
+	Permission is hereby granted, free of charge, to any person obtaining a copy
+	of this software and associated documentation files (the "Software"), to deal
+	in the Software without restriction, including without limitation the rights
+	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+	copies of the Software, and to permit persons to whom the Software is
+	furnished to do so, subject to the following conditions:
+	
+	The above copyright notice and this permission notice shall be included in all
+	copies or substantial portions of the Software.
+	
+	The Software shall be used for Good, not Evil.
+	
+	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+	SOFTWARE.
\ No newline at end of file

Added: incubator/wink/trunk/src/licences/slf4j.txt
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/src/licences/slf4j.txt?rev=802522&view=auto
==============================================================================
--- incubator/wink/trunk/src/licences/slf4j.txt (added)
+++ incubator/wink/trunk/src/licences/slf4j.txt Sun Aug  9 11:42:37 2009
@@ -0,0 +1,21 @@
+	 Copyright (c) 2004-2008 QOS.ch
+	 All rights reserved.
+	
+	 Permission is hereby granted, free  of charge, to any person obtaining
+	 a  copy  of this  software  and  associated  documentation files  (the
+	 "Software"), to  deal in  the Software without  restriction, including
+	 without limitation  the rights to  use, copy, modify,  merge, publish,
+	 distribute,  sublicense, and/or sell  copies of  the Software,  and to
+	 permit persons to whom the Software  is furnished to do so, subject to
+	 the following conditions:
+	 
+	 The  above  copyright  notice  and  this permission  notice  shall  be
+	 included in all copies or substantial portions of the Software.
+	 
+	 THE  SOFTWARE IS  PROVIDED  "AS  IS", WITHOUT  WARRANTY  OF ANY  KIND,
+	 EXPRESS OR  IMPLIED, INCLUDING  BUT NOT LIMITED  TO THE  WARRANTIES OF
+	 MERCHANTABILITY,    FITNESS    FOR    A   PARTICULAR    PURPOSE    AND
+	 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+	 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+	 OF CONTRACT, TORT OR OTHERWISE,  ARISING FROM, OUT OF OR IN CONNECTION
+	 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file

Modified: incubator/wink/trunk/wink-scripts/wink-dist/build.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-scripts/wink-dist/build.xml?rev=802522&r1=802521&r2=802522&view=diff
==============================================================================
--- incubator/wink/trunk/wink-scripts/wink-dist/build.xml (original)
+++ incubator/wink/trunk/wink-scripts/wink-dist/build.xml Sun Aug  9 11:42:37 2009
@@ -41,6 +41,7 @@
 	<property name="dist.root" value="${dist}/apache-wink-${project.version}" />
 	<property name="dist.docs" value="${dist.root}/docs" />
 	<property name="dist.docs.api" value="${dist.docs}/api" />
+	<property name="dist.licences" value="${dist.root}/licences" />
 	<property name="dist.dist" value="${dist.root}/dist" />
 	<property name="dist.components" value="${dist.dist}" />
 	<property name="dist.examples" value="${dist.root}/examples" />
@@ -87,6 +88,17 @@
 			</fileset>
 		</copy>
 	</target>
+	
+	<!-- Creates licences folder with all 3-rd party licences -->
+	<target name="create.licences" depends="init">
+		<echo>Copying Licences ...</echo>
+		<mkdir dir="${dist.licences}" />
+		<copy todir="${dist.licences}">
+			<fileset dir="${basedir}/../../src/licences">
+				<include name="**/*.txt" />
+			</fileset>
+		</copy>
+	</target>
 
 	<!-- Creates components folder with jar of each component -->
 	<target name="create.dist.components" depends="init">
@@ -265,7 +277,7 @@
 	</target>
 
 	<!-- Done building distribution -->
-	<target name="dist" depends="create.javadoc, create.dist.components, create.dist.lib, create.dist.root.docs, create.dist.main.jar, create.dist.main.sources.jar, create.examples">
+	<target name="dist" depends="create.javadoc, create.licences, create.dist.components, create.dist.lib, create.dist.root.docs, create.dist.main.jar, create.dist.main.sources.jar, create.examples">
 	</target>
 
 </project>
\ No newline at end of file

Modified: incubator/wink/trunk/wink-scripts/wink-dist/src.xml
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-scripts/wink-dist/src.xml?rev=802522&r1=802521&r2=802522&view=diff
==============================================================================
--- incubator/wink/trunk/wink-scripts/wink-dist/src.xml (original)
+++ incubator/wink/trunk/wink-scripts/wink-dist/src.xml Sun Aug  9 11:42:37 2009
@@ -34,6 +34,7 @@
             <excludes>
                 <exclude>**/target</exclude>
                 <exclude>**/target/**</exclude>
+                <exclude>KEYS</exclude>
             </excludes>
         </fileSet>
     </fileSets>



Mime
View raw message