You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2010/12/13 21:46:48 UTC
svn commit: r1045365 [1/2] - in /tiles/sandbox/trunk/tiles3/tiles-core/src:
main/java/org/apache/tiles/awareness/ main/java/org/apache/tiles/context/
main/java/org/apache/tiles/definition/
main/java/org/apache/tiles/definition/dao/ main/java/org/apache...
Author: apetrelli
Date: Mon Dec 13 20:46:46 2010
New Revision: 1045365
URL: http://svn.apache.org/viewvc?rev=1045365&view=rev
Log:
TILESSB-38
Fixed tiles-core checkstyle.
Added:
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/package-info.java (with props)
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/package-info.java (with props)
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/package-info.java (with props)
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/digester/package-info.java (with props)
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/package-info.java (with props)
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/package-info.java (with props)
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/regexp/package-info.java (with props)
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/wildcard/package-info.java (with props)
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/package-info.java (with props)
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/package-info.java (with props)
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/package-info.java (with props)
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/package-info.java (with props)
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/package-info.java (with props)
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/impl/package-info.java (with props)
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/package-info.java (with props)
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/package-info.java (with props)
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/package-info.java (with props)
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/package-info.java (with props)
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/util/package-info.java (with props)
Removed:
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/package.html
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/package.html
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/package.html
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/digester/package.html
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/package.html
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/package.html
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/regexp/package.html
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/wildcard/package.html
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/package.html
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/package.html
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/package.html
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/package.html
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/package.html
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/impl/package.html
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/package.html
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/package.html
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/package.html
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/package.html
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/util/package.html
Modified:
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/FactoryNotFoundException.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/NoSuchDefinitionException.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/DefinitionRenderer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/DefinitionsFactoryExceptionTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/LocaleDefinitionsFactoryTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/NoSuchDefinitionExceptionTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAOTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/DigesterDefinitionsReaderExceptionTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryExceptionTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerUnitTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/impl/mgmt/CachingTilesContainerTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/locale/impl/DefaultLocaleResolverTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/renderer/DefinitionRendererTest.java
tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/util/CombinedBeanInfoTest.java
Added: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/package-info.java?rev=1045365&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/package-info.java (added)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/package-info.java Mon Dec 13 20:46:46 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.
+ */
+/**
+ * Interfaces that let the Tiles engine to inject dependencies to its objects.
+ */
+package org.apache.tiles.awareness;
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/awareness/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/package-info.java?rev=1045365&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/package-info.java (added)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/package-info.java Mon Dec 13 20:46:46 2010
@@ -0,0 +1,25 @@
+/*
+ * $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 and interfaces that allow to access the various contexts in an
+ * application in a uniformed way.
+ */
+package org.apache.tiles.context;
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/context/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/FactoryNotFoundException.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/FactoryNotFoundException.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/FactoryNotFoundException.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/FactoryNotFoundException.java Mon Dec 13 20:46:46 2010
@@ -44,10 +44,21 @@ public class FactoryNotFoundException ex
super(msg);
}
+ /**
+ * Constructor.
+ *
+ * @param message Message.
+ * @param e Cause.
+ */
public FactoryNotFoundException(String message, Throwable e) {
super(message, e);
}
+ /**
+ * Constructor.
+ *
+ * @param e Cause.
+ */
public FactoryNotFoundException(Throwable e) {
super(e);
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/NoSuchDefinitionException.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/NoSuchDefinitionException.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/NoSuchDefinitionException.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/NoSuchDefinitionException.java Mon Dec 13 20:46:46 2010
@@ -44,10 +44,21 @@ public class NoSuchDefinitionException e
super(msg);
}
+ /**
+ * Constructor.
+ *
+ * @param message Message.
+ * @param e Cause.
+ */
public NoSuchDefinitionException(String message, Throwable e) {
super(message, e);
}
+ /**
+ * Constructor.
+ *
+ * @param e Cause.
+ */
public NoSuchDefinitionException(Throwable e) {
super(e);
}
Added: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/package-info.java?rev=1045365&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/package-info.java (added)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/package-info.java Mon Dec 13 20:46:46 2010
@@ -0,0 +1,25 @@
+/*
+ * $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 simply load definitions depending on a customization key.
+ * The package contains also basic implementations.
+ */
+package org.apache.tiles.definition.dao;
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/dao/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/digester/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/digester/package-info.java?rev=1045365&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/digester/package-info.java (added)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/digester/package-info.java Mon Dec 13 20:46:46 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.
+ */
+/**
+ * Allows reading definitions with the use of Jakarta Commons Digester.
+ */
+package org.apache.tiles.definition.digester;
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/digester/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/digester/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/package-info.java?rev=1045365&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/package-info.java (added)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/package-info.java Mon Dec 13 20:46:46 2010
@@ -0,0 +1,25 @@
+/*
+ * $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.
+ */
+/**
+ * It contains classes and interfaces to allow manipulations of "definitions", i.e.
+ * objects made of a template page and a number of filled attributes.
+ */
+package org.apache.tiles.definition;
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/package-info.java?rev=1045365&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/package-info.java (added)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/package-info.java Mon Dec 13 20:46:46 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 manage pattern matching in definition names, and substitution in attributes.
+ */
+package org.apache.tiles.definition.pattern;
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/regexp/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/regexp/package-info.java?rev=1045365&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/regexp/package-info.java (added)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/regexp/package-info.java Mon Dec 13 20:46:46 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.
+ */
+/**
+ * In Tiles it is possible to use regular expression patterns thanks to this package.
+ */
+package org.apache.tiles.definition.pattern.regexp;
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/regexp/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/regexp/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/wildcard/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/wildcard/package-info.java?rev=1045365&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/wildcard/package-info.java (added)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/wildcard/package-info.java Mon Dec 13 20:46:46 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.
+ */
+/**
+ * In Tiles it is possible to use wildcard patterns thanks to this package.
+ */
+package org.apache.tiles.definition.pattern.wildcard;
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/wildcard/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/definition/pattern/wildcard/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/package-info.java?rev=1045365&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/package-info.java (added)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/package-info.java Mon Dec 13 20:46:46 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 manage attribute value evaluation.
+ */
+package org.apache.tiles.evaluator.impl;
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/impl/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/package-info.java?rev=1045365&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/package-info.java (added)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/package-info.java Mon Dec 13 20:46:46 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.
+ */
+/**
+ * Interfaces to manage attribute value evaluation.
+ */
+package org.apache.tiles.evaluator;
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/evaluator/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/BasicTilesContainerFactory.java Mon Dec 13 20:46:46 2010
@@ -391,7 +391,7 @@ public class BasicTilesContainerFactory
}
/**
- * Creates a {@link AttributeRenderer} using a {@link DefinitionRenderer}
+ * Creates a {@link AttributeRenderer} using a {@link DefinitionRenderer}.
*
* @param rendererFactory The renderer factory to configure.
* @param applicationContext The Tiles application context.
Added: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/package-info.java?rev=1045365&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/package-info.java (added)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/package-info.java Mon Dec 13 20:46:46 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.
+ */
+/**
+ * Factory classes, to allow creation of container instances.
+ */
+package org.apache.tiles.factory;
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/factory/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java Mon Dec 13 20:46:46 2010
@@ -26,14 +26,13 @@ import java.util.Map;
import org.apache.tiles.Definition;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.TilesContainerWrapper;
-import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.NoSuchDefinitionException;
import org.apache.tiles.mgmt.MutableTilesContainer;
import org.apache.tiles.request.Request;
/**
* Manages custom and configured definitions, so they can be used by the
- * container, instead of using a simple {@link DefinitionsFactory}.
+ * container, instead of using a simple {@link org.apache.tiles.definition.DefinitionsFactory}.
*
* @version $Rev$ $Date$
*/
@@ -226,6 +225,13 @@ public class CachingTilesContainer exten
return candidate;
}
+ /**
+ * Returns a custom definition from the cache.
+ *
+ * @param definition The definition to search.
+ * @param request The request.
+ * @return The requested definition.
+ */
private Definition getCustomDefinition(String definition, Request request) {
Map<String, Definition> definitions = getDefinitions(request);
if (definitions != null) {
Added: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/package-info.java?rev=1045365&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/package-info.java (added)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/package-info.java Mon Dec 13 20:46:46 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.
+ */
+/**
+ * It contains the basic implementations of mutable Tiles containers.
+ */
+package org.apache.tiles.impl.mgmt;
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/package-info.java?rev=1045365&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/package-info.java (added)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/package-info.java Mon Dec 13 20:46:46 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.
+ */
+/**
+ * It contains the basic implementations of Tiles container.
+ */
+package org.apache.tiles.impl;
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/impl/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/impl/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/impl/package-info.java?rev=1045365&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/impl/package-info.java (added)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/impl/package-info.java Mon Dec 13 20:46:46 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.
+ */
+/**
+ * Basic implementation of the locale resolver.
+ */
+package org.apache.tiles.locale.impl;
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/impl/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/impl/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/package-info.java?rev=1045365&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/package-info.java (added)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/package-info.java Mon Dec 13 20:46:46 2010
@@ -0,0 +1,25 @@
+/*
+ * $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 and interfaces to allow locale resolution in an application, i.e. it
+ * allows to specify how to access the locale that the user wants to use.
+ */
+package org.apache.tiles.locale;
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/locale/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/package-info.java?rev=1045365&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/package-info.java (added)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/package-info.java Mon Dec 13 20:46:46 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.
+ */
+/**
+ * "View preparers" are objects that allows the "preparation" of a Tiles artifact
+ * (definition, template or attribute) before it is rendered.<br>
+ * It is useful, for example, when a view item should be built and stored in a
+ * particular context (e.g. a menu) and then rendered.
+ */
+package org.apache.tiles.preparer;
+
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/preparer/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/DefinitionRenderer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/DefinitionRenderer.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/DefinitionRenderer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/DefinitionRenderer.java Mon Dec 13 20:46:46 2010
@@ -40,6 +40,11 @@ public class DefinitionRenderer implemen
*/
private TilesContainer container;
+ /**
+ * Constructor.
+ *
+ * @param container The Tiles container.
+ */
public DefinitionRenderer(TilesContainer container) {
this.container = container;
}
Added: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/package-info.java?rev=1045365&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/package-info.java (added)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/package-info.java Mon Dec 13 20:46:46 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.
+ */
+/**
+ * Interfaces to manage attribute rendering.
+ */
+package org.apache.tiles.renderer;
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/renderer/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/AbstractTilesInitializer.java Mon Dec 13 20:46:46 2010
@@ -99,8 +99,7 @@ public abstract class AbstractTilesIniti
* @return The container key.
* @since 2.2.0
*/
- protected String getContainerKey(
- @SuppressWarnings("unused") ApplicationContext applicationContext) {
+ protected String getContainerKey(ApplicationContext applicationContext) {
return null;
}
Added: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/package-info.java?rev=1045365&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/package-info.java (added)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/package-info.java Mon Dec 13 20:46:46 2010
@@ -0,0 +1,26 @@
+/*
+ * $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 start the Tiles engine up. Use these classes in your environment by
+ * using a preliminary TilesApplicationContext that expose at least the needed
+ * initialization parameters.
+ */
+package org.apache.tiles.startup;
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/startup/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/util/package-info.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/util/package-info.java?rev=1045365&view=auto
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/util/package-info.java (added)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/util/package-info.java Mon Dec 13 20:46:46 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.
+ */
+/**
+ * Static utility classes used throughout the implementation.
+ */
+package org.apache.tiles.util;
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/util/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/sandbox/trunk/tiles3/tiles-core/src/main/java/org/apache/tiles/util/package-info.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/DefinitionsFactoryExceptionTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/DefinitionsFactoryExceptionTest.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/DefinitionsFactoryExceptionTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/DefinitionsFactoryExceptionTest.java Mon Dec 13 20:46:46 2010
@@ -64,7 +64,7 @@ public class DefinitionsFactoryException
}
/**
- * Test method for {@link DefinitionsFactoryException#DefinitionsFactoryException(java.lang.String, java.lang.Throwable)}.
+ * Test method for {@link DefinitionsFactoryException#DefinitionsFactoryException(String, Throwable)}.
*/
@Test
public void testDefinitionsFactoryExceptionStringThrowable() {
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/LocaleDefinitionsFactoryTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/LocaleDefinitionsFactoryTest.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/LocaleDefinitionsFactoryTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/LocaleDefinitionsFactoryTest.java Mon Dec 13 20:46:46 2010
@@ -79,7 +79,7 @@ public class LocaleDefinitionsFactoryTes
* Test method for {@link LocaleDefinitionsFactory#getDefinition(String, Request)}.
*/
@SuppressWarnings("unchecked")
- @Test(expected=NoSuchDefinitionException.class)
+ @Test(expected = NoSuchDefinitionException.class)
public void testGetDefinitionNoParent() {
DefinitionDAO<Locale> dao = createMock(DefinitionDAO.class);
LocaleResolver localeResolver = createMock(LocaleResolver.class);
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java Mon Dec 13 20:46:46 2010
@@ -63,8 +63,7 @@ public class MockDefinitionsReader imple
* @throws org.apache.tiles.definition.DefinitionsFactoryException if the source is invalid or
* an error occurs when reading definitions.
*/
- @SuppressWarnings("unchecked")
public Map<String, Definition> read(Object source) {
- return new LinkedHashMap();
+ return new LinkedHashMap<String, Definition>();
}
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/MockOnlyLocaleTilesContext.java Mon Dec 13 20:46:46 2010
@@ -152,8 +152,8 @@ public class MockOnlyLocaleTilesContext
return null;
}
- @Override
- public String[] getNativeScopes() {
- return null;
- }
+ @Override
+ public String[] getNativeScopes() {
+ return null;
+ }
}
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/NoSuchDefinitionExceptionTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/NoSuchDefinitionExceptionTest.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/NoSuchDefinitionExceptionTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/NoSuchDefinitionExceptionTest.java Mon Dec 13 20:46:46 2010
@@ -64,7 +64,7 @@ public class NoSuchDefinitionExceptionTe
}
/**
- * Test method for {@link NoSuchDefinitionException#NoSuchDefinitionException(java.lang.String, java.lang.Throwable)}.
+ * Test method for {@link NoSuchDefinitionException#NoSuchDefinitionException(String, Throwable)}.
*/
@Test
public void testNoSuchDefinitionExceptionStringThrowable() {
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAOTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAOTest.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAOTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/BaseLocaleUrlDefinitionDAOTest.java Mon Dec 13 20:46:46 2010
@@ -44,6 +44,9 @@ public class BaseLocaleUrlDefinitionDAOT
*/
private static final int SLEEP_MILLIS = 2000;
+ /**
+ * The dao to test.
+ */
private BaseLocaleUrlDefinitionDAO dao;
/**
@@ -65,7 +68,8 @@ public class BaseLocaleUrlDefinitionDAOT
// Set up multiple data sources.
Map<String, Attribute> attribs = new HashMap<String, Attribute>();
attribs.put("testparm", new Attribute("testval"));
- Definition rewriteTest = new Definition("rewrite.test", Attribute.createTemplateAttribute("/test.jsp"), attribs);
+ Definition rewriteTest = new Definition("rewrite.test",
+ Attribute.createTemplateAttribute("/test.jsp"), attribs);
expect(dao.getDefinition("rewrite.test", null)).andReturn(rewriteTest);
replay(dao);
@@ -168,7 +172,7 @@ public class BaseLocaleUrlDefinitionDAOT
}
/**
- * Test method for {@link org.apache.tiles.definition.dao.BaseLocaleUrlDefinitionDAO#loadDefinitionsFromURL(java.net.URL)}.
+ * Test method for {@link BaseLocaleUrlDefinitionDAO#loadDefinitionsFromURL(URL)}.
* @throws MalformedURLException If something goes wrong.
*/
@Test
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/CachingLocaleUrlDefinitionDAOTest.java Mon Dec 13 20:46:46 2010
@@ -358,8 +358,6 @@ public class CachingLocaleUrlDefinitionD
* Tests
* {@link ResolvingLocaleUrlDefinitionDAO#getDefinition(String, Locale)}
* when loading multiple files for a locale.
- *
- * @throws IOException If something goes wrong.
*/
public void testListAttributeLocaleInheritance() {
URL url = this.getClass().getClassLoader().getResource(
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/LocaleUrlDefinitionDAOTest.java Mon Dec 13 20:46:46 2010
@@ -61,8 +61,6 @@ public class LocaleUrlDefinitionDAOTest
/**
* Tests {@link LocaleUrlDefinitionDAO#getDefinition(String, Locale)}.
- *
- * @throws IOException If something goes wrong.
*/
public void testGetDefinition() {
// Set up multiple data sources.
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/dao/ResolvingLocaleUrlDefinitionDAOTest.java Mon Dec 13 20:46:46 2010
@@ -293,7 +293,10 @@ public class ResolvingLocaleUrlDefinitio
definitionDao.reader);
}
- @Test(expected=NoSuchDefinitionException.class)
+ /**
+ * Tests {@link ResolvingLocaleUrlDefinitionDAO#resolveInheritance(Definition, Map, Locale, Set)}.
+ */
+ @Test(expected = NoSuchDefinitionException.class)
public void testResolveInheritanceNoParent() {
Definition definition = new Definition("mydef", null, null);
definition.setExtends("otherDef");
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/DigesterDefinitionsReaderExceptionTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/DigesterDefinitionsReaderExceptionTest.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/DigesterDefinitionsReaderExceptionTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/DigesterDefinitionsReaderExceptionTest.java Mon Dec 13 20:46:46 2010
@@ -53,7 +53,7 @@ public class DigesterDefinitionsReaderEx
}
/**
- * Test method for {@link DigesterDefinitionsReaderException#DigesterDefinitionsReaderException(java.lang.Throwable)}.
+ * Test method for {@link DigesterDefinitionsReaderException#DigesterDefinitionsReaderException(Throwable)}.
*/
@Test
public void testDigesterDefinitionsReaderExceptionThrowable() {
@@ -64,7 +64,7 @@ public class DigesterDefinitionsReaderEx
}
/**
- * Test method for {@link DigesterDefinitionsReaderException#DigesterDefinitionsReaderException(java.lang.String, java.lang.Throwable)}.
+ * Test method for {@link DigesterDefinitionsReaderException#DigesterDefinitionsReaderException(String, Throwable)}.
*/
@Test
public void testDigesterDefinitionsReaderExceptionStringThrowable() {
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java Mon Dec 13 20:46:46 2010
@@ -70,7 +70,6 @@ public class TestDigesterDefinitionsRead
* Tests the read method under normal conditions.
* @throws IOException If something goes wrong.
*/
- @SuppressWarnings("unchecked")
@Test
public void testRead() throws IOException {
URL configFile = this.getClass().getClassLoader().getResource(
@@ -313,7 +312,7 @@ public class TestDigesterDefinitionsRead
/**
* Tests {@link DigesterDefinitionsReader#addDefinition(Definition)}.
*/
- @Test(expected=DigesterDefinitionsReaderException.class)
+ @Test(expected = DigesterDefinitionsReaderException.class)
public void testAddDefinitionNoName() {
Definition def = new Definition();
reader.addDefinition(def);
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/evaluator/impl/DirectAttributeEvaluatorTest.java Mon Dec 13 20:46:46 2010
@@ -24,7 +24,6 @@ import static org.junit.Assert.*;
import org.apache.tiles.Attribute;
import org.apache.tiles.Expression;
-import org.apache.tiles.request.Request;
import org.junit.Before;
import org.junit.Test;
@@ -50,7 +49,7 @@ public class DirectAttributeEvaluatorTes
/**
* Tests
- * {@link DirectAttributeEvaluator#evaluate(Attribute, Request)}.
+ * {@link DirectAttributeEvaluator#evaluate(Attribute, org.apache.tiles.request.Request)}.
*/
@Test
public void testEvaluate() {
@@ -69,16 +68,16 @@ public class DirectAttributeEvaluatorTes
/**
* Tests
- * {@link DirectAttributeEvaluator#evaluate(Attribute, Request)}.
+ * {@link DirectAttributeEvaluator#evaluate(Attribute, org.apache.tiles.request.Request)}.
*/
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testEvaluateNullAttribute() {
evaluator.evaluate((Attribute) null, null);
}
/**
* Tests
- * {@link DirectAttributeEvaluator#evaluate(String, Request)}.
+ * {@link DirectAttributeEvaluator#evaluate(String, org.apache.tiles.request.Request)}.
*/
@Test
public void testEvaluateString() {
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryExceptionTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryExceptionTest.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryExceptionTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/factory/TilesContainerFactoryExceptionTest.java Mon Dec 13 20:46:46 2010
@@ -64,7 +64,7 @@ public class TilesContainerFactoryExcept
}
/**
- * Test method for {@link TilesContainerFactoryException#TilesContainerFactoryException(java.lang.String, java.lang.Throwable)}.
+ * Test method for {@link TilesContainerFactoryException#TilesContainerFactoryException(String, Throwable)}.
*/
@Test
public void testTilesContainerFactoryExceptionStringThrowable() {
Modified: tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerUnitTest.java
URL: http://svn.apache.org/viewvc/tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerUnitTest.java?rev=1045365&r1=1045364&r2=1045365&view=diff
==============================================================================
--- tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerUnitTest.java (original)
+++ tiles/sandbox/trunk/tiles3/tiles-core/src/test/java/org/apache/tiles/impl/BasicTilesContainerUnitTest.java Mon Dec 13 20:46:46 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.impl;
@@ -45,16 +62,34 @@ public class BasicTilesContainerUnitTest
private static final String ATTRIBUTE_CONTEXT_STACK =
"org.apache.tiles.AttributeContext.STACK";
+ /**
+ * The application context.
+ */
private ApplicationContext applicationContext;
+ /**
+ * The definitions factory.
+ */
private DefinitionsFactory definitionsFactory;
+ /**
+ * The preparer factory.
+ */
private PreparerFactory preparerFactory;
+ /**
+ * The renderer factory.
+ */
private RendererFactory rendererFactory;
+ /**
+ * The evaluator factory.
+ */
private AttributeEvaluatorFactory attributeEvaluatorFactory;
+ /**
+ * The container to test.
+ */
private BasicTilesContainer container;
/**
@@ -76,7 +111,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#startContext(org.apache.tiles.request.Request)}.
+ * Test method for {@link BasicTilesContainer#startContext(Request)}.
*/
@SuppressWarnings("unchecked")
@Test
@@ -103,7 +138,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#endContext(org.apache.tiles.request.Request)}.
+ * Test method for {@link BasicTilesContainer#endContext(Request)}.
*/
@SuppressWarnings("unchecked")
@Test
@@ -127,7 +162,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#renderContext(org.apache.tiles.request.Request)}.
+ * Test method for {@link BasicTilesContainer#renderContext(Request)}.
* @throws IOException If something goes wrong.
*/
@SuppressWarnings("unchecked")
@@ -165,7 +200,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#getApplicationContext()}.
+ * Test method for {@link BasicTilesContainer#getApplicationContext()}.
*/
@Test
public void testGetApplicationContext() {
@@ -177,7 +212,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#getAttributeContext(org.apache.tiles.request.Request)}.
+ * Test method for {@link BasicTilesContainer#getAttributeContext(Request)}.
*/
@SuppressWarnings("unchecked")
@Test
@@ -202,7 +237,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#getAttributeContext(org.apache.tiles.request.Request)}.
+ * Test method for {@link BasicTilesContainer#getAttributeContext(Request)}.
*/
@SuppressWarnings("unchecked")
@Test
@@ -227,7 +262,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#getDefinitionsFactory()}.
+ * Test method for {@link BasicTilesContainer#getDefinitionsFactory()}.
*/
@Test
public void testGetDefinitionsFactory() {
@@ -239,7 +274,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#getPreparerFactory()}.
+ * Test method for {@link BasicTilesContainer#getPreparerFactory()}.
*/
@Test
public void testGetPreparerFactory() {
@@ -251,7 +286,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#prepare(java.lang.String, org.apache.tiles.request.Request)}.
+ * Test method for {@link BasicTilesContainer#prepare(java.lang.String, Request)}.
*/
@SuppressWarnings("unchecked")
@Test
@@ -279,10 +314,10 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#prepare(java.lang.String, org.apache.tiles.request.Request)}.
+ * Test method for {@link BasicTilesContainer#prepare(java.lang.String, Request)}.
*/
@SuppressWarnings("unchecked")
- @Test(expected=NoSuchPreparerException.class)
+ @Test(expected = NoSuchPreparerException.class)
public void testPrepareException() {
Request request = createMock(Request.class);
Map<String, Object> requestScope = createMock(Map.class);
@@ -304,7 +339,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#render(org.apache.tiles.request.Request, java.lang.String)}.
+ * Test method for {@link BasicTilesContainer#render(Request, java.lang.String)}.
* @throws IOException If something goes wrong.
*/
@SuppressWarnings("unchecked")
@@ -348,9 +383,9 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#render(org.apache.tiles.request.Request, java.lang.String)}.
+ * Test method for {@link BasicTilesContainer#render(Request, java.lang.String)}.
*/
- @Test(expected=NoSuchDefinitionException.class)
+ @Test(expected = NoSuchDefinitionException.class)
public void testRenderStringRequestException() {
Request request = createMock(Request.class);
@@ -367,7 +402,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#render(org.apache.tiles.request.Request, org.apache.tiles.Attribute)}.
+ * Test method for {@link BasicTilesContainer#render(Request, org.apache.tiles.Attribute)}.
* @throws IOException If something goes wrong.
*/
@Test
@@ -394,10 +429,10 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#render(org.apache.tiles.request.Request, org.apache.tiles.Attribute)}.
+ * Test method for {@link BasicTilesContainer#render(Request, org.apache.tiles.Attribute)}.
* @throws IOException If something goes wrong.
*/
- @Test(expected=CannotRenderException.class)
+ @Test(expected = CannotRenderException.class)
public void testRenderAttributeRequestException1() throws IOException {
Request request = createMock(Request.class);
@@ -413,10 +448,10 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#render(org.apache.tiles.request.Request, org.apache.tiles.Attribute)}.
+ * Test method for {@link BasicTilesContainer#render(Request, org.apache.tiles.Attribute)}.
* @throws IOException If something goes wrong.
*/
- @Test(expected=NoSuchRendererException.class)
+ @Test(expected = NoSuchRendererException.class)
public void testRenderAttributeRequestException2() throws IOException {
Request request = createMock(Request.class);
Attribute templateAttribute = createMock(Attribute.class);
@@ -439,10 +474,10 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#render(org.apache.tiles.request.Request, org.apache.tiles.Attribute)}.
+ * Test method for {@link BasicTilesContainer#render(Request, org.apache.tiles.Attribute)}.
* @throws IOException If something goes wrong.
*/
- @Test(expected=CannotRenderException.class)
+ @Test(expected = CannotRenderException.class)
public void testRenderAttributeRequestException3() throws IOException {
Request request = createMock(Request.class);
Attribute templateAttribute = createMock(Attribute.class);
@@ -468,10 +503,10 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#render(org.apache.tiles.request.Request, org.apache.tiles.Attribute)}.
+ * Test method for {@link BasicTilesContainer#render(Request, org.apache.tiles.Attribute)}.
* @throws IOException If something goes wrong.
*/
- @Test(expected=NoSuchRendererException.class)
+ @Test(expected = NoSuchRendererException.class)
public void testRenderAttributeRequestException() throws IOException {
Request request = createMock(Request.class);
Attribute templateAttribute = createMock(Attribute.class);
@@ -494,7 +529,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#evaluate(org.apache.tiles.Attribute, org.apache.tiles.request.Request)}.
+ * Test method for {@link BasicTilesContainer#evaluate(org.apache.tiles.Attribute, Request)}.
*/
@Test
public void testEvaluate() {
@@ -515,7 +550,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#isValidDefinition(java.lang.String, org.apache.tiles.request.Request)}.
+ * Test method for {@link BasicTilesContainer#isValidDefinition(java.lang.String, Request)}.
*/
@Test
public void testIsValidDefinition() {
@@ -532,7 +567,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#isValidDefinition(java.lang.String, org.apache.tiles.request.Request)}.
+ * Test method for {@link BasicTilesContainer#isValidDefinition(java.lang.String, Request)}.
*/
@Test
public void testIsValidDefinitionNull() {
@@ -548,7 +583,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#isValidDefinition(java.lang.String, org.apache.tiles.request.Request)}.
+ * Test method for {@link BasicTilesContainer#isValidDefinition(java.lang.String, Request)}.
*/
@Test
public void testIsValidDefinitionException() {
@@ -565,7 +600,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#getDefinition(java.lang.String, org.apache.tiles.request.Request)}.
+ * Test method for {@link BasicTilesContainer#getDefinition(java.lang.String, Request)}.
*/
@Test
public void testGetDefinition() {
@@ -582,7 +617,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#getContextStack(org.apache.tiles.request.Request)}.
+ * Test method for {@link BasicTilesContainer#getContextStack(Request)}.
*/
@SuppressWarnings("unchecked")
@Test
@@ -604,7 +639,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#getContextStack(org.apache.tiles.request.Request)}.
+ * Test method for {@link BasicTilesContainer#getContextStack(Request)}.
*/
@SuppressWarnings("unchecked")
@Test
@@ -626,7 +661,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#pushContext(org.apache.tiles.AttributeContext, org.apache.tiles.request.Request)}.
+ * Test method for {@link BasicTilesContainer#pushContext(org.apache.tiles.AttributeContext, Request)}.
*/
@SuppressWarnings("unchecked")
@Test
@@ -650,7 +685,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#popContext(org.apache.tiles.request.Request)}.
+ * Test method for {@link BasicTilesContainer#popContext(Request)}.
*/
@SuppressWarnings("unchecked")
@Test
@@ -674,7 +709,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#getContext(org.apache.tiles.request.Request)}.
+ * Test method for {@link BasicTilesContainer#getContext(Request)}.
*/
@SuppressWarnings("unchecked")
@Test
@@ -699,7 +734,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#getContext(org.apache.tiles.request.Request)}.
+ * Test method for {@link BasicTilesContainer#getContext(Request)}.
*/
@SuppressWarnings("unchecked")
@Test
@@ -722,7 +757,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#render(org.apache.tiles.Definition, org.apache.tiles.request.Request)}.
+ * Test method for {@link BasicTilesContainer#render(org.apache.tiles.Definition, Request)}.
* @throws IOException If something goes wrong.
*/
@SuppressWarnings("unchecked")
@@ -765,11 +800,11 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#render(org.apache.tiles.Definition, org.apache.tiles.request.Request)}.
+ * Test method for {@link BasicTilesContainer#render(org.apache.tiles.Definition, Request)}.
* @throws IOException If something goes wrong.
*/
@SuppressWarnings("unchecked")
- @Test(expected=CannotRenderException.class)
+ @Test(expected = CannotRenderException.class)
public void testRenderRequestDefinitionException() throws IOException {
Request request = createMock(Request.class);
Map<String, Object> requestScope = createMock(Map.class);
@@ -813,7 +848,7 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#render(org.apache.tiles.request.Request, org.apache.tiles.AttributeContext)}.
+ * Test method for {@link BasicTilesContainer#render(Request, org.apache.tiles.AttributeContext)}.
* @throws IOException If something goes wrong.
*/
@SuppressWarnings("unchecked")
@@ -847,11 +882,11 @@ public class BasicTilesContainerUnitTest
}
/**
- * Test method for {@link org.apache.tiles.impl.BasicTilesContainer#render(org.apache.tiles.request.Request, org.apache.tiles.AttributeContext)}.
+ * Test method for {@link BasicTilesContainer#render(Request, org.apache.tiles.AttributeContext)}.
* @throws IOException If something goes wrong.
*/
@SuppressWarnings("unchecked")
- @Test(expected=CannotRenderException.class)
+ @Test(expected = CannotRenderException.class)
public void testRenderRequestAttributeContextException() throws IOException {
Request request = createMock(Request.class);
Map<String, Object> requestScope = createMock(Map.class);