You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2008/04/14 19:07:15 UTC

svn commit: r647905 - in /cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache: cocoon/jnet/ excalibur/source/ excalibur/sourceresolve/jnet/source/ excalibur/sourceresolve/test/

Author: reinhard
Date: Mon Apr 14 10:07:03 2008
New Revision: 647905

URL: http://svn.apache.org/viewvc?rev=647905&view=rev
Log:
. move JNet of Corona into the Cocoon namespace

Added:
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/
      - copied from r647815, cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/source/
Removed:
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/source/
Modified:
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/ModifiableSource.java
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/ModifiableTraversableSource.java
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/MoveableSource.java
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/Source.java
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceException.java
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceFactory.java
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceNotFoundException.java
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceParameters.java
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceResolver.java
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceUtil.java
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceValidity.java
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/TraversableSource.java
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/URIAbsolutizer.java
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceIOInputStream.java
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceSAXResult.java
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceURLConnection.java
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceURLStreamHandler.java
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceURLStreamHandlerFactory.java
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/test/FileSource.java
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/test/FileSourceFactory.java
    cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/test/Test.java

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/ModifiableSource.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/ModifiableSource.java?rev=647905&r1=647815&r2=647905&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/ModifiableSource.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/ModifiableSource.java Mon Apr 14 10:07:03 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.excalibur.source;
+package org.apache.cocoon.jnet;
 
 import java.io.IOException;
 import java.io.OutputStream;

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/ModifiableTraversableSource.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/ModifiableTraversableSource.java?rev=647905&r1=647815&r2=647905&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/ModifiableTraversableSource.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/ModifiableTraversableSource.java Mon Apr 14 10:07:03 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.excalibur.source;
+package org.apache.cocoon.jnet;
 
 /**
  * A modifiable traversable source. This adds to {@link ModifiableSource} the

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/MoveableSource.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/MoveableSource.java?rev=647905&r1=647815&r2=647905&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/MoveableSource.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/MoveableSource.java Mon Apr 14 10:07:03 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.excalibur.source;
+package org.apache.cocoon.jnet;
 
 
 /**

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/Source.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/Source.java?rev=647905&r1=647815&r2=647905&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/Source.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/Source.java Mon Apr 14 10:07:03 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.excalibur.source;
+package org.apache.cocoon.jnet;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceException.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceException.java?rev=647905&r1=647815&r2=647905&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceException.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceException.java Mon Apr 14 10:07:03 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.excalibur.source;
+package org.apache.cocoon.jnet;
 
 import java.io.IOException;
 

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceFactory.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceFactory.java?rev=647905&r1=647815&r2=647905&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceFactory.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceFactory.java Mon Apr 14 10:07:03 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.excalibur.source;
+package org.apache.cocoon.jnet;
 
 import java.io.IOException;
 import java.net.MalformedURLException;

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceNotFoundException.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceNotFoundException.java?rev=647905&r1=647815&r2=647905&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceNotFoundException.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceNotFoundException.java Mon Apr 14 10:07:03 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.excalibur.source;
+package org.apache.cocoon.jnet;
 
 /**
  * This Exception should be thrown if the source could not be found.

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceParameters.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceParameters.java?rev=647905&r1=647815&r2=647905&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceParameters.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceParameters.java Mon Apr 14 10:07:03 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.excalibur.source;
+package org.apache.cocoon.jnet;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -30,7 +30,7 @@
  * request parameters.
  * <p>
  * Only particular kinds of <code>Source</code> implementations, such as
- * {@link org.apache.excalibur.source.factories.URLSource} support this kind of
+ * {@link org.apache.cocoon.jnet.factories.URLSource} support this kind of
  * parameters, passed as the {@link SourceResolver#URI_PARAMETERS} entry
  * in the <code>parameters</code> argument of
  * {@link SourceResolver#resolveURI(String, String, Map)}.

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceResolver.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceResolver.java?rev=647905&r1=647815&r2=647905&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceResolver.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceResolver.java Mon Apr 14 10:07:03 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.excalibur.source;
+package org.apache.cocoon.jnet;
 
 import java.io.IOException;
 import java.net.MalformedURLException;

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceUtil.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceUtil.java?rev=647905&r1=647815&r2=647905&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceUtil.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceUtil.java Mon Apr 14 10:07:03 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.excalibur.source;
+package org.apache.cocoon.jnet;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceValidity.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceValidity.java?rev=647905&r1=647815&r2=647905&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceValidity.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/SourceValidity.java Mon Apr 14 10:07:03 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.excalibur.source;
+package org.apache.cocoon.jnet;
 
 import java.io.Serializable;
 

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/TraversableSource.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/TraversableSource.java?rev=647905&r1=647815&r2=647905&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/TraversableSource.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/TraversableSource.java Mon Apr 14 10:07:03 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.excalibur.source;
+package org.apache.cocoon.jnet;
 
 
 import java.util.Collection;

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/URIAbsolutizer.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/URIAbsolutizer.java?rev=647905&r1=647815&r2=647905&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/URIAbsolutizer.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/cocoon/jnet/URIAbsolutizer.java Mon Apr 14 10:07:03 2008
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.excalibur.source;
+package org.apache.cocoon.jnet;
 
 /**
  * Implemented by a SourceFactory when it supports applying a relative URI

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceIOInputStream.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceIOInputStream.java?rev=647905&r1=647904&r2=647905&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceIOInputStream.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceIOInputStream.java Mon Apr 14 10:07:03 2008
@@ -19,8 +19,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceFactory;
+import org.apache.cocoon.jnet.Source;
+import org.apache.cocoon.jnet.SourceFactory;
 
 public class SourceIOInputStream extends InputStream {
 

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceSAXResult.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceSAXResult.java?rev=647905&r1=647904&r2=647905&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceSAXResult.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceSAXResult.java Mon Apr 14 10:07:03 2008
@@ -18,8 +18,8 @@
 
 import javax.xml.transform.sax.SAXResult;
 
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceFactory;
+import org.apache.cocoon.jnet.Source;
+import org.apache.cocoon.jnet.SourceFactory;
 import org.apache.excalibur.xml.sax.XMLizable;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceURLConnection.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceURLConnection.java?rev=647905&r1=647904&r2=647905&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceURLConnection.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceURLConnection.java Mon Apr 14 10:07:03 2008
@@ -26,8 +26,8 @@
 
 import javax.xml.transform.sax.SAXResult;
 
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceFactory;
+import org.apache.cocoon.jnet.Source;
+import org.apache.cocoon.jnet.SourceFactory;
 import org.apache.excalibur.xml.sax.XMLizable;
 
 public class SourceURLConnection extends URLConnection {

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceURLStreamHandler.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceURLStreamHandler.java?rev=647905&r1=647904&r2=647905&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceURLStreamHandler.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceURLStreamHandler.java Mon Apr 14 10:07:03 2008
@@ -22,7 +22,7 @@
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
 
-import org.apache.excalibur.source.SourceFactory;
+import org.apache.cocoon.jnet.SourceFactory;
 
 public class SourceURLStreamHandler extends URLStreamHandler {
 

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceURLStreamHandlerFactory.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceURLStreamHandlerFactory.java?rev=647905&r1=647904&r2=647905&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceURLStreamHandlerFactory.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/jnet/source/SourceURLStreamHandlerFactory.java Mon Apr 14 10:07:03 2008
@@ -20,12 +20,12 @@
 import java.net.URLStreamHandlerFactory;
 import java.util.Map;
 
-import org.apache.excalibur.source.SourceFactory;
+import org.apache.cocoon.jnet.SourceFactory;
 
 public class SourceURLStreamHandlerFactory implements URLStreamHandlerFactory {
 
     /**
-     * @see org.apache.excalibur.sourceresolve.jnet.ParentAwareURLStreamHandlerFactory#create(java.lang.String)
+     * @see org.apache.cocoon.jnet.jnet.ParentAwareURLStreamHandlerFactory#create(java.lang.String)
      */
     public URLStreamHandler createURLStreamHandler(String protocol) {
         final Map factories = SourceFactoriesManager.getCurrentFactories();

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/test/FileSource.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/test/FileSource.java?rev=647905&r1=647904&r2=647905&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/test/FileSource.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/test/FileSource.java Mon Apr 14 10:07:03 2008
@@ -29,14 +29,14 @@
 import java.util.Collection;
 import java.util.ConcurrentModificationException;
 
-import org.apache.excalibur.source.ModifiableSource;
-import org.apache.excalibur.source.ModifiableTraversableSource;
-import org.apache.excalibur.source.MoveableSource;
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceException;
-import org.apache.excalibur.source.SourceNotFoundException;
-import org.apache.excalibur.source.SourceUtil;
-import org.apache.excalibur.source.SourceValidity;
+import org.apache.cocoon.jnet.ModifiableSource;
+import org.apache.cocoon.jnet.ModifiableTraversableSource;
+import org.apache.cocoon.jnet.MoveableSource;
+import org.apache.cocoon.jnet.Source;
+import org.apache.cocoon.jnet.SourceException;
+import org.apache.cocoon.jnet.SourceNotFoundException;
+import org.apache.cocoon.jnet.SourceUtil;
+import org.apache.cocoon.jnet.SourceValidity;
 
 /**
  * A {@link ModifiableTraversableSource} for filesystem objects.
@@ -128,14 +128,14 @@
     // ----------------------------------------------------------------------------------
 
     /**
-     * @see org.apache.excalibur.source.Source#getContentLength()
+     * @see org.apache.cocoon.jnet.Source#getContentLength()
      */
     public long getContentLength() {
         return this.m_file.length();
     }
 
     /**
-     * @see org.apache.excalibur.source.Source#getInputStream()
+     * @see org.apache.cocoon.jnet.Source#getInputStream()
      */
     public InputStream getInputStream() throws IOException, SourceNotFoundException {
         try {
@@ -146,14 +146,14 @@
     }
 
     /**
-     * @see org.apache.excalibur.source.Source#getLastModified()
+     * @see org.apache.cocoon.jnet.Source#getLastModified()
      */
     public long getLastModified() {
         return this.m_file.lastModified();
     }
 
     /**
-     * @see org.apache.excalibur.source.Source#getMimeType()
+     * @see org.apache.cocoon.jnet.Source#getMimeType()
      */
     public String getMimeType() {
         return URLConnection.getFileNameMap().getContentTypeFor(this.m_file.getName());
@@ -184,14 +184,14 @@
     /**
      * Return a validity object based on the file's modification date.
      * 
-     * @see org.apache.excalibur.source.Source#getValidity()
+     * @see org.apache.cocoon.jnet.Source#getValidity()
      */
     public SourceValidity getValidity() {
         return null;
     }
 
     /**
-     * @see org.apache.excalibur.source.Source#refresh()
+     * @see org.apache.cocoon.jnet.Source#refresh()
      */
     public void refresh() {
         // Nothing to do...
@@ -211,7 +211,7 @@
     // ----------------------------------------------------------------------------------
 
     /**
-     * @see org.apache.excalibur.source.TraversableSource#getChild(java.lang.String)
+     * @see org.apache.cocoon.jnet.TraversableSource#getChild(java.lang.String)
      */
     public Source getChild(String name) throws SourceException {
         if (!this.m_file.isDirectory()) {
@@ -223,7 +223,7 @@
     }
 
     /**
-     * @see org.apache.excalibur.source.TraversableSource#getChildren()
+     * @see org.apache.cocoon.jnet.TraversableSource#getChildren()
      */
     public Collection getChildren() throws SourceException {
 
@@ -244,21 +244,21 @@
     }
 
     /**
-     * @see org.apache.excalibur.source.TraversableSource#getName()
+     * @see org.apache.cocoon.jnet.TraversableSource#getName()
      */
     public String getName() {
         return this.m_file.getName();
     }
 
     /**
-     * @see org.apache.excalibur.source.TraversableSource#getParent()
+     * @see org.apache.cocoon.jnet.TraversableSource#getParent()
      */
     public Source getParent() throws SourceException {
         return new FileSource(this.getScheme(), this.m_file.getParentFile());
     }
 
     /**
-     * @see org.apache.excalibur.source.TraversableSource#isCollection()
+     * @see org.apache.cocoon.jnet.TraversableSource#isCollection()
      */
     public boolean isCollection() {
         return this.m_file.isDirectory();
@@ -368,7 +368,7 @@
     // ----------------------------------------------------------------------------------
 
     /**
-     * @see org.apache.excalibur.source.ModifiableTraversableSource#makeCollection()
+     * @see org.apache.cocoon.jnet.ModifiableTraversableSource#makeCollection()
      */
     public void makeCollection() throws SourceException {
         this.m_file.mkdirs();
@@ -379,7 +379,7 @@
     // ----------------------------------------------------------------------------------
 
     /**
-     * @see org.apache.excalibur.source.MoveableSource#copyTo(org.apache.excalibur.source.Source)
+     * @see org.apache.cocoon.jnet.MoveableSource#copyTo(org.apache.cocoon.jnet.Source)
      */
     public void copyTo(Source destination) throws SourceException {
         try {
@@ -390,7 +390,7 @@
     }
 
     /**
-     * @see org.apache.excalibur.source.MoveableSource#moveTo(org.apache.excalibur.source.Source)
+     * @see org.apache.cocoon.jnet.MoveableSource#moveTo(org.apache.cocoon.jnet.Source)
      */
     public void moveTo(Source destination) throws SourceException {
         if (destination instanceof FileSource) {

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/test/FileSourceFactory.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/test/FileSourceFactory.java?rev=647905&r1=647904&r2=647905&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/test/FileSourceFactory.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/test/FileSourceFactory.java Mon Apr 14 10:07:03 2008
@@ -20,10 +20,10 @@
 import java.net.MalformedURLException;
 import java.util.Map;
 
-import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceFactory;
-import org.apache.excalibur.source.SourceUtil;
-import org.apache.excalibur.source.URIAbsolutizer;
+import org.apache.cocoon.jnet.Source;
+import org.apache.cocoon.jnet.SourceFactory;
+import org.apache.cocoon.jnet.SourceUtil;
+import org.apache.cocoon.jnet.URIAbsolutizer;
 
 /**
  * A factory for filesystem-based sources (see {@link FileSource}).
@@ -34,7 +34,7 @@
 public class FileSourceFactory implements SourceFactory, URIAbsolutizer {
 
     /**
-     * @see org.apache.excalibur.source.SourceFactory#getSource(java.lang.String,
+     * @see org.apache.cocoon.jnet.SourceFactory#getSource(java.lang.String,
      *      java.util.Map)
      */
     public Source getSource(String location, Map parameters) throws IOException, MalformedURLException {
@@ -44,7 +44,7 @@
     /**
      * Does nothing, since {@link FileSource}s don't need to be released.
      * 
-     * @see org.apache.excalibur.source.SourceFactory#release(org.apache.excalibur.source.Source)
+     * @see org.apache.cocoon.jnet.SourceFactory#release(org.apache.cocoon.jnet.Source)
      */
     public void release(Source source) {
         // Nothing to do here

Modified: cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/test/Test.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/test/Test.java?rev=647905&r1=647904&r2=647905&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/test/Test.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-servlet/src/main/java/org/apache/excalibur/sourceresolve/test/Test.java Mon Apr 14 10:07:03 2008
@@ -21,7 +21,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.excalibur.source.SourceFactory;
+import org.apache.cocoon.jnet.SourceFactory;
 import org.apache.excalibur.sourceresolve.jnet.URLStreamHandlerFactoryInstaller;
 import org.apache.excalibur.sourceresolve.jnet.source.SourceFactoriesManager;
 import org.apache.excalibur.sourceresolve.jnet.source.SourceURLStreamHandlerFactory;