[Fedora-directory-commits] console build.properties, 1.10, 1.11 build.xml, 1.13, 1.14 fedora-console.spec, 1.1, 1.2 startconsole, 1.6, 1.7
Nathan Kinder (nkinder)
fedora-directory-commits at redhat.com
Fri Jun 29 20:32:29 UTC 2007
Author: nkinder
Update of /cvs/dirsec/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1397
Modified Files:
build.properties build.xml fedora-console.spec startconsole
Log Message:
Resolves: 246270
Summary: Remove server root concept from Console.
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/console/build.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.properties 13 Jun 2007 20:33:08 -0000 1.10
+++ build.properties 29 Jun 2007 20:32:26 -0000 1.11
@@ -24,9 +24,9 @@
console.brand=fedora
console.root=.
-console.version=10
-console.dotversion=1.0.3
-console.dotgenversion=1.0
+console.version=11
+console.dotversion=1.1.0
+console.dotgenversion=1.1
mcc.core=${console.brand}-mcc
mcc.name=${mcc.core}-${console.dotversion}
@@ -43,3 +43,6 @@
theme.core=${console.brand}-theme
theme.name=${theme.core}-${console.dotversion}
theme.gen.name=${theme.core}-${console.dotgenversion}
+
+jss.jar.name=jss4.jar
+ldapjdk.jar.name=ldapjdk.jar
Index: build.xml
===================================================================
RCS file: /cvs/dirsec/console/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 13 Jun 2007 20:33:08 -0000 1.13
+++ build.xml 29 Jun 2007 20:32:26 -0000 1.14
@@ -42,17 +42,20 @@
<!-- Create directories -->
<mkdir dir="${built.classdir}"/>
+ <!-- Classdest is the location you intend to install the Console jars -->
+ <property name="classdest" value="/usr/share/java"/>
+
<!-- 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="jss.local.location" value="/usr/lib/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="${ldapjdk.local.location}/ldapjdk.jar"/>
- <pathelement location="${jss.local.location}/jss3.jar"/>
+ <pathelement location="${ldapjdk.local.location}/${ldapjdk.jar.name}"/>
+ <pathelement location="${jss.local.location}/${jss.jar.name}"/>
</path>
<!-- Generate version property file -->
@@ -124,7 +127,7 @@
<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"/>
+ <copy file="${imports.dir}/jss/${jss.jar.import}" tofile="${imports.dir}/jss/${jss.jar.name}"/>
</target>
<target name="import_jss_lib" depends="prepare_imports" if="imports.file" unless="jss.lib.import.exists">
@@ -151,19 +154,19 @@
<!-- Build -->
<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}">
+ <fail message="LDAP JDK (${ldapjdk.jar.name}) 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"/>
+ <available file="${ldapjdk.local.location}/${ldapjdk.jar.name}"/>
</not>
</condition>
</fail>
- <fail message="JSS (jss3.jar) does not exist in ${jss.local.location}">
+ <fail message="JSS (${jss.jar.name}) 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"/>
+ <available file="${jss.local.location}/${jss.jar.name}"/>
</not>
</condition>
</fail>
@@ -180,6 +183,21 @@
excludes="**/CVS/**">
<classpath refid="console.classpath" />
</javac>
+
+ <!-- create startconsole script -->
+ <copy file="startconsole" todir="${release.dir}"/>
+ <replace file="${release.dir}/startconsole">
+ <replacefilter token="@classdest@" value="${classdest}"/>
+ <replacefilter token="@jssjar@" value="${jss.local.location}/${jss.jar.name}"/>
+ <replacefilter token="@ldapjdkjar@" value="${ldapjdk.local.location}/${ldapjdk.jar.name}"/>
+ <replacefilter token="@basejar@" value="${base.name}.jar"/>
+ <replacefilter token="@mccjar@" value="${mcc.name}.jar"/>
+ <replacefilter token="@mcclangjar@" value="${mcc.name}_${lang}.jar"/>
+ <replacefilter token="@nmclfjar@" value="${nmclf.name}.jar"/>
+ <replacefilter token="@nmclflangjar@" value="${nmclf.name}_${lang}.jar"/>
+ <replacefilter token="@themejar@" value="${theme.name}_${lang}.jar"/>
+ <replacefilter token="@libdir@" value="${lib.dir}"/>
+ </replace>
</target>
<!-- Package -->
@@ -286,8 +304,8 @@
</exec>
<!-- Copy components into packaging area -->
- <copy file="${ldapjdk.local.location}/ldapjdk.jar" todir="${java.dir}"/>
- <copy file="${jss.local.location}/jss3.jar" todir="${java.dir}"/>
+ <copy file="${ldapjdk.local.location}/${ldapjdk.jar.name}" todir="${java.dir}"/>
+ <copy file="${jss.local.location}/${jss.jar.name}" todir="${java.dir}"/>
<copy todir="${lib.dir}">
<fileset dir="${jsslib.local.location}">
<include name="libjss*"/>
Index: fedora-console.spec
===================================================================
RCS file: /cvs/dirsec/console/fedora-console.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-console.spec 29 Nov 2005 18:36:50 -0000 1.1
+++ fedora-console.spec 29 Jun 2007 20:32:26 -0000 1.2
@@ -1,5 +1,8 @@
+%define major_version 1.1
+%define minor_version 0
+
Name: fedora-console
-Version: 1.0
+Version: %{major_version}.%{minor_version}
Release: 1
Group: Applications
Vendor: Fedora Project
@@ -8,11 +11,12 @@
Packager: Red Hat, Inc. <http://bugzilla.redhat.com/bugzilla>
Summary: Fedora Management Console
BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildArch: noarch
Source: %{name}-%{version}.tar.gz
Autoreq: 0
AutoReqProv: no
-Requires: ldapjdk >= 4.17, jss >= 3.6
-BuildPreReq: ldapjdk >= 4.17, jss >= 3.6
+Requires: fedora-console-framework >= %{version}
+BuildPreReq: ant >= 1.6.2, ldapjdk >= 4.18, jss >= 4.2
%description
A Java based remote management console used for Managing Fedora
@@ -21,47 +25,77 @@
# 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)
+
+%package framework
+Summary: Fedora Management Console Framework
+Requires: ldapjdk >= 4.18, jss >= 4.2
+Group: System Environment/Libraries
+
+%description framework
+A Java Management Console framework used for remote server management.
+
%prep
%setup -q
%build
cd console
-ant
+ant -Dlib.dir=%{_libdir}
%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
+install -m777 built/release/startconsole $RPM_BUILD_ROOT/usr/bin
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
+/usr/share/java/fedora-theme-%{version}_en.jar
+/usr/bin/startconsole
+
+%files framework
+%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-%{major_version}.jar
ln -s fedora-base-%{version}.jar fedora-base.jar
+ln -s fedora-mcc-%{version}.jar fedora-mcc-%{major_version}.jar
ln -s fedora-mcc-%{version}.jar fedora-mcc.jar
+ln -s fedora-mcc-%{version}_en.jar fedora-mcc-%{major_version}_en.jar
ln -s fedora-mcc-%{version}_en.jar fedora-mcc_en.jar
+ln -s fedora-nmclf-%{version}.jar fedora-nmclf-%{major_version}.jar
ln -s fedora-nmclf-%{version}.jar fedora-nmclf.jar
+ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf-%{major_version}_en.jar
ln -s fedora-nmclf-%{version}_en.jar fedora-nmclf_en.jar
+ln -s fedora-theme-%{version}_en.jar fedora-theme-%{major_version}_en.jar
+ln -s fedora-theme-%{version}_en.jar fedora-theme_en.jar
%preun
+rm -rf /usr/share/java/fedora-base-%{major_version}.jar
rm -rf /usr/share/java/fedora-base.jar
+rm -rf /usr/share/java/fedora-mcc-%{major_version}.jar
rm -rf /usr/share/java/fedora-mcc.jar
+rm -rf /usr/share/java/fedora-mcc-%{major_version}_en.jar
rm -rf /usr/share/java/fedora-mcc_en.jar
+rm -rf /usr/share/java/fedora-nmclf-%{major_version}.jar
rm -rf /usr/share/java/fedora-nmclf.jar
+rm -rf /usr/share/java/fedora-nmclf-%{major_version}_en.jar
rm -rf /usr/share/java/fedora-nmclf_en.jar
+rm -rf /usr/share/java/fedora-theme-%{major_version}_en.jar
+rm -rf /usr/share/java/fedora-theme_en.jar
%changelog
+* Fri Jun 29 2007 Nathan Kinder <nkinder at redhat.com 1.1.0-1
+- Updated for 1.1.0 release
+
* Mon Nov 14 2005 Nathan Kinder <nkinder at redhat.com> 1.0-1
- Initial creation
Index: startconsole
===================================================================
RCS file: /cvs/dirsec/console/startconsole,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- startconsole 13 Jun 2007 20:33:08 -0000 1.6
+++ startconsole 29 Jun 2007 20:32:26 -0000 1.7
@@ -26,8 +26,9 @@
exit 1
fi
-THEME_JAR=/usr/share/java/fedora-theme-1.0.3_en.jar
+CLASSDEST=@classdest@
+
#
# Launch the Console
#
-java -ms8m -mx64m -cp /usr/share/java/jss3.jar:/usr/share/java/ldapjdk.jar:/usr/share/java/fedora-base-1.0.3.jar:/usr/share/java/fedora-mcc-1.0.3.jar:/usr/share/java/fedora-mcc-1.0.3_en.jar:/usr/share/java/fedora-nmclf-1.0.3.jar:/usr/share/java/fedora-nmclf-1.0.3_en.jar:$THEME_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 $*
+java -ms8m -mx64m -cp @jssjar@:@ldapjdkjar@:$CLASSDEST/@basejar@:$CLASSDEST/@mccjar@:$CLASSDEST/@mcclangjar@:$CLASSDEST/@nmclfjar@:$CLASSDEST/@nmclflangjar@:$CLASSDEST/@themejar@ -Djava.library.path=@libdir@ -Djava.util.prefs.systemRoot="$HOME/.fedora-console" -Djava.util.prefs.userRoot="$HOME/.fedora-console" com.netscape.management.client.console.Console $*
More information about the Fedora-directory-commits
mailing list