You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by bd...@apache.org on 2011/04/25 03:38:10 UTC

svn commit: r1096394 [3/5] - in /forrest/trunk: ./ whiteboard/forrest-osgi/ whiteboard/forrest-osgi/bin/ whiteboard/forrest-osgi/conf/ whiteboard/forrest-osgi/docs/ whiteboard/forrest-osgi/docs/src/ whiteboard/forrest-osgi/docs/src/documentation/ white...

Added: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.input.xdoc/src/java/org/apache/forrest/plugin/input/xdoc/service/XDocInput.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.input.xdoc/src/java/org/apache/forrest/plugin/input/xdoc/service/XDocInput.java?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.input.xdoc/src/java/org/apache/forrest/plugin/input/xdoc/service/XDocInput.java (added)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.input.xdoc/src/java/org/apache/forrest/plugin/input/xdoc/service/XDocInput.java Mon Apr 25 01:38:03 2011
@@ -0,0 +1,175 @@
+/*
+ * 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.
+ */
+package org.apache.forrest.plugin.input.xdoc.service;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.TransformerFactoryConfigurationError;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.log.LogService;
+
+import org.apache.forrest.log.LogPlugin;
+import org.apache.forrest.plugin.api.BaseInputPlugin;
+import org.apache.forrest.plugin.api.ForrestResult;
+import org.apache.forrest.plugin.api.ForrestSource;
+import org.apache.forrest.plugin.api.ForrestStreamSource;
+
+public class XDocInput extends BaseInputPlugin {
+
+  // private BundleContext mContext;
+
+  public XDocInput(final BundleContext context) {
+    super(context);
+  }
+
+  @Override
+  public ForrestSource getSource(URI uri) {
+    if (null == uri) {
+      throw new IllegalArgumentException("I told you, null won't work");
+    }
+
+    LogPlugin.getDefault().getLogService().log
+      (LogService.LOG_DEBUG,
+       "Hello, this is the xdoc input plugin handling getSource(" + uri + ")");
+
+    try {
+      ServiceReference[] refs = getBundleContext().getServiceReferences(TransformerFactory.class.getName(), null);
+      TransformerFactory factory = null;
+
+      if (null != refs) {
+        // get first available service
+        for (int i = 0; i < refs.length; i++) {
+          Object obj = getBundleContext().getService(refs[i]);
+
+          if (null != obj && obj instanceof TransformerFactory) {
+            LogPlugin.getDefault().getLogService().log
+              (LogService.LOG_DEBUG,
+               "Found the right class: " + obj.getClass().getName());
+            factory = (TransformerFactory) obj;
+            break;
+          } else {
+            if (null != obj) {
+              LogPlugin.getDefault().getLogService().log
+                (LogService.LOG_DEBUG,
+                 "Found the wrong class: " + obj.getClass().getName());
+            } else {
+              LogPlugin.getDefault().getLogService().log
+                (LogService.LOG_DEBUG,
+                 "Null service");
+            }
+          }
+        }
+      }
+
+      if (null != factory) {
+        LogPlugin.getDefault().getLogService().log
+          (LogService.LOG_DEBUG,
+           "factory " + factory.getClass().getName());
+
+        InputStream in = XDocInput.class.getClassLoader().getResourceAsStream
+          ("resources/stylesheets/documentv20-to-internal.xsl");
+
+        if (null != in) {
+          LogPlugin.getDefault().getLogService().log
+            (LogService.LOG_DEBUG,
+             "Found the input stylesheet");
+
+          Transformer transformer = factory.newTransformer
+            (new StreamSource(in));
+
+          if (null != transformer) {
+            LogPlugin.getDefault().getLogService().log
+              (LogService.LOG_DEBUG,
+               "transformer " + transformer.getClass().getName());
+          }
+
+          ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+          StreamResult internalStream = new StreamResult(bytes);
+
+          InputStream source = uri.toURL().openStream();
+
+          transformer.transform(new StreamSource(source),
+                                internalStream);
+
+
+          // build ForrestSource container and return it
+          ForrestSource forrestSource = new ForrestStreamSource(in);
+          forrestSource.setInternalRepresentation(bytes.toString());
+
+          try {
+            in.close();
+            source.close();
+          } catch (IOException ioe) {
+            ; // failed to close stream
+          }
+
+          return forrestSource;
+        } else {
+          LogPlugin.getDefault().getLogService().log
+            (LogService.LOG_DEBUG,
+             "Didn't find the stylesheet");
+        }
+      }
+    } catch (InvalidSyntaxException ise) {
+      LogPlugin.getDefault().getLogService().log
+        (LogService.LOG_DEBUG,
+         "Check your filter string",
+         ise);
+    } catch (TransformerFactoryConfigurationError tfce) {
+      LogPlugin.getDefault().getLogService().log
+        (LogService.LOG_DEBUG,
+         "There is a problem at the factory",
+         tfce);
+    } catch (TransformerConfigurationException tce) {
+      LogPlugin.getDefault().getLogService().log
+        (LogService.LOG_DEBUG,
+         "The transformer could not be configured",
+         tce);
+    } catch (TransformerException te) {
+      LogPlugin.getDefault().getLogService().log
+        (LogService.LOG_DEBUG,
+         "The transformation broke",
+         te);
+    } catch (MalformedURLException mue) {
+      LogPlugin.getDefault().getLogService().log
+        (LogService.LOG_DEBUG,
+         "The given URL is invalid",
+         mue);
+    } catch (IOException ioe) {
+      LogPlugin.getDefault().getLogService().log
+        (LogService.LOG_DEBUG,
+         "There is a problem reading the resource",
+         ioe);
+    }
+
+    return null;
+  }
+
+}

Added: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.input.xdoc/xdocInput.bnd
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.input.xdoc/xdocInput.bnd?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.input.xdoc/xdocInput.bnd (added)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.input.xdoc/xdocInput.bnd Mon Apr 25 01:38:03 2011
@@ -0,0 +1,8 @@
+Bundle-Name: ${bundle.name}
+Bundle-SymbolicName: ${bundle.symbolic.name}
+Bundle-Version: ${bundle.version}
+Bundle-Activator: ${bundle.activator}
+Bundle-Vendor: ${bundle.vendor}
+Export-Package: org.apache.forrest.plugin.input.xdoc
+Import-Package: javax.xml.transform, javax.xml.transform.stream, org.apache.forrest.plugin.input.xdoc, org.apache.forrest.plugin.api, org.osgi.framework, org.osgi.service.log, org.apache.forrest.log
+Private-Package: *

Added: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html.res/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html.res/build.xml?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html.res/build.xml (added)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html.res/build.xml Mon Apr 25 01:38:03 2011
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<project name="Apache Forrest HTML Output Resources" default="bundle">
+
+<!--
+  Bundle properties
+  Override master build.xml where necessary
+-->
+  <property name="bundle.name" value="Apache Forrest HTML Output Resources Bundle" />
+  <property name="bundle.symbolic.name" value="org.apache.forrest.plugin.output.html.res" />
+  <property name="bundle.bnd.file" location="htmlOutputRes.bnd" />
+
+  <!--
+    Override master jar target to include bundle resources
+  -->
+  <target name="jar">
+    <jar destfile="${build.dir}/${jar.file}">
+      <fileset dir="${bundle.resource.dir}" />
+    </jar>
+  </target>
+
+  <import file="../master.xml" />
+
+</project>

Added: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html.res/htmlOutputRes.bnd
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html.res/htmlOutputRes.bnd?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html.res/htmlOutputRes.bnd (added)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html.res/htmlOutputRes.bnd Mon Apr 25 01:38:03 2011
@@ -0,0 +1,6 @@
+Bundle-Name: ${bundle.name}
+Bundle-SymbolicName: ${bundle.symbolic.name}
+Bundle-Version: ${bundle.version}
+Bundle-Vendor: ${bundle.vendor}
+Private-Package: *
+Fragment-Host: org.apache.forrest.plugin.output.html

Added: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html.res/src/bundle/resources/stylesheets/internal-to-html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html.res/src/bundle/resources/stylesheets/internal-to-html.xsl?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html.res/src/bundle/resources/stylesheets/internal-to-html.xsl (added)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html.res/src/bundle/resources/stylesheets/internal-to-html.xsl Mon Apr 25 01:38:03 2011
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <!-- internal representation to html transformation -->
+
+  <xsl:template match="document">
+    <html>
+      <xsl:apply-templates />
+    </html>
+  </xsl:template>
+
+  <xsl:template match="header">
+    <head>
+      <xsl:apply-templates />
+    </head>
+  </xsl:template>
+
+  <xsl:template match="node() | @*">
+    <xsl:copy>
+      <xsl:apply-templates select="@*"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+
+</xsl:stylesheet>

Added: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html/build.xml?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html/build.xml (added)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html/build.xml Mon Apr 25 01:38:03 2011
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<project name="Apache Forrest HTML Output" default="bundle">
+
+<!--
+  Bundle properties
+  Override master build.xml where necessary
+-->
+  <property name="bundle.name" value="Apache Forrest HTML Output Bundle" />
+  <property name="bundle.symbolic.name" value="org.apache.forrest.plugin.output.html" />
+  <property name="bundle.activator" value="org.apache.forrest.plugin.output.html.HtmlOutputPlugin" />
+  <property name="bundle.bnd.file" location="htmlOutput.bnd" />
+
+  <import file="../master.xml" />
+
+</project>

Added: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html/htmlOutput.bnd
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html/htmlOutput.bnd?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html/htmlOutput.bnd (added)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html/htmlOutput.bnd Mon Apr 25 01:38:03 2011
@@ -0,0 +1,8 @@
+Bundle-Name: ${bundle.name}
+Bundle-SymbolicName: ${bundle.symbolic.name}
+Bundle-Version: ${bundle.version}
+Bundle-Activator: ${bundle.activator}
+Bundle-Vendor: ${bundle.vendor}
+Export-Package: org.apache.forrest.plugin.output.html
+Import-Package: javax.xml.transform, javax.xml.transform.stream, org.osgi.framework, org.apache.forrest.plugin.api, org.apache.forrest.plugin.output.html, org.osgi.service.log, org.apache.forrest.log
+Private-Package: org.apache.forrest.plugin.output.html.service

Added: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html/src/java/org/apache/forrest/plugin/output/html/HtmlOutputPlugin.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html/src/java/org/apache/forrest/plugin/output/html/HtmlOutputPlugin.java?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html/src/java/org/apache/forrest/plugin/output/html/HtmlOutputPlugin.java (added)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html/src/java/org/apache/forrest/plugin/output/html/HtmlOutputPlugin.java Mon Apr 25 01:38:03 2011
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+package org.apache.forrest.plugin.output.html;
+
+import java.util.Properties;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+import org.apache.forrest.plugin.api.ForrestPlugin;
+import org.apache.forrest.plugin.output.html.service.HtmlOutput;
+
+public class HtmlOutputPlugin implements BundleActivator {
+
+  public void start(final BundleContext context) throws Exception {
+    System.out.println("HTML bundle starting");
+
+    Properties props = new Properties();
+    props.put("pluginType", "output");
+    props.put("contentType", "text/html");
+    context.registerService(ForrestPlugin.class.getName(), new HtmlOutput(context), props);
+  }
+
+  public void stop(BundleContext context) throws Exception {
+    System.out.println("HTML bundle stopping");
+  }
+
+}

Added: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html/src/java/org/apache/forrest/plugin/output/html/service/HtmlOutput.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html/src/java/org/apache/forrest/plugin/output/html/service/HtmlOutput.java?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html/src/java/org/apache/forrest/plugin/output/html/service/HtmlOutput.java (added)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html/src/java/org/apache/forrest/plugin/output/html/service/HtmlOutput.java Mon Apr 25 01:38:03 2011
@@ -0,0 +1,188 @@
+/*
+ * 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.
+ */
+package org.apache.forrest.plugin.output.html.service;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.StringReader;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.TransformerFactoryConfigurationError;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.log.LogService;
+
+import org.apache.forrest.log.LogPlugin;
+import org.apache.forrest.plugin.api.BaseOutputPlugin;
+import org.apache.forrest.plugin.api.ForrestResult;
+import org.apache.forrest.plugin.api.ForrestSource;
+import org.apache.forrest.plugin.api.ForrestStreamSource;
+
+public class HtmlOutput extends BaseOutputPlugin {
+
+  // private BundleContext mContext;
+
+  public HtmlOutput(final BundleContext context) {
+    super(context);
+  }
+
+  @Override
+  public ForrestResult transform(ForrestSource source) {
+    if (null == source) {
+      throw new IllegalArgumentException("I told you, null won't work");
+    }
+
+    LogPlugin.getDefault().getLogService().log
+      (LogService.LOG_DEBUG,
+       "Hello, this is the html output plugin handling transform(" + source + ")");
+
+    try {
+      ServiceReference[] refs = getBundleContext().getServiceReferences(TransformerFactory.class.getName(), null);
+      TransformerFactory factory = null;
+
+      if (null != refs) {
+        // get first available service
+        for (int i = 0; i < refs.length; i++) {
+          Object obj = getBundleContext().getService(refs[i]);
+
+          if (null != obj && obj instanceof TransformerFactory) {
+            LogPlugin.getDefault().getLogService().log
+              (LogService.LOG_DEBUG,
+               "Found the right class: " + obj.getClass().getName());
+            factory = (TransformerFactory) obj;
+            break;
+          } else {
+            if (null != obj) {
+              LogPlugin.getDefault().getLogService().log
+                (LogService.LOG_DEBUG,
+                 "Found the wrong class: " + obj.getClass().getName());
+            } else {
+              LogPlugin.getDefault().getLogService().log
+                (LogService.LOG_DEBUG,
+                 "Null service");
+            }
+          }
+        }
+      }
+
+      if (null != factory) {
+        LogPlugin.getDefault().getLogService().log
+          (LogService.LOG_DEBUG,
+           "factory " + factory.getClass().getName());
+
+        InputStream in = HtmlOutput.class.getClassLoader().getResourceAsStream
+          ("resources/stylesheets/internal-to-html.xsl");
+
+        if (null != in) {
+          LogPlugin.getDefault().getLogService().log
+            (LogService.LOG_DEBUG,
+             "Found the output stylesheet");
+
+          Transformer transformer = factory.newTransformer
+            (new StreamSource(in));
+
+          if (null != transformer) {
+            LogPlugin.getDefault().getLogService().log
+              (LogService.LOG_DEBUG,
+               "transformer " + transformer.getClass().getName());
+          }
+
+          ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+          StreamResult internalStream = new StreamResult(bytes);
+
+          /*
+           * the source input stream is not needed here
+           * because this transformation starts with
+           * the internal format; the input stream would
+           * lead to the raw source before conversion
+           * to internal format
+           */
+          /*
+          InputStream sourceIn = source.getInputStream();
+
+          if (null == sourceIn) {
+            System.out.println("ForrestSource.getInputStream() is null");
+          }
+          */
+
+          transformer.transform
+            (new StreamSource
+             (new StringReader(source.getInternalRepresentationAsString())),
+             internalStream);
+
+
+          // build ForrestResult container and return it
+          final ByteArrayOutputStream buf = bytes;
+
+          ForrestResult forrestResult = new ForrestResult() {
+
+              public String getResultAsString() {
+                return buf.toString();
+              }
+
+            };
+
+          try {
+            in.close();
+            // sourceIn.close();
+          } catch (IOException ioe) {
+            ; // failed to close stream
+          }
+
+          return forrestResult;
+        } else {
+          LogPlugin.getDefault().getLogService().log
+            (LogService.LOG_DEBUG,
+             "Didn't find the stylesheet");
+        }
+      }
+    } catch (InvalidSyntaxException ise) {
+      LogPlugin.getDefault().getLogService().log
+        (LogService.LOG_DEBUG,
+         "Check your filter string",
+         ise);
+    } catch (TransformerFactoryConfigurationError tfce) {
+      LogPlugin.getDefault().getLogService().log
+        (LogService.LOG_DEBUG,
+         "There is a problem at the factory",
+         tfce);
+    } catch (TransformerConfigurationException tce) {
+      LogPlugin.getDefault().getLogService().log
+        (LogService.LOG_DEBUG,
+         "The transformer could not be configured",
+         tce);
+    } catch (TransformerException te) {
+      LogPlugin.getDefault().getLogService().log
+        (LogService.LOG_DEBUG,
+         "The transformation broke",
+         te);
+    }
+
+    return null;
+  }
+
+}

Added: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf.res/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf.res/build.xml?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf.res/build.xml (added)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf.res/build.xml Mon Apr 25 01:38:03 2011
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<project name="Apache Forrest PDF Output Resources" default="bundle">
+
+<!--
+  Bundle properties
+  Override master build.xml where necessary
+-->
+  <property name="bundle.name" value="Apache Forrest PDF Output Resources Bundle" />
+  <property name="bundle.symbolic.name" value="org.apache.forrest.plugin.output.pdf.res" />
+  <property name="bundle.bnd.file" location="pdfOutputRes.bnd" />
+
+  <!--
+    Override master jar target to include bundle resources
+  -->
+  <target name="jar">
+    <jar destfile="${build.dir}/${jar.file}">
+      <fileset dir="${bundle.resource.dir}" />
+    </jar>
+  </target>
+
+  <import file="../master.xml" />
+
+</project>

Added: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf.res/pdfOutputRes.bnd
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf.res/pdfOutputRes.bnd?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf.res/pdfOutputRes.bnd (added)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf.res/pdfOutputRes.bnd Mon Apr 25 01:38:03 2011
@@ -0,0 +1,6 @@
+Bundle-Name: ${bundle.name}
+Bundle-SymbolicName: ${bundle.symbolic.name}
+Bundle-Version: ${bundle.version}
+Bundle-Vendor: ${bundle.vendor}
+Private-Package: *
+Fragment-Host: org.apache.forrest.plugin.output.pdf

Added: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf.res/src/bundle/resources/stylesheets/internal-to-fo.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf.res/src/bundle/resources/stylesheets/internal-to-fo.xsl?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf.res/src/bundle/resources/stylesheets/internal-to-fo.xsl (added)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf.res/src/bundle/resources/stylesheets/internal-to-fo.xsl Mon Apr 25 01:38:03 2011
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <!-- internal representation to html transformation -->
+
+  <xsl:template match="document">
+    <html>
+      <xsl:apply-templates />
+    </html>
+  </xsl:template>
+
+  <xsl:template match="header">
+    <head>
+      <xsl:apply-templates />
+    </head>
+  </xsl:template>
+
+  <xsl:template match="node() | @*">
+    <xsl:copy>
+      <xsl:apply-templates select="@*"/>
+      <xsl:apply-templates />
+    </xsl:copy>
+  </xsl:template>
+
+</xsl:stylesheet>

Added: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf/build.xml?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf/build.xml (added)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf/build.xml Mon Apr 25 01:38:03 2011
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<project name="Apache Forrest PDF Output" default="bundle">
+
+<!--
+  Bundle properties
+  Override master build.xml where necessary
+-->
+  <property name="bundle.name" value="Apache Forrest PDF Output Bundle" />
+  <property name="bundle.symbolic.name" value="org.apache.forrest.plugin.output.pdf" />
+  <property name="bundle.activator" value="org.apache.forrest.plugin.output.pdf.PdfOutputPlugin" />
+  <property name="bundle.bnd.file" location="pdfOutput.bnd" />
+
+  <import file="../master.xml" />
+
+</project>

Added: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf/pdfOutput.bnd
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf/pdfOutput.bnd?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf/pdfOutput.bnd (added)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf/pdfOutput.bnd Mon Apr 25 01:38:03 2011
@@ -0,0 +1,8 @@
+Bundle-Name: ${bundle.name}
+Bundle-SymbolicName: ${bundle.symbolic.name}
+Bundle-Version: ${bundle.version}
+Bundle-Activator: ${bundle.activator}
+Bundle-Vendor: ${bundle.vendor}
+Export-Package: org.apache.forrest.plugin.output.pdf
+Import-Package: javax.xml.transform, javax.xml.transform.stream, org.osgi.framework, org.apache.forrest.plugin.api, org.apache.forrest.plugin.output.pdf
+Private-Package: org.apache.forrest.plugin.output.pdf.service

Added: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf/src/java/org/apache/forrest/plugin/output/pdf/PdfOutputPlugin.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf/src/java/org/apache/forrest/plugin/output/pdf/PdfOutputPlugin.java?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf/src/java/org/apache/forrest/plugin/output/pdf/PdfOutputPlugin.java (added)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf/src/java/org/apache/forrest/plugin/output/pdf/PdfOutputPlugin.java Mon Apr 25 01:38:03 2011
@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+package org.apache.forrest.plugin.output.pdf;
+
+import java.util.Properties;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+import org.apache.forrest.plugin.api.ForrestPlugin;
+import org.apache.forrest.plugin.output.pdf.service.PdfOutput;
+
+public class PdfOutputPlugin implements BundleActivator {
+
+  public void start(final BundleContext context) throws Exception {
+    System.out.println("PDF bundle starting");
+
+    Properties props = new Properties();
+    props.put("pluginType", "output");
+    props.put("contentType", "application/pdf");
+    props.put("contentType", "text/plain");
+    context.registerService(ForrestPlugin.class.getName(), new PdfOutput(context), props);
+  }
+
+  public void stop(BundleContext context) throws Exception {
+    System.out.println("PDF bundle stopping");
+  }
+
+}

Added: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf/src/java/org/apache/forrest/plugin/output/pdf/service/PdfOutput.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf/src/java/org/apache/forrest/plugin/output/pdf/service/PdfOutput.java?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf/src/java/org/apache/forrest/plugin/output/pdf/service/PdfOutput.java (added)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf/src/java/org/apache/forrest/plugin/output/pdf/service/PdfOutput.java Mon Apr 25 01:38:03 2011
@@ -0,0 +1,156 @@
+/*
+ * 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.
+ */
+package org.apache.forrest.plugin.output.pdf.service;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.StringReader;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.TransformerFactoryConfigurationError;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+
+import org.apache.forrest.plugin.api.BaseOutputPlugin;
+import org.apache.forrest.plugin.api.ForrestResult;
+import org.apache.forrest.plugin.api.ForrestSource;
+import org.apache.forrest.plugin.api.ForrestStreamSource;
+
+public class PdfOutput extends BaseOutputPlugin {
+
+  public PdfOutput(final BundleContext context) {
+    super(context);
+  }
+
+  @Override
+  public ForrestResult transform(ForrestSource source) {
+    if (null == source) {
+      throw new IllegalArgumentException("I told you, null won't work");
+    }
+
+    System.out.println("Hello, this is the pdf output plugin handling transform(" + source + ")");
+
+    try {
+      ServiceReference[] refs = getBundleContext().getServiceReferences(TransformerFactory.class.getName(), null);
+      TransformerFactory factory = null;
+
+      if (null != refs) {
+        // get first available service
+        for (int i = 0; i < refs.length; i++) {
+          Object obj = getBundleContext().getService(refs[i]);
+
+          if (null != obj && obj instanceof TransformerFactory) {
+            System.out.println("Found the right class: " + obj.getClass().getName());
+            factory = (TransformerFactory) obj;
+            break;
+          } else {
+            if (null != obj) {
+              System.out.println("Found the wrong class: " + obj.getClass().getName());
+            } else {
+              System.out.println("Null service");
+            }
+          }
+        }
+      }
+
+      if (null != factory) {
+        System.out.println("factory " + factory.getClass().getName());
+
+        InputStream in = PdfOutput.class.getClassLoader().getResourceAsStream
+          ("resources/stylesheets/internal-to-fo.xsl");
+
+        if (null != in) {
+          System.out.println("Found the output stylesheet");
+
+          Transformer transformer = factory.newTransformer
+            (new StreamSource(in));
+
+          if (null != transformer) {
+            System.out.println("transformer " + transformer.getClass().getName());
+          }
+
+          ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+          StreamResult internalStream = new StreamResult(bytes);
+
+          /*
+           * the source input stream is not needed here
+           * because this transformation starts with
+           * the internal format; the input stream would
+           * lead to the raw source before conversion
+           * to internal format
+           */
+          /*
+          InputStream sourceIn = source.getInputStream();
+
+          if (null == sourceIn) {
+            System.out.println("ForrestSource.getInputStream() is null");
+          }
+          */
+
+          transformer.transform
+            (new StreamSource
+             (new StringReader(source.getInternalRepresentationAsString())),
+             internalStream);
+
+
+          // build ForrestResult container and return it
+          final ByteArrayOutputStream buf = bytes;
+
+          ForrestResult forrestResult = new ForrestResult() {
+
+              public String getResultAsString() {
+                return buf.toString();
+              }
+
+            };
+
+          try {
+            in.close();
+            // sourceIn.close();
+          } catch (IOException ioe) {
+            ; // failed to close stream
+          }
+
+          return forrestResult;
+        } else {
+          System.out.println("Didn't find the stylesheet");
+        }
+      }
+    } catch (InvalidSyntaxException ise) {
+      System.out.println("Check your filter: " + ise);
+    } catch (TransformerFactoryConfigurationError tfce) {
+      System.out.println("There is a problem at the factory: " + tfce);
+    } catch (TransformerConfigurationException tce) {
+      System.out.println(tce);
+    } catch (TransformerException te) {
+      System.out.println("That didn't work: " + te);
+    }
+
+    return null;
+  }
+
+}

Added: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/build.xml?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/build.xml (added)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/build.xml Mon Apr 25 01:38:03 2011
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<project name="Apache Forrest Servlet" default="bundle">
+
+<!--
+  Bundle properties
+  Override master build.xml where necessary
+-->
+  <property name="bundle.name" value="Apache Forrest Servlet Bundle" />
+  <property name="bundle.symbolic.name" value="org.apache.forrest.servlet" />
+  <property name="bundle.activator" value="org.apache.forrest.http.ForrestServletPlugin" />
+  <property name="bundle.bnd.file" location="servlet.bnd" />
+
+  <import file="../master.xml" />
+
+</project>

Added: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/servlet.bnd
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/servlet.bnd?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/servlet.bnd (added)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/servlet.bnd Mon Apr 25 01:38:03 2011
@@ -0,0 +1,7 @@
+Bundle-Name: ${bundle.name}
+Bundle-SymbolicName: ${bundle.symbolic.name}
+Bundle-Version: ${bundle.version}
+Bundle-Activator: ${bundle.activator}
+Bundle-Vendor: ${bundle.vendor}
+Export-Package: org.apache.forrest.http
+Import-Package: org.osgi.framework, org.osgi.util.tracker, org.osgi.service.http, javax.servlet, javax.servlet.http, org.apache.forrest.plugin.api, org.apache.forrest.http, org.apache.forrest.util, org.osgi.service.log, org.apache.forrest.log

Added: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/src/java/org/apache/forrest/http/ForrestServlet.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/src/java/org/apache/forrest/http/ForrestServlet.java?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/src/java/org/apache/forrest/http/ForrestServlet.java (added)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/src/java/org/apache/forrest/http/ForrestServlet.java Mon Apr 25 01:38:03 2011
@@ -0,0 +1,288 @@
+/*
+ * 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.
+ */
+package org.apache.forrest.http;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.net.URI;
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.Filter;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.log.LogService;
+import org.osgi.util.tracker.ServiceTracker;
+
+import org.apache.forrest.log.LogPlugin;
+import org.apache.forrest.plugin.api.ForrestPlugin;
+import org.apache.forrest.plugin.api.ForrestResult;
+import org.apache.forrest.util.ContentType;
+
+public class ForrestServlet extends HttpServlet {
+
+  private static final long serialVersionUID = 3575916939233594893L;
+
+  private BundleContext mBundleContext;
+  private ServiceTracker mInputPluginTracker;
+  private ServiceTracker mOutputPluginTracker;
+
+  public ForrestServlet(final BundleContext context) {
+    mBundleContext = context;
+
+    Filter filter;
+
+    // track input plugins
+    try {
+      filter = context.createFilter("(&("
+                                    + Constants.OBJECTCLASS
+                                    + "=" + ForrestPlugin.class.getName() + ")"
+                                    + "(pluginType=" + ForrestPlugin.TYPE_INPUT + ")"
+                                    + ")");
+      mInputPluginTracker = new ServiceTracker(context, filter, null);
+      mInputPluginTracker.open();
+    } catch (InvalidSyntaxException ise) {
+      // TODO: log failure
+    }
+
+    // track output plugins
+    try {
+      filter = context.createFilter("(&("
+                                    + Constants.OBJECTCLASS
+                                    + "=" + ForrestPlugin.class.getName() + ")"
+                                    + "(pluginType=" + ForrestPlugin.TYPE_OUTPUT + ")"
+                                    + ")");
+      mOutputPluginTracker = new ServiceTracker(context, filter, null);
+      mOutputPluginTracker.open();
+    } catch (InvalidSyntaxException ise) {
+      // TODO: log failure
+    }
+  }
+
+  @Override
+  protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+    throws ServletException, IOException {
+
+    String pathInfo = req.getPathInfo();
+    LogPlugin.getDefault().getLogService().log(LogService.LOG_DEBUG, "doGet: " + pathInfo);
+    File rootPath = new File(System.getProperty("project.home"),
+                             System.getProperty("project.xdocs-dir"));
+    LogPlugin.getDefault().getLogService().log(LogService.LOG_DEBUG, "project.xdocs-dir: " + rootPath.getAbsolutePath());
+
+    if (!rootPath.canRead()) {
+      // not much to do if the source area is not readable
+      resp.sendError(resp.SC_INTERNAL_SERVER_ERROR);
+
+      return;
+    }
+
+    LogPlugin.getDefault().getLogService().log(LogService.LOG_DEBUG, "Can read " + rootPath.getAbsolutePath());
+    File source = new File(rootPath, pathInfo);
+
+    if (source.canRead()) {
+      // source exists on disk and is readable
+      LogPlugin.getDefault().getLogService().log(LogService.LOG_DEBUG, "Can read " + source.getAbsolutePath());
+      doFileResponse(req, resp, source);
+
+      return;
+    }
+
+    // source does not exist on disk or is not readable
+    LogPlugin.getDefault().getLogService().log(LogService.LOG_DEBUG, "Cannot read " + source.getAbsolutePath());
+
+    File[] files = source.getParentFile().listFiles();
+    Arrays.sort(files);
+
+    String sourceName = source.getName();
+    int sourceExtension = sourceName.lastIndexOf(".");
+    String sourceBasename = null;
+
+    if (sourceExtension > 0) {
+      sourceBasename = sourceName.substring(0, sourceExtension);
+    }
+
+    boolean foundMatch = false;
+    String name = null;
+    URI sourceUri = null;
+
+    for (int i = 0; i < files.length; i++) {
+      name = files[i].getName();
+
+      // exclude certain files from consideration
+      if (!name.endsWith("~")) {
+        int extension = name.lastIndexOf(".");
+
+        if (extension > 0) {
+          String base = name.substring(0, extension);
+          LogPlugin.getDefault().getLogService().log(LogService.LOG_DEBUG, name + " --> " + base);
+
+          if (base.equals(sourceBasename)) {
+            LogPlugin.getDefault().getLogService().log(LogService.LOG_DEBUG, "Found something, right here");
+            foundMatch = true;
+            sourceUri = files[i].toURI();
+            break;
+          }
+        }
+      }
+    }
+
+    if (foundMatch) {
+      String requestUri = req.getRequestURI();
+      String sourceFormat = name;
+      String logMsg = "transform input " + sourceFormat + " into output " + requestUri;
+
+      LogPlugin.getDefault().getLogService().log(LogService.LOG_DEBUG, logMsg);
+
+      String pluginType;
+
+      // is there support for the requested output format?
+      ForrestPlugin outputPlugin = null;
+
+      if (null != mOutputPluginTracker) {
+        ServiceReference[] outRefs = mOutputPluginTracker.getServiceReferences();
+
+        if (null != outRefs) {
+          for (int i = 0; i < outRefs.length; i++) {
+            // XXX use property name, something like PROP_CONTENT_TYPE
+            pluginType = (String) outRefs[i].getProperty("contentType");
+            LogPlugin.getDefault().getLogService().log(LogService.LOG_DEBUG, "Found an output plugin for format: " + pluginType);
+
+            if (null != pluginType
+                && pluginType.equals
+                (ContentType.getContentTypeByName(requestUri))) {
+              LogPlugin.getDefault().getLogService().log(LogService.LOG_DEBUG, "It's a match. Transform it.");
+
+              outputPlugin = (ForrestPlugin) mOutputPluginTracker.getService(outRefs[i]);
+              break;
+            } else {
+              LogPlugin.getDefault().getLogService().log(LogService.LOG_DEBUG, "Skipping " + pluginType + " format for " + ContentType.getContentTypeByName(requestUri));
+            }
+          }
+        } else {
+          LogPlugin.getDefault().getLogService().log(LogService.LOG_DEBUG, "List of output plugins is null");
+        }
+      }
+
+      // is there support for the source format?
+      ForrestPlugin inputPlugin = null;
+
+      if (null != mInputPluginTracker) {
+        ServiceReference[] inRefs = mInputPluginTracker.getServiceReferences();
+
+        if (null != inRefs) {
+          for (int i = 0; i < inRefs.length; i++) {
+            // XXX use property, something like PROP_CONTENT_TYPE
+            pluginType = (String) inRefs[i].getProperty("contentType");
+            LogPlugin.getDefault().getLogService().log(LogService.LOG_DEBUG, "Found an input plugin for format: " + pluginType);
+
+            if (null != pluginType
+                && pluginType.equals
+                (ContentType.getContentTypeByName(sourceFormat))) {
+              LogPlugin.getDefault().getLogService().log(LogService.LOG_DEBUG, "It's a match. Transform it.");
+
+              inputPlugin = (ForrestPlugin) mInputPluginTracker.getService(inRefs[i]);
+              break;
+            } else {
+              LogPlugin.getDefault().getLogService().log
+                (LogService.LOG_DEBUG,
+                 "Skipping " + pluginType + " format for "
+                 + ContentType.getContentTypeByName(sourceFormat));
+            }
+          }
+        } else {
+          LogPlugin.getDefault().getLogService().log(LogService.LOG_DEBUG, "List of input plugins is null");
+        }
+      }
+
+      if (null != outputPlugin && null != inputPlugin) {
+        resp.setContentType
+          (ContentType.getContentTypeByName(requestUri));
+
+        ForrestResult result = outputPlugin.transform(inputPlugin.getSource(sourceUri));
+        if (null != result) {
+          resp.getWriter().println(result.getResultAsString());
+        }
+
+        return;
+      }
+    }
+
+    // no source found for requested output format
+    resp.sendError(resp.SC_NOT_FOUND);
+  }
+
+  private void doFileResponse(HttpServletRequest req,
+                              HttpServletResponse resp, File source) throws IOException {
+    // source exists and is readable
+    if (source.isFile()) {
+      try {
+        String contentType = ContentType.getContentTypeByName(source);
+        String ext = ContentType.getExtensionByName(source.getName());
+
+        if (null != contentType) {
+          resp.setContentType(contentType);
+          BufferedReader reader = new BufferedReader(new FileReader(source));
+          String line;
+
+          do {
+            line = reader.readLine();
+
+            if (null != line) {
+              resp.getWriter().println(line);
+            }
+          } while (null != line);
+
+          reader.close();
+        }
+      } catch (IOException e) {
+        e.printStackTrace();
+      }
+    } else if (isDirectory(source.getName())) {
+      // TODO: use a property here for index file name
+      resp.sendRedirect(redirectTo(req.getPathInfo(), "index.html"));
+    }
+  }
+
+  private boolean isDirectory(String path) {
+    if (path.endsWith("/")) {
+      return true;
+    }
+
+    // TODO: raw content location is not considered
+    File file = new File(System.getProperty("project.xdocs-dir"), path);
+
+    return file.isDirectory();
+  }
+
+  private String redirectTo(String path, String index) {
+    return path + (path.endsWith("/") ? "" : "/") + index;
+  }
+
+}

Added: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/src/java/org/apache/forrest/http/ForrestServletPlugin.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/src/java/org/apache/forrest/http/ForrestServletPlugin.java?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/src/java/org/apache/forrest/http/ForrestServletPlugin.java (added)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/src/java/org/apache/forrest/http/ForrestServletPlugin.java Mon Apr 25 01:38:03 2011
@@ -0,0 +1,77 @@
+/*
+ * 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.
+ */
+package org.apache.forrest.http;
+
+import java.util.Properties;
+import javax.servlet.ServletException;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.service.http.HttpService;
+import org.osgi.service.http.NamespaceException;
+import org.osgi.service.log.LogService;
+import org.osgi.util.tracker.ServiceTracker;
+
+import org.apache.forrest.log.LogPlugin;
+
+public class ForrestServletPlugin implements BundleActivator {
+
+  private ServiceTracker mHttpTracker;
+  private ForrestServlet mServlet;
+
+  @Override
+  public void start(final BundleContext context) throws Exception {
+    LogPlugin.getDefault().getLogService().log(LogService.LOG_DEBUG, "http activator");
+
+    // track OSGi HTTP service
+    mHttpTracker = new ServiceTracker(context, HttpService.class.getName(), null);
+    mHttpTracker.open();
+
+    // create servlet instance
+    mServlet = new ForrestServlet(context);
+
+    /*
+     * ServiceTracker.waitForService(long timeout) is not supposed
+     * to be called from BundleActivator methods because activator
+     * methods are expected to return quickly. The point of this
+     * activator is to register the servlet with the HTTP service,
+     * so I'm willing to wait.
+     */
+    try {
+      mHttpTracker.waitForService(1000);
+      HttpService service = (HttpService) mHttpTracker.getService();
+
+      if (null != service) {
+        try {
+          service.registerServlet("/", mServlet, null, null);
+        } catch (ServletException e) {
+          e.printStackTrace();
+        } catch (NamespaceException e) {
+          e.printStackTrace();
+        }
+      }
+    } catch (InterruptedException ie) {
+      ;
+    }
+  }
+
+  @Override
+  public void stop(BundleContext context) throws Exception {
+    mHttpTracker.close();
+  }
+
+}

Added: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/build.xml?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/build.xml (added)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/build.xml Mon Apr 25 01:38:03 2011
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  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.
+-->
+<project name="Apache Forrest Utilities" default="bundle">
+
+<!--
+  Bundle properties
+  Override master build.xml where necessary
+-->
+  <property name="bundle.name" value="Apache Forrest Utilities Bundle" />
+  <property name="bundle.symbolic.name" value="org.apache.forrest.util" />
+  <property name="bundle.bnd.file" location="util.bnd" />
+
+  <import file="../master.xml" />
+
+</project>

Added: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/src/java/org/apache/forrest/util/ContentType.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/src/java/org/apache/forrest/util/ContentType.java?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/src/java/org/apache/forrest/util/ContentType.java (added)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/src/java/org/apache/forrest/util/ContentType.java Mon Apr 25 01:38:03 2011
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ */
+package org.apache.forrest.util;
+
+import java.io.File;
+import java.util.Hashtable;
+import java.util.Map;
+
+public class ContentType {
+
+  private static final Map<String, String> sContentTypeMap;
+
+  public static String getExtensionByName(String name) {
+    if (null == name || name.isEmpty()) {
+      throw new IllegalArgumentException("Argument must not be null or empty");
+    }
+
+    int pos = name.lastIndexOf(".");
+
+    if (pos > 0 && name.length() > 1) {
+      return name.substring(pos + 1);
+    }
+
+    return null;
+  }
+
+  public static String getContentTypeByName(String path) {
+    if (null == path || path.isEmpty()) {
+      throw new IllegalArgumentException("Argument must not be null or empty");
+    }
+
+    return sContentTypeMap.get(getExtensionByName(path));
+  }
+
+  public static String getContentTypeByName(File file) {
+    if (null == file || file.getName().isEmpty()) {
+      throw new IllegalArgumentException("Argument must not be null or empty");
+    }
+
+    return getContentTypeByName(file.getName());
+  }
+
+  public static String getContentTypeByExt(String ext) {
+    return sContentTypeMap.get(ext);
+  }
+
+  static {
+    sContentTypeMap = new Hashtable<String, String>();
+    sContentTypeMap.put("xml", "application/xml");
+    sContentTypeMap.put("html", "text/html");
+    sContentTypeMap.put("txt", "text/plain");
+    sContentTypeMap.put("pdf", "application/pdf");
+    sContentTypeMap.put("css", "text/css");
+    sContentTypeMap.put("js", "application/javascript");
+    sContentTypeMap.put("fo", "application/xml+fo"); // FIXME
+  }
+
+}

Added: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/util.bnd
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/util.bnd?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/util.bnd (added)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.util/util.bnd Mon Apr 25 01:38:03 2011
@@ -0,0 +1,6 @@
+Bundle-Name: ${bundle.name}
+Bundle-SymbolicName: ${bundle.symbolic.name}
+Bundle-Version: ${bundle.version}
+Bundle-Vendor: ${bundle.vendor}
+Export-Package: org.apache.forrest.util
+Import-Package: org.apache.forrest.util

Added: forrest/trunk/whiteboard/forrest-osgi/tools/ant/LICENSE.txt
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/tools/ant/LICENSE.txt?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/tools/ant/LICENSE.txt (added)
+++ forrest/trunk/whiteboard/forrest-osgi/tools/ant/LICENSE.txt Mon Apr 25 01:38:03 2011
@@ -0,0 +1,272 @@
+/*
+ *                                 Apache License
+ *                           Version 2.0, January 2004
+ *                        http://www.apache.org/licenses/
+ *
+ *   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ *
+ *   1. Definitions.
+ *
+ *      "License" shall mean the terms and conditions for use, reproduction,
+ *      and distribution as defined by Sections 1 through 9 of this document.
+ *
+ *      "Licensor" shall mean the copyright owner or entity authorized by
+ *      the copyright owner that is granting the License.
+ *
+ *      "Legal Entity" shall mean the union of the acting entity and all
+ *      other entities that control, are controlled by, or are under common
+ *      control with that entity. For the purposes of this definition,
+ *      "control" means (i) the power, direct or indirect, to cause the
+ *      direction or management of such entity, whether by contract or
+ *      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ *      outstanding shares, or (iii) beneficial ownership of such entity.
+ *
+ *      "You" (or "Your") shall mean an individual or Legal Entity
+ *      exercising permissions granted by this License.
+ *
+ *      "Source" form shall mean the preferred form for making modifications,
+ *      including but not limited to software source code, documentation
+ *      source, and configuration files.
+ *
+ *      "Object" form shall mean any form resulting from mechanical
+ *      transformation or translation of a Source form, including but
+ *      not limited to compiled object code, generated documentation,
+ *      and conversions to other media types.
+ *
+ *      "Work" shall mean the work of authorship, whether in Source or
+ *      Object form, made available under the License, as indicated by a
+ *      copyright notice that is included in or attached to the work
+ *      (an example is provided in the Appendix below).
+ *
+ *      "Derivative Works" shall mean any work, whether in Source or Object
+ *      form, that is based on (or derived from) the Work and for which the
+ *      editorial revisions, annotations, elaborations, or other modifications
+ *      represent, as a whole, an original work of authorship. For the purposes
+ *      of this License, Derivative Works shall not include works that remain
+ *      separable from, or merely link (or bind by name) to the interfaces of,
+ *      the Work and Derivative Works thereof.
+ *
+ *      "Contribution" shall mean any work of authorship, including
+ *      the original version of the Work and any modifications or additions
+ *      to that Work or Derivative Works thereof, that is intentionally
+ *      submitted to Licensor for inclusion in the Work by the copyright owner
+ *      or by an individual or Legal Entity authorized to submit on behalf of
+ *      the copyright owner. For the purposes of this definition, "submitted"
+ *      means any form of electronic, verbal, or written communication sent
+ *      to the Licensor or its representatives, including but not limited to
+ *      communication on electronic mailing lists, source code control systems,
+ *      and issue tracking systems that are managed by, or on behalf of, the
+ *      Licensor for the purpose of discussing and improving the Work, but
+ *      excluding communication that is conspicuously marked or otherwise
+ *      designated in writing by the copyright owner as "Not a Contribution."
+ *
+ *      "Contributor" shall mean Licensor and any individual or Legal Entity
+ *      on behalf of whom a Contribution has been received by Licensor and
+ *      subsequently incorporated within the Work.
+ *
+ *   2. Grant of Copyright License. Subject to the terms and conditions of
+ *      this License, each Contributor hereby grants to You a perpetual,
+ *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ *      copyright license to reproduce, prepare Derivative Works of,
+ *      publicly display, publicly perform, sublicense, and distribute the
+ *      Work and such Derivative Works in Source or Object form.
+ *
+ *   3. Grant of Patent License. Subject to the terms and conditions of
+ *      this License, each Contributor hereby grants to You a perpetual,
+ *      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ *      (except as stated in this section) patent license to make, have made,
+ *      use, offer to sell, sell, import, and otherwise transfer the Work,
+ *      where such license applies only to those patent claims licensable
+ *      by such Contributor that are necessarily infringed by their
+ *      Contribution(s) alone or by combination of their Contribution(s)
+ *      with the Work to which such Contribution(s) was submitted. If You
+ *      institute patent litigation against any entity (including a
+ *      cross-claim or counterclaim in a lawsuit) alleging that the Work
+ *      or a Contribution incorporated within the Work constitutes direct
+ *      or contributory patent infringement, then any patent licenses
+ *      granted to You under this License for that Work shall terminate
+ *      as of the date such litigation is filed.
+ *
+ *   4. Redistribution. You may reproduce and distribute copies of the
+ *      Work or Derivative Works thereof in any medium, with or without
+ *      modifications, and in Source or Object form, provided that You
+ *      meet the following conditions:
+ *
+ *      (a) You must give any other recipients of the Work or
+ *          Derivative Works a copy of this License; and
+ *
+ *      (b) You must cause any modified files to carry prominent notices
+ *          stating that You changed the files; and
+ *
+ *      (c) You must retain, in the Source form of any Derivative Works
+ *          that You distribute, all copyright, patent, trademark, and
+ *          attribution notices from the Source form of the Work,
+ *          excluding those notices that do not pertain to any part of
+ *          the Derivative Works; and
+ *
+ *      (d) If the Work includes a "NOTICE" text file as part of its
+ *          distribution, then any Derivative Works that You distribute must
+ *          include a readable copy of the attribution notices contained
+ *          within such NOTICE file, excluding those notices that do not
+ *          pertain to any part of the Derivative Works, in at least one
+ *          of the following places: within a NOTICE text file distributed
+ *          as part of the Derivative Works; within the Source form or
+ *          documentation, if provided along with the Derivative Works; or,
+ *          within a display generated by the Derivative Works, if and
+ *          wherever such third-party notices normally appear. The contents
+ *          of the NOTICE file are for informational purposes only and
+ *          do not modify the License. You may add Your own attribution
+ *          notices within Derivative Works that You distribute, alongside
+ *          or as an addendum to the NOTICE text from the Work, provided
+ *          that such additional attribution notices cannot be construed
+ *          as modifying the License.
+ *
+ *      You may add Your own copyright statement to Your modifications and
+ *      may provide additional or different license terms and conditions
+ *      for use, reproduction, or distribution of Your modifications, or
+ *      for any such Derivative Works as a whole, provided Your use,
+ *      reproduction, and distribution of the Work otherwise complies with
+ *      the conditions stated in this License.
+ *
+ *   5. Submission of Contributions. Unless You explicitly state otherwise,
+ *      any Contribution intentionally submitted for inclusion in the Work
+ *      by You to the Licensor shall be under the terms and conditions of
+ *      this License, without any additional terms or conditions.
+ *      Notwithstanding the above, nothing herein shall supersede or modify
+ *      the terms of any separate license agreement you may have executed
+ *      with Licensor regarding such Contributions.
+ *
+ *   6. Trademarks. This License does not grant permission to use the trade
+ *      names, trademarks, service marks, or product names of the Licensor,
+ *      except as required for reasonable and customary use in describing the
+ *      origin of the Work and reproducing the content of the NOTICE file.
+ *
+ *   7. Disclaimer of Warranty. Unless required by applicable law or
+ *      agreed to in writing, Licensor provides the Work (and each
+ *      Contributor provides its Contributions) on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ *      implied, including, without limitation, any warranties or conditions
+ *      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ *      PARTICULAR PURPOSE. You are solely responsible for determining the
+ *      appropriateness of using or redistributing the Work and assume any
+ *      risks associated with Your exercise of permissions under this License.
+ *
+ *   8. Limitation of Liability. In no event and under no legal theory,
+ *      whether in tort (including negligence), contract, or otherwise,
+ *      unless required by applicable law (such as deliberate and grossly
+ *      negligent acts) or agreed to in writing, shall any Contributor be
+ *      liable to You for damages, including any direct, indirect, special,
+ *      incidental, or consequential damages of any character arising as a
+ *      result of this License or out of the use or inability to use the
+ *      Work (including but not limited to damages for loss of goodwill,
+ *      work stoppage, computer failure or malfunction, or any and all
+ *      other commercial damages or losses), even if such Contributor
+ *      has been advised of the possibility of such damages.
+ *
+ *   9. Accepting Warranty or Additional Liability. While redistributing
+ *      the Work or Derivative Works thereof, You may choose to offer,
+ *      and charge a fee for, acceptance of support, warranty, indemnity,
+ *      or other liability obligations and/or rights consistent with this
+ *      License. However, in accepting such obligations, You may act only
+ *      on Your own behalf and on Your sole responsibility, not on behalf
+ *      of any other Contributor, and only if You agree to indemnify,
+ *      defend, and hold each Contributor harmless for any liability
+ *      incurred by, or claims asserted against, such Contributor by reason
+ *      of your accepting any such warranty or additional liability.
+ *
+ *   END OF TERMS AND CONDITIONS
+ *
+ *   APPENDIX: How to apply the Apache License to your work.
+ *
+ *      To apply the Apache License to your work, attach the following
+ *      boilerplate notice, with the fields enclosed by brackets "[]"
+ *      replaced with your own identifying information. (Don't include
+ *      the brackets!)  The text should be enclosed in the appropriate
+ *      comment syntax for the file format. We also recommend that a
+ *      file or class name and description of purpose be included on the
+ *      same "printed page" as the copyright notice for easier
+ *      identification within third-party archives.
+ *
+ *   Copyright [yyyy] [name of copyright owner]
+ *
+ *   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.
+ */
+
+W3C® SOFTWARE NOTICE AND LICENSE
+http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+This work (and included software, documentation such as READMEs, or other
+related items) is being provided by the copyright holders under the following
+license. By obtaining, using and/or copying this work, you (the licensee) agree
+that you have read, understood, and will comply with the following terms and
+conditions.
+
+Permission to copy, modify, and distribute this software and its documentation,
+with or without modification, for any purpose and without fee or royalty is
+hereby granted, provided that you include the following on ALL copies of the
+software and documentation or portions thereof, including modifications:
+
+  1. The full text of this NOTICE in a location viewable to users of the
+     redistributed or derivative work. 
+  2. Any pre-existing intellectual property disclaimers, notices, or terms
+     and conditions. If none exist, the W3C Software Short Notice should be
+     included (hypertext is preferred, text is permitted) within the body
+     of any redistributed or derivative code.
+  3. Notice of any changes or modifications to the files, including the date
+     changes were made. (We recommend you provide URIs to the location from
+     which the code is derived.)
+     
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE
+NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
+THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY
+PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the software without specific, written prior permission.
+Title to copyright in this software and any associated documentation will at
+all times remain with copyright holders.
+
+____________________________________
+
+This formulation of W3C's notice and license became active on December 31 2002.
+This version removes the copyright ownership notice such that this license can
+be used with materials other than those owned by the W3C, reflects that ERCIM
+is now a host of the W3C, includes references to this specific dated version of
+the license, and removes the ambiguous grant of "use". Otherwise, this version
+is the same as the previous version and is written so as to preserve the Free
+Software Foundation's assessment of GPL compatibility and OSI's certification
+under the Open Source Definition. Please see our Copyright FAQ for common
+questions about using materials from our site, including specific terms and
+conditions for packages like libwww, Amaya, and Jigsaw. Other questions about
+this notice can be directed to site-policy@w3.org.
+ 
+Joseph Reagle <si...@w3.org> 
+
+This license came from: http://www.megginson.com/SAX/copying.html
+  However please note future versions of SAX may be covered 
+  under http://saxproject.org/?selected=pd
+
+SAX2 is Free!
+
+I hereby abandon any property rights to SAX 2.0 (the Simple API for
+XML), and release all of the SAX 2.0 source code, compiled code, and
+documentation contained in this distribution into the Public Domain.
+SAX comes with NO WARRANTY or guarantee of fitness for any
+purpose.
+
+David Megginson, david@megginson.com
+2000-05-05

Added: forrest/trunk/whiteboard/forrest-osgi/tools/ant/NOTICE.txt
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/tools/ant/NOTICE.txt?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/tools/ant/NOTICE.txt (added)
+++ forrest/trunk/whiteboard/forrest-osgi/tools/ant/NOTICE.txt Mon Apr 25 01:38:03 2011
@@ -0,0 +1,6 @@
+   Apache Ant
+   Copyright 1999-2010 The Apache Software Foundation
+
+   The <sync> task is based on code Copyright (c) 2002, Landmark
+   Graphics Corp that has been kindly donated to the Apache Software
+   Foundation.

Added: forrest/trunk/whiteboard/forrest-osgi/tools/ant/bin/README-forrest-upgrade.txt
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/tools/ant/bin/README-forrest-upgrade.txt?rev=1096394&view=auto
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/tools/ant/bin/README-forrest-upgrade.txt (added)
+++ forrest/trunk/whiteboard/forrest-osgi/tools/ant/bin/README-forrest-upgrade.txt Mon Apr 25 01:38:03 2011
@@ -0,0 +1,8 @@
+Notes for upgrading Forrest's packaged Ant.
+
+We have some changes to the Ant scripts.
+See svn log for details.
+
+ant : r8757, r410731
+ant.bat : r8757, r410731
+lcp.bat : r23058