Unifies small bikeshed samples into a single "cookbook" app.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@7901 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/bikeshed/war/Mail.css b/bikeshed/war/Cookbook.css
similarity index 100%
rename from bikeshed/war/Mail.css
rename to bikeshed/war/Cookbook.css
diff --git a/bikeshed/war/Tree.html b/bikeshed/war/Cookbook.html
similarity index 74%
rename from bikeshed/war/Tree.html
rename to bikeshed/war/Cookbook.html
index 17a1984..e5a4ab9 100644
--- a/bikeshed/war/Tree.html
+++ b/bikeshed/war/Cookbook.html
@@ -2,9 +2,9 @@
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <link type="text/css" rel="stylesheet" href="Tree.css">
- <title>Tree Sample</title>
- <script type="text/javascript" language="javascript" src="tree/tree.nocache.js"></script>
+ <link type="text/css" rel="stylesheet" href="Cookbook.css">
+ <title>Cookbook</title>
+ <script type="text/javascript" language="javascript" src="cookbook/cookbook.nocache.js"></script>
</head>
<body>
@@ -15,7 +15,5 @@
in order for this application to display correctly.
</div>
</noscript>
-
- <h1>Tree Sample</h1>
</body>
</html>
diff --git a/bikeshed/war/Mail.html b/bikeshed/war/Mail.html
deleted file mode 100644
index ce279e6..0000000
--- a/bikeshed/war/Mail.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!doctype html>
-<html>
- <head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <link type="text/css" rel="stylesheet" href="Mail.css">
- <title>Mail Sample</title>
- <script type="text/javascript" language="javascript" src="mailsample/mailsample.nocache.js"></script>
- </head>
-
- <body>
- <iframe src="javascript:''" id="__gwt_historyFrame" tabIndex='-1' style="position:absolute;width:0;height:0;border:0"></iframe>
- <noscript>
- <div style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif">
- Your web browser must have JavaScript enabled
- in order for this application to display correctly.
- </div>
- </noscript>
-
- <h1>Mail Sample</h1>
- </body>
-</html>
diff --git a/bikeshed/war/SimpleCellList.html b/bikeshed/war/SimpleCellList.html
deleted file mode 100644
index 3119975..0000000
--- a/bikeshed/war/SimpleCellList.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!doctype html>
-<html>
- <head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <title>Simple Cell List Demo</title>
- <script type="text/javascript" language="javascript" src="simplecelllist/simplecelllist.nocache.js"></script>
- </head>
-
- <body>
- <iframe src="javascript:''" id="__gwt_historyFrame" tabIndex='-1' style="position:absolute;width:0;height:0;border:0"></iframe>
-
- </body>
-</html>
diff --git a/bikeshed/war/Tree.css b/bikeshed/war/Tree.css
deleted file mode 100644
index ccb77f0..0000000
--- a/bikeshed/war/Tree.css
+++ /dev/null
@@ -1,59 +0,0 @@
-/** Add css rules here for your application. */
-
-div.gwt-stree-selectedItem {
- border-style: solid;
-}
-
-div.gwt-sstree-column {
- overflow-y: scroll;
- overflow-x: auto;
- position: relative;
-}
-
-div.gwt-sstree {
- border: 2px solid black;
-}
-
-div.gwt-sstree-selectedItem {
- background-color: rgb(56, 117, 215);
-}
-
-div.gwt-sstree-evenRow {
- background-color: rgb(255, 255, 255);
-}
-
-div.gwt-sstree-oddRow {
- background-color: rgb(220, 220, 220);
-}
-
-/** Example rules used by the template application (remove for your app) */
-h1 {
- font-size: 2em;
- font-weight: bold;
- color: #777777;
- margin: 40px 0px 70px;
- text-align: center;
-}
-
-.sendButton {
- display: block;
- font-size: 16pt;
-}
-
-/** Most GWT widgets already have a style name defined */
-.gwt-DialogBox {
- width: 400px;
-}
-
-.dialogVPanel {
- margin: 5px;
-}
-
-.serverResponseLabelError {
- color: red;
-}
-
-/** Set ids using widget.getElement().setId("idOfElement") */
-#closeButton {
- margin: 15px 6px 6px;
-}
diff --git a/bikeshed/war/Validation.html b/bikeshed/war/Validation.html
deleted file mode 100644
index 93317bf..0000000
--- a/bikeshed/war/Validation.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!doctype html>
-<html>
- <head>
- <meta http-equiv="content-type" content="text/html; charset=UTF-8">
- <title>Validation</title>
- <script type="text/javascript" language="javascript" src="validation/validation.nocache.js"></script>
- </head>
-
- <body>
- <iframe src="javascript:''" id="__gwt_historyFrame" tabIndex='-1' style="position:absolute;width:0;height:0;border:0"></iframe>
-
- </body>
-</html>
diff --git a/bikeshed/war/WEB-INF/appengine-web.xml b/bikeshed/war/WEB-INF/appengine-web.xml
index 99223a5..4b248dd 100644
--- a/bikeshed/war/WEB-INF/appengine-web.xml
+++ b/bikeshed/war/WEB-INF/appengine-web.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
- <application></application>
+ <application>gwt-bikeshed</application>
<version>1</version>
<!-- Configure java.util.logging -->
diff --git a/bikeshed/war/WEB-INF/web.xml b/bikeshed/war/WEB-INF/web.xml
index 17718a8..2a3f9e8 100644
--- a/bikeshed/war/WEB-INF/web.xml
+++ b/bikeshed/war/WEB-INF/web.xml
@@ -24,7 +24,7 @@
<servlet>
<servlet-name>treeServlet</servlet-name>
- <servlet-class>com.google.gwt.sample.bikeshed.tree.server.TreeServiceImpl</servlet-class>
+ <servlet-class>com.google.gwt.sample.bikeshed.cookbook.server.TreeServiceImpl</servlet-class>
</servlet>
<servlet-mapping>
@@ -44,14 +44,9 @@
<servlet-mapping>
<servlet-name>treeServlet</servlet-name>
- <url-pattern>/tree/tree</url-pattern>
+ <url-pattern>/cookbook/tree</url-pattern>
</servlet-mapping>
- <!-- Default page to serve -->
- <welcome-file-list>
- <welcome-file>Tree.html</welcome-file>
- </welcome-file-list>
-
<!-- Require login. -->
<security-constraint>
<web-resource-collection>
