cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r608379 - in /cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice: components/ postable/components/ shielding/
Date Thu, 03 Jan 2008 08:42:46 GMT
Author: reinhard
Date: Thu Jan  3 00:42:43 2008
New Revision: 608379

URL: http://svn.apache.org/viewvc?rev=608379&view=rev
Log:
@since attribute
tidy up comments

Modified:
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/CompletePathModule.java
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/LinkRewriterReader.java
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/PathModule.java
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/PropertyModule.java
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceConsumerSource.java
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceConsumerSourceFactory.java
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceGenerator.java
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceSerializer.java
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceTransformer.java
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ServletService.java
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ShieldedGroupClassLoaderManager.java
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ShieldingClassLoaderInterceptor.java
    cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ShieldingServletService.java

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/CompletePathModule.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/CompletePathModule.java?rev=608379&r1=608378&r2=608379&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/CompletePathModule.java
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/CompletePathModule.java
Thu Jan  3 00:42:43 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -30,11 +30,13 @@
  * this module adds prefix-path on which block/servlet is mounted.<br>
  * Use this module if you need a base path for URLs pointing resources in your block.
  *
+ * @version $Id$
+ * @since 1.0.0
  */
 public class CompletePathModule implements InputModule {
-	
+
 	PathModule blockPathModule;
-	
+
 	public PathModule getBlockPathModule() {
 		return blockPathModule;
 	}

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/LinkRewriterReader.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/LinkRewriterReader.java?rev=608379&r1=608378&r2=608379&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/LinkRewriterReader.java
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/LinkRewriterReader.java
Thu Jan  3 00:42:43 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -49,10 +49,12 @@
 import org.xml.sax.SAXException;
 
 /**
+ * <p>
  * <code>LinkRewriterReader<code> implements <code>servlet:</code>
link rewriting in
  * text resources. It should be used especially for serving JavaScript files that have
  * paths refering to other blocks (<code>servlet:</code> links).
- * 
+ * </p>
+ *
  * <p><b>Configuration</b><br>
  * <code>encoding</code> - see {@link #setEncoding}<br>
  * <code>expires</code> - see {@link #setExpires}.
@@ -64,22 +66,23 @@
  * @cocoon.sitemap.component.documentation.caching Yes
  *
  * @version $Id$
+ * @since 1.0.0
  */
 public class LinkRewriterReader extends AbstractReader
                                 implements CacheableProcessingComponent {
 
     protected long configuredExpires = -1;
     protected String configuredEncoding = "UTF-8";
-    
+
     protected Response response;
     protected Request request;
     protected Source inputSource;
-    
+
     protected InputModule inputModule;
-    
+
     protected long expires;
     protected String encoding;
-    
+
     /**
      * This parameter is optional. When specified it determines how long
      * in miliseconds the resources can be cached by any proxy or browser
@@ -90,7 +93,7 @@
     public void setExpires(long expires) {
         this.configuredExpires = expires;
     }
-    
+
     /**
      * This parameter is optional. When specified it determines charset encoding
      * of <b>input</b> files. This is needed for parsing working properly.
@@ -100,29 +103,29 @@
     public void setEncoding(String encoding) {
         this.configuredEncoding = encoding;
     }
-    
+
     public void setInputModule(InputModule inputModule) {
         this.inputModule = inputModule;
     }
-    
+
     public void setup(SourceResolver resolver, Map objectModel, String src, Parameters par)
throws ProcessingException, SAXException, IOException {
         super.setup(resolver, objectModel, src, par);
-        
+
         this.request = ObjectModelHelper.getRequest(objectModel);
         this.response = ObjectModelHelper.getResponse(objectModel);
-        
+
         this.expires = par.getParameterAsLong("expires", this.configuredExpires);
         this.encoding = par.getParameter("encoding", this.configuredEncoding);
-        
+
         try {
             this.inputSource = resolver.resolveURI(src);
         } catch (SourceException e) {
             throw SourceUtil.handle("Error during resolving of '" + src + "'.", e);
         }
-        
+
         setupHeaders();
     }
-    
+
     protected void setupHeaders() {
         response.setHeader("Accept-Ranges", "none");
         if (expires > 0) {
@@ -130,8 +133,8 @@
         } else if (expires == 0) {
             response.setDateHeader("Expires", 0);
         }
-        
-        long lastModified = inputSource.getLastModified(); 
+
+        long lastModified = inputSource.getLastModified();
         if (lastModified > 0)
             response.setDateHeader("Last-Modified", lastModified);
     }
@@ -140,9 +143,9 @@
         InputStream inputStream = this.inputSource.getInputStream();
         InputStreamReader inputStreamReader = new InputStreamReader(inputStream, encoding);
         BufferedWriter outputWriter = new BufferedWriter(new OutputStreamWriter(out, encoding));
-        
+
         BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
-        
+
         String line = bufferedReader.readLine();
         int lineNumber = 1;
         while (line != null) {
@@ -155,7 +158,7 @@
         bufferedReader.close();
         outputWriter.close();
     }
-    
+
     /**
      * This class is just container for regexp URI pattern. This regexp bases on RFC2396.
      * Actually it's stripped version of original definition. It suits well for the task
- servlet: links rewriting.
@@ -169,41 +172,41 @@
         static final String pathSegment = "(?:"+pChar+")*(?:;(?:"+pChar+")*)*";
         static final String absPath = "(?:/"+pathSegment+")+";
         static final String reserved = ";|/|\\?|:|@|&|=|\\+|\\$|,";
-        static final String uric = reserved+"|"+unreserved+"|"+escaped; 
+        static final String uric = reserved+"|"+unreserved+"|"+escaped;
         static final String hierPath = absPath+"(?:\\?(?:"+uric+")*)*";
         static final String URIpattern = "servlet:((?:"+scheme+":)??"+hierPath+"(?:#(?:"+uric+")*)*)";
         static final Pattern compiledURIpattern = Pattern.compile(URIpattern);
     }
-    
+
     protected String proccessLine(String line, int lineNumber) throws ProcessingException
{
         if (getLogger().isDebugEnabled())
             getLogger().debug("Processing line: " + line);
-        
+
         Matcher matcher = URIregexp.compiledURIpattern.matcher(line);
         StringBuffer sb = new StringBuffer(line.length());
         while (matcher.find()) {
             if (getLogger().isDebugEnabled())
                 getLogger().debug("Processing link: " + matcher.group(0));
             String link = matcher.group(1);
-            
+
             Object replacement;
             try {
                 replacement = inputModule.getAttribute(link, null, objectModel);
             } catch (ConfigurationException e) {
-                throw ProcessingException.throwLocated("Failed to obtain attribute from input
module", e, 
+                throw ProcessingException.throwLocated("Failed to obtain attribute from input
module", e,
                         new LocationImpl(null, inputSource.getURI(), lineNumber, matcher.start()));
             }
-            
-            if (!(replacement instanceof String)) 
+
+            if (!(replacement instanceof String))
                 throw new ProcessingException("Attribute named '" + link + "' obtained from
'servlet' input module has to be String object.",
                         new LocationImpl(null, inputSource.getURI(), lineNumber, matcher.start()));
-            
+
             matcher.appendReplacement(sb, (String)replacement);
         }
         matcher.appendTail(sb);
         return sb.toString();
     }
-    
+
     /**
      * Returns the mime-type of the resource in process.
      */

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/PathModule.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/PathModule.java?rev=608379&r1=608378&r2=608379&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/PathModule.java
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/PathModule.java
Thu Jan  3 00:42:43 2008
@@ -33,6 +33,7 @@
  * BlockPathModule returns the absolute path of a block protocol path.
  *
  * @version $Id$
+ * @since 1.0.0
  */
 public class PathModule implements InputModule {
 

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/PropertyModule.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/PropertyModule.java?rev=608379&r1=608378&r2=608379&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/PropertyModule.java
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/components/PropertyModule.java
Thu Jan  3 00:42:43 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -30,6 +30,7 @@
  * BlockPropertyModule provides access to the properties of the current block.
  *
  * @version $Id$
+ * @since 1.0.0
  */
 public class PropertyModule implements InputModule {
 

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceConsumerSource.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceConsumerSource.java?rev=608379&r1=608378&r2=608379&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceConsumerSource.java
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceConsumerSource.java
Thu Jan  3 00:42:43 2008
@@ -29,14 +29,18 @@
 /**
  * The <code>ServletServiceConsumerSource</code> makes available the data that
has been passed to a sitemap service.
  * In a sitemap the source should be referenced with <code>service-consumer:</code>
syntax.<br>
+ *
  * FIXME: Provide a link to the documents discussing servlet (and sitemap) services.
+ *
+ * @version $Id$
+ * @since 1.0.0
  */
 public class ServletServiceConsumerSource extends AbstractSource {
-	
+
 	private Log logger = LogFactory.getLog(getClass());
-	
+
 	private InputStream requestBody;
-	
+
 	public ServletServiceConsumerSource(HttpServletRequest request) {
 		try {
 			requestBody = request.getInputStream();
@@ -48,7 +52,7 @@
 	public boolean exists() {
 		return requestBody != null;
 	}
-	
+
 	public InputStream getInputStream() throws IOException, SourceException {
 		if (!exists()) throw new SourceException("POST data does not exists for request. Make sure
you are processing service call.");
 		return requestBody;

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceConsumerSourceFactory.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceConsumerSourceFactory.java?rev=608379&r1=608378&r2=608379&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceConsumerSourceFactory.java
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceConsumerSourceFactory.java
Thu Jan  3 00:42:43 2008
@@ -31,9 +31,10 @@
  *
  * @see ServletServiceConsumerSource
  * @version $Id$
+ * @since 1.0.0
  */
 public class ServletServiceConsumerSourceFactory implements SourceFactory {
-	
+
     private ProcessInfoProvider processInfoProvider;
 
     public Source getSource(String location, Map parameters) throws IOException, MalformedURLException
{

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceGenerator.java?rev=608379&r1=608378&r2=608379&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceGenerator.java
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceGenerator.java
Thu Jan  3 00:42:43 2008
@@ -37,24 +37,24 @@
 /**
  * <p>The generator takes only <code>service</code> parameter that should
contain the URL of the called service.<br>
  * Use <code>servlet:</code> source for that purpose.</p>
- * 
+ *
  * <p>FIXME: Provide a link to the documents discussing servlet (and sitemap) services.</p>
- * 
+ *
  * @cocoon.sitemap.component.documentation
  * The <code>ServletServiceGenerator</code> POSTs its input data to a called
service and passes the XML data returned
  * by the service down the pipeline.
- * @cocoon.sitemap.component.name servletService 
+ * @cocoon.sitemap.component.name servletService
  * @cocoon.sitemap.component.documentation.caching Not Implemented
  *
- * @since 2.2
  * @version $Id$
+ * @since 1.0.0
  */
 public class ServletServiceGenerator extends AbstractGenerator {
-	
+
 	private SAXParser saxParser;
-	
+
 	private PostableSource servletSource;
-	
+
 
     public SAXParser getSaxParser() {
         return saxParser;
@@ -87,7 +87,7 @@
 		} catch (ParameterException e) {
 			throw new ProcessingException(e);
 		}
-		
+
         Source inputSource;
         try {
         	try {
@@ -96,16 +96,16 @@
         		throw new ProcessingException("Resolved '" + service + "' to source that is not
postable. Use servlet: protocol for service calls.");
         	}
             inputSource = super.resolver.resolveURI(src);
-            
+
         } catch (SourceException se) {
             throw SourceUtil.handle("Error during resolving of '" + src + "'.", se);
         }
-        
+
         if (getLogger().isDebugEnabled()) {
         	getLogger().debug("Source " + service + " resolved to " + servletSource.getURI());
             getLogger().debug("Source " + super.source + " resolved to " + inputSource.getURI());
         }
-        
+
         IOUtils.copy(inputSource.getInputStream(), servletSource.getOutputStream());
 	}
 }

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceSerializer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceSerializer.java?rev=608379&r1=608378&r2=608379&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceSerializer.java
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceSerializer.java
Thu Jan  3 00:42:43 2008
@@ -45,18 +45,18 @@
  * contain the URL of the called service.</p>
  *
  * <p>Use <code>servlet:</code> source for that purpose.</p>
- * 
+ *
  * <p>FIXME: Provide a link to the documents discussing servlet (and sitemap) services.</p>
- * 
+ *
  * @cocoon.sitemap.component.documentation
  * The <code>ServletServiceSerializer</code> POSTs its input data to a called
  * service. Result of the serialization is a data returned by the called
  * service.
- * @cocoon.sitemap.component.name servletService  
+ * @cocoon.sitemap.component.name servletService
  * @cocoon.sitemap.component.documentation.caching Not Implemented
  *
- * @since 2.2
  * @version $Id$
+ * @since 1.0.0
  */
 public class ServletServiceSerializer extends AbstractSerializer
                                       implements SitemapModelComponent {
@@ -90,7 +90,7 @@
 
 		saxBuffer = new SaxBuffer();
 		setConsumer(saxBuffer);
-		
+
 		response = ObjectModelHelper.getResponse(objectModel);
 	}
 
@@ -106,7 +106,7 @@
 
         try {
             // TODO Improve this quick fix; it is better for Postable to provide Writer instead.
-            // TODO Need to specify 
+            // TODO Need to specify
             // Convert output stream to writer to specify UTF-8 encoding.
             Writer out = new OutputStreamWriter(servletSource.getOutputStream(), "UTF-8");
             IOUtils.copy(new StringReader(serializedXML), out);
@@ -118,7 +118,7 @@
         try {
 			//here real mime type is set, see Spring bean's configuration comment
 			response.setHeader("Content-Type", servletSource.getMimeType());
-			
+
 			IOUtils.copy(servletSource.getInputStream(), super.output);
 		} catch (Exception e) {
 			throw new SAXException("Exception occured while copying response from the service to the
output stream", e);

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceTransformer.java?rev=608379&r1=608378&r2=608379&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceTransformer.java
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/postable/components/ServletServiceTransformer.java
Thu Jan  3 00:42:43 2008
@@ -35,25 +35,25 @@
 /**
  * <p>The generator takes only <code>service</code> parameter that should
contain the URL of the called service.<br>
  * Use <code>servlet:</code> source for that purpose.</p>
- * 
+ *
  * <p>FIXME: Provide a link to the documents discussing servlet (and sitemap) services.</p>
- * 
+ *
  * @cocoon.sitemap.component.documentation
  * The <code>ServletServiceTransformer</code> POSTs its input data to a called
service and passes the XML data returned
  * by the service down the pipeline.
  * @cocoon.sitemap.component.name servletService
  * @cocoon.sitemap.component.documentation.caching Not Implemented
  *
- * @since 2.2
  * @version $Id$
+ * @since 1.0.0
  */
 public class ServletServiceTransformer extends AbstractSAXTransformer
                                        implements DisposableSitemapComponent {
 
 	private SAXParser saxParser;
-	
+
 	private PostableSource servletSource;
-	
+
 
     public SAXParser getSaxParser() {
         return saxParser;
@@ -66,29 +66,29 @@
 
 	public void setupTransforming() throws IOException, ProcessingException, SAXException {
 		super.setupTransforming();
-		
+
 		String service;
 		try {
 			service = parameters.getParameter("service");
 		} catch (ParameterException e) {
 			throw new ProcessingException(e);
 		}
-		
+
         try {
         	servletSource = (PostableSource)resolver.resolveURI(service);
         } catch (ClassCastException e) {
-        	throw new ProcessingException("Resolved '" + service + "' to source that is not
postable. Use servlet: protocol for service calls.");            
+        	throw new ProcessingException("Resolved '" + service + "' to source that is not
postable. Use servlet: protocol for service calls.");
         } catch (SourceException se) {
             throw SourceUtil.handle("Error during resolving of '" + service + "'.", se);
         }
-        
+
         if (getLogger().isDebugEnabled()) {
         	getLogger().debug("Source " + service + " resolved to " + servletSource.getURI());
         }
-		
+
 		startSerializedXMLRecording(null);
 	}
-	
+
 	public void endDocument() throws SAXException {
 		super.endDocument();
 
@@ -101,7 +101,7 @@
 			throw new SAXException("Exception occured while calling servlet service", e);
 		}
 	}
-	
+
 	public void dispose() {
 		if (servletSource != null) {
 			resolver.release(servletSource);

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ServletService.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ServletService.java?rev=608379&r1=608378&r2=608379&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ServletService.java
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ServletService.java
Thu Jan  3 00:42:43 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -43,17 +43,23 @@
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
- * This class is only used as a base class for the {@link ShieldingServletService}. For non
shielded servlet
- * services, the {@link org.apache.cocoon.servletservice.spring.ServletFactoryBean} should
be used.
- * 
+ * <p>
+ * This class is only used as a base class for the
+ * {@link ShieldingServletService}. For non shielded servlet services, the
+ * {@link org.apache.cocoon.servletservice.spring.ServletFactoryBean} should be
+ * used.
+ * </p>
+ * <p>
  * TODO: Make the shielding work together with the ServletBeanFactory.
- * 
+ * </p>
+ *
  * @version $Id$
+ * @since 1.0.0
  */
 public class ServletService extends HttpServlet
     implements ApplicationContextAware, ServletContextAware, BeanNameAware,
     InitializingBean, DisposableBean {
-    
+
     private ServletServiceContext servletServiceContext;
     private String embeddedServletClass;
     private Servlet embeddedServlet;
@@ -64,7 +70,7 @@
     public ServletService() {
         this.servletServiceContext = new ServletServiceContext();
     }
-    
+
     /* (non-Javadoc)
      * @see javax.servlet.GenericServlet#init(javax.servlet.ServletConfig)
      */
@@ -97,7 +103,7 @@
                     return super.getServletContext().getInitParameterNames();
                 }
             };
-            
+
         super.init(blockServletConfig);
 
         // create and initialize the embedded servlet
@@ -105,10 +111,10 @@
         this.embeddedServlet.init(blockServletConfig);
         this.servletServiceContext.setServlet(this.embeddedServlet);
     }
-    
+
     /**
      * Creates and initializes the embedded servlet
-     * @param string 
+     * @param string
      * @throws ServletException
      */
     protected Servlet createEmbeddedServlet(String embeddedServletClassName, ServletConfig
servletConfig)
@@ -131,10 +137,10 @@
     }
 
     public void destroy() {
-        this.embeddedServlet.destroy();        
+        this.embeddedServlet.destroy();
         super.destroy();
     }
-    
+
     public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
{
         this.parentContainer = applicationContext;
     }
@@ -148,13 +154,13 @@
     }
 
     public void setMountPath(String mountPath) {
-        this.servletServiceContext.setMountPath(mountPath);        
+        this.servletServiceContext.setMountPath(mountPath);
     }
-    
+
     public String getMountPath() {
         return this.servletServiceContext.getMountPath();
     }
-    
+
     /**
      * The path to the blocks resources relative to the servlet context URL,
      * must start with an '/'.
@@ -173,7 +179,7 @@
     public void setProperties(Map properties) {
         this.servletServiceContext.setInitParams(properties);
     }
-    
+
     public void setConnections(Map connections) {
         this.servletServiceContext.setConnections(connections);
     }
@@ -199,7 +205,7 @@
             public String getServletName() {
                 return ServletService.this.beanName;
             }
-            
+
         };
         this.init(servletConfig);
     }

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ShieldedGroupClassLoaderManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ShieldedGroupClassLoaderManager.java?rev=608379&r1=608378&r2=608379&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ShieldedGroupClassLoaderManager.java
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ShieldedGroupClassLoaderManager.java
Thu Jan  3 00:42:43 2008
@@ -31,6 +31,9 @@
  * Used by the ShieldingServletService to obtain a shielded classloader. Supports
  * groups of servlets that use the same classloader that is still shielded from
  * the rest of the webapp.
+ *
+ * @version $Id$
+ * @since 1.0.0
  */
 public class ShieldedGroupClassLoaderManager {
 
@@ -79,7 +82,7 @@
         }
 
         ClassLoader shieldedClassLoader;
-        
+
         shieldedClassLoader = createClassLoader(
                 ShieldedGroupClassLoaderManager.class.getClassLoader(),
                 servletContext, parameters);

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ShieldingClassLoaderInterceptor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ShieldingClassLoaderInterceptor.java?rev=608379&r1=608378&r2=608379&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ShieldingClassLoaderInterceptor.java
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ShieldingClassLoaderInterceptor.java
Thu Jan  3 00:42:43 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -19,6 +19,10 @@
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 
+/**
+ * @version $Id$
+ * @since 1.0.0
+ */
 public class ShieldingClassLoaderInterceptor implements MethodInterceptor {
 
     private final ClassLoader classLoader;

Modified: cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ShieldingServletService.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ShieldingServletService.java?rev=608379&r1=608378&r2=608379&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ShieldingServletService.java
(original)
+++ cocoon/trunk/core/cocoon-servlet-service/cocoon-servlet-service-components/src/main/java/org/apache/cocoon/servletservice/shielding/ShieldingServletService.java
Thu Jan  3 00:42:43 2008
@@ -5,9 +5,9 @@
  * 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.
@@ -28,6 +28,9 @@
 
 /**
  * A servlet for use in cocoon blocks that adds shielded classloading support.
+ *
+ * @version $Id$
+ * @since 1.0.0
  */
 public class ShieldingServletService extends ServletService {
 
@@ -77,7 +80,7 @@
         this.classLoaderFactory = classLoaderFactory;
     }
 
-    protected Servlet createEmbeddedServlet(String embeddedServletClassName, ServletConfig
servletConfig) 
+    protected Servlet createEmbeddedServlet(String embeddedServletClassName, ServletConfig
servletConfig)
     throws ServletException {
         // create the classloader
         Map parameters = new HashMap();
@@ -89,15 +92,15 @@
                 this.shieldedClasses);
         parameters.put(ShieldedGroupClassLoaderManager.CLASSLOADER_FACTORY_PARAM,
                 this.classLoaderFactory);
-        
-        this.classLoader = 
+
+        this.classLoader =
             ShieldedGroupClassLoaderManager.getClassLoader(getServletContext(), parameters);
 
         // Create the servlet
         final ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
         try {
             Thread.currentThread().setContextClassLoader(this.classLoader);
-            
+
             Class servletClass = this.classLoader.loadClass(embeddedServletClassName);
             Servlet embeddedServlet = (Servlet) servletClass.newInstance();
             ProxyFactory proxyFactory = new ProxyFactory(embeddedServlet);



Mime
View raw message