struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r465598 - in /struts/sandbox/trunk/tiles: src/site/apt/ src/site/fml/ tiles-core/src/test/java/org/apache/tiles/mock/ tiles-test/src/main/java/org/apache/tiles/test/servlet/ tiles-test/src/main/webapp/
Date Thu, 19 Oct 2006 12:12:46 GMT
Author: apetrelli
Date: Thu Oct 19 05:12:44 2006
New Revision: 465598

URL: http://svn.apache.org/viewvc?view=rev&rev=465598
Log:
Set svn:eol-style=native to files that have not this property.

Modified:
    struts/sandbox/trunk/tiles/src/site/apt/selenium.apt   (props changed)
    struts/sandbox/trunk/tiles/src/site/fml/faq.fml   (contents, props changed)
    struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockOnlyLocaleTilesContext.java   (contents, props changed)
    struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockPublicUrlDefinitionsFactory.java   (contents, props changed)
    struts/sandbox/trunk/tiles/tiles-test/src/main/java/org/apache/tiles/test/servlet/IncludingServlet.java   (contents, props changed)
    struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/override.jsp   (props changed)
    struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/putattributeslayout.jsp   (contents, props changed)
    struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testimportattribute.jsp   (contents, props changed)
    struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition.jsp   (contents, props changed)
    struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite.jsp   (contents, props changed)
    struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp   (contents, props changed)
    struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp   (contents, props changed)
    struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp   (contents, props changed)
    struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp   (contents, props changed)
    struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp   (contents, props changed)
    struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_notype.jsp   (contents, props changed)
    struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_override.jsp   (contents, props changed)
    struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput_servlet.jsp   (contents, props changed)

Propchange: struts/sandbox/trunk/tiles/src/site/apt/selenium.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/sandbox/trunk/tiles/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/src/site/fml/faq.fml?view=diff&rev=465598&r1=465597&r2=465598
==============================================================================
--- struts/sandbox/trunk/tiles/src/site/fml/faq.fml (original)
+++ struts/sandbox/trunk/tiles/src/site/fml/faq.fml Thu Oct 19 05:12:44 2006
@@ -1,120 +1,120 @@
-<?xml version="1.0"?>
-<!--
-Copyright 2006 The Apache Software Foundation
-Licensed 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.
--->
-<!--
-// ======================================================================== 78
--->
-<faqs title="Tiles 2 FAQ">
-    <part id="taglib-faq">
-        <title>Tiles 2 Taglib</title>
-        <faq id="get">
-            <question>What happened to <code>&amp;lt;tiles:get&amp;gt;</code> tag?
-            </question>
-            <answer>
-                <p>The <code>&amp;lt;tiles:get&amp;gt;</code> has been removed,
-                    along with its class GetTag. Use
-                    <code>&amp;lt;tiles:insert&amp;gt;</code> instead,
-                    eventually specifiying <code>ignore="true"</code>, that was
-                    the default in <code>&amp;lt;tiles:get&amp;gt;</code>.
-                </p>
-            </answer>
-        </faq>
-        <faq id="get-attribute-tag">
-            <question>What happened to <code>GetAttributeTag</code> class?
-            </question>
-            <answer>
-                <p>The <code>GetAttributeTag</code> class has been renamed to
-                    <code>GetAsStringTag</code> to conform to conventions on tag
-                    libraries.
-                </p>
-            </answer>
-        </faq>
-        <faq id="name">
-            <question>What happened to 'attribute' and 'definition'?</question>
-            <answer>
-                <p>The 'attribute' and 'definition' tag attributes were removed.
-                    Use 'name' instead.
-                </p>
-            </answer>
-        </faq>
-        <faq id="template">
-            <question>What happened to 'page' and 'component'?</question>
-            <answer>
-                <p>The 'page' and 'component' tag attributes were removed.
-                    Use 'template' instead.
-                </p>
-            </answer>
-        </faq>
-        <faq id="bean">
-            <question>What happened to beanName, beanProperty and beanScope?
-            </question>
-            <answer>
-                <p>The 'beanName', 'beanProperty', and 'beanScope' tag attributes
-                    were removed with no replacement. Use EL instead. For example:
-                </p>
-                <code>&lt;tiles:put name="foo" value="${foo.bar}"/&gt;</code>
-            </answer>
-        </faq>
-        <faq id="put-add-direct">
-            <question>What happened to the 'direct' attribute of PutTag and AddTag?
-            </question>
-            <answer>
-                <p>It has been removed since you can specify the "direct"
-                inclusion using <code>type="string"</code></p>
-            </answer>
-        </faq>
-        <faq id="insert-type">
-            <question>Is the insert tag's 'type' attribute required?
-            </question>
-            <answer>
-                <p>The "type" attribute should not be required: it is useful only to
-                distinguish between "definition" and "attribute" in the case that we
-                have a definition and an attribute with the same name.</p>
-                <p>However, we've seen reports of errors if it is not used.
-                Please comment on <a href="http://issues.apache.org/struts/browse/SB-46">SB-46</a>
-                if you have more information.</p>
-            </answer>
-        </faq>
-        <faq id="controller">
-            <question>What happened to controllerUrl and controllerClass and the
-                      <code>Controller</code> Java class?
-            </question>
-            <answer>
-                <p>The "controller" concept has been replaced with "preparer",
-                to avoid confusion with "controller" as in MVC model.
-                <code>Controller</code> class has been renamed to
-                <code>ViewPreparer</code>, while the attributes have been
-                renamed to "preparerUrl" and "preparerClass".</p>
-            </answer>
-        </faq>
-        <faq id="definition-id">
-            <question>What happened to the 'id' attribute of DefinitionTag?
-            </question>
-            <answer>
-                <p>TODO - Did this change to 'name'?</p>
-            </answer>
-        </faq>
-    </part>
-    <part id="dtd-faq">
-        <title>Tiles 2 DTD</title>
-        <faq id="todo">
-            <question>What happened to ... ?</question>
-            <answer>
-                <p>TODO
-                </p>
-            </answer>
-        </faq>
-    </part>
-</faqs>
+<?xml version="1.0"?>
+<!--
+Copyright 2006 The Apache Software Foundation
+Licensed 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.
+-->
+<!--
+// ======================================================================== 78
+-->
+<faqs title="Tiles 2 FAQ">
+    <part id="taglib-faq">
+        <title>Tiles 2 Taglib</title>
+        <faq id="get">
+            <question>What happened to <code>&amp;lt;tiles:get&amp;gt;</code> tag?
+            </question>
+            <answer>
+                <p>The <code>&amp;lt;tiles:get&amp;gt;</code> has been removed,
+                    along with its class GetTag. Use
+                    <code>&amp;lt;tiles:insert&amp;gt;</code> instead,
+                    eventually specifiying <code>ignore="true"</code>, that was
+                    the default in <code>&amp;lt;tiles:get&amp;gt;</code>.
+                </p>
+            </answer>
+        </faq>
+        <faq id="get-attribute-tag">
+            <question>What happened to <code>GetAttributeTag</code> class?
+            </question>
+            <answer>
+                <p>The <code>GetAttributeTag</code> class has been renamed to
+                    <code>GetAsStringTag</code> to conform to conventions on tag
+                    libraries.
+                </p>
+            </answer>
+        </faq>
+        <faq id="name">
+            <question>What happened to 'attribute' and 'definition'?</question>
+            <answer>
+                <p>The 'attribute' and 'definition' tag attributes were removed.
+                    Use 'name' instead.
+                </p>
+            </answer>
+        </faq>
+        <faq id="template">
+            <question>What happened to 'page' and 'component'?</question>
+            <answer>
+                <p>The 'page' and 'component' tag attributes were removed.
+                    Use 'template' instead.
+                </p>
+            </answer>
+        </faq>
+        <faq id="bean">
+            <question>What happened to beanName, beanProperty and beanScope?
+            </question>
+            <answer>
+                <p>The 'beanName', 'beanProperty', and 'beanScope' tag attributes
+                    were removed with no replacement. Use EL instead. For example:
+                </p>
+                <code>&lt;tiles:put name="foo" value="${foo.bar}"/&gt;</code>
+            </answer>
+        </faq>
+        <faq id="put-add-direct">
+            <question>What happened to the 'direct' attribute of PutTag and AddTag?
+            </question>
+            <answer>
+                <p>It has been removed since you can specify the "direct"
+                inclusion using <code>type="string"</code></p>
+            </answer>
+        </faq>
+        <faq id="insert-type">
+            <question>Is the insert tag's 'type' attribute required?
+            </question>
+            <answer>
+                <p>The "type" attribute should not be required: it is useful only to
+                distinguish between "definition" and "attribute" in the case that we
+                have a definition and an attribute with the same name.</p>
+                <p>However, we've seen reports of errors if it is not used.
+                Please comment on <a href="http://issues.apache.org/struts/browse/SB-46">SB-46</a>
+                if you have more information.</p>
+            </answer>
+        </faq>
+        <faq id="controller">
+            <question>What happened to controllerUrl and controllerClass and the
+                      <code>Controller</code> Java class?
+            </question>
+            <answer>
+                <p>The "controller" concept has been replaced with "preparer",
+                to avoid confusion with "controller" as in MVC model.
+                <code>Controller</code> class has been renamed to
+                <code>ViewPreparer</code>, while the attributes have been
+                renamed to "preparerUrl" and "preparerClass".</p>
+            </answer>
+        </faq>
+        <faq id="definition-id">
+            <question>What happened to the 'id' attribute of DefinitionTag?
+            </question>
+            <answer>
+                <p>TODO - Did this change to 'name'?</p>
+            </answer>
+        </faq>
+    </part>
+    <part id="dtd-faq">
+        <title>Tiles 2 DTD</title>
+        <faq id="todo">
+            <question>What happened to ... ?</question>
+            <answer>
+                <p>TODO
+                </p>
+            </answer>
+        </faq>
+    </part>
+</faqs>

Propchange: struts/sandbox/trunk/tiles/src/site/fml/faq.fml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockOnlyLocaleTilesContext.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockOnlyLocaleTilesContext.java?view=diff&rev=465598&r1=465597&r2=465598
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockOnlyLocaleTilesContext.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockOnlyLocaleTilesContext.java Thu Oct 19 05:12:44 2006
@@ -1,103 +1,103 @@
-/*
- * $Id$
- *
- * Copyright 1999-2006 The Apache Software Foundation.
- * 
- * Licensed 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.mock;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.tiles.TilesContext;
-
-/**
- * Creates a TilesContext that contains only a Locale
- * 
- * @version $Rev$ $Date$
- */
-public class MockOnlyLocaleTilesContext implements TilesContext {
-
-    /**
-     * The locale object.
-     */
-    private Locale locale;
-
-    /** Creates a new instance of MockOnlyLocaleTilesContext.
-     * 
-     * @param locale The locale object to use.
-     */
-    public MockOnlyLocaleTilesContext(Locale locale) {
-        this.locale = locale;
-    }
-
-    /**
-     * Returns the locale specified in the constructor.
-     * 
-     * @see org.apache.tiles.TilesContext#getRequestLocale()
-     */
-    public Locale getRequestLocale() {
-        return locale;
-    }
-
-    // The rest of the implemented methods has a "dummy" behaviour, doing
-    // nothing or returning null, because they are not needed at all in tests
-    // that use this class.
-    
-    public void dispatch(String path) throws IOException, Exception {
-    }
-
-    public Map getApplicationScope() {
-        return null;
-    }
-
-    public Map getHeader() {
-        return null;
-    }
-
-    public Map getHeaderValues() {
-        return null;
-    }
-
-    public Map getInitParams() {
-        return null;
-    }
-
-    public Map getParam() {
-        return null;
-    }
-
-    public Map getParamValues() {
-        return null;
-    }
-
-    public Map getRequestScope() {
-        return null;
-    }
-
-    public URL getResource(String path) throws MalformedURLException {
-        return null;
-    }
-
-    public Map getSessionScope() {
-        return null;
-    }
-
-    public void include(String path) throws IOException, Exception {
-    }
-}
+/*
+ * $Id$
+ *
+ * Copyright 1999-2006 The Apache Software Foundation.
+ * 
+ * Licensed 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.mock;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Locale;
+import java.util.Map;
+
+import org.apache.tiles.TilesContext;
+
+/**
+ * Creates a TilesContext that contains only a Locale
+ * 
+ * @version $Rev$ $Date$
+ */
+public class MockOnlyLocaleTilesContext implements TilesContext {
+
+    /**
+     * The locale object.
+     */
+    private Locale locale;
+
+    /** Creates a new instance of MockOnlyLocaleTilesContext.
+     * 
+     * @param locale The locale object to use.
+     */
+    public MockOnlyLocaleTilesContext(Locale locale) {
+        this.locale = locale;
+    }
+
+    /**
+     * Returns the locale specified in the constructor.
+     * 
+     * @see org.apache.tiles.TilesContext#getRequestLocale()
+     */
+    public Locale getRequestLocale() {
+        return locale;
+    }
+
+    // The rest of the implemented methods has a "dummy" behaviour, doing
+    // nothing or returning null, because they are not needed at all in tests
+    // that use this class.
+    
+    public void dispatch(String path) throws IOException, Exception {
+    }
+
+    public Map getApplicationScope() {
+        return null;
+    }
+
+    public Map getHeader() {
+        return null;
+    }
+
+    public Map getHeaderValues() {
+        return null;
+    }
+
+    public Map getInitParams() {
+        return null;
+    }
+
+    public Map getParam() {
+        return null;
+    }
+
+    public Map getParamValues() {
+        return null;
+    }
+
+    public Map getRequestScope() {
+        return null;
+    }
+
+    public URL getResource(String path) throws MalformedURLException {
+        return null;
+    }
+
+    public Map getSessionScope() {
+        return null;
+    }
+
+    public void include(String path) throws IOException, Exception {
+    }
+}

Propchange: struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockOnlyLocaleTilesContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockPublicUrlDefinitionsFactory.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockPublicUrlDefinitionsFactory.java?view=diff&rev=465598&r1=465597&r2=465598
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockPublicUrlDefinitionsFactory.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockPublicUrlDefinitionsFactory.java Thu Oct 19 05:12:44 2006
@@ -1,56 +1,56 @@
-/*
- * $Id$
- *
- * Copyright 1999-2006 The Apache Software Foundation.
- * 
- * Licensed 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.mock;
-
-import org.apache.tiles.ComponentDefinitions;
-import org.apache.tiles.DefinitionsFactoryException;
-import org.apache.tiles.TilesContext;
-import org.apache.tiles.definition.UrlDefinitionsFactory;
-
-/**
- * Mock implementation of UrlDefinitionsFactory that exposes two of its methods
- * as public instead of protected.
- * 
- * @version $Rev$ $Date$
- */
-public class MockPublicUrlDefinitionsFactory extends UrlDefinitionsFactory {
-
-    /**
-     * Exposes the <code>addDefinitions</code> method of
-     * <code>UrlDefinitionsFactory</code>
-     * 
-     * @see org.apache.tiles.definition.UrlDefinitionsFactory#addDefinitions(org.apache.tiles.ComponentDefinitions,
-     *      org.apache.tiles.TilesContext)
-     */
-    public void addDefinitions(ComponentDefinitions definitions,
-            TilesContext tilesContext) throws DefinitionsFactoryException {
-        super.addDefinitions(definitions, tilesContext);
-    }
-
-    /**
-     * 
-     * Exposes the <code>isContextProcessed</code> method of
-     * <code>UrlDefinitionsFactory</code>
-     * 
-     * @see org.apache.tiles.definition.UrlDefinitionsFactory#isContextProcessed(org.apache.tiles.TilesContext)
-     */
-    public boolean isContextProcessed(TilesContext tilesContext) {
-        return super.isContextProcessed(tilesContext);
-    }
-}
+/*
+ * $Id$
+ *
+ * Copyright 1999-2006 The Apache Software Foundation.
+ * 
+ * Licensed 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.mock;
+
+import org.apache.tiles.ComponentDefinitions;
+import org.apache.tiles.DefinitionsFactoryException;
+import org.apache.tiles.TilesContext;
+import org.apache.tiles.definition.UrlDefinitionsFactory;
+
+/**
+ * Mock implementation of UrlDefinitionsFactory that exposes two of its methods
+ * as public instead of protected.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class MockPublicUrlDefinitionsFactory extends UrlDefinitionsFactory {
+
+    /**
+     * Exposes the <code>addDefinitions</code> method of
+     * <code>UrlDefinitionsFactory</code>
+     * 
+     * @see org.apache.tiles.definition.UrlDefinitionsFactory#addDefinitions(org.apache.tiles.ComponentDefinitions,
+     *      org.apache.tiles.TilesContext)
+     */
+    public void addDefinitions(ComponentDefinitions definitions,
+            TilesContext tilesContext) throws DefinitionsFactoryException {
+        super.addDefinitions(definitions, tilesContext);
+    }
+
+    /**
+     * 
+     * Exposes the <code>isContextProcessed</code> method of
+     * <code>UrlDefinitionsFactory</code>
+     * 
+     * @see org.apache.tiles.definition.UrlDefinitionsFactory#isContextProcessed(org.apache.tiles.TilesContext)
+     */
+    public boolean isContextProcessed(TilesContext tilesContext) {
+        return super.isContextProcessed(tilesContext);
+    }
+}

Propchange: struts/sandbox/trunk/tiles/tiles-core/src/test/java/org/apache/tiles/mock/MockPublicUrlDefinitionsFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/java/org/apache/tiles/test/servlet/IncludingServlet.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/java/org/apache/tiles/test/servlet/IncludingServlet.java?view=diff&rev=465598&r1=465597&r2=465598
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-test/src/main/java/org/apache/tiles/test/servlet/IncludingServlet.java (original)
+++ struts/sandbox/trunk/tiles/tiles-test/src/main/java/org/apache/tiles/test/servlet/IncludingServlet.java Thu Oct 19 05:12:44 2006
@@ -1,55 +1,55 @@
-/*
- * $Id$
- *
- * Copyright 1999-2006 The Apache Software Foundation.
- * 
- * Licensed 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.test.servlet;
-
-import java.io.IOException;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Sample servlet that includes a page specified by the <code>include</code>
- * init parameter.
- * 
- * @version $Rev$ $Date$ 
- */
-public class IncludingServlet extends HttpServlet {
-
-    private String include;
-
-    /**
-     * Initializes the servlet, reading the <code>include</code> init parameter
-     */
-    public void init(ServletConfig config) throws ServletException {
-        super.init(config);
-
-        include = config.getInitParameter("include");
-    }
-
-    /**
-     * Processes the request, including the specified page.
-     */
-    protected void doGet(HttpServletRequest request,
-            HttpServletResponse response) throws ServletException, IOException {
-        request.getRequestDispatcher(include).include(request, response);
-    }
-}
+/*
+ * $Id$
+ *
+ * Copyright 1999-2006 The Apache Software Foundation.
+ * 
+ * Licensed 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.test.servlet;
+
+import java.io.IOException;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Sample servlet that includes a page specified by the <code>include</code>
+ * init parameter.
+ * 
+ * @version $Rev$ $Date$ 
+ */
+public class IncludingServlet extends HttpServlet {
+
+    private String include;
+
+    /**
+     * Initializes the servlet, reading the <code>include</code> init parameter
+     */
+    public void init(ServletConfig config) throws ServletException {
+        super.init(config);
+
+        include = config.getInitParameter("include");
+    }
+
+    /**
+     * Processes the request, including the specified page.
+     */
+    protected void doGet(HttpServletRequest request,
+            HttpServletResponse response) throws ServletException, IOException {
+        request.getRequestDispatcher(include).include(request, response);
+    }
+}

Propchange: struts/sandbox/trunk/tiles/tiles-test/src/main/java/org/apache/tiles/test/servlet/IncludingServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/override.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/putattributeslayout.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/putattributeslayout.jsp?view=diff&rev=465598&r1=465597&r2=465598
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/putattributeslayout.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/putattributeslayout.jsp Thu Oct 19 05:12:44 2006
@@ -1,11 +1,11 @@
-<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
-<tiles:importAttribute name="stringTest"/>
-<tiles:importAttribute name="list"/>
-Single attribute "stringTest" value: <c:out value="${stringTest}" /> <br/><br/>
-The attribute "list" contains these values:
-<ul>
-<c:forEach var="item" items="${list}">
-<li><c:out value="${item}" /></li>
-</c:forEach>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<tiles:importAttribute name="stringTest"/>
+<tiles:importAttribute name="list"/>
+Single attribute "stringTest" value: <c:out value="${stringTest}" /> <br/><br/>
+The attribute "list" contains these values:
+<ul>
+<c:forEach var="item" items="${list}">
+<li><c:out value="${item}" /></li>
+</c:forEach>
 </ul>

Propchange: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/putattributeslayout.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testimportattribute.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testimportattribute.jsp?view=diff&rev=465598&r1=465597&r2=465598
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testimportattribute.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testimportattribute.jsp Thu Oct 19 05:12:44 2006
@@ -1,3 +1,3 @@
-<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-
-<tiles:insert name="test.putAttributes" />
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+
+<tiles:insert name="test.putAttributes" />

Propchange: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testimportattribute.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition.jsp?view=diff&rev=465598&r1=465597&r2=465598
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition.jsp Thu Oct 19 05:12:44 2006
@@ -1,3 +1,3 @@
-<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-
-<tiles:insert name="test.definition" type="definition" />
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+
+<tiles:insert name="test.definition" type="definition" />

Propchange: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite.jsp?view=diff&rev=465598&r1=465597&r2=465598
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite.jsp Thu Oct 19 05:12:44 2006
@@ -1,3 +1,3 @@
-<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-
-<tiles:insert name="test.composite.definition" type="definition" />
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+
+<tiles:insert name="test.composite.definition" type="definition" />

Propchange: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp?view=diff&rev=465598&r1=465597&r2=465598
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp Thu Oct 19 05:12:44 2006
@@ -1,13 +1,13 @@
-<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-
-<tiles:definition name="test.inner.definition.tags" template="/layout.jsp">
-    <tiles:put name="title"  value="This is an inner definition with tags."/>
-    <tiles:put name="header" value="/header.jsp"/>
-    <tiles:put name="body"   value="/body.jsp"/>
-</tiles:definition>
-<tiles:definition name="test.composite.definition.tags" template="/layout.jsp">
-    <tiles:put name="title"  value="This is a composite definition with tags."/>
-    <tiles:put name="header" value="/header.jsp"/>
-    <tiles:put name="body"   value="test.inner.definition.tags" type="definition"/>
-</tiles:definition>
-<tiles:insert name="test.composite.definition.tags" type="definition" />
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+
+<tiles:definition name="test.inner.definition.tags" template="/layout.jsp">
+    <tiles:put name="title"  value="This is an inner definition with tags."/>
+    <tiles:put name="header" value="/header.jsp"/>
+    <tiles:put name="body"   value="/body.jsp"/>
+</tiles:definition>
+<tiles:definition name="test.composite.definition.tags" template="/layout.jsp">
+    <tiles:put name="title"  value="This is a composite definition with tags."/>
+    <tiles:put name="header" value="/header.jsp"/>
+    <tiles:put name="body"   value="test.inner.definition.tags" type="definition"/>
+</tiles:definition>
+<tiles:insert name="test.composite.definition.tags" type="definition" />

Propchange: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp?view=diff&rev=465598&r1=465597&r2=465598
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp Thu Oct 19 05:12:44 2006
@@ -1,13 +1,13 @@
-<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-
-<tiles:definition name="test.inner.definition.tags" template="/layout.jsp">
-    <tiles:put name="title"  value="This is an inner definition with tags."/>
-    <tiles:put name="header" value="/header.jsp"/>
-    <tiles:put name="body"   value="/body.jsp"/>
-</tiles:definition>
-<tiles:definition name="test.composite.definition.tags" template="/layout.jsp">
-    <tiles:put name="title"  value="This is a composite definition with tags."/>
-    <tiles:put name="header" value="/header.jsp"/>
-    <tiles:put name="body"   value="test.inner.definition" type="definition"/>
-</tiles:definition>
-<tiles:insert name="test.composite.definition.tags" type="definition" />
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+
+<tiles:definition name="test.inner.definition.tags" template="/layout.jsp">
+    <tiles:put name="title"  value="This is an inner definition with tags."/>
+    <tiles:put name="header" value="/header.jsp"/>
+    <tiles:put name="body"   value="/body.jsp"/>
+</tiles:definition>
+<tiles:definition name="test.composite.definition.tags" template="/layout.jsp">
+    <tiles:put name="title"  value="This is a composite definition with tags."/>
+    <tiles:put name="header" value="/header.jsp"/>
+    <tiles:put name="body"   value="test.inner.definition" type="definition"/>
+</tiles:definition>
+<tiles:insert name="test.composite.definition.tags" type="definition" />

Propchange: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp?view=diff&rev=465598&r1=465597&r2=465598
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp Thu Oct 19 05:12:44 2006
@@ -1,13 +1,13 @@
-<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-
-<tiles:definition name="test.inner.definition.tags" template="/layout.jsp">
-    <tiles:put name="title"  value="This is an inner definition with tags."/>
-    <tiles:put name="header" value="/header.jsp"/>
-    <tiles:put name="body"   value="/body.jsp"/>
-</tiles:definition>
-<tiles:definition name="test.composite.definition.tags" template="/layout.jsp">
-    <tiles:put name="title"  value="This is a composite definition with tags."/>
-    <tiles:put name="header" value="/header.jsp"/>
-    <tiles:put name="body"   value="test.inner.definition"/>
-</tiles:definition>
-<tiles:insert name="test.composite.definition.tags" type="definition" />
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+
+<tiles:definition name="test.inner.definition.tags" template="/layout.jsp">
+    <tiles:put name="title"  value="This is an inner definition with tags."/>
+    <tiles:put name="header" value="/header.jsp"/>
+    <tiles:put name="body"   value="/body.jsp"/>
+</tiles:definition>
+<tiles:definition name="test.composite.definition.tags" template="/layout.jsp">
+    <tiles:put name="title"  value="This is a composite definition with tags."/>
+    <tiles:put name="header" value="/header.jsp"/>
+    <tiles:put name="body"   value="test.inner.definition"/>
+</tiles:definition>
+<tiles:insert name="test.composite.definition.tags" type="definition" />

Propchange: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_includes_configured_notype.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp?view=diff&rev=465598&r1=465597&r2=465598
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp Thu Oct 19 05:12:44 2006
@@ -1,13 +1,13 @@
-<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-
-<tiles:definition name="test.inner.definition.tags" template="/layout.jsp">
-    <tiles:put name="title"  value="This is an inner definition with tags."/>
-    <tiles:put name="header" value="/header.jsp"/>
-    <tiles:put name="body"   value="/body.jsp"/>
-</tiles:definition>
-<tiles:definition name="test.composite.definition.tags" template="/layout.jsp">
-    <tiles:put name="title"  value="This is a composite definition with tags."/>
-    <tiles:put name="header" value="/header.jsp"/>
-    <tiles:put name="body"   value="test.inner.definition.tags"/>
-</tiles:definition>
-<tiles:insert name="test.composite.definition.tags" type="definition" />
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+
+<tiles:definition name="test.inner.definition.tags" template="/layout.jsp">
+    <tiles:put name="title"  value="This is an inner definition with tags."/>
+    <tiles:put name="header" value="/header.jsp"/>
+    <tiles:put name="body"   value="/body.jsp"/>
+</tiles:definition>
+<tiles:definition name="test.composite.definition.tags" template="/layout.jsp">
+    <tiles:put name="title"  value="This is a composite definition with tags."/>
+    <tiles:put name="header" value="/header.jsp"/>
+    <tiles:put name="body"   value="test.inner.definition.tags"/>
+</tiles:definition>
+<tiles:insert name="test.composite.definition.tags" type="definition" />

Propchange: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_composite_tags_notype.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp?view=diff&rev=465598&r1=465597&r2=465598
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp Thu Oct 19 05:12:44 2006
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-
-<tiles:insert name="test.definition" type="definition">
-  <tiles:put name="body">
-  <div align="center"><b><i>This is an inline content</i></b></div>
-  </tiles:put>
-</tiles:insert>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+
+<tiles:insert name="test.definition" type="definition">
+  <tiles:put name="body">
+  <div align="center"><b><i>This is an inline content</i></b></div>
+  </tiles:put>
+</tiles:insert>

Propchange: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_inline.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_notype.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_notype.jsp?view=diff&rev=465598&r1=465597&r2=465598
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_notype.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_notype.jsp Thu Oct 19 05:12:44 2006
@@ -1,3 +1,3 @@
-<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-
-<tiles:insert name="test.definition" />
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+
+<tiles:insert name="test.definition" />

Propchange: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_notype.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_override.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_override.jsp?view=diff&rev=465598&r1=465597&r2=465598
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_override.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_override.jsp Thu Oct 19 05:12:44 2006
@@ -1,5 +1,5 @@
-<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-
-<tiles:insert name="test.definition" type="definition">
-  <tiles:put name="body"   value="/override.jsp" />
-</tiles:insert>
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+
+<tiles:insert name="test.definition" type="definition">
+  <tiles:put name="body"   value="/override.jsp" />
+</tiles:insert>

Propchange: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testinsertdefinition_override.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput_servlet.jsp
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput_servlet.jsp?view=diff&rev=465598&r1=465597&r2=465598
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput_servlet.jsp (original)
+++ struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput_servlet.jsp Thu Oct 19 05:12:44 2006
@@ -1,7 +1,7 @@
-<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
-
-<tiles:insert template="/servlets/layoutServlet">
-  <tiles:put name="title"  value="This is the title." />
-  <tiles:put name="header" value="/header.jsp" />
-  <tiles:put name="body"   value="/body.jsp" />
+<%@ taglib uri="http://struts.apache.org/tags-tiles" prefix="tiles" %>
+
+<tiles:insert template="/servlets/layoutServlet">
+  <tiles:put name="title"  value="This is the title." />
+  <tiles:put name="header" value="/header.jsp" />
+  <tiles:put name="body"   value="/body.jsp" />
 </tiles:insert>

Propchange: struts/sandbox/trunk/tiles/tiles-test/src/main/webapp/testput_servlet.jsp
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message