Author: kkolinko Date: Thu Nov 10 05:46:02 2011 New Revision: 1200164 URL: http://svn.apache.org/viewvc?rev=1200164&view=rev Log: Merging revision 1187781 from tomcat/trunk: Whitespace removal from /java/org/apache/tomcat I won't merge all of it (as it spans bcel etc.), but only our code. Part 1.
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/InstanceManager.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/JarScanner.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/JarScannerCallback.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/PeriodicEventListener.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Directory.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/File.java tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSLSocket.java Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/InstanceManager.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/InstanceManager.java?rev=1200164&r1=1200163&r2=1200164&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/InstanceManager.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/InstanceManager.java Thu Nov 10 05:46:02 2011 @@ -26,14 +26,14 @@ import javax.naming.NamingException; public interface InstanceManager { public Object newInstance(String className) - throws IllegalAccessException, InvocationTargetException, NamingException, + throws IllegalAccessException, InvocationTargetException, NamingException, InstantiationException, ClassNotFoundException; - public Object newInstance(String fqcn, ClassLoader classLoader) - throws IllegalAccessException, InvocationTargetException, NamingException, + public Object newInstance(String fqcn, ClassLoader classLoader) + throws IllegalAccessException, InvocationTargetException, NamingException, InstantiationException, ClassNotFoundException; - public void newInstance(Object o) + public void newInstance(Object o) throws IllegalAccessException, InvocationTargetException, NamingException; public void destroyInstance(Object o) Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/JarScanner.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/JarScanner.java?rev=1200164&r1=1200163&r2=1200164&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/JarScanner.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/JarScanner.java Thu Nov 10 05:46:02 2011 @@ -23,14 +23,14 @@ import javax.servlet.ServletContext; /** * Scans a web application and classloader hierarchy for JAR files. Uses * include TLD scanning and web-fragment.xml scanning. Uses a call-back - * mechanism so the caller can process each JAR found. + * mechanism so the caller can process each JAR found. */ public interface JarScanner { /** * Scan the provided ServletContext and classloader for JAR files. Each JAR * file found will be passed to the callback handler to be processed. - * + * * @param context The ServletContext - used to locate and access * WEB-INF/lib * @param classloader The classloader - used to access JARs not in @@ -40,5 +40,5 @@ public interface JarScanner { */ public void scan(ServletContext context, ClassLoader classloader, JarScannerCallback callback, Set<String> jarsToSkip); - + } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/JarScannerCallback.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/JarScannerCallback.java?rev=1200164&r1=1200163&r2=1200164&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/JarScannerCallback.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/JarScannerCallback.java Thu Nov 10 05:46:02 2011 @@ -24,12 +24,12 @@ import java.net.JarURLConnection; public interface JarScannerCallback { /** - * + * * @param urlConn * @throws IOException */ public void scan(JarURLConnection urlConn) throws IOException; - + public void scan(File file) throws IOException ; } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/PeriodicEventListener.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/PeriodicEventListener.java?rev=1200164&r1=1200163&r2=1200164&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/PeriodicEventListener.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/PeriodicEventListener.java Thu Nov 10 05:46:02 2011 @@ -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. Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java?rev=1200164&r1=1200163&r2=1200164&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/buildutil/Txt2Html.java Thu Nov 10 05:46:02 2011 @@ -42,16 +42,16 @@ import org.apache.tools.ant.types.FileSe * * @author Mark Roth */ -public class Txt2Html - extends Task +public class Txt2Html + extends Task { - + /** The directory to contain the resulting files */ private File todir; - + /** The file to be converted into HTML */ private List<FileSet> filesets = new LinkedList<FileSet>(); - + /** * Sets the directory to contain the resulting files * @@ -60,7 +60,7 @@ public class Txt2Html public void setTodir( File todir ) { this.todir = todir; } - + /** * Sets the files to be converted into HTML * @@ -69,7 +69,7 @@ public class Txt2Html public void addFileset( FileSet fs ) { filesets.add( fs ); } - + /** * Perform the conversion * @@ -77,11 +77,11 @@ public class Txt2Html * this task. */ @Override - public void execute() - throws BuildException + public void execute() + throws BuildException { int count = 0; - + // Step through each file and convert. Iterator<FileSet> iter = filesets.iterator(); while( iter.hasNext() ) { @@ -92,29 +92,29 @@ public class Txt2Html for( int i = 0; i < files.length; i++ ) { File from = new File( basedir, files[i] ); File to = new File( todir, files[i] + ".html" ); - if( !to.exists() || - (from.lastModified() > to.lastModified()) ) + if( !to.exists() || + (from.lastModified() > to.lastModified()) ) { - log( "Converting file '" + from.getAbsolutePath() + + log( "Converting file '" + from.getAbsolutePath() + "' to '" + to.getAbsolutePath(), Project.MSG_VERBOSE ); try { convert( from, to ); } catch( IOException e ) { - throw new BuildException( "Could not convert '" + - from.getAbsolutePath() + "' to '" + + throw new BuildException( "Could not convert '" + + from.getAbsolutePath() + "' to '" + to.getAbsolutePath() + "'", e ); } count++; } } if( count > 0 ) { - log( "Converted " + count + " file" + (count > 1 ? "s" : "") + + log( "Converted " + count + " file" + (count > 1 ? "s" : "") + " to " + todir.getAbsolutePath() ); } } } - + /** * Perform the actual copy and conversion * @@ -128,10 +128,10 @@ public class Txt2Html // Open files: BufferedReader in = new BufferedReader( new FileReader( from ) ); PrintWriter out = new PrintWriter( new FileWriter( to ) ); - + // Output header: out.println( "<html><body><pre>" ); - + // Convert, line-by-line: String line; while( (line = in.readLine()) != null ) { @@ -152,15 +152,15 @@ public class Txt2Html } out.println( result.toString() ); } - + // Output footer: out.println( "</pre></body></html>" ); - + // Close streams: out.close(); in.close(); } - + } Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Directory.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Directory.java?rev=1200164&r1=1200163&r2=1200164&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Directory.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/Directory.java Thu Nov 10 05:46:02 2011 @@ -53,7 +53,7 @@ public class Directory { * Find an existing directory suitable as a temporary storage location. * @param pool The pool to use for any necessary allocations. * @return The temp directory. - * + * * This function uses an algorithm to search for a directory that an * an application can use for temporary storage. Once such a * directory is found, that location is cached by the library. Thus, Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/File.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/File.java?rev=1200164&r1=1200163&r2=1200164&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/File.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/File.java Thu Nov 10 05:46:02 2011 @@ -242,7 +242,7 @@ public class File { * APR_CREATE | APR_READ | APR_WRITE | APR_EXCL | APR_DELONCLOSE * @param pool The pool to allocate the file out of. * @return The apr file to use as a temporary file. - * + * * This function generates a unique temporary file name from template. * The last six characters of template must be XXXXXX and these are replaced * with a string that makes the filename unique. Since it will be modified, Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSLSocket.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSLSocket.java?rev=1200164&r1=1200163&r2=1200164&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSLSocket.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/jni/SSLSocket.java Thu Nov 10 05:46:02 2011 @@ -78,8 +78,8 @@ public class SSLSocket { * @param level Type of Client Certificate verification. */ public static native void setVerify(long sock, int level, int depth); - - /** + + /** * Return SSL Info parameter as byte array. * * @param sock The socket to read the data from. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org