You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@click.apache.org by sa...@apache.org on 2009/01/11 18:03:35 UTC
svn commit: r733491 - in /incubator/click/trunk/examples/click-bench: ./
src/benchmark/click/controls/ src/benchmark/click/jsp/
src/benchmark/click/pages/ src/benchmark/click/velocity/ src/benchmark/dao/
src/benchmark/struts/ web/ web/META-INF/ web/WEB...
Author: sabob
Date: Sun Jan 11 09:03:35 2009
New Revision: 733491
URL: http://svn.apache.org/viewvc?rev=733491&view=rev
Log:
migrated click-bench example to Apache namespace
Modified:
incubator/click/trunk/examples/click-bench/build.xml
incubator/click/trunk/examples/click-bench/src/benchmark/click/controls/DateTextField.java
incubator/click/trunk/examples/click-bench/src/benchmark/click/jsp/JSPCustomerList.java
incubator/click/trunk/examples/click-bench/src/benchmark/click/pages/AddCustomer.java
incubator/click/trunk/examples/click-bench/src/benchmark/click/pages/CustomerList.java
incubator/click/trunk/examples/click-bench/src/benchmark/click/pages/EditCustomer.java
incubator/click/trunk/examples/click-bench/src/benchmark/click/velocity/VelocityCustomerList.java
incubator/click/trunk/examples/click-bench/src/benchmark/dao/Customer.java
incubator/click/trunk/examples/click-bench/src/benchmark/struts/CustomerListAction.java
incubator/click/trunk/examples/click-bench/web/META-INF/context.xml
incubator/click/trunk/examples/click-bench/web/WEB-INF/click.xml
incubator/click/trunk/examples/click-bench/web/WEB-INF/struts-config.xml
incubator/click/trunk/examples/click-bench/web/WEB-INF/web.xml
incubator/click/trunk/examples/click-bench/web/index.html
Modified: incubator/click/trunk/examples/click-bench/build.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-bench/build.xml?rev=733491&r1=733490&r2=733491&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-bench/build.xml (original)
+++ incubator/click/trunk/examples/click-bench/build.xml Sun Jan 11 09:03:35 2009
@@ -1,7 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!--
+ 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.
+-->
+
<project name="click-bench" default="compile" basedir=".">
<description>Builds, tests, and runs the project click-bench.</description>
Modified: incubator/click/trunk/examples/click-bench/src/benchmark/click/controls/DateTextField.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-bench/src/benchmark/click/controls/DateTextField.java?rev=733491&r1=733490&r2=733491&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-bench/src/benchmark/click/controls/DateTextField.java (original)
+++ incubator/click/trunk/examples/click-bench/src/benchmark/click/controls/DateTextField.java Sun Jan 11 09:03:35 2009
@@ -1,9 +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.
+ */
package benchmark.click.controls;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
-import net.sf.click.control.TextField;
+import org.apache.click.control.TextField;
public class DateTextField extends TextField {
Modified: incubator/click/trunk/examples/click-bench/src/benchmark/click/jsp/JSPCustomerList.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-bench/src/benchmark/click/jsp/JSPCustomerList.java?rev=733491&r1=733490&r2=733491&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-bench/src/benchmark/click/jsp/JSPCustomerList.java (original)
+++ incubator/click/trunk/examples/click-bench/src/benchmark/click/jsp/JSPCustomerList.java Sun Jan 11 09:03:35 2009
@@ -1,8 +1,25 @@
+/*
+ * 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.
+ */
package benchmark.click.jsp;
-import benchmark.click.velocity.*;
import benchmark.dao.CustomerDao;
-import net.sf.click.Page;
+import org.apache.click.Page;
public class JSPCustomerList extends Page {
Modified: incubator/click/trunk/examples/click-bench/src/benchmark/click/pages/AddCustomer.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-bench/src/benchmark/click/pages/AddCustomer.java?rev=733491&r1=733490&r2=733491&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-bench/src/benchmark/click/pages/AddCustomer.java (original)
+++ incubator/click/trunk/examples/click-bench/src/benchmark/click/pages/AddCustomer.java Sun Jan 11 09:03:35 2009
@@ -1,11 +1,29 @@
+/*
+ * 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.
+ */
package benchmark.click.pages;
-import net.sf.click.Page;
-import net.sf.click.control.Form;
-import net.sf.click.control.Option;
-import net.sf.click.control.Select;
-import net.sf.click.control.Submit;
-import net.sf.click.control.TextField;
+import org.apache.click.Page;
+import org.apache.click.control.Form;
+import org.apache.click.control.Option;
+import org.apache.click.control.Select;
+import org.apache.click.control.Submit;
+import org.apache.click.control.TextField;
import benchmark.dao.Customer;
import benchmark.dao.CustomerDao;
Modified: incubator/click/trunk/examples/click-bench/src/benchmark/click/pages/CustomerList.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-bench/src/benchmark/click/pages/CustomerList.java?rev=733491&r1=733490&r2=733491&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-bench/src/benchmark/click/pages/CustomerList.java (original)
+++ incubator/click/trunk/examples/click-bench/src/benchmark/click/pages/CustomerList.java Sun Jan 11 09:03:35 2009
@@ -1,11 +1,29 @@
+/*
+ * 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.
+ */
package benchmark.click.pages;
-import net.sf.click.Page;
-import net.sf.click.control.AbstractLink;
-import net.sf.click.control.ActionLink;
-import net.sf.click.control.Column;
-import net.sf.click.control.Table;
-import net.sf.click.extras.control.LinkDecorator;
+import org.apache.click.Page;
+import org.apache.click.control.AbstractLink;
+import org.apache.click.control.ActionLink;
+import org.apache.click.control.Column;
+import org.apache.click.control.Table;
+import org.apache.click.extras.control.LinkDecorator;
import benchmark.dao.CustomerDao;
import benchmark.dao.Customer;
Modified: incubator/click/trunk/examples/click-bench/src/benchmark/click/pages/EditCustomer.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-bench/src/benchmark/click/pages/EditCustomer.java?rev=733491&r1=733490&r2=733491&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-bench/src/benchmark/click/pages/EditCustomer.java (original)
+++ incubator/click/trunk/examples/click-bench/src/benchmark/click/pages/EditCustomer.java Sun Jan 11 09:03:35 2009
@@ -1,16 +1,34 @@
+/*
+ * 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.
+ */
package benchmark.click.pages;
import benchmark.click.controls.DateTextField;
-import net.sf.click.Page;
-import net.sf.click.control.Form;
-import net.sf.click.control.Option;
-import net.sf.click.control.Select;
-import net.sf.click.control.Submit;
-import net.sf.click.control.TextField;
+import org.apache.click.Page;
+import org.apache.click.control.Form;
+import org.apache.click.control.Option;
+import org.apache.click.control.Select;
+import org.apache.click.control.Submit;
+import org.apache.click.control.TextField;
import benchmark.dao.Customer;
import benchmark.dao.CustomerDao;
-import net.sf.click.control.HiddenField;
+import org.apache.click.control.HiddenField;
public class EditCustomer extends Page {
Modified: incubator/click/trunk/examples/click-bench/src/benchmark/click/velocity/VelocityCustomerList.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-bench/src/benchmark/click/velocity/VelocityCustomerList.java?rev=733491&r1=733490&r2=733491&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-bench/src/benchmark/click/velocity/VelocityCustomerList.java (original)
+++ incubator/click/trunk/examples/click-bench/src/benchmark/click/velocity/VelocityCustomerList.java Sun Jan 11 09:03:35 2009
@@ -1,7 +1,25 @@
+/*
+ * 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.
+ */
package benchmark.click.velocity;
import benchmark.dao.CustomerDao;
-import net.sf.click.Page;
+import org.apache.click.Page;
public class VelocityCustomerList extends Page {
Modified: incubator/click/trunk/examples/click-bench/src/benchmark/dao/Customer.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-bench/src/benchmark/dao/Customer.java?rev=733491&r1=733490&r2=733491&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-bench/src/benchmark/dao/Customer.java (original)
+++ incubator/click/trunk/examples/click-bench/src/benchmark/dao/Customer.java Sun Jan 11 09:03:35 2009
@@ -1,8 +1,9 @@
package benchmark.dao;
+import java.io.Serializable;
import java.util.Date;
-public class Customer implements Comparable {
+public class Customer implements Comparable, Serializable {
private Integer id;
private String firstName;
private String lastName;
Modified: incubator/click/trunk/examples/click-bench/src/benchmark/struts/CustomerListAction.java
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-bench/src/benchmark/struts/CustomerListAction.java?rev=733491&r1=733490&r2=733491&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-bench/src/benchmark/struts/CustomerListAction.java (original)
+++ incubator/click/trunk/examples/click-bench/src/benchmark/struts/CustomerListAction.java Sun Jan 11 09:03:35 2009
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
package benchmark.struts;
import benchmark.dao.CustomerDao;
Modified: incubator/click/trunk/examples/click-bench/web/META-INF/context.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-bench/web/META-INF/context.xml?rev=733491&r1=733490&r2=733491&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-bench/web/META-INF/context.xml (original)
+++ incubator/click/trunk/examples/click-bench/web/META-INF/context.xml Sun Jan 11 09:03:35 2009
@@ -1,2 +1,20 @@
<?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
+
+ 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.
+-->
<Context path="/click-bench"/>
Modified: incubator/click/trunk/examples/click-bench/web/WEB-INF/click.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-bench/web/WEB-INF/click.xml?rev=733491&r1=733490&r2=733491&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-bench/web/WEB-INF/click.xml (original)
+++ incubator/click/trunk/examples/click-bench/web/WEB-INF/click.xml Sun Jan 11 09:03:35 2009
@@ -1,4 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
+
+ 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.
+-->
<click-app>
<pages package="benchmark.click">
Modified: incubator/click/trunk/examples/click-bench/web/WEB-INF/struts-config.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-bench/web/WEB-INF/struts-config.xml?rev=733491&r1=733490&r2=733491&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-bench/web/WEB-INF/struts-config.xml (original)
+++ incubator/click/trunk/examples/click-bench/web/WEB-INF/struts-config.xml Sun Jan 11 09:03:35 2009
@@ -1,4 +1,22 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?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
+
+ 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 struts-config PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"
Modified: incubator/click/trunk/examples/click-bench/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-bench/web/WEB-INF/web.xml?rev=733491&r1=733490&r2=733491&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-bench/web/WEB-INF/web.xml (original)
+++ incubator/click/trunk/examples/click-bench/web/WEB-INF/web.xml Sun Jan 11 09:03:35 2009
@@ -1,4 +1,22 @@
<?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
+
+ 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 web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<display-name>Click/Wicket Benchmark</display-name>
@@ -26,7 +44,7 @@
-->
<servlet>
<servlet-name>click</servlet-name>
- <servlet-class>net.sf.click.ClickServlet</servlet-class>
+ <servlet-class>org.apache.click.ClickServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
Modified: incubator/click/trunk/examples/click-bench/web/index.html
URL: http://svn.apache.org/viewvc/incubator/click/trunk/examples/click-bench/web/index.html?rev=733491&r1=733490&r2=733491&view=diff
==============================================================================
--- incubator/click/trunk/examples/click-bench/web/index.html (original)
+++ incubator/click/trunk/examples/click-bench/web/index.html Sun Jan 11 09:03:35 2009
@@ -16,7 +16,7 @@
<div id="content">
<p>
This benchmark was adapted to Click from the <a href="http://wicket.apache.org/">Wicket</a> benchmark available
- <a href="http://wicket-stuff.svn.sourceforge.net/svnroot/wicket-stuff/trunk/wicket-benchmark/">here.</a>
+ <a href="http://wicket-stuff.svn.sourceforge.net/svnroot/wicket-stuff/branches/wicket-1.3.x/wicket-benchmark/">here.</a>
</p>
<p>
To run the test you must first download and install
@@ -28,7 +28,7 @@
<p>
Below you can find links to the tests.
</p>
- <h3>Click benchmark (v1.4.1)</h3>
+ <h3>Click benchmark (v2.0.1)</h3>
<ul>
<li><a href="pages/customer-list.htm">Click - List Customers</a></li>
<li><a href="pages/add-customer.htm">Click - Add Customer</a></li>