Repository: struts Updated Branches: refs/heads/master 954a29efc -> 6d2a57355
fixed tiles showcase by setting dtd to 3.0 Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d9f4054b Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d9f4054b Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d9f4054b Branch: refs/heads/master Commit: d9f4054b1367cd7ab6e3f22b9cc677f62def4e83 Parents: 249d2f8 Author: cnenning <cnenn...@apache.org> Authored: Fri Jan 22 14:59:48 2016 +0100 Committer: cnenning <cnenn...@apache.org> Committed: Fri Jan 22 14:59:48 2016 +0100 ---------------------------------------------------------------------- apps/showcase/src/main/webapp/WEB-INF/tiles.xml | 96 ++++++++++---------- 1 file changed, 48 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/d9f4054b/apps/showcase/src/main/webapp/WEB-INF/tiles.xml ---------------------------------------------------------------------- diff --git a/apps/showcase/src/main/webapp/WEB-INF/tiles.xml b/apps/showcase/src/main/webapp/WEB-INF/tiles.xml index 7c7057f..027f9a4 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/tiles.xml +++ b/apps/showcase/src/main/webapp/WEB-INF/tiles.xml @@ -1,48 +1,48 @@ -<?xml version="1.0" encoding="ISO-8859-1" ?> -<!-- -/* - * 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. - * - */ ---> - -<!DOCTYPE tiles-definitions PUBLIC - "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN" - "http://tiles.apache.org/dtds/tiles-config_2_0.dtd";> - -<tiles-definitions> - - <definition name="showcase.index" template="/WEB-INF/tiles/layout.jsp"> - <put-attribute name="title" value="Tiles Showcase"/> - <put-attribute name="header" value="/WEB-INF/tiles/header.jsp"/> - <put-attribute name="body" value="/WEB-INF/tiles/body.jsp"/> - </definition> - - <definition name="showcase.freemarker" template="/WEB-INF/tiles/layout.jsp"> - <put-attribute name="title" value="Tiles/Freemarker Showcase"/> - <put-attribute name="header" value="/WEB-INF/tiles/header.jsp"/> - <put-attribute name="body" value="/WEB-INF/tiles/body.ftl"/> - </definition> - - <definition name="showcase.freemarkerLayout" template="/WEB-INF/tiles/layout.ftl"> - <put-attribute name="title" value="Tiles/Freemarker Showcase"/> - <put-attribute name="header" value="/WEB-INF/tiles/header.jsp"/> - <put-attribute name="body" value="/WEB-INF/tiles/body.ftl"/> - </definition> - -</tiles-definitions> +<?xml version="1.0" encoding="ISO-8859-1" ?> +<!-- +/* + * 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. + * + */ +--> + +<!DOCTYPE tiles-definitions PUBLIC + "-//Apache Software Foundation//DTD Tiles Configuration 3.0//EN" + "http://tiles.apache.org/dtds/tiles-config_3_0.dtd";> + +<tiles-definitions> + + <definition name="showcase.index" template="/WEB-INF/tiles/layout.jsp"> + <put-attribute name="title" value="Tiles Showcase"/> + <put-attribute name="header" value="/WEB-INF/tiles/header.jsp"/> + <put-attribute name="body" value="/WEB-INF/tiles/body.jsp"/> + </definition> + + <definition name="showcase.freemarker" template="/WEB-INF/tiles/layout.jsp"> + <put-attribute name="title" value="Tiles/Freemarker Showcase"/> + <put-attribute name="header" value="/WEB-INF/tiles/header.jsp"/> + <put-attribute name="body" value="/WEB-INF/tiles/body.ftl"/> + </definition> + + <definition name="showcase.freemarkerLayout" template="/WEB-INF/tiles/layout.ftl"> + <put-attribute name="title" value="Tiles/Freemarker Showcase"/> + <put-attribute name="header" value="/WEB-INF/tiles/header.jsp"/> + <put-attribute name="body" value="/WEB-INF/tiles/body.ftl"/> + </definition> + +</tiles-definitions>
