You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2014/09/03 15:01:00 UTC
svn commit: r1622241 - in
/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank:
./ src/main/webapp/ src/main/webapp/WEB-INF/
Author: lofwyr
Date: Wed Sep 3 13:00:59 2014
New Revision: 1622241
URL: http://svn.apache.org/r1622241
Log:
clean up blank example
Added:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/helloWorld.xhtml
- copied, changed from r1622226, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/helloWorld.jsp
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/index.html
- copied, changed from r1622226, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/index.jsp
Removed:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/helloWorld.jsp
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/index.jsp
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/pom.xml
myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/web.xml
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/pom.xml?rev=1622241&r1=1622240&r2=1622241&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/pom.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/pom.xml Wed Sep 3 13:00:59 2014
@@ -34,40 +34,8 @@
<dependencies>
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-theme-charlotteville</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-theme-scarborough</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme-speyside</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-theme-richmond</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-theme-standard</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-core</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
</project>
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/web.xml?rev=1622241&r1=1622240&r2=1622241&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/web.xml Wed Sep 3 13:00:59 2014
@@ -60,7 +60,7 @@
<!-- The Usual Welcome File List -->
<welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
+ <welcome-file>index.html</welcome-file>
</welcome-file-list>
<session-config>
Copied: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/helloWorld.xhtml (from r1622226, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/helloWorld.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/helloWorld.xhtml?p2=myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/helloWorld.xhtml&p1=myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/helloWorld.jsp&r1=1622226&r2=1622241&rev=1622241&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/helloWorld.jsp (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/helloWorld.xhtml Wed Sep 3 13:00:59 2014
@@ -1,4 +1,6 @@
-<%--
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
* 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.
@@ -13,15 +15,11 @@
* 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.
---%>
-<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<f:view>
+-->
+
+<f:view xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:tc="http://myfaces.apache.org/tobago/component">
<tc:page>
- <f:facet name="layout">
- <tc:gridLayout/>
- </f:facet>
- <tc:out value="Hello World"/>
+ <tc:out value="Hello World!"/>
</tc:page>
-</f:view>
\ No newline at end of file
+</f:view>
Copied: myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/index.html (from r1622226, myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/index.jsp)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/index.html?p2=myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/index.html&p1=myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/index.jsp&r1=1622226&r2=1622241&rev=1622241&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/index.jsp (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-example/tobago-example-blank/src/main/webapp/index.html Wed Sep 3 13:00:59 2014
@@ -1,17 +1,27 @@
-<%--
- * 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.
---%>
-<jsp:forward page="faces/helloWorld.jsp" />;
+<!DOCTYPE html>
+
+<!--
+* 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.
+-->
+
+<html>
+<head>
+ <meta http-equiv="Cache-Control" content="no-cache">
+ <meta http-equiv="Refresh" content="0; URL=faces/helloWorld.xhtml">
+</head>
+<body>
+</body>
+</html>