Author: ericjohnson
Date: Mon Oct 25 22:08:56 2010
New Revision: 1027284
URL: http://svn.apache.org/viewvc?rev=1027284&view=rev
Log:
added some content and cleaned up the POM
Added:
servicemix/sandbox/website20/src/main/webapp/WEB-INF/scalate/errors/
servicemix/sandbox/website20/src/main/webapp/WEB-INF/scalate/errors/500.page
servicemix/sandbox/website20/src/main/webapp/index.page
Removed:
servicemix/sandbox/website20/src/main/webapp/another.conf
servicemix/sandbox/website20/src/main/webapp/code.conf
servicemix/sandbox/website20/src/main/webapp/favicon.ico
servicemix/sandbox/website20/src/main/webapp/index.conf
servicemix/sandbox/website20/src/main/webapp/pygmentize.conf
Modified:
servicemix/sandbox/website20/pom.xml
servicemix/sandbox/website20/src/main/webapp/WEB-INF/scalate/layouts/default.ssp
servicemix/sandbox/website20/src/main/webapp/WEB-INF/web.xml
servicemix/sandbox/website20/src/main/webapp/theme/master.css
Modified: servicemix/sandbox/website20/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/website20/pom.xml?rev=1027284&r1=1027283&r2=1027284&view=diff
==============================================================================
--- servicemix/sandbox/website20/pom.xml (original)
+++ servicemix/sandbox/website20/pom.xml Mon Oct 25 22:08:56 2010
@@ -19,85 +19,63 @@
-->
-<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.fusesource.scalate</groupId>
- <artifactId>scalate-project</artifactId>
- <version>1.3</version>
- </parent>
+<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";>
<modelVersion>4.0.0</modelVersion>
-
- <artifactId>scalate-sample-sitegen</artifactId>
- <name>Scalate :: Sample Site Generation</name>
- <description>Scalate Sample Site Generation Web Application</description>
- <packaging>war</packaging>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>static-website</artifactId>
+ <name>Apache ServiceMix :: Site Generation</name>
+ <description>Apache ServiceMix Site Generation Web Application</description>
+ <packaging>war</packaging>
+ <version>1.0</version>
+
<properties>
<netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
+ <scalate.version>1.4-SNAPSHOT</scalate.version>
</properties>
-
+
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <version>2.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.fusesource.scalate</groupId>
<artifactId>scalate-wikitext</artifactId>
- <version>${project.version}</version>
+ <version>${scalate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fusesource.scalate</groupId>
+ <artifactId>scalate-page</artifactId>
+ <version>${scalate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.fusesource.scalamd</groupId>
+ <artifactId>scalamd</artifactId>
+ <version>1.2</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
+ <version>0.9.24</version>
</dependency>
-
-
- <!-- testing -->
<dependency>
- <groupId>org.fusesource.scalate</groupId>
- <artifactId>scalate-test</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.0</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <inherited>true</inherited>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire-version}</version>
- <configuration>
- <forkMode>once</forkMode>
- <!-- these settings are mandatory to avoid SureFire giving a bogus
system property to the web container -->
- <useSystemClassLoader>false</useSystemClassLoader>
- <useManifestOnlyJar>false</useManifestOnlyJar>
- <includes>
- <include>**/*Test.*</include>
- </includes>
- <excludes>
- <exclude>**/SomeFailingTest.*</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- <plugin>
<groupId>org.fusesource.scalate</groupId>
<artifactId>maven-scalate-plugin</artifactId>
- <version>${project.version}</version>
+ <version>${scalate.version}</version>
<executions>
<execution>
<goals>
@@ -107,7 +85,6 @@
</executions>
</plugin>
-
<plugin>
<artifactId>maven-war-plugin</artifactId>
</plugin>
@@ -115,8 +92,56 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
+ <version>7.1.5.v20100705</version>
</plugin>
</plugins>
</build>
-</project>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.fusesource.scalate</groupId>
+ <artifactId>maven-linkchecker-plugin</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <excludedLinks>
+ <value>http://github.com/</value>
+ <value>http://git.or.cz/</value>
+ <value>http://localhost:8080/</value>
+ <value>http://repo.fusesource.com/</value>
+ <value>http://search.twitter.com/</value>
+ <value>http://www.chengin.com/</value>
+ </excludedLinks>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <!-- Scalate snapshots -->
+ <repositories>
+ <repository>
+ <id>fusesource.snapshots</id>
+
<url>http://repo.fusesource.com/nexus/content/groups/public-snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <!-- Scalate snapshots -->
+ <pluginRepositories>
+ <pluginRepository>
+ <id>fusesource.snapshots</id>
+
<url>http://repo.fusesource.com/nexus/content/groups/public-snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+</project>
\ No newline at end of file
Added:
servicemix/sandbox/website20/src/main/webapp/WEB-INF/scalate/errors/500.page
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/website20/src/main/webapp/WEB-INF/scalate/errors/500.page?rev=1027284&view=auto
==============================================================================
---
servicemix/sandbox/website20/src/main/webapp/WEB-INF/scalate/errors/500.page
(added)
+++
servicemix/sandbox/website20/src/main/webapp/WEB-INF/scalate/errors/500.page
Mon Oct 25 22:08:56 2010
@@ -0,0 +1,22 @@
+-#
+-# Copyright (C) 2009-2010 the original author or authors.
+-# See the notice.md file distributed with this work for additional
+-# information regarding copyright ownership.
+-#
+-# Licensed 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.
+-#
+
+-@ val it : FooResource
+%h1 FooResource sub page
+%p
+ FooResource is #{it}
\ No newline at end of file
Modified:
servicemix/sandbox/website20/src/main/webapp/WEB-INF/scalate/layouts/default.ssp
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/website20/src/main/webapp/WEB-INF/scalate/layouts/default.ssp?rev=1027284&r1=1027283&r2=1027284&view=diff
==============================================================================
---
servicemix/sandbox/website20/src/main/webapp/WEB-INF/scalate/layouts/default.ssp
(original)
+++
servicemix/sandbox/website20/src/main/webapp/WEB-INF/scalate/layouts/default.ssp
Mon Oct 25 22:08:56 2010
@@ -16,7 +16,7 @@ See the License for the specific languag
limitations under the License.
--%>
<%@ var body: String %>
-<%@ var title: String = "Apache ServiceMix ${servicemix.version}" %>
+<%@ var title: String = "Apache ServiceMix" %>
<%@ var navigation: Boolean = true %>
<% escapeMarkup = false %>
<% import org.fusesource.scalate.servlet.ServletRenderContext._ %>
@@ -30,14 +30,14 @@ limitations under the License.
</head>
<body>
- <div id="siteHeader">
- <table width="100%">
- <tr>
- <td>
- <a href="http://servicemix.apache.org/"; title="An open source ESB">
- <img border="0" src="/images/new-logo.png" />
- </a>
- </td>
+ <div id="siteHeader">
+ <table width="100%">
+ <tr>
+ <td>
+ <a href="http://servicemix.apache.org/"; title="An open source ESB">
+ <img border="0" src="/images/new-logo.png" />
+ </a>
+ </td>
<td align="right">
<a href="http://www.apache.org/"; title="The Apache Sofware
Foundation">
<img border="0"
src="http://activemq.apache.org/images/asf-logo.png";>
@@ -75,11 +75,11 @@ limitations under the License.
</tr>
</table>
</div>
- <div id="content">
- <%= body %>
- </div>
- <div id="siteFooter">
- <p>Thanks for using Apache ServiceMix!</p>
+ <div id="content">
+ <%= body %>
+ </div>
+ <div id="siteFooter">
+ <p>Thanks for using Apache ServiceMix!</p>
</div>
</body>
</html>
\ No newline at end of file
Modified: servicemix/sandbox/website20/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/website20/src/main/webapp/WEB-INF/web.xml?rev=1027284&r1=1027283&r2=1027284&view=diff
==============================================================================
--- servicemix/sandbox/website20/src/main/webapp/WEB-INF/web.xml (original)
+++ servicemix/sandbox/website20/src/main/webapp/WEB-INF/web.xml Mon Oct 25
22:08:56 2010
@@ -24,9 +24,9 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";
version="2.5">
- <display-name>Apache ServiceMix</display-name>
+ <display-name>The Apache ServiceMix Project</display-name>
- <description>Apache ServiceMix static web site.</description>
+ <description>The Apache ServiceMix Web site</description>
<filter>
<filter-name>TemplateEngineFilter</filter-name>
@@ -38,11 +38,11 @@
</filter-mapping>
<welcome-file-list>
- <welcome-file>index.conf</welcome-file>
+ <welcome-file>index.page</welcome-file>
</welcome-file-list>
<error-page>
<error-code>500</error-code>
- <location>/WEB-INF/scalate/errors/500.scaml</location>
+ <location>/WEB-INF/scalate/errors/500.page</location>
</error-page>
</web-app>
Added: servicemix/sandbox/website20/src/main/webapp/index.page
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/website20/src/main/webapp/index.page?rev=1027284&view=auto
==============================================================================
--- servicemix/sandbox/website20/src/main/webapp/index.page (added)
+++ servicemix/sandbox/website20/src/main/webapp/index.page Mon Oct 25 22:08:56
2010
@@ -0,0 +1,24 @@
+---
+title: The Apache ServiceMix Project
+--- name:overview pipeline:scaml
+
+%h1 The Apache ServiceMix Project
+
+--- name:content pipeline:markdown
+
+# The Apache ServiceMix Project
+
+Apache ServiceMix is a powerful open source Enterprise Service Bus (ESB). It
combines the functionality of a Service Oriented Architecture (SOA) and an
Event Driven Architecture (EDA) to create an agile, enterprise and powerful ESB.
+
+Built from the ground up on the Java Business Integration (JBI) specification,
OSGi and released under the Apache License, Apache ServiceMix is an Java based,
open source enterprise service bus (ESB) that provides a platform for service
oriented integration.
+
+ServiceMix includes a complete JBI container supporting all parts of the JBI
specification including:
+
+* Normalized Message Service and Router
+* JBI Management MBeans
+* Ant Tasks for management and installation of components
+* Full support for the JBI deployment units with hot-deployment of JBI
components
+* Large set of JBI Components and OSGi bundles
+* Tools to easily use, deploy and develop on ServiceMix
+
+ServiceMix also provides a simple to use Client API for sending messages to
JBI components and services
\ No newline at end of file
Modified: servicemix/sandbox/website20/src/main/webapp/theme/master.css
URL:
http://svn.apache.org/viewvc/servicemix/sandbox/website20/src/main/webapp/theme/master.css?rev=1027284&r1=1027283&r2=1027284&view=diff
==============================================================================
--- servicemix/sandbox/website20/src/main/webapp/theme/master.css (original)
+++ servicemix/sandbox/website20/src/main/webapp/theme/master.css Mon Oct 25
22:08:56 2010
@@ -119,6 +119,7 @@ div#siteFooter {
div#content {
clear: both;
+ margin: 30px;
}
div#body {
![http://activemq.apache.org/images/asf-logo.png"](http://activemq.apache.org/images/asf-logo.png"){kind=link}