TILES-177
Moved the new Definition class to "org.apache.tiles" package.
git-svn-id: https://svn.apache.org/repos/asf/tiles/framework/trunk@537196 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tiles-api/src/main/java/org/apache/tiles/mgmt/Definition.java b/tiles-api/src/main/java/org/apache/tiles/Definition.java
similarity index 98%
rename from tiles-api/src/main/java/org/apache/tiles/mgmt/Definition.java
rename to tiles-api/src/main/java/org/apache/tiles/Definition.java
index 4a92928..602a249 100644
--- a/tiles-api/src/main/java/org/apache/tiles/mgmt/Definition.java
+++ b/tiles-api/src/main/java/org/apache/tiles/Definition.java
@@ -18,14 +18,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tiles.mgmt;
+package org.apache.tiles;
-import org.apache.tiles.Attribute;
-import org.apache.tiles.Attribute.AttributeType;
import java.util.Map;
import java.util.HashMap;
+import org.apache.tiles.Attribute.AttributeType;
+
/**
* A definition, i.e. a template with (completely or not) filled attributes.
* Attributes of a template can be defined with the help of this class.<br>
diff --git a/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java b/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java
index 5b0f864..a591640 100644
--- a/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java
+++ b/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java
@@ -20,6 +20,7 @@
*/
package org.apache.tiles.mgmt;
+import org.apache.tiles.Definition;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.TilesException;
diff --git a/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinition.java b/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java
similarity index 92%
rename from tiles-core/src/test/java/org/apache/tiles/definition/TestDefinition.java
rename to tiles-api/src/test/java/org/apache/tiles/TestDefinition.java
index 62f18e2..6b376de 100644
--- a/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinition.java
+++ b/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java
@@ -1,85 +1,84 @@
-/*
- * $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.definition;
-
-import org.apache.tiles.Attribute;
-import org.apache.tiles.Attribute.AttributeType;
-import org.apache.tiles.mgmt.Definition;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Tests the Definition class.
- *
- * @version $Rev$ $Date$
- */
-public class TestDefinition extends TestCase {
-
- /**
- * Creates a new instance of TestDefinition.
- *
- * @param name The name of the test.
- */
- public TestDefinition(String name) {
- super(name);
- }
-
- /**
- * Start the tests.
- *
- * @param theArgs the arguments. Not used
- */
- public static void main(String[] theArgs) {
- junit.textui.TestRunner.main(
- new String[] { TestDefinition.class.getName()});
- }
-
- /**
- * @return a test suite (<code>TestSuite</code>) that includes all methods
- * starting with "test"
- */
- public static Test suite() {
- return new TestSuite(TestDefinition.class);
- }
-
- /**
- * Verifies the put Attribute functionality.
- *
- * Attributes are added or replaced in the definition.
- */
- public void testPutAttribute() {
- Definition def = new Definition();
- def.setName("test1");
- def.setTemplate("/page1.jsp");
- def.put("attr1", "test.definition.name", AttributeType.DEFINITION,
- null);
-
- Attribute attr1 = def.getAttribute("attr1");
- assertNotNull("Null attribute.", attr1);
- assertTrue("Wrong attribute type",
- attr1.getType() == AttributeType.DEFINITION);
- }
-
-
-}
+/*
+ * $Id: TestDefinition.java 537191 2007-05-11 13:46:06Z apetrelli $
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tiles;
+
+
+import org.apache.tiles.Attribute.AttributeType;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Tests the Definition class.
+ *
+ * @version $Rev: 537191 $ $Date: 2007-05-11 15:46:06 +0200 (ven, 11 mag 2007) $
+ */
+public class TestDefinition extends TestCase {
+
+ /**
+ * Creates a new instance of TestDefinition.
+ *
+ * @param name The name of the test.
+ */
+ public TestDefinition(String name) {
+ super(name);
+ }
+
+ /**
+ * Start the tests.
+ *
+ * @param theArgs the arguments. Not used
+ */
+ public static void main(String[] theArgs) {
+ junit.textui.TestRunner.main(
+ new String[] { TestDefinition.class.getName()});
+ }
+
+ /**
+ * @return a test suite (<code>TestSuite</code>) that includes all methods
+ * starting with "test"
+ */
+ public static Test suite() {
+ return new TestSuite(TestDefinition.class);
+ }
+
+ /**
+ * Verifies the put Attribute functionality.
+ *
+ * Attributes are added or replaced in the definition.
+ */
+ public void testPutAttribute() {
+ Definition def = new Definition();
+ def.setName("test1");
+ def.setTemplate("/page1.jsp");
+ def.put("attr1", "test.definition.name", AttributeType.DEFINITION,
+ null);
+
+ Attribute attr1 = def.getAttribute("attr1");
+ assertNotNull("Null attribute.", attr1);
+ assertTrue("Wrong attribute type",
+ attr1.getType() == AttributeType.DEFINITION);
+ }
+
+
+}
diff --git a/tiles-core/src/main/java/org/apache/tiles/definition/Definitions.java b/tiles-core/src/main/java/org/apache/tiles/definition/Definitions.java
index 0314819..528058c 100644
--- a/tiles-core/src/main/java/org/apache/tiles/definition/Definitions.java
+++ b/tiles-core/src/main/java/org/apache/tiles/definition/Definitions.java
@@ -24,7 +24,7 @@
import java.util.Locale;
import java.util.Map;
-import org.apache.tiles.mgmt.Definition;
+import org.apache.tiles.Definition;
/**
* Interface for managing collections of {@link Definition} objects.
diff --git a/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java b/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java
index 4b7413d..5274ab5 100644
--- a/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java
+++ b/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java
@@ -22,7 +22,7 @@
package org.apache.tiles.definition;
import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.mgmt.Definition;
+import org.apache.tiles.Definition;
import org.apache.tiles.TilesException;
import java.util.Map;
diff --git a/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java b/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java
index 891ee94..84904f8 100644
--- a/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java
+++ b/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java
@@ -24,7 +24,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.tiles.Attribute;
-import org.apache.tiles.mgmt.Definition;
+import org.apache.tiles.Definition;
import java.util.HashMap;
import java.util.HashSet;
diff --git a/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java b/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java
index 07078a9..c955ddc 100644
--- a/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java
+++ b/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java
@@ -23,7 +23,7 @@
import java.util.Map;
-import org.apache.tiles.mgmt.Definition;
+import org.apache.tiles.Definition;
/**
* Interface for reading <code>{@link Definition}</code> from a source.
diff --git a/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java b/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
index 23eb9b2..8dddbe2 100644
--- a/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
+++ b/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
@@ -22,12 +22,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.tiles.Definition;
import org.apache.tiles.TilesException;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.definition.digester.DigesterDefinitionsReader;
import org.apache.tiles.locale.LocaleResolver;
import org.apache.tiles.locale.impl.DefaultLocaleResolver;
-import org.apache.tiles.mgmt.Definition;
import org.apache.tiles.util.ClassUtil;
import java.io.FileNotFoundException;
diff --git a/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java b/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
index 5c33fcf..4b95d2e 100644
--- a/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
+++ b/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
@@ -24,11 +24,11 @@
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule;
import org.apache.tiles.Attribute;
+import org.apache.tiles.Definition;
import org.apache.tiles.Attribute.AttributeType;
import org.apache.tiles.context.ListAttribute;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.DefinitionsReader;
-import org.apache.tiles.mgmt.Definition;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
diff --git a/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java b/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
index be7d5f6..f935ec1 100644
--- a/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
+++ b/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
@@ -24,6 +24,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.tiles.Attribute;
import org.apache.tiles.AttributeContext;
+import org.apache.tiles.Definition;
import org.apache.tiles.TilesApplicationContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.TilesException;
@@ -34,7 +35,6 @@
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.NoSuchDefinitionException;
-import org.apache.tiles.mgmt.Definition;
import org.apache.tiles.preparer.NoSuchPreparerException;
import org.apache.tiles.preparer.PreparerFactory;
import org.apache.tiles.preparer.ViewPreparer;
diff --git a/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java b/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java
index 5cadc90..52d44a7 100644
--- a/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java
+++ b/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java
@@ -24,11 +24,11 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.tiles.Definition;
import org.apache.tiles.TilesException;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.DefinitionsFactoryException;
-import org.apache.tiles.mgmt.Definition;
/**
* Container that can be used to store multiple {@link DefinitionsFactory}
diff --git a/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingKeyedDefinitionsFactoryTilesContainer.java b/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingKeyedDefinitionsFactoryTilesContainer.java
index a5b9a83..a5a11a2 100644
--- a/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingKeyedDefinitionsFactoryTilesContainer.java
+++ b/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingKeyedDefinitionsFactoryTilesContainer.java
@@ -24,13 +24,13 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.tiles.Definition;
import org.apache.tiles.TilesException;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.impl.KeyedDefinitionsFactoryTilesContainer;
import org.apache.tiles.mgmt.MutableTilesContainer;
-import org.apache.tiles.mgmt.Definition;
/**
* Container that can be used to store multiple {@link DefinitionsFactory}
diff --git a/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java b/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java
index d29a1ac..7dedc97 100644
--- a/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java
+++ b/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java
@@ -20,12 +20,12 @@
*/
package org.apache.tiles.impl.mgmt;
+import org.apache.tiles.Definition;
import org.apache.tiles.TilesException;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.impl.BasicTilesContainer;
-import org.apache.tiles.mgmt.Definition;
import org.apache.tiles.mgmt.MutableTilesContainer;
/**
diff --git a/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java b/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
index 37c873d..083a6b5 100644
--- a/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
+++ b/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
@@ -21,11 +21,11 @@
package org.apache.tiles.impl.mgmt;
import org.apache.tiles.Attribute;
+import org.apache.tiles.Definition;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.NoSuchDefinitionException;
-import org.apache.tiles.mgmt.Definition;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitions.java b/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitions.java
index 1493147..3d2c9cb 100644
--- a/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitions.java
+++ b/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitions.java
@@ -25,7 +25,7 @@
import java.util.Locale;
import java.util.Map;
-import org.apache.tiles.mgmt.Definition;
+import org.apache.tiles.Definition;
/**
*
diff --git a/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java b/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java
index 71a6b72..b9afd4e 100644
--- a/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java
+++ b/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java
@@ -24,7 +24,7 @@
import java.util.Collections;
import java.util.Map;
-import org.apache.tiles.mgmt.Definition;
+import org.apache.tiles.Definition;
/**
* Mock Defintions Reader implementation. Stubs out all functionality.
diff --git a/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinitions.java b/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinitions.java
index ff05d93..d0908b0 100644
--- a/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinitions.java
+++ b/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinitions.java
@@ -28,8 +28,8 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.tiles.Attribute;
+import org.apache.tiles.Definition;
import org.apache.tiles.Attribute.AttributeType;
-import org.apache.tiles.mgmt.Definition;
/**
* Tests the DefinitionsImpl class.
diff --git a/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java b/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
index afdeb40..c7134c2 100644
--- a/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
+++ b/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
@@ -31,9 +31,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.tiles.Definition;
import org.apache.tiles.definition.DefinitionsFactoryException;
import org.apache.tiles.definition.DefinitionsReader;
-import org.apache.tiles.mgmt.Definition;
/**
* Tests the <code>org.apache.tiles.definition.digester.DigesterDefinitionsReader</code> class.
diff --git a/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java b/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
index 4a3d1b1..1e96544 100644
--- a/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
+++ b/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
@@ -21,12 +21,12 @@
package org.apache.tiles.jsp.taglib.definition;
import org.apache.tiles.Attribute;
+import org.apache.tiles.Definition;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.TilesException;
import org.apache.tiles.jsp.taglib.PutAttributeTag;
import org.apache.tiles.jsp.taglib.PutAttributeTagParent;
import org.apache.tiles.mgmt.MutableTilesContainer;
-import org.apache.tiles.mgmt.Definition;
import org.apache.tiles.Attribute.AttributeType;
import org.apache.tiles.access.TilesAccess;
