[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

[Nathan Kinder (nkinder)]

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