svn commit: r1058093 - in /tiles/sandbox/trunk/tiles3/tiles-servlet/src: main/java/org/apache/tiles/web/startup/ main/java/org/apache/tiles/web/startup/simple/ main/java/org/apache/tiles/web/util/ test/java/org/apache/tiles/servlet/ test/java/org/apach...

Wed, 12 Jan 2011 03:49:36 -0800 

Author: apetrelli
Date: Wed Jan 12 11:49:02 2011
New Revision: 1058093

URL: http://svn.apache.org/viewvc?rev=1058093&view=rev
Log:
TILESSB-38
Fixed tiles-servlet Checkstyle.

Added:
    
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/package-info.java
    
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/simple/package-info.java
    
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/package-info.java
Removed:
    
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/package.html
    
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/simple/package.html
    
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/package.html
    
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/servlet/
Modified:
    
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java
    
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java
    
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/AbstractTilesInitializerServletTest.java
    
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/AbstractTilesListenerTest.java
    
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/simple/SimpleTilesInitializerServletTest.java
    
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/simple/SimpleTilesListenerTest.java
    
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/util/ServletContextAdapterTest.java
    
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/util/TilesDecorationFilterTest.java

Added: 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/package-info.java
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/package-info.java?rev=1058093&view=auto
==============================================================================
--- 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/package-info.java
 (added)
+++ 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/package-info.java
 Wed Jan 12 11:49:02 2011
@@ -0,0 +1,24 @@
+/*
+ * $Id: package-info.java 1049711 2010-12-15 21:12:00Z apetrelli $
+ *
+ * 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.
+ */
+/**
+ * Classes to start the Tiles engine up in a web environment.
+ */
+package org.apache.tiles.web.startup;

Added: 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/simple/package-info.java
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/simple/package-info.java?rev=1058093&view=auto
==============================================================================
--- 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/simple/package-info.java
 (added)
+++ 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/startup/simple/package-info.java
 Wed Jan 12 11:49:02 2011
@@ -0,0 +1,24 @@
+/*
+ * $Id: package-info.java 1049711 2010-12-15 21:12:00Z apetrelli $
+ *
+ * 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.
+ */
+/**
+ * Classes to start the Tiles engine up in a web environment using the default 
settings.
+ */
+package org.apache.tiles.web.startup.simple;

Modified: 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java?rev=1058093&r1=1058092&r2=1058093&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java
 (original)
+++ 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/ServletContextAdapter.java
 Wed Jan 12 11:49:02 2011
@@ -98,7 +98,7 @@ public class ServletContextAdapter imple
     }
 
     /** {...@inheritdoc} */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "rawtypes" })
     public Set getResourcePaths(String string) {
         return rootContext.getResourcePaths(string);
     }
@@ -129,13 +129,13 @@ public class ServletContextAdapter imple
     }
 
     /** {...@inheritdoc} */
-    @SuppressWarnings({ "unchecked" })
+    @SuppressWarnings("rawtypes")
     public Enumeration getServlets() {
         return rootContext.getServlets();  //To change body of implemented 
methods use File | Settings | File Templates.
     }
 
     /** {...@inheritdoc} */
-    @SuppressWarnings({ "unchecked" })
+    @SuppressWarnings("rawtypes")
     public Enumeration getServletNames() {
         return rootContext.getServletNames();
     }
@@ -171,7 +171,7 @@ public class ServletContextAdapter imple
     }
 
     /** {...@inheritdoc} */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
     public Enumeration getInitParameterNames() {
         return initParameters.keys();
     }
@@ -182,7 +182,7 @@ public class ServletContextAdapter imple
     }
 
     /** {...@inheritdoc} */
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings("rawtypes")
     public Enumeration getAttributeNames() {
         return rootContext.getAttributeNames();
     }

Modified: 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java?rev=1058093&r1=1058092&r2=1058093&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java
 (original)
+++ 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/TilesDecorationFilter.java
 Wed Jan 12 11:49:02 2011
@@ -51,30 +51,30 @@ import org.slf4j.LoggerFactory;
  * with the configured definition.
  * <p/>
  * For example, given the following config:
- * <xmp>
- * <filter>
- * <filter-name>Tiles Decoration Filter</filter-name>
- * <filter-class>org.apache.tiles.web.TilesDecorationFilter</filter-class>
- * <init-param>
- * <param-name>definition</param-name>
- * <param-value>test.definition</param-value>
- * </init-param>
- * <init-param>
- * <param-name>attribute-name</param-name>
- * <param-value>body</param-value>
- * </init-param>
- * <init-param>
- * <param-name>prevent-token</param-name>
- * <param-value>layout</param-value>
- * </init-param>
- * </filter>
+ * &lt;xmp&gt;
+ * &lt;filter&gt;
+ * &lt;filter-name&gt;Tiles Decoration Filter&lt;/filter-name&gt;
+ * 
&lt;filter-class&gt;org.apache.tiles.web.TilesDecorationFilter&lt;/filter-class&gt;
+ * &lt;init-param&gt;
+ * &lt;param-name&gt;definition&lt;/param-name&gt;
+ * &lt;param-value&gt;test.definition&lt;/param-value&gt;
+ * &lt;/init-param&gt;
+ * &lt;init-param&gt;
+ * &lt;param-name&gt;attribute-name&lt;/param-name&gt;
+ * &lt;param-value&gt;body&lt;/param-value&gt;
+ * &lt;/init-param&gt;
+ * &lt;init-param&gt;
+ * &lt;param-name&gt;prevent-token&lt;/param-name&gt;
+ * &lt;param-value&gt;layout&lt;/param-value&gt;
+ * &lt;/init-param&gt;
+ * &lt;/filter&gt;
  * <p/>
- * <filter-mapping>
- * <filter-name>Tiles Decoration Filter</filter-name>
- * <url-pattern>/testdecorationfilter.jsp</url-pattern>
- * <dispatcher>REQUEST</dispatcher>
- * </filter-mapping>
- * </xmp>
+ * &lt;filter-mapping&gt;
+ * &lt;filter-name&gt;Tiles Decoration Filter&lt;/filter-name&gt;
+ * &lt;url-pattern&gt;/testdecorationfilter.jsp&lt;/url-pattern&gt;
+ * &lt;dispatcher&gt;REQUEST&lt;/dispatcher&gt;
+ * &lt;/filter-mapping&gt;
+ * &lt;/xmp&gt;
  * The filter will intercept all requests to the indicated url pattern
  * store the initial request path as the "body"  attribute and then render the
  * "test.definition" definition.  The filter will only redecorate those 
requests
@@ -136,6 +136,9 @@ public class TilesDecorationFilter imple
      */
     private AttributeContextMutator mutator = null;
 
+    /**
+     * The servlet context.
+     */
     private ServletContext servletContext;
 
     /** {...@inheritdoc} */

Added: 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/package-info.java
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/package-info.java?rev=1058093&view=auto
==============================================================================
--- 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/package-info.java
 (added)
+++ 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/main/java/org/apache/tiles/web/util/package-info.java
 Wed Jan 12 11:49:02 2011
@@ -0,0 +1,24 @@
+/*
+ * $Id: package-info.java 1049711 2010-12-15 21:12:00Z apetrelli $
+ *
+ * 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.
+ */
+/**
+ * Utility classes to use Tiles in a servlet environment.
+ */
+package org.apache.tiles.web.util;

Modified: 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/AbstractTilesInitializerServletTest.java
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/AbstractTilesInitializerServletTest.java?rev=1058093&r1=1058092&r2=1058093&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/AbstractTilesInitializerServletTest.java
 (original)
+++ 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/AbstractTilesInitializerServletTest.java
 Wed Jan 12 11:49:02 2011
@@ -1,5 +1,22 @@
-/**
+/*
+ * $Id$
+ *
+ * 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.tiles.web.startup;
 

Modified: 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/AbstractTilesListenerTest.java
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/AbstractTilesListenerTest.java?rev=1058093&r1=1058092&r2=1058093&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/AbstractTilesListenerTest.java
 (original)
+++ 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/AbstractTilesListenerTest.java
 Wed Jan 12 11:49:02 2011
@@ -1,5 +1,22 @@
-/**
+/*
+ * $Id$
+ *
+ * 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.tiles.web.startup;
 

Modified: 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/simple/SimpleTilesInitializerServletTest.java
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/simple/SimpleTilesInitializerServletTest.java?rev=1058093&r1=1058092&r2=1058093&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/simple/SimpleTilesInitializerServletTest.java
 (original)
+++ 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/simple/SimpleTilesInitializerServletTest.java
 Wed Jan 12 11:49:02 2011
@@ -1,5 +1,22 @@
-/**
+/*
+ * $Id$
+ *
+ * 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.tiles.web.startup.simple;
 
@@ -16,7 +33,7 @@ import org.junit.Test;
 public class SimpleTilesInitializerServletTest {
 
     /**
-     * Test method for {...@link 
org.apache.tiles.web.startup.simple.SimpleTilesInitializerServlet#createTilesInitializer()}.
+     * Test method for {...@link 
SimpleTilesInitializerServlet#createTilesInitializer()}.
      */
     @Test
     public void testCreateTilesInitializer() {

Modified: 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/simple/SimpleTilesListenerTest.java
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/simple/SimpleTilesListenerTest.java?rev=1058093&r1=1058092&r2=1058093&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/simple/SimpleTilesListenerTest.java
 (original)
+++ 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/startup/simple/SimpleTilesListenerTest.java
 Wed Jan 12 11:49:02 2011
@@ -1,5 +1,22 @@
-/**
+/*
+ * $Id$
+ *
+ * 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.tiles.web.startup.simple;
 

Modified: 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/util/ServletContextAdapterTest.java
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/util/ServletContextAdapterTest.java?rev=1058093&r1=1058092&r2=1058093&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/util/ServletContextAdapterTest.java
 (original)
+++ 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/util/ServletContextAdapterTest.java
 Wed Jan 12 11:49:02 2011
@@ -1,5 +1,22 @@
-/**
+/*
+ * $Id$
+ *
+ * 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.tiles.web.util;
 

Modified: 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/util/TilesDecorationFilterTest.java
URL: 
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/util/TilesDecorationFilterTest.java?rev=1058093&r1=1058092&r2=1058093&view=diff
==============================================================================
--- 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/util/TilesDecorationFilterTest.java
 (original)
+++ 
tiles/sandbox/trunk/tiles3/tiles-servlet/src/test/java/org/apache/tiles/web/util/TilesDecorationFilterTest.java
 Wed Jan 12 11:49:02 2011
@@ -1,5 +1,22 @@
-/**
+/*
+ * $Id$
+ *
+ * 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.tiles.web.util;

Reply via email to