[Fedora-directory-commits] adminserver/admserv/console/cmdln Makefile, 1.5, 1.6
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/console/cmdln
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20715/adminserver/admserv/console/cmdln
Modified Files:
Makefile
Log Message:
Bug: 192785
Description: Admin Server: Move admin server console into a separate package
Reviewed by: Noriko (Thanks!)
Moved files into the top level admservconsole module - changed admin server build/packaging to pick up this as a component - removed now useless java build/makefiles
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/cmdln/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile 29 Sep 2005 22:11:58 -0000 1.5
+++ Makefile 23 May 2006 22:13:37 -0000 1.6
@@ -24,7 +24,6 @@
BUILD_ROOT = ../../..
include $(BUILD_ROOT)/nsconfig.mk
-include ../rules.mk
MKDIR = mkdir -p
STAGE_DIR = $(OBJDIR)/cmdln
17 years, 4 months
[Fedora-directory-commits] adminserver/admserv pkgadmin.mk, 1.46, 1.47
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20715/adminserver/admserv
Modified Files:
pkgadmin.mk
Log Message:
Bug: 192785
Description: Admin Server: Move admin server console into a separate package
Reviewed by: Noriko (Thanks!)
Moved files into the top level admservconsole module - changed admin server build/packaging to pick up this as a component - removed now useless java build/makefiles
Index: pkgadmin.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/pkgadmin.mk,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- pkgadmin.mk 24 Mar 2006 19:13:11 -0000 1.46
+++ pkgadmin.mk 23 May 2006 22:13:36 -0000 1.47
@@ -42,7 +42,7 @@
PKGTOP=$(PLATFORM_PACKAGE_DIR)
PKGDIR=$(PLATFORM_PACKAGE_DIR)/admin
-ADMIN_JARS=$(BUILD_ROOT)/built/package/java/admin
+JAVA_PACKAGE_DIR=$(BUILD_ROOT)/built/package/java
ADM_CORE=$(DIR)
ADM_CLIENT=client
@@ -155,10 +155,10 @@
# grab the jar files
ifeq ($(ARCH), WINNT)
# no symlink on Windows
- cd $(ADMIN_JARS) ; \
+ cd $(ADMSERVCONSOLE_JAR_DIR) ; \
cp -p $(ADMIN_BRAND)-admserv-$(ADM_SUF).jar $(ADMIN_BRAND)-admserv-$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars
else
- cd $(ADMIN_JARS) ; \
+ cd $(ADMSERVCONSOLE_JAR_DIR) ; \
cp -p $(ADMIN_BRAND)-admserv-$(ADM_SUF).jar $(ADMIN_BRAND)-admserv-$(ADM_SUF)_en.jar $(CLIENT_DIR)/java/jars; \
(cd $(CLIENT_DIR)/java/jars; ln -s $(ADMIN_BRAND)-admserv-$(ADM_SUF).jar $(ADMIN_BRAND)-admserv-$(ADM_GEN_SUF).jar; ln -s $(ADMIN_BRAND)-admserv-$(ADM_SUF)_en.jar $(ADMIN_BRAND)-admserv-$(ADM_GEN_SUF)_en.jar)
endif
@@ -271,9 +271,9 @@
cd $(ADMSERV_OBJDIR)/cmdln; \
cp -p admconfig $(ADMIN_DIR)/bin/admin;
- cd $(ADMIN_JARS)/.. ; \
+ cd $(JAVA_PACKAGE_DIR) ; \
find *.html *.gif *.jpg | $(CPIO) $(ADMIN_DIR)/java/html
- cd $(ADMIN_JARS)/.. ; \
+ cd $(JAVA_PACKAGE_DIR)/.. ; \
find *.html | $(CPIO) $(ADMIN_DIR)/java/html/en
endif # NOJAVA
17 years, 4 months
[Fedora-directory-commits] adminserver/admserv/console Makefile, 1.5, 1.6
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20715/adminserver/admserv/console
Modified Files:
Makefile
Log Message:
Bug: 192785
Description: Admin Server: Move admin server console into a separate package
Reviewed by: Noriko (Thanks!)
Moved files into the top level admservconsole module - changed admin server build/packaging to pick up this as a component - removed now useless java build/makefiles
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile 29 Sep 2005 22:11:58 -0000 1.5
+++ Makefile 23 May 2006 22:13:37 -0000 1.6
@@ -32,31 +32,15 @@
include $(BUILD_ROOT)/nsconfig.mk
include $(BUILD_ROOT)/components.mk
-include javarules.mk
-CMDLNPATH=com/netscape/management/admserv/cmdln
-CLASSESDIR=$(BUILD_ROOT)/built/classes
PACKAGEDIR=$(BUILD_ROOT)/built/package/java
-LDAPJDK.JAR = -Dldapjdk.jar=$(LDAPJDK_DIR)/$(LDAPJDK)
-CONSOLE.ROOT = -Dconsole.root=$(CONSOLE_JAR_DIR)
-
all: build
-build: ldapjdk nmcjdk $(ANT_DEP)
- $(ANT) -Dlang=en $(LDAPJDK.JAR) $(CONSOLE.ROOT) build
- cp -p src/$(CMDLNPATH)/admconfig.dat $(CLASSESDIR)/$(CMDLNPATH)
- cp -p src/$(CMDLNPATH)/version.dat $(CLASSESDIR)/$(CMDLNPATH)
+build: ldapjdk nmcjdk
cd cmdln; $(MAKE) $(MFLAGS)
-package: $(ANT_DEP)
- $(ANT) -Dlang=en $(LDAPJDK.JAR) $(CONSOLE.ROOT) dist
+package:
cp smartupdate/goto.gif $(PACKAGEDIR)
cp smartupdate/spacer.gif $(PACKAGEDIR)
cp smartupdate/start-console.html $(PACKAGEDIR)
-
-doc: $(ANT_DEP)
- $(ANT) javadoc
-
-clean:
- $(ANT) clean
17 years, 4 months
[Fedora-directory-commits] adminserver Makefile, 1.19, 1.20 buildpaths.mk, 1.9, 1.10 components.mk, 1.49, 1.50 nsconfig.mk, 1.28, 1.29
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20715/adminserver
Modified Files:
Makefile buildpaths.mk components.mk nsconfig.mk
Log Message:
Bug: 192785
Description: Admin Server: Move admin server console into a separate package
Reviewed by: Noriko (Thanks!)
Moved files into the top level admservconsole module - changed admin server build/packaging to pick up this as a component - removed now useless java build/makefiles
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Makefile 21 Mar 2006 19:48:49 -0000 1.19
+++ Makefile 23 May 2006 22:13:36 -0000 1.20
@@ -33,7 +33,7 @@
PACKAGEDEPS = start_time
ifndef NOJAVA
-PACKAGEDEPS += ldapjdk nmcjdk jsssdk jsslib
+PACKAGEDEPS += ldapjdk nmcjdk jsssdk jsslib admservconsole
endif
PACKAGEDEPS += pkgBase pkgAdmin pkgMcc end_time
Index: buildpaths.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/buildpaths.mk,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- buildpaths.mk 21 Mar 2006 19:48:49 -0000 1.9
+++ buildpaths.mk 23 May 2006 22:13:36 -0000 1.10
@@ -89,6 +89,8 @@
CONSOLE_SOURCE_DIR = $(BUILD_ROOT)/..
+ADMSERVCONSOLE_SOURCE_DIR = $(BUILD_ROOT)/..
+
#LDAPJDK_SOURCE_DIR = $(MOZILLA_SOURCE_ROOT)
LDAPJDK_BUILD_DIR = $(CONSOLE_SOURCE_DIR)/imports/ldapjdk
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- components.mk 12 May 2006 00:50:08 -0000 1.49
+++ components.mk 23 May 2006 22:13:36 -0000 1.50
@@ -399,6 +399,45 @@
endif
#############################################################
+# Admserv Console java classes
+#############################################################
+
+ADMSERVCONSOLE_SUF = 1.0.2
+ADMSERVCONSOLE_GEN_SUF = 1.0
+ADMSERVCONSOLE_RELDATE = 20060523
+
+ADMSERVCONSOLE_COMP = admservconsole/$(ADMSERVCONSOLE_GEN_SUF)
+
+ADMSERVCONSOLE_VERSION = $(ADMSERVCONSOLE_RELDATE)
+
+ifeq ($(BUILD_MODE), int)
+ifeq ($(INT_NMCSDK), 1)
+ADMSERVCONSOLE_DIR = $(INT_DIR)/$(ADMSERVCONSOLE_COMP)/$(ADMSERVCONSOLE_VERSION)/$(NSOBJDIR_NAME)
+else
+ADMSERVCONSOLE_DIR = $(COMPONENTS_DIR)/$(ADMSERVCONSOLE_COMP)/$(ADMSERVCONSOLE_VERSION)/$(NSOBJDIR_NAME)
+endif
+else #fedora
+ADMSERVCONSOLE_DIR = $(FED_COMPONENTS_DIR)/$(ADMSERVCONSOLE_COMP)/$(ADMSERVCONSOLE_VERSION)/$(NSOBJDIR_NAME)
+endif
+
+# since the jar files are packaged as is, they should not be symlink'ed.
+ADMSERVCONSOLE_METHOD = FTP
+
+admservconsole:
+ifdef INTERNAL_BUILD
+ mkdir -p $(CLASS_DEST)
+# grab the jar files
+ $(PERL5) $(RELTOOLS)/ftp_puller.pl -method $(ADMSERVCONSOLE_METHOD) -objdir $(ADMSERVCONSOLE_JAR_DIR) -componentdir $(ADMSERVCONSOLE_DIR)/java -files $(ADMIN_BRAND)-admserv-$(ADMSERVCONSOLE_SUF).jar,$(ADMIN_BRAND)-admserv-$(ADMSERVCONSOLE_SUF)_en.jar
+ifneq ($(ARCH), WINNT)
+# make symlinks; cannot FTP symlinked files
+ -(cd $(ADMSERVCONSOLE_JAR_DIR); ln -s $(ADMIN_BRAND)-admserv-$(ADMSERVCONSOLE_SUF).jar $(ADMIN_BRAND)-admserv-$(ADMSERVCONSOLE_GEN_SUF).jar)
+ -(cd $(ADMSERVCONSOLE_JAR_DIR); ln -s $(ADMIN_BRAND)-admserv-$(ADMSERVCONSOLE_SUF)_en.jar $(ADMIN_BRAND)-admserv-$(ADMSERVCONSOLE_GEN_SUF)_en.jar)
+endif
+else # INTERNAL_BUILD
+ @if [ ! -f $(ADMSERVCONSOLE_JAR_DIR)/$(ADMIN_BRAND)-admserv-$(ADMSERVCONSOLE_SUF).jar ]; then echo The admservconsole jar files are missing from $(ADMSERVCONSOLE_JAR_DIR) - please build or download them ; exit 1 ; fi
+endif
+
+#############################################################
# JSS java classes
#############################################################
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- nsconfig.mk 24 Mar 2006 01:12:20 -0000 1.28
+++ nsconfig.mk 23 May 2006 22:13:36 -0000 1.29
@@ -944,6 +944,12 @@
CONSOLE_JAR_DIR = $(CLASS_DEST)
endif
+ifdef ADMSERVCONSOLE_SOURCE_ROOT
+ ADMSERVCONSOLE_JAR_DIR = $(ADMSERVCONSOLE_SOURCE_ROOT)/built/package
+else
+ ADMSERVCONSOLE_JAR_DIR = $(CLASS_DEST)
+endif
+
ifdef ONLINEHELP_SOURCE_DIR
else
endif
17 years, 4 months
[Fedora-directory-commits] admservconsole build.properties, 1.1.1.1, 1.2
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/admservconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16736
Modified Files:
build.properties
Log Message:
use admserv instead of as for jar file names
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/admservconsole/build.properties,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- build.properties 22 May 2006 18:14:32 -0000 1.1.1.1
+++ build.properties 22 May 2006 19:48:18 -0000 1.2
@@ -24,5 +24,5 @@
admservconsole.version=1.0.2
admservconsole.gen.version=1.0
brand=fedora
-admservconsole.name=${brand}-as-${admservconsole.version}
-admservconsole.gen.name=${brand}-as-${admservconsole.gen.version}
+admservconsole.name=${brand}-admserv-${admservconsole.version}
+admservconsole.gen.name=${brand}-admserv-${admservconsole.gen.version}
17 years, 4 months
[Fedora-directory-commits] adminutil components.mk, 1.4, 1.5 internal_comp_deps.mk, 1.4, 1.5
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminutil
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13822
Modified Files:
components.mk internal_comp_deps.mk
Log Message:
[172166] Admin Util build (RPM)
Preparation for the RPM build.
If these environment variables are set, the paths are used instead of the
"local paths" or "internal paths". (note: the values are just examples.)
$ env | egrep "ICU_|NSS_|NSPR_|LDAPCSDK_"
NSS_INCLUDE_DIR=/usr/include/dirsec/nss3
ICU_INCLUDE_DIR=/usr/include
ICU_BIN_DIR=/usr/bin
LDAPCSDK_LIB_DIR=/usr/lib
NSPR_INCLUDE_DIR=/usr/include/dirsec/nspr4
LDAPCSDK_INCLUDE_DIR=/usr/include/mozldap
NSS_LIB_DIR=/usr/lib/dirsec
NSPR_LIB_DIR=/usr/lib/dirsec
ICU_LIB_DIR=/usr/lib
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/components.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- components.mk 1 Mar 2006 23:44:01 -0000 1.4
+++ components.mk 22 May 2006 18:56:16 -0000 1.5
@@ -63,12 +63,23 @@
endif
endif
NSPR_LIBNAMES += nspr4
-ifdef NSPR_SOURCE_ROOT
- NSPR_LIBPATH = $(NSPR_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/lib
+ifdef NSPR_INCLUDE_DIR
+ NSPR_INCDIR = $(NSPR_INCLUDE_DIR)
+else
+ ifdef NSPR_SOURCE_ROOT
NSPR_INCDIR = $(NSPR_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/include
+ else
+ NSPR_INCDIR = $(NSPR_BUILD_DIR)/include
+ endif
+endif
+ifdef NSPR_LIB_DIR
+ NSPR_LIBPATH = $(NSPR_LIB_DIR)
else
+ ifdef NSPR_SOURCE_ROOT
+ NSPR_LIBPATH = $(NSPR_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/lib
+ else
NSPR_LIBPATH = $(NSPR_BUILD_DIR)/lib
- NSPR_INCDIR = $(NSPR_BUILD_DIR)/include
+ endif
endif
NSPR_INCLUDE = -I$(NSPR_INCDIR)
NSPR_LIBS_TO_PKG = $(addsuffix .$(DLL_SUFFIX),$(addprefix $(NSPR_LIBPATH)/lib,$(NSPR_LIBNAMES)))
@@ -81,24 +92,34 @@
$(addprefix lib, $(NSPR_LIBNAMES))))
else
NSPR_SOLIBS = $(addsuffix .$(DLL_SUFFIX), $(addprefix $(LIB_PREFIX), $(NSPR_LIBNAMES)))
- NSPROBJNAME = $(addsuffix .a, $(addprefix $(LIB_PREFIX), $(NSPR_LIBNAMES))
+ NSPROBJNAME = $(addsuffix .a, $(addprefix $(LIB_PREFIX), $(NSPR_LIBNAMES)))
LIBNSPR = $(addprefix $(NSPR_LIBPATH)/, $(NSPR_SOLIBS))
NSPRLINK = -L$(NSPR_LIBPATH) $(addprefix -l, $(NSPR_LIBNAMES))
endif
### SECURITY #############################
-ifdef SECURITY_SOURCE_ROOT
- SECURITY_LIBPATH = $(SECURITY_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/lib
- SECURITY_BINPATH = $(SECURITY_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/bin
+ifdef NSS_INCLUDE_DIR
+ SECURITY_INCDIR = $(NSS_INCLUDE_DIR)
+else
+ ifdef SECURITY_SOURCE_ROOT
SECURITY_INCDIR = $(SECURITY_SOURCE_ROOT)/dist/public/nss
+ else
+ SECURITY_INCDIR = $(SECURITY_BUILD_DIR)/include
+ endif
+endif
+
+ifdef NSS_LIB_DIR
+ SECURITY_LIBPATH = $(NSS_LIB_DIR)
else
+ ifdef SECURITY_SOURCE_ROOT
+ SECURITY_LIBPATH = $(SECURITY_SOURCE_ROOT)/dist/$(MOZ_OBJDIR_NAME)/lib
+ else
SECURITY_LIBPATH = $(SECURITY_BUILD_DIR)/lib
- SECURITY_BINPATH = $(SECURITY_BUILD_DIR)/bin
- SECURITY_INCDIR = $(SECURITY_BUILD_DIR)/include
+ endif
endif
+
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
ifeq ($(ARCH), WINNT)
@@ -117,15 +138,26 @@
# LDAP SDK
###################################################
-ifdef LDAPSDK_SOURCE_ROOT
- LDAPSDK_LIBPATH = $(LDAPSDK_SOURCE_ROOT)/dist/lib
+ifdef LDAPCSDK_INCLUDE_DIR
+ LDAPSDK_INCDIR = $(LDAPCSDK_INCLUDE_DIR)
+else
+ ifdef LDAPSDK_SOURCE_ROOT
LDAPSDK_INCDIR = $(LDAPSDK_SOURCE_ROOT)/dist/public/ldap
- LDAPSDK_BINPATH = $(LDAPSDK_SOURCE_ROOT)/dist/bin
+ else
+ LDAPSDK_INCDIR = $(LDAP_ROOT)/include
+ endif
+endif
+
+ifdef LDAPCSDK_LIB_DIR
+ LDAPSDK_LIBPATH = $(LDAPCSDK_LIB_DIR)
else
+ ifdef LDAPSDK_SOURCE_ROOT
+ LDAPSDK_LIBPATH = $(LDAPSDK_SOURCE_ROOT)/dist/lib
+ else
LDAPSDK_LIBPATH = $(LDAP_ROOT)/lib
- LDAPSDK_INCDIR = $(LDAP_ROOT)/include
- LDAPSDK_BINPATH = $(LDAP_ROOT)/bin
+ endif
endif
+
LDAPSDK_INCLUDE = -I$(LDAPSDK_INCDIR)
# package the include files - needed for the plugin API
@@ -156,20 +188,40 @@
LDAP_LIBPATH = $(LDAPSDK_LIBPATH)
LDAP_INCLUDE = $(LDAPSDK_INCDIR)
-LDAP_TOOLDIR = $(LDAPSDK_BINPATH)
### ICU package ##########################################
ICU_LIB_VERSION = 34
-ifdef ICU_SOURCE_ROOT
- ICU_LIBPATH = $(ICU_SOURCE_ROOT)/built/lib
+ifdef ICU_BIN_DIR
+ ICU_BINPATH = $(ICU_BIN_DIR)
+else
+ ifdef ICU_SOURCE_ROOT
ICU_BINPATH = $(ICU_SOURCE_ROOT)/built/bin
+ else
+ ICU_BINPATH = $(ICU_BUILD_DIR)/bin
+ endif
+endif
+
+ifdef ICU_INCLUDE_DIR
+ ICU_INCPATH = $(ICU_INCLUDE_DIR)
+else
+ ifdef ICU_SOURCE_ROOT
ICU_INCPATH = $(ICU_SOURCE_ROOT)/built/include
+ else
+ ICU_INCPATH = $(ICU_BUILD_DIR)/include
+ endif
+endif
+
+ifdef ICU_LIB_DIR
+ ICU_LIBPATH = $(ICU_LIB_DIR)
else
+ ifdef ICU_SOURCE_ROOT
+ ICU_LIBPATH = $(ICU_SOURCE_ROOT)/built/lib
+ else
ICU_LIBPATH = $(ICU_BUILD_DIR)/lib
- ICU_BINPATH = $(ICU_BUILD_DIR)/bin
- ICU_INCPATH = $(ICU_BUILD_DIR)/include
+ endif
endif
+
ICU_INCLUDE = -I$(ICU_INCPATH)
ifeq ($(ARCH), WINNT)
ifeq ($(BUILD_DEBUG), optimize)
@@ -183,14 +235,17 @@
else
ICU_LIBNAMES = icui18n icuuc icudata
ICULINK = -L$(ICU_LIBPATH) $(addprefix -l, $(ICU_LIBNAMES))
-#LIBS_TO_PKG = $(addsuffix $(addprefix lib,$(ICU_LIBNAMES))
endif
# Resource Bundle Compiler
ifeq ($(ARCH), WINNT)
ICU_GENRB = $(ICU_BINPATH)/genrb.exe
else
+ ifdef ICU_BIN_DIR
+ ICU_GENRB = genrb
+ else
ICU_GENRB = sh ./genrb_wrapper.sh $(ICU_BUILD_DIR)
+ endif
endif
###########################################################
Index: internal_comp_deps.mk
===================================================================
RCS file: /cvs/dirsec/adminutil/internal_comp_deps.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- internal_comp_deps.mk 1 Mar 2006 23:44:01 -0000 1.4
+++ internal_comp_deps.mk 22 May 2006 18:56:16 -0000 1.5
@@ -68,7 +68,6 @@
$(SECURITY_DEP): $(RELTOOLS) $(NSCP_DISTDIR_FULL_RTL)
ifdef COMPONENT_DEPS
- mkdir -p $(SECURITY_BINPATH)
$(FTP_PULL) -method $(SECURITY_PULL_METHOD) \
-objdir $(SECURITY_BUILD_DIR) -componentdir $(SECURITY_IMPORT) \
-files $(SECURITY_FILES)
17 years, 4 months
[Fedora-directory-commits] admservconsole - Imported sources
by Doctor Conrad
Author: rmeggins
Update of /cvs/dirsec/admservconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13228
Log Message:
Initial import of admin server console into its own module
Status:
Vendor Tag: FedoraAdmservConsole
Release Tags: FedoraAdmservConsole_0_01
N admservconsole/imports.FC2
N admservconsole/LICENSE
N admservconsole/build.properties
N admservconsole/imports.HP-UX11i
N admservconsole/imports.FC3
N admservconsole/imports.Solaris9
N admservconsole/build.xml
N admservconsole/src/com/netscape/management/admserv/classes.env
N admservconsole/src/com/netscape/management/admserv/LoggingNode.java
N admservconsole/src/com/netscape/management/admserv/AdminServer.java
N admservconsole/src/com/netscape/management/admserv/AdminResourceModel.java
N admservconsole/src/com/netscape/management/admserv/AdminServerNode.java
N admservconsole/src/com/netscape/management/admserv/AdminFrameworkInitializer.java
N admservconsole/src/com/netscape/management/admserv/admserv.properties
N admservconsole/src/com/netscape/management/admserv/SNMPNode.java
N admservconsole/src/com/netscape/management/admserv/AdminServerProduct.java
N admservconsole/src/com/netscape/management/admserv/images/admin50.gif
N admservconsole/src/com/netscape/management/admserv/images/AdminServer.gif
N admservconsole/src/com/netscape/management/admserv/images/admin.gif
N admservconsole/src/com/netscape/management/admserv/images/AdminServerL.gif
N admservconsole/src/com/netscape/management/admserv/config/ConfigInfoDialog.java
N admservconsole/src/com/netscape/management/admserv/config/PluginConfigPanel.java
N admservconsole/src/com/netscape/management/admserv/config/GBC.java
N admservconsole/src/com/netscape/management/admserv/config/config.properties
N admservconsole/src/com/netscape/management/admserv/config/FilteredInputDocument.java
N admservconsole/src/com/netscape/management/admserv/config/ConfigPanelException.java
N admservconsole/src/com/netscape/management/admserv/config/IConfigDataModel.java
N admservconsole/src/com/netscape/management/admserv/config/IPluginConfigPanel.java
N admservconsole/src/com/netscape/management/admserv/config/ConfigErrorDialog.java
N admservconsole/src/com/netscape/management/admserv/config/ValidationException.java
N admservconsole/src/com/netscape/management/admserv/config/ButtonBar.java
N admservconsole/src/com/netscape/management/admserv/config/EditMonitor.java
N admservconsole/src/com/netscape/management/admserv/config/TabbedConfigPanel.java
N admservconsole/src/com/netscape/management/admserv/config/ActionMonitorPanel.java
N admservconsole/src/com/netscape/management/admserv/config/BaseConfigPanel.java
N admservconsole/src/com/netscape/management/admserv/config/RemoteRequestException.java
N admservconsole/src/com/netscape/management/admserv/logging/ErrorLogViewerModel.java
N admservconsole/src/com/netscape/management/admserv/logging/AccessLogViewerModel.java
N admservconsole/src/com/netscape/management/admserv/cmdln/sample-unix-options
N admservconsole/src/com/netscape/management/admserv/cmdln/ViewLogEntriesTask.java
N admservconsole/src/com/netscape/management/admserv/cmdln/admconfig.dat
N admservconsole/src/com/netscape/management/admserv/cmdln/version.dat
N admservconsole/src/com/netscape/management/admserv/cmdln/CountLogEntriesTask.java
N admservconsole/src/com/netscape/management/admserv/cmdln/CommandLine.java
N admservconsole/src/com/netscape/management/admserv/cmdln/AdmpwTask.java
N admservconsole/src/com/netscape/management/admserv/cmdln/sample-nt-options
N admservconsole/src/com/netscape/management/admserv/panel/SNMPCommunityPanel.java
N admservconsole/src/com/netscape/management/admserv/panel/IAdminOperationListener.java
N admservconsole/src/com/netscape/management/admserv/panel/AdminConfigData.java
N admservconsole/src/com/netscape/management/admserv/panel/CGISNMPSetup.java
N admservconsole/src/com/netscape/management/admserv/panel/SNMPManagerPanel.java
N admservconsole/src/com/netscape/management/admserv/panel/UGDirectoryConfigPanel.java
N admservconsole/src/com/netscape/management/admserv/panel/NetworkConfigPanel.java
N admservconsole/src/com/netscape/management/admserv/panel/panel.properties
N admservconsole/src/com/netscape/management/admserv/panel/IRestartControl.java
N admservconsole/src/com/netscape/management/admserv/panel/CGIDataModel.java
N admservconsole/src/com/netscape/management/admserv/panel/CGIAggregateDataModel.java
N admservconsole/src/com/netscape/management/admserv/panel/SNMPConfigPanel.java
N admservconsole/src/com/netscape/management/admserv/panel/DialogFrame.java
N admservconsole/src/com/netscape/management/admserv/panel/AdminOperation.java
N admservconsole/src/com/netscape/management/admserv/panel/SNMPStatusPanel.java
N admservconsole/src/com/netscape/management/admserv/panel/LoggingConfigPanel.java
N admservconsole/src/com/netscape/management/admserv/panel/CGIServerSetup.java
N admservconsole/src/com/netscape/management/admserv/panel/CGIAccessSetup.java
N admservconsole/src/com/netscape/management/admserv/panel/AttrNames.java
N admservconsole/src/com/netscape/management/admserv/panel/RestartOperation.java
N admservconsole/src/com/netscape/management/admserv/panel/StopOperation.java
N admservconsole/src/com/netscape/management/admserv/panel/EditableList.java
N admservconsole/src/com/netscape/management/admserv/panel/CGIUGDirectorySetup.java
N admservconsole/src/com/netscape/management/admserv/panel/AccessConfigPanel.java
N admservconsole/src/com/netscape/management/admserv/panel/CGIDirectorySetup.java
N admservconsole/src/com/netscape/management/admserv/panel/AdminConfigPanel.java
N admservconsole/src/com/netscape/management/admserv/panel/CGILoggingSetup.java
N admservconsole/src/com/netscape/management/admserv/panel/DirectoryConfigPanel.java
N admservconsole/src/com/netscape/management/admserv/panel/TurnOnSSL.java
N admservconsole/src/com/netscape/management/admserv/task/Restart.java
N admservconsole/src/com/netscape/management/admserv/task/SNMPSetup.java
N admservconsole/src/com/netscape/management/admserv/task/Logging.java
N admservconsole/src/com/netscape/management/admserv/task/Stop.java
N admservconsole/src/com/netscape/management/admserv/task/AdminTaskObject.java
N admservconsole/src/com/netscape/management/admserv/task/ServerSetup.java
N admservconsole/src/com/netscape/management/admserv/task/CertSetup.java
No conflicts created by this import
17 years, 4 months
[Fedora-directory-commits] mod_admserv mod_admserv.c,1.23,1.24
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/mod_admserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18529
Modified Files:
mod_admserv.c
Log Message:
[192022] Admin Server fails to bring up Config DS
Always treat StartConfigDS specially.
Regardless of the result of opening LDAPConnection,
put StartConfigDs into the cache for bootstrap.
Index: mod_admserv.c
===================================================================
RCS file: /cvs/dirsec/mod_admserv/mod_admserv.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mod_admserv.c 11 May 2006 23:53:52 -0000 1.23
+++ mod_admserv.c 17 May 2006 00:01:55 -0000 1.24
@@ -2248,21 +2248,21 @@
}
} while (server != NULL && ++tries < 2);
- if (error != LDAPU_SUCCESS) {
+ {
+ /* Always treat StartConfigDS specially.
+ * Regardless of the result of opening LDAPConnection,
+ * put StartConfigDs into the cache for bootstrap.
+ * This code allows the Console to launch the Config DS via Admin Server
+ * even if
+ * 1) the Config DS is not up when the Admin Server is started, or
+ * 2) the Config DS is shutdown after the Admin Server is started.
+ */
char startds[LINE_LENGTH];
char normStartds[LINE_LENGTH];
char *storage = startds;
char *uri = apr_pstrdup(module_pool, STARTDS_IDENTIFIER);
- /* Although opening LDAPConnection failed, we can initialize
- * Hosts/Addresses using the local cache.
- */
TaskCacheEntry *cache_entry;
- destroyAdmldap(info);
- closeLDAPConnection(server);
- ap_log_error(APLOG_MARK, APLOG_WARNING, 0, base_server,
- "Unable to bind as LocalAdmin to populate LocalAdmin tasks into cache.");
- /* Config DS is not up and running
- * put startconfigds into the cache for bootstrap */
+
if (!build_full_DN(&storage, startds+LINE_LENGTH, uri,
registryServer.bindDN)) {
ap_log_error(APLOG_MARK, APLOG_ERR, 0, base_server,
@@ -2291,6 +2291,13 @@
cache_entry->execRef ? cache_entry->execRef : "",
cache_entry->execRefArgs ? cache_entry->execRefArgs : "",
LOCAL_SUPER_NAME);
+ }
+
+ if (error != LDAPU_SUCCESS) {
+ destroyAdmldap(info);
+ closeLDAPConnection(server);
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, base_server,
+ "Unable to bind as LocalAdmin to populate LocalAdmin tasks into cache.");
return host_ip_init(p, plog, ptemp, base_server);
}
17 years, 4 months