You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2010/10/19 09:10:33 UTC
svn commit: r1024141 - in /karaf/trunk: ./ manual/ manual/src/fallback/
manual/src/main/webapp/ manual/src/main/webapp/WEB-INF/scalate/layouts/
manual/src/main/webapp/css/ manual/src/main/webapp/images/
Author: gnodet
Date: Tue Oct 19 07:10:32 2010
New Revision: 1024141
URL: http://svn.apache.org/viewvc?rev=1024141&view=rev
Log:
Reuse the karaf web site css/template
Added:
karaf/trunk/manual/src/fallback/manual.html
karaf/trunk/manual/src/fallback/manual.pdf
karaf/trunk/manual/src/main/webapp/_banner.ssp
karaf/trunk/manual/src/main/webapp/_navigation.conf
karaf/trunk/manual/src/main/webapp/_quicklinks.ssp
karaf/trunk/manual/src/main/webapp/images/asf-logo.png
karaf/trunk/manual/src/main/webapp/images/bg.png
karaf/trunk/manual/src/main/webapp/images/bg02-blue-left.png
karaf/trunk/manual/src/main/webapp/images/bg02-blue-right.png
karaf/trunk/manual/src/main/webapp/images/bg02-white-left-nogr.png
karaf/trunk/manual/src/main/webapp/images/bg02-white-right-nogr.png
karaf/trunk/manual/src/main/webapp/images/big-bullet.png
karaf/trunk/manual/src/main/webapp/images/karaf2.png
karaf/trunk/manual/src/main/webapp/images/left-box-bottom.png
karaf/trunk/manual/src/main/webapp/images/left-box-right.png
karaf/trunk/manual/src/main/webapp/images/left-box-top.png
karaf/trunk/manual/src/main/webapp/manual.conf
- copied, changed from r1023786, karaf/trunk/manual/src/main/webapp/karaf-manual.conf
Removed:
karaf/trunk/manual/src/main/webapp/_navigation.ssp
karaf/trunk/manual/src/main/webapp/karaf-manual.conf
Modified:
karaf/trunk/manual/pom.xml
karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
karaf/trunk/manual/src/main/webapp/css/style.css
karaf/trunk/pom.xml
Modified: karaf/trunk/manual/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/pom.xml?rev=1024141&r1=1024140&r2=1024141&view=diff
==============================================================================
--- karaf/trunk/manual/pom.xml (original)
+++ karaf/trunk/manual/pom.xml Tue Oct 19 07:10:32 2010
@@ -19,352 +19,406 @@
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.apache.karaf</groupId>
- <artifactId>karaf</artifactId>
- <version>2.1.99-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>manual</artifactId>
- <name>Apache Karaf :: Manual</name>
- <packaging>war</packaging>
-
- <properties>
- <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
- <jetty-port>8080</jetty-port>
- <jetty-war-dir>${project.build.directory}/webapp/</jetty-war-dir>
- <scalate.version>1.4-SNAPSHOT</scalate.version>
- <wikitext.version>1.1-SNAPSHOT</wikitext.version>
- <scalate.editor>${env.SCALATE_EDITOR}</scalate.editor>
- <scalate.mode>production</scalate.mode>
- <scalate.workdir>${project.build.directory}/scalateWorkDir</scalate.workdir>
- <karaf.version>${project.version}</karaf.version>
- <maven.wagon.version>1.0-beta-6</maven.wagon.version>
- </properties>
-
- <repositories>
- <repository>
- <id>fusesource</id>
- <name>Fusesource Maven Repository</name>
- <url>http://repo.fusesource.com/nexus/content/repositories/snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
- <pluginRepositories>
- <pluginRepository>
- <id>fusesource</id>
- <name>Fusesource Maven Repository</name>
- <url>http://repo.fusesource.com/nexus/content/repositories/snapshots/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
-
- <dependencies>
- <dependency>
- <groupId>org.fusesource.scalate</groupId>
- <artifactId>scalate-wikitext</artifactId>
- <version>${scalate.version}</version>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>0.9.24</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.0</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>filter</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/webapp</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/webapp</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.karaf.tooling</groupId>
- <artifactId>cmdhelp-maven-plugin</artifactId>
- <version>${project.version}</version>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>cmdhelp</goal>
- </goals>
+ <parent>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>karaf</artifactId>
+ <version>2.1.99-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>manual</artifactId>
+ <name>Apache Karaf :: Manual</name>
+ <packaging>war</packaging>
+
+ <properties>
+ <must-succeed>false</must-succeed>
+ <manual.dir>${project.build.directory}/manual</manual.dir>
+ <manual>${manual.dir}/manual-${project.version}</manual>
+ <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
+ <jetty-port>8080</jetty-port>
+ <jetty-war-dir>${project.build.directory}/webapp/</jetty-war-dir>
+ <scalate.version>1.4-SNAPSHOT</scalate.version>
+ <wikitext.version>1.1-SNAPSHOT</wikitext.version>
+ <scalate.editor>${env.SCALATE_EDITOR}</scalate.editor>
+ <scalate.mode>production</scalate.mode>
+ <scalate.workdir>${project.build.directory}/scalateWorkDir</scalate.workdir>
+ <karaf.version>${project.version}</karaf.version>
+ <maven.wagon.version>1.0-beta-6</maven.wagon.version>
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>fusesource</id>
+ <name>Fusesource Maven Repository</name>
+ <url>http://repo.fusesource.com/nexus/content/repositories/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>fusesource</id>
+ <name>Fusesource Maven Repository</name>
+ <url>http://repo.fusesource.com/nexus/content/repositories/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.fusesource.scalate</groupId>
+ <artifactId>scalate-wikitext</artifactId>
+ <version>${scalate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>0.9.24</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.0</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>filter</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/webapp</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/webapp</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/webapp</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>cmdhelp-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <id>generate-commands</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>cmdhelp</goal>
+ </goals>
+ <configuration>
+ <format>conf</format>
+ <targetFolder>${project.build.directory}/webapp/commands/</targetFolder>
+ <classLoader>plugin</classLoader>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <!-- Commands for help generation -->
+ <dependency>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.commands</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.config</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.dev</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.log</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.osgi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.packages</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.ssh</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.wrapper</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.fusesource.scalate</groupId>
+ <artifactId>maven-scalate-plugin</artifactId>
+ <version>${scalate.version}</version>
+ <executions>
+ <execution>
+ <id>generate-htmls</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>sitegen</goal>
+ </goals>
+ <configuration>
+ <warSourceDirectory>${project.build.directory}/webapp</warSourceDirectory>
+ </configuration>
+ </execution>
+ </executions>
<configuration>
- <format>conf</format>
- <targetFolder>${project.build.directory}/webapp/commands/</targetFolder>
- <classLoader>plugin</classLoader>
+ <remoteServerId>people.apache.org</remoteServerId>
+ <remoteServerUrl>scp://people.apache.org/www/karaf.apache.org/manual/${karaf.version}
+ </remoteServerUrl>
</configuration>
- </execution>
- </executions>
- <dependencies>
- <!-- Commands for help generation -->
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.console</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.commands</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.config</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.dev</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.log</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.osgi</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.packages</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.ssh</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.wrapper</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.fusesource.scalate</groupId>
- <artifactId>maven-scalate-plugin</artifactId>
- <version>${scalate.version}</version>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>sitegen</goal>
- </goals>
- <configuration>
- <warSourceDirectory>${project.build.directory}/webapp</warSourceDirectory>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <remoteServerId>people.apache.org</remoteServerId>
- <remoteServerUrl>scp://people.apache.org/www/karaf.apache.org/manual/${karaf.version}</remoteServerUrl>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh</artifactId>
- <version>${maven.wagon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.fusesource.wikitext</groupId>
- <artifactId>confluence-core</artifactId>
- <version>${wikitext.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <webResources>
- <resource>
- <directory>${project.build.directory}/webapp/</directory>
- </resource>
- </webResources>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>7.1.5.v20100705</version>
- <configuration>
- <!-- When editing the conf files, you can comment this line to run
- mvn jetty:run
- to have a live web site
- -->
- <webAppSourceDirectory>${jetty-war-dir}</webAppSourceDirectory>
-
- <systemProperties>
- <systemProperty>
- <name>scalate.editor</name>
- <value>${scalate.editor}</value>
- </systemProperty>
- <systemProperty>
- <name>scalate.workdir</name>
- <value>${scalate.workdir}</value>
- </systemProperty>
- <systemProperty>
- <name>scalate.mode</name>
- <value>${scalate.mode}</value>
- </systemProperty>
- </systemProperties>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <executions>
- <execution>
- <id>bundle-manifest</id>
- <phase>process-classes</phase>
- <goals>
- <goal>manifest</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <supportedProjectTypes>
- <supportedProjectType>jar</supportedProjectType>
- <supportedProjectType>bundle</supportedProjectType>
- <supportedProjectType>war</supportedProjectType>
- </supportedProjectTypes>
- <instructions>
- <Import-Package>
- javax.servlet,
- javax.servlet.http,
- org.osgi.framework,
- org.osgi.service.packageadmin,
- javax.swing.tree,
- org.apache.commons.logging;provider=paxlogging;resolution:=optional,
- org.apache.log4j;provider=paxlogging;resolution:=optional,
- org.slf4j;provider=paxlogging;resolution:=optional,
- </Import-Package>
- <Bundle-ClassPath>.,WEB-INF/classes</Bundle-ClassPath>
- <Embed-Directory>WEB-INF/lib</Embed-Directory>
- <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
- <Webapp-Context>karaf-doc</Webapp-Context>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <id>preprocess</id>
- <configuration>
- <tasks>
- <echo message="Generating PDF using Prince XML (http://www.princexml.com/)"/>
- <exec executable="prince">
- <arg value="${project.build.directory}/sitegen/karaf-manual.html" />
- <arg value="${project.build.directory}/sitegen/karaf-manual.pdf" />
- <arg value="--log"/>
- <arg value="${project.build.directory}/prince.log"/>
- </exec>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>verify</phase>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.5</version>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>verify</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>${project.build.directory}/sitegen/karaf-manual.pdf</file>
- <type>pdf</type>
- </artifact>
- <artifact>
- <file>${project.build.directory}/sitegen/karaf-manual.html</file>
- <type>html</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.fusesource.scalate</groupId>
- <artifactId>maven-scalate-plugin</artifactId>
- <version>${scalate.version}</version>
- </plugin>
- </plugins>
- </reporting>
-
- <profiles>
- <profile>
- <id>live</id>
- <properties>
- <jetty-war-dir>${basedir}/src/main/webapp/</jetty-war-dir>
- <scalate.mode>development</scalate.mode>
- </properties>
- </profile>
- </profiles>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>${maven.wagon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fusesource.wikitext</groupId>
+ <artifactId>confluence-core</artifactId>
+ <version>${wikitext.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>attach-manual</id>
+ <phase>install</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <taskdef name="trycatch" classname="net.sf.antcontrib.logic.TryCatchTask"
+ classpathref="maven.plugin.classpath"/>
+ <mkdir dir="${manual.dir}"/>
+ <move file="${project.build.directory}/sitegen/manual.html" tofile="${manual}.html"/>
+ <trycatch property="error">
+ <try>
+ <echo message="Generating PDF using Prince XML (http://www.princexml.com/)"/>
+ <exec executable="prince">
+ <arg value="${manual}.html"/>
+ <arg value="${manual}.pdf"/>
+ <arg value="--log"/>
+ <arg value="${project.build.directory}/prince.log"/>
+ </exec>
+ </try>
+ <catch>
+ <if>
+ <equals arg1="${must-succeed}" arg2="true"/>
+ <then>
+ <echo>ERROR: ${error}</echo>
+ <fail>${error}</fail>
+ </then>
+ <else>
+ <echo>ERROR: ${error}</echo>
+ <echo>Falling back to dummy manuals</echo>
+ <copy file="src/fallback/manual.html" tofile="${manual}.html"/>
+ <copy file="src/fallback/manual.pdf" tofile="${manual}.pdf"/>
+ </else>
+ </if>
+ </catch>
+ </trycatch>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>install</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${manual}.pdf</file>
+ <type>pdf</type>
+ </artifact>
+ <artifact>
+ <file>${manual}.html</file>
+ <type>html</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <webResources>
+ <resource>
+ <directory>${project.build.directory}/webapp/</directory>
+ </resource>
+ </webResources>
+ <archive>
+ <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>7.1.5.v20100705</version>
+ <configuration>
+ <!-- When editing the conf files, you can comment this line to run
+ mvn jetty:run
+ to have a live web site
+ -->
+ <webAppSourceDirectory>${jetty-war-dir}</webAppSourceDirectory>
+
+ <systemProperties>
+ <systemProperty>
+ <name>scalate.editor</name>
+ <value>${scalate.editor}</value>
+ </systemProperty>
+ <systemProperty>
+ <name>scalate.workdir</name>
+ <value>${scalate.workdir}</value>
+ </systemProperty>
+ <systemProperty>
+ <name>scalate.mode</name>
+ <value>${scalate.mode}</value>
+ </systemProperty>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-manifest</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <supportedProjectTypes>
+ <supportedProjectType>jar</supportedProjectType>
+ <supportedProjectType>bundle</supportedProjectType>
+ <supportedProjectType>war</supportedProjectType>
+ </supportedProjectTypes>
+ <instructions>
+ <Import-Package>
+ javax.servlet,
+ javax.servlet.http,
+ org.osgi.framework,
+ org.osgi.service.packageadmin,
+ javax.swing.tree,
+ org.apache.commons.logging;provider=paxlogging;resolution:=optional,
+ org.apache.log4j;provider=paxlogging;resolution:=optional,
+ org.slf4j;provider=paxlogging;resolution:=optional;version="[1.5,2)",
+ </Import-Package>
+ <Bundle-ClassPath>.,WEB-INF/classes</Bundle-ClassPath>
+ <Embed-Directory>WEB-INF/lib</Embed-Directory>
+ <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+ <Embed-Transitive>true</Embed-Transitive>
+ <Webapp-Context>/karaf-doc</Webapp-Context>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.fusesource.scalate</groupId>
+ <artifactId>maven-scalate-plugin</artifactId>
+ <version>${scalate.version}</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <profiles>
+ <profile>
+ <id>live</id>
+ <properties>
+ <jetty-war-dir>${basedir}/src/main/webapp/</jetty-war-dir>
+ <scalate.mode>development</scalate.mode>
+ </properties>
+ </profile>
+ <profile>
+ <id>release</id>
+ <properties>
+ <must-succeed>true</must-succeed>
+ </properties>
+ </profile>
+ </profiles>
</project>
Added: karaf/trunk/manual/src/fallback/manual.html
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/fallback/manual.html?rev=1024141&view=auto
==============================================================================
--- karaf/trunk/manual/src/fallback/manual.html (added)
+++ karaf/trunk/manual/src/fallback/manual.html Tue Oct 19 07:10:32 2010
@@ -0,0 +1,20 @@
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<div class="wiki-content">
+ Unable to generate manual.
+</div>
\ No newline at end of file
Added: karaf/trunk/manual/src/fallback/manual.pdf
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/fallback/manual.pdf?rev=1024141&view=auto
==============================================================================
Files karaf/trunk/manual/src/fallback/manual.pdf (added) and karaf/trunk/manual/src/fallback/manual.pdf Tue Oct 19 07:10:32 2010 differ
Modified: karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml?rev=1024141&r1=1024140&r2=1024141&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml (original)
+++ karaf/trunk/manual/src/main/webapp/WEB-INF/scalate/layouts/default.scaml Tue Oct 19 07:10:32 2010
@@ -44,15 +44,71 @@
= title
%body
- #navigation
- .wrapper
- = include("/_navigation.ssp")
- #content
- .wrapper
- !~~ body
-
- #footer
- .wrapper
- %br
- - if (include_console)
- = include("/org/fusesource/scalate/console/console.scaml")
+ %table{:width => "100%", :cellpadding => "0", :cellspacing => "0"}
+ %tr{:width => "100%"}
+ %td#cell-0-0{:colspan => "2"}
+
+ %td#cell-0-1
+
+ %td#cell-0-2{:colspan => "2"}
+
+ %tr{:width => "100%"}
+ %td#cell-1-0
+
+ %td#cell-1-1
+
+ %td#cell-1-2
+ %div{:style => "padding: 5px;"}
+ #banner
+ = include("/_banner.ssp")
+ #top-menu
+ %table{:border => "0", :cellpadding => "1", :cellspacing => "0", :width => "100%"}
+ %tr
+ %td
+ %div{:align => "left"}
+ %td
+ %div{:align => "right"}
+ = include("/_quicklinks.ssp")
+ %td#cell-1-3
+
+ %td#cell-1-4
+
+ %tr{:width => "100%"}
+ %td#cell-2-0{:colspan => "2"}
+
+ %td#cell-2-1
+ %table
+ %tr{:height => "100%", :valign => "top"}
+ %td{:height => "100%"}
+ #wrapper-menu-page-right
+ #wrapper-menu-page-top
+ #wrapper-menu-page-bottom
+ #menu-page
+ = include("/_navigation.conf")
+ %td{:height =>"100%", :width => "100%"}
+ #wiki-content
+ !~~ body
+ %td#cell-2-2{:colspan => "2"}
+
+ %tr{:width => "100%"}
+ %td#cell-3-0
+
+ %td#cell-3-1
+
+ %td#cell-3-2
+ #footer
+ #site-footer
+ © 2008-2010 The Apache Software Foundation
+ %td#cell-3-3
+
+ %td#cell-3-4
+
+ %tr{:width => "100%"}
+ %td#cell-4-0{:colspan => "2"}
+
+ %td#cell-4-1
+
+ %td#cell-4-2{:colspan => "2"}
+
+ - if (include_console)
+ = include("/org/fusesource/scalate/console/console.scaml")
Added: karaf/trunk/manual/src/main/webapp/_banner.ssp
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/_banner.ssp?rev=1024141&view=auto
==============================================================================
--- karaf/trunk/manual/src/main/webapp/_banner.ssp (added)
+++ karaf/trunk/manual/src/main/webapp/_banner.ssp Tue Oct 19 07:10:32 2010
@@ -0,0 +1,14 @@
+ <table border="0" cellpadding="0" cellspacing="0" width="100%">
+ <tr>
+ <td align="left" class="topbardiv" nowrap="">
+<a href="http://karaf.apache.org/" title="A server side OSGi distribution">
+ <!--<img border="0" src="http://karaf.apache.org/images/logo.png"></img>--><span style="position: relative; top: -24px; font-family: Comic Sans MS; font-size: 64px; color: black;">Apache Karaf</span>
+</a>
+ </td>
+ <td align="right" nowrap="">
+<a href="http://www.apache.org/" title="The Apache Sofware Foundation">
+ <img border="0" src="/images/asf-logo.png">
+</a>
+ </td>
+ </tr>
+ </table>
Added: karaf/trunk/manual/src/main/webapp/_navigation.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/_navigation.conf?rev=1024141&view=auto
==============================================================================
--- karaf/trunk/manual/src/main/webapp/_navigation.conf (added)
+++ karaf/trunk/manual/src/main/webapp/_navigation.conf Tue Oct 19 07:10:32 2010
@@ -0,0 +1,35 @@
+h3. [Home|/index]
+
+- [Overview]
+- [Quick Start]
+
+h3. [Users Guide|/users-guide/index]
+
+- [Installing Karaf|/users-guide/installation]
+- [Directory Structure|/users-guide/directory-structure]
+- [Starting and stopping Karaf|/users-guide/start-stop]
+- [Using the console|/users-guide/using-console]
+- [Web console|/users-guide/web-console]
+- [Remote console|/users-guide/remote-console]
+- [Child instances|/users-guide/child-instances]
+- [Security|/users-guide/security]
+- [Failover Deployments|/users-guide/failover]
+- [Logging system|/users-guide/logging-system]
+
+- [Installing additional features|/users-guide/installing-features]
+- [Deployer|/users-guide/deployer]
+- [Provisioning|/users-guide/provisioning]
+- [Configuration|/users-guide/configuration]
+
+h3. [Developers Guide|/developers-guide/index]
+
+- [Extending the Console|/developers-guide/extending-console]
+- [Security Framework|/developers-guide/security-framework]
+
+- [writing-tests]
+- [debugging]
+- [creating-bundes]
+- [connect-console]
+- [shell-syntax]
+
+h3. [Commands|/commands/]
Added: karaf/trunk/manual/src/main/webapp/_quicklinks.ssp
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/_quicklinks.ssp?rev=1024141&view=auto
==============================================================================
--- karaf/trunk/manual/src/main/webapp/_quicklinks.ssp (added)
+++ karaf/trunk/manual/src/main/webapp/_quicklinks.ssp Tue Oct 19 07:10:32 2010
@@ -0,0 +1,8 @@
+<p>
+<a href="${uri("/index.html")}" title="Home">Home</a>
+|
+<a href="${uri("/users-guide/index.html")}" title="Users Guide">Users Guide</a>
+|
+<a href="${uri("/developers-guide/index.html")}" title="Developers Guide">Developers Guide</a>
+</p>
+
Modified: karaf/trunk/manual/src/main/webapp/css/style.css
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/css/style.css?rev=1024141&r1=1024140&r2=1024141&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/css/style.css (original)
+++ karaf/trunk/manual/src/main/webapp/css/style.css Tue Oct 19 07:10:32 2010
@@ -16,123 +16,1571 @@
* limitations under the License.
*/
-body, html {
- font-family:Arial,Verdana,Helvetica,sans-serif;
- color: #666666;
+body {
+ margin: 0;
+ padding: 0;
+}
+
+#cell-0-0 { background: white url( '../images/bg02-white-left-nogr.png' ) repeat-y right top; }
+#cell-0-1 { height: 1em; width: 85%; }
+#cell-0-2 { background: transparent url( '../images/bg02-white-right-nogr.png' ) repeat-y left top; }
+#cell-1-0 { background: transparent url( '../images/bg.png' ) repeat-x top; }
+#cell-1-1 { background: transparent url( '../images/bg02-blue-left.png' ) no-repeat right top; width:13px; }
+#cell-1-2 { background: transparent url( '../images/bg.png' ) repeat-x top; width:85%; }
+#banner { height: 80px; }
+#cell-1-3 { background: transparent url( '../images/bg02-blue-right.png' ) no-repeat left top; width:13px; }
+#cell-1-4 { background: transparent url( '../images/bg.png' ) repeat-x top; }
+#cell-2-0 { background: white url( '../images/bg02-white-left-nogr.png' ) repeat-y right top; }
+#cell-2-1 { height: 1em; width: 85%; }
+#cell-2-2 { background: white url( '../images/bg02-white-right-nogr.png' ) repeat-y left top; }
+#cell-3-0 { background: transparent url( '../images/bg.png' ) repeat-x top; }
+#cell-3-1 { background: transparent url( '../images/bg02-blue-left.png' ) no-repeat right top; width:13px; }
+#cell-3-2 { background: transparent url( '../images/bg.png' ) repeat-x top; width:85%; }
+#cell-3-3 { background: transparent url( '../images/bg02-blue-right.png' ) no-repeat left top; width:13px; }
+#cell-3-4 { background: transparent url( '../images/bg.png' ) repeat-x top; }
+#cell-4-0 { background: white url( '../images/bg02-white-left-nogr.png' ) repeat-y right top; }
+#cell-4-1 { height: 1em; width: 85%; }
+#cell-4-2 { background: transparent url( '../images/bg02-white-right-nogr.png' ) repeat-y left top; }
+
+#banner {
+ margin: 0px 20px;
+ padding: 0px 50px 0px 50px;
+ font-size: 200%;
+ text-align: center;
+ background: transparent;
}
-body, html, table, tr, td, tbody {
- padding:0;
- margin:0;
- vertical-align: top;
+#top-menu {
+ margin: 0px 25px;
+ padding: 2px;
+ line-height: 100%;
+ font-family: Verdana, arial, sans-serif;
+ font-weight: bold;
+ font-size: 11px;
+ color: white;
+ line-height: 13px;
+ overflow: none;
}
-body {
- padding-top: 20px;
+#top-menu a:link, #top-menu a:visited {
+ color: #ffffff;
+ text-decoration: none;
+}
+#top-menu a:active, #top-menu a:hover {
+ color: #5b8fbe;
+ text-decoration: underline;
+}
+#top-menu sup img {
+ height: 0px;
+ width: 0px;
}
-h1, h2, h3, h4, h5, h6 {
- overflow: visible;
- color: #993333;
+#footer {
+ padding: 0px 50px 0px 50px;
+ min-height: 0em;
+ text-align: center;
+ color: #5b8fbe;
+ font-size: 65%;
+ font-family: Verdana, arial, sans-serif;
+}
+#footer a:link, #footer a:visited {
+ color: white;
+ text-decoration: none;
+}
+#footer a:hover {
+ color: white;
+ text-decoration: underline;
}
-/*
-h1 {
- margin-top: 0em;
- margin-bottom: 2em;
+#wrapper-menu-page-right {
+ background: transparent url( '../images/left-box-right.png' ) repeat-y right;
}
-*/
-p { margin-bottom:0px; }
+#wrapper-menu-page-bottom {
+ background: transparent url( '../images/left-box-bottom.png' ) no-repeat right bottom;
+}
-a {
- color: #990000;
- font-weight:bold;
- text-decoration: none;
+#wrapper-menu-page-top {
+ background: transparent url( '../images/left-box-top.png' ) no-repeat right top;
+}
+
+#menu-page {
+ width: 200px;
+ color: #5b8fbe;
+ font-family: Verdana, arial, sans-serif;
+ font-weight: bold;
+ margin: 0px;
+ padding: 17px 11px 17px 0px;
+ text-align: left;
+ margin-left: 0px;
+ line-height: 1em;
+}
+
+#menu-page ul {
+ margin: 0;
+ padding: 0;
+ padding-left: 35px;
+ font-size: 75%;
+}
+
+#menu-page h3 {
+ font-size: 75%;
+ text-transform: uppercase;
+ margin: 1em 0 0.3em 0;
+ color: #5b8fbe;
+ font-weight: normal;
+ letter-spacing: 0.15em;
+ background: url('../images/big-bullet.png') no-repeat 0pt;
+ background-position:left center;
+ margin-left:15px;
+ padding-left: 20px;
+ font-family: Verdana, arial, sans-serif;
+ font-weight: bold;
+}
+
+#menu-page a:link, #menu-page a:visited {
+ color: black;
+}
+
+#menu-page a:hover {
+ color: #5b8fbe;
+}
+
+#content {
+ padding: 20px 0px 0px 0px;
+ display: block;
+ text-align: left;
+ height: 100%;
+ width: 100%;
+ color: black;
+}
+
+h2 {
+ font-size: 110%;
+}
+
+h3 {
+ font-size: 100%;
+}
+
+a:link, a:visited {
+ color: #5b8fbe;
+ text-decoration: none;
}
a:hover {
- color: #ff3333;
- text-decoration: underline;
- }
+ color: #666;
+ text-decoration: none;
+}
+
+
+table.align {
+ padding: 0px;
+ border: none;
+}
+
+td.align {
+ padding: 0px;
+ border: none;
+}
+
+/*********************************************************************
+ CSS Elements that are part of the confluence rendered xhtml
+ *********************************************************************/
+.wiki-content {
+ font-family: Verdana, arial, sans-serif;
+ font-size: 11px;
+ line-height: 16px;
+ color: #000000;
+ font-weight: normal;
+ padding-top: 10px;
+ padding-bottom: 10px;
+}
-img {
- border: none;
/*
- padding-right:2em
+** when this stylesheet is used for the Tiny MCE Wysiwyg editor's edit area, we can't
+** use an id=PageContent or class=wiki-content, so we must
+** set the body style to that used for PageContent, and p to that used for wiki-content.
*/
+
+.monospaceInput {
+ font:12px monospace
+}
+
+.wiki-content p, .commentblock p {
+ margin: 16px 0px 16px 0px;
+ padding: 0px;
+}
+
+.wiki-content-preview {
+ padding: 5px;
+ border-left: 1px solid #3c78b5;
+ border-right: 1px solid #3c78b5;
+}
+
+ul, ol {
+ margin-top: 2px;
+ margin-bottom: 2px;
+ padding-top: 0px;
+ padding-bottom: 0px;
+}
+
+pre {
+ padding: 0px;
+ margin-top: 5px;
+ margin-left: 15px;
+ margin-bottom: 5px;
+ margin-right: 5px;
+ text-align: left;
+}
+
+.helpheading {
+ font-weight: bold;
+ background-color: #D0D9BD;
+ border-bottom: 1px solid #3c78b5;
+ padding: 4px 4px 4px 4px;
+ margin: 0px;
+ margin-top: 10px;
+}
+.helpcontent {
+ padding: 4px 4px 20px 4px;
+ background-color: #f5f7f1;
+}
+
+.code {
+ border: 1px dashed #3c78b5;
+ font-size: 11px;
+ font-family: Courier;
+ margin: 10px;
+ line-height: 13px;
+}
+
+.focusedComment {
+ background: #ffffce;
+}
+
+.commentBox, .focusedComment {
+ padding: 10px;
+ margin: 5px 0 5px 0;
+ border: 1px #bbb solid;
+}
+
+.codeHeader {
+ background-color: #f0f0f0;
+ border-bottom: 1px dashed #3c78b5;
+ padding: 3px;
+ text-align: center;
+}
+
+.codeContent {
+ text-align: left;
+ background-color: #f0f0f0;
+ padding: 3px;
+}
+
+.preformatted {
+ border: 1px dashed #3c78b5;
+ font-size: 11px;
+ font-family: Courier;
+ margin: 10px;
+ line-height: 13px;
+}
+
+.preformattedHeader {
+ background-color: #f0f0f0;
+ border-bottom: 1px dashed #3c78b5;
+ padding: 3px;
+ text-align: center;
+}
+
+.preformattedContent {
+ background-color: #f0f0f0;
+ padding: 3px;
+}
+
+.panel {
+ border: 1px dashed #3c78b5;
+ margin: 10px;
+ margin-top: 0px;
+}
+
+.panelHeader {
+ background-color: #f0f0f0;
+ border-bottom: 1px dashed #3c78b5;
+ padding: 3px;
+ text-align: center;
+}
+
+.panelContent {
+ background-color: #f0f0f0;
+ padding: 5px;
+}
+
+.anonymousAlert {
+ background-color: #f0f0f0;
+ border: 1px dashed red;
+ font-size: 11px;
+ padding: 10px 5px 10px 5px;
+ margin: 4px;
+ line-height: 13px;
+}
+
+.lockAlert {
+ background-color: #f0f0f0;
+ width: 50%;
+ border: 1px dashed red;
+ font-size: 11px;
+ padding: 10px 5px 10px 5px;
+ margin: 4px;
+ line-height: 13px;
+}
+
+
+.code-keyword {
+ color: #000091;
+ background-color: inherit;
+}
+
+.code-object {
+ color: #910091;
+ background-color: inherit;
+}
+
+.code-quote {
+ color: #009100;
+ background-color: inherit;
+}
+
+.code-comment {
+ color: #808080;
+ background-color: inherit;
+}
+
+
+.code-xml .code-keyword {
+ color: inherit;
+ font-weight: bold;
+}
+
+.code-tag {
+ color: #000091;
+ background-color: inherit;
+}
+
+.breadcrumbs {
+ background-color: #f0f0f0;
+ border-color: #3c78b5;
+ border-width: 1px 0px 1px 0px;
+ border-style: solid;
+ font-size: 11px;
+ padding: 3px 0px 3px 0px;
+}
+
+.navmenu {
+ border: 1px solid #ccc;
+}
+
+.menuheading {
+ font-weight: bold;
+ background-color: #f0f0f0;
+ border-bottom: 1px solid #3c78b5;
+ padding: 4px 4px 2px 4px;
+}
+
+.menuitems {
+ padding: 4px 4px 20px 4px;
+}
+
+.rightpanel {
+ border-left: 1px solid #ccc;
+ border-bottom: 1px solid #ccc;
+}
+
+#helpheading {
+ text-align: left;
+ font-weight: bold;
+ background-color: #D0D9BD;
+ border-bottom: 1px solid #3c78b5;
+ padding: 4px 4px 4px 4px;
+ margin: 0px;
+}
+#helpcontent {
+ padding: 4px 4px 4px 4px;
+ background-color: #f5f7f1;
+}
+.helptab-unselected {
+ font-weight: bold;
+ padding: 5px;
+ background-color: #f5f7f1;
+}
+.helptab-selected {
+ font-weight: bold;
+ background-color: #D0D9BD;
+ padding: 5px;
+}
+.helptabs {
+ margin: 0px;
+ background-color: #f5f7f1;
+ padding: 5px;
+}
+.infopanel-heading {
+ font-weight: bold;
+ padding: 4px 0px 2px 0px;
+}
+
+.pagebody {
+}
+
+.pageheader {
+ padding: 5px 5px 5px 0px;
+ border-bottom: 1px solid #3c78b5;
+}
+
+.steptitle {
+ font-size: 18px;
+ font-weight: bold;
+ font-family: Arial, sans-serif;
+ color: #003366;
+ margin-bottom: 7px;
+}
+
+.substeptitle {
+ font-size: 12px;
+ font-weight: bold;
+ font-family: Arial, sans-serif;
+ color: #003366;
+ margin: 2px 4px 4px 4px;
+ padding: 2px 4px 1px 4px;
}
-.wrapper { min-width: 762px; width: 762px; margin: 0 auto; }
+.stepdesc {
+ font-family: Verdana, arial, sans-serif;
+ font-size: 11px;
+ line-height: 16px;
+ font-weight: normal;
+ color: #666666;
+ margin-top: 7px;
+ margin-bottom: 7px;
+}
+
+.steplabel {
+ font-weight: bold;
+ margin-right: 4px;
+ color: black;
+ float: left;
+ width: 15%;
+ text-align: right;
+}
+
+.stepfield {
+ background: #f0f0f0;
+ padding: 5px;
+}
+
+.submitButtons{
+ margin-top:5px;
+ text-align:right;
+}
+
+.formtitle {
+ font-size: 12px;
+ font-weight: bold;
+ font-family: Arial, sans-serif;
+ color: #003366;
+}
+
+.sectionbottom {
+ border-bottom: 1px solid #3c78b5;
+}
+
+.topRow {
+ border-top: 2px solid #3c78b5;
+}
+
+.tabletitle {
+ font-size: 14px;
+ font-weight: bold;
+ font-family: Arial, sans-serif;
+ padding: 3px 0px 2px 0px;
+ margin: 8px 4px 2px 0px;
+ color: #003366;
+ border-bottom: 2px solid #3c78b5;
+}
+.pagesubheading {
+ color: #666666;
+ font-size: 10px;
+ padding: 0px 0px 5px 0px;
+}
+
+HR {
+ color: 3c78b5;
+ height: 1;
+}
+
+A:link, A:visited, A:active, A:hover {
+ color: #5b8fbe;
+}
+
+A:hover {
+ text-decoration: underline;
+}
+
+h1 A:link, h1 A:visited, h1 A:active {
+ text-decoration: none;
+}
+
+h1 A:hover {
+ border-bottom: 1px dotted #003366;
+}
+
+.wiki-content > :first-child, .commentblock > :first-child {
+ margin-top: 3px;
+}
+
+.logocell {
+ padding: 10px;
+}
+
+input {
+ font-family: verdana, geneva, arial, sans-serif;
+ font-size: 11px;
+ color: #000000;
+}
+
+textarea, textarea.editor {
+ font-family: verdana, geneva, arial, sans-serif;
+ font-size: 11px;
+ color: #333333;
+}
+
+/* use logoSpaceLink instead.
+.spacenametitle {
+ font: 21px/31px Impact, Arial, Helvetica;
+ font-weight: 100;
+ color: #999999;
+ margin: 0px;
+}
+.spacenametitle img {
+ margin: 0 0 -4px 0;
+}
+.spacenametitle a {
+ text-decoration: none;
+ color: #999999;
+}
+.spacenametitle a:visited {
+ text-decoration: none;
+ color: #999999;
+}*/
+
+.spacenametitle-printable {
+ font: 20px/25px Impact, Arial, Helvetica;
+ font-weight: 100;
+ color: #999999;
+ margin: 0px;
+}
+.spacenametitle-printable a {
+ text-decoration: none;
+ color: #999999;
+}
+.spacenametitle-printable a:visited {
+ text-decoration: none;
+ color: #999999;
+}
+
+.blogDate {
+ font-weight: bold;
+ text-decoration: none;
+ color: black;
+}
+
+.blogSurtitle {
+ background: #f0f0f0;
+ border: 1px solid #ddd;
+ padding: 3px;
+ margin: 1px 1px 10px 1px;
+}
+
+.blogHeading {
+ font-size: 20px;
+ line-height: normal;
+ font-weight: bold;
+ padding: 0px;
+ margin: 0px;
+}
+
+.blogHeading a {
+ text-decoration: none;
+ color: black;
+}
+
+.endsection {
+ align: right;
+ color: #666666;
+ margin-top: 10px;
+}
+.endsectionleftnav {
+ align: right;
+ color: #666666;
+ margin-top: 10px;
+}
-#navigation { width: 100%; float: left;
- font-family: Helvetica,Verdana,Arial,sans-serif;
- background: black;
- text-align:center; padding: 8px;
- color: #b55;
- font-size: 10pt;
- font-weight: bold;
- position: absolute;
- top: 0px;
-}
-#navigation a { color: white; }
-#navigation ul { display: block; margin:0; padding:0; }
-#navigation li { list-style-type: none; display: inline; margin:0 5px 0 5px;}
-
-#overview { width: 100%; padding-top:20px}
-#overview div.message {
- font-size: 11pt;
- margin-top: -20px;
- padding-left: 120px;
+h1 {
+ font-size: 24px;
+ line-height: normal;
+ font-weight: bold;
+ background-color: #f0f0f0;
+ color: #003366;
+ border-bottom: 1px solid #3c78b5;
+ padding: 2px;
+ margin: 36px 0px 4px 0px;
+}
+
+h2 {
+ font-size: 18px;
+ line-height: normal;
+ font-weight: bold;
+ background-color: #f0f0f0;
+ border-bottom: 1px solid #3c78b5;
+ padding: 2px;
+ margin: 27px 0px 4px 0px;
+}
+
+h3 {
+ font-size: 14px;
+ line-height: normal;
+ font-weight: bold;
+ background-color: #f0f0f0;
+ padding: 2px;
+ margin: 21px 0px 4px 0px;
+}
+
+h4 {
+ font-size: 12px;
+ line-height: normal;
+ font-weight: bold;
+ background-color: #f0f0f0;
+ padding: 2px;
+ margin: 18px 0px 4px 0px;
+}
+
+h4.search {
+ font-size: 12px;
+ line-height: normal;
+ font-weight: normal;
+ background-color: #f0f0f0;
+ padding: 4px;
+ margin: 18px 0px 4px 0px;
+}
+
+h5 {
+ font-size: 10px;
+ line-height: normal;
+ font-weight: bold;
+ background-color: #f0f0f0;
+ padding: 2px;
+ margin: 14px 0px 4px 0px;
+}
+
+h6 {
+ font-size: 8px;
+ line-height: normal;
+ font-weight: bold;
+ background-color: #f0f0f0;
+ padding: 2px;
+ margin: 14px 0px 4px 0px;
+}
+
+.smallfont {
+ font-size: 10px;
+}
+.descfont {
+ font-size: 10px;
+ color: #666666;
+}
+.smallerfont {
+ font-size: 9px;
+}
+.smalltext {
+ color: #666666;
+ font-size: 10px;
+}
+.smalltext a {
+ color: #666666;
+}
+.smalltext-blue {
+ color: #3c78b5;
+ font-size: 10px;
+}
+.surtitle {
+ margin-left: 1px;
+ margin-bottom: 5px;
+ font-size: 14px;
+ color: #666666;
+}
+
+/* css hack found here: http://www.fo3nix.pwp.blueyonder.co.uk/tutorials/css/hacks/ */
+.navItemOver { font-size: 10px; font-weight: bold; color: #ffffff; background-color: #003366; cursor: hand; voice-family: '\'}\''; voice-family:inherit; cursor: pointer;}
+.navItemOver a { color: #ffffff; background-color:#003366; text-decoration: none; }
+.navItemOver a:visited { color: #ffffff; background-color:#003366; text-decoration: none; }
+.navItemOver a:hover { color: #ffffff; background-color:#003366; text-decoration: none; }
+.navItem { font-size: 10px; font-weight: bold; color: #ffffff; background-color: #3c78b5; }
+.navItem a { color: #ffffff; text-decoration: none; }
+.navItem a:hover { color: #ffffff; text-decoration: none; }
+.navItem a:visited { color: #ffffff; text-decoration: none; }
+
+div.padded { padding: 4px; }
+div.thickPadded { padding: 10px; }
+h3.macrolibrariestitle {
+ margin: 0px 0px 0px 0px;
+}
+
+div.centered { text-align: center; margin: 10px; }
+div.centered table {margin: 0px auto; text-align: left; }
+
+.tableview table {
+ margin: 0;
+}
+
+.tableview th {
+ text-align: left;
+ color: #003366;
+ font-size: 12px;
+ padding: 5px 0px 0px 5px;
+ border-bottom: 2px solid #3c78b5;
+}
+.tableview td {
+ text-align: left;
+ border-color: #ccc;
+ border-width: 0px 0px 1px 0px;
+ border-style: solid;
+ margin: 0;
+ padding: 4px 10px 4px 5px;
+}
+
+.grid {
+ margin: 2px 0px 5px 0px;
+ border-collapse: collapse;
+}
+.grid th {
+ border: 1px solid #ccc;
+ padding: 2px 4px 2px 4px;
+ background: #f0f0f0;
+ text-align: center;
+}
+.grid td {
+ border: 1px solid #ccc;
+ padding: 3px 4px 3px 4px;
+}
+.gridHover {
+ background-color: #f9f9f9;
+}
+
+td.infocell {
+ background-color: #f0f0f0;
+}
+.label {
+ font-weight: bold;
+ color: #003366;
+}
+.error {
+ background-color: #fcc;
+}
+
+.errorBox {
+ background-color: #fcc;
+ border: 1px solid #c00;
+ padding: 5px;
+ margin: 5px;
+}
+
+.errorMessage {
+ color: #c00;
+}
+
+.success {
+ background-color: #dfd;
+}
+
+.successBox {
+ background-color: #dfd;
+ border: 1px solid #090;
+ padding: 5px;
+ margin-top:5px;
+ margin-bottom:5px;
+}
+
+blockquote {
+ padding-left: 10px;
+ padding-right: 10px;
+ margin-left: 5px;
+ margin-right: 0px;
+ border-left: 1px solid #3c78b5;
+}
+
+table.confluenceTable
+{
+ margin: 5px;
+ border-collapse: collapse;
+}
+
+/* Added as a temporary fix for CONF-4223. The table elements appear to be inheriting the border: none attribute from the sectionMacro class */
+table.confluenceTable td.confluenceTd
+{
+ border-width: 1px;
+ border-style: solid;
+ border-color: #ccc;
+ padding: 3px 4px 3px 4px;
+}
+
+/* Added as a temporary fix for CONF-4223. The table elements appear to be inheriting the border: none attribute from the sectionMacro class */
+table.confluenceTable th.confluenceTh
+{
+ border-width: 1px;
+ border-style: solid;
+ border-color: #ccc;
+ padding: 3px 4px 3px 4px;
+ background-color: #f0f0f0;
+ text-align: center;
+}
+
+td.confluenceTd
+{
+ border-width: 1px;
+ border-style: solid;
+ border-color: #ccc;
+ padding: 3px 4px 3px 4px;
+}
+
+th.confluenceTh
+{
+ border-width: 1px;
+ border-style: solid;
+ border-color: #ccc;
+ padding: 3px 4px 3px 4px;
+ background-color: #f0f0f0;
+ text-align: center;
+}
+
+DIV.small {
+ font-size: 9px;
+}
+
+H1.pagename {
+ margin-top: 0px;
+}
+
+IMG.inline {}
+
+.loginform {
+ margin: 5px;
+ border: 1px solid #ccc;
+}
+
+/* The text how the "This is a preview" comment should be shown. */
+.previewnote { text-align: center;
+ font-size: 11px;
+ color: red; }
+
+/* How the preview content should be shown */
+.previewcontent { background: #E0E0E0; }
+
+/* How the system messages should be shown (DisplayMessage.jsp) */
+.messagecontent { background: #E0E0E0; }
+
+/* How the "This page has been modified..." -comment should be shown. */
+.conflictnote { }
+
+.createlink {
+ color: maroon;
+}
+a.createlink {
+ color: maroon;
+}
+.templateparameter {
+ font-size: 9px;
+ color: darkblue;
+}
+
+.diffadded {
+ background: #ddffdd;
+ padding: 1px 1px 1px 4px;
+ border-left: 4px solid darkgreen;
+}
+.diffdeleted {
+ color: #999;
+ background: #ffdddd;
+ padding: 1px 1px 1px 4px;
+ border-left: 4px solid darkred;
+}
+.diffnochange {
+ padding: 1px 1px 1px 4px;
+ border-left: 4px solid lightgrey;
+}
+.differror {
+ background: brown;
+}
+.diff {
+ font-family: lucida console, courier new, fixed-width;
+ font-size: 12px;
+ line-height: 14px;
+}
+.diffaddedchars {
+ background-color:#99ff99;
+ font-weight:bolder;
+}
+.diffremovedchars {
+ background-color:#ff9999;
+ text-decoration: line-through;
+ font-weight:bolder;
+}
+
+.greybackground {
+ background: #f0f0f0
+}
+
+.greybox {
+ border: 1px solid #ddd;
+ padding: 3px;
+ margin: 1px 1px 10px 1px;
+}
+
+.borderedGreyBox {
+ border: 1px solid #cccccc;
+ background-color: #f0f0f0;
+ padding: 10px;
+}
+
+.greyboxfilled {
+ border: 1px solid #ddd;
+ padding: 5px;
+ margin: 10px 1px 10px 1px;
+ background: #f0f0f0;
+}
+
+.navBackgroundBox {
+ padding: 5px 5px 5px 5px;
+ font-size: 22px;
+ font-weight: bold;
+ font-family: Arial, sans-serif;
+ color: white;
+ background: #3c78b5;
+ text-decoration: none;
+}
+
+.previewBoxTop {
+ background-color: #f0f0f0;
+ border-width: 1px 1px 0px 1px;
+ border-style: solid;
+ border-color: #3c78b5;
+ padding: 5px;
+ margin: 5px 0px 0px 0px;
+ text-align: center;
+}
+.previewContent {
+ background-color: #fff;
+ border-color: #3c78b5;
+ border-width: 0px 1px 0px 1px;
+ border-style: solid;
+ padding: 10px;
+ margin: 0px;
+}
+.previewBoxBottom {
+ background-color: #f0f0f0;
+ border-width: 0px 1px 1px 1px;
+ border-style: solid;
+ border-color: #3c78b5;
+ padding: 5px;
+ margin: 0px 0px 5px 0px;
+ text-align: center;
+}
+
+.functionbox {
+ background-color: #f0f0f0;
+ border: 1px solid #3c78b5;
+ padding: 3px;
+ margin: 1px 1px 10px 1px;
+}
+
+.functionbox-greyborder {
+ background-color: #f0f0f0;
+ border: 1px solid #ddd;
+ padding: 3px;
+ margin: 1px 1px 10px 1px;
+}
+
+.search-highlight {
+ background-color: #ffffcc;
+}
+
+/* normal (white) background */
+.rowNormal {
+ background-color: #ffffff;
+ }
+
+/* alternate (pale yellow) background */
+.rowAlternate {
+ background-color: #f7f7f7;
+}
+
+/* used in the list attachments table */
+.rowAlternateNoBottomColor {
+ background-color: #f7f7f7;
+}
+
+.rowAlternateNoBottomNoColor {
+}
+
+.rowAlternateNoBottomColor td {
+ border-bottom: 0px;
+}
+
+.rowAlternateNoBottomNoColor td {
+ border-bottom: 0px;
+}
+
+/* row highlight (grey) background */
+.rowHighlight {
+ background-color: #f0f0f0;
+
+}
+
+TD.greenbar {FONT-SIZE: 2px; BACKGROUND: #00df00; BORDER: 1px solid #9c9c9c; PADDING: 0px; }
+TD.redbar {FONT-SIZE: 2px; BACKGROUND: #df0000; BORDER: 1px solid #9c9c9c; PADDING: 0px; }
+TD.darkredbar {FONT-SIZE: 2px; BACKGROUND: #af0000; BORDER: 1px solid #9c9c9c; PADDING: 0px; }
+
+TR.testpassed {FONT-SIZE: 2px; BACKGROUND: #ddffdd; PADDING: 0px; }
+TR.testfailed {FONT-SIZE: 2px; BACKGROUND: #ffdddd; PADDING: 0px; }
+
+.toolbar {
+ margin: 0px;
+ border-collapse: collapse;
+}
+
+.toolbar td {
+ border: 1px solid #ccc;
+ padding: 2px 2px 2px 2px;
+ color: #ccc;
+}
+
+td.noformatting {
+ border-width: 0px;
+ border-style: none;
+ text-align: center;
+ padding: 0px;
+}
+
+.commentblock {
+ margin: 12px 0 12px 0;
+}
+
+/*
+ * Divs displaying the license information, if necessary.
+ */
+.license-eval, .license-none, .license-nonprofit {
+ border-top: 1px solid #bbbbbb;
+ text-align: center;
+ font-size: 10px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+}
+
+.license-eval, .license-none {
+ background-color: #ffcccc;
+}
+
+.license-eval b, .license-none b {
+ color: #990000
+}
+
+.license-nonprofit {
+ background-color: #ffffff;
+}
+
+/*
+ * The shadow at the bottom of the page between the main content and the
+ * "powered by" section.
+ */
+.bottomshadow {
+ height: 12px;
+ background-image: url("$req.contextPath/images/border/border_bottom.gif");
+ background-repeat: repeat-x;
+}
+
+/*
+ * Styling of the operations box
+ */
+.navmenu .operations li, .navmenu .operations ul {
+ list-style: none;
+ margin-left: 0;
+ padding-left: 0;
+}
+
+.navmenu .operations ul {
+ margin-bottom: 9px;
+}
+
+.navmenu .label {
+ font-weight: inherit;
+}
+
+/*
+ * Styling of ops as a toolbar
+ */
+.toolbar div {
+ display: none;
+}
+
+.toolbar .label {
+ display: none;
+}
+
+.toolbar .operations {
+ display: block;
+}
+
+.toolbar .operations ul {
+ display: inline;
+ list-style: none;
+ margin-left: 10px;
+ padding-left: 0;
+}
+
+.toolbar .operations li {
+ list-style: none;
+ display: inline;
+}
+
+/* list page navigational tabs */
+#foldertab {
+padding: 3px 0px 3px 8px;
+margin-left: 0;
+border-bottom: 1px solid #3c78b5;
+font: bold 11px Verdana, sans-serif;
+}
+
+#foldertab li {
+list-style: none;
+margin: 0;
+display: inline;
+}
+
+#foldertab li a {
+padding: 3px 0.5em;
+margin-left: 3px;
+border: 1px solid #3c78b5;
+border-bottom: none;
+background: #3c78b5;
+text-decoration: none;
+}
+
+#foldertab li a:link { color: #ffffff; }
+#foldertab li a:visited { color: #ffffff; }
+
+#foldertab li a:hover {
+color: #ffffff;
+background: #003366;
+border-color: #003366;
+}
+
+#foldertab li a.current {
+background: white;
+border-bottom: 1px solid white;
+color: black;
+}
+
+#foldertab li a.current:link { color: black; }
+#foldertab li a.current:visited { color: black; }
+#foldertab li a.current:hover {
+background: white;
+border-bottom: 1px solid white;
+color: black;
+}
+
+/* alphabet list */
+ul#squaretab {
+margin-left: 0;
+padding-left: 0;
+white-space: nowrap;
+font: bold 8px Verdana, sans-serif;
+}
+
+#squaretab li {
+display: inline;
+list-style-type: none;
+}
+
+#squaretab a {
+padding: 2px 6px;
+border: 1px solid #3c78b5;
+}
+
+#squaretab a:link, #squaretab a:visited {
+color: #fff;
+background-color: #3c78b5;
+text-decoration: none;
+}
+
+#squaretab a:hover {
+color: #ffffff;
+background-color: #003366;
+border-color: #003366;
+text-decoration: none;
+}
+
+#squaretab li a#current {
+background: white;
+color: black;
+}
+
+.blogcalendar * {
+ font-family:verdana, arial, sans-serif;
+ font-size:x-small;
+ font-weight:normal;
+ line-height:140%;
+ padding:2px;
+}
+
+
+table.blogcalendar {
+ border: 1px solid #3c78b5;
+}
+
+.blogcalendar th.calendarhead, a.calendarhead {
+ font-size:x-small;
+ font-weight:bold;
+ padding:2px;
+ text-transform:uppercase;
+ background-color: #3c78b5;
+ color: #ffffff;
+ letter-spacing: .3em;
+ text-transform: uppercase;
+}
+
+.calendarhead:visited {color: white;}
+.calendarhead:active {color: white;}
+.calendarhead:hover {color: white;}
+
+.blogcalendar th {
+ font-size:x-small;
+ font-weight:bold;
+ padding:2px;
+ background-color:#f0f0f0;
+}
+
+.blogcalendar td {
+ font-size:x-small;
+ font-weight:normal;
+}
+
+.searchGroup { padding: 0 0 10px 0; background: #f0f0f0; }
+.searchGroupHeading { font-size: 10px; font-weight: bold; color: #ffffff; background-color: #3c78b5; padding: 2px 4px 1px 4px; }
+.searchItem { padding: 1px 4px 1px 4px; }
+.searchItemSelected { padding: 1px 4px 1px 4px; font-weight: bold; background: #ddd; }
+
+/* permissions page styles */
+.permissionHeading {
+ border-bottom: #bbb; border-width: 0 0 1px 0; border-style: solid; font-size: 16px; text-align: left;
+}
+.permissionTab {
+ border-width: 0 0 0 1px; border-style: solid; background: #3c78b5; color: #ffffff; font-size: 10px;
+}
+.permissionSuperTab {
+ border-width: 0 0 0 1px; border-style: solid; background: #003366; color: #ffffff;
+}
+.permissionCell {
+ border-left: #bbb; border-width: 0 0 0 1px; border-style: solid;
+}
+
+/* warning panel */
+.warningPanel { background: #FFFFCE; border:#F0C000 1px solid; padding: 8px; margin: 10px; }
+/* alert panel */
+.alertPanel { background: #FFCCCC; border:#C00 1px solid; padding: 8px; margin: 10px; }
+
+/* side menu highlighting (e.g. space content screen) */
+.optionPadded { padding: 2px; }
+.optionSelected { background-color: #ffffcc; padding: 2px; border: 1px solid #ddd; margin: -1px; }
+.optionSelected a { font-weight: bold; text-decoration: none; color: black; }
+
+/* information macros */
+.noteMacro { border-style: solid; border-width: 1px; border-color: #F0C000; background-color: #FFFFCE; text-align:left; margin-top: 5px; margin-bottom: 5px}
+.warningMacro { border-style: solid; border-width: 1px; border-color: #c00; background-color: #fcc; text-align:left; margin-top: 5px; margin-bottom: 5px}
+.infoMacro { border-style: solid; border-width: 1px; border-color: #3c78b5; background-color: #D8E4F1; text-align:left; margin-top: 5px; margin-bottom: 5px}
+.tipMacro { border-style: solid; border-width: 1px; border-color: #090; background-color: #dfd; text-align:left; margin-top: 5px; margin-bottom: 5px}
+.informationMacroPadding { padding: 5px 0 0 5px; }
+
+table.infoMacro td, table.warningMacro td, table.tipMacro td, table.noteMacro td, table.sectionMacro td {
+ border: none;
+}
+
+table.sectionMacroWithBorder td.columnMacro { border-style: dashed; border-width: 1px; border-color: #cccccc;}
+
+/* styles for links in the top bar */
+.topBarDiv a:link {color: #ffffff;}
+.topBarDiv a:visited {color: #ffffff;}
+.topBarDiv a:active {color: #ffffff;}
+.topBarDiv a:hover {color: #ffffff;}
+.topBarDiv {color: #ffffff;}
+
+.topBar {
+ background-color: #003366;
+}
+
+
+/* styles for extended operations */
+.greyLinks a:link {color: #666666; text-decoration:underline;}
+.greyLinks a:visited {color: #666666; text-decoration:underline;}
+.greyLinks a:active {color: #666666; text-decoration:underline;}
+.greyLinks a:hover {color: #666666; text-decoration:underline;}
+.greyLinks {color: #666666; display:block; padding: 10px}
+
+.logoSpaceLink {color: #999999; text-decoration: none}
+.logoSpaceLink a:link {color: #999999; text-decoration: none}
+.logoSpaceLink a:visited {color: #999999; text-decoration: none}
+.logoSpaceLink a:active {color: #999999; text-decoration: none}
+.logoSpaceLink a:hover {color: #003366; text-decoration: none}
+
+/* basic panel (basicpanel.vmd) style */
+.basicPanelContainer {border: 1px solid #3c78b5; margin-top: 2px; margin-bottom: 8px; width: 100%}
+.basicPanelTitle {padding: 5px; margin: 0px; background-color: #f0f0f0; color: black; font-weight: bold;}
+.basicPanelBody {padding: 5px; margin: 0px}
+
+.separatorLinks a:link {color: white}
+.separatorLinks a:visited {color: white}
+.separatorLinks a:active {color: white}
+
+.greynavbar {background-color: #f0f0f0; border-top: 1px solid #3c78b5; margin-top: 2px}
+
+div.headerField {
+ float: left;
+ width: auto;
+ height: 100%;
+}
+
+.headerFloat {
+ margin-left: auto;
+ width: 50%;
+}
+
+.headerFloatLeft {
+ float: left;
+ margin-right: 20px;
+ margin-bottom: 10px;
+}
+
+#headerRow {
+ padding: 10px;
+}
+
+div.license-personal {
+ background-color: #003366;
+ color: #ffffff;
+}
+
+div.license-personal a {
+ color: #ffffff;
+}
+
+.greyFormBox {
+ border: 1px solid #cccccc;
+ padding: 5px;
+}
+
+/* IE automatically adds a margin before and after form tags. Use this style to remove that */
+.marginlessForm {
+ margin: 0px;
+}
+
+.openPageHighlight {
+ background-color: #ffffcc;
+ padding: 2px;
+ border: 1px solid #ddd;
+}
+
+.editPageInsertLinks, .editPageInsertLinks a
+{
+ color: #666666;
+ font-weight: bold;
+ font-size: 10px;
+}
+
+/* Style for label heatmap. */
+.top10 a {
+ font-weight: bold;
+ font-size: 2em;
+ color: #003366;
+}
+.top25 a {
+ font-weight: bold;
+ font-size: 1.6em;
+ color: #003366;
+}
+.top50 a {
+ font-size: 1.4em;
+ color: #003366;
+}
+.top100 a {
+ font-size: 1.2em;
+ color: #003366;
+}
+
+.heatmap {
+ list-style:none;
+ width: 95%;
+ margin: 0px auto;
+}
+
+.heatmap a {
+ text-decoration:none;
+}
+
+.heatmap a:hover {
+ text-decoration:underline;
+}
+
+.heatmap li {
+ display: inline;
+}
+
+.minitab {
+padding: 3px 0px 3px 8px;
+margin-left: 0;
+margin-top: 1px;
+margin-bottom: 0px;
+border-bottom: 1px solid #3c78b5;
+font: bold 9px Verdana, sans-serif;
+text-decoration: none;
+float:none;
+}
+.selectedminitab {
+padding: 3px 0.5em;
+margin-left: 3px;
+margin-top: 1px;
+border: 1px solid #3c78b5;
+background: white;
+border-bottom: 1px solid white;
+color: #000000;
+text-decoration: none;
+}
+.unselectedminitab {
+padding: 3px 0.5em;
+margin-left: 3px;
+margin-top: 1px;
+border: 1px solid #3c78b5;
+border-bottom: none;
+background: #3c78b5;
+color: #ffffff;
+text-decoration: none;
+}
+
+a.unselectedminitab:hover {
+color: #ffffff;
+background: #003366;
+border-color: #003366;
+}
+
+a.unselectedminitab:link { color: white; }
+a.unselectedminitab:visited { color: white; }
+
+a.selectedminitab:link { color: black; }
+a.selectedminitab:visited { color: black; }
+
+.linkerror { background-color: #fcc;}
+
+a.labelOperationLink:link {text-decoration: underline}
+a.labelOperationLink:active {text-decoration: underline}
+a.labelOperationLink:visited {text-decoration: underline}
+a.labelOperationLink:hover {text-decoration: underline}
+
+a.newLabel:link {background-color: #ddffdd}
+a.newLabel:active {background-color: #ddffdd}
+a.newLabel:visited {background-color: #ddffdd}
+a.newLabel:hover {background-color: #ddffdd}
+
+ul.square {list-style-type: square}
+
+.inline-control-link {
+ background: #ffc;
+ font-size: 9px;
+ color: #666;
+ padding: 2px;
+ text-transform: uppercase;
+ text-decoration: none;
+}
+
+
+.inline-control-link a:link {text-decoration: none}
+.inline-control-link a:active {text-decoration: none}
+.inline-control-link a:visited {text-decoration: none}
+.inline-control-link a:hover {text-decoration: none}
+
+.inline-control-link {
+ background: #ffc;
+ font-size: 9px;
+ color: #666;
+ padding: 2px;
+ text-transform: uppercase;
+ text-decoration: none;
+ cursor: pointer;
+}
+
+div.auto_complete {
width: 350px;
+ background: #fff;
+}
+div.auto_complete ul {
+ border: 1px solid #888;
+ margin: 0;
+ padding: 0;
+ width: 100%;
+ list-style-type: none;
+}
+div.auto_complete ul li {
+ margin: 0;
+ padding: 3px;
+}
+div.auto_complete ul li.selected {
+ background-color: #ffb;
+}
+div.auto_complete ul strong.highlight {
+ color: #800;
+ margin: 0;
+ padding: 0;
+}
+
+/******* Edit Page Styles *******/
+.toogleFormDiv{
+ border:1px solid #A7A6AA;
+ background-color:white;
+ padding:5px;
+ margin-top: 5px;
+}
+
+.toogleInfoDiv{
+ border:1px solid #A7A6AA;
+ background-color:white;
+ display:none;
+ padding:5px;
+ margin-top: 10px;
+}
+
+.inputSection{
+ margin-bottom:20px;
+}
+
+#editBox{
+ border:1px solid lightgray;
+ background-color:#F0F0F0;
}
-#overview div.message h1{ margin-bottom: 5px; display:none; }
-#overview div.message p{ margin-top: 0px; padding-bottom:14px; }
-#content { width: 100%; float: left; }
-#content .wrapper { min-width: 700px; width: 700px; margin: 0 auto; padding-top: 1em}
-#content div.left {
- float:left;
- width:200px;
- text-align:right;
- font-size: 18pt;
- clear:both;
-}
-#content h1 {
- font-size: 18pt;
-}
-#content div.right {
- float:right;
- width:450px;
- text-align:left;
-}
-
-#blog { width: 100%; float: left; }
-#blog .wrapper { min-width: 600px; width: 600px; margin: 0 auto; }
-#blog h1 {
- font-family: HelveticaNeue,"Helvetica Neue",Helvetica,Arial,Verdana,sans-serif;
- font-size: 18pt; color: #993333;
-}
-#blog h2 {
- border-bottom: thin dashed #DDD;
- font-size: 16pt;
- margin-bottom: 5px;
-}
-#blog div.post p {
- padding-left: 10px;
-}
-#blog div.post .details {
- padding-top: 5px;
- color: #ccc;
- font-size: 10pt;
- font-family: HelveticaNeue,"Helvetica Neue",Helvetica,Arial,Verdana,sans-serif;
-}
-
-#content .post h2 {
- margin-bottom:5px;
-}
-#content .post .details {
- color: #ccc;
- font-size: 10pt;
- font-family: HelveticaNeue,"Helvetica Neue",Helvetica,Arial,Verdana,sans-serif;
- margin-top:0px;
+/******* Left Navigation Theme Styles ********/
+.leftnav li a {
+ text-decoration:none;
+ color:white;
+ margin:0px;
+ display:block;
+ padding:2px;
+ padding-left:5px;
+ background-color: #3c78b5;
+ border-top:1px solid #3c78b5;
}
+.leftnav li a:active {color:white;}
+.leftnav li a:visited {color:white;}
+.leftnav li a:hover {background-color: #003366; color:white;}
Added: karaf/trunk/manual/src/main/webapp/images/asf-logo.png
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/images/asf-logo.png?rev=1024141&view=auto
==============================================================================
Files karaf/trunk/manual/src/main/webapp/images/asf-logo.png (added) and karaf/trunk/manual/src/main/webapp/images/asf-logo.png Tue Oct 19 07:10:32 2010 differ
Added: karaf/trunk/manual/src/main/webapp/images/bg.png
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/images/bg.png?rev=1024141&view=auto
==============================================================================
Files karaf/trunk/manual/src/main/webapp/images/bg.png (added) and karaf/trunk/manual/src/main/webapp/images/bg.png Tue Oct 19 07:10:32 2010 differ
Added: karaf/trunk/manual/src/main/webapp/images/bg02-blue-left.png
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/images/bg02-blue-left.png?rev=1024141&view=auto
==============================================================================
Files karaf/trunk/manual/src/main/webapp/images/bg02-blue-left.png (added) and karaf/trunk/manual/src/main/webapp/images/bg02-blue-left.png Tue Oct 19 07:10:32 2010 differ
Added: karaf/trunk/manual/src/main/webapp/images/bg02-blue-right.png
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/images/bg02-blue-right.png?rev=1024141&view=auto
==============================================================================
Files karaf/trunk/manual/src/main/webapp/images/bg02-blue-right.png (added) and karaf/trunk/manual/src/main/webapp/images/bg02-blue-right.png Tue Oct 19 07:10:32 2010 differ
Added: karaf/trunk/manual/src/main/webapp/images/bg02-white-left-nogr.png
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/images/bg02-white-left-nogr.png?rev=1024141&view=auto
==============================================================================
Files karaf/trunk/manual/src/main/webapp/images/bg02-white-left-nogr.png (added) and karaf/trunk/manual/src/main/webapp/images/bg02-white-left-nogr.png Tue Oct 19 07:10:32 2010 differ
Added: karaf/trunk/manual/src/main/webapp/images/bg02-white-right-nogr.png
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/images/bg02-white-right-nogr.png?rev=1024141&view=auto
==============================================================================
Files karaf/trunk/manual/src/main/webapp/images/bg02-white-right-nogr.png (added) and karaf/trunk/manual/src/main/webapp/images/bg02-white-right-nogr.png Tue Oct 19 07:10:32 2010 differ
Added: karaf/trunk/manual/src/main/webapp/images/big-bullet.png
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/images/big-bullet.png?rev=1024141&view=auto
==============================================================================
Files karaf/trunk/manual/src/main/webapp/images/big-bullet.png (added) and karaf/trunk/manual/src/main/webapp/images/big-bullet.png Tue Oct 19 07:10:32 2010 differ
Added: karaf/trunk/manual/src/main/webapp/images/karaf2.png
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/images/karaf2.png?rev=1024141&view=auto
==============================================================================
Files karaf/trunk/manual/src/main/webapp/images/karaf2.png (added) and karaf/trunk/manual/src/main/webapp/images/karaf2.png Tue Oct 19 07:10:32 2010 differ
Added: karaf/trunk/manual/src/main/webapp/images/left-box-bottom.png
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/images/left-box-bottom.png?rev=1024141&view=auto
==============================================================================
Files karaf/trunk/manual/src/main/webapp/images/left-box-bottom.png (added) and karaf/trunk/manual/src/main/webapp/images/left-box-bottom.png Tue Oct 19 07:10:32 2010 differ
Added: karaf/trunk/manual/src/main/webapp/images/left-box-right.png
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/images/left-box-right.png?rev=1024141&view=auto
==============================================================================
Files karaf/trunk/manual/src/main/webapp/images/left-box-right.png (added) and karaf/trunk/manual/src/main/webapp/images/left-box-right.png Tue Oct 19 07:10:32 2010 differ
Added: karaf/trunk/manual/src/main/webapp/images/left-box-top.png
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/images/left-box-top.png?rev=1024141&view=auto
==============================================================================
Files karaf/trunk/manual/src/main/webapp/images/left-box-top.png (added) and karaf/trunk/manual/src/main/webapp/images/left-box-top.png Tue Oct 19 07:10:32 2010 differ
Copied: karaf/trunk/manual/src/main/webapp/manual.conf (from r1023786, karaf/trunk/manual/src/main/webapp/karaf-manual.conf)
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/manual.conf?p2=karaf/trunk/manual/src/main/webapp/manual.conf&p1=karaf/trunk/manual/src/main/webapp/karaf-manual.conf&r1=1023786&r2=1024141&rev=1024141&view=diff
==============================================================================
(empty)
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1024141&r1=1024140&r2=1024141&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Tue Oct 19 07:10:32 2010
@@ -119,7 +119,7 @@
<felix.compendium.version>1.2.0</felix.compendium.version>
<felix.configadmin.version>1.2.4</felix.configadmin.version>
<felix.fileinstall.version>3.0.2</felix.fileinstall.version>
- <felix.framework.version>3.0.3</felix.framework.version>
+ <felix.framework.version>3.0.4</felix.framework.version>
<felix.gogo.version>0.6.1</felix.gogo.version>
<felix.osgi.version>1.4.0</felix.osgi.version>
<felix.plugin.version>2.1.0</felix.plugin.version>