[Fedora-directory-commits] mod_admserv aclocal.m4, 1.4, 1.5 Makefile.am, 1.7, 1.8 Makefile.in, 1.10, 1.11 configure.in, 1.9, 1.10 configure, 1.11, 1.12
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/mod_admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10047
Modified Files:
aclocal.m4 Makefile.am Makefile.in configure.in configure
Log Message:
This allows the mod_admserv configure to figure out what adminutil
version to use. It looks in the given directory and extracts the
version number from the end of the first matching libadminutil.
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/mod_admserv/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.am 19 Aug 2005 14:49:57 -0000 1.7
+++ Makefile.am 28 Oct 2005 01:57:54 -0000 1.8
@@ -6,7 +6,7 @@
## Set the includes and libraries needed
INCLUDES = -I@apache_inc@ @apr_inc@ @adminutil_inc@ @nspr_inc@ @ldapsdk_inc@ @nss_inc@
-LIBS = @adminutil_lib@ -ladminutil71 -ladmsslutil71 @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3
+LIBS = @adminutil_lib@ -ladminutil@adminutil_ver@ -ladmsslutil@adminutil_ver@ @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3
install-libLTLIBRARIES: libmodadmserv.la
@APXS@ -i -a -n admserv libmodadmserv.la
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/mod_admserv/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.in 26 Sep 2005 19:52:01 -0000 1.10
+++ Makefile.in 28 Oct 2005 01:57:54 -0000 1.11
@@ -85,6 +85,7 @@
VERSION = @VERSION@
adminutil_inc = @adminutil_inc@
adminutil_lib = @adminutil_lib@
+adminutil_ver = @adminutil_ver@
am__include = @am__include@
am__quote = @am__quote@
apache_bin = @apache_bin@
@@ -103,7 +104,7 @@
libmodadmserv_la_SOURCES = mod_admserv.c
INCLUDES = -I@apache_inc@ @apr_inc@ @adminutil_inc@ @nspr_inc@ @ldapsdk_inc@ @nss_inc@
-LIBS = @adminutil_lib@ -ladminutil71 -ladmsslutil71 @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3
+LIBS = @adminutil_lib@ -ladminutil@adminutil_ver@ -ladmsslutil@adminutil_ver@ @ldapsdk_lib@ -lssldap50 -lprldap50 -lldap50 @nss_lib@ -lssl3 -lnss3
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
Index: configure.in
===================================================================
RCS file: /cvs/dirsec/mod_admserv/configure.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- configure.in 26 Sep 2005 19:40:08 -0000 1.9
+++ configure.in 28 Oct 2005 01:57:54 -0000 1.10
@@ -225,6 +225,13 @@
ADMINUTILDIR=$withval
adminutil_inc="-I$ADMINUTILDIR/include"
adminutil_lib="-L$ADMINUTILDIR/lib"
+ for file in $ADMINUTILDIR/lib/* ; do
+ echo $file | grep 'libadminutil[0-9][0-9]' && adminutil_ver=`echo $file | sed -e 's/.*libadminutil\([0-9][0-9]\).*/\1/'` ; break
+ done
+ if test -z "$adminutil_ver"
+ then
+ adminutil_ver=10
+ fi
else
echo
AC_MSG_ERROR([$withval not found])
@@ -313,6 +320,7 @@
AC_SUBST(ldapsdk_lib)
AC_SUBST(adminutil_inc)
AC_SUBST(adminutil_lib)
+AC_SUBST(adminutil_ver)
AC_SUBST(nss_inc)
AC_SUBST(nss_lib)
Index: configure
===================================================================
RCS file: /cvs/dirsec/mod_admserv/configure,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- configure 26 Sep 2005 19:52:01 -0000 1.11
+++ configure 28 Oct 2005 01:57:54 -0000 1.12
@@ -466,7 +466,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL APR_CONFIG APXS PKG_CONFIG apr_inc apache_inc apache_conf apache_prefix apache_bin nspr_inc ldapsdk_inc ldapsdk_lib adminutil_inc adminutil_lib nss_inc nss_lib LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL APR_CONFIG APXS PKG_CONFIG apr_inc apache_inc apache_conf apache_prefix apache_bin nspr_inc ldapsdk_inc ldapsdk_lib adminutil_inc adminutil_lib adminutil_ver nss_inc nss_lib LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -8588,6 +8588,13 @@
ADMINUTILDIR=$withval
adminutil_inc="-I$ADMINUTILDIR/include"
adminutil_lib="-L$ADMINUTILDIR/lib"
+ for file in $ADMINUTILDIR/lib/* ; do
+ echo $file | grep 'libadminutil0-90-9' && adminutil_ver=`echo $file | sed -e 's/.*libadminutil\(0-90-9\).*/\1/'` ; break
+ done
+ if test -z "$adminutil_ver"
+ then
+ adminutil_ver=10
+ fi
else
echo
{ { echo "$as_me:$LINENO: error: $withval not found" >&5
@@ -8758,6 +8765,7 @@
+
# Write config.status and the Makefile
ac_config_files="$ac_config_files Makefile"
cat >confcache <<\_ACEOF
@@ -9472,6 +9480,7 @@
s,@ldapsdk_lib@,$ldapsdk_lib,;t t
s,@adminutil_inc@,$adminutil_inc,;t t
s,@adminutil_lib@,$adminutil_lib,;t t
+s,@adminutil_ver@,$adminutil_ver,;t t
s,@nss_inc@,$nss_inc,;t t
s,@nss_lib@,$nss_lib,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
18 years, 6 months
[Fedora-directory-commits] ldapserver/ldap/cm/newinst setup, 1.9.2.5, 1.9.2.6 setup.patch, 1.1.2.4, 1.1.2.5
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28847/newinst
Modified Files:
Tag: Directory71RtmBranch
setup setup.patch
Log Message:
[171817] RHEL full install from service pack rpm cannot process security files
dssecure.txt and assecure.txt are the temporary file created in the setup
script, which is generated only when slapd instance and admin server are
installed, respectively. But they were checked even if it was the fresh
install.
Index: setup
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -u -r1.9.2.5 -r1.9.2.6
--- setup 25 Oct 2005 20:37:05 -0000 1.9.2.5
+++ setup 27 Oct 2005 17:50:16 -0000 1.9.2.6
@@ -316,38 +316,43 @@
}
SSLOn() {
- for dir in `cat dssecure.txt` ; do
- if [ -f $dir/config/dse.ldif ]; then
- security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
- $dir/stop-slapd
- cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 on/g" > $dir/config/dse.ldif.0
- mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
- echo "$dir/config/dse.ldif: SSL on ..."
- echo "Restarting Directory Server: $dir/start-slapd"
- $dir/start-slapd
- fi
- done
+ if [ -f dssecure.txt ]; then
+ for dir in `cat dssecure.txt` ; do
+ if [ -f $dir/config/dse.ldif ]; then
+ security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
+ $dir/stop-slapd
+ cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 on/g" > $dir/config/dse.ldif.0
+ mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
+ echo "$dir/config/dse.ldif: SSL on ..."
+ echo "Restarting Directory Server: $dir/start-slapd"
+ $dir/start-slapd
+ fi
+ done
+ rm -f dssecure.txt > /dev/null 2>&1
+ fi
if [ $isadminsslon -ne 0 ]; then
$sroot/stop-admin
fi
- for confline in `cat assecure.txt` ; do
- conffile=`echo $confline | awk -F= '{print $1}'`
- confparam=`echo $confline | awk -F= '{print $2}'`
- echo $conffile | grep "\.xml$" > /dev/null 2>&1
- rval=$?
- if [ $rval -eq 0 ]; then
- adminXmlSSLOn $conffile $confparam
- else
- adminSSLOn $conffile $confparam
- fi
- done
+ if [ -f assecure.txt ]; then
+ for confline in `cat assecure.txt` ; do
+ conffile=`echo $confline | awk -F= '{print $1}'`
+ confparam=`echo $confline | awk -F= '{print $2}'`
+ echo $conffile | grep "\.xml$" > /dev/null 2>&1
+ rval=$?
+ if [ $rval -eq 0 ]; then
+ adminXmlSSLOn $conffile $confparam
+ else
+ adminSSLOn $conffile $confparam
+ fi
+ done
+ rm -f assecure.txt > /dev/null 2>&1
+ fi
if [ $isadminsslon -ne 0 ]; then
echo "Restarting Administration Server: $sroot/start-admin"
$sroot/start-admin
fi
- rm -f dssecure.txt assecure.txt > /dev/null 2>&1
}
# check whether it is an in-place installation
setup.patch:
Index: setup.patch
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup.patch,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- setup.patch 17 Oct 2005 18:07:11 -0000 1.1.2.4
+++ setup.patch 27 Oct 2005 17:50:16 -0000 1.1.2.5
@@ -272,36 +272,41 @@
echo "$conffile: SSL on ..."
}
-for dir in `cat dssecure.txt` ; do
- clear
- if [ -f $dir/config/dse.ldif ]; then
- security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
- $dir/stop-slapd
- cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 on/g" > $dir/config/dse.ldif.0
- mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
- echo "$dir/config/dse.ldif: SSL on ..."
- echo "Restarting Directory Server: $dir/start-slapd"
- $dir/start-slapd
- fi
-done
+if [ -f dssecure.txt ]; then
+ for dir in `cat dssecure.txt` ; do
+ clear
+ if [ -f $dir/config/dse.ldif ]; then
+ security=`grep -i "^nsslapd-security:" $dir/config/dse.ldif | awk '{print $1}'`
+ $dir/stop-slapd
+ cat $dir/config/dse.ldif | sed -e "s/\($security\) .*/\1 on/g" > $dir/config/dse.ldif.0
+ mv $dir/config/dse.ldif.0 $dir/config/dse.ldif
+ echo "$dir/config/dse.ldif: SSL on ..."
+ echo "Restarting Directory Server: $dir/start-slapd"
+ $dir/start-slapd
+ fi
+ done
+ rm -f dssecure.txt
+fi
if [ $isadminsslon -ne 0 ]; then
$serverroot/stop-admin
fi
-for confline in `cat assecure.txt` ; do
- conffile=`echo $confline | awk -F= '{print $1}'`
- confparam=`echo $confline | awk -F= '{print $2}'`
- echo $conffile | grep "\.xml$" > /dev/null 2>&1
- rval=$?
- if [ $rval -eq 0 ]; then
- adminXmlSSLOn $conffile $confparam
- else
- adminSSLOn $conffile $confparam
- fi
-done
+if [ -f assecure.txt ]; then
+ for confline in `cat assecure.txt` ; do
+ conffile=`echo $confline | awk -F= '{print $1}'`
+ confparam=`echo $confline | awk -F= '{print $2}'`
+ echo $conffile | grep "\.xml$" > /dev/null 2>&1
+ rval=$?
+ if [ $rval -eq 0 ]; then
+ adminXmlSSLOn $conffile $confparam
+ else
+ adminSSLOn $conffile $confparam
+ fi
+ done
+ rm -f assecuire.txt
+fi
if [ $isadminsslon -ne 0 ]; then
echo "Restarting Administration Server: $serverroot/start-admin"
$serverroot/start-admin
fi
-rm -f dssecure.txt assecuire.txt
18 years, 6 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.37,1.38
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22474/ldapserver/ldap/cm
Modified Files:
Makefile
Log Message:
Bug(s) fixed: 171854
Bug Description: Allow DSMLGW to build with GAR build scripts
Reviewed by: nhosoi(a)redhat.com (Thanks!)
Fix Description: Add a new macro DSMLGWJARS_BUILD_DIR which defaults to
dist/classes for internal builds. For external builds, the developer
can grab these jars from their respective locations, or grab the bundle
from the fds download site, which is what the GAR builds will do. The
location is then passed in on the make command line as
DSMLGWJARS_BUILD_DIR=/path/to/dsmlgwjars. Regular internal builds
should continue to work as always.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Makefile 25 Oct 2005 16:55:48 -0000 1.37
+++ Makefile 27 Oct 2005 14:12:40 -0000 1.38
@@ -349,18 +349,18 @@
$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/dsmlgw/misc/web-app_2_3.dtd $(RELDIR)/clients/dsmlgw/
# now time to move the necessary jars in place
- $(INSTALL) -m 644 $(NSDIST)/classes/ldapjdk.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
- $(INSTALL) -m 644 $(NSDIST)/classes/activation.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/ldapjdk.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/activation.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
# if you use the jaxrpc.jar from the axis distribution, you don't need the api file
# or perhaps you need the jaxrpc.jar for building, and jaxrpc-api.jar at runtime, or vice versa
# if so, I'm not sure where to get the implementation
- if [ -f $(NSDIST)/classes/jaxrpc-api.jar ] ; then \
- $(INSTALL) -m 644 $(NSDIST)/classes/jaxrpc-api.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib ; \
+ if [ -f $(DSMLGWJARS_BUILD_DIR)/jaxrpc-api.jar ] ; then \
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jaxrpc-api.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib ; \
fi
- $(INSTALL) -m 644 $(NSDIST)/classes/jaxrpc.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
- $(INSTALL) -m 644 $(NSDIST)/classes/saaj.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
- $(INSTALL) -m 644 $(NSDIST)/classes/xercesImpl.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
- $(INSTALL) -m 644 $(NSDIST)/classes/xml-apis.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jaxrpc.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/saaj.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/xercesImpl.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/xml-apis.jar $(RELDIR)/clients/dsmlgw/WEB-INF/lib
endif # USE_DSMLGW
# PACKAGE_UNDER_JAVA is defined in components.mk - these are component .jar files to install
18 years, 6 months
[Fedora-directory-commits] ldapserver buildpaths.mk, 1.6, 1.7 internal_buildpaths.mk, 1.6, 1.7
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22474/ldapserver
Modified Files:
buildpaths.mk internal_buildpaths.mk
Log Message:
Bug(s) fixed: 171854
Bug Description: Allow DSMLGW to build with GAR build scripts
Reviewed by: nhosoi(a)redhat.com (Thanks!)
Fix Description: Add a new macro DSMLGWJARS_BUILD_DIR which defaults to
dist/classes for internal builds. For external builds, the developer
can grab these jars from their respective locations, or grab the bundle
from the fds download site, which is what the GAR builds will do. The
location is then passed in on the make command line as
DSMLGWJARS_BUILD_DIR=/path/to/dsmlgwjars. Regular internal builds
should continue to work as always.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/buildpaths.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- buildpaths.mk 21 Oct 2005 19:21:04 -0000 1.6
+++ buildpaths.mk 27 Oct 2005 14:12:33 -0000 1.7
@@ -135,5 +135,8 @@
# JAF - activation.jar - http://java.sun.com/products/javabeans/glasgow/jaf.html
# JWSDP - jaxrpc-api.jar,jaxrpc.jar,saaj.jar - http://java.sun.com/webservices/downloads/webservicespack.html
# Crimson - crimson.jar - http://xml.apache.org/crimson/
+# Also the ldapjdk.jar
+# all of these files need to be in the following directory
+DSMLGWJARS_BUILD_DIR = $(BUILD_ROOT)/../dsmlgwjars
PERLDAP_SOURCE_ROOT = $(MOZILLA_SOURCE_ROOT)
Index: internal_buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/internal_buildpaths.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- internal_buildpaths.mk 3 Oct 2005 19:53:40 -0000 1.6
+++ internal_buildpaths.mk 27 Oct 2005 14:12:33 -0000 1.7
@@ -139,3 +139,5 @@
ifndef ADMINSERVER_SOURCE_ROOT
ADMSERV_DIR=$(ABS_ROOT_PARENT)/dist/$(NSOBJDIR_NAME)/adminserver
endif
+
+DSMLGWJARS_BUILD_DIR = $(CLASS_DEST)
18 years, 6 months
[Fedora-directory-commits] ldapserver/ldap/clients/dsmlgw Makefile, 1.8, 1.9
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/clients/dsmlgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22474/ldapserver/ldap/clients/dsmlgw
Modified Files:
Makefile
Log Message:
Bug(s) fixed: 171854
Bug Description: Allow DSMLGW to build with GAR build scripts
Reviewed by: nhosoi(a)redhat.com (Thanks!)
Fix Description: Add a new macro DSMLGWJARS_BUILD_DIR which defaults to
dist/classes for internal builds. For external builds, the developer
can grab these jars from their respective locations, or grab the bundle
from the fds download site, which is what the GAR builds will do. The
location is then passed in on the make command line as
DSMLGWJARS_BUILD_DIR=/path/to/dsmlgwjars. Regular internal builds
should continue to work as always.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsmlgw/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile 3 Oct 2005 19:53:53 -0000 1.8
+++ Makefile 27 Oct 2005 14:12:40 -0000 1.9
@@ -49,7 +49,7 @@
@if [ ! -f $(CLASS_DEST)/axis.jar ]; then \
cp $(CLASS_DEST)/$(AXIS_REL_DIR)/lib/axis.jar $(CLASS_DEST) ; \
fi
- $(ANT)
+ $(ANT) -Dglobaldist.dir=$(DSMLGWJARS_BUILD_DIR)
clean:
$(ANT) clean
18 years, 6 months
[Fedora-directory-commits] setuputil Makefile, 1.1.1.1, 1.2 fedora-setuputil.spec.tmpl, 1.1.1.1, 1.2
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/setuputil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9146
Modified Files:
Makefile fedora-setuputil.spec.tmpl
Log Message:
Reset the rpm Version to 1.0
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/setuputil/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 29 Jul 2005 22:16:18 -0000 1.1.1.1
+++ Makefile 27 Oct 2005 06:23:11 -0000 1.2
@@ -65,6 +65,7 @@
$(PERL5) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandverNT.dat
else
$(PERL5) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/brandver.dat
+ $(PERL5) $(RELTOOLSPATH)/brandver.pl -i branding/fedora/spec.dat
endif
@echo ==== Finished Branding SetupUtil ==========
Index: fedora-setuputil.spec.tmpl
===================================================================
RCS file: /cvs/dirsec/setuputil/fedora-setuputil.spec.tmpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- fedora-setuputil.spec.tmpl 29 Jul 2005 22:16:18 -0000 1.1.1.1
+++ fedora-setuputil.spec.tmpl 27 Oct 2005 06:23:11 -0000 1.2
@@ -26,7 +26,7 @@
%define __os_install_post %{nil}
Summary: Fedora Setup SDK
Name: fedora-setuputil-devel
-Version: 7.1
+Version: 1.0
Release: 1.@PLATFORM@
License: LGPL
Group: System Environment/Libraries
18 years, 6 months
[Fedora-directory-commits] console/src/com/netscape/management/client/util LocalJarClassLoader.java, 1.1.1.1, 1.2
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26415/src/com/netscape/management/client/util
Modified Files:
LocalJarClassLoader.java
Log Message:
171830 - Change console version to 1.0
Index: LocalJarClassLoader.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/util/LocalJarClassLoader.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- LocalJarClassLoader.java 18 Jul 2005 00:34:27 -0000 1.1.1.1
+++ LocalJarClassLoader.java 26 Oct 2005 23:16:29 -0000 1.2
@@ -45,14 +45,6 @@
static final protected int JAR_FILE_INCLUDE_LIMIT = 100;
- // Flag whether a jar is based on a console version prior to 5.0 (
- // (4.0, 4.1 or 4.2). Denotes that a class needs swing package name
- // conversion and compatibility adjustments
- private boolean isPre50Jar;
-
- // Compatibility jar to be used by all pre 5.0 jars
- private static String console42Jar= "console42.jar";
-
protected Vector jarNames = new Vector(); // A String Vector
protected Vector jarFiles = new Vector(); // A ZipFile Vector
@@ -152,38 +144,13 @@
//
PropertyResourceBundle manifest = getManifest(filename);
if (manifest == null) {
- // Include console42.jar for pre 5.0 jars
- isPre50Jar = true;
- includeConsole42Jar(language);
+ if (Debug.isEnabled()) {
+ Debug.println(3, debugTag + "No manifest file for " + filename);
+ }
return;
}
- // Step 4. Set isPre50Jar flag
- //
- String mccVersion = manifest.getString("mcc-version");
-
- if (mccVersion == null) {
- // 5.0+ manifests must have mcc-version directive
- isPre50Jar = true;
- if (Debug.isEnabled()) {
- Debug.println(2, debugTag + "Bad manifest, no mcc-version directive");
- }
-
- }
- else {
- // Only 4.x jars needs swing package name conversion
- isPre50Jar = mccVersion.startsWith("4");
- }
- if (Debug.isEnabled()) {
- Debug.println(5, debugTag +"isPre50Jar=" + isPre50Jar);
- }
-
- // Include console42.jar for pre 5.0 jars
- if (isPre50Jar) {
- includeConsole42Jar(language);
- }
-
- // Step 5. Include jars specified in the manifest
+ // Step 4. Include jars specified in the manifest
//
String[] list = getManifestJarList(manifest);
for (int i = 0 ; i < list.length; i++) {
@@ -220,33 +187,6 @@
}
}
- /**
- * Backward compatibility jar console42.jar is automatically added to all
- * server jars prior to console 5.0
- */
- private void includeConsole42Jar(String language) throws Exception {
- String path = patchDir + "/" + console42Jar;
- if (!(new File(path)).exists()) {
- return;
- }
- if (Debug.isEnabled()) {
- Debug.println(2, debugTag + "include jar " + console42Jar);
- }
- jarNames.addElement(console42Jar);
- jarFiles.addElement(new ZipFile(path));
-
- String langFile = addL10Nsuffix(console42Jar, "en");
- path = patchDir + "/" + langFile;
- if (!(new File(path)).exists()) {
- return;
- }
- if (Debug.isEnabled()) {
- Debug.println(2, debugTag + "include jar " + langFile);
- }
- jarNames.addElement(langFile);
- jarFiles.addElement(new ZipFile(path));
- }
-
/**
* Processes the manifest PropertyResourceBundle and produces an array
@@ -508,31 +448,7 @@
BufferedInputStream zis =
new BufferedInputStream(f.getInputStream(e));
- // Do swing package name conversion on the fly if necessary
- if (isPre50Jar && path.endsWith(".class")) {
- try {
- if (Debug.isEnabled()) {
- Debug.println(6, debugTag + "converting " + path + " ...");
- }
- ByteArrayOutputStream bos = new ByteArrayOutputStream(512);
- SwingPackageNameConverter.convert(zis,bos);
- bos.close();
- if (Debug.isEnabled()) {
- Debug.println(6, debugTag + "---- Done");
- }
- return bos.toByteArray();
- }
- catch (Exception ex) {
- Debug.println(0, debugTag + "Conversion Exception "+ ex);
- if (Debug.isEnabled()) {
- ex.printStackTrace(System.out);
- }
- throw ex;
- }
-
- }
-
- // Read the content if no swing name conversion
+ // Read the content
int size = (int)(e.getSize());
int cnt = 0;
byte[] storage = new byte[size];
18 years, 6 months
[Fedora-directory-commits] console/src/com/netscape/management/client/topology/ug IUGToolPlugin.java, 1.1.1.1, 1.2 UGPage.java, 1.1.1.1, 1.2
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/topology/ug
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26415/src/com/netscape/management/client/topology/ug
Modified Files:
IUGToolPlugin.java UGPage.java
Log Message:
171830 - Change console version to 1.0
Index: IUGToolPlugin.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/ug/IUGToolPlugin.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- IUGToolPlugin.java 18 Jul 2005 00:34:20 -0000 1.1.1.1
+++ IUGToolPlugin.java 26 Oct 2005 23:16:29 -0000 1.2
@@ -28,10 +28,10 @@
* the User Group page is selected.
*
* The plugin must be registered in LDAP under this entry:
- * cn=UserGroupTools, ou=4.0, ou=Admin, ou=Global Preferences, ou=<domain>, o=NetscapeRoot
+ * cn=UserGroupTools, ou=[AS version], ou=Admin, ou=Global Preferences, ou=[domain], o=NetscapeRoot
*
* For example,
- * dn: cn=UserGroupTools, ou=4.0, ou=Admin, ou=Global Preferences, ou=mcom.com, o=NetscapeRoot
+ * dn: cn=UserGroupTools, ou=1.0, ou=Admin, ou=Global Preferences, ou=mcom.com, o=NetscapeRoot
* cn: UserGroupTools
* objectclass: top
* objectclass: nsAdminObject
Index: UGPage.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/ug/UGPage.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- UGPage.java 18 Jul 2005 00:34:21 -0000 1.1.1.1
+++ UGPage.java 26 Oct 2005 23:16:29 -0000 1.2
@@ -211,7 +211,6 @@
public MenuItemCategory createToolsMenu() {
ConsoleInfo ci = Console.getConsoleInfo();
LDAPConnection ldc = ci.getLDAPConnection();
- // String dn = "cn=UserGroupTools,ou=4.0,ou=Admin,ou=Global Preferences,ou=mcom.com,o=NetscapeRoot";
String dn = "cn=UserGroupTools," +
LDAPUtil.getAdminGlobalParameterEntry();
18 years, 6 months
[Fedora-directory-commits] console/src/com/netscape/management/client/topology topology.properties, 1.1.1.1, 1.2
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/topology
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26415/src/com/netscape/management/client/topology
Modified Files:
topology.properties
Log Message:
171830 - Change console version to 1.0
Index: topology.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/topology/topology.properties,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- topology.properties 18 Jul 2005 00:34:20 -0000 1.1.1.1
+++ topology.properties 26 Oct 2005 23:16:23 -0000 1.2
@@ -41,9 +41,6 @@
menu-NewSIE=Server Instance
menu-newDomain=C&reate Administration Domain
-menu-AddOldServer=&Add Pre 4.0 Server
-menu-RemoveOldServer=&Remove Pre 4.0 Server
-menu-MigrateServer=&Migrate Pre 4.0 Server Config...
menu-CreateServer=&Create Instance Of
menu-RemoveServer=Remove Server
menu-CloneServer=Clone Server Config...
18 years, 6 months
[Fedora-directory-commits] console/src/com/netscape/management/client/components IDirNode.java, 1.1.1.1, 1.2
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/console/src/com/netscape/management/client/components
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26415/src/com/netscape/management/client/components
Modified Files:
IDirNode.java
Log Message:
171830 - Change console version to 1.0
Index: IDirNode.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/components/IDirNode.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- IDirNode.java 18 Jul 2005 00:34:13 -0000 1.1.1.1
+++ IDirNode.java 26 Oct 2005 23:16:21 -0000 1.2
@@ -23,7 +23,7 @@
import netscape.ldap.LDAPEntry;
/**
- * Netscape Directory Server 4.0 Directory Entry interface.
+ * Directory Server Directory Entry interface.
*
* @author rweltman
* @version %I%, %G%
18 years, 6 months