Author: jleroux
Date: Sun Sep 14 02:16:41 2008
New Revision: 695153
URL: http://svn.apache.org/viewvc?rev=695153&view=rev
Log:
Amend r694647 : [A modified patch from Shi Yusen "CASifying OFBiz"
(https://issues.apache.org/jira/browse/OFBIZ-1689) - OFBIZ-1689)]
JA-SIG CAS is BSD licenced : LICENSE and NOTICE files updated in regard to that
Updated jar to last version (from 3.1 to 3.3)
Removed the snippet in build.xml which copied LICENSE, NOTICE and possibly
other files in MET2A-INF directory. Following Adam's r685934 initiative there
are only copied in jars now.
Wiki updated too
Added:
ofbiz/trunk/specialpurpose/ldap/lib/cas-server-core-3.3.jar (with props)
Removed:
ofbiz/trunk/specialpurpose/ldap/lib/cas-server-core-3.1.jar
Modified:
ofbiz/trunk/LICENSE
ofbiz/trunk/NOTICE
ofbiz/trunk/specialpurpose/ldap/build.xml
Modified: ofbiz/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=695153&r1=695152&r2=695153&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Sun Sep 14 02:16:41 2008
@@ -431,6 +431,7 @@
ofbiz/trunk/specialpurpose/pos/lib/looks-2.0.2.jar
ofbiz/trunk/framework/base/lib/javolution-5.2.3.jar
ofbiz/trunk/framework/images/webapp/images/dojo/*
+ofbiz/trunk/specialpurpose/ldap/lib/cas-server-core-3.3.jar
=========================================================================
The BSD License
@@ -2532,35 +2533,3 @@
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
====================================================================================
-
-====================================================================================
-The following libraries distributed with Apache OFBiz are licensed under the
-JA-SIG License
-ofbiz/trunk/specialpurpose/ldap/lib/cas-server-core-3.1.jar
-=========================================================================
-Copyright (c) 2007, JA-SIG, Inc.
-
-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 JA-SIG, Inc. 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 COPYRIGHT OWNER 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: ofbiz/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/NOTICE?rev=695153&r1=695152&r2=695153&view=diff
==============================================================================
--- ofbiz/trunk/NOTICE (original)
+++ ofbiz/trunk/NOTICE Sun Sep 14 02:16:41 2008
@@ -371,11 +371,3 @@
Java PIM Library (jpim)
Copyright (c) 2001-2003 jpim development team.
-
-=========================================================================
-== CAS Notice ==
-=========================================================================
-
-This product includes software developed by the
-Java Architectures (JA-SIG) association (http://www.ja-sig.org/).
-
Modified: ofbiz/trunk/specialpurpose/ldap/build.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ldap/build.xml?rev=695153&r1=695152&r2=695153&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ldap/build.xml (original)
+++ ofbiz/trunk/specialpurpose/ldap/build.xml Sun Sep 14 02:16:41 2008
@@ -91,15 +91,6 @@
</classpath>
<src path="${src.dir}"/>
</javac>
- <copy todir="${build.dir}/classes">
- <!-- don't put the DTDs in the jar file... -->
- <fileset dir="${src.dir}"
includes="**/*.properties,**/*.xml,**/*.bsh,**/*.logic,**/*.js,**/*.jacl,**/*.py"/>
- </copy>
-
- <!-- now add the NOTICE and LICENSE files to allow the jar file to be
distributed alone -->
- <copy todir="${build.dir}/classes/META-INF">
- <fileset dir="${ofbiz.home.dir}" includes="NOTICE,LICENSE"/>
- </copy>
</target>
<target name="jar" depends="classes">
Added: ofbiz/trunk/specialpurpose/ldap/lib/cas-server-core-3.3.jar
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ldap/lib/cas-server-core-3.3.jar?rev=695153&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ofbiz/trunk/specialpurpose/ldap/lib/cas-server-core-3.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
