Author: scottbw
Date: Mon Feb 20 14:41:41 2012
New Revision: 1291286
URL: http://svn.apache.org/viewvc?rev=1291286&view=rev
Log:
Removing the Services and Types features from Wookie (see WOOKIE-263). Still
to-do is remove from JCR module and connector framework.
Removed:
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetServicesControllerTest.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IWidgetDefault.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IWidgetService.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IWidgetType.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetDefaultImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetServiceImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetTypeImpl.java
incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetServicesController.java
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetServiceHelper.java
incubator/wookie/trunk/src/org/apache/wookie/manager/IWidgetAdminManager.java
incubator/wookie/trunk/src/org/apache/wookie/manager/impl/
Modified:
incubator/wookie/trunk/WebContent/WEB-INF/web.xml
incubator/wookie/trunk/WebContent/admin/uploadresults.jsp
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/beans/AbstractPersistenceTest.java
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetsControllerTest.java
incubator/wookie/trunk/src/org/apache/wookie/WidgetAdminServlet.java
incubator/wookie/trunk/src/org/apache/wookie/WidgetWebMenuServlet.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IWidget.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/JPAPersistenceManager.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/util/IPersistenceManager.java
incubator/wookie/trunk/src/org/apache/wookie/beans/util/PersistenceManagerFactory.java
incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetsController.java
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetHelper.java
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceFactory.java
Modified: incubator/wookie/trunk/WebContent/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/WEB-INF/web.xml?rev=1291286&r1=1291285&r2=1291286&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/WEB-INF/web.xml (original)
+++ incubator/wookie/trunk/WebContent/WEB-INF/web.xml Mon Feb 20 14:41:41 2012
@@ -165,20 +165,6 @@
<servlet>
<description></description>
- <display-name>WidgetServices</display-name>
- <servlet-name>WidgetServiceController</servlet-name>
- <servlet-class>
- org.apache.wookie.controller.WidgetServicesController
- </servlet-class>
- <load-on-startup>2</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>WidgetServiceController</servlet-name>
- <url-pattern>/services/*</url-pattern>
- </servlet-mapping>
-
- <servlet>
- <description></description>
<display-name>ApiKeys</display-name>
<servlet-name>ApiKeyController</servlet-name>
<servlet-class>
@@ -326,10 +312,6 @@
<filter-name>AuthorizationFilter</filter-name>
<servlet-name>ParticipantServlet</servlet-name>
</filter-mapping>
- <filter-mapping>
- <filter-name>AuthorizationFilter</filter-name>
- <servlet-name>WidgetServiceServlet</servlet-name>
- </filter-mapping>
<filter-mapping>
<filter-name>AuthorizationFilter</filter-name>
<servlet-name>Flatpack</servlet-name>
Modified: incubator/wookie/trunk/WebContent/admin/uploadresults.jsp
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/WebContent/admin/uploadresults.jsp?rev=1291286&r1=1291285&r2=1291286&view=diff
==============================================================================
--- incubator/wookie/trunk/WebContent/admin/uploadresults.jsp (original)
+++ incubator/wookie/trunk/WebContent/admin/uploadresults.jsp Mon Feb 20
14:41:41 2012
@@ -14,14 +14,12 @@
*/
--%>
<%@ page import='org.apache.wookie.helpers.FlashMessage' %>
-<%@ page import='org.apache.wookie.beans.IWidgetService' %>
<% String errors = FlashMessage.getErrors(session, request);%>
<% String messages = FlashMessage.getMessages(session, request);%>
<%
Integer dbkey = (Integer)request.getAttribute("dbkey");
Boolean hasValidated = (Boolean)request.getAttribute("hasValidated");
Boolean closeWindow = (Boolean)request.getAttribute("closeWindow");
-IWidgetService[] services = (IWidgetService[])request.getAttribute("services");
%>
<!DOCTYPE html>
<html>
@@ -70,32 +68,6 @@ IWidgetService[] services = (IWidgetServ
<%if(hasValidated){%>
-<p>A widget can be seen as having several "contexts" or "types". The same
widget may be referred to as both a "discussion" and a "forum" type of tool,
for example.
-When a client of the widget system asks for a widget, it will ask using one of
these type names. Please choose from the list below what type or types this
widget can act as.
-</p>
-<form name="form1" method="post" action="WidgetAdminServlet">
- <input type="hidden" name="operation" value="SETWIDGETTYPES">
- <input type="hidden" name="dbkey" value="<%=dbkey%>">
- <table width="500" class="ui-widget ui-widget-content" align="center">
- <tr class="ui-widget-header">
- <td colspan="2">Please choose the type/s for this widget</td>
- </tr>
- <tr>
- <td valign="top">Widget Types<br><i>(multiple allowed)</i></td>
- <td>
- <select name="widgetTypes" size="<%=services.length%>" multiple>
- <%for (int i=1; i<services.length;i++){%>
- <option
value="<%=services[i].getServiceName()%>"><%=services[i].getServiceName()%></option>
- <%}%>
- </select>
- </td>
- </tr>
- <tr>
- <td colspan="2"><div align="center"><input class="ui-button
ui-state-default ui-corner-all" type="submit" name="Submit"
value="Submit"></div>
- </td>
- </tr>
- </table>
- </form>
<%}%>
Modified:
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/beans/AbstractPersistenceTest.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src-tests/org/apache/wookie/tests/beans/AbstractPersistenceTest.java?rev=1291286&r1=1291285&r2=1291286&view=diff
==============================================================================
---
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/beans/AbstractPersistenceTest.java
(original)
+++
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/beans/AbstractPersistenceTest.java
Mon Feb 20 14:41:41 2012
@@ -25,9 +25,7 @@ import org.apache.wookie.beans.IApiKey;
import org.apache.wookie.beans.IParticipant;
import org.apache.wookie.beans.IPreference;
import org.apache.wookie.beans.IWidget;
-import org.apache.wookie.beans.IWidgetDefault;
import org.apache.wookie.beans.IWidgetInstance;
-import org.apache.wookie.beans.IWidgetService;
import org.apache.wookie.beans.SharedContext;
import org.apache.wookie.beans.util.IPersistenceManager;
import org.apache.wookie.beans.util.PersistenceManagerFactory;
@@ -79,20 +77,6 @@ public abstract class AbstractPersistenc
IWidget [] allWidgets = persistenceManager.findAll(IWidget.class);
assertNotNull(allWidgets);
assertEquals(1, allWidgets.length);
-
- //
- // test findAll method for IWidgetDefault
- //
- IWidgetDefault [] allWidgetDefaults =
persistenceManager.findAll(IWidgetDefault.class);
- assertNotNull(allWidgetDefaults);
- assertEquals(1, allWidgetDefaults.length);
-
- //
- // test findAll method for IWidgetService
- //
- IWidgetService [] widgetServices =
persistenceManager.findAll(IWidgetService.class);
- assertNotNull(widgetServices);
- assertEquals(5, widgetServices.length);
//
// test findById for IWidget
@@ -103,14 +87,6 @@ public abstract class AbstractPersistenc
assertEquals(allWidgets[0], widgetById);
//
- // test findById for IWidgetDefault
- //
- Object widgetDefaultId = allWidgetDefaults[0].getId();
- IWidgetDefault widgetDefaultById =
persistenceManager.findById(IWidgetDefault.class, widgetDefaultId);
- assertNotNull(widgetDefaultById);
- assertEquals(allWidgetDefaults[0], widgetDefaultById);
-
- //
// test findByValue method for IWidget
//
String widgetGuid = allWidgets[0].getGuid();
@@ -118,15 +94,7 @@ public abstract class AbstractPersistenc
assertNotNull(widgetsByValue);
assertEquals(1, widgetsByValue.length);
assertEquals(allWidgets[0], widgetsByValue[0]);
-
- //
- // test findByValue method for IWidgetDefault
- //
- IWidgetDefault [] widgetDefaultsByValue =
persistenceManager.findByValue(IWidgetDefault.class, "widget", widgetById);
- assertNotNull(widgetDefaultsByValue);
- assertEquals(1, widgetDefaultsByValue.length);
- assertEquals(allWidgetDefaults[0], widgetDefaultsByValue[0]);
-
+
//
// test findByValues methods for IWidget
//
@@ -149,14 +117,6 @@ public abstract class AbstractPersistenc
IWidget widgetByGuid = persistenceManager.findWidgetByGuid(widgetGuid);
assertNotNull(widgetByGuid);
assertEquals(allWidgets[0], widgetByGuid);
- String widgetContext = allWidgetDefaults[0].getWidgetContext();
- IWidget widgetDefaultByType =
persistenceManager.findWidgetDefaultByType(widgetContext);
- assertNotNull(widgetDefaultByType);
- assertEquals(allWidgets[0], widgetDefaultByType);
- IWidget [] widgetsByType =
persistenceManager.findWidgetsByType(widgetContext);
- assertNotNull(widgetsByType);
- assertEquals(1, widgetsByType.length);
- assertEquals(allWidgets[0], widgetsByType[0]);
//
// rollback and close persistence manager transaction
@@ -238,14 +198,13 @@ public abstract class AbstractPersistenc
persistenceManager.begin();
//
- // Get the widget instance created in the previous transaction via its
"service context" (category)
+ // Get the widget instance created in the previous transaction
//
apiKeys = persistenceManager.findAll(IApiKey.class);
apiKey = apiKeys[0].getValue();
widgets = persistenceManager.findAll(IWidget.class);
widget = widgets[0];
- String serviceContext =
widget.getWidgetTypes().iterator().next().getWidgetContext();
- IWidgetInstance widgetInstance0 =
persistenceManager.findWidgetInstance(apiKey, "test", "test-shared-data-key",
serviceContext);
+ IWidgetInstance widgetInstance0 =
persistenceManager.findWidgetInstanceByGuid(apiKey, "test",
"test-shared-data-key", widgetGuid);
assertNotNull(widgetInstance0);
widgetGuid = widget.getGuid();
Modified:
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetsControllerTest.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetsControllerTest.java?rev=1291286&r1=1291285&r2=1291286&view=diff
==============================================================================
---
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetsControllerTest.java
(original)
+++
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/functional/WidgetsControllerTest.java
Mon Feb 20 14:41:41 2012
@@ -87,43 +87,7 @@ public class WidgetsControllerTest exten
}
/**
- * Tests we get GET widgets by service type
- * NOTE that the Services functionality is deprecated and may be
removed in a future release
- * @throws IOException
- * @throws HttpException
- */
- @Test
- public void getWidgetType() throws HttpException, IOException{
- HttpClient client = new HttpClient();
- GetMethod get = new
GetMethod(TEST_WIDGETS_SERVICE_URL_VALID+"/unsupported");
- client.executeMethod(get);
- int code = get.getStatusCode();
- assertEquals(200,code);
- String response = get.getResponseBodyAsString();
- assertTrue(response.contains("<widget id=\"1\"
identifier=\"http://notsupported\"";));
- get.releaseConnection();
- }
-
- /**
- * Tests we get GET widgets by service type when it is empty; we expect a
valid response, just no actual widgets
- * NOTE that the Services functionality is deprecated and may be removed in
a future release
- * @throws IOException
- * @throws HttpException
- */
- @Test
- public void getWidgetType_empty() throws HttpException, IOException{
- HttpClient client = new HttpClient();
- GetMethod get = new
GetMethod(TEST_WIDGETS_SERVICE_URL_VALID+"/games");
- client.executeMethod(get);
- int code = get.getStatusCode();
- assertEquals(200,code);
- String response = get.getResponseBodyAsString();
- assertFalse(response.contains("<widget "));
- get.releaseConnection();
- }
-
- /**
- * Tests a GET which matches neither an existing widget id or existing
service type gives us a 404
+ * Tests a GET which does not matche an existing widget id gives us a
404
* @throws IOException
* @throws HttpException
*/
Modified: incubator/wookie/trunk/src/org/apache/wookie/WidgetAdminServlet.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/WidgetAdminServlet.java?rev=1291286&r1=1291285&r2=1291286&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/WidgetAdminServlet.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/WidgetAdminServlet.java Mon
Feb 20 14:41:41 2012
@@ -16,7 +16,6 @@ package org.apache.wookie;
import java.io.File;
import java.io.IOException;
-import java.util.Hashtable;
import javax.servlet.RequestDispatcher;
import javax.servlet.Servlet;
@@ -30,19 +29,11 @@ import org.apache.commons.configuration.
import org.apache.log4j.Logger;
import org.apache.wookie.beans.IApiKey;
import org.apache.wookie.beans.IWidget;
-import org.apache.wookie.beans.IWidgetDefault;
-import org.apache.wookie.beans.IWidgetService;
import org.apache.wookie.beans.util.IPersistenceManager;
import org.apache.wookie.beans.util.PersistenceManagerFactory;
-import org.apache.wookie.controller.WidgetServicesController;
-import org.apache.wookie.exceptions.InvalidParametersException;
-import org.apache.wookie.exceptions.ResourceDuplicationException;
-import org.apache.wookie.exceptions.ResourceNotFoundException;
import org.apache.wookie.feature.Features;
import org.apache.wookie.helpers.WidgetFactory;
import org.apache.wookie.helpers.WidgetKeyManager;
-import org.apache.wookie.manager.IWidgetAdminManager;
-import org.apache.wookie.manager.impl.WidgetAdminManager;
import org.apache.wookie.server.LocaleHandler;
import org.apache.wookie.util.WidgetFileUtils;
import org.apache.wookie.util.WidgetJavascriptSyntaxAnalyzer;
@@ -86,12 +77,9 @@ public class WidgetAdminServlet extends
static Logger _logger =
Logger.getLogger(WidgetAdminServlet.class.getName());
// jsp page handles
- private static final String fAddNewServicesPage =
"/admin/addnewservice.jsp"; //$NON-NLS-1$
- private static final String fListServicesPage =
"/admin/listservices.jsp"; //$NON-NLS-1$
private static final String fListWidgetsForDeletePage =
"/admin/listallfordelete.jsp"; //$NON-NLS-1$
private static final String fListWidgetsPage = "/admin/listall.jsp";
//$NON-NLS-1$
private static final String fMainPage = "/admin/index.jsp";
//$NON-NLS-1$
- private static final String fRemoveServicesPage =
"/admin/removeservice.jsp"; //$NON-NLS-1$
private static final String fUpLoadResultsPage =
"/admin/uploadresults.jsp"; //$NON-NLS-1$
private static final String fRegisterGadgetPage =
"/admin/registergadget.jsp"; //$NON-NLS-1$
private static final String fListAPIKeysPage = "/admin/keys.jsp";
//$NON-NLS-1$
@@ -108,25 +96,6 @@ public class WidgetAdminServlet extends
super();
}
-
- /**
- * Add a new service type to the DB
- * @param request
- * @param manager
- */
- private void addNewService(HttpServletRequest request) {
- String serviceName = request.getParameter("newservice");
//$NON-NLS-1$
- Messages localizedMessages =
LocaleHandler.localizeMessages(request);
- try {
- WidgetServicesController.create(serviceName);
- request.setAttribute("message_value",
localizedMessages.getString("WidgetAdminServlet.0")); //$NON-NLS-1$
//$NON-NLS-2$
- } catch (ResourceDuplicationException e) {
- request.setAttribute("error_value",
localizedMessages.getString("WidgetAdminServlet.1")); //$NON-NLS-1$
//$NON-NLS-2$
- } catch (InvalidParametersException e) {
- request.setAttribute("error_value",
localizedMessages.getString("WidgetAdminServlet.1")); //$NON-NLS-1$
//$NON-NLS-2$
- }
- }
-
/**
* Forward to correct jsp page
*/
@@ -146,11 +115,6 @@ public class WidgetAdminServlet extends
HttpSession session = request.getSession(true);
Messages localizedMessages =
LocaleHandler.localizeMessages(request);
- IWidgetAdminManager manager =
(IWidgetAdminManager)session.getAttribute(WidgetAdminManager.class.getName());
- if(manager == null){
- manager = new WidgetAdminManager(localizedMessages);
-
session.setAttribute(WidgetAdminManager.class.getName(), manager);
- }
Configuration properties = (Configuration)
session.getServletContext().getAttribute("properties"); //$NON-NLS-1$
request.setAttribute("version",
properties.getString("widget.version")); //$NON-NLS-1$ //$NON-NLS-2$
@@ -168,24 +132,13 @@ public class WidgetAdminServlet extends
if(op!=null){
switch (op) {
case REMOVEWIDGET: {
- removeWidget(request, properties, manager);
+ removeWidget(request, properties);
listOperation(request, false);
doForward(request, response,
fListWidgetsForDeletePage);
break;
}
- case REVISETYPES: {
- reviseTypes(request, manager);
- doForward(request, response,
fUpLoadResultsPage);
- break;
- }
- case ADDNEWSERVICE: {
- addNewService(request);
- retrieveServices(request);
- doForward(request, response,
fAddNewServicesPage);
- break;
- }
case UPLOADWIDGET: {
- uploadOperation(request, properties, manager);
+ uploadOperation(request, properties);
doForward(request, response,
fUpLoadResultsPage);
break;
}
@@ -200,41 +153,6 @@ public class WidgetAdminServlet extends
}
break;
}
- case LISTSERVICES: {
- retrieveServices(request);
-
if(request.getParameter("param").equalsIgnoreCase("list")){
//$NON-NLS-1$
//$NON-NLS-2$
- doForward(request, response,
fListServicesPage);
- }
- else
if(request.getParameter("param").equalsIgnoreCase("add")){
//$NON-NLS-1$ //$NON-NLS-2$
- doForward(request, response,
fAddNewServicesPage);
- }
- else
if(request.getParameter("param").equalsIgnoreCase("remove")){
//$NON-NLS-1$ //$NON-NLS-2$
- doForward(request, response,
fRemoveServicesPage);
- }
- break;
- }
- case SETWIDGETTYPES: {
- updateWidgetTypes(request, manager);
- listOperation(request, true);
- doForward(request, response, fListWidgetsPage);
- break;
- }
- case REMOVESERVICE:{
- removeServiceOperation(request);
- doForward(request, response,
fRemoveServicesPage);
- break;
- }
- case REMOVESINGLEWIDGETTYPE:{
- removeSingleWidgetTypeOperation(request,
manager);
- listOperation(request, true);
- doForward(request, response, fListWidgetsPage);
- break;
- }
- case SETDEFAULTWIDGET:{
- setDefaultWidgetOperation(request, manager);
- doForward(request, response, fListWidgetsPage);
- break;
- }
case REGISTERGADGET:{
registerOperation(request, properties);
doForward(request, response,fMainPage);
@@ -280,17 +198,6 @@ public class WidgetAdminServlet extends
private void listOperation(HttpServletRequest request, boolean
getDefaults){
retrieveWidgets(request);
- if(getDefaults){
- Hashtable<String, Object> defaultHash = new
Hashtable<String, Object>();
- IPersistenceManager persistenceManager =
PersistenceManagerFactory.getPersistenceManager();
- IWidgetDefault[] wds =
persistenceManager.findAll(IWidgetDefault.class);
- if (wds != null){
- for(IWidgetDefault defaultWidget : wds){
-
defaultHash.put(defaultWidget.getWidgetContext(),
defaultWidget.getWidget().getId());
- }
- }
- request.setAttribute("widget_defaults", defaultHash);
//$NON-NLS-1$
- }
}
private void registerOperation(HttpServletRequest request,
Configuration properties){
@@ -310,32 +217,7 @@ public class WidgetAdminServlet extends
}
}
- private void removeServiceOperation(HttpServletRequest request) {
- Messages localizedMessages =
LocaleHandler.localizeMessages(request);
- String serviceId = request.getParameter("serviceId");
//$NON-NLS-1$
- try {
- WidgetServicesController.remove(serviceId);
- request.setAttribute("message_value",
localizedMessages.getString("WidgetAdminServlet.6"));
//$NON-NLS-1$ //$NON-NLS-2$
- } catch (ResourceNotFoundException e) {
- request.setAttribute("error_value",
localizedMessages.getString("WidgetAdminServlet.7")); //$NON-NLS-1$
//$NON-NLS-2$
- }
- retrieveServices(request);
- }
-
- private void removeSingleWidgetTypeOperation(HttpServletRequest
request, IWidgetAdminManager manager) {
- Messages localizedMessages =
LocaleHandler.localizeMessages(request);
- String widgetId = request.getParameter("widgetId");
//$NON-NLS-1$
- String widgetType = request.getParameter("widgetType");
//$NON-NLS-1$
- if(manager.removeSingleWidgetType(widgetId, widgetType)){
- request.setAttribute("message_value",
localizedMessages.getString("WidgetAdminServlet.8"));
//$NON-NLS-1$ //$NON-NLS-2$
- }
- else{
- request.setAttribute("error_value",
localizedMessages.getString("WidgetAdminServlet.9")); //$NON-NLS-1$
//$NON-NLS-2$
- }
- request.setAttribute("widgets", null);
//$NON-NLS-1$
- }
-
- private void removeWidget(HttpServletRequest request, Configuration
properties, IWidgetAdminManager manager) {
+ private void removeWidget(HttpServletRequest request, Configuration
properties) {
final String WIDGETFOLDER =
getServletContext().getRealPath(properties.getString("widget.widgetfolder"));//$NON-NLS-1$
Messages localizedMessages =
LocaleHandler.localizeMessages(request);
String widgetId = request.getParameter("widgetId");
//$NON-NLS-1$
@@ -355,26 +237,11 @@ public class WidgetAdminServlet extends
}
}
-
-
- private void retrieveServices(HttpServletRequest request){
- IPersistenceManager persistenceManager =
PersistenceManagerFactory.getPersistenceManager();
- request.setAttribute("services",
persistenceManager.findAll(IWidgetService.class));
//$NON-NLS-1$
- }
-
private void retrieveWidgets(HttpServletRequest request){
IPersistenceManager persistenceManager =
PersistenceManagerFactory.getPersistenceManager();
request.setAttribute("widgets",
persistenceManager.findAll(IWidget.class)); //$NON-NLS-1$
}
- private void reviseTypes(HttpServletRequest request,
IWidgetAdminManager manager) {
- retrieveServices(request);
- request.setAttribute("hasValidated", Boolean.valueOf(true));
//$NON-NLS-1$
- request.setAttribute("closeWindow", Boolean.valueOf(false));
//$NON-NLS-1$
- String dbkey = request.getParameter("dbkey"); //$NON-NLS-1$
- request.setAttribute("dbkey", Integer.parseInt(dbkey));
//$NON-NLS-1$
- }
-
private void revokeAPIKeyOperation(HttpServletRequest request){
String value = request.getParameter("key");
if (WidgetKeyManager.revokeKey(value)){
@@ -384,28 +251,7 @@ public class WidgetAdminServlet extends
}
}
- private void setDefaultWidgetOperation(HttpServletRequest request,
IWidgetAdminManager manager){
- String widgetId = request.getParameter("widgetId");
//$NON-NLS-1$
- String widgetType = request.getParameter("widgetType");
//$NON-NLS-1$
- manager.setDefaultWidget(widgetId, widgetType);
- listOperation(request, true);
- }
-
- private void updateWidgetTypes(HttpServletRequest request,
IWidgetAdminManager manager) throws IOException{
- Messages localizedMessages =
LocaleHandler.localizeMessages(request);
- boolean canMax = false;
-
- String maximize = request.getParameter("max"); //$NON-NLS-1$
- if(maximize!=null){
- canMax = Boolean.valueOf(maximize);
- }
- String dbKey = request.getParameter("dbkey"); //$NON-NLS-1$
- String[] widgetTypes =
request.getParameterValues("widgetTypes"); //$NON-NLS-1$
- manager.setWidgetTypesForWidget(dbKey, widgetTypes, canMax);
- request.setAttribute("message_value",
localizedMessages.getString("WidgetAdminServlet.15"));
//$NON-NLS-1$ //$NON-NLS-2$
- }
-
- private void uploadOperation(HttpServletRequest request, Configuration
properties, IWidgetAdminManager manager) {
+ private void uploadOperation(HttpServletRequest request, Configuration
properties) {
final String WIDGETFOLDER =
getServletContext().getRealPath(properties.getString("widget.widgetfolder"));//$NON-NLS-1$
final String UPLOADFOLDER =
getServletContext().getRealPath(properties.getString("widget.useruploadfolder"));//$NON-NLS-1$
@@ -440,7 +286,6 @@ public class WidgetAdminServlet extends
Object dbkey = widget.getId();
// widget added
request.setAttribute("message_value",
"'"+ widgetModel.getLocalName("en") +"' - " +
localizedMessages.getString("WidgetAdminServlet.19")); //$NON-NLS-1$
//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- retrieveServices(request);
request.setAttribute("hasValidated",
Boolean.valueOf(true));
//$NON-NLS-1$
request.setAttribute("dbkey", dbkey);
//$NON-NLS-1$
}
Modified: incubator/wookie/trunk/src/org/apache/wookie/WidgetWebMenuServlet.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/WidgetWebMenuServlet.java?rev=1291286&r1=1291285&r2=1291286&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/WidgetWebMenuServlet.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/WidgetWebMenuServlet.java Mon
Feb 20 14:41:41 2012
@@ -37,8 +37,6 @@ import org.apache.wookie.connector.frame
import org.apache.wookie.connector.framework.WookieConnectorService;
import org.apache.wookie.controller.WidgetInstancesController;
import org.apache.wookie.helpers.WidgetKeyManager;
-import org.apache.wookie.manager.IWidgetAdminManager;
-import org.apache.wookie.manager.impl.WidgetAdminManager;
import org.apache.wookie.server.LocaleHandler;
/**
@@ -71,11 +69,6 @@ public class WidgetWebMenuServlet extend
protected void doGet(HttpServletRequest request, HttpServletResponse
response) throws ServletException, IOException {
HttpSession session = request.getSession(true);
Messages localizedMessages =
LocaleHandler.localizeMessages(request);
- IWidgetAdminManager manager =
(IWidgetAdminManager)session.getAttribute(WidgetAdminManager.class.getName());
- if(manager == null){
- manager = new WidgetAdminManager(localizedMessages);
-
session.setAttribute(WidgetAdminManager.class.getName(), manager);
- }
Configuration properties = (Configuration)
request.getSession().getServletContext().getAttribute("properties");
//$NON-NLS-1$
request.setAttribute("version",
properties.getString("widget.version")); //$NON-NLS-1$ //$NON-NLS-2$
@@ -97,7 +90,7 @@ public class WidgetWebMenuServlet extend
break;
}
case LISTWIDGETS: {
- listOperation(request, session,
manager);
+ listOperation(request, session);
doForward(request, response,
fListWidgetsPage);
break;
}
@@ -123,12 +116,12 @@ public class WidgetWebMenuServlet extend
break;
}
case INSTANTIATE: {
- instantiateOperation(request, manager);
+ instantiateOperation(request);
doForward(request, response,
fInstantiateWidgetsPage);
break;
}
case REQUESTAPIKEY:{
-
requestApiKeyOperation(request,properties,manager);
+
requestApiKeyOperation(request,properties);
doForward(request, response, fMainPage);
break;
}
@@ -173,7 +166,7 @@ public class WidgetWebMenuServlet extend
doGet(request, response);
}
- private void instantiateOperation(HttpServletRequest request,
IWidgetAdminManager manager){
+ private void instantiateOperation(HttpServletRequest request){
IPersistenceManager persistenceManager =
PersistenceManagerFactory.getPersistenceManager();
IWidget[] widgets = persistenceManager.findAll(IWidget.class);
request.setAttribute("widgets", widgets); //$NON-NLS-1$
@@ -188,7 +181,7 @@ public class WidgetWebMenuServlet extend
* @param session
* @param manager
*/
- private void listOperation(HttpServletRequest request, HttpSession
session, IWidgetAdminManager manager){
+ private void listOperation(HttpServletRequest request, HttpSession
session){
ArrayList<IWidget> widgets = new ArrayList<IWidget>();
IPersistenceManager persistenceManager =
PersistenceManagerFactory.getPersistenceManager();
for(IWidget widget : persistenceManager.findAll(IWidget.class)){
@@ -208,7 +201,7 @@ public class WidgetWebMenuServlet extend
request.setAttribute("widgets", widgets.toArray( new
IWidget[widgets.size()])); //$NON-NLS-1$
}
- private void requestApiKeyOperation(HttpServletRequest request,
Configuration properties, IWidgetAdminManager manager){
+ private void requestApiKeyOperation(HttpServletRequest request,
Configuration properties){
Messages localizedMessages =
LocaleHandler.localizeMessages(request);
try {
String email = request.getParameter("email");
//$NON-NLS-1$
Modified: incubator/wookie/trunk/src/org/apache/wookie/beans/IWidget.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/IWidget.java?rev=1291286&r1=1291285&r2=1291286&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/beans/IWidget.java (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/beans/IWidget.java Mon Feb 20
14:41:41 2012
@@ -92,20 +92,6 @@ public interface IWidget extends ILocali
void setWidth(Integer width);
/**
- * Get collection of widget types for this widget.
- *
- * @return widget types collection
- */
- Collection<IWidgetType> getWidgetTypes();
-
- /**
- * Set collection of widget types for this widget.
- *
- * @param widgetTypes widget types collection
- */
- void setWidgetTypes(Collection<IWidgetType> widgetTypes);
-
- /**
* Get widget GUID.
*
* @return widget GUID
Modified:
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/JPAPersistenceManager.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/JPAPersistenceManager.java?rev=1291286&r1=1291285&r2=1291286&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/JPAPersistenceManager.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/JPAPersistenceManager.java
Mon Feb 20 14:41:41 2012
@@ -62,11 +62,8 @@ import org.apache.wookie.beans.IPreferen
import org.apache.wookie.beans.ISharedData;
import org.apache.wookie.beans.IStartFile;
import org.apache.wookie.beans.IWidget;
-import org.apache.wookie.beans.IWidgetDefault;
import org.apache.wookie.beans.IWidgetIcon;
import org.apache.wookie.beans.IWidgetInstance;
-import org.apache.wookie.beans.IWidgetService;
-import org.apache.wookie.beans.IWidgetType;
import org.apache.wookie.beans.jpa.impl.ApiKeyImpl;
import org.apache.wookie.beans.jpa.impl.AuthorImpl;
import org.apache.wookie.beans.jpa.impl.DescriptionImpl;
@@ -80,12 +77,9 @@ import org.apache.wookie.beans.jpa.impl.
import org.apache.wookie.beans.jpa.impl.PreferenceImpl;
import org.apache.wookie.beans.jpa.impl.SharedDataImpl;
import org.apache.wookie.beans.jpa.impl.StartFileImpl;
-import org.apache.wookie.beans.jpa.impl.WidgetDefaultImpl;
import org.apache.wookie.beans.jpa.impl.WidgetIconImpl;
import org.apache.wookie.beans.jpa.impl.WidgetImpl;
import org.apache.wookie.beans.jpa.impl.WidgetInstanceImpl;
-import org.apache.wookie.beans.jpa.impl.WidgetServiceImpl;
-import org.apache.wookie.beans.jpa.impl.WidgetTypeImpl;
import org.apache.wookie.beans.util.DatabaseUtils;
import org.apache.wookie.beans.util.IPersistenceManager;
import org.apache.wookie.beans.util.PersistenceCommitException;
@@ -127,11 +121,8 @@ public class JPAPersistenceManager imple
INTERFACE_TO_CLASS_MAP.put(ISharedData.class, SharedDataImpl.class);
INTERFACE_TO_CLASS_MAP.put(IStartFile.class, StartFileImpl.class);
INTERFACE_TO_CLASS_MAP.put(IWidget.class, WidgetImpl.class);
- INTERFACE_TO_CLASS_MAP.put(IWidgetDefault.class,
WidgetDefaultImpl.class);
INTERFACE_TO_CLASS_MAP.put(IWidgetIcon.class, WidgetIconImpl.class);
INTERFACE_TO_CLASS_MAP.put(IWidgetInstance.class,
WidgetInstanceImpl.class);
- INTERFACE_TO_CLASS_MAP.put(IWidgetService.class,
WidgetServiceImpl.class);
- INTERFACE_TO_CLASS_MAP.put(IWidgetType.class, WidgetTypeImpl.class);
INTERFACE_TO_CLASS_MAP.put(IOAuthToken.class, OAuthTokenImpl.class);
BEAN_INTERFACE_TO_CLASS_MAP.put(IApiKey.class, ApiKeyImpl.class);
@@ -139,17 +130,13 @@ public class JPAPersistenceManager imple
BEAN_INTERFACE_TO_CLASS_MAP.put(IPreference.class,
PreferenceImpl.class);
BEAN_INTERFACE_TO_CLASS_MAP.put(ISharedData.class,
SharedDataImpl.class);
BEAN_INTERFACE_TO_CLASS_MAP.put(IWidget.class, WidgetImpl.class);
- BEAN_INTERFACE_TO_CLASS_MAP.put(IWidgetDefault.class,
WidgetDefaultImpl.class);
BEAN_INTERFACE_TO_CLASS_MAP.put(IWidgetInstance.class,
WidgetInstanceImpl.class);
- BEAN_INTERFACE_TO_CLASS_MAP.put(IWidgetService.class,
WidgetServiceImpl.class);
BEAN_INTERFACE_TO_CLASS_MAP.put(IOAuthToken.class,
OAuthTokenImpl.class);
BEAN_INTERFACE_TO_ID_FIELD_TYPE_MAP.put(IApiKey.class, Integer.class);
BEAN_INTERFACE_TO_ID_FIELD_TYPE_MAP.put(IParticipant.class,
Integer.class);
BEAN_INTERFACE_TO_ID_FIELD_TYPE_MAP.put(IWidget.class, Integer.class);
- BEAN_INTERFACE_TO_ID_FIELD_TYPE_MAP.put(IWidgetDefault.class,
String.class);
BEAN_INTERFACE_TO_ID_FIELD_TYPE_MAP.put(IWidgetInstance.class,
Integer.class);
- BEAN_INTERFACE_TO_ID_FIELD_TYPE_MAP.put(IWidgetService.class,
Integer.class);
BEAN_INTERFACE_TO_ID_FIELD_TYPE_MAP.put(IOAuthToken.class,
Integer.class);
DB_TYPE_TO_JPA_DICTIONARY_MAP.put("db2", "db2");
@@ -661,37 +648,6 @@ public class JPAPersistenceManager imple
}
/* (non-Javadoc)
- * @see
org.apache.wookie.beans.util.IPersistenceManager#findWidgetDefaultByType(java.lang.String)
- */
- public IWidget findWidgetDefaultByType(String widgetContext)
- {
- // validate entity manager transaction
- if (entityManager == null)
- {
- throw new IllegalStateException("Transaction not initiated or
already closed");
- }
-
- // get default widget by type using custom query
- if (widgetContext != null)
- {
- try
- {
- Query query = entityManager.createNamedQuery("DEFAULT_WIDGET");
- query.setParameter("widgetContext", widgetContext);
- return (IWidget)query.getSingleResult();
- }
- catch (NoResultException nre)
- {
- }
- catch (Exception e)
- {
- logger.error("Unexpected exception: "+e, e);
- }
- }
- return null;
- }
-
- /* (non-Javadoc)
* @see
org.apache.wookie.beans.util.IPersistenceManager#findWidgetInstance(java.lang.String,
java.lang.String, java.lang.String, java.lang.String)
*/
public IWidgetInstance findWidgetInstance(String apiKey, String userId,
String sharedDataKey, String serviceContext)
@@ -789,40 +745,7 @@ public class JPAPersistenceManager imple
}
return null;
}
-
- /* (non-Javadoc)
- * @see
org.apache.wookie.beans.util.IPersistenceManager#findWidgetsByType(java.lang.String)
- */
- @SuppressWarnings("unchecked")
- public IWidget[] findWidgetsByType(String widgetContext)
- {
- // validate entity manager transaction
- if (entityManager == null)
- {
- throw new IllegalStateException("Transaction not initiated or
already closed");
- }
-
- // get widgets by type using custom query
- if (widgetContext != null)
- {
- try
- {
- Query query = entityManager.createNamedQuery("WIDGETS");
- query.setParameter("widgetContext", widgetContext);
- List<IWidget> widgetsList = query.getResultList();
- if ((widgetsList != null) && !widgetsList.isEmpty())
- {
- return widgetsList.toArray(new
IWidget[widgetsList.size()]);
- }
- }
- catch (Exception e)
- {
- logger.error("Unexpected exception: "+e, e);
- }
- }
- return new IWidget[0];
- }
-
+
/* (non-Javadoc)
* @see
org.apache.wookie.beans.util.IPersistenceManager#newInstance(java.lang.Class)
*/
Modified:
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetImpl.java?rev=1291286&r1=1291285&r2=1291286&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetImpl.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetImpl.java
Mon Feb 20 14:41:41 2012
@@ -42,7 +42,6 @@ import org.apache.wookie.beans.IPreferen
import org.apache.wookie.beans.IStartFile;
import org.apache.wookie.beans.IWidget;
import org.apache.wookie.beans.IWidgetIcon;
-import org.apache.wookie.beans.IWidgetType;
import org.apache.wookie.beans.jpa.InverseRelationshipCollection;
import org.apache.wookie.beans.util.PersistenceManagerFactory;
@@ -81,10 +80,6 @@ public class WidgetImpl extends Localize
@Column(name="width")
private Integer width;
- @OneToMany(mappedBy="widget", fetch=FetchType.LAZY,
cascade=CascadeType.ALL)
- @ElementDependent
- private Collection<WidgetTypeImpl> widgetTypes;
-
@Basic
@Column(name="update_location")
private String updateLocation;
@@ -479,33 +474,6 @@ public class WidgetImpl extends Localize
}
/* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidget#getWidgetTypes()
- */
- public Collection<IWidgetType> getWidgetTypes()
- {
- if (widgetTypes == null)
- {
- widgetTypes = new ArrayList<WidgetTypeImpl>();
- }
- return new
InverseRelationshipCollection<WidgetImpl,WidgetTypeImpl,IWidgetType>(this,
widgetTypes);
- }
-
- /* (non-Javadoc)
- * @see
org.apache.wookie.beans.IWidget#setWidgetTypes(java.util.Collection)
- */
- public void setWidgetTypes(Collection<IWidgetType> widgetTypes)
- {
- getWidgetTypes().clear();
- if (widgetTypes != null)
- {
- for (IWidgetType widgetType : widgetTypes)
- {
- getWidgetTypes().add((WidgetTypeImpl)widgetType);
- }
- }
- }
-
- /* (non-Javadoc)
* @see org.apache.wookie.beans.IWidget#getWidth()
*/
public Integer getWidth()
Modified:
incubator/wookie/trunk/src/org/apache/wookie/beans/util/IPersistenceManager.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/util/IPersistenceManager.java?rev=1291286&r1=1291285&r2=1291286&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/beans/util/IPersistenceManager.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/beans/util/IPersistenceManager.java
Mon Feb 20 14:41:41 2012
@@ -151,22 +151,6 @@ public interface IPersistenceManager
IWidget findWidgetByGuid(String guid);
/**
- * Custom default widget type IWidget query.
- *
- * @param widgetContext default widget type matching query value
- * @return retrieved IWidget bean instance or null if not found
- */
- IWidget findWidgetDefaultByType(String widgetContext);
-
- /**
- * Custom widget type IWidgets query.
- *
- * @param widgetContext widget type matching query value
- * @return retrieved matching IWidget beans array or empty array if none
found
- */
- IWidget [] findWidgetsByType(String widgetContext);
-
- /**
* Custom service type IWidgetInstance query.
*
* @param apiKey API key matching query value
Modified:
incubator/wookie/trunk/src/org/apache/wookie/beans/util/PersistenceManagerFactory.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/util/PersistenceManagerFactory.java?rev=1291286&r1=1291285&r2=1291286&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/beans/util/PersistenceManagerFactory.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/beans/util/PersistenceManagerFactory.java
Mon Feb 20 14:41:41 2012
@@ -22,10 +22,7 @@ import org.apache.wookie.beans.IDescript
import org.apache.wookie.beans.IName;
import org.apache.wookie.beans.IStartFile;
import org.apache.wookie.beans.IWidget;
-import org.apache.wookie.beans.IWidgetDefault;
import org.apache.wookie.beans.IWidgetIcon;
-import org.apache.wookie.beans.IWidgetService;
-import org.apache.wookie.beans.IWidgetType;
import org.apache.wookie.helpers.WidgetRuntimeHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -119,9 +116,6 @@ public class PersistenceManagerFactory
widgetENStartFile.setUrl(WidgetRuntimeHelper.getWebContextPath() +
"/wservices/notsupported/locales/en/index.htm");
widgetENStartFile.setLang("en");
widget.getStartFiles().add(widgetENStartFile);
- IWidgetType widgetType =
persistenceManager.newInstance(IWidgetType.class);
- widgetType.setWidgetContext("unsupported");
- widget.getWidgetTypes().add(widgetType);
IWidgetIcon widgetIcon =
persistenceManager.newInstance(IWidgetIcon.class);
widgetIcon.setSrc(WidgetRuntimeHelper.getWebContextPath()
+ "/shared/images/defaultwidget.png");
widgetIcon.setHeight(80);
@@ -134,53 +128,6 @@ public class PersistenceManagerFactory
{
initializing = false;
}
-
- // WidgetDefault
- if (persistenceManager.findWidgetDefaultByType("unsupported")
== null)
- {
- // required: always create if not found
- IWidgetDefault widgetDefault =
persistenceManager.newInstance(IWidgetDefault.class);
- widgetDefault.setWidget(widget);
- widgetDefault.setWidgetContext("unsupported");
- persistenceManager.save(widgetDefault);
- }
- else
- {
- initializing = false;
- }
-
- // WidgetService
- if (initializing &&
(persistenceManager.findAll(IWidgetService.class).length == 0))
- {
- // optional: create only if initializing
- IWidgetService chatWidgetService =
persistenceManager.newInstance(IWidgetService.class);
- chatWidgetService.setServiceName("chat");
- persistenceManager.save(chatWidgetService);
- IWidgetService gamesWidgetService =
persistenceManager.newInstance(IWidgetService.class);
- gamesWidgetService.setServiceName("games");
- persistenceManager.save(gamesWidgetService);
- IWidgetService votingWidgetService =
persistenceManager.newInstance(IWidgetService.class);
- votingWidgetService.setServiceName("voting");
- persistenceManager.save(votingWidgetService);
- IWidgetService weatherWidgetService =
persistenceManager.newInstance(IWidgetService.class);
- weatherWidgetService.setServiceName("weather");
- persistenceManager.save(weatherWidgetService);
- }
- else
- {
- initializing = false;
- }
- if (persistenceManager.findByValue(IWidgetService.class,
"serviceName", "unsupported").length == 0)
- {
- // required: always create if not found
- IWidgetService unsupportedWidgetService =
persistenceManager.newInstance(IWidgetService.class);
- unsupportedWidgetService.setServiceName("unsupported");
- persistenceManager.save(unsupportedWidgetService);
- }
- else
- {
- initializing = false;
- }
// ApiKey
if (initializing &&
(persistenceManager.findAll(IApiKey.class).length == 0))
Modified:
incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetsController.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetsController.java?rev=1291286&r1=1291285&r2=1291286&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetsController.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/controller/WidgetsController.java
Mon Feb 20 14:41:41 2012
@@ -16,7 +16,6 @@ package org.apache.wookie.controller;
import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.List;
import javax.servlet.ServletException;
@@ -30,8 +29,6 @@ import org.apache.commons.fileupload.Fil
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.wookie.beans.IWidget;
-import org.apache.wookie.beans.IWidgetDefault;
-import org.apache.wookie.beans.IWidgetService;
import org.apache.wookie.beans.util.IPersistenceManager;
import org.apache.wookie.beans.util.PersistenceManagerFactory;
import org.apache.wookie.exceptions.InvalidParametersException;
@@ -88,15 +85,7 @@ public class WidgetsController extends C
// attempt to get specific widget by id
IPersistenceManager persistenceManager =
PersistenceManagerFactory.getPersistenceManager();
IWidget widget = persistenceManager.findById(IWidget.class,
resourceId);
- // support queries by type
- if (widget == null) {
- IWidgetService[] services =
persistenceManager.findByValue(IWidgetService.class, "serviceName", resourceId);
- if (services != null && services.length == 1) {
- IWidget[] widgets =
persistenceManager.findWidgetsByType(resourceId);
-
returnXml(WidgetHelper.createXMLWidgetsDocument(widgets, getLocalPath(request),
getLocales(request)),response);
- return;
- }
- }
+
// return widget result
if (widget == null) throw new ResourceNotFoundException();
returnXml(WidgetHelper.createXMLWidgetsDocument(widget,
getLocalPath(request), getLocales(request)),response);
@@ -121,33 +110,9 @@ public class WidgetsController extends C
*/
private void index(String resourceId, HttpServletRequest request,
HttpServletResponse response) throws IOException {
- IWidget widget = null;
- IWidget[] widgets;
-
- // If the request has the parameter ?all, return all widgets.
- // If the request contains a String resource identifier
- // such as "/chat", return all matching widgets
- IPersistenceManager persistenceManager =
PersistenceManagerFactory.getPersistenceManager();
- if (request.getParameter("all") != null
- || (resourceId != null &&
!resourceId.equals(""))) {
- if (resourceId != null && !resourceId.equals("")) {
- widgets =
persistenceManager.findWidgetsByType(resourceId);
- } else {
- widgets =
persistenceManager.findAll(IWidget.class);
- }
- // Otherwise, return default widgets for the defined
services. In
- // future we may want
- // to move this into the Services controller.
- } else {
- ArrayList<IWidget> widgetsarr = new
ArrayList<IWidget>();
- for (IWidgetDefault widgetDefault :
persistenceManager.findAll(IWidgetDefault.class)) {
- widget = widgetDefault.getWidget();
- if
(!widget.getGuid().equals("http://notsupported";)) {
- widgetsarr.add(widget);
- }
- }
- widgets = (IWidget[])widgetsarr.toArray(new
IWidget[widgetsarr.size()]);
- }
+
+ IPersistenceManager persistenceManager =
PersistenceManagerFactory.getPersistenceManager();
+ IWidget[] widgets = persistenceManager.findAll(IWidget.class);
returnXml(WidgetHelper.createXMLWidgetsDocument(widgets,
getLocalPath(request), getLocales(request)),response);
}
Modified:
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java?rev=1291286&r1=1291285&r2=1291286&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetFactory.java Mon
Feb 20 14:41:41 2012
@@ -29,10 +29,8 @@ import org.apache.wookie.beans.IPreferen
import org.apache.wookie.beans.ISharedData;
import org.apache.wookie.beans.IStartFile;
import org.apache.wookie.beans.IWidget;
-import org.apache.wookie.beans.IWidgetDefault;
import org.apache.wookie.beans.IWidgetIcon;
import org.apache.wookie.beans.IWidgetInstance;
-import org.apache.wookie.beans.IWidgetType;
import org.apache.wookie.beans.SharedContext;
import org.apache.wookie.beans.util.IPersistenceManager;
import org.apache.wookie.beans.util.PersistenceManagerFactory;
@@ -110,7 +108,6 @@ public class WidgetFactory {
IPersistenceManager persistenceManager =
PersistenceManagerFactory.getPersistenceManager();
IWidget widget = createWidget(persistenceManager, model);
createAuthor(persistenceManager, model, widget);
- createTypes(persistenceManager, widgetTypes, widget);
createStartFiles(persistenceManager, model,widget);
createNames(persistenceManager, model,widget);
createDescriptions(persistenceManager, model,widget);
@@ -149,17 +146,6 @@ public class WidgetFactory {
}
}
- private static void createTypes(IPersistenceManager persistenceManager,
String[] widgetTypes, IWidget widget){
- IWidgetType widgetType;
- if (widgetTypes!=null){
- for(int i=0;i<widgetTypes.length;i++){
- widgetType =
persistenceManager.newInstance(IWidgetType.class);
- widgetType.setWidgetContext(widgetTypes[i]);
- widget.getWidgetTypes().add(widgetType);
- }
- }
- }
-
private static void createStartFiles(IPersistenceManager
persistenceManager, W3CWidget model, IWidget widget){
for (IContentEntity page:model.getContentList()){
IStartFile start =
persistenceManager.newInstance(IStartFile.class);
@@ -283,10 +269,7 @@ public class WidgetFactory {
if(widget==null) return false;
- // remove any defaults for this widget
- IPersistenceManager persistenceManager =
PersistenceManagerFactory.getPersistenceManager();
- IWidgetDefault[] widgetDefault =
persistenceManager.findByValue(IWidgetDefault.class, "widget", widget);
- if (widgetDefault.length == 1)
persistenceManager.delete(widgetDefault[0]);
+ IPersistenceManager persistenceManager =
PersistenceManagerFactory.getPersistenceManager();
// remove any widget instances for this widget
IWidgetInstance[] instances =
persistenceManager.findByValue(IWidgetInstance.class, "widget", widget);
Modified: incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetHelper.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetHelper.java?rev=1291286&r1=1291285&r2=1291286&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetHelper.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetHelper.java Mon
Feb 20 14:41:41 2012
@@ -23,7 +23,6 @@ import org.apache.wookie.beans.IName;
import org.apache.wookie.beans.IPreferenceDefault;
import org.apache.wookie.beans.IWidget;
import org.apache.wookie.beans.IWidgetIcon;
-import org.apache.wookie.beans.IWidgetType;
import org.apache.wookie.util.WidgetFormattingUtils;
import org.apache.wookie.w3c.IW3CXMLConfiguration;
import org.apache.wookie.w3c.util.LocalizationUtils;
@@ -77,7 +76,6 @@ public class WidgetHelper {
out += getName(widget, locales);
out += getDescription(widget, locales);
out += getIcons(widget, locales, localIconPath);
- out += getTags(widget);
out += getAuthor(widget);
out += getLicenses(widget, locales);
out += getPreferences(widget);
@@ -171,14 +169,6 @@ public class WidgetHelper {
out += "</description>\n";
return out;
}
-
- private static String getTags(IWidget widget){
- String out = "";
- for (IWidgetType type:widget.getWidgetTypes()){
- out
+="\t\t<category>"+type.getWidgetContext()+"</category>\n";
- }
- return out;
- }
private static String getIcons(IWidget widget, String[] locales, String
localIconPath){
URL urlWidgetIcon = null;
Modified:
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceFactory.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceFactory.java?rev=1291286&r1=1291285&r2=1291286&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceFactory.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/helpers/WidgetInstanceFactory.java
Mon Feb 20 14:41:41 2012
@@ -70,7 +70,7 @@ public class WidgetInstanceFactory{
public static IWidgetInstance defaultInstance(String locale){
IPersistenceManager persistenceManager =
PersistenceManagerFactory.getPersistenceManager();
IWidgetInstance instance =
persistenceManager.newInstance(IWidgetInstance.class);
-
instance.setWidget(persistenceManager.findWidgetDefaultByType("unsupported"));
//$NON-NLS-1$
+
instance.setWidget(persistenceManager.findWidgetByGuid("http://notsupported";));
//$NON-NLS-1$
instance.setIdKey("0000");
instance.setLang(locale);
instance.setOpensocialToken("");
@@ -88,17 +88,13 @@ public class WidgetInstanceFactory{
*/
public IWidgetInstance newInstance(String apiKey, String userId, String
sharedDataKey, String serviceType, String widgetId, String lang){
try {
- IWidget widget;
+ IWidget widget = null;
IWidgetInstance widgetInstance;
// Widget ID or Widget Type?
IPersistenceManager persistenceManager =
PersistenceManagerFactory.getPersistenceManager();
if (widgetId != null){
widget =
persistenceManager.findWidgetByGuid(widgetId);
}
- else {
- // does this type of widget exist?
- widget =
persistenceManager.findWidgetDefaultByType(serviceType);
- }
// Unsupported
if (widget == null) return null;
