incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1309107 [3/3] - in /incubator/lcf/branches/release-0.5-incubating-branch: ./ CHANGES.txt LICENSE.txt README.txt build.xml dist-license/ lib-license/
Date Tue, 03 Apr 2012 19:36:22 GMT
Modified: incubator/lcf/branches/release-0.5-incubating-branch/README.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.5-incubating-branch/README.txt?rev=1309107&r1=1309106&r2=1309107&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.5-incubating-branch/README.txt (original)
+++ incubator/lcf/branches/release-0.5-incubating-branch/README.txt Tue Apr  3 19:36:22 2012
@@ -23,12 +23,6 @@ For a complete description of the Manifo
 code repositories, and other details, please see the ManifoldCF web site at
 http://incubator.apache.org/connectors
 
-
-Getting Started
----------------
-
-You will need to build ManifoldCF before you can do anything else.
-
 Instructions for Building Apache ManifoldCF from Source
 -----------------------------------------------------
 
@@ -121,11 +115,6 @@ may be subject to export controls on cry
 
     - HTTPS support
 
-  ManifoldCF interfaces with the
-  Java Cryptography Extension (JCE) API to provide
-
-    - NTLM authentication
-
   ManifoldCF does not include any
   implementation of JSSE or JCE.
 
@@ -135,103 +124,3 @@ Contact
   o For general information visit the main project site at
     http://incubator.apache.org/connectors
 
-
-=========================================================================
-==     Jetty Notice                                                    ==
-=========================================================================
-==============================================================
- Jetty Web Container 
- Copyright 1995-2006 Mort Bay Consulting Pty Ltd
-==============================================================
-
-This product includes some software developed at The Apache Software 
-Foundation (http://www.apache.org/).
-
-The javax.servlet package used by Jetty is copyright 
-Sun Microsystems, Inc and Apache Software Foundation. It is 
-distributed under the Common Development and Distribution License.
-You can obtain a copy of the license at 
-https://glassfish.dev.java.net/public/CDDLv1.0.html.
-
-The UnixCrypt.java code ~Implements the one way cryptography used by
-Unix systems for simple password protection.  Copyright 1996 Aki Yoshida,
-modified April 2001  by Iris Van den Broeke, Daniel Deville.
-
-The default JSP implementation is provided by the Glassfish JSP engine
-from project Glassfish http://glassfish.dev.java.net.  Copyright 2005
-Sun Microsystems, Inc. and portions Copyright Apache Software Foundation.
-
-Some portions of the code are Copyright:
-  2006 Tim Vernum 
-  1999 Jason Gilbert.
-
-The jboss integration module contains some LGPL code.
-
-=========================================================================
-==     HSQLDB Notice                                                   ==
-=========================================================================
-
-For content, code, and products originally developed by Thomas Mueller and the Hypersonic
SQL Group:
-
-Copyright (c) 1995-2000 by the Hypersonic SQL Group.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-Neither the name of the Hypersonic SQL Group nor the names of its
-contributors may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE HYPERSONIC SQL GROUP,
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This software consists of voluntary contributions made by many individuals on behalf of the
-Hypersonic SQL Group.
-
-For work added by the HSQL Development Group (a.k.a. hsqldb_lic.txt):
-
-Copyright (c) 2001-2005, The HSQL Development Group
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-Neither the name of the HSQL Development Group nor the names of its
-contributors may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG,
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Modified: incubator/lcf/branches/release-0.5-incubating-branch/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.5-incubating-branch/build.xml?rev=1309107&r1=1309106&r2=1309107&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.5-incubating-branch/build.xml (original)
+++ incubator/lcf/branches/release-0.5-incubating-branch/build.xml Tue Apr  3 19:36:22 2012
@@ -1002,6 +1002,8 @@
         <delete file="dist/example-proprietary/properties.xml"/>
         <delete file="dist/multiprocess-example/properties.xml"/>
         <delete file="dist/multiprocess-example-proprietary/properties.xml"/>
+        <delete file="dist/NOTICE.txt"/>
+        <delete file="dist/LICENSE.txt"/>
     </target>
     
     <target name="deliver-framework" depends="preclean-for-delivery,build-framework" if="downloaded">
@@ -1053,6 +1055,9 @@
         <chmod dir="dist/example-proprietary" perm="a+x" includes="**/*.sh"/>
         <chmod dir="dist/multiprocess-example" perm="a+x" includes="**/*.sh"/>
         <chmod dir="dist/multiprocess-example-proprietary" perm="a+x" includes="**/*.sh"/>
+        <copy todir="dist" file="dist-license/README.txt"/>
+        <copy todir="dist" file="dist-license/NOTICE.txt"/>
+        <copy todir="dist" file="dist-license/LICENSE.txt"/>
     </target>
     
     <target name="deliver-framework-doc" depends="doc-framework" if="downloaded">
@@ -2441,6 +2446,8 @@
           <include name="/lib/"/>
           <include name="/connectors/*/lib/"/>
           <include name="/framework/lib/"/>
+        </zipfileset>
+        <zipfileset dir="lib-license" prefix="apache-manifoldcf-${release-version}">
           <include name="*.txt"/>
         </zipfileset>
       </zip>
@@ -2493,77 +2500,24 @@
 
     <target name="create-bin-zip" depends="build,doc,javadoc,set-version">
       <zip destfile="apache-manifoldcf-${release-version}-bin.zip" update="false">
-        <zipfileset dir="." prefix="apache-manifoldcf-${release-version}">
-          <exclude name="/build/"/>
-          <exclude name="/target/"/>
-          <exclude name="/lib/"/>
-          <exclude name="/lib-proprietary/"/>
-          <exclude name="/upstream-diffs/"/>
-          <exclude name="/json/"/>
-          <exclude name="/site/"/>
-          <exclude name="/connectors/"/>
-          <exclude name="/framework/"/>
-          <exclude name="/tests/"/>
-          <exclude name="/mod-authz-annotate/"/>
-          <exclude name="mvn-bootstrap.*"/>
-          <exclude name="build.xml"/>
-          <exclude name="common-build.xml"/>
-          <exclude name="pom.xml"/>
-          <exclude name="/test-materials/"/>
-          <exclude name="**/lib-proprietary/*.jar"/>
-          <exclude name="**/test-materials-proprietary/*.jar"/>
-          <exclude name="**/lib-proprietary/*.war"/>
-          <exclude name="**/test-materials-proprietary/*.war"/>
-          <exclude name="**/lib-proprietary/*.wsdl"/>
-          <exclude name="**/test-materials-proprietary/*.wsdl"/>
-          <exclude name="**/lib-proprietary/*.xsd"/>
-          <exclude name="**/test-materials-proprietary/*.xsd"/>
-          <exclude name="/legacy-*/"/>
-          <exclude name="dist/connector-lib-proprietary/*.jar"/>
-          <exclude name="dist/connectors-proprietary.xml"/>
-          <exclude name="dist/example-proprietary/"/>
-          <exclude name="dist/multiprocess-example-proprietary/"/>
-          <exclude name="dist/web-proprietary/"/>
-          <exclude name="apache-manifoldcf-*"/>
-          <exclude name="*.xml"/>
+        <zipfileset dir="dist" prefix="apache-manifoldcf-${release-version}">
+          <exclude name="connector-lib-proprietary/*.jar"/>
+          <exclude name="connectors-proprietary.xml"/>
+          <exclude name="/example-proprietary/"/>
+          <exclude name="/multiprocess-example-proprietary/"/>
+          <exclude name="/web-proprietary/"/>
         </zipfileset>
       </zip>
     </target>
     
     <target name="create-bin-tar" depends="build,doc,javadoc,set-version">
       <tar destfile="apache-manifoldcf-${release-version}-bin.tar.gz" compression="gzip"
longfile="gnu">
-        <tarfileset dir="." prefix="apache-manifoldcf-${release-version}">
-          <exclude name="/build/"/>
-          <exclude name="/target/"/>
-          <exclude name="/lib/"/>
-          <exclude name="/lib-proprietary/"/>
-          <exclude name="/upstream-diffs/"/>
-          <exclude name="/json/"/>
-          <exclude name="/site/"/>
-          <exclude name="/connectors/"/>
-          <exclude name="/framework/"/>
-          <exclude name="/tests/"/>
-          <exclude name="/mod-authz-annotate/"/>
-          <exclude name="mvn-bootstrap.*"/>
-          <exclude name="build.xml"/>
-          <exclude name="common-build.xml"/>
-          <exclude name="pom.xml"/>
-          <exclude name="/test-materials/"/>
-          <exclude name="**/lib-proprietary/*.jar"/>
-          <exclude name="**/test-materials-proprietary/*.jar"/>
-          <exclude name="**/lib-proprietary/*.war"/>
-          <exclude name="**/test-materials-proprietary/*.war"/>
-          <exclude name="**/lib-proprietary/*.wsdl"/>
-          <exclude name="**/test-materials-proprietary/*.wsdl"/>
-          <exclude name="**/lib-proprietary/*.xsd"/>
-          <exclude name="**/test-materials-proprietary/*.xsd"/>
-          <exclude name="/legacy-*/"/>
-          <exclude name="dist/connector-lib-proprietary/*.jar"/>
-          <exclude name="dist/connectors-proprietary.xml"/>
-          <exclude name="dist/example-proprietary/"/>
-          <exclude name="dist/multiprocess-example-proprietary/"/>
-          <exclude name="dist/web-proprietary/"/>
-          <exclude name="apache-manifoldcf-*"/>
+        <tarfileset dir="dist" prefix="apache-manifoldcf-${release-version}">
+          <exclude name="connector-lib-proprietary/*.jar"/>
+          <exclude name="connectors-proprietary.xml"/>
+          <exclude name="/example-proprietary/"/>
+          <exclude name="/multiprocess-example-proprietary/"/>
+          <exclude name="/web-proprietary/"/>
         </tarfileset>
       </tar>
     </target>



Mime
View raw message