You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2006/11/08 23:57:13 UTC
svn commit: r472678 - in /myfaces/tobago/trunk: example/demo/
example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/
example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/
example/demo/src/main/webapp/overview/ tobago-t...
Author: bommel
Date: Wed Nov 8 14:57:12 2006
New Revision: 472678
URL: http://svn.apache.org/viewvc?view=rev&rev=472678
Log:
(TOBAGO-178) ASF Source Header and Copyright Notice Policy
Modified:
myfaces/tobago/trunk/example/demo/pom.xml
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/PresentationController.java
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basicControls.jsp
myfaces/tobago/trunk/example/demo/src/main/webapp/overview/layout.jsp
myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml
myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/AttributeData.java
myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/Controller.java
myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/DynamicTag.java
myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/TagData.java
Modified: myfaces/tobago/trunk/example/demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/pom.xml?view=diff&rev=472678&r1=472677&r2=472678
==============================================================================
--- myfaces/tobago/trunk/example/demo/pom.xml (original)
+++ myfaces/tobago/trunk/example/demo/pom.xml Wed Nov 8 14:57:12 2006
@@ -1,21 +1,19 @@
<?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. 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
+ * 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
+ * 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.
+ * 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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -83,11 +81,11 @@
<artifactId>tobago-theme-scarborough</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-sandbox</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme-speyside</artifactId>
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java?view=diff&rev=472678&r1=472677&r2=472678
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java Wed Nov 8 14:57:12 2006
@@ -1,11 +1,12 @@
package org.apache.myfaces.tobago.example.demo;
/*
- * Copyright 2002-2005 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
+ * 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
*
@@ -57,6 +58,8 @@
private Boolean[] bool;
private Boolean boolTest;
+
+ private boolean skipUpdate;
private String[] text;
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/PresentationController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/PresentationController.java?view=diff&rev=472678&r1=472677&r2=472678
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/PresentationController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/PresentationController.java Wed Nov 8 14:57:12 2006
@@ -1,11 +1,12 @@
package org.apache.myfaces.tobago.example.demo.overview;
/*
- * Copyright 2002-2005 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
+ * 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
*
@@ -35,6 +36,7 @@
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.util.List;
+import java.util.Date;
public class PresentationController {
@@ -43,6 +45,18 @@
private List pages;
private int pageIndex;
+
+ private Date currentRequestTime = new Date();
+
+ public Date getCurrentRequestTime() {
+ System.err.println("Get " + currentRequestTime!=null?currentRequestTime.getTime():0);
+ return currentRequestTime;
+ }
+
+ public void setCurrentRequestTime(Date currentRequestTime) {
+ System.err.println("Set " + currentRequestTime.getTime());
+ this.currentRequestTime = currentRequestTime;
+ }
public String gotoFirst() {
pageIndex = 0;
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basicControls.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basicControls.jsp?view=diff&rev=472678&r1=472677&r2=472678
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basicControls.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/basicControls.jsp Wed Nov 8 14:57:12 2006
@@ -1,17 +1,18 @@
<%--
- * Copyright 2002-2005 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
--%>
<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
@@ -21,6 +22,9 @@
<layout:overview>
<jsp:body>
<tc:panel>
+ <f:facet name="reload">
+ <tc:reload frequency="5000" />
+ </f:facet>
<f:facet name="layout">
<tc:gridLayout border="0" rows="20px;fixed;1*;20px;fixed;1*;20px;fixed" />
</f:facet>
@@ -29,7 +33,7 @@
<tc:out escape="false" value="#{overviewBundle.basic_text_input}" />
<%-- row --%>
- <tc:box label="#{overviewBundle.basicControls_sampleInputTitle}">
+ <tc:box label="#{overviewBundle.basicControls_sampleInputTitle}" markup="deleted">
<f:facet name="layout">
<tc:gridLayout columns="1*;1*" border="0" />
</f:facet>
@@ -38,12 +42,13 @@
<f:facet name="layout">
<tc:gridLayout />
</f:facet>
- <tx:in value="#{overviewController.basicInput}"
+ <tx:in value="#{overviewController.basicInput}" required="true"
label="#{overviewBundle.basic_textboxLabel}" tip="test"
suggestMethod="#{overviewController.getInputSuggestItems}" />
<tx:date value="#{overviewController.basicDate}"
label="#{overviewBundle.basic_dateLabel}" required="true" >
- <f:convertDateTime pattern="dd.MM.yyyy" />
+ <f:convertDateTime pattern="dd/MM/yyyy" />
+ <tc:validateSubmittedValueLength maximum="10"/>
</tx:date>
<tx:time label="#{overviewBundle.basic_timeLabel}"
value="#{overviewController.basicTime}" />
@@ -67,6 +72,9 @@
<tc:selectOneRadio value="#{overviewController.radioValue}"
id="rg0" converter="salutationId">
<f:selectItems value="#{overviewController.items}" id="items0" />
+ <f:facet name="click">
+ <tc:command/>
+ </f:facet>
</tc:selectOneRadio>
<tc:panel>
Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/layout.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/layout.jsp?view=diff&rev=472678&r1=472677&r2=472678
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/layout.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/layout.jsp Wed Nov 8 14:57:12 2006
@@ -1,20 +1,22 @@
<%--
- * Copyright 2002-2005 The Apache Software Foundation.
+ * 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
*
- * 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
*
- * 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.
+ * 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.
--%>
<%@ taglib uri="http://myfaces.apache.org/tobago/component" prefix="tc" %>
<%@ taglib uri="http://myfaces.apache.org/tobago/extension" prefix="tx" %>
+<%@ taglib uri="http://myfaces.apache.org/tobago/sandbox" prefix="tcs" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
<%@ taglib tagdir="/WEB-INF/tags/layout" prefix="layout" %>
@@ -29,7 +31,7 @@
<%-- code-sniplet-start id="layoutManagementExample" --%>
<tc:box label="#{overviewBundle.layout_exampleTitle}">
<f:facet name="layout">
- <tc:gridLayout columns="1*;1*" rows="fixed;fixed;fixed;fixed;fixed;*"/>
+ <tc:gridLayout columns="1*;1*" rows="fixed;fixed;fixed;fixed;fixed;fixed;*"/>
</f:facet>
<tx:selectOneChoice value="#{overviewController.singleValue}"
label="#{overviewBundle.layout_salutation}"
@@ -37,6 +39,13 @@
<f:selectItems value="#{overviewController.items}" />
</tx:selectOneChoice>
<tc:cell/>
+
+ <tcs:separator />
+ <tcs:separator>
+ <f:facet name="label">
+ <tc:label value="Test" />
+ </f:facet>
+ </tcs:separator>
<tx:in value="" label="#{overviewBundle.layout_firstName}" />
<tx:in value="" label="#{overviewBundle.layout_lastName}" />
Modified: myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml?view=diff&rev=472678&r1=472677&r2=472678
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml Wed Nov 8 14:57:12 2006
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * Copyright 2002-2005 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
+ * 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
*
Modified: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/AttributeData.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/AttributeData.java?view=diff&rev=472678&r1=472677&r2=472678
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/AttributeData.java (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/AttributeData.java Wed Nov 8 14:57:12 2006
@@ -1,11 +1,12 @@
package org.apache.myfaces.tobago.example.reference;
/*
- * Copyright 2002-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
+ * 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
*
Modified: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/Controller.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/Controller.java?view=diff&rev=472678&r1=472677&r2=472678
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/Controller.java (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/Controller.java Wed Nov 8 14:57:12 2006
@@ -1,11 +1,12 @@
package org.apache.myfaces.tobago.example.reference;
/*
- * Copyright 2002-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
+ * 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
*
Modified: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/DynamicTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/DynamicTag.java?view=diff&rev=472678&r1=472677&r2=472678
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/DynamicTag.java (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/DynamicTag.java Wed Nov 8 14:57:12 2006
@@ -1,11 +1,12 @@
package org.apache.myfaces.tobago.example.reference;
/*
- * Copyright 2002-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
+ * 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
*
Modified: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/TagData.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/TagData.java?view=diff&rev=472678&r1=472677&r2=472678
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/TagData.java (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/java/org/apache/myfaces/tobago/example/reference/TagData.java Wed Nov 8 14:57:12 2006
@@ -1,11 +1,12 @@
package org.apache.myfaces.tobago.example.reference;
/*
- * Copyright 2002-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
+ * 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
*