[Fedora-directory-commits] ldapserver component_versions.mk, 1.40, 1.41 components.mk, 1.38, 1.39
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1878/ldapserver
Modified Files:
component_versions.mk components.mk
Log Message:
Use NSS 3.11 and NSPR 4.6.1 - NSS 3.11 requires the new freebl lib at runtime,
and more on Solaris and HP-UX.
Use setup.inf from admin server, and make sure the admin component is in there.
Index: component_versions.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/component_versions.mk,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- component_versions.mk 31 Oct 2005 15:55:24 -0000 1.40
+++ component_versions.mk 13 Feb 2006 22:25:27 -0000 1.41
@@ -52,12 +52,12 @@
# naming scheme.
# NSPR
ifndef NSPR_RELDATE
- NSPR_RELDATE = v4.4.1
+ NSPR_RELDATE = v4.6.1
endif
# SECURITY (NSS) LIBRARY
ifndef SECURITY_RELDATE
- SECURITY_RELDATE = NSS_3_9_3_RTM
+ SECURITY_RELDATE = NSS_3_11_RTM
endif
# LIBDB
@@ -97,7 +97,7 @@
# ANT
ifndef ANT_VERSION
- ANT_VERSION = 1.4.1
+ ANT_VERSION = 1.6.2
endif
ifndef ANT_COMP
ANT_COMP = ant
@@ -140,7 +140,7 @@
# server core
ifndef SVRCORE_RELDATE
- SVRCORE_RELDATE = SVRCORE_4_0_RTM
+ SVRCORE_RELDATE = SVRCORE_4_0_1_RTM
endif
# admin utility library
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/ldapserver/components.mk,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- components.mk 10 Feb 2006 23:21:43 -0000 1.38
+++ components.mk 13 Feb 2006 22:25:27 -0000 1.39
@@ -210,23 +210,30 @@
SECURITY_INCLUDE = -I$(SECURITY_INCDIR)
# add crlutil and ocspclnt when we support CRL and OCSP cert checking in DS
SECURITY_BINNAMES = certutil derdump pp pk12util ssltap modutil shlibsign
-SECURITY_LIBNAMES = ssl3 nss3 softokn3
+# as of NSS 3.11, no longer need to link with softokn3
+SECURITY_LIBNAMES = ssl3 nss3
# these libs have a corresponding .chk file
-SECURITY_NEED_CHK = softokn3
+# freebl is new for NSS 3.11
+SECURITY_NEED_CHK = softokn3 freebl3
-SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3
+SECURITY_LIBNAMES.pkg = $(SECURITY_LIBNAMES) smime3 softokn3 freebl3
-# these are only needed on 32 bit Solaris and HP-UX
ifneq ($(USE_64), 1)
ifeq ($(ARCH), SOLARIS)
-SECURITY_LIBNAMES.pkg += freebl_hybrid_3 freebl_pure32_3
+SECURITY_LIBNAMES.pkg += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
# these libs have a corresponding .chk file
-SECURITY_NEED_CHK += freebl_hybrid_3 freebl_pure32_3
-endif
+SECURITY_NEED_CHK += freebl_32fpu_3 freebl_32int64_3 freebl_32int_3
+endif # SOLARIS
ifeq ($(ARCH), HPUX)
-SECURITY_LIBNAMES.pkg += freebl_hybrid_3 freebl_pure32_3
+SECURITY_LIBNAMES.pkg += freebl_32fpu_3 freebl_32int_3
+# these libs have a corresponding .chk file
+SECURITY_NEED_CHK += freebl_32fpu_3 freebl_32int_3
+endif # HPUX
+else # USE_64
+ifeq ($(ARCH), SOLARIS)
+SECURITY_LIBNAMES.pkg += freebl_64fpu_3 freebl_64int_3
# these libs have a corresponding .chk file
-SECURITY_NEED_CHK += freebl_hybrid_3 freebl_pure32_3
+SECURITY_NEED_CHK += freebl_64fpu_3 freebl_64int_3
endif
endif # USE_64
@@ -238,7 +245,7 @@
LIBS_TO_PKG += $(SECURITY_LIBS_TO_PKG)
LIBS_TO_PKG_SHARED += $(SECURITY_LIBS_TO_PKG) # for cmd line tools
ifeq ($(USE_SETUPUTIL), 1)
- PACKAGE_SETUP_LIBS += $(SECURITY_LIBS_TO_PKG)
+ PACKAGE_SETUP_LIBS += $(SECURITY_LIBS_TO_PKG) # for the setup programs
endif
ifeq ($(USE_DSGW), 1)
LIBS_TO_PKG_CLIENTS += $(SECURITY_LIBS_TO_PKG) # for dsgw
@@ -423,7 +430,7 @@
### ICU package ##########################################
-ICU_LIB_VERSION = 24
+ICU_LIB_VERSION = 34
ifdef ICU_SOURCE_ROOT
ICU_LIBPATH = $(ICU_SOURCE_ROOT)/built/lib
ICU_BINPATH = $(ICU_SOURCE_ROOT)/built/bin
@@ -518,10 +525,10 @@
# during the build process
ifdef ADMINUTIL_SOURCE_ROOT
ADMINUTIL_LIBPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(COMPONENT_OBJDIR)/lib
- ADMINUTIL_INCPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(COMPONENT_OBJDIR)/include
+ ADMINUTIL_INCPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(COMPONENT_OBJDIR)/include/adminutil-$(ADMINUTIL_DOT_VER)
else
ADMINUTIL_LIBPATH = $(ADMINUTIL_BUILD_DIR)/lib
- ADMINUTIL_INCPATH = $(ADMINUTIL_BUILD_DIR)/include
+ ADMINUTIL_INCPATH = $(ADMINUTIL_BUILD_DIR)/include/adminutil-$(ADMINUTIL_DOT_VER)
endif
PACKAGE_SRC_DEST += $(ADMINUTIL_LIBPATH)/property bin/slapd/lib
@@ -529,11 +536,11 @@
LIBS_TO_PKG_CLIENTS += $(wildcard $(ADMINUTIL_LIBPATH)/*.$(DLL_SUFFIX))
ifeq ($(ARCH),WINNT)
-ADMINUTIL_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil$(ADMINUTIL_VER).$(LIB_SUFFIX)
-ADMINUTIL_S_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil_s$(ADMINUTIL_VER).$(LIB_SUFFIX)
-LIBADMINUTILDLL_NAMES = $(ADMINUTIL_LIBPATH)/libadminutil$(ADMINUTIL_VER).$(DLL_SUFFIX)
+ADMINUTIL_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil.$(LIB_SUFFIX)
+ADMINUTIL_S_LINK = /LIBPATH:$(ADMINUTIL_LIBPATH) libadminutil_s.$(LIB_SUFFIX)
+LIBADMINUTILDLL_NAMES = $(ADMINUTIL_LIBPATH)/libadminutil.$(DLL_SUFFIX)
else
-ADMINUTIL_LINK=-L$(ADMINUTIL_LIBPATH) -ladminutil$(ADMINUTIL_VER)
+ADMINUTIL_LINK=-L$(ADMINUTIL_LIBPATH) -ladminutil
endif
ADMINUTIL_INCLUDE=-I$(ADMINUTIL_INCPATH) -I$(ADMINUTIL_INCPATH)/libadminutil \
-I$(ADMINUTIL_INCPATH)/libadmsslutil
@@ -572,8 +579,8 @@
ADMSERV_DIR = $(ADMINSERVER_SOURCE_ROOT)/built/package/$(COMPONENT_OBJDIR)
# else set in internal_buildpaths.mk
endif
-# these are the only two subcomponents we use from the adminserver package
-ADMINSERVER_SUBCOMPS=admin base
+# these are the subcomponents we use from the adminserver package
+ADMINSERVER_SUBCOMPS=admin base setup.inf
ifdef LDAPCONSOLE_SOURCE_ROOT
LDAPCONSOLE_DIR = $(LDAPCONSOLE_SOURCE_ROOT)/built/package
18 years, 2 months
[Fedora-directory-commits] adminserver/admserv/console build.properties, 1.9, 1.10
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1369/adminserver/admserv/console
Modified Files:
build.properties
Log Message:
Use NSPR 4.6.1 and NSS 3.11 - this requires new freebl3 libraries at runtime
on all platforms, and more on Solaris and HP-UX.
Use admserv10.jar as the console jar file name instead of the new format - will
change back once the new code is tagged.
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/build.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.properties 1 Feb 2006 23:04:04 -0000 1.9
+++ build.properties 13 Feb 2006 22:13:06 -0000 1.10
@@ -22,9 +22,10 @@
adminconsole.root=../..
mcc.version=1.0
+mcc.nodot.version=10
admin.core=admserv
-admin.console=fedora-${admin.core}-${mcc.version}
+admin.console=${admin.core}${mcc.nodot.version}
console.root=${adminconsole.root}/../built/release/package/java
ldapjdk.jar=${adminconsole.root}/../imports/ldapjdk/ldapjdk.jar
18 years, 2 months
[Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.36, 1.37
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1369/adminserver/admserv
Modified Files:
pkgadmin.mk
Log Message:
Use NSPR 4.6.1 and NSS 3.11 - this requires new freebl3 libraries at runtime
on all platforms, and more on Solaris and HP-UX.
Use admserv10.jar as the console jar file name instead of the new format - will
change back once the new code is tagged.
Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- pkgadmin.mk 1 Feb 2006 23:03:49 -0000 1.36
+++ pkgadmin.mk 13 Feb 2006 22:12:55 -0000 1.37
@@ -168,7 +168,7 @@
# grab the jar files
cd $(ADMIN_JARS) ; \
- cp -p fedora-admserv-$(ADM_SUF).jar fedora-admserv-$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars
+ cp -p admserv$(ADM_SUF).jar admserv$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars
#
# Cleanup before making distributable zip
@@ -252,19 +252,6 @@
fi ; \
done
-# Cert System needs chk files [154431]
- cd $(NSPR_LIBPATH); cp -p libsoftokn3.chk $(ADMIN_DIR)/bin/admin/lib
-# libfreebl_*.chk files only exist on the 32-bit builds.
-# They should be packaged only for the 32-bit builds.
-ifneq ($(USE_64), 1)
-ifeq ($(ARCH), SOLARIS)
- cd $(NSPR_LIBPATH); cp -p libfreebl_*.chk $(ADMIN_DIR)/bin/admin/lib
-endif
-ifeq ($(ARCH), HPUX)
- cd $(NSPR_LIBPATH); cp -p libfreebl_*.chk $(ADMIN_DIR)/bin/admin/lib
-endif
-endif
-
# Copy LIB ADMIN UTIL
cd $(ADMINUTIL_LIBPATH); cp -p $(ADMINUTIL_SOLIBS) $(ADMIN_DIR)/bin/admin/lib
for file in $(ADMINUTIL_SOLIBS); do \
18 years, 2 months
[Fedora-directory-commits] adminserver nsconfig.mk,1.21,1.22
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv840/adminserver
Modified Files:
nsconfig.mk
Log Message:
Use NSS 3.11 and NSPR 4.6.1 - This requires packaging the new freebl3
library on all platforms, and more on Solaris and HPUX.
Rename the console jar file back to admserv10.jar for now to easy new fedora ds migration issues. Will rename it back to the new name once the current code is tagged.
18 years, 2 months
[Fedora-directory-commits] directoryconsole build.properties, 1.2, 1.3 build.xml, 1.3, 1.4
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/directoryconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31761/directoryconsole
Modified Files:
build.properties build.xml
Log Message:
The console now builds jar files in the format
brand-name-version.jar e.g. fedora-mcc-1.0.jar
so change the build scripts to pick up the new
jar format. We will have to add build.properties
to the branding.
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/directoryconsole/build.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.properties 28 Oct 2005 18:01:11 -0000 1.2
+++ build.properties 13 Feb 2006 22:00:39 -0000 1.3
@@ -23,3 +23,4 @@
ldapconsole.root=..
ldapconsole.version=10
ldapconsole.name=ds${ldapconsole.version}
+brand=fedora
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/directoryconsole/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 14 Nov 2005 04:14:11 -0000 1.3
+++ build.xml 13 Feb 2006 22:00:39 -0000 1.4
@@ -79,9 +79,9 @@
<!-- Construct classpath -->
<path id="ldapconsole.classpath">
<fileset dir="${console.location}">
- <include name="**/java/base.jar"/>
- <include name="**/java/mcc*.jar"/>
- <include name="**/java/nmclf*.jar"/>
+ <include name="**/java/${brand}-base-*.jar"/>
+ <include name="**/java/${brand}-mcc-*.jar"/>
+ <include name="**/java/${brand}-nmclf-*.jar"/>
<include name="**/java/ldapjdk.jar"/>
</fileset>
<pathelement path="${built.classdir}"/>
18 years, 2 months
[Fedora-directory-commits] ldapserver/ldap/cm Makefile,1.46,1.47
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/cm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23344/ldapserver/ldap/cm
Modified Files:
Makefile
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: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/Makefile,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Makefile 7 Dec 2005 21:49:52 -0000 1.46
+++ Makefile 10 Feb 2006 23:22:00 -0000 1.47
@@ -359,7 +359,11 @@
# now time to move the necessary jars in place
$(INSTALL) -m 644 $(LDAPJARFILE) $(RELDIR)/clients/dsmlgw/WEB-INF/lib
- $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/activation.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib
+ if [ -f $(DSMLGWJARS_BUILD_DIR)/jaf.jar ] ; then \
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jaf.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib ; \
+ else \
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/activation.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib ; \
+ fi
# 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
@@ -370,6 +374,7 @@
$(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/saaj.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib
$(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/xercesImpl.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib
$(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/xml-apis.jar $(EXT_JAVA_RELDIR)/clients/dsmlgw/WEB-INF/lib
+ $(INSTALL) -m 644 $(DSMLGWJARS_BUILD_DIR)/jakarta-commons-codec.jar $(EXT_JAVA_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, 2 months
[Fedora-directory-commits] ldapserver/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway ParseValue.java, 1.4, 1.5 gatewayHandler.java, 1.8, 1.9
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23344/ldapserver/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway
Modified Files:
ParseValue.java gatewayHandler.java
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: ParseValue.java
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/ParseValue.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ParseValue.java 19 Apr 2005 22:07:19 -0000 1.4
+++ ParseValue.java 10 Feb 2006 23:21:54 -0000 1.5
@@ -36,6 +36,8 @@
* --- END COPYRIGHT BLOCK --- */
package com.netscape.dsml.gateway;
+import org.apache.commons.codec.binary.Base64;
+
/**
*
* @author elliot
@@ -53,9 +55,9 @@
org.w3c.dom.Node type = n.getAttributes().getNamedItem("xsi:type");
if (type != null && type.getNodeValue().equalsIgnoreCase("xsd:base64Binary") ) {
// This value is encoded in base64. decode it.
- sun.misc.BASE64Decoder bd = new sun.misc.BASE64Decoder();
+ Base64 bd = new Base64();
try {
- ret = bd.decodeBuffer( n.getFirstChild().getNodeValue() ) ;
+ ret = bd.decode( n.getFirstChild().getNodeValue().getBytes() ) ;
}
catch (org.w3c.dom.DOMException de) {
ret = "".getBytes();
Index: gatewayHandler.java
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsmlgw/src/com/netscape/dsml/gateway/gatewayHandler.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gatewayHandler.java 11 May 2005 04:29:55 -0000 1.8
+++ gatewayHandler.java 10 Feb 2006 23:21:54 -0000 1.9
@@ -62,6 +62,7 @@
import org.apache.axis.Message;
import org.apache.axis.MessageContext;
import org.apache.axis.handlers.BasicHandler;
+import org.apache.commons.codec.binary.Base64;
public class gatewayHandler extends BasicHandler {
private HandlerInfo handlerInfo;
@@ -110,9 +111,9 @@
if ( tmp != null && tmp.startsWith("Basic ") ) {
int i ;
- sun.misc.BASE64Decoder bd = new sun.misc.BASE64Decoder();
+ Base64 bd = new Base64();
try {
- tmp = new String( (bd.decodeBuffer(tmp.substring(6) )));
+ tmp = new String( (bd.decode(tmp.substring(6).getBytes() )));
}
catch (Exception e) {
// couldn't decode auth info
18 years, 2 months
[Fedora-directory-commits] ldapserver/ldap/clients/dsmlgw build.xml, 1.7, 1.8
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/ldapserver/ldap/clients/dsmlgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23344/ldapserver/ldap/clients/dsmlgw
Modified Files:
build.xml
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: build.xml
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsmlgw/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 29 Oct 2005 02:21:46 -0000 1.7
+++ build.xml 10 Feb 2006 23:21:49 -0000 1.8
@@ -51,16 +51,20 @@
<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}"/>
@@ -68,6 +72,7 @@
<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"/>
18 years, 2 months
[Fedora-directory-commits] ldapserver buildpaths.mk, 1.9, 1.10 components.mk, 1.37, 1.38 internal_comp_deps.mk, 1.33, 1.34
by 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)
18 years, 2 months
[Fedora-directory-commits] ldapserver/ldap/schema 00core.ldif, 1.7, 1.8
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/ldapserver/ldap/schema
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11071
Modified Files:
00core.ldif
Log Message:
Bug(s) fixed: 180744
Bug Description: If you try to add one of the new password policy attributes to a fine-grained
policy, you get an objectclass violation error.
Reviewed by: Rich, Noriko (thanks!)
Files: ldapserver/ldap/schema/00core.ldif
Branch: HEAD
Fix Description: This adds new password policy config attributes need to the schema and updates
the "passwordPolicy" objectclass needs to allow them. I've also updated our master schema document
to keep track of the OIDs.
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Index: 00core.ldif
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/schema/00core.ldif,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 00core.ldif 19 Apr 2005 22:07:27 -0000 1.7
+++ 00core.ldif 10 Feb 2006 18:33:20 -0000 1.8
@@ -190,6 +190,15 @@
attributeTypes: ( 2.16.840.1.113730.3.1.997 NAME 'pwdpolicysubentry' DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE USAGE directoryOperation X-ORIGIN 'Netscape Directory Server' )
attributeTypes: ( 2.16.840.1.113730.3.1.998 NAME ( 'passwordGraceUserTime' 'pwdGraceUserTime' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE USAGE directoryOperation X-ORIGIN 'Netscape Directory Server' )
attributeTypes: ( 2.16.840.1.113730.3.1.999 NAME ( 'passwordGraceLimit' 'pwdGraceLoginLimit' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' )
+attributeTypes: ( 2.16.840.1.113730.3.1.2075 NAME ( 'passwordMinDigits' 'pwdMinDigits' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' )
+attributeTypes: ( 2.16.840.1.113730.3.1.2076 NAME ( 'passwordMinAlphas' 'pwdMinAlphas' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' )
+attributeTypes: ( 2.16.840.1.113730.3.1.2077 NAME ( 'passwordMinUppers' 'pwdMinUppers' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' )
+attributeTypes: ( 2.16.840.1.113730.3.1.2078 NAME ( 'passwordMinLowers' 'pwdMinLowers' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' )
+attributeTypes: ( 2.16.840.1.113730.3.1.2079 NAME ( 'passwordMinSpecials' 'pwdMinSpecials' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' )
+attributeTypes: ( 2.16.840.1.113730.3.1.2080 NAME ( 'passwordMin8bit' 'pwdMin8bit' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' )
+attributeTypes: ( 2.16.840.1.113730.3.1.2081 NAME ( 'passwordMaxRepeats' 'pwdMaxRepeats' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' )
+attributeTypes: ( 2.16.840.1.113730.3.1.2082 NAME ( 'passwordMinCategories' 'pwdMinCategories' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' )
+attributeTypes: ( 2.16.840.1.113730.3.1.2083 NAME ( 'passwordMinTokenLength' 'pwdMinTokenLength' ) DESC 'Netscape defined password policy attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE X-ORIGIN 'Netscape Directory Server' )
attributeTypes: ( 2.16.840.1.113730.3.1.198 NAME 'memberURL' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 X-ORIGIN 'Netscape Directory Server' )
attributeTypes: ( 2.16.840.1.113730.3.1.199 NAME 'memberCertificateDescription' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 X-ORIGIN 'Netscape Directory Server' )
attributeTypes: ( 2.16.840.1.113730.3.1.207 NAME 'vlvBase' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 X-ORIGIN 'Netscape Directory Server' )
@@ -344,7 +353,7 @@
objectClasses: ( 2.16.840.1.113730.3.2.1 NAME 'changeLogEntry' DESC 'LDAP changelog objectclass' SUP top MUST ( targetdn $ changeTime $ changenumber $ changeType ) MAY ( changes $ newrdn $ deleteoldrdn $ newsuperior ) X-ORIGIN 'Changelog Internet Draft' )
objectClasses: ( 2.16.840.1.113730.3.2.6 NAME 'referral' DESC 'LDAP referrals objectclass' SUP top MAY ( ref ) X-ORIGIN 'LDAPv3 referrals Internet Draft' )
objectClasses: ( 2.16.840.1.113730.3.2.12 NAME 'passwordObject' DESC 'Netscape defined password policy objectclass' SUP top MAY ( pwdpolicysubentry $ passwordExpirationTime $ passwordExpWarned $ passwordRetryCount $ retryCountResetTime $ accountUnlockTime $ passwordHistory $ passwordAllowChangeTime $ passwordGraceUserTime ) X-ORIGIN 'Netscape Directory Server' )
-objectClasses: ( 2.16.840.1.113730.3.2.13 NAME 'passwordPolicy' DESC 'Netscape defined password policy objectclass' SUP top MAY ( passwordMaxAge $ passwordExp $ passwordMinLength $ passwordKeepHistory $ passwordInHistory $ passwordChange $ passwordWarning $ passwordLockout $ passwordMaxFailure $ passwordResetDuration $ passwordUnlock $ passwordLockoutDuration $ passwordCheckSyntax $ passwordMustChange $ passwordStorageScheme $ passwordMinAge $ passwordResetFailureCount $ passwordGraceLimit ) X-ORIGIN 'Netscape Directory Server' )
+objectClasses: ( 2.16.840.1.113730.3.2.13 NAME 'passwordPolicy' DESC 'Netscape defined password policy objectclass' SUP top MAY ( passwordMaxAge $ passwordExp $ passwordMinLength $ passwordKeepHistory $ passwordInHistory $ passwordChange $ passwordWarning $ passwordLockout $ passwordMaxFailure $ passwordResetDuration $ passwordUnlock $ passwordLockoutDuration $ passwordCheckSyntax $ passwordMustChange $ passwordStorageScheme $ passwordMinAge $ passwordResetFailureCount $ passwordGraceLimit $ passwordMinDigits $ passwordMinAlphas $ passwordMinUppers $ passwordMinLowers $ passwordMinSpecials $ passwordMin8bit $ passwordMaxRepeats $ passwordMinCategories $ passwordMinTokenLength ) X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.30 NAME 'glue' DESC 'Netscape defined objectclass' SUP top X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.32 NAME 'netscapeMachineData' DESC 'Netscape defined objectclass' SUP top X-ORIGIN 'Netscape Directory Server' )
objectClasses: ( 2.16.840.1.113730.3.2.38 NAME 'vlvSearch' DESC 'Netscape defined objectclass' SUP top MUST ( cn $ vlvBase $ vlvScope $ vlvFilter ) MAY ( multiLineDescription ) X-ORIGIN 'Netscape Directory Server' )
18 years, 2 months