[Fedora-directory-commits] dsmlgw LICENSE, 1.1, 1.2 build.xml, 1.9, 1.10

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/dsmlgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24176/dsmlgw

Modified Files:
	LICENSE build.xml 
Log Message:
relicense all files under the GPLv2 + gnu classpathx exception - remove etc/dirsrv/dsmlgw/dsmlgw.cfg - the ant tar task has to explicitly set the executable mode of scripts


Index: LICENSE
===================================================================
RCS file: /cvs/dirsec/dsmlgw/LICENSE,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LICENSE	18 Apr 2008 16:43:38 -0000	1.1
+++ LICENSE	30 Apr 2008 20:49:21 -0000	1.2
@@ -1,13 +1,18 @@
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+This Program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
 
-This program is distributed in the hope that it will be useful,
+This Program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+
+As a special exception, if you link this library with other files to
+produce an executable, this library does not by itself cause the
+resulting executable to be covered by the GNU General Public License.
+This exception does not however invalidate any other reasons why the
+executable file might be covered by the GNU General Public License.


Index: build.xml
===================================================================
RCS file: /cvs/dirsec/dsmlgw/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml	25 Apr 2008 02:28:09 -0000	1.9
+++ build.xml	30 Apr 2008 20:49:21 -0000	1.10
@@ -1,16 +1,23 @@
 <?xml version='1.0'?>
 <!-- BEGIN COPYRIGHT BLOCK
- This Program is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free Software
- Foundation; version 2 of the License.
- 
- This Program is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License along with
- this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- Place, Suite 330, Boston, MA 02111-1307 USA.
+ This Program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+
+ This Program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+
+ As a special exception, if you link this library with other files to
+ produce an executable, this library does not by itself cause the
+ resulting executable to be covered by the GNU General Public License.
+ This exception does not however invalidate any other reasons why the
+ executable file might be covered by the GNU General Public License.
 
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
@@ -226,18 +233,22 @@
 		<copyfilter file="scripts/ldif2dsml.in"
 			tofile="${pkg.dir}${dsmlgwbindir}/ldif2dsml"/>
 		<chmod file="${pkg.dir}${dsmlgwbindir}/ldif2dsml" perm="0755"/>
-		<copy file="misc/dsmlgw.cfg" todir="${pkg.dir}${dsmlgwconfigdir}"/>
-		<chmod file="${pkg.dir}${dsmlgwconfigdir}/dsmlgw.cfg" perm="0644"/>
 		<copy todir="${pkg.dir}${dsmlgwdatadir}/data">
 			<fileset dir="dsml">
 				<include name="*.dsml"/>
 			</fileset>
 		</copy>
-		<tar destfile="${dist.dir}/${ant.project.name}-${version}.tar"
-			basedir="${pkg.dir}"/>
-		<gzip zipfile="${dist.dir}/${ant.project.name}-${version}.tar.gz"
-			src="${dist.dir}/${ant.project.name}-${version}.tar"/>
-		<delete file="${dist.dir}/${ant.project.name}-${version}.tar"/>
+		<tar destfile="${dist.dir}/${ant.project.name}-${version}.tar.gz"
+			compression="gzip">
+			<tarfileset dir="${pkg.dir}" mode="0755">
+				<include name="**/bin/**"/>
+				<include name="**/sbin/**"/>
+			</tarfileset>
+			<tarfileset dir="${pkg.dir}">
+				<exclude name="**/bin/**"/>
+				<exclude name="**/sbin/**"/>
+			</tarfileset>
+		</tar>
 	</target>
 
 	<target name="prepare" description="prepares the output directories">