You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@wookie.apache.org by sc...@apache.org on 2012/03/16 15:26:02 UTC

svn commit: r1301543 - in /incubator/wookie/trunk: WebContent/ WebContent/WEB-INF/ WebContent/admin/ WebContent/error/ WebContent/shared/images/ WebContent/webmenu/ src/org/apache/wookie/

Author: scottbw
Date: Fri Mar 16 14:26:00 2012
New Revision: 1301543

URL: http://svn.apache.org/viewvc?rev=1301543&view=rev
Log:
Removing JSPs and related servlets and resources used by the admin and webmenu UI. See WOOKIE-262.

Removed:
    incubator/wookie/trunk/WebContent/admin/index.jsp
    incubator/wookie/trunk/WebContent/admin/keys.jsp
    incubator/wookie/trunk/WebContent/admin/listall.jsp
    incubator/wookie/trunk/WebContent/admin/listallfordelete.jsp
    incubator/wookie/trunk/WebContent/admin/message.jsp
    incubator/wookie/trunk/WebContent/admin/registergadget.jsp
    incubator/wookie/trunk/WebContent/admin/selectupload.htm
    incubator/wookie/trunk/WebContent/admin/upload.htm
    incubator/wookie/trunk/WebContent/admin/uploadresults.jsp
    incubator/wookie/trunk/WebContent/admin/viewwhitelist.jsp
    incubator/wookie/trunk/WebContent/admin/warp.jsp
    incubator/wookie/trunk/WebContent/layout.css
    incubator/wookie/trunk/WebContent/shared/images/Thumbs.db
    incubator/wookie/trunk/WebContent/shared/images/add_1.gif
    incubator/wookie/trunk/WebContent/shared/images/add_2.gif
    incubator/wookie/trunk/WebContent/shared/images/bg_gradient.gif
    incubator/wookie/trunk/WebContent/shared/images/bg_gradient_inv.gif
    incubator/wookie/trunk/WebContent/shared/images/book.gif
    incubator/wookie/trunk/WebContent/shared/images/cancel.gif
    incubator/wookie/trunk/WebContent/shared/images/cog.gif
    incubator/wookie/trunk/WebContent/shared/images/community_comp.gif
    incubator/wookie/trunk/WebContent/shared/images/continue.png
    incubator/wookie/trunk/WebContent/shared/images/delete_1.gif
    incubator/wookie/trunk/WebContent/shared/images/down.gif
    incubator/wookie/trunk/WebContent/shared/images/edit.gif
    incubator/wookie/trunk/WebContent/shared/images/go.gif
    incubator/wookie/trunk/WebContent/shared/images/go_1.gif
    incubator/wookie/trunk/WebContent/shared/images/greentick.gif
    incubator/wookie/trunk/WebContent/shared/images/index_search.png
    incubator/wookie/trunk/WebContent/shared/images/license.txt
    incubator/wookie/trunk/WebContent/shared/images/lock.gif
    incubator/wookie/trunk/WebContent/shared/images/mail.png
    incubator/wookie/trunk/WebContent/shared/images/plus.gif
    incubator/wookie/trunk/WebContent/shared/images/plus1.gif
    incubator/wookie/trunk/WebContent/shared/images/refresh.gif
    incubator/wookie/trunk/WebContent/shared/images/run.gif
    incubator/wookie/trunk/WebContent/shared/images/shapeimage_1.jpg
    incubator/wookie/trunk/WebContent/shared/images/shapeimage_2.jpg
    incubator/wookie/trunk/WebContent/shared/images/trash.gif
    incubator/wookie/trunk/WebContent/shared/images/unlock.gif
    incubator/wookie/trunk/WebContent/shared/images/validno.png
    incubator/wookie/trunk/WebContent/shared/images/validyes.png
    incubator/wookie/trunk/WebContent/shared/images/view.gif
    incubator/wookie/trunk/WebContent/shared/images/view_1.gif
    incubator/wookie/trunk/WebContent/shared/images/widget-bg.png
    incubator/wookie/trunk/WebContent/webmenu/demoWidget.jsp
    incubator/wookie/trunk/WebContent/webmenu/index.jsp
    incubator/wookie/trunk/WebContent/webmenu/instantiate.jsp
    incubator/wookie/trunk/WebContent/webmenu/listall.jsp
    incubator/wookie/trunk/WebContent/webmenu/requestapikey.jsp
    incubator/wookie/trunk/src/org/apache/wookie/WidgetAdminServlet.java
    incubator/wookie/trunk/src/org/apache/wookie/WidgetWebMenuServlet.java
Modified:
    incubator/wookie/trunk/WebContent/WEB-INF/web.xml
    incubator/wookie/trunk/WebContent/error/notauthorized.jsp
    incubator/wookie/trunk/WebContent/index.htm

Modified: incubator/wookie/trunk/WebContent/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/WEB-INF/web.xml?rev=1301543&r1=1301542&r2=1301543&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/WEB-INF/web.xml (original)
+++ incubator/wookie/trunk/WebContent/WEB-INF/web.xml Fri Mar 16 14:26:00 2012
@@ -249,36 +249,7 @@
 		<servlet-name>WidgetServiceServlet</servlet-name>
 		<url-pattern>/WidgetServiceServlet</url-pattern>
 	</servlet-mapping>
-	
-	<!-- Admin -->  
-	<servlet>
-		<description></description>
-		<display-name>WidgetAdminServlet</display-name>
-		<servlet-name>WidgetAdminServlet</servlet-name>
-		<servlet-class>
-			org.apache.wookie.WidgetAdminServlet
-		</servlet-class>
-	</servlet>
-	
-	<servlet>
-		<description></description>
-		<display-name>WidgetWebServlet</display-name>
-		<servlet-name>WidgetWebServlet</servlet-name>
-		<servlet-class>
-			org.apache.wookie.WidgetWebMenuServlet
-		</servlet-class>
-		<load-on-startup>2</load-on-startup>
-	</servlet>
-	<servlet-mapping>
-		<servlet-name>WidgetAdminServlet</servlet-name>
-		<url-pattern>/admin/WidgetAdminServlet</url-pattern>
-	</servlet-mapping>
-	
-	<servlet-mapping>
-		<servlet-name>WidgetWebServlet</servlet-name>
-		<url-pattern>/webmenu/WidgetWebMenuServlet</url-pattern>
-	</servlet-mapping>
-	
+
 	<servlet-mapping>
 		<servlet-name>dwr-invoker</servlet-name>
 		<url-pattern>/dwr/*</url-pattern>

Modified: incubator/wookie/trunk/WebContent/error/notauthorized.jsp
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/error/notauthorized.jsp?rev=1301543&r1=1301542&r2=1301543&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/error/notauthorized.jsp (original)
+++ incubator/wookie/trunk/WebContent/error/notauthorized.jsp Fri Mar 16 14:26:00 2012
@@ -22,37 +22,17 @@ response.setStatus(HttpServletResponse.S
 <head>
 <title>Wookie Widget Server</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link type="text/css" href="../shared/js/jquery/themes/redmond/jquery-ui-1.7.1.custom.css" rel="stylesheet" />    
-<link type="text/css" href="../layout.css" rel="stylesheet" />
-<script type="text/javascript" src="../shared/js/jquery/jquery-1.3.2.min.js"></script>
-<script type="text/javascript" src="../shared/js/jquery/jquery-ui-1.7.custom.min.js"></script>
 </head>
 
 <body>
-   <div id="header">
- 		<div id="banner">
-    		<div style="float:left;">
-    			<img style="margin: 8 8px;" border="0" src="../shared/images/furry_white.png">
-    		</div>
-    		<div id="menu"><a class="menulink" href="../webmenu/index.jsp">menu&nbsp;<img border="0" src="../shared/images/book.gif"></a>&nbsp;</div>
-    	</div> 
-    	<div id="pagetitle">
-    		<h3>Invalid username/password</h3>
-    	</div>
-    	<!--  END HEADER -->
-	</div>
+    <h3>Invalid username/password</h3>
+
      
     <div id="content">  
 	
 <p>
-<img src="../shared/images/cancel.gif" width="16" height="16"><font color=red> You are not authorized to enter this area.</font>  <BR><br>Click <a href="../webmenu/index.jsp">here</a> to continue.
+You are not authorized to enter this area.
 </p>
 
- 
-</div>
-	
-<div id="footer">
-	<div style="text-align:right"><a class="menulink" href="../webmenu/index.jsp">menu&nbsp;<img border="0" src="../shared/images/book.gif"></a>&nbsp;</div>
-</div>
 </body>
 </html>
\ No newline at end of file

Modified: incubator/wookie/trunk/WebContent/index.htm
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/index.htm?rev=1301543&r1=1301542&r2=1301543&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/index.htm (original)
+++ incubator/wookie/trunk/WebContent/index.htm Fri Mar 16 14:26:00 2012
@@ -14,5 +14,5 @@
  */
 -->
 <script>
-window.location.href="webmenu/WidgetWebMenuServlet?operation=INDEX";						
+window.location.href="demo";						
 </script>