forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bd...@apache.org
Subject svn commit: r1100225 - in /forrest/trunk/whiteboard/forrest-osgi: main/src/java/org/apache/forrest/ org.apache.forrest.log.servlet/src/java/org/apache/forrest/log/servlet/ org.apache.forrest.log.servlet/src/java/org/apache/forrest/log/servlet/service/ ...
Date Fri, 06 May 2011 14:12:11 GMT
Author: bdube
Date: Fri May  6 14:12:10 2011
New Revision: 1100225

URL: http://svn.apache.org/viewvc?rev=1100225&view=rev
Log:
Run code through Eclipse Organize Imports

Modified:
    forrest/trunk/whiteboard/forrest-osgi/main/src/java/org/apache/forrest/Forrest.java
    forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log.servlet/src/java/org/apache/forrest/log/servlet/LogServletPlugin.java
    forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log.servlet/src/java/org/apache/forrest/log/servlet/service/LogServlet.java
    forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log/src/java/org/apache/forrest/log/LogPlugin.java
    forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log/src/java/org/apache/forrest/log/service/LogWriter.java
    forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/AbstractPlugin.java
    forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/BaseInputPlugin.java
    forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/BaseOutputPlugin.java
    forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/ForrestSource.java
    forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/ForrestStreamSource.java
    forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.input.xdoc/src/java/org/apache/forrest/plugin/input/xdoc/XDocInputPlugin.java
    forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.input.xdoc/src/java/org/apache/forrest/plugin/input/xdoc/service/XDocInput.java
    forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html/src/java/org/apache/forrest/plugin/output/html/HtmlOutputPlugin.java
    forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html/src/java/org/apache/forrest/plugin/output/html/service/HtmlOutput.java
    forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf/src/java/org/apache/forrest/plugin/output/pdf/PdfOutputPlugin.java
    forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf/src/java/org/apache/forrest/plugin/output/pdf/service/PdfOutput.java
    forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/src/java/org/apache/forrest/http/ForrestServlet.java
    forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/src/java/org/apache/forrest/http/ForrestServletPlugin.java

Modified: forrest/trunk/whiteboard/forrest-osgi/main/src/java/org/apache/forrest/Forrest.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/main/src/java/org/apache/forrest/Forrest.java?rev=1100225&r1=1100224&r2=1100225&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/main/src/java/org/apache/forrest/Forrest.java (original)
+++ forrest/trunk/whiteboard/forrest-osgi/main/src/java/org/apache/forrest/Forrest.java Fri
May  6 14:12:10 2011
@@ -24,12 +24,10 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Enumeration;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 
 import org.apache.felix.framework.util.Util;
-
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;

Modified: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log.servlet/src/java/org/apache/forrest/log/servlet/LogServletPlugin.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log.servlet/src/java/org/apache/forrest/log/servlet/LogServletPlugin.java?rev=1100225&r1=1100224&r2=1100225&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log.servlet/src/java/org/apache/forrest/log/servlet/LogServletPlugin.java
(original)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log.servlet/src/java/org/apache/forrest/log/servlet/LogServletPlugin.java
Fri May  6 14:12:10 2011
@@ -16,22 +16,19 @@
  */
 package org.apache.forrest.log.servlet;
 
-import java.util.Properties;
 import javax.servlet.ServletException;
 
+import org.apache.forrest.log.LogPlugin.LOG;
+import org.apache.forrest.log.servlet.service.LogBuffer;
+import org.apache.forrest.log.servlet.service.LogServlet;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.http.HttpService;
 import org.osgi.service.http.NamespaceException;
 import org.osgi.service.log.LogReaderService;
-import org.osgi.service.log.LogService;
 import org.osgi.util.tracker.ServiceTracker;
 
-import org.apache.forrest.log.LogPlugin.LOG;
-import org.apache.forrest.log.servlet.service.LogBuffer;
-import org.apache.forrest.log.servlet.service.LogServlet;
-
 public class LogServletPlugin implements BundleActivator {
 
   private static final String SERVLET_ALIAS = "/logs";

Modified: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log.servlet/src/java/org/apache/forrest/log/servlet/service/LogServlet.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log.servlet/src/java/org/apache/forrest/log/servlet/service/LogServlet.java?rev=1100225&r1=1100224&r2=1100225&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log.servlet/src/java/org/apache/forrest/log/servlet/service/LogServlet.java
(original)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log.servlet/src/java/org/apache/forrest/log/servlet/service/LogServlet.java
Fri May  6 14:12:10 2011
@@ -16,41 +16,16 @@
  */
 package org.apache.forrest.log.servlet.service;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.net.URI;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.Hashtable;
 import java.util.Iterator;
-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.Bundle;
 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.LogEntry;
-import org.osgi.service.log.LogReaderService;
-import org.osgi.service.log.LogService;
-import org.osgi.util.tracker.ServiceTracker;
-
-import org.apache.forrest.log.LogPlugin.LOG;
-import org.apache.forrest.util.ContentType;
 
 public class LogServlet extends HttpServlet {
 

Modified: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log/src/java/org/apache/forrest/log/LogPlugin.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log/src/java/org/apache/forrest/log/LogPlugin.java?rev=1100225&r1=1100224&r2=1100225&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log/src/java/org/apache/forrest/log/LogPlugin.java
(original)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log/src/java/org/apache/forrest/log/LogPlugin.java
Fri May  6 14:12:10 2011
@@ -16,8 +16,7 @@
  */
 package org.apache.forrest.log;
 
-import java.util.Properties;
-
+import org.apache.forrest.log.service.LogWriter;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
@@ -25,8 +24,6 @@ import org.osgi.service.log.LogReaderSer
 import org.osgi.service.log.LogService;
 import org.osgi.util.tracker.ServiceTracker;
 
-import org.apache.forrest.log.service.LogWriter;
-
 public class LogPlugin implements BundleActivator {
 
   private static LogPlugin sInstance = null;

Modified: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log/src/java/org/apache/forrest/log/service/LogWriter.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log/src/java/org/apache/forrest/log/service/LogWriter.java?rev=1100225&r1=1100224&r2=1100225&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log/src/java/org/apache/forrest/log/service/LogWriter.java
(original)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.log/src/java/org/apache/forrest/log/service/LogWriter.java
Fri May  6 14:12:10 2011
@@ -23,7 +23,6 @@ import org.osgi.framework.Bundle;
 import org.osgi.service.log.LogEntry;
 import org.osgi.service.log.LogListener;
 import org.osgi.service.log.LogService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/AbstractPlugin.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/AbstractPlugin.java?rev=1100225&r1=1100224&r2=1100225&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/AbstractPlugin.java
(original)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/AbstractPlugin.java
Fri May  6 14:12:10 2011
@@ -17,13 +17,8 @@
 package org.apache.forrest.plugin.api;
 
 import java.net.URI;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.log.LogService;
 
-import org.apache.forrest.log.LogPlugin;
-import org.apache.forrest.plugin.api.ForrestPlugin;
-import org.apache.forrest.plugin.api.ForrestResult;
-import org.apache.forrest.plugin.api.ForrestSource;
+import org.osgi.framework.BundleContext;
 
 /**
  * An abstract base class for plugins.

Modified: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/BaseInputPlugin.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/BaseInputPlugin.java?rev=1100225&r1=1100224&r2=1100225&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/BaseInputPlugin.java
(original)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/BaseInputPlugin.java
Fri May  6 14:12:10 2011
@@ -17,12 +17,9 @@
 package org.apache.forrest.plugin.api;
 
 import java.net.URI;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.log.LogService;
 
 import org.apache.forrest.log.LogPlugin.LOG;
-import org.apache.forrest.plugin.api.ForrestResult;
-import org.apache.forrest.plugin.api.ForrestSource;
+import org.osgi.framework.BundleContext;
 
 /**
  * Base implementation for input plugins. Input plugins override

Modified: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/BaseOutputPlugin.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/BaseOutputPlugin.java?rev=1100225&r1=1100224&r2=1100225&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/BaseOutputPlugin.java
(original)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/BaseOutputPlugin.java
Fri May  6 14:12:10 2011
@@ -17,12 +17,9 @@
 package org.apache.forrest.plugin.api;
 
 import java.net.URI;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.log.LogService;
 
 import org.apache.forrest.log.LogPlugin.LOG;
-import org.apache.forrest.plugin.api.ForrestResult;
-import org.apache.forrest.plugin.api.ForrestSource;
+import org.osgi.framework.BundleContext;
 
 /**
  * Base implementation for output plugins. Output plugins override

Modified: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/ForrestSource.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/ForrestSource.java?rev=1100225&r1=1100224&r2=1100225&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/ForrestSource.java
(original)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/ForrestSource.java
Fri May  6 14:12:10 2011
@@ -17,7 +17,6 @@
 package org.apache.forrest.plugin.api;
 
 import java.io.InputStream;
-import javax.xml.transform.stream.StreamResult;
 
 public interface ForrestSource {
 

Modified: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/ForrestStreamSource.java
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/ForrestStreamSource.java?rev=1100225&r1=1100224&r2=1100225&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/ForrestStreamSource.java
(original)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.api/src/java/org/apache/forrest/plugin/api/ForrestStreamSource.java
Fri May  6 14:12:10 2011
@@ -17,10 +17,9 @@
 package org.apache.forrest.plugin.api;
 
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.IOException;
-import javax.xml.transform.stream.StreamResult;
 
 public class ForrestStreamSource implements ForrestSource {
 

Modified: forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.input.xdoc/src/java/org/apache/forrest/plugin/input/xdoc/XDocInputPlugin.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/XDocInputPlugin.java?rev=1100225&r1=1100224&r2=1100225&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.input.xdoc/src/java/org/apache/forrest/plugin/input/xdoc/XDocInputPlugin.java
(original)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.input.xdoc/src/java/org/apache/forrest/plugin/input/xdoc/XDocInputPlugin.java
Fri May  6 14:12:10 2011
@@ -18,11 +18,10 @@ package org.apache.forrest.plugin.input.
 
 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.input.xdoc.service.XDocInput;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
 
 public class XDocInputPlugin implements BundleActivator {
 

Modified: 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=1100225&r1=1100224&r2=1100225&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.input.xdoc/src/java/org/apache/forrest/plugin/input/xdoc/service/XDocInput.java
(original)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.input.xdoc/src/java/org/apache/forrest/plugin/input/xdoc/service/XDocInput.java
Fri May  6 14:12:10 2011
@@ -17,11 +17,11 @@
 package org.apache.forrest.plugin.input.xdoc.service;
 
 import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 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;
@@ -30,16 +30,13 @@ import javax.xml.transform.TransformerFa
 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.LOG;
 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;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
 
 public class XDocInput extends BaseInputPlugin {
 

Modified: 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=1100225&r1=1100224&r2=1100225&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html/src/java/org/apache/forrest/plugin/output/html/HtmlOutputPlugin.java
(original)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html/src/java/org/apache/forrest/plugin/output/html/HtmlOutputPlugin.java
Fri May  6 14:12:10 2011
@@ -18,11 +18,10 @@ package org.apache.forrest.plugin.output
 
 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;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
 
 public class HtmlOutputPlugin implements BundleActivator {
 

Modified: 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=1100225&r1=1100224&r2=1100225&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html/src/java/org/apache/forrest/plugin/output/html/service/HtmlOutput.java
(original)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.html/src/java/org/apache/forrest/plugin/output/html/service/HtmlOutput.java
Fri May  6 14:12:10 2011
@@ -17,12 +17,10 @@
 package org.apache.forrest.plugin.output.html.service;
 
 import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 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;
@@ -31,16 +29,13 @@ import javax.xml.transform.TransformerFa
 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.LOG;
 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;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
 
 public class HtmlOutput extends BaseOutputPlugin {
 

Modified: 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=1100225&r1=1100224&r2=1100225&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf/src/java/org/apache/forrest/plugin/output/pdf/PdfOutputPlugin.java
(original)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf/src/java/org/apache/forrest/plugin/output/pdf/PdfOutputPlugin.java
Fri May  6 14:12:10 2011
@@ -18,11 +18,10 @@ package org.apache.forrest.plugin.output
 
 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;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
 
 public class PdfOutputPlugin implements BundleActivator {
 

Modified: 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=1100225&r1=1100224&r2=1100225&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf/src/java/org/apache/forrest/plugin/output/pdf/service/PdfOutput.java
(original)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.plugin.output.pdf/src/java/org/apache/forrest/plugin/output/pdf/service/PdfOutput.java
Fri May  6 14:12:10 2011
@@ -17,12 +17,10 @@
 package org.apache.forrest.plugin.output.pdf.service;
 
 import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 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;
@@ -31,14 +29,12 @@ import javax.xml.transform.TransformerFa
 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;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
 
 public class PdfOutput extends BaseOutputPlugin {
 

Modified: 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=1100225&r1=1100224&r2=1100225&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/src/java/org/apache/forrest/http/ForrestServlet.java
(original)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/src/java/org/apache/forrest/http/ForrestServlet.java
Fri May  6 14:12:10 2011
@@ -22,29 +22,23 @@ 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.apache.forrest.log.LogPlugin.LOG;
+import org.apache.forrest.plugin.api.ForrestPlugin;
+import org.apache.forrest.plugin.api.ForrestResult;
+import org.apache.forrest.util.ContentType;
 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.LOG;
-import org.apache.forrest.plugin.api.ForrestPlugin;
-import org.apache.forrest.plugin.api.ForrestResult;
-import org.apache.forrest.util.ContentType;
+import org.osgi.util.tracker.ServiceTrackerCustomizer;
 
 /**
  * Implements the main Forrest servlet.

Modified: 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=1100225&r1=1100224&r2=1100225&view=diff
==============================================================================
--- forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/src/java/org/apache/forrest/http/ForrestServletPlugin.java
(original)
+++ forrest/trunk/whiteboard/forrest-osgi/org.apache.forrest.servlet/src/java/org/apache/forrest/http/ForrestServletPlugin.java
Fri May  6 14:12:10 2011
@@ -16,18 +16,19 @@
  */
 package org.apache.forrest.http;
 
-import java.util.Properties;
+import java.util.Dictionary;
+
+import javax.servlet.Servlet;
 import javax.servlet.ServletException;
 
+import org.apache.forrest.log.LogPlugin.LOG;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
+import org.osgi.service.http.HttpContext;
 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.LOG;
-
 /**
  * Registers a servlet with the OSGi HTTP Service with alias
  * <code>ForrestServletPlugin.SERVLET_ALIAS</code>.



Mime
View raw message