[Fedora-directory-commits] dsmlgw LICENSE, NONE, 1.1 build.properties, NONE, 1.1 build.xml, 1.1.1.1, 1.2 Makefile, 1.1.1.1, NONE

Fri Apr 18 16:43:40 UTC 2008

Author: rmeggins

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

Modified Files:
	build.xml 
Added Files:
	LICENSE build.properties 
Removed Files:
	Makefile 
Log Message:
initial commit of dsmlgw - updated license to plain old GPLv2 - updated to use axis1.4

--- NEW FILE LICENSE ---
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 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.


--- NEW FILE build.properties ---
axisbin.url=http://apache.mirrors.tds.net/ws/axis/1_4/
#axisbin.dir=/path/to/
axisbin.tgz=axis-bin-1_4.tar.gz
axisbin.tar=axis-bin-1_4.tar
axisname=axis-1_4
#havelocalaxisbin=true


Index: build.xml
===================================================================
RCS file: /cvs/dirsec/dsmlgw/build.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- build.xml	26 Apr 2007 22:28:54 -0000	1.1.1.1
+++ build.xml	18 Apr 2008 16:43:38 -0000	1.2
@@ -12,99 +12,143 @@
  this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
  Place, Suite 330, Boston, MA 02111-1307 USA.
 
- In addition, as a special exception, Red Hat, Inc. gives You the additional
- right to link the code of this Program with code not covered under the GNU
- General Public License ("Non-GPL Code") and to distribute linked combinations
- including the two, subject to the limitations in this paragraph. Non-GPL Code
- permitted under this exception must only link to the code of this Program
- through those well defined interfaces identified in the file named EXCEPTION
- found in the source code files (the "Approved Interfaces"). The files of
- Non-GPL Code may instantiate templates or use macros or inline functions from
- the Approved Interfaces without causing the resulting work to be covered by
- the GNU General Public License. Only Red Hat, Inc. may make changes or
- additions to the list of Approved Interfaces. You must obey the GNU General
- Public License in all respects for all of the Program code and other code used
- in conjunction with the Program except the Non-GPL Code covered by this
- exception. If you modify this file, you may extend this exception to your
- version of the file, but you are not obligated to do so. If you do not wish to
- provide this exception without modification, you must delete this exception
- statement from your version and license this file solely under the GPL without
- exception. 
-
-
  Copyright (C) 2005 Red Hat, Inc.
  All rights reserved.
  END COPYRIGHT BLOCK -->
 <!-- ANT build script for the new dsml gateway -->
-<!-- Possible to compile by hand, use 
-     cd /ldapserver/ldap/clients/dsmlgw
-     ant -Dxerces=../../../../dist/classes/jakarta-tomcat-5.0.27/common/endorsed
- -->
 <project name="dsmlgw" default="dist" basedir=".">
 
-<!-- ******************** Adjustable Properties *********************** -->
-<property name="mcom.root"       value="../../.."/>
-<property name="globaldist.dir"  value="${mcom.root}/../dist/classes"/>
-<property name="ldapdist.dir"    value="${mcom.root}/../dist/classes"/>
-<property name="app.name"        value="dsmlgw"/>
-<property name="taglib.name"     value="dsmlgw"/>
-
-<property name="ldapjdk.jar"     value="${ldapdist.dir}/ldapjdk.jar"/>
-<property name="activation.jar"  value="${globaldist.dir}/activation.jar"/>
-<property name="jaf.jar"  value="${globaldist.dir}/jaf.jar"/>
-<property name="jaxrpc-api.jar"  value="${globaldist.dir}/jaxrpc-api.jar"/>
-<property name="jaxrpc.jar"  value="${globaldist.dir}/jaxrpc.jar"/>
-<property name="saaj.jar"  value="${globaldist.dir}/saaj.jar"/>
-<property name="xercesImpl.jar"  value="${globaldist.dir}/xercesImpl.jar"/>
-<property name="xmlParserAPIs.jar"  value="${globaldist.dir}/xml-apis.jar"/>
-<property name="axis.jar"        value="${globaldist.dir}/axis.jar"/>
-<property name="codec.jar"        value="${globaldist.dir}/jakarta-commons-codec.jar"/>
-<property environment="env"/>
-
-<path id="class.path">
-<pathelement location="${ldapjdk.jar}"/>
-<pathelement location="${activation.jar}"/>
-<pathelement location="${jaf.jar}"/>
-<pathelement location="${jaxrpc-api.jar}"/>
-<pathelement location="${jaxrpc.jar}"/> 
-<pathelement location="${saaj.jar}"/>
-
-<pathelement location="${xercesImpl.jar}"/> 
-<pathelement location="${xmlParserAPIs.jar}"/>
-<pathelement location="${axis.jar}"/>
-<pathelement location="${codec.jar}"/>
-</path>
-
-<property name="build.dir"      value="${mcom.root}/built/dsmlgw"/>
-<property name="dist.dir"       value="${mcom.root}/../dist/dsmlgw"/>
-
-
+	<property file="build.properties" />
 
-<target name="prepare" description="prepares the output directories">
-   <mkdir dir="${build.dir}"/>
-   <mkdir dir="${dist.dir}"/>
-</target>
-
-<target name="library" depends="classpath,prepare" description="builds it">
-<javac srcdir="." destdir="${build.dir}" classpathref="class.path" debug="on"/>
-</target>
-
-
-  <!-- Create the library distribution files -->
-<target name="dist" depends="classpath,library" description="makes the distribution">
-    <jar jarfile="${dist.dir}/dsmlgw.jar" basedir="${build.dir}"/>
-
-  </target>
-
-  <target name="clean" description="makes clean">
-    <delete dir="${build.dir}"/>
-    <delete dir="${dist.dir}"/>
-  </target>
-
-<property name="classpath" refid="class.path"/>
-  <target name="classpath">
-    <echo message="${classpath}"/>
-  </target>
+	<!-- ******************** Adjustable Properties *********************** -->
+	<property name="globaldist.dir" location="/usr/share/java" />
+	<property name="ldapdist.dir"   location="/usr/share/java" />
+
+	<!-- If using the binary distribution of axis 1.4, the axisdist.dir
+		 will be /path/to/axis-1_4 and the lib dir is the "lib" dir
+		 under that - use -Daxisbinpkg=true -Daxisdist.dir=/path/to/axis-1_4
+		 on the command line - otherwise, it will default to using
+		 /usr/share/java and /usr/share/java/axis
+	-->
+	<property name="axisdist.dir" location="/usr/share/java/axis" />
+	<property name="axis.lib.dir"  location="/usr/share/java/axis" />
+
+	<!-- These are the jars needed for building - the first 3 are usually
+		 found in the ${axis.home}/lib directory from the binary distribution
+	-->
+	<property name="saaj.jar"       location="${axis.lib.dir}/saaj.jar" />
+	<property name="jaxrpc.jar"     location="${axis.lib.dir}/jaxrpc.jar" />
+	<property name="axis.jar"       location="${axis.lib.dir}/axis.jar" />
+	<property name="ldapjdk.jar"    location="${ldapdist.dir}/ldapjdk.jar" />
+	<property name="activation.jar" location="${globaldist.dir}/activation.jar" />
+	<property name="codec.jar"      location="${globaldist.dir}/jakarta-commons-codec.jar" />
+
+	<!-- These are the jars needed at run time, in addition to the ones
+		 above needed for building
+	-->
+	<property name="mail.jar"       location="${globaldist.dir}/mail.jar" />
+
+	<property environment="env" />
+
+	<path id="class.path">
+		<pathelement location="${ldapjdk.jar}" />
+		<pathelement location="${saaj.jar}" />
+		<pathelement location="${axis.jar}" />
+		<pathelement location="${codec.jar}" />
+		<pathelement location="${activation.jar}" />
+		<pathelement location="${jaxrpc.jar}" />
+	</path>
+
+	<!-- place to write class files and other transient files
+		 generated during build process -->
+	<property name="build.dir" value="${mcom.root}/built/dsmlgw" />
+	<!-- place to write final jar file and webapps files/dirs -->
+	<property name="dist.dir" value="${mcom.root}/../dist/dsmlgw" />
+	<!-- see if we are using the binary axis package and if it is local -->
+	<available file="${axisdist.dir}/webapps/axis" type="dir"
+		property="haveaxisbinpkg"/>
+	<available file="${axisdist.dir}" type="dir"
+		property="havelocalaxisbin"/>
+
+	<target name="help" description="get help">
+		<echo>
+There are 6 jar files required to build ${ant.project.name}, specified
+by the following properties:
+	ldapjdk.jar - the Mozilla LDAP Java SDK
+	codec.jar - the Jakarta Commons codec
+	activation.jar - the Java Activation Framework - Sun or Classpathx
+These 3 are provided by Axis:
+	axis.jar, saaj.jar, jaxrpc.jar
+			
+On many linux systems, all of these jars are available in /usr/share/java
+or whatever the java datadir is.  Axis is usually provided in the axis
+subdir of this.
+
+If you want to build using the axis binary distribution from ws.apache.org/axis,
+download and unpack it.  The top level directory will be axis-1_4.  The two main
+subdirs that ${ant.project.name} requires are "lib" and "webapps".  lib is needed
+during building, to find the axis jars listed above.  webapps is used in packaging
+the ${ant.project.name} as a standard web app or WAR.  In order to use the binary
+distribution, you must specify the properties on the command line like this:
+-Daxisdist.dir=/path/to/axis-1_4 -Daxis.lib.dir=/path/to/axis-1_4/lib
+		</echo>
+	</target>
+
+	<target name="unzipaxisbinlocal" description="unzip a local axis bin tgz" if="havelocalaxisbin">
+		<gunzip dest="${dist.dir}/${axisbin.tar}" src="${axisbin.dir}/${axisbin.tgz}" />
+	</target>
+
+	<target name="unzipaxisbinremote" description="download and unzip a remote axis bin tgz" unless="havelocalaxisbin">
+		<get dest="${dist.dir}/${axisbin.tgz}" src="${axisbin.url}${axisbin.tgz}" verbose="true" usetimestamp="true" />
+		<gunzip dest="${dist.dir}/${axisbin.tar}" src="${dist.dir}/${axisbin.tgz}" />
+	</target>
+
+	<!-- the useaxisbinpkg target is based on the package
+		 axis-bin-1_4.tar.gz available from ws.apache.org download -->
+	<target name="useaxisbinpkg" description="extract the webapps part of the binary axis tgz" if="haveaxisbinpkg" depends="unzipaxisbinlocal,unzipaxisbinremote">
+		<untar src="${dist.dir}/${axisbin.tar}" dest="${dist.dir}">
+			<patternset>
+				<include name="${axisname}/webapps/axis/**" />
+			</patternset>
+		</untar>
+		<move file="${dist.dir}/${axisname}/webapps" todir="${dist.dir}" />
+		<delete dir="${dist.dir}/${axisname}" />
+		<delete file="${dist.dir}/${axisbin.tar}" />
+	</target>
+
+	<target name="mkwebappsdirs" description="make the webapps directory layout"
+		unless="haveaxisbinpkg">
+		<mkdir dir="${dist.dir}/webapps/axis/WEB-INF/lib" />
+		<mkdir dir="${dist.dir}/webapps/axis/WEB-INF/classes" />
+	</target>
+
+	<target name="pkgwebapp" description="create the webapps layout, prepare for WAR" depends="dist,useaxisbinpkg,mkwebappsdirs">
+	</target>
+
+	<target name="prepare" description="prepares the output directories">
+		<mkdir dir="${build.dir}" />
+		<mkdir dir="${dist.dir}" />
+	</target>
+
+	<target name="library" depends="classpath,prepare" description="builds it">
+		<javac srcdir="." destdir="${build.dir}" classpathref="class.path" debug="on" />
+	</target>
+
+
+	<!-- Create the library distribution files -->
+	<target name="dist" depends="classpath,library" description="makes the distribution">
+		<jar jarfile="${dist.dir}/dsmlgw.jar" basedir="${build.dir}" />
+	</target>
+
+	<target name="clean" description="makes clean">
+		<delete dir="${build.dir}" />
+		<delete dir="${dist.dir}" />
+	</target>
+
+	<property name="classpath" refid="class.path" />
+	<target name="classpath">
+		<echo message="${classpath}" />
+	</target>
 
 
 </project>


--- Makefile DELETED ---


