Author: nkinder Update of /cvs/dirsec/console In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22252 Modified Files: build.properties build.xml imports.FC2 imports.FC3 imports.HP-UX11i imports.Solaris9 startconsole Added Files: fedora-console.spec startconsole-sandbox Log Message: 173947 - Added ability to build a Console RPM. The layout of Console can now be distributed inside system locations instead of being self-contained. --- NEW FILE fedora-console.spec --- Name: fedora-console Version: 1.0 Release: 1 Group: Applications Vendor: Fedora Project URL: http://directory.fedora.redhat.com License: LGPL Packager: Red Hat, Inc. <http://bugzilla.redhat.com/bugzilla> Summary: Fedora Management Console BuildRoot: %{_tmppath}/%{name}-%{version}-root Source: %{name}-%{version}.tar.gz Autoreq: 0 AutoReqProv: no Requires: ldapjdk >= 4.17, jss >= 3.6 BuildPreReq: ldapjdk >= 4.17, jss >= 3.6 %description A Java based remote management console used for Managing Fedora Administration Server and Fedora Directory Server. # prep and setup expect there to be a Source file # in the /usr/src/redhat/SOURCES directory - it will be unpacked # in the _builddir (not BuildRoot) %prep %setup -q %build cd console ant %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/usr/share/java install -m777 built/release/jars/fedora-* $RPM_BUILD_ROOT/usr/share/java install -d $RPM_BUILD_ROOT/usr/bin install -m777 console/startconsole $RPM_BUILD_ROOT/usr/bin %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /usr/share/java/fedora-base-%{version}.jar /usr/share/java/fedora-mcc-%{version}.jar /usr/share/java/fedora-mcc-%{version}_en.jar /usr/share/java/fedora-nmclf-%{version}.jar /usr/share/java/fedora-nmclf-%{version}_en.jar /usr/bin/startconsole %post cd /usr/share/java ln -s fedora-base-%{version}.jar fedora-base.jar ln -s fedora-mcc-%{version}.jar fedora-mcc.jar ln -s fedora-mcc-%{version}_en.jar fedora-mcc_en.jar ln -s fedora-nmclf-%{version}.jar fedora-nmclf.jar ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf_en.jar %preun rm -rf /usr/share/java/fedora-base.jar rm -rf /usr/share/java/fedora-mcc.jar rm -rf /usr/share/java/fedora-mcc_en.jar rm -rf /usr/share/java/fedora-nmclf.jar rm -rf /usr/share/java/fedora-nmclf_en.jar %changelog * Mon Nov 14 2005 Nathan Kinder <nkinder(a)redhat.com&gt; 1.0-1 - Initial creation --- NEW FILE startconsole-sandbox --- #!/bin/sh # # BEGIN COPYRIGHT BLOCK # Copyright (C) 2005 Red Hat, Inc. # All rights reserved. # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public # License as published by the Free Software Foundation version # 2.1 of the License. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # END COPYRIGHT BLOCK JAVA=`which java` if [ -z "$JAVA" -o ! -x "$JAVA" ] then echo "$0: The java program is not in your path, or is not executable."; exit 1 fi # # Launch the Console # java -ms8m -mx64m -cp ./java/jss3.jar:./java/ldapjdk.jar:./java/fedora-base-1.0.jar:./java/fedora-mcc-1.0.jar:./java/fedora-mcc-1.0_en.jar:./java/fedora-nmclf-1.0.jar:./java/fedora-nmclf-1.0_en.jar -Djava.library.path=./lib -Djava.util.prefs.systemRoot="$HOME/.fedora-console" -Djava.util.prefs.userRoot="$HOME/.fedora-console" com.netscape.management.client.console.Console $* Index: build.properties =================================================================== RCS file: /cvs/dirsec/console/build.properties,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- build.properties 26 Oct 2005 23:16:14 -0000 1.6 +++ build.properties 29 Nov 2005 18:36:50 -0000 1.7 @@ -25,8 +25,11 @@ console.version=10 console.dotversion=1.0 -mcc.core=mcc -mcc.name=${mcc.core}${console.version} +mcc.core=fedora-mcc +mcc.name=${mcc.core}-${console.dotversion} -nmclf.core=nmclf -nmclf.name=${nmclf.core}${console.version} +nmclf.core=fedora-nmclf +nmclf.name=${nmclf.core}-${console.dotversion} + +base.core=fedora-base +base.name=${base.core}-${console.dotversion} Index: build.xml =================================================================== RCS file: /cvs/dirsec/console/build.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- build.xml 25 Oct 2005 17:30:46 -0000 1.7 +++ build.xml 29 Nov 2005 18:36:50 -0000 1.8 @@ -19,58 +19,43 @@ END COPYRIGHT BLOCK --> -<project name="console" default="dist" basedir="."> +<project name="console" default="build_jars" basedir="."> <!-- Load properties --> <property file="build.properties"/> <!-- Paths --> - <property name="built.dir" value="${console.root}/../built"/> - <property name="package.dir" value="${built.dir}/package"/> - <property name="lib.dir" value="${package.dir}/lib"/> - <property name="dist.dir" value="${package.dir}/java"/> - <property name="caplugin.dir" value="${dist.dir}/caplugin"/> - <property name="jars.dir" value="${dist.dir}/jars"/> - <property name="built.classdir" value="${built.dir}/classes"/> - <property name="javadoc.dir" value="${built.dir}/doc"/> - <property name="imports.dir" value="${console.root}/../imports"/> - <property name="java.src.dir" value="src"/> + <property name="built.dir" value="${console.root}/../built"/> + <property name="built.classdir" value="${built.dir}/classes"/> + <property name="release.dir" value="${built.dir}/release"/> + <property name="built.jardir" value="${release.dir}/jars"/> + <property name="package.dir" value="${release.dir}/package"/> + <property name="dist.dir" value="${release.dir}/dist"/> + <property name="lib.dir" value="${package.dir}/lib"/> + <property name="java.dir" value="${package.dir}/java"/> + <property name="javadoc.dir" value="${built.dir}/doc"/> + <property name="imports.dir" value="${console.root}/../imports"/> + <property name="java.src.dir" value="src"/> <!-- Prepare --> - <target name="prepare_build"> + <target name="prepare_build" depends="prepare_imports"> <!-- Create directories --> <mkdir dir="${built.classdir}"/> - <mkdir dir="${imports.dir}"/> - <!-- Load imports file --> - <input - message="An imports file must be specified. Enter the imports file that you want to use:" - addproperty="imports.file" - defaultvalue="imports" - /> - <fail message="Imports file does not exist. (${imports.file})"> - <condition> - <not> - <available file="${imports.file}"/> - </not> - </condition> - </fail> - <property file="${imports.file}"/> - - <!-- Check if components exist --> - <available file="${imports.dir}/ldapjdk/${ldapjdk.import}" property="ldapjdk.import.exists"/> - <available file="${imports.dir}/jss/${jss.jar.import}" property="jss.jar.import.exists"/> - <available file="${imports.dir}/jss/${jss.lib.import}" property="jss.lib.import.exists"/> - <available file="${imports.dir}/nss/${nss.import}" property="nss.import.exists"/> - <available file="${imports.dir}/nspr/${nspr.import}" property="nspr.import.exists"/> + <!-- Override these properties to use components from other system locations --> + <property name="ldapjdk.local.location" value="/usr/share/java"/> + <property name="jss.local.location" value="/usr/share/java"/> + <property name="jsslib.local.location" value="/usr/lib"/> + <property name="nss.local.location" value="/usr/lib"/> + <property name="nspr.local.location" value="/usr/lib"/> <!-- Construct classpath --> <path id="console.classpath"> - <pathelement location="${imports.dir}/ldapjdk/${ldapjdk.import}"/> - <pathelement location="${imports.dir}/jss/${jss.jar.import}"/> + <pathelement location="${ldapjdk.local.location}/ldapjdk.jar"/> + <pathelement location="${jss.local.location}/jss3.jar"/> </path> <!-- Generate version property file --> - <exec executable="${console.root}/buildnum.pl" vmlauncher="true"> + <exec executable="${console.root}/buildnum.pl" vmlauncher="true"> <arg line="-p ${built.dir}"/> </exec> @@ -81,11 +66,44 @@ </exec> </target> - <target name="prepare_dist"> + <target name="prepare_imports" if="imports.file"> + <mkdir dir="${imports.dir}"/> + + <!-- Load imports file --> + <fail message="Imports file does not exist. (${imports.file})"> + <condition> + <not> + <available file="${imports.file}"/> + </not> + </condition> + </fail> + <property file="${imports.file}"/> + + <!-- Set local component locations --> + <property name="ldapjdk.local.location" value="${imports.dir}/ldapjdk"/> + <property name="jss.local.location" value="${imports.dir}/jss"/> + <property name="jsslib.local.location" value="${imports.dir}/jss/lib"/> + <property name="nss.local.location" value="${imports.dir}/nss/lib"/> + <property name="nspr.local.location" value="${imports.dir}/nspr/lib"/> + + <!-- Check if components exist --> + <available file="${imports.dir}/ldapjdk/${ldapjdk.import}" property="ldapjdk.import.exists"/> + <available file="${imports.dir}/jss/${jss.jar.import}" property="jss.jar.import.exists"/> + <available file="${imports.dir}/jss/${jss.lib.import}" property="jss.lib.import.exists"/> + <available file="${imports.dir}/nss/${nss.import}" property="nss.import.exists"/> + <available file="${imports.dir}/nspr/${nspr.import}" property="nspr.import.exists"/> + </target> + + <target name="prepare_jars"> + <!-- Create directories --> + <mkdir dir="${package.dir}"/> + <mkdir dir="${built.jardir}"/> + </target> + + <target name="prepare_package"> <!-- Create directories --> <mkdir dir="${lib.dir}"/> - <mkdir dir="${caplugin.dir}"/> - <mkdir dir="${jars.dir}"/> + <mkdir dir="${dist.dir}"/> </target> <target name="prepare_doc"> @@ -94,33 +112,34 @@ </target> <!-- Imports --> - <target name="import_ldapjdk" depends="prepare_build" unless="ldapjdk.import.exists"> + <target name="import_ldapjdk" depends="prepare_imports" if="imports.file" unless="ldapjdk.import.exists"> <mkdir dir="${imports.dir}/ldapjdk"/> <get src="${ldapjdk.location}/${ldapjdk.import}" dest="${imports.dir}/ldapjdk/${ldapjdk.import}"/> </target> - <target name="import_jss_jar" depends="prepare_build" unless="jss.jar.import.exists"> + <target name="import_jss_jar" depends="prepare_imports" if="imports.file" unless="jss.jar.import.exists"> <mkdir dir="${imports.dir}/jss"/> <get src="${jss.jar.location}/${jss.jar.import}" dest="${imports.dir}/jss/${jss.jar.import}"/> + <copy file="${imports.dir}/jss/${jss.jar.import}" tofile="${imports.dir}/jss/jss3.jar"/> </target> - <target name="import_jss_lib" depends="prepare_build" unless="jss.lib.import.exists"> - <mkdir dir="${imports.dir}/jss"/> - <get src="${jss.lib.location}/${jss.lib.import}" - dest="${imports.dir}/jss/${jss.lib.import}"/> - <unjar src="${imports.dir}/jss/${jss.lib.import}" dest="${imports.dir}/jss"/> + <target name="import_jss_lib" depends="prepare_imports" if="imports.file" unless="jss.lib.import.exists"> + <mkdir dir="${imports.dir}/jss"/> + <get src="${jss.lib.location}/${jss.lib.import}" + dest="${imports.dir}/jss/${jss.lib.import}"/> + <unjar src="${imports.dir}/jss/${jss.lib.import}" dest="${imports.dir}/jss"/> </target> - <target name="import_nss_lib" depends="prepare_build" unless="nss.import.exists"> + <target name="import_nss_lib" depends="prepare_imports" if="imports.file" unless="nss.import.exists"> <mkdir dir="${imports.dir}/nss"/> <get src="${nss.location}/${nss.import}" dest="${imports.dir}/nss/${nss.import}"/> <unjar src="${imports.dir}/nss/${nss.import}" dest="${imports.dir}/nss"/> </target> - <target name="import_nspr_lib" depends="prepare_build" unless="nspr.import.exists"> + <target name="import_nspr_lib" depends="prepare_imports" if="imports.file" unless="nspr.import.exists"> <mkdir dir="${imports.dir}/nspr"/> <get src="${nspr.location}/${nspr.import}" dest="${imports.dir}/nspr/${nspr.import}"/> @@ -128,7 +147,25 @@ </target> <!-- Build --> - <target name="build" depends="import_ldapjdk,import_jss_jar"> + <target name="build" depends="prepare_build, import_ldapjdk, import_jss_jar"> + <!-- Verify that the required jars exist --> + <fail message="LDAP JDK (ldapjdk.jar) does not exist in ${ldapjdk.local.location}"> + Please set the correct location with -Dldapjdk.local.location=[path] + <condition> + <not> + <available file="${ldapjdk.local.location}/ldapjdk.jar"/> + </not> + </condition> + </fail> + <fail message="JSS (jss3.jar) does not exist in ${jss.local.location}"> + Please set the correct location with -Djss.local.location=[path] + <condition> + <not> + <available file="${jss.local.location}/jss3.jar"/> + </not> + </condition> + </fail> + <!-- compile regular java code --> <javac srcdir="${java.src.dir}" destdir="${built.classdir}" @@ -142,10 +179,10 @@ </javac> </target> - <!-- Dist --> - <target name="dist" depends="build,prepare_dist,import_jss_lib,import_nss_lib,import_nspr_lib"> + <!-- Package --> + <target name="build_jars" depends="build,prepare_jars"> <!-- Create jar files --> - <jar jarfile="${dist.dir}/${mcc.name}.jar" > + <jar jarfile="${built.jardir}/${mcc.name}.jar" > <fileset dir="${built.classdir}"> <include name="com/netscape/management/client/**/*.class" /> <include name="sun/net/www/protocol/https/**/*.class" /> @@ -168,26 +205,26 @@ <exclude name="com/netscape/management/client/console/VersionInfo.class"/> </fileset> </jar> - <jar jarfile="${dist.dir}/${mcc.name}_${lang}.jar" > + <jar jarfile="${built.jardir}/${mcc.name}_${lang}.jar" > <fileset dir="${java.src.dir}"> <include name="com/netscape/management/client/**/*.properties" /> <include name="com/netscape/management/client/**/*.gif" /> <include name="com/netscape/management/client/**/*.jpg" /> </fileset> </jar> - <jar jarfile="${dist.dir}/${nmclf.name}.jar" > + <jar jarfile="${built.jardir}/${nmclf.name}.jar" > <fileset dir="${built.classdir}"> <include name="com/netscape/management/nmclf/**/*.class" /> </fileset> </jar> - <jar jarfile="${dist.dir}/${nmclf.name}_${lang}.jar" > + <jar jarfile="${built.jardir}/${nmclf.name}_${lang}.jar" > <fileset dir="${java.src.dir}"> <include name="com/netscape/management/nmclf/**/*.properties" /> <include name="com/netscape/management/nmclf/**/*.gif" /> <include name="com/netscape/management/nmclf/**/*.jpg" /> </fileset> </jar> - <jar jarfile="${dist.dir}/base.jar" > + <jar jarfile="${built.jardir}/${base.name}.jar" > <fileset dir="${built.classdir}"> <include name="com/netscape/management/client/topology/IServerObject.class"/> <include name="com/netscape/management/client/topology/IRemovableServerObject.class"/> @@ -208,30 +245,25 @@ <include name="com/netscape/management/client/console/VersionInfo.class"/> </fileset> </jar> - <jar jarfile="${caplugin.dir}/default.jar" > - <manifest> - <section name="com.netscape.management.client.security.csr.DefaultPlugin.class"> - <attribute name="UserURL" value="http://fedora.redhat.com"/> - <attribute name="UpdateURL" value="http://fedora.redhat.com"/> - <attribute name="Description" value="Fedora"/> - <attribute name="Icon" value="com/netscape/management/client/images/logo16.gif"/> - </section> - </manifest> - <fileset dir="${built.classdir}"> - <include name="com/netscape/management/client/security/csr/DefaultPlugin.class"/> - <include name="com/netscape/management/client/security/csr/CertRequestInfoPage.class"/> - <include name="com/netscape/management/client/security/csr/CertRequestSubmissionPage.class"/> - </fileset> - </jar> + </target> + + <!-- Package --> + <target name="package" depends="build_jars,prepare_package,import_jss_lib,import_nss_lib,import_nspr_lib"> + <!-- Copy built jars to packaging area --> + <copy file="${built.jardir}/${mcc.name}.jar" todir="${java.dir}"/> + <copy file="${built.jardir}/${mcc.name}_${lang}.jar" todir="${java.dir}"/> + <copy file="${built.jardir}/${nmclf.name}.jar" todir="${java.dir}"/> + <copy file="${built.jardir}/${nmclf.name}_${lang}.jar" todir="${java.dir}"/> + <copy file="${built.jardir}/${base.name}.jar" todir="${java.dir}"/> <!-- Copy components into packaging area --> - <copy file="${imports.dir}/ldapjdk/${ldapjdk.import}" todir="${dist.dir}"/> - <copy file="${imports.dir}/jss/${jss.jar.import}" tofile="${dist.dir}/jss3.jar"/> + <copy file="${ldapjdk.local.location}/ldapjdk.jar" todir="${java.dir}"/> + <copy file="${jss.local.location}/jss3.jar" todir="${java.dir}"/> <copy todir="${lib.dir}"> - <fileset dir="${imports.dir}/jss/lib"> + <fileset dir="${jsslib.local.location}"> <include name="libjss*"/> </fileset> - <fileset dir="${imports.dir}/nss/lib"> + <fileset dir="${nss.local.location}"> <include name="libnss*"/> <include name="libssl*"/> <include name="libsmime*"/> @@ -239,7 +271,7 @@ <exclude name="libnssckbi*"/> <exclude name="lib*.a"/> </fileset> - <fileset dir="${imports.dir}/nspr/lib"> + <fileset dir="${nspr.local.location}"> <include name="libnspr*"/> <include name="libpl*"/> <exclude name="lib*.a"/> @@ -247,19 +279,19 @@ </copy> <!-- Copy start script into packaging area --> - <copy file="startconsole" todir="${package.dir}"/> + <copy file="startconsole-sandbox" tofile="${package.dir}/startconsole"/> <chmod file="${package.dir}/startconsole" perm="755"/> <!-- Create a bundle of the Console --> - <tar destfile="${built.dir}/console${console.version}.tar.gz" + <tar destfile="${dist.dir}/fedora-console-${console.dotversion}.tar.gz" compression="gzip"> <tarfileset dir="${package.dir}" - prefix="console${console.version}" + prefix="fedora-console-${console.dotversion}" mode="755"> <include name="startconsole"/> </tarfileset> <tarfileset dir="${package.dir}" - prefix="console${console.version}"> + prefix="fedora-console${console.dotversion}"> <include name="**"/> <exclude name="startconsole"/> </tarfileset> Index: imports.FC2 =================================================================== RCS file: /cvs/dirsec/console/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:34:05 -0000 1.1.1.1 +++ imports.FC2 29 Nov 2005 18:36:50 -0000 1.2 @@ -24,17 +24,17 @@ ldapjdk.import=ldapjdk.jar # Mozilla JSS Library -jss.lib.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_5_1_RTM/RHEL3_x86_gcc3_OPT.OBJ +jss.lib.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_7_RTM/RHEL3_x86_gcc3_OPT.OBJ jss.lib.import=mdbinary.jar # Mozilla JSS Jar -jss.jar.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_5_1_RTM +jss.jar.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_7_RTM jss.jar.import=xpclass.jar # Mozilla NSS Library -nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_9_3_RTM/RHEL3_x86_gcc3_OPT.OBJ +nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_10_2_RTM/RHEL3_x86_gcc3_OPT.OBJ nss.import=mdbinary.jar # Mozilla NSPR Library -nspr.location=http://directory.fedora.redhat.com/built/components/nspr/v4.4.1/RHEL3_x86_gcc3_OPT.OBJ +nspr.location=http://directory.fedora.redhat.com/built/components/nspr/v4.6/RHEL3_x86_gcc3_OPT.OBJ nspr.import=mdbinary.jar Index: imports.FC3 =================================================================== RCS file: /cvs/dirsec/console/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:34:05 -0000 1.1.1.1 +++ imports.FC3 29 Nov 2005 18:36:50 -0000 1.2 @@ -24,17 +24,17 @@ ldapjdk.import=ldapjdk.jar # Mozilla JSS Library -jss.lib.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_5_1_RTM/RHEL4_x86_gcc3_OPT.OBJ +jss.lib.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_7_RTM/RHEL4_x86_gcc3_OPT.OBJ jss.lib.import=mdbinary.jar # Mozilla JSS Jar -jss.jar.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_5_1_RTM +jss.jar.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_7_RTM jss.jar.import=xpclass.jar # Mozilla NSS Library -nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_9_3_RTM/RHEL4_x86_gcc3_OPT.OBJ +nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_10_2_RTM/RHEL4_x86_gcc3_OPT.OBJ nss.import=mdbinary.jar # Mozilla NSPR Library -nspr.location=http://directory.fedora.redhat.com/built/components/nspr/v4.4.1/RHEL4_x86_gcc3_OPT.OBJ +nspr.location=http://directory.fedora.redhat.com/built/components/nspr/v4.6/RHEL4_x86_gcc3_OPT.OBJ nspr.import=mdbinary.jar Index: imports.HP-UX11i =================================================================== RCS file: /cvs/dirsec/console/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:34:05 -0000 1.1.1.1 +++ imports.HP-UX11i 29 Nov 2005 18:36:50 -0000 1.2 @@ -24,17 +24,17 @@ ldapjdk.import=ldapjdk.jar # Mozilla JSS Library -jss.lib.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_5_1_RTM/HP-UXB.11.11_OPT.OBJ +jss.lib.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_7_RTM/HP-UXB.11.11_OPT.OBJ jss.lib.import=mdbinary.jar # Mozilla JSS Jar -jss.jar.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_5_1_RTM +jss.jar.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_7_RTM jss.jar.import=xpclass.jar # Mozilla NSS Library -nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_9_3_RTM/HP-UXB.11.11_OPT.OBJ +nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_10_2_RTM/HP-UXB.11.11_OPT.OBJ nss.import=mdbinary.jar # Mozilla NSPR Library -nspr.location=http://directory.fedora.redhat.com/built/components/nspr/v4.4.1/HP-UXB.11.11_OPT.OBJ +nspr.location=http://directory.fedora.redhat.com/built/components/nspr/v4.6/HP-UXB.11.11_OPT.OBJ nspr.import=mdbinary.jar Index: imports.Solaris9 =================================================================== RCS file: /cvs/dirsec/console/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:34:05 -0000 1.1.1.1 +++ imports.Solaris9 29 Nov 2005 18:36:50 -0000 1.2 @@ -24,17 +24,17 @@ ldapjdk.import=ldapjdk.jar # Mozilla JSS Library -jss.lib.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_5_1_RTM/SunOS5.9_OPT.OBJ +jss.lib.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_7_RTM/SunOS5.9_OPT.OBJ jss.lib.import=mdbinary.jar # Mozilla JSS Jar -jss.jar.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_5_1_RTM +jss.jar.location=http://directory.fedora.redhat.com/built/components/jss/JSS_3_7_RTM jss.jar.import=xpclass.jar # Mozilla NSS Library -nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_9_3_RTM/SunOS5.9_OPT.OBJ +nss.location=http://directory.fedora.redhat.com/built/components/nss/NSS_3_10_2_RTM/SunOS5.9_OPT.OBJ nss.import=mdbinary.jar # Mozilla NSPR Library -nspr.location=http://directory.fedora.redhat.com/built/components/nspr/v4.4.1/SunOS5.9_OPT.OBJ +nspr.location=http://directory.fedora.redhat.com/built/components/nspr/v4.6/SunOS5.9_OPT.OBJ nspr.import=mdbinary.jar Index: startconsole =================================================================== RCS file: /cvs/dirsec/console/startconsole,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- startconsole 26 Oct 2005 23:16:14 -0000 1.4 +++ startconsole 29 Nov 2005 18:36:50 -0000 1.5 @@ -19,51 +19,14 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # END COPYRIGHT BLOCK -# -# Check if JAVA_HOME is set -# -if [ -z "$JAVA_HOME" ] -then - echo "$0: Your JAVA_HOME environment variable is not set. Please set it appropriately." - exit 1 -fi - -# -# Make sure java exists and is executable -# -if [ ! -f java -a ! -x java ] -then - echo "$0: The java program is not in your path, or is not executable." - exit 1 -fi - -# -# See if libjava and libjvm exist, and set the lib path. These are linked to by JSS. -# -LIBJAVA_DIR=`find $JAVA_HOME -name libjava\.s[ol] | sed 's/\/libjava\.s.$//'` -LIBJVM_DIR=`find $JAVA_HOME -name libjvm\.s[ol] | sed 's/\/libjvm\.s.$//'` - -if [ -z "$LIBJAVA_DIR" -a -z "$LIBJVM_DIR" ] +JAVA=`which java` +if [ -z "$JAVA" -o ! -x "$JAVA" ] then - echo "$0: Unable to find libjava and libjvm in JAVA_HOME. Please ensure that JAVA_HOME is set correctly." + echo "$0: The java program is not in your path, or is not executable."; exit 1 -else - if [ "$LIBJAVA_DIR" = "$LIBJVM_DIR" ] - then - LD_LIBRARY_PATH="$LIBJAVA_DIR" - SHLIB_PATH="$LIBJAVA_DIR" - DYLD_PATH="$LIBJAVA_DIR" - else - LD_LIBRARY_PATH="$LIBJAVA_DIR:$LIBJVM_DIR" - SHLIB_PATH="$LIBJAVA_DIR:$LIBJVM_DIR" - DYLD_PATH="$LIBJAVA_DIR:$LIBJVM_DIR" - fi - export LD_LIBRARY_PATH - export SHLIB_PATH - export DYLD_PATH fi # # Launch the Console # -cd java; $JAVA_HOME/bin/java -ms8m -mx64m -cp .:./base.jar:./mcc10_en.jar:./jss3.jar:./ldapjdk.jar:./mcc10.jar:./nmclf10_en.jar:./nmclf10.jar -Djava.library.path=../lib -Djava.util.prefs.systemRoot=. -Djava.util.prefs.userRoot=. com.netscape.management.client.console.Console $* +java -ms8m -mx64m -cp /usr/share/java/jss3.jar:/usr/share/java/ldapjdk.jar:/usr/share/java/fedora-base-1.0.jar:/usr/share/java/fedora-mcc-1.0.jar:/usr/share/java/fedora-mcc-1.0_en.jar:/usr/share/java/fedora-nmclf-1.0.jar:/usr/share/java/fedora-nmclf-1.0_en.jar -Djava.library.path=/usr/lib -Djava.util.prefs.systemRoot="$HOME/.fedora-console" -Djava.util.prefs.userRoot="$HOME/.fedora-console" com.netscape.management.client.console.Console $*