diff --git a/build.xml b/build.xml index 52f5fa11252f..5b3e1738c283 100644 --- a/build.xml +++ b/build.xml @@ -1646,15 +1646,6 @@ - - - - - - - - - diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 60e7debf73e6..865595dfac40 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -282,6 +282,9 @@ Examples. Limit the shopping cart example to only allow adding the pre-defined items to the cart. (markt) + + Examples. Remove JSP calendar example. (markt) + diff --git a/webapps/examples/WEB-INF/classes/cal/Entries.java b/webapps/examples/WEB-INF/classes/cal/Entries.java deleted file mode 100644 index cac611a03b1f..000000000000 --- a/webapps/examples/WEB-INF/classes/cal/Entries.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * 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 cal; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -import javax.servlet.http.HttpServletRequest; - -public class Entries { - - private final Map entries; - private static final String[] time = { "8am", "9am", "10am", "11am", - "12pm", "1pm", "2pm", "3pm", "4pm", "5pm", "6pm", "7pm", "8pm" }; - public static final int rows = 12; - - public Entries() { - entries = new ConcurrentHashMap<>(rows); - for (int i = 0; i < rows; i++) { - entries.put(time[i], new Entry(time[i])); - } - } - - public int getRows() { - return rows; - } - - public Entry getEntry(int index) { - return this.entries.get(time[index]); - } - - public int getIndex(String tm) { - for (int i = 0; i < rows; i++) { - if (tm.equals(time[i])) { - return i; - } - } - return -1; - } - - public void processRequest(HttpServletRequest request, String tm) { - int index = getIndex(tm); - if (index >= 0) { - String descr = request.getParameter("description"); - entries.get(time[index]).setDescription(descr); - } - } - -} diff --git a/webapps/examples/WEB-INF/classes/cal/Entry.java b/webapps/examples/WEB-INF/classes/cal/Entry.java deleted file mode 100644 index ac248bfa3169..000000000000 --- a/webapps/examples/WEB-INF/classes/cal/Entry.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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 cal; - -public class Entry { - - final String hour; - String description; - - public Entry(String hour) { - this.hour = hour; - this.description = ""; - - } - - public String getHour() { - return this.hour; - } - - public String getColor() { - if (description.equals("")) { - return "lightblue"; - } - return "red"; - } - - public String getDescription() { - if (description.equals("")) { - return "None"; - } - return this.description; - } - - public void setDescription(String descr) { - description = descr; - } - -} diff --git a/webapps/examples/WEB-INF/classes/cal/JspCalendar.java b/webapps/examples/WEB-INF/classes/cal/JspCalendar.java deleted file mode 100644 index 29541cccb400..000000000000 --- a/webapps/examples/WEB-INF/classes/cal/JspCalendar.java +++ /dev/null @@ -1,152 +0,0 @@ -/* - * 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 cal; - -import java.util.Calendar; -import java.util.Date; - -public class JspCalendar { - final Calendar calendar; - - public JspCalendar() { - calendar = Calendar.getInstance(); - Date trialTime = new Date(); - calendar.setTime(trialTime); - } - - - public int getYear() { - return calendar.get(Calendar.YEAR); - } - - public String getMonth() { - int m = getMonthInt(); - String[] months = new String [] { "January", "February", "March", - "April", "May", "June", - "July", "August", "September", - "October", "November", "December" }; - if (m > 12) { - return "Unknown to Man"; - } - - return months[m - 1]; - - } - - public String getDay() { - int x = getDayOfWeek(); - String[] days = new String[] {"Sunday", "Monday", "Tuesday", "Wednesday", - "Thursday", "Friday", "Saturday"}; - - if (x > 7) { - return "Unknown to Man"; - } - - return days[x - 1]; - - } - - public int getMonthInt() { - return 1 + calendar.get(Calendar.MONTH); - } - - public String getDate() { - return getMonthInt() + "/" + getDayOfMonth() + "/" + getYear(); - } - - public String getCurrentDate() { - Date dt = new Date (); - calendar.setTime (dt); - return getMonthInt() + "/" + getDayOfMonth() + "/" + getYear(); - - } - - public String getNextDate() { - calendar.set (Calendar.DAY_OF_MONTH, getDayOfMonth() + 1); - return getDate (); - } - - public String getPrevDate() { - calendar.set (Calendar.DAY_OF_MONTH, getDayOfMonth() - 1); - return getDate (); - } - - public String getTime() { - return getHour() + ":" + getMinute() + ":" + getSecond(); - } - - public int getDayOfMonth() { - return calendar.get(Calendar.DAY_OF_MONTH); - } - - public int getDayOfYear() { - return calendar.get(Calendar.DAY_OF_YEAR); - } - - public int getWeekOfYear() { - return calendar.get(Calendar.WEEK_OF_YEAR); - } - - public int getWeekOfMonth() { - return calendar.get(Calendar.WEEK_OF_MONTH); - } - - public int getDayOfWeek() { - return calendar.get(Calendar.DAY_OF_WEEK); - } - - public int getHour() { - return calendar.get(Calendar.HOUR_OF_DAY); - } - - public int getMinute() { - return calendar.get(Calendar.MINUTE); - } - - - public int getSecond() { - return calendar.get(Calendar.SECOND); - } - - - public int getEra() { - return calendar.get(Calendar.ERA); - } - - public String getUSTimeZone() { - String[] zones = new String[] {"Hawaii", "Alaskan", "Pacific", - "Mountain", "Central", "Eastern"}; - - return zones[10 + getZoneOffset()]; - } - - public int getZoneOffset() { - return calendar.get(Calendar.ZONE_OFFSET)/(60*60*1000); - } - - - public int getDSTOffset() { - return calendar.get(Calendar.DST_OFFSET)/(60*60*1000); - } - - - public int getAMPM() { - return calendar.get(Calendar.AM_PM); - } -} - - diff --git a/webapps/examples/WEB-INF/classes/cal/TableBean.java b/webapps/examples/WEB-INF/classes/cal/TableBean.java deleted file mode 100644 index 9f1cc4a6cf7d..000000000000 --- a/webapps/examples/WEB-INF/classes/cal/TableBean.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * 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 cal; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -import javax.servlet.http.HttpServletRequest; - -public class TableBean { - - private final Map table; - private final JspCalendar JspCal; - private Entries entries; - private String date; - private String name = null; - private String email = null; - private boolean processError = false; - - public TableBean() { - this.table = new ConcurrentHashMap<>(10); - this.JspCal = new JspCalendar(); - this.date = JspCal.getCurrentDate(); - } - - public void setName(String nm) { - this.name = nm; - } - - public String getName() { - return this.name; - } - - public void setEmail(String mail) { - this.email = mail; - } - - public String getEmail() { - return this.email; - } - - public String getDate() { - return this.date; - } - - public Entries getEntries() { - return this.entries; - } - - public void processRequest(HttpServletRequest request) { - - // Get the name and e-mail. - this.processError = false; - if (name == null || name.equals("")) { - setName(request.getParameter("name")); - } - if (email == null || email.equals("")) { - setEmail(request.getParameter("email")); - } - if (name == null || email == null || name.equals("") - || email.equals("")) { - this.processError = true; - return; - } - - // Get the date. - String dateR = request.getParameter("date"); - if (dateR == null) { - date = JspCal.getCurrentDate(); - } else if (dateR.equalsIgnoreCase("next")) { - date = JspCal.getNextDate(); - } else if (dateR.equalsIgnoreCase("prev")) { - date = JspCal.getPrevDate(); - } - - entries = table.get(date); - if (entries == null) { - entries = new Entries(); - table.put(date, entries); - } - - // If time is provided add the event. - String time = request.getParameter("time"); - if (time != null) { - entries.processRequest(request, time); - } - } - - public boolean getProcessError() { - return this.processError; - } -} diff --git a/webapps/examples/jsp/cal/cal1.jsp b/webapps/examples/jsp/cal/cal1.jsp deleted file mode 100644 index ce29c13f9608..000000000000 --- a/webapps/examples/jsp/cal/cal1.jsp +++ /dev/null @@ -1,94 +0,0 @@ -<%-- - 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. ---%> -<%@page contentType="text/html; charset=UTF-8" %> - - - Calendar: A JSP APPLICATION - - - - - -<%@ page language="java" import="cal.*" %> - - -<% - table.processRequest(request); - if (table.getProcessError() == false) { -%> - - -
- - - - -
prev - Calendar:<%= table.getDate() %> next -
- - - - - - - - -<% - for(int i=0; i - - - - -<% - } -%> - -
Time Appointment
- > - <%= entr.getHour() %> - > - <% out.print(util.HTMLFilter.filter(entr.getDescription())); %> -
-
- - - - - - -
<% out.print(util.HTMLFilter.filter(table.getName())); %> : - <% out.print(util.HTMLFilter.filter(table.getEmail())); %>
-
- -<% - } else { -%> - - You must enter your name and email address correctly. - -<% - } -%> - - - - - - diff --git a/webapps/examples/jsp/cal/cal2.jsp b/webapps/examples/jsp/cal/cal2.jsp deleted file mode 100644 index e7e14d8e0468..000000000000 --- a/webapps/examples/jsp/cal/cal2.jsp +++ /dev/null @@ -1,45 +0,0 @@ -<%-- - 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. ---%> -<%@page contentType="text/html; charset=UTF-8" %> - - - Calendar: A JSP APPLICATION - - - - - - -<% - String time = request.getParameter ("time"); -%> - - Please add the following event: -

Date <%= table.getDate() %> -
Time <%= util.HTMLFilter.filter(time) %>

- -
-
-
-
-

Description of the event

-
-
- - - - diff --git a/webapps/examples/jsp/cal/calendar.html b/webapps/examples/jsp/cal/calendar.html deleted file mode 100644 index a0a3ea184134..000000000000 --- a/webapps/examples/jsp/cal/calendar.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - -Untitled Document - - - - -

- -

Source Code for Calendar Example.
-

cal1.jsp -

-

cal2.jsp -

- -
-

Beans. -

TableBean -

-

Entries -

-

Entry -

- - - diff --git a/webapps/examples/jsp/cal/login.html b/webapps/examples/jsp/cal/login.html deleted file mode 100644 index 8a62eca07b4d..000000000000 --- a/webapps/examples/jsp/cal/login.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - - Login page for the calendar. - - - -
- - Please Enter the following information: - -
-
- - Name - -
- Email - -
- - -
-
- Note: This application does not implement the complete -functionality of a typical calendar application. It demonstrates a way JSP can -be used with HTML tables and forms. - -
- - diff --git a/webapps/examples/jsp/index.html b/webapps/examples/jsp/index.html index dc25005b2710..ed2da43b9a12 100644 --- a/webapps/examples/jsp/index.html +++ b/webapps/examples/jsp/index.html @@ -249,14 +249,6 @@

JSP 1.2 Examples

Source - -Calendar - -Execute - -Source - - Include