[Fedora-directory-commits] ldapserver buildpaths.mk, 1.9, 1.10 components.mk, 1.37, 1.38 internal_comp_deps.mk, 1.33, 1.34

[Doctor Conrad]

Author: rmeggins

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23344/ldapserver

Modified Files:
	buildpaths.mk components.mk internal_comp_deps.mk 
Log Message:
Bug(s) fixed: 178479
Bug Description: DSMLGW code uses non-standard sun.misc.Base64Encoder
Reviewed by: The team (Thanks!)
Fix Description: Added jakarta-commons-codec.jar to the DS build and 
packaging.  We will need to add this file to the bundle of dsmlgw jar 
files on /share/builds/components.
Platforms tested: Fedora Core 4
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none



Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/buildpaths.mk,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- buildpaths.mk	31 Oct 2005 15:55:24 -0000	1.9
+++ buildpaths.mk	10 Feb 2006 23:21:43 -0000	1.10
@@ -122,9 +122,13 @@
 SETUPUTIL_SOURCE_ROOT = $(BUILD_ROOT)/../setuputil
 #SETUPUTIL_BUILD_DIR = $(NSCP_DISTDIR_FULL_RTL)/setuputil
 
-# it's customary and easier to use the pre-built jars
+# it's customary and easier to use the pre-built jar
+# you can get this from www.jpackage.org as well
+# we usually get this from the admin server package which
+# gets it from the console package
 #LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
 # Crimson - crimson.jar - http://xml.apache.org/crimson/
+# you can get this from www.jpackage.org as well
 #CRIMSON_SOURCE_DIR = $(BUILD_ROOT)/../crimson
 
 ADMINSERVER_SOURCE_ROOT = $(BUILD_ROOT)/../adminserver
@@ -133,9 +137,16 @@
 
 # these are the files needed to build the java components - xmltools and dsmlgw -
 # and where to get them
+# NOTE: www.jpackage.org has almost all of these, and you can configure yum or apt
+# or up2date or whatever your package manager is to pull them, which is nice because it
will
+# also take care of the dependencies - http://www.jpackage.org/repos.php
 # Axis - axis.jar - http://ws.apache.org/axis/index.html - also jaxrpc.jar,saaj.jar
 # Xerces-J - xercesImpl.jar, xml-apis.jar http://xml.apache.org/xerces2-j/download.cgi
 # JAF - activation.jar - http://java.sun.com/products/javabeans/glasgow/jaf.html
+# OR
+# JAF - activation.jar or jaf.jar - http://www.jpackage.org
+# NOTE - classpathx-jaf may also work
+# Codec - jakarta-commons-codec.jar - http://jakarta.apache.org/commons/codec/
 # JWSDP - jaxrpc-api.jar,jaxrpc.jar,saaj.jar -
http://java.sun.com/webservices/downloads/webservicespack.html
 # all of these files need to be in the following directory:
 DSMLGWJARS_BUILD_DIR = $(BUILD_ROOT)/../dsmlgwjars


Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- components.mk	8 Nov 2005 15:58:16 -0000	1.37
+++ components.mk	10 Feb 2006 23:21:43 -0000	1.38
@@ -555,7 +555,7 @@
 AXIS_FILES = $(AXIS)
 AXIS_FILE = $(CLASS_DEST)/$(AXIS)
 
-DSMLJAR = activation.jar,jaxrpc-api.jar,jaxrpc.jar,saaj.jar,xercesImpl.jar,xml-apis.jar
+DSMLJAR =
activation.jar,jaxrpc-api.jar,jaxrpc.jar,saaj.jar,xercesImpl.jar,xml-apis.jar,jakarta-commons-codec.jar
 DSMLJAR_FILE = $(CLASS_DEST)
 
 CRIMSON_LICENSE = LICENSE.crimson


Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_comp_deps.mk,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- internal_comp_deps.mk	7 Dec 2005 21:25:50 -0000	1.33
+++ internal_comp_deps.mk	10 Feb 2006 23:21:43 -0000	1.34
@@ -450,7 +450,7 @@
 DSMLJAR_RELEASE = $(COMPONENTS_DIR)
 #DSMLJARJAR_DIR = $(DSMLJARJAR_RELEASE)/$(DSMLJARJAR_COMP)/$(DSMLJARJAR_VERSION)
 DSMLJAR_DIR = $(DSMLJAR_RELEASE)/dsmljars
-DSMLJAR_DEP = $(CLASS_DEST)/activation.jar $(CLASS_DEST)/jaxrpc-api.jar
$(CLASS_DEST)/jaxrpc.jar $(CLASS_DEST)/saaj.jar $(CLASS_DEST)/xercesImpl.jar
$(CLASS_DEST)/xml-apis.jar
+DSMLJAR_DEP = $(CLASS_DEST)/activation.jar $(CLASS_DEST)/jaxrpc-api.jar
$(CLASS_DEST)/jaxrpc.jar $(CLASS_DEST)/saaj.jar $(CLASS_DEST)/xercesImpl.jar
$(CLASS_DEST)/xml-apis.jar $(CLASS_DEST)/jakarta-commons-codec.jar
 
 ifndef DSMLJAR_PULL_METHOD
 DSMLJAR_PULL_METHOD = $(COMPONENT_PULL_METHOD)