[Fedora-directory-commits] console build.properties, 1.9, 1.10 build.xml, 1.12, 1.13 startconsole, 1.5, 1.6

[Christina Fu (cfu)]

Author: cfu

Update of /cvs/dirsec/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5061

Modified Files:
	build.properties build.xml startconsole 
Log Message:
244051 - move brand-specifics to a new jar



Index: build.properties
===================================================================
RCS file: /cvs/dirsec/console/build.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.properties	29 Sep 2006 17:17:19 -0000	1.9
+++ build.properties	13 Jun 2007 20:33:08 -0000	1.10
@@ -39,3 +39,7 @@
 base.core=${console.brand}-base
 base.name=${base.core}-${console.dotversion}
 base.gen.name=${base.core}-${console.dotgenversion}
+
+theme.core=${console.brand}-theme
+theme.name=${theme.core}-${console.dotversion}
+theme.gen.name=${theme.core}-${console.dotgenversion}


Index: build.xml
===================================================================
RCS file: /cvs/dirsec/console/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml	24 Mar 2006 19:05:16 -0000	1.12
+++ build.xml	13 Jun 2007 20:33:08 -0000	1.13
@@ -213,6 +213,12 @@
          <include name="com/netscape/management/client/**/*.properties" />
          <include name="com/netscape/management/client/**/*.gif" />
          <include name="com/netscape/management/client/**/*.jpg" />
+         <exclude name="com/netscape/management/client/theme/**" />
+      </fileset>
+    </jar>
+    <jar jarfile="${built.jardir}/${theme.name}_${lang}.jar" >
+      <fileset dir="${java.src.dir}">
+         <include name="com/netscape/management/client/theme/**" />
       </fileset>
     </jar>
     <jar jarfile="${built.jardir}/${nmclf.name}.jar" >
@@ -255,6 +261,7 @@
     <!-- 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}/${theme.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}"/>
@@ -266,6 +273,9 @@
       <arg line="-s ${mcc.name}_${lang}.jar ${mcc.gen.name}_${lang}.jar"/>
     </exec>
     <exec executable="ln" dir="${java.dir}" vmlauncher="true">
+      <arg line="-s ${theme.name}_${lang}.jar ${theme.gen.name}_${lang}.jar"/>
+    </exec>
+    <exec executable="ln" dir="${java.dir}" vmlauncher="true">
       <arg line="-s ${nmclf.name}.jar ${nmclf.gen.name}.jar"/>
     </exec>
     <exec executable="ln" dir="${java.dir}" vmlauncher="true">


Index: startconsole
===================================================================
RCS file: /cvs/dirsec/console/startconsole,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- startconsole	29 Nov 2005 18:36:50 -0000	1.5
+++ startconsole	13 Jun 2007 20:33:08 -0000	1.6
@@ -26,7 +26,8 @@
   exit 1
 fi
 
+THEME_JAR=/usr/share/java/fedora-theme-1.0.3_en.jar
 #
 # Launch the 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 $*
+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 $*