You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by cr...@apache.org on 2006/11/16 03:04:05 UTC
svn commit: r475524 - in /beehive/branches/v1.0.2:
netui/test/webapps/drt/src/databinding/datagrid/j1120/
netui/test/webapps/drt/testRecorder/tests/
netui/test/webapps/drt/web/databinding/datagrid/j1120/
test/dist-test/files/ant/
Author: crogers
Date: Wed Nov 15 18:04:04 2006
New Revision: 475524
URL: http://svn.apache.org/viewvc?view=rev&rev=475524
Log:
Set the svn:eol-style property to "native" on some files and removed an empty dir.
Tests: nightly build target
Removed:
beehive/branches/v1.0.2/test/dist-test/files/ant/
Modified:
beehive/branches/v1.0.2/netui/test/webapps/drt/src/databinding/datagrid/j1120/Controller.java (contents, props changed)
beehive/branches/v1.0.2/netui/test/webapps/drt/testRecorder/tests/DataGridJ1120.xml (contents, props changed)
beehive/branches/v1.0.2/netui/test/webapps/drt/web/databinding/datagrid/j1120/index.jsp (contents, props changed)
Modified: beehive/branches/v1.0.2/netui/test/webapps/drt/src/databinding/datagrid/j1120/Controller.java
URL: http://svn.apache.org/viewvc/beehive/branches/v1.0.2/netui/test/webapps/drt/src/databinding/datagrid/j1120/Controller.java?view=diff&rev=475524&r1=475523&r2=475524
==============================================================================
--- beehive/branches/v1.0.2/netui/test/webapps/drt/src/databinding/datagrid/j1120/Controller.java (original)
+++ beehive/branches/v1.0.2/netui/test/webapps/drt/src/databinding/datagrid/j1120/Controller.java Wed Nov 15 18:04:04 2006
@@ -1,97 +1,97 @@
-/*
- * 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.
- *
- * $Header:$
- */
-package databinding.datagrid.j1120;
-
-import javax.servlet.http.HttpSession;
-
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import java.util.List;
-import java.util.ArrayList;
-
-@Jpf.Controller(
- simpleActions={
- @Jpf.SimpleAction(name="begin", path="index.jsp")
- }
-)
-public class Controller
- extends PageFlowController
-{
- public Pet[] pets;
- public Pet[] getPets() { return pets; }
-
- /**
- * Method that is invoked when this controller instance is created.
- */
- protected void onCreate()
- {
- pets = new Pet[2];
- pets[0] = new Pet("1", "dog", "white", "10.00");
- pets[1] = new Pet("2", "dog", "purple", "10.00");
- }
-
- public class Pet {
- private String _petId;
- private String _name;
- private String _description;
- private String _price;
-
- public Pet(String id, String name, String desc, String price) {
- _petId = id;
- _name = name;
- _description = desc;
- _price = price;
- }
- public String getPetId() { return _petId; }
- public String getName() { return _name; }
- public String getDescription() { return _description; }
- public String getPrice() { return _price; }
- }
-
- protected void onDestroy(HttpSession session)
- {
- }
-
- @Jpf.Action(
- forwards={@Jpf.Forward(name="success", path="index.jsp")})
- public Forward submit() {
- Forward fwd = new Forward("success");
- return fwd;
- }
-
- @Jpf.Action(
- forwards={@Jpf.Forward(name="success", path="index.jsp")})
- public Forward save() {
- Forward fwd = new Forward("success");
- return fwd;
- }
-
- @Jpf.Action(
- forwards={@Jpf.Forward(name="success", path="index.jsp")})
- public Forward sortingAction() {
- Pet p = pets[0];
- pets[0] = pets[1];
- pets[1] = p;
- Forward fwd = new Forward("success");
- return fwd;
- }
-}
+/*
+ * 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.
+ *
+ * $Header:$
+ */
+package databinding.datagrid.j1120;
+
+import javax.servlet.http.HttpSession;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import java.util.List;
+import java.util.ArrayList;
+
+@Jpf.Controller(
+ simpleActions={
+ @Jpf.SimpleAction(name="begin", path="index.jsp")
+ }
+)
+public class Controller
+ extends PageFlowController
+{
+ public Pet[] pets;
+ public Pet[] getPets() { return pets; }
+
+ /**
+ * Method that is invoked when this controller instance is created.
+ */
+ protected void onCreate()
+ {
+ pets = new Pet[2];
+ pets[0] = new Pet("1", "dog", "white", "10.00");
+ pets[1] = new Pet("2", "dog", "purple", "10.00");
+ }
+
+ public class Pet {
+ private String _petId;
+ private String _name;
+ private String _description;
+ private String _price;
+
+ public Pet(String id, String name, String desc, String price) {
+ _petId = id;
+ _name = name;
+ _description = desc;
+ _price = price;
+ }
+ public String getPetId() { return _petId; }
+ public String getName() { return _name; }
+ public String getDescription() { return _description; }
+ public String getPrice() { return _price; }
+ }
+
+ protected void onDestroy(HttpSession session)
+ {
+ }
+
+ @Jpf.Action(
+ forwards={@Jpf.Forward(name="success", path="index.jsp")})
+ public Forward submit() {
+ Forward fwd = new Forward("success");
+ return fwd;
+ }
+
+ @Jpf.Action(
+ forwards={@Jpf.Forward(name="success", path="index.jsp")})
+ public Forward save() {
+ Forward fwd = new Forward("success");
+ return fwd;
+ }
+
+ @Jpf.Action(
+ forwards={@Jpf.Forward(name="success", path="index.jsp")})
+ public Forward sortingAction() {
+ Pet p = pets[0];
+ pets[0] = pets[1];
+ pets[1] = p;
+ Forward fwd = new Forward("success");
+ return fwd;
+ }
+}
Propchange: beehive/branches/v1.0.2/netui/test/webapps/drt/src/databinding/datagrid/j1120/Controller.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/branches/v1.0.2/netui/test/webapps/drt/testRecorder/tests/DataGridJ1120.xml
URL: http://svn.apache.org/viewvc/beehive/branches/v1.0.2/netui/test/webapps/drt/testRecorder/tests/DataGridJ1120.xml?view=diff&rev=475524&r1=475523&r2=475524
==============================================================================
--- beehive/branches/v1.0.2/netui/test/webapps/drt/testRecorder/tests/DataGridJ1120.xml (original)
+++ beehive/branches/v1.0.2/netui/test/webapps/drt/testRecorder/tests/DataGridJ1120.xml Wed Nov 15 18:04:04 2006
@@ -76,72 +76,72 @@
<![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<html lang="en">
-
- <head>
- <title>Test for Jira-1120 Fix</title>
- <base href="http://localhost:8080/coreWeb/databinding/datagrid/j1120/index.jsp">
- </head>
- <body>
-
- <p>
- Click the save button, then click the sort column link.
- The sort column link should cause the column to be re-sorted.
- </p>
- <form action="/coreWeb/databinding/datagrid/j1120/submit.do" method="post">
+
+ <head>
+ <title>Test for Jira-1120 Fix</title>
+ <base href="http://localhost:8080/coreWeb/databinding/datagrid/j1120/index.jsp">
+ </head>
+ <body>
+
+ <p>
+ Click the save button, then click the sort column link.
+ The sort column link should cause the column to be re-sorted.
+ </p>
+ <form action="/coreWeb/databinding/datagrid/j1120/submit.do" method="post">
Page 1 of 1
<table class="datagrid">
-
-
-
-
+
-<tr class="datagrid-header">
+
+
+
+<tr class="datagrid-header">
<th class="datagrid-sortable datagrid">Pet ID <a href="/coreWeb/databinding/datagrid/j1120/sortingAction.do?netui_sort=petGrid%3Bpetid"><img src="/coreWeb/resources/beehive/version1/images/sortable.gif" border="false"></a></th>
-
-
+
+
<th class="datagrid">Name</th>
-
-
+
+
<th class="datagrid">Description</th>
-
-
+
+
<th class="datagrid">Price</th>
-
-
+
+
+
+</tr>
+
+
-</tr>
-
-
-
-
-<tr class="datagrid-even">
- <td class="datagrid"><span>1</span></td>
-
- <td class="datagrid"><span>dog</span></td>
-
- <td class="datagrid"><span>white</span></td>
-
- <td class="datagrid"><span>10.00</span></td>
-
+
+<tr class="datagrid-even">
+ <td class="datagrid"><span>1</span></td>
+
+ <td class="datagrid"><span>dog</span></td>
+
+ <td class="datagrid"><span>white</span></td>
+
+ <td class="datagrid"><span>10.00</span></td>
+
</tr>
-<tr class="datagrid-odd">
- <td class="datagrid"><span>2</span></td>
-
- <td class="datagrid"><span>dog</span></td>
-
- <td class="datagrid"><span>purple</span></td>
-
- <td class="datagrid"><span>10.00</span></td>
-
+<tr class="datagrid-odd">
+ <td class="datagrid"><span>2</span></td>
+
+ <td class="datagrid"><span>dog</span></td>
+
+ <td class="datagrid"><span>purple</span></td>
+
+ <td class="datagrid"><span>10.00</span></td>
+
-</tr>
+</tr>
</table>
-
- <input type="submit" name="actionOverride:save" value="save">
- </form>
- </body>
+
+ <input type="submit" name="actionOverride:save" value="save">
+ </form>
+ </body>
</html>]]>
</responseBody>
@@ -234,72 +234,72 @@
<![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<html lang="en">
-
- <head>
- <title>Test for Jira-1120 Fix</title>
- <base href="http://localhost:8080/coreWeb/databinding/datagrid/j1120/index.jsp">
- </head>
- <body>
-
- <p>
- Click the save button, then click the sort column link.
- The sort column link should cause the column to be re-sorted.
- </p>
- <form action="/coreWeb/databinding/datagrid/j1120/submit.do" method="post">
+
+ <head>
+ <title>Test for Jira-1120 Fix</title>
+ <base href="http://localhost:8080/coreWeb/databinding/datagrid/j1120/index.jsp">
+ </head>
+ <body>
+
+ <p>
+ Click the save button, then click the sort column link.
+ The sort column link should cause the column to be re-sorted.
+ </p>
+ <form action="/coreWeb/databinding/datagrid/j1120/submit.do" method="post">
Page 1 of 1
<table class="datagrid">
-
-
-
-
+
+
-<tr class="datagrid-header">
+
+
+<tr class="datagrid-header">
<th class="datagrid-sortable datagrid">Pet ID <a href="/coreWeb/databinding/datagrid/j1120/sortingAction.do?netui_sort=petGrid%3Bpetid"><img src="/coreWeb/resources/beehive/version1/images/sortable.gif" border="false"></a></th>
-
-
+
+
<th class="datagrid">Name</th>
-
-
+
+
<th class="datagrid">Description</th>
-
-
+
+
<th class="datagrid">Price</th>
-
-
+
+
-</tr>
-
-
-
-
-<tr class="datagrid-even">
- <td class="datagrid"><span>1</span></td>
-
- <td class="datagrid"><span>dog</span></td>
-
- <td class="datagrid"><span>white</span></td>
-
- <td class="datagrid"><span>10.00</span></td>
-
+</tr>
+
+
+
+
+<tr class="datagrid-even">
+ <td class="datagrid"><span>1</span></td>
+
+ <td class="datagrid"><span>dog</span></td>
+
+ <td class="datagrid"><span>white</span></td>
+
+ <td class="datagrid"><span>10.00</span></td>
+
</tr>
-<tr class="datagrid-odd">
- <td class="datagrid"><span>2</span></td>
-
- <td class="datagrid"><span>dog</span></td>
-
- <td class="datagrid"><span>purple</span></td>
-
- <td class="datagrid"><span>10.00</span></td>
-
+<tr class="datagrid-odd">
+ <td class="datagrid"><span>2</span></td>
+
+ <td class="datagrid"><span>dog</span></td>
+
+ <td class="datagrid"><span>purple</span></td>
+
+ <td class="datagrid"><span>10.00</span></td>
+
-</tr>
+</tr>
</table>
-
- <input type="submit" name="actionOverride:save" value="save">
- </form>
- </body>
+
+ <input type="submit" name="actionOverride:save" value="save">
+ </form>
+ </body>
</html>]]>
</responseBody>
@@ -384,72 +384,72 @@
<![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<html lang="en">
-
- <head>
- <title>Test for Jira-1120 Fix</title>
- <base href="http://localhost:8080/coreWeb/databinding/datagrid/j1120/index.jsp">
- </head>
- <body>
-
- <p>
- Click the save button, then click the sort column link.
- The sort column link should cause the column to be re-sorted.
- </p>
- <form action="/coreWeb/databinding/datagrid/j1120/submit.do" method="post">
+
+ <head>
+ <title>Test for Jira-1120 Fix</title>
+ <base href="http://localhost:8080/coreWeb/databinding/datagrid/j1120/index.jsp">
+ </head>
+ <body>
+
+ <p>
+ Click the save button, then click the sort column link.
+ The sort column link should cause the column to be re-sorted.
+ </p>
+ <form action="/coreWeb/databinding/datagrid/j1120/submit.do" method="post">
Page 1 of 1
<table class="datagrid">
-
-
-
-
+
+
+
+
-<tr class="datagrid-header">
+<tr class="datagrid-header">
<th class="datagrid-sorted datagrid-sortable datagrid">Pet ID <a href="/coreWeb/databinding/datagrid/j1120/sortingAction.do?netui_sort=petGrid%3B-petid"><img src="/coreWeb/resources/beehive/version1/images/sortdown.gif" border="false"></a></th>
-
-
+
+
<th class="datagrid">Name</th>
-
-
+
+
<th class="datagrid">Description</th>
-
-
+
+
<th class="datagrid">Price</th>
-
-
+
+
+
+</tr>
+
+
+
-</tr>
-
-
-
-
-<tr class="datagrid-even">
- <td class="datagrid"><span>2</span></td>
-
- <td class="datagrid"><span>dog</span></td>
-
- <td class="datagrid"><span>purple</span></td>
-
- <td class="datagrid"><span>10.00</span></td>
-
+<tr class="datagrid-even">
+ <td class="datagrid"><span>2</span></td>
+
+ <td class="datagrid"><span>dog</span></td>
+
+ <td class="datagrid"><span>purple</span></td>
+
+ <td class="datagrid"><span>10.00</span></td>
+
</tr>
-<tr class="datagrid-odd">
- <td class="datagrid"><span>1</span></td>
-
- <td class="datagrid"><span>dog</span></td>
-
- <td class="datagrid"><span>white</span></td>
-
- <td class="datagrid"><span>10.00</span></td>
-
+<tr class="datagrid-odd">
+ <td class="datagrid"><span>1</span></td>
+
+ <td class="datagrid"><span>dog</span></td>
+
+ <td class="datagrid"><span>white</span></td>
+
+ <td class="datagrid"><span>10.00</span></td>
+
-</tr>
+</tr>
</table>
-
- <input type="submit" name="actionOverride:save" value="save">
- </form>
- </body>
+
+ <input type="submit" name="actionOverride:save" value="save">
+ </form>
+ </body>
</html>]]>
</responseBody>
Propchange: beehive/branches/v1.0.2/netui/test/webapps/drt/testRecorder/tests/DataGridJ1120.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/branches/v1.0.2/netui/test/webapps/drt/web/databinding/datagrid/j1120/index.jsp
URL: http://svn.apache.org/viewvc/beehive/branches/v1.0.2/netui/test/webapps/drt/web/databinding/datagrid/j1120/index.jsp?view=diff&rev=475524&r1=475523&r2=475524
==============================================================================
--- beehive/branches/v1.0.2/netui/test/webapps/drt/web/databinding/datagrid/j1120/index.jsp (original)
+++ beehive/branches/v1.0.2/netui/test/webapps/drt/web/databinding/datagrid/j1120/index.jsp Wed Nov 15 18:04:04 2006
@@ -1,56 +1,56 @@
-<%--
- 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.
-
- $Header:$
---%>
-<%@ page language="java" contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
-<netui:html>
- <head>
- <title>Test for Jira-1120 Fix</title>
- <netui:base/>
- </head>
- <netui:body>
-
- <p>
- Click the save button, then click the sort column link.
- The sort column link should cause the column to be re-sorted.
- </p>
- <netui:form action="submit">
- <netui-data:dataGrid dataSource="pageFlow.pets" name="petGrid">
- <netui-data:header>
- <netui-data:headerCell sortAction="sortingAction"
- sortExpression="petid"
- headerText="Pet ID">
- Pet ID
- </netui-data:headerCell>
- <netui-data:headerCell headerText="Name"/>
- <netui-data:headerCell headerText="Description"/>
- <netui-data:headerCell headerText="Price"/>
- </netui-data:header>
- <netui-data:rows>
- <netui-data:spanCell value="${container.item.petId}"/>
- <netui-data:spanCell value="${container.item.name}"/>
- <netui-data:spanCell value="${container.item.description}"/>
- <netui-data:spanCell value="${container.item.price}"/>
- </netui-data:rows>
- </netui-data:dataGrid>
- <netui:button action="save" value="save"/>
- </netui:form>
- </netui:body>
-</netui: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.
+
+ $Header:$
+--%>
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
+<netui:html>
+ <head>
+ <title>Test for Jira-1120 Fix</title>
+ <netui:base/>
+ </head>
+ <netui:body>
+
+ <p>
+ Click the save button, then click the sort column link.
+ The sort column link should cause the column to be re-sorted.
+ </p>
+ <netui:form action="submit">
+ <netui-data:dataGrid dataSource="pageFlow.pets" name="petGrid">
+ <netui-data:header>
+ <netui-data:headerCell sortAction="sortingAction"
+ sortExpression="petid"
+ headerText="Pet ID">
+ Pet ID
+ </netui-data:headerCell>
+ <netui-data:headerCell headerText="Name"/>
+ <netui-data:headerCell headerText="Description"/>
+ <netui-data:headerCell headerText="Price"/>
+ </netui-data:header>
+ <netui-data:rows>
+ <netui-data:spanCell value="${container.item.petId}"/>
+ <netui-data:spanCell value="${container.item.name}"/>
+ <netui-data:spanCell value="${container.item.description}"/>
+ <netui-data:spanCell value="${container.item.price}"/>
+ </netui-data:rows>
+ </netui-data:dataGrid>
+ <netui:button action="save" value="save"/>
+ </netui:form>
+ </netui:body>
+</netui:html>
Propchange: beehive/branches/v1.0.2/netui/test/webapps/drt/web/databinding/datagrid/j1120/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native