Author: apetrelli
Date: Mon Dec 13 20:08:47 2010
New Revision: 1045354
URL: http://svn.apache.org/viewvc?rev=1045354&view=rev
Log:
TILESSB-38
Fixed tiles-compat checkstyle.
Added:
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/beans/package-info.java
(with props)
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/package-info.java
(with props)
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/package-info.java
(with props)
Removed:
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/beans/package.html
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/package.html
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/package.html
Modified:
tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/beans/SimpleMenuItemTest.java
tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java
Added:
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/beans/package-info.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/beans/package-info.java?rev=1045354&view=auto
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/beans/package-info.java
(added)
+++
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/beans/package-info.java
Mon Dec 13 20:08:47 2010
@@ -0,0 +1,24 @@
+/*
+ * $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.
+ */
+/**
+ * Classes to work with Tiles menu items and beans.
+ */
+package org.apache.tiles.beans;
Propchange:
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/beans/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/beans/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added:
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/package-info.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/package-info.java?rev=1045354&view=auto
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/package-info.java
(added)
+++
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/package-info.java
Mon Dec 13 20:08:47 2010
@@ -0,0 +1,24 @@
+/*
+ * $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.
+ */
+/**
+ * Contains code to read old-format Tiles definition files.
+ */
+package org.apache.tiles.compat.definition.digester;
Propchange:
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/definition/digester/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added:
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/package-info.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/package-info.java?rev=1045354&view=auto
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/package-info.java
(added)
+++
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/package-info.java
Mon Dec 13 20:08:47 2010
@@ -0,0 +1,28 @@
+/*
+ * $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.
+ */
+/**
+ * <p>"View preparers" are objects that allows the "preparation" of a Tiles
artifact
+ * (definition, template or attribute) before it is rendered.</p>
+ * <p>This package contains "compatibility" preparers, i.e. ViewPreparers that
are
+ * compatibile with Tiles 1 "controllers".</p>
+ */
+package org.apache.tiles.compat.preparer;
+
Propchange:
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
tiles/sandbox/trunk/tiles3/tiles-compat/src/main/java/org/apache/tiles/compat/preparer/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/beans/SimpleMenuItemTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/beans/SimpleMenuItemTest.java?rev=1045354&r1=1045353&r2=1045354&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/beans/SimpleMenuItemTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/beans/SimpleMenuItemTest.java
Mon Dec 13 20:08:47 2010
@@ -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.beans;
@@ -15,6 +32,9 @@ import org.junit.Test;
*/
public class SimpleMenuItemTest {
+ /**
+ * The item to test.
+ */
private SimpleMenuItem item;
/**
Modified:
tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java
URL:
http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java?rev=1045354&r1=1045353&r2=1045354&view=diff
==============================================================================
---
tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java
(original)
+++
tiles/sandbox/trunk/tiles3/tiles-compat/src/test/java/org/apache/tiles/compat/preparer/UrlPreparerTest.java
Mon Dec 13 20:08:47 2010
@@ -25,8 +25,6 @@ import static org.easymock.EasyMock.*;
import java.io.IOException;
-import javax.servlet.ServletException;
-
import org.apache.tiles.AttributeContext;
import org.apache.tiles.preparer.PreparerException;
import org.apache.tiles.request.Request;
@@ -58,7 +56,6 @@ public class UrlPreparerTest {
* {...@link org.apache.tiles.compat.preparer.UrlPreparer#execute(
* org.apache.tiles.request.Request, org.apache.tiles.AttributeContext)}.
* @throws IOException If something goes wrong.
- * @throws ServletException If something goes wrong.
*/
@Test
public void testExecute() throws IOException {
@@ -76,9 +73,8 @@ public class UrlPreparerTest {
* {...@link org.apache.tiles.compat.preparer.UrlPreparer#execute(
* org.apache.tiles.request.Request, org.apache.tiles.AttributeContext)}.
* @throws IOException If something goes wrong.
- * @throws ServletException If something goes wrong.
*/
- @Test(expected=PreparerException.class)
+ @Test(expected = PreparerException.class)
public void testExecuteException() throws IOException {
Request requestContext = createMock(Request.class);
AttributeContext attributeContext = createMock(AttributeContext.class);
