[hibernate-commits] Hibernate SVN: r19701 - in core/branches/gradle2: hibernate-release and 3 other directories.

Author: steve.ebersole(a)jboss.com Date: 2010-06-08 15:16:21 -0400 (Tue, 08 Jun 2010) New Revision: 19701 Added: core/branches/gradle2/hibernate-release/src/javadoc/ core/branches/gradle2/hibernate-release/src/javadoc/images/ core/branches/gradle2/hibernate-release/src/javadoc/images/bkg_blkheader.png core/branches/gradle2/hibernate-release/src/javadoc/images/bkg_gradient.gif core/branches/gradle2/hibernate-release/src/javadoc/images/bkgheader.png core/branches/gradle2/hibernate-release/src/javadoc/images/h1_hdr.png core/branches/gradle2/hibernate-release/src/javadoc/package.html core/branches/gradle2/hibernate-release/src/javadoc/stylesheet.css Modified: core/branches/gradle2/build.gradle core/branches/gradle2/hibernate-release/hibernate-release.gradle Log: initial work on full release piece Modified: core/branches/gradle2/build.gradle =================================================================== --- core/branches/gradle2/build.gradle 2010-06-08 14:50:55 UTC (rev 19700) +++ core/branches/gradle2/build.gradle 2010-06-08 19:16:21 UTC (rev 19701) @@ -109,137 +109,6 @@ dependsOnChildren() -documentationBuildDir = dir(buildDirName + "/documentation"); - -task documentation(dependsOn: documentationBuildDir) << { -} - -distBuildDir = dir(buildDirName + "/dist"); - -task uberJar(type: Jar, dependsOn: distBuildDir) { - destinationDir = distBuildDir.dir - customName = 'hibernate3.jar' - from(allCompilationOutputDirectories()) -} - -subprojects.each { Project project -> - if (project.name != 'hibernate-testing') { - uberJar.dependsOn project.getTasksByName("classes", false); - } -} - -task prepareDistribution(dependsOn: [uberJar, documentation]) << { - File requiredLibDir = new File(distBuildDir.dir, "stage/lib/required"); - copy { - from project('core').getConfigurations().getByName('runtime') - into requiredLibDir - } - copy { - from project('core').getConfigurations().getByName('provided').files { dep -> dep.name == 'jboss-transaction-api' } - into requiredLibDir - rename 'jboss-transaction-api(.*).jar', 'jta-1.1.jar' - } - - File cglibLibDir = new File(distBuildDir.dir, "stage/lib/bytecode/cglib"); - copy { - from project('core').getConfigurations().getByName('provided').files { dep -> dep.name == 'cglib' } - into cglibLibDir - } - - File javassistLibDir = new File(distBuildDir.dir, "stage/lib/bytecode/javassist"); - copy { - from project('core').getConfigurations().getByName('provided').files { dep -> dep.name == 'javassist' } - into javassistLibDir - } - -// ['c3p0', 'proxool', 'ehcache', 'jbosscache', 'infinispan', 'oscache', 'swarmcache'].each { feature -> - ['connection-c3p0', 'connection-proxool', 'cache-ehcache', 'cache-oscache', 'cache-swarmcache'].each { feature -> - File featureLibDir = new File(distBuildDir.dir, "stage/lib/optional/${feature}"); -// Set libs = project("hibernate-${feature}").configurations.runtime.files - project("hibernate-core").configurations.runtime.files - Set libs = project("${feature}").configurations.runtime.files - -files(requiredLibDir) - -files(cglibLibDir) - -files(javassistLibDir) - copy { - from libs - into featureLibDir - } - } - -// File c3p0LibDir = new File( distBuildDir.dir, "stage/lib/optional/c3p0" ); -// c3p0LibDir.mkdirs(); -// copy { -// from project('hibernate-c3p0').getConfigurations().getByName( 'runtime' ) -// into c3p0LibDir -// } -// -// File proxoolLibDir = new File( distBuildDir.dir, "stage/lib/optional/proxool" ); -// proxoolLibDir.mkdirs(); -// copy { -// from project('hibernate-proxool').getConfigurations().getByName( 'runtime' ) -// into proxoolLibDir -// } -// -// File ehcacheLibDir = new File( distBuildDir.dir, "stage/lib/optional/ehcache" ); -// ehcacheLibDir.mkdirs(); -// copy { -// from project('hibernate-ehcache').getConfigurations().getByName( 'runtime' ) -// into ehcacheLibDir -// } -// -//// File jbcLibDir = new File( distBuildDir.dir, "stage/lib/optional/jbosscache" ); -//// jbcLibDir.mkdirs(); -//// copy { -//// from project('hibernate-jbosscache').getConfigurations().getByName( 'runtime' ) -//// into jbcLibDir -//// } -//// -//// File infinispanLibDir = new File( distBuildDir.dir, "stage/lib/optional/infinispan" ); -//// infinispanLibDir.mkdirs(); -//// copy { -//// from project('hibernate-infinispan').getConfigurations().getByName( 'runtime' ) -//// into infinispanLibDir -//// } -// -// File oscacheLibDir = new File( distBuildDir.dir, "stage/lib/optional/oscache" ); -// oscacheLibDir.mkdirs(); -// copy { -// from project('hibernate-oscache').getConfigurations().getByName( 'runtime' ) -// into oscacheLibDir -// } -// -// File swarmcacheLibDir = new File( distBuildDir.dir, "stage/lib/optional/swarmcache" ); -// swarmcacheLibDir.mkdirs(); -// copy { -// from project('hibernate-swarmcache').getConfigurations().getByName( 'runtime' ) -// into swarmcacheLibDir -// } -} - -FileCollection[] allCompilationOutputDirectories() { - ArrayList<File> compilationOutputDirectories = new ArrayList<File>(); - for (Project project: getSubprojects()) { - if (project.name == 'hibernate-testing') { - continue; - } - compilationOutputDirectories.add(project.sourceSets.main.classes.asFileTree); - } - return compilationOutputDirectories as FileCollection[]; -} - -task distributionZip(/*type: Zip,*/ dependsOn: prepareDistribution) << { -// println 'building zip dist (todo)...' -} - -task distributionTgz(/*type: Tar,*/ dependsOn: prepareDistribution) << { -// compression = Compression.GZIP -// println 'building tgz dist (todo)...' -} - -task distribution(dependsOn: [distributionZip, distributionTgz]) << { -// println 'building dists (todo)...' -} - task wrapper(type: Wrapper) { gradleVersion = '0.9-preview-3' jarPath = 'gradle' Modified: core/branches/gradle2/hibernate-release/hibernate-release.gradle =================================================================== --- core/branches/gradle2/hibernate-release/hibernate-release.gradle 2010-06-08 14:50:55 UTC (rev 19700) +++ core/branches/gradle2/hibernate-release/hibernate-release.gradle 2010-06-08 19:16:21 UTC (rev 19701) @@ -6,7 +6,7 @@ dependencies { classpath "org.jboss.jdocbook:gradle-jdocbook:1.0.0-SNAPSHOT" classpath "org.hibernate:hibernate-jdocbook-style:2.0.1" - + classpath gradleApi() } } @@ -19,6 +19,14 @@ ) } +task needs16 { + if ( ! project.hasProperty('jdk16_home') ) { + throw new Exception( "Property 'jdk16_home' must be set to run release" ); + } +} + +// jDocBook ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + jdocbook { masterSourceDocumentName = 'HIBERNATE_-_Relational_Persistence_for_Idiomatic_Java.xml' translation 'fr-FR' @@ -30,14 +38,202 @@ finalName = 'index.html' stylesheet = 'classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml-single.xsl' } -// format { -// name 'html' -// finalName 'index.html' -// stylesheet 'classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl' -// } -// format { -// name 'pdf' -// stylesheet 'classpath:/xslt/org/hibernate/jdocbook/xslt/pdf.xsl' -// } + format { + name = 'html' + finalName = 'index.html' + stylesheet = 'classpath:/xslt/org/hibernate/jdocbook/xslt/xhtml.xsl' + } + format { + name = 'pdf' + stylesheet = 'classpath:/xslt/org/hibernate/jdocbook/xslt/pdf.xsl' + } -} \ No newline at end of file +} + + +// Javadocs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +javadocBuildDir = dir( buildDirName + "/javadocs" ) + +def List subProjectsToSkipForJavadoc = ["testsuite"]; + +task aggregateJavadocs(type: Javadoc) { +// executable: '${jdk16_home}/bin/javadoc' + maxmemory = '512m' + destinationDir = javadocBuildDir.dir + configure( options ) { + overview = new File( projectDir, 'src/javadoc/package.html' ) + stylesheetfile = new File( projectDir, 'src/javadoc/stylesheet.css' ) + windowtitle = 'Hibernate JavaDocs' + doctitle = "Hibernate JavaDoc ($version)" + bottom = 'Copyright &copy; 2001-2010 <a href="http://redhat.com">Red Hat, Inc.</a> All Rights Reserved.' + use = true + group( + 'Core API', [ + 'org.hibernate', + 'org.hibernate.classic', + 'org.hibernate.criterion', + 'org.hibernate.mapping', + 'org.hibernate.metadata', + 'org.hibernate.cfg', + 'org.hibernate.stat' + ] + ) + group( + 'Extension SPI', [ + 'org.hibernate.id*', + 'org.hibernate.connection', + 'org.hibernate.transaction', + 'org.hibernate.type', + 'org.hibernate.dialect*', + 'org.hibernate.cache*', + 'org.hibernate.event*', + 'org.hibernate.property', + 'org.hibernate.loader*', + 'org.hibernate.persister*', + ':org.hibernate.proxy', + 'org.hibernate.tuple', + 'org.hibernate.transform', + 'org.hibernate.collection', + 'org.hibernate.jdbc', + 'org.hibernate.usertype' + ] + ) + group( + 'Bytecode providers', [ + 'org.hibernate.bytecode*', + 'org.hibernate.intercept*' + ] + ) + group ( + 'Infinispan Integration', ['org.hibernate.cache.infinispan*'] + ) + group ( + 'JBossCache Integration', ['org.hibernate.cache.jbc*'] + ) + group ( + 'Testing Support', ['org.hibernate.junit*'] + ) + setJavadocExecHandleBuilder( + new org.gradle.external.javadoc.JavadocExecHandleBuilder() { + public ExecAction getExecHandle() { + try { + options.write(optionsFile); + } catch (IOException e) { + throw new GradleException("Faild to store javadoc options.", e); + } + + ExecAction execAction = new DefaultExecAction(); + execAction.workingDir(execDirectory); + execAction.executable( "$jdk16_home/bin/javadoc" ); + execAction.args("@" + optionsFile.getAbsolutePath()); + + options.contributeCommandLineOptions(execAction); + + return execAction; + } + } + ) + } + + parent.subprojects.each{ subproject-> + if ( !subProjectsToSkipForJavadoc.contains( subproject.name ) ) { + subproject.sourceSets.each { set -> + if ( !"test".equals( set.name ) ) { + source set.java + + if( classpath ) { + classpath += set.classes + set.compileClasspath + } + else { + classpath = set.classes + set.compileClasspath + } + } + } + } + } +} + +// uber-jar ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +def List subProjectsToSkipForUberJar = ['testsuite','hibernate-testing']; + +releaseBuildDir = dir( buildDirName ) + +task uberJar(type: Jar, dependsOn: [releaseBuildDir, needs16]) { + destinationDir = releaseBuildDir.dir + customName = 'hibernate3.jar' + parent.subprojects.each { subproject-> + if ( !subProjectsToSkipForUberJar.contains( subproject.name ) ) { + subproject.sourceSets.each { set -> + if ( !"test".equals( set.name ) ) { + from set.classes + } + } + } + } +} + +parent.subprojects.each { subproject -> + if ( !subProjectsToSkipForUberJar.contains( subproject.name ) ) { + uberJar.dependsOn subproject.getTasksByName( "classes", false ); + } +} + + +// release bundles ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +task prepareReleaseBundles( dependsOn: [buildDocs, aggregateJavadocs, uberJar, needs16] ) + +releaseCopySpec = copySpec { + from new File( parent.projectDir, 'lgpl.txt' ) + from new File( parent.projectDir, 'changelog.txt' ) + from new File( parent.projectDir, 'hibernate_logo.gif' ) + from tasks.uberJar.archivePath + from parent.project( 'hibernate-testing' ).artifacts + + into('lib/required') { + from parent.project( 'hibernate-core' ).configurations.runtime + from parent.project( 'hibernate-core' ).configurations.provided.files { dep -> dep.name == 'jta' } +// rename 'jboss-transaction-api(.*).jar', 'jta-1.1.jar' + } + + into('lib/bytecode/cglib') { + from parent.project( 'hibernate-core' ).configurations.provided.files { dep -> dep.name == 'cglib' } + } + + into('lib/bytecode/javassist') { + from parent.project( 'hibernate-core' ).configurations.provided.files { dep -> dep.name == 'javassist' } + } + + ['hibernate-c3p0', 'hibernate-proxool', 'hibernate-ehcache', 'hibernate-infinispan', + 'hibernate-jbosscache', 'hibernate-oscache', 'hibernate-swarmcache', + 'hibernate-entitymanager', 'hibernate-envers'].each { feature -> + final String shortName = feature.substring( 'hibernate-'.length() ); + into('lib/optional/' + shortName) { + from ( parent.project( feature ).configurations.runtime + - parent.project( 'hibernate-core' ).configurations.runtime + - parent.project( 'hibernate-core' ).configurations.provided ) + } + } + + into('documentation/manual') { + from new File( project.buildDir, 'docbook/publish' ) + } + + into('documentation/javadocs') { + from javadocBuildDir + } +} + +task buildReleaseZip( type: Zip, dependsOn: [prepareReleaseBundles] ) { + baseName = 'hibernate-release' + with project.releaseCopySpec +} + +task buildReleaseTgz( type: Tar, dependsOn: [prepareReleaseBundles] ) { + baseName = 'hibernate-release' + compression = Compression.GZIP + with project.releaseCopySpec +} + Added: core/branches/gradle2/hibernate-release/src/javadoc/images/bkg_blkheader.png =================================================================== (Binary files differ) Property changes on: core/branches/gradle2/hibernate-release/src/javadoc/images/bkg_blkheader.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: core/branches/gradle2/hibernate-release/src/javadoc/images/bkg_gradient.gif =================================================================== (Binary files differ) Property changes on: core/branches/gradle2/hibernate-release/src/javadoc/images/bkg_gradient.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: core/branches/gradle2/hibernate-release/src/javadoc/images/bkgheader.png =================================================================== (Binary files differ) Property changes on: core/branches/gradle2/hibernate-release/src/javadoc/images/bkgheader.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: core/branches/gradle2/hibernate-release/src/javadoc/images/h1_hdr.png =================================================================== (Binary files differ) Property changes on: core/branches/gradle2/hibernate-release/src/javadoc/images/h1_hdr.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: core/branches/gradle2/hibernate-release/src/javadoc/package.html (from rev 19677, core/branches/gradle2/distribution/src/javadoc/package.html) =================================================================== --- core/branches/gradle2/hibernate-release/src/javadoc/package.html (rev 0) +++ core/branches/gradle2/hibernate-release/src/javadoc/package.html 2010-06-08 19:16:21 UTC (rev 19701) @@ -0,0 +1,93 @@ +<!-- + ~ Hibernate, Relational Persistence for Idiomatic Java + ~ + ~ Copyright (c) 2010, Red Hat Inc. or third-party contributors as + ~ indicated by the @author tags or express copyright attribution + ~ statements applied by the authors. All third-party contributions are + ~ distributed under license by Red Hat Inc. + ~ + ~ This copyrighted material is made available to anyone wishing to use, modify, + ~ copy, or redistribute it subject to the terms and conditions of the GNU + ~ Lesser General Public License, as published by the Free Software Foundation. + ~ + ~ This program 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 distribution; if not, write to: + ~ Free Software Foundation, Inc. + ~ 51 Franklin Street, Fifth Floor + ~ Boston, MA 02110-1301 USA + --> +<body> + +<h2>Aggregated Hibernate Core JavaDocs</h2> + +Hibernate provides both<ul> + <li> + a native API comprised mainly of {@link org.hibernate.SessionFactory} and {@link org.hibernate.Session} + </li> + <li> + an implementation of the <a href="">JSR-317</a> Java Persistence API (JPA) specification comprised mainly of + {@link org.hibernate.ejb.EntityManagerFactoryImpl} and {@link org.hibernate.ejb.EntityManagerImpl} + </li> +</ul> +<hr/> + +<h3>Native API</h3> +In addition to {@link org.hibernate.SessionFactory} and {@link org.hibernate.Session}, applications using the +native API will often need to utilize the following interfaces:<ul> + <li>{@link org.hibernate.cfg.Configuration}</li> + <li>{@link org.hibernate.Hibernate}</li> + <li>{@link org.hibernate.Transaction}</li> + <li>{@link org.hibernate.Query}</li> + <li>{@link org.hibernate.Criteria}</li> + <li>{@link org.hibernate.criterion.Projection}</li> + <li>{@link org.hibernate.criterion.Projections}</li> + <li>{@link org.hibernate.criterion.Criterion}</li> + <li>{@link org.hibernate.criterion.Restrictions}</li> + <li>{@link org.hibernate.criterion.Order}</li> + <li>{@link org.hibernate.criterion.Example}</li> +</ul> +These interfaces are fully intended to be exposed to application code. +<hr/> + +<h3>JPA</h3> +The JPA interfaces are all defined by the JPA specification. For details see {@link javax.persistence} +<hr/> + +<h3>Extensions</h3> +Hibernate defines a number of interfaces that are completely intended to be extendable by application programmers and/or +integrators. Listed below is a (not necessarily exhaustive) list of the most commonly utilized extension points:<ul> + <li>{@link org.hibernate.EntityNameResolver}</li> + <li>{@link org.hibernate.Interceptor} / {@link org.hibernate.EmptyInterceptor}</li> + <li>{@link org.hibernate.Transaction} / {@link org.hibernate.transaction.TransactionFactory}</li> + <li>{@link org.hibernate.context.CurrentSessionContext}</li> + <li>{@link org.hibernate.dialect.Dialect}</li> + <li>{@link org.hibernate.dialect.resolver.DialectResolver}</li> + <li>{@link org.hibernate.event event listener} interfaces</li> + <li>{@link org.hibernate.id.IdentifierGenerator}</li> + <li>{@link org.hibernate.tuple.entity.EntityTuplizer} / {@link org.hibernate.tuple.component.ComponentTuplizer}</li> + <li>{@link org.hibernate.type.Type} / {@link org.hibernate.usertype}</li> +</ul> +Note that there is a large degree of crossover between the notion of extension points and that of an integration SPI (below). +<hr/> + +<h3>Integration SPI</h3> +Hibernate provides a number of SPIs intended to integrate itself with various third party frameworks or application code to provide +additional capabilities. The SPIs fall mainly into 2 categories:<ul> + <li>Caching - {@link org.hibernate.cache.RegionFactory}</li> + <li>JDBC Connection management - {@link org.hibernate.connection.ConnectionProvider} +</ul> +Certainly {@link org.hibernate.dialect.Dialect} could fit in here as well, though we chose to list it under extensions since application +developers tend to provide extended dialects rather frequently for various reasons. +<br/> +Another SPI that is not yet exposed but is planned for such is the <em>bytecode provider</em> SPI. See {@link org.hibernate.bytecode} +for details. +<hr/> + +Complete Hibernate documentation may be found online at <a href="http://docs.jboss.org/hibernate/">http://docs.jboss.or...;. + +</body> \ No newline at end of file Copied: core/branches/gradle2/hibernate-release/src/javadoc/stylesheet.css (from rev 19677, core/branches/gradle2/distribution/src/javadoc/stylesheet.css) =================================================================== --- core/branches/gradle2/hibernate-release/src/javadoc/stylesheet.css (rev 0) +++ core/branches/gradle2/hibernate-release/src/javadoc/stylesheet.css 2010-06-08 19:16:21 UTC (rev 19701) @@ -0,0 +1,174 @@ +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2010, Red Hat Inc. or third-party contributors as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Inc. + * + * This copyrighted material is made available to anyone wishing to use, modify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Foundation. + * + * This program 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 distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + */ + +/* + * Custom Hibernate javadoc style sheet + */ + +/* Page background color */ +body { + background: #FFFFFF url(images/bkg_gradient.gif) repeat-x; + margin:0 auto; + font-family:'Lucida Grande', Geneva, Verdana, Arial, sans-serif; + font-size:12px; + padding:0 2em; + color:#333; + + } + +/* Common elements */ + +font { + font-family: inherit, sans-serif; + font-size: inherit; + color: inherit; + font-weight: inherit; +} + +hr { + border-style: none; + border-bottom: 1px solid #CCCCCC; +} + +/* Links */ +a:link { + color:#003399; +} +a:visited { + color:#888888; +} +a:hover { + color:#6699cc; +} +a:active { + color: #003399; +} + +/* Headings */ +h1 { + background: url(images/h1_hdr.png) no-repeat; + line-height:1.2em; + color:#586464; + font-size:2em; + padding:1.5em; + margin-top: 0; + text-align:left; +} + +h2 { + color:#586464; +} + + +/* Default Table elements and colors */ + +th, table { + border-collapse:collapse; + border-color: #E6E7E8; +} + + +.TableHeadingColor { + background:#000000 url(images/bkg_blkheader.png) repeat-x scroll left top; + color:#FFFFFF; + font-size:12px; + font-weight:bold; + height:31px; + text-align:left; + padding:1.5em; +} + +.TableHeadingColor th { + padding-left: 10px; +} + + +.TableSubHeadingColor { + background: #ebe7d7; +} +.TableRowColor { + background: #FFFFFF; + border-color: #E6E7E8; +} +.TableRowColor td { + line-height: 175%; + padding-left: 10px; +} + +/* Font used in left-hand frame lists */ +.FrameTitleFont { + font-size: 125%; + font-family: Helvetica, Arial, sans-serif; + font-weight: bold; + margin-top: 1em; + display: block; +} +.FrameHeadingFont { + font-size: 125%; + font-family: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; + font-weight: bold; + margin-top: 1em; + display: block; + color:#586464; + border-bottom:1px dotted #CCCCCC; +} +.FrameItemFont { + font-size: 100%; + font-family: Helvetica, Arial, sans-serif +} + +/* Navigation bar fonts and colors */ + +.NavBarCell1 { + background: #ffffff url(images/bkgheader.png) repeat-x; + line-height:3em; + padding-left:10px; + padding-right:10px; +} + +.NavBarFont1 { + color: white; +} +.NavBarCell1 a { + color: white; +} + +.NavBarCell1Rev { + background-color:#FFFFFF; + padding-left:6px; + padding-right:6px; +} +.NavBarFont1 { + color:#FFFFFF; +} +.NavBarFont1Rev { + color:#243446; +} + +.NavBarCell2 { + background-color:#FFFFFF; +} +.NavBarCell3 { + background-color:#FFFFFF; +}