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 2007/05/11 16:07:36 UTC

svn commit: r537196 - in /tiles/framework/trunk: tiles-api/src/main/java/org/apache/tiles/ tiles-api/src/main/java/org/apache/tiles/mgmt/ tiles-api/src/test/java/org/apache/tiles/ tiles-core/src/main/java/org/apache/tiles/definition/ tiles-core/src/mai...

Author: apetrelli
Date: Fri May 11 07:07:35 2007
New Revision: 537196

URL: http://svn.apache.org/viewvc?view=rev&rev=537196
Log:
TILES-177
Moved the new Definition class to "org.apache.tiles" package.

Added:
    tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Definition.java
      - copied, changed from r537191, tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/Definition.java
    tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java
Removed:
    tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/Definition.java
    tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinition.java
Modified:
    tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java
    tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/Definitions.java
    tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java
    tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java
    tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java
    tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
    tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
    tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
    tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java
    tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingKeyedDefinitionsFactoryTilesContainer.java
    tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java
    tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
    tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitions.java
    tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java
    tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinitions.java
    tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
    tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java

Copied: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Definition.java (from r537191, tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/Definition.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Definition.java?view=diff&rev=537196&p1=tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/Definition.java&r1=537191&p2=tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Definition.java&r2=537196
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/Definition.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/Definition.java Fri May 11 07:07:35 2007
@@ -18,13 +18,13 @@
  * 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.

Modified: tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java?view=diff&rev=537196&r1=537195&r2=537196
==============================================================================
--- tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java (original)
+++ tiles/framework/trunk/tiles-api/src/main/java/org/apache/tiles/mgmt/MutableTilesContainer.java Fri May 11 07:07:35 2007
@@ -20,6 +20,7 @@
  */
 package org.apache.tiles.mgmt;
 
+import org.apache.tiles.Definition;
 import org.apache.tiles.TilesContainer;
 import org.apache.tiles.TilesException;
 

Added: tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java?view=auto&rev=537196
==============================================================================
--- tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java (added)
+++ tiles/framework/trunk/tiles-api/src/test/java/org/apache/tiles/TestDefinition.java Fri May 11 07:07:35 2007
@@ -0,0 +1,84 @@
+/*
+ * $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);
+    }
+
+
+}

Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/Definitions.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/Definitions.java?view=diff&rev=537196&r1=537195&r2=537196
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/Definitions.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/Definitions.java Fri May 11 07:07:35 2007
@@ -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.

Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java?view=diff&rev=537196&r1=537195&r2=537196
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsFactory.java Fri May 11 07:07:35 2007
@@ -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;

Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java?view=diff&rev=537196&r1=537195&r2=537196
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsImpl.java Fri May 11 07:07:35 2007
@@ -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;

Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java?view=diff&rev=537196&r1=537195&r2=537196
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/DefinitionsReader.java Fri May 11 07:07:35 2007
@@ -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.

Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java?view=diff&rev=537196&r1=537195&r2=537196
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/UrlDefinitionsFactory.java Fri May 11 07:07:35 2007
@@ -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;

Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java?view=diff&rev=537196&r1=537195&r2=537196
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/definition/digester/DigesterDefinitionsReader.java Fri May 11 07:07:35 2007
@@ -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;
 

Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java?view=diff&rev=537196&r1=537195&r2=537196
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/BasicTilesContainer.java Fri May 11 07:07:35 2007
@@ -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;

Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java?view=diff&rev=537196&r1=537195&r2=537196
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java Fri May 11 07:07:35 2007
@@ -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}

Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingKeyedDefinitionsFactoryTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingKeyedDefinitionsFactoryTilesContainer.java?view=diff&rev=537196&r1=537195&r2=537196
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingKeyedDefinitionsFactoryTilesContainer.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingKeyedDefinitionsFactoryTilesContainer.java Fri May 11 07:07:35 2007
@@ -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}

Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java?view=diff&rev=537196&r1=537195&r2=537196
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachingTilesContainer.java Fri May 11 07:07:35 2007
@@ -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;
 
 /**

Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java?view=diff&rev=537196&r1=537195&r2=537196
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/DefinitionManager.java Fri May 11 07:07:35 2007
@@ -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;
 

Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitions.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitions.java?view=diff&rev=537196&r1=537195&r2=537196
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitions.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitions.java Fri May 11 07:07:35 2007
@@ -25,7 +25,7 @@
 import java.util.Locale;
 import java.util.Map;
 
-import org.apache.tiles.mgmt.Definition;
+import org.apache.tiles.Definition;
 
 /**
  *

Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java?view=diff&rev=537196&r1=537195&r2=537196
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/MockDefinitionsReader.java Fri May 11 07:07:35 2007
@@ -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.

Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinitions.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinitions.java?view=diff&rev=537196&r1=537195&r2=537196
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinitions.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/TestDefinitions.java Fri May 11 07:07:35 2007
@@ -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.

Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java?view=diff&rev=537196&r1=537195&r2=537196
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/definition/digester/TestDigesterDefinitionsReader.java Fri May 11 07:07:35 2007
@@ -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.

Modified: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java?view=diff&rev=537196&r1=537195&r2=537196
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/jsp/taglib/definition/DefinitionTag.java Fri May 11 07:07:35 2007
@@ -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;