[Fedora-directory-commits] adminserver/admserv/console/smartupdate Makefile, 1.7, 1.8 start.html, 1.5, 1.6
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/console/smartupdate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/admserv/console/smartupdate
Modified Files:
Makefile start.html
Log Message:
171942 ��� Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/smartupdate/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile 29 Sep 2005 22:11:59 -0000 1.7
+++ Makefile 28 Oct 2005 22:43:45 -0000 1.8
@@ -36,7 +36,7 @@
FIND = /bin/find
endif
-JARVERSION = 71
+JARVERSION = 10
LANGUAGE = en
SMARTUPDATE_DIR = $(PACKAGE_DIR)/..
Index: start.html
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/smartupdate/start.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- start.html 9 Sep 2005 18:46:45 -0000 1.5
+++ start.html 28 Oct 2005 22:43:45 -0000 1.6
@@ -23,7 +23,7 @@
<html>
<head>
-<title>Fedora Management Console 7.1</title>
+<title>Fedora Management Console 1.0</title>
</head>
<body bgColor=#000000>
18 years, 6 months
[Fedora-directory-commits] adminserver/admserv/console/cmdln admconfig, 1.4, 1.5 admconfig_testscript.bat, 1.2, 1.3
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/console/cmdln
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/admserv/console/cmdln
Modified Files:
admconfig admconfig_testscript.bat
Log Message:
171942 ��� Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: admconfig
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/cmdln/admconfig,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- admconfig 9 Sep 2005 18:46:23 -0000 1.4
+++ admconfig 28 Oct 2005 22:43:40 -0000 1.5
@@ -35,7 +35,7 @@
SHLIB_PATH=$SRVROOT/lib/jss:$SRVROOT/lib
LIBPATH=$SRVROOT/lib/jss:$SRVROOT/lib
JAVAOPTIONS=-Djava.library.path=$LD_LIBRARY_PATH
-CLASSPATH=./java/nmclf71.jar:./java/ldapjdk.jar:./java/jss3.jar:./java/base.jar:./java/mcc71.jar:./java/jars/admserv71.jar
+CLASSPATH=./java/nmclf10.jar:./java/ldapjdk.jar:./java/jss3.jar:./java/base.jar:./java/mcc10.jar:./java/jars/admserv10.jar
MAINCLASS=com.netscape.management.admserv.cmdln.CommandLine
PLATFORM=`uname`
Index: admconfig_testscript.bat
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/cmdln/admconfig_testscript.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- admconfig_testscript.bat 18 Aug 2005 18:59:53 -0000 1.2
+++ admconfig_testscript.bat 28 Oct 2005 22:43:40 -0000 1.3
@@ -22,7 +22,7 @@
REM
REM This batch file can be run from anywhere. The only stipulation is that
REM the <drive-letter> and <server-root> must be provided as the first two
-REM arguments. For example, admconfig_testscript h: as4.0\test
+REM arguments. For example, admconfig_testscript h: asX.X\test
REM
18 years, 6 months
[Fedora-directory-commits] adminserver/admserv/console build.properties, 1.7, 1.8
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/admserv/console
Modified Files:
build.properties
Log Message:
171942 ��� Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/console/build.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.properties 26 Sep 2005 14:07:18 -0000 1.7
+++ build.properties 28 Oct 2005 22:43:34 -0000 1.8
@@ -21,7 +21,7 @@
# END COPYRIGHT BLOCK
adminconsole.root=../..
-mcc.version=71
+mcc.version=10
admin.core=admserv
admin.console=${admin.core}${mcc.version}
18 years, 6 months
[Fedora-directory-commits] adminserver/admserv/cgi-src40 NTRestartService.c, 1.5, 1.6 NTStopService.c, 1.5, 1.6 ugdsconfig.c, 1.4, 1.5
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/admserv/cgi-src40
Modified Files:
NTRestartService.c NTStopService.c ugdsconfig.c
Log Message:
171942 ��� Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: NTRestartService.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/NTRestartService.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NTRestartService.c 9 Sep 2005 18:45:39 -0000 1.5
+++ NTRestartService.c 28 Oct 2005 22:43:29 -0000 1.6
@@ -46,5 +46,5 @@
//--------------------------------------------------------------------------//
int main(int argc, char *argv[])
{
- RestartService("admin71-serv");
+ RestartService("admin10-serv");
}
Index: NTStopService.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/NTStopService.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NTStopService.c 9 Sep 2005 18:45:39 -0000 1.5
+++ NTStopService.c 28 Oct 2005 22:43:29 -0000 1.6
@@ -43,5 +43,5 @@
//--------------------------------------------------------------------------//
int main(int argc, char *argv[])
{
- StopService("admin71-serv");
+ StopService("admin10-serv");
}
Index: ugdsconfig.c
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/ugdsconfig.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ugdsconfig.c 18 Aug 2005 18:59:03 -0000 1.4
+++ ugdsconfig.c 28 Oct 2005 22:43:29 -0000 1.5
@@ -390,7 +390,7 @@
* The <Admin Domain> name is extractioned from the sie DN. The domain name is the second
* RDN in the sie DN from right to left.
*
- * Example: sie dn="admin-serv-goo,ou=Netscape Adminstration Server,cn=SuiteSpot 4.0,
+ * Example: sie dn="admin-serv-goo,ou=Netscape Adminstration Server,cn=SuiteSpot,
* cn=goo.mcom.com, ou=Netscape SuiteSpot, o=NetscapeRoot"
* The admin domain name is "Netscape SuiteSpot"
* Returning cn=UserDirectory, ou=Globalpreferences,ou=Netscape SuiteSpot,o=NetscapeSuiteSpot
18 years, 6 months
[Fedora-directory-commits] adminserver/admserv/cfgstuff admserv.conf, 1.7, 1.8
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435/admserv/cfgstuff
Modified Files:
admserv.conf
Log Message:
171942 ��� Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: admserv.conf
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/admserv.conf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- admserv.conf 9 Sep 2005 19:02:07 -0000 1.7
+++ admserv.conf 28 Oct 2005 22:43:23 -0000 1.8
@@ -25,7 +25,7 @@
SetEnv ADMSERV_ROOT %%%sroot%%%/admin-serv/config/
ADMCacheLifeTime 600
-ADMServerVersionString "Fedora-Administrator/7.1"
+ADMServerVersionString "Fedora-Administrator/1.0"
ScriptAlias /clients/orgchart/bin/ "%%%sroot%%%/clients/orgchart/bin/"
ScriptAlias /clients/dsgw/bin/ "%%%sroot%%%/clients/dsgw/bin/"
18 years, 6 months
[Fedora-directory-commits] adminserver Makefile, 1.14, 1.15 components.mk, 1.37, 1.38 nsconfig.mk, 1.16, 1.17
by Doctor Conrad
Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14435
Modified Files:
Makefile components.mk nsconfig.mk
Log Message:
171942 ��� Change Admin Server version to 1.0
1) changing Admin Server version to 1.0 including ou in the Global preferences
2) picking up Console 1.0, AdminUtil 1.0, SetupUtil 1.0, and mod_admserv
3) removing failover support checking which checks if SIE_VERSION is 4.0 or not.
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Makefile 29 Sep 2005 22:11:57 -0000 1.14
+++ Makefile 28 Oct 2005 22:43:18 -0000 1.15
@@ -107,9 +107,9 @@
@echo ==== Finished Branding Administration Server ==========
versionAdmin: $(RELTOOLS)
- @echo ==== Branding Administration Server ==========
+ @echo ==== Versioning Administration Server ==========
$(PERL5) $(RELTOOLS)/brandver.pl -i branding/fedora/brandver.dat
- @echo ==== Finished Branding Administration Server ==========
+ @echo ==== Finished Versioning Administration Server ==========
normalizeAdmin: $(RELTOOLS)
@echo ==== Normalizing Administration Server ==========
Index: components.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/components.mk,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- components.mk 25 Oct 2005 15:29:07 -0000 1.37
+++ components.mk 28 Oct 2005 22:43:18 -0000 1.38
@@ -158,9 +158,9 @@
# SETUPUTIL
##############################################################
-SETUPUTIL_RELDATE = 20050831
+SETUPUTIL_RELDATE = 20051027
SETUPUTIL_FILE = setuputil.tar.gz
-SETUPUTIL_COMPNAME = setuputil/7.1
+SETUPUTIL_COMPNAME = setuputil/1.0
SETUPUTIL_ROOT = $(NSCP_COMPDIR)/setuputil
@@ -196,11 +196,11 @@
# ADMINUTIL Library
###############################################################
-ADMINUTIL_SUF = 71
-ADMINUTIL_RELDATE = 20050721
+ADMINUTIL_SUF = 10
+ADMINUTIL_RELDATE = 20051026
ADMINUTIL_VERSION = $(ADMINUTIL_RELDATE)
ADMINUTIL_ROOT = $(NSCP_COMPDIR)/adminutil
-ADMINUTIL_COMPNAME = adminutil/7.1
+ADMINUTIL_COMPNAME = adminutil/1.0
ADMINUTILOBJDIR = $(NSOBJDIR_NAME)
@@ -233,8 +233,8 @@
# DOCS
################################################################
-ADMDOC_SUF = 7.1$(BUILD_MODE)
-ADMDOC_RELDATE = 20050309
+ADMDOC_SUF = 1.0$(BUILD_MODE)
+ADMDOC_RELDATE = 20050930
ADMDOC_VERSION = $(ADMDOC_RELDATE)
ADMDOC_PATH = $(NSCP_COMPDIR)/admservdoc
ADMDOC_ABSPATH = $(ABS_ROOT)/components/admservdoc
@@ -313,10 +313,10 @@
# Console java classes
#############################################################
-NMCJDK_SUF = 71
-NMCJDK_RELDATE = 20051024
+NMCJDK_SUF = 10
+NMCJDK_RELDATE = 20051027
-NMCJDK_COMP = console/7.1
+NMCJDK_COMP = console/1.0
NMCJDK_VERSION = $(NMCJDK_RELDATE)
@@ -420,10 +420,10 @@
###########################################################
# mod_admserv #############################################
-MOD_ADMSERV_RELDATE = 20050819
+MOD_ADMSERV_RELDATE = 20051028
#BASE_MOD_ADMSERV = $(COMPONENTS_DIR)/mod_admserv/$(MOD_ADMSERV_RELDATE)/$(NSOBJDIR_NAME)
-BASE_MOD_ADMSERV = $(INT_DIR)/mod_admserv/$(MOD_ADMSERV_RELDATE)/$(NSOBJDIR_NAME)
+BASE_MOD_ADMSERV = $(FED_COMPONENTS_DIR)/mod_admserv/1.0/$(MOD_ADMSERV_RELDATE)/$(NSOBJDIR_NAME)
MOD_ADMSERV = $(MOD_ADMSERV_LIBPATH)/libmodadmserv.$(DLL_SUFFIX)
Index: nsconfig.mk
===================================================================
RCS file: /cvs/dirsec/adminserver/nsconfig.mk,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nsconfig.mk 7 Oct 2005 21:49:29 -0000 1.16
+++ nsconfig.mk 28 Oct 2005 22:43:18 -0000 1.17
@@ -499,7 +499,7 @@
endif
endif
-ADM_SUF=71
+ADM_SUF=10
# CLEAN THIS UP
@@ -784,7 +784,7 @@
# ADMINUTIL
########################################
-ADMINUTIL_LIB_VERSION=71
+ADMINUTIL_LIB_VERSION=10
ifdef ADMINUTIL_SOURCE_ROOT
ADMINUTIL_LIBPATH = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(PLATFORM_DEST)/lib
ADMINUTIL_INCLUDE = $(ADMINUTIL_SOURCE_ROOT)/built/adminutil/$(PLATFORM_DEST)/include
@@ -841,7 +841,7 @@
# NMCSDK
#########################################
-NMCJDK_JAR_VERSION = 71
+NMCJDK_JAR_VERSION = 10
NMCJDK_JARS = base.jar mcc$(NMCJDK_JAR_VERSION).jar mcc$(NMCJDK_JAR_VERSION)_en.jar nmclf$(NMCJDK_JAR_VERSION).jar nmclf$(NMCJDK_JAR_VERSION)_en.jar
#########################################
18 years, 6 months
[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv DSAdmin.java, 1.2, 1.3
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14275
Modified Files:
DSAdmin.java
Log Message:
171941 - checkVersion was comparing versions with greater than when it should have been using greater than or equal to
Index: DSAdmin.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSAdmin.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DSAdmin.java 28 Oct 2005 18:01:34 -0000 1.2
+++ DSAdmin.java 28 Oct 2005 22:18:17 -0000 1.3
@@ -1236,7 +1236,7 @@
try {
Float f = new Float(version);
// Check if the console meets the minimum version requirement
- if ((f != null) && (f.floatValue() > MINIMUM_VERSION)) {
+ if ((f != null) && (f.floatValue() >= MINIMUM_VERSION)) {
return true;
} else {
DSUtil.showErrorDialog(frame, "neednewconsole", version);
18 years, 6 months
[Fedora-directory-commits] mod_nss nss_engine_init.c,1.15,1.16
by Doctor Conrad
Author: rcritten
Update of /cvs/dirsec/mod_nss
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7458
Modified Files:
nss_engine_init.c
Log Message:
Add in check to be sure that the same server isn't initialized with SSL
more than once. This avoids a crash during shutdown where the same
certificates and keys will try to be released multiple times. This is
based on ssl_init_server_check() from mod_ssl.
Index: nss_engine_init.c
===================================================================
RCS file: /cvs/dirsec/mod_nss/nss_engine_init.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nss_engine_init.c 11 Oct 2005 15:01:34 -0000 1.15
+++ nss_engine_init.c 28 Oct 2005 18:20:01 -0000 1.16
@@ -717,6 +717,19 @@
}
}
+static void nss_init_server_check(server_rec *s,
+ apr_pool_t *p,
+ apr_pool_t *ptemp,
+ modnss_ctx_t *mctx)
+{
+ if (mctx->servercert != NULL || mctx->serverkey != NULL) {
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
+ "Illegal attempt to re-initialise SSL for server "
+ "(theoretically shouldn't happen!)");
+ nss_die();
+ }
+}
+
static void nss_init_ctx(server_rec *s,
apr_pool_t *p,
apr_pool_t *ptemp,
@@ -895,6 +908,8 @@
apr_pool_t *ptemp,
SSLSrvConfigRec *sc)
{
+ nss_init_server_check(s, p, ptemp, sc->server);
+
nss_init_ctx(s, p, ptemp, sc->server);
nss_init_server_certs(s, p, ptemp, sc->server);
18 years, 6 months
[Fedora-directory-commits] directoryconsole/src/com/netscape/admin/dirserv DSAdmin.java, 1.1.1.1, 1.2 about.properties, 1.1.1.1, 1.2 dirserv.properties, 1.1.1.1, 1.2
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7298/src/com/netscape/admin/dirserv
Modified Files:
DSAdmin.java about.properties dirserv.properties
Log Message:
171941 - Adjusted the version number and branding. I had to modify the checkVersion method to deal with running in Console 1.0. I also cleaned up references to consolesdk in the Ant build files. They should be console instead since we dropped the consolesdk naming. The external and internal imports files were adjusted to pick up the new 1.0 Console component.
Index: DSAdmin.java
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/DSAdmin.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- DSAdmin.java 18 Jul 2005 00:55:34 -0000 1.1.1.1
+++ DSAdmin.java 28 Oct 2005 18:01:34 -0000 1.2
@@ -1231,25 +1231,19 @@
private boolean checkVersion(ConsoleInfo info) {
String version = null;
JFrame frame = UtilConsoleGlobals.getActivatedFrame();
- try {
- version = VersionInfo.getVersionNumber();
- }
- // If the class is not found then we are running in 4.0 environment
- catch (Exception e) {
- DSUtil.showErrorDialog(frame, "neednewconsole", "4.0");
- return false;
- }
+ version = VersionInfo.getVersionNumber();
try {
Float f = new Float(version);
- // this version of the console is compatible with any kingpin
- // console version greater than 4.0 e.g. 4.1, 4.2, 5.0, etc.
- return (f != null) && (f.floatValue() > 4.0);
+ // Check if the console meets the minimum version requirement
+ if ((f != null) && (f.floatValue() > MINIMUM_VERSION)) {
+ return true;
+ } else {
+ DSUtil.showErrorDialog(frame, "neednewconsole", version);
+ }
} catch (Exception e) { // could not parse version as float
}
- DSUtil.showErrorDialog(frame, "neednewconsole", version);
-
return false;
}
@@ -1274,6 +1268,9 @@
static public int SECURITY_DISABLE = 1;
static public int SECURITY_ENABLE = 2;
+ // Minimum required console version
+ private static final float MINIMUM_VERSION = 1.0f;
+
// Icon for the console
private static final String _imageName = "directory.gif";
private static final String AUTH_ICON = "face.gif";
Index: about.properties
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/about.properties,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- about.properties 18 Jul 2005 00:55:43 -0000 1.1.1.1
+++ about.properties 28 Oct 2005 18:01:34 -0000 1.2
@@ -19,7 +19,7 @@
#
# Strings and logos used by the DSAboutDialog
-aboutDialog-dialogTitle=Fedora Directory Server 7.1
+aboutDialog-dialogTitle=Fedora Directory Server 1.0
aboutDialog-productLogo=com/netscape/management/client/images/logo32.gif
aboutDialog-productCopyright=Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.\nCopyright (C) 2005 Red Hat, Inc.\nAll rights reserved.
aboutDialog-productLicense=Fedora is a trademark of Red Hat, Inc. in the United States and other countries and is used by permission.
Index: dirserv.properties
===================================================================
RCS file: /cvs/dirsec/directoryconsole/src/com/netscape/admin/dirserv/dirserv.properties,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- dirserv.properties 18 Jul 2005 00:55:45 -0000 1.1.1.1
+++ dirserv.properties 28 Oct 2005 18:01:34 -0000 1.2
@@ -164,9 +164,9 @@
#
dialog-configtitle=Fedora Directory Server
dsAdmin-title=Fedora Directory Server
-dsAdmin-version=Version 7.1
+dsAdmin-version=Version 1.0
dsAdmin-nsServerPort=Port
-dsAdmin-framework-description=Fedora Directory Server Console 7.1
+dsAdmin-framework-description=Fedora Directory Server Console 1.0
dsAdmin-remove-server-cgi-failed=ds_remove failure
#
18 years, 6 months
[Fedora-directory-commits] directoryconsole build.properties, 1.1.1.1, 1.2 build.xml, 1.1.1.1, 1.2 imports.FC2, 1.1.1.1, 1.2 imports.FC3, 1.1.1.1, 1.2 imports.HP-UX11i, 1.1.1.1, 1.2 imports.Solaris9, 1.1.1.1, 1.2
by Doctor Conrad
Author: nkinder
Update of /cvs/dirsec/directoryconsole
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7298
Modified Files:
build.properties build.xml imports.FC2 imports.FC3
imports.HP-UX11i imports.Solaris9
Log Message:
171941 - Adjusted the version number and branding. I had to modify the checkVersion method to deal with running in Console 1.0. I also cleaned up references to consolesdk in the Ant build files. They should be console instead since we dropped the consolesdk naming. The external and internal imports files were adjusted to pick up the new 1.0 Console component.
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/directoryconsole/build.properties,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- build.properties 18 Jul 2005 00:55:31 -0000 1.1.1.1
+++ build.properties 28 Oct 2005 18:01:11 -0000 1.2
@@ -21,5 +21,5 @@
lang=en
ldapconsole.root=..
-ldapconsole.version=71
+ldapconsole.version=10
ldapconsole.name=ds${ldapconsole.version}
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/directoryconsole/build.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- build.xml 18 Jul 2005 00:55:32 -0000 1.1.1.1
+++ build.xml 28 Oct 2005 18:01:11 -0000 1.2
@@ -47,7 +47,7 @@
</target>
<!-- Imports -->
- <target name="import_consolesdk" depends="prepare_build" unless="consolesdk.location">
+ <target name="import_console" depends="prepare_build" unless="console.location">
<!-- Load imports file -->
<input
message="An imports file must be specified. Enter the imports file that you want to use:"
@@ -62,23 +62,23 @@
</condition>
</fail>
<property file="${imports.file}"/>
- <!-- Fetch consolesdk -->
- <mkdir dir="${imports.dir}/consolesdk"/>
- <get src="${consolesdk.import.location}/${consolesdk.import}"
- dest="${imports.dir}/consolesdk/${consolesdk.import}"/>
- <!-- Extract consolesdk -->
- <untar src="${imports.dir}/consolesdk/${consolesdk.import}"
- dest="${imports.dir}/consolesdk/unzipped"
+ <!-- Fetch console -->
+ <mkdir dir="${imports.dir}/console"/>
+ <get src="${console.import.location}/${console.import}"
+ dest="${imports.dir}/console/${console.import}"/>
+ <!-- Extract console -->
+ <untar src="${imports.dir}/console/${console.import}"
+ dest="${imports.dir}/console/unzipped"
compression="gzip"/>
- <!-- Set consolesdk.location -->
- <property name="consolesdk.location" value="${imports.dir}/consolesdk/unzipped"/>
+ <!-- Set console.location -->
+ <property name="console.location" value="${imports.dir}/console/unzipped"/>
</target>
<!-- Build -->
- <target name="build" depends="import_consolesdk">
+ <target name="build" depends="import_console">
<!-- Construct classpath -->
<path id="ldapconsole.classpath">
- <fileset dir="${consolesdk.location}">
+ <fileset dir="${console.location}">
<include name="*/java/base.jar"/>
<include name="*/java/mcc*.jar"/>
<include name="*/java/nmclf*.jar"/>
Index: imports.FC2
===================================================================
RCS file: /cvs/dirsec/directoryconsole/imports.FC2,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- imports.FC2 18 Jul 2005 00:55:32 -0000 1.1.1.1
+++ imports.FC2 28 Oct 2005 18:01:11 -0000 1.2
@@ -19,5 +19,5 @@
# Defines component import locations for FC2
# Console SDK
-consolesdk.import.location=http://directory.fedora.redhat.com/built/components/consolesdk/70/20050714/RHEL3_x86_gcc3_OPT.OBJ
-consolesdk.import=consolesdk70.tar.gz
+console.import.location=http://directory.fedora.redhat.com/built/components/console/1.0/20051027/RHEL3_x86_gcc3_OPT.OBJ
+console.import=console10.tar.gz
Index: imports.FC3
===================================================================
RCS file: /cvs/dirsec/directoryconsole/imports.FC3,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- imports.FC3 18 Jul 2005 00:55:32 -0000 1.1.1.1
+++ imports.FC3 28 Oct 2005 18:01:11 -0000 1.2
@@ -19,5 +19,5 @@
# Defines component import locations for FC3
# Console SDK
-consolesdk.import.location=http://directory.fedora.redhat.com/built/components/consolesdk/70/20050714/RHEL4_x86_gcc3_OPT.OBJ
-consolesdk.import=consolesdk70.tar.gz
+console.import.location=http://directory.fedora.redhat.com/built/components/console/1.0/20051027/RHEL4_x86_gcc3_OPT.OBJ
+console.import=console10.tar.gz
Index: imports.HP-UX11i
===================================================================
RCS file: /cvs/dirsec/directoryconsole/imports.HP-UX11i,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- imports.HP-UX11i 18 Jul 2005 00:55:32 -0000 1.1.1.1
+++ imports.HP-UX11i 28 Oct 2005 18:01:11 -0000 1.2
@@ -19,5 +19,5 @@
# Defines component import locations for FC2
# Console SDK
-consolesdk.import.location=http://directory.fedora.redhat.com/built/components/consolesdk/70/20050714/HP-UXB.11.11_OPT.OBJ
-consolesdk.import=consolesdk70.tar.gz
+console.import.location=http://directory.fedora.redhat.com/built/components/console/1.0/20051027/HP-UXB.11.11_OPT.OBJ
+console.import=console10.tar.gz
Index: imports.Solaris9
===================================================================
RCS file: /cvs/dirsec/directoryconsole/imports.Solaris9,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- imports.Solaris9 18 Jul 2005 00:55:32 -0000 1.1.1.1
+++ imports.Solaris9 28 Oct 2005 18:01:11 -0000 1.2
@@ -19,5 +19,5 @@
# Defines component import locations for FC2
# Console SDK
-consolesdk.import.location=http://directory.fedora.redhat.com/built/components/consolesdk/70/20050714/SunOS5.9_OPT.OBJ
-consolesdk.import=consolesdk70.tar.gz
+console.import.location=http://directory.fedora.redhat.com/built/components/console/1.0/20051027/SunOS5.9_OPT.OBJ
+console.import=console10.tar.gz
18 years, 6 months