Author: gertv
Date: Mon Oct 18 07:44:37 2010
New Revision: 1023674
URL: http://svn.apache.org/viewvc?rev=1023674&view=rev
Log:
Upgrade to Scalate 1.3.0 and add OSGi metadata
Modified:
servicemix/documentation/trunk/README.md
servicemix/documentation/trunk/pom.xml
servicemix/documentation/trunk/src/main/webapp/getting-started/what-is-smx4.conf
servicemix/documentation/trunk/src/main/webapp/theme/print.css
Modified: servicemix/documentation/trunk/README.md
URL:
http://svn.apache.org/viewvc/servicemix/documentation/trunk/README.md?rev=1023674&r1=1023673&r2=1023674&view=diff
==============================================================================
--- servicemix/documentation/trunk/README.md (original)
+++ servicemix/documentation/trunk/README.md Mon Oct 18 07:44:37 2010
@@ -1,8 +1,8 @@
## Prerequisites ##
You need to have these two programs installed on your machine:
-- [Pygments] - syntax highlighting for HTML and PDF (http://pygments.org/)
-- [Prince XML] - converts HTML into PDF for the manual
(http://www.princexml.com/)
+- [Pygments](http://pygments.org/) - syntax highlighting for HTML and PDF
+- [Prince XML](http://www.princexml.com/) - converts HTML into PDF for the
manual
## Building SNAPSHOT dependencies ##
This project depends on a few SNAPSHOT dependencies. Before you start working
on the docs, you need to checkout and build these two projects locally:
Modified: servicemix/documentation/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/documentation/trunk/pom.xml?rev=1023674&r1=1023673&r2=1023674&view=diff
==============================================================================
--- servicemix/documentation/trunk/pom.xml (original)
+++ servicemix/documentation/trunk/pom.xml Mon Oct 18 07:44:37 2010
@@ -39,7 +39,7 @@
<netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
<jetty-port>8080</jetty-port>
<jetty-war-dir>${basedir}/target/webapp/</jetty-war-dir>
- <scalate.version>1.3-SNAPSHOT</scalate.version>
+ <scalate.version>1.3</scalate.version>
<scalate.editor>${env.SCALATE_EDITOR}</scalate.editor>
<scalate.mode>production</scalate.mode>
<scalate.workdir>${basedir}/target/scalateWorkDir</scalate.workdir>
@@ -75,7 +75,7 @@
<plugin>
<groupId>org.scala-tools</groupId>
<artifactId>maven-scala-plugin</artifactId>
- <version>2.14.2-SNAPSHOT</version>
+ <version>2.14.1</version>
<executions>
<execution>
<goals>
@@ -109,7 +109,7 @@
<plugin>
<groupId>org.fusesource.scalate</groupId>
<artifactId>maven-scalate-plugin</artifactId>
- <version>1.3-SNAPSHOT</version>
+ <version>${scalate.version}</version>
<executions>
<execution>
<goals>
@@ -125,6 +125,9 @@
<artifactId>maven-war-plugin</artifactId>
<configuration>
<warSourceDirectory>${project.build.directory}/webapp</warSourceDirectory>
+ <archive>
+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
</configuration>
</plugin>
<plugin>
@@ -158,7 +161,34 @@
</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</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>documentation</Webapp-Context>
+ </instructions>
+ </configuration>
+ </plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.2</version>
Modified:
servicemix/documentation/trunk/src/main/webapp/getting-started/what-is-smx4.conf
URL:
http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/getting-started/what-is-smx4.conf?rev=1023674&r1=1023673&r2=1023674&view=diff
==============================================================================
---
servicemix/documentation/trunk/src/main/webapp/getting-started/what-is-smx4.conf
(original)
+++
servicemix/documentation/trunk/src/main/webapp/getting-started/what-is-smx4.conf
Mon Oct 18 07:44:37 2010
@@ -1,38 +1,21 @@
h2. What is ServiceMix 4?
-Apache ServiceMix is an open source ESB (Enterprise Service Bus) that
-combines the functionality of a Service Oriented Architecture (SOA) and the
-modularity. The adoption of a Service Bus allows to decouple the applicatons
-together and reduce dependencies. Messages are used to wired the
-applications (=services) and/or connectors to exchange information using
-different protocols or communications mode like FTP, HTTP, WebServices, ...
-
-This new version of Apache ServiceMix is more than an evolution of the
-previous as the kernel of the platform has been completety rewritten and is
designed
-top of the OSGI specification. Using OSGI framework brings a new important
feature
-for SOA development : modularity. That means that we can handle classloading
and application
-lifecycle differently between the components.
-
-ServiceMix is lightweight and easily embeddable, has integrated Spring
-support and can be run at the edge of the network (inside a client or
-server), as a standalone ESB provider or as a service within another ESB.
-You can use ServiceMix in Java SE or Java EE application server.
+Apache ServiceMix is an open source ESB (Enterprise Service Bus) that combines
the functionality of a Service Oriented Architecture (SOA) and the modularity.
The adoption of a Service Bus allows to decouple the applicatons together and
reduce dependencies. Messages are used to wired the applications (=services)
and/or connectors to exchange information using different protocols or
communications mode like FTP, HTTP, WebServices, ...
+
+This new version of Apache ServiceMix is more than an evolution of the
previous as the kernel of the platform has been completety rewritten and is
designed top of the OSGI specification. Using OSGI framework brings a new
important feature for SOA development : modularity. That means that we can
handle classloading and application lifecycle differently between the
components.
+
+ServiceMix is lightweight and easily embeddable, has integrated Spring support
and can be run at the edge of the network (inside a client or server), as a
standalone ESB provider or as a service within another ESB. You can use
ServiceMix in Java SE or Java EE application server.
h3. Platform presentation
-Apache ServiceMix is an distributed ESB built from the ground up on the Java
Business Integration (JBI) specification JSR 208 and released
-under the Apache license. The goal of JBI is to allow components and services
to be integrated in a vendor independent way, allowing users
-and vendors to plug and play.
+Apache ServiceMix is an distributed ESB built from the ground up on the Java
Business Integration (JBI) specification JSR 208 and released under the Apache
license. The goal of JBI is to allow components and services to be integrated
in a vendor independent way, allowing users and vendors to plug and play.
ServiceMix uses ActiveMQ to provide remoting, clustering, reliability and
distributed failover.
-ServiceMix is completely integrated into Apache Geronimo, which allows
-you to deploy JBI components and services directly into Geronimo. ServiceMix
-is being JBI certified as part of the Geronimo project.
+ServiceMix is completely integrated into Apache Geronimo, which allows you to
deploy JBI components and services directly into Geronimo. ServiceMix is being
JBI certified as part of the Geronimo project.
ServiceMix can be embedded into a JEE application server such as JBoss, Oracle
Weblogic or IBM Websphere.
-ServiceMix includes a complete JBI container supporting all parts of
-the JBI specification including:
+ServiceMix includes a complete JBI container supporting all parts of the JBI
specification including:
* NMR (Normalized Message Router)</para>
* JBI Management MBeans
* full support for the JBI deployment units with hot-deployment of JBI
components
Modified: servicemix/documentation/trunk/src/main/webapp/theme/print.css
URL:
http://svn.apache.org/viewvc/servicemix/documentation/trunk/src/main/webapp/theme/print.css?rev=1023674&r1=1023673&r2=1023674&view=diff
==============================================================================
--- servicemix/documentation/trunk/src/main/webapp/theme/print.css (original)
+++ servicemix/documentation/trunk/src/main/webapp/theme/print.css Mon Oct 18
07:44:37 2010
@@ -1,7 +1,13 @@
@page {
- @top { content: "Apache ServiceMix ${servicemix.version}" }
- @bottom { content: counter(page) }
- margin: 50pt 50pt 50pt 50pt;
+ @top {
+ content: "Apache ServiceMix ${servicemix.version}";
+ font-family:'Lucida Grande', Geneva, Verdana, Arial, sans-serif;
+ }
+ @bottom {
+ content: counter(page);
+ font-family:'Lucida Grande', Geneva, Verdana, Arial, sans-serif;
+ }
+ margin: 70pt 50pt 70pt 50pt;
size: a4;
}
@@ -35,8 +41,8 @@ div#titlepage div#subtitle {
div.highlight pre {
font-family: 'Courier', Courier, monospace;
- font-size: 1em;
- background-color: #eee;
+ font-size: .9em;
+ background-color: #ededed;
margin-left: 1em;
margin-right: 1em;
padding: .5em;
@@ -62,3 +68,21 @@ h2 {
h2::before {
content: counter(h1) "." counter(h2) ". ";
}
+
+table {
+ border-spacing: 0px 0px;
+ border: solid thin #777777;
+}
+
+table tr td {
+ border: solid thin #ededed;
+ padding: 2px;
+ font-size: .9em;
+}
+
+table tr th {
+ border: solid thin #ededed;
+ background-color: #ededed;
+ padding: 2px;
+ font-size: .9em;
+}
\ No newline at end of file
