Author: markt
Date: Fri Dec 2 21:25:49 2011
New Revision: 1209694
URL: http://svn.apache.org/viewvc?rev=1209694&view=rev
Log:
Fix checkstyle errors
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/trunk/java/org/apache/naming/resources/VirtualDirContext.java
tomcat/trunk/test/org/apache/catalina/loader/EchoTag.java
tomcat/trunk/test/org/apache/catalina/loader/MyAnnotatedServlet.java
tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
tomcat/trunk/test/webapp-3.0-virtual-webapp/src/main/webapp2/rsrc/resourceF.properties
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1209694&r1=1209693&r2=1209694&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Fri Dec
2 21:25:49 2011
@@ -1341,7 +1341,7 @@ public class WebappClassLoader
}
}
-
+
final Iterator<URL> iterator = result.iterator();
return new Enumeration<URL>() {
Modified: tomcat/trunk/java/org/apache/naming/resources/VirtualDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/resources/VirtualDirContext.java?rev=1209694&r1=1209693&r2=1209694&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/resources/VirtualDirContext.java
(original)
+++ tomcat/trunk/java/org/apache/naming/resources/VirtualDirContext.java Fri
Dec 2 21:25:49 2011
@@ -28,7 +28,6 @@ import java.util.StringTokenizer;
import javax.naming.NamingException;
import javax.naming.directory.Attributes;
-import org.apache.catalina.loader.VirtualWebappLoader;
import org.apache.naming.NamingEntry;
/**
@@ -36,9 +35,9 @@ import org.apache.naming.NamingEntry;
* directories of the filesystem under a single webapp, a feature mainly used
* for development with IDEs.
* This should be used in conjunction with {@link VirtualWebappLoader}.
- *
+ *
* Sample context xml configuration:
- *
+ *
* <code>
* <Context path="/mywebapp"
docBase="/Users/theuser/mywebapp/src/main/webapp" >
* <Resources className="org.apache.naming.resources.VirtualDirContext"
@@ -48,13 +47,13 @@ import org.apache.naming.NamingEntry;
* <JarScanner scanAllDirectories="true" />
* </Context>
* </code>
- *
- *
+ *
+ *
* <strong>This is not meant to be used for production.
* Its meant to ease development with IDE's without the
* need for fully republishing jars in WEB-INF/lib</strong>
- *
- *
+ *
+ *
* @author Fabrizio Giustina
* @version $Id$
*/
@@ -76,7 +75,7 @@ public class VirtualDirContext extends F
* The path to the docBase must not be added here, otherwise resources
would
* be listed twice.
* </p>
- *
+ *
* @param path
*/
public void setExtraResourcePaths(String path) {
Modified: tomcat/trunk/test/org/apache/catalina/loader/EchoTag.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/EchoTag.java?rev=1209694&r1=1209693&r2=1209694&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/loader/EchoTag.java (original)
+++ tomcat/trunk/test/org/apache/catalina/loader/EchoTag.java Fri Dec 2
21:25:49 2011
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.catalina.loader;
import java.io.IOException;
Modified: tomcat/trunk/test/org/apache/catalina/loader/MyAnnotatedServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/MyAnnotatedServlet.java?rev=1209694&r1=1209693&r2=1209694&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/loader/MyAnnotatedServlet.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/loader/MyAnnotatedServlet.java Fri
Dec 2 21:25:49 2011
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.catalina.loader;
import java.io.IOException;
Modified: tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java?rev=1209694&r1=1209693&r2=1209694&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/loader/TestVirtualContext.java Fri
Dec 2 21:25:49 2011
@@ -17,8 +17,6 @@
package org.apache.catalina.loader;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.FileOutputStream;
@@ -29,6 +27,10 @@ import java.util.HashSet;
import junit.framework.Assert;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import org.junit.Test;
+
import org.apache.catalina.core.JreMemoryLeakPreventionListener;
import org.apache.catalina.core.StandardContext;
import org.apache.catalina.startup.Tomcat;
@@ -38,7 +40,6 @@ import org.apache.tomcat.util.buf.ByteCh
import org.apache.tomcat.util.http.fileupload.FileUtils;
import org.apache.tomcat.util.http.fileupload.IOUtils;
import org.apache.tomcat.util.scan.StandardJarScanner;
-import org.junit.Test;
public class TestVirtualContext extends TomcatBaseTest {
Modified:
tomcat/trunk/test/webapp-3.0-virtual-webapp/src/main/webapp2/rsrc/resourceF.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/webapp-3.0-virtual-webapp/src/main/webapp2/rsrc/resourceF.properties?rev=1209694&r1=1209693&r2=1209694&view=diff
==============================================================================
---
tomcat/trunk/test/webapp-3.0-virtual-webapp/src/main/webapp2/rsrc/resourceF.properties
(original)
+++
tomcat/trunk/test/webapp-3.0-virtual-webapp/src/main/webapp2/rsrc/resourceF.properties
Fri Dec 2 21:25:49 2011
@@ -13,5 +13,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-This file should not be served, it is masked by
+This file should not be served, it is masked by'[
/test/webapp-3.0-virtual-webapp/src/main/webapp/rsrc/resourceF.properties
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
