Author: scottbw
Date: Fri Jun 18 11:33:51 2010
New Revision: 955947
URL: http://svn.apache.org/viewvc?rev=955947&view=rev
Log:
updating PP branch with changes in trunk (continued)
Modified:
incubator/wookie/branches/pluggablepersistence/src-tests/org/apache/wookie/tests/conformance/
(props changed)
incubator/wookie/branches/pluggablepersistence/src-tests/org/apache/wookie/tests/conformance/PackagingAndConfiguration.java
(props changed)
incubator/wookie/branches/pluggablepersistence/src-tests/org/apache/wookie/tests/conformance/WidgetInterface.java
(props changed)
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/controller/Controller.java
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/controller/ParticipantsController.java
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/controller/WidgetInstancesController.java
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/feature/conformance/
(props changed)
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/feature/conformance/Test.java
(props changed)
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/helpers/FlashMessage.java
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/util/html/HtmlCleaner.java
(props changed)
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/util/html/HtmlSerializer.java
(props changed)
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/util/html/IHtmlProcessor.java
(props changed)
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/util/html/StartPageProcessor.java
(props changed)
Propchange:
incubator/wookie/branches/pluggablepersistence/src-tests/org/apache/wookie/tests/conformance/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:33:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/src-tests/org/apache/wookie/tests/conformance:827972-831908
+/incubator/wookie/trunk/src-tests/org/apache/wookie/tests/conformance:949078-955931*
Propchange:
incubator/wookie/branches/pluggablepersistence/src-tests/org/apache/wookie/tests/conformance/PackagingAndConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:33:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/src-tests/org/apache/wookie/tests/conformance/PackagingAndConfiguration.java:827972-831908
+/incubator/wookie/trunk/src-tests/org/apache/wookie/tests/conformance/PackagingAndConfiguration.java:949078-955931
Propchange:
incubator/wookie/branches/pluggablepersistence/src-tests/org/apache/wookie/tests/conformance/WidgetInterface.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:33:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/src-tests/org/apache/wookie/tests/conformance/WidgetInterface.java:827972-831908
+/incubator/wookie/trunk/src-tests/org/apache/wookie/tests/conformance/WidgetInterface.java:949078-955931
Modified:
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/controller/Controller.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/controller/Controller.java?rev=955947&r1=955946&r2=955947&view=diff
==============================================================================
---
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/controller/Controller.java
(original)
+++
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/controller/Controller.java
Fri Jun 18 11:33:51 2010
@@ -23,6 +23,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.log4j.Logger;
import org.apache.wookie.exceptions.InvalidParametersException;
import org.apache.wookie.exceptions.ResourceDuplicationException;
import org.apache.wookie.exceptions.ResourceNotFoundException;
@@ -34,6 +35,7 @@ import org.apache.wookie.exceptions.Unau
public abstract class Controller extends HttpServlet{
private static final long serialVersionUID = 2791062551643568756L;
+ static Logger _logger = Logger.getLogger(Controller.class.getName());
/**
* Content type for XML output
@@ -96,6 +98,7 @@ public abstract class Controller extends
} catch (UnauthorizedAccessException e){
response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
} catch (InvalidParametersException e){
+ _logger.debug(e);
response.sendError(HttpServletResponse.SC_BAD_REQUEST);
}
}
@@ -114,11 +117,14 @@ public abstract class Controller extends
response.setStatus(HttpServletResponse.SC_OK);
}
} catch (ResourceDuplicationException e) {
+ _logger.error(e.getMessage(), e);
response.sendError(HttpServletResponse.SC_CONFLICT);//
already exists with same name - need error message for this
} catch (InvalidParametersException e){
- response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+ _logger.error(e.getMessage(), e);
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST);
} catch (UnauthorizedAccessException e){
- response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
+ _logger.error(e.getMessage(), e);
+ response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
}
}
Modified:
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/controller/ParticipantsController.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/controller/ParticipantsController.java?rev=955947&r1=955946&r2=955947&view=diff
==============================================================================
---
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/controller/ParticipantsController.java
(original)
+++
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/controller/ParticipantsController.java
Fri Jun 18 11:33:51 2010
@@ -87,6 +87,16 @@ public class ParticipantsController exte
UnauthorizedAccessException {
return create(request);
}
+
+ /**
+ * Add a participant to a widget.
+ *
+ * @param request
+ * @return
+ * @throws ResourceDuplicationException
+ * @throws InvalidParametersException
+ * @throws UnauthorizedAccessException
+ */
public static boolean create(HttpServletRequest request)
throws ResourceDuplicationException,
InvalidParametersException,
UnauthorizedAccessException {
@@ -101,10 +111,14 @@ public class ParticipantsController exte
String participantThumbnailUrl =
request.getParameter("participant_thumbnail_url"); //$NON-NLS-1$
// Check required params
- if (participantId == null || participantId.trim().equals(""))
throw new InvalidParametersException();
+ if (participantId == null || participantId.trim().equals("")) {
+ _logger.error("participant_id parameter cannot be
null");
+ throw new InvalidParametersException();
+ }
if (addParticipantToWidgetInstance(instance, participantId,
participantDisplayName, participantThumbnailUrl)){
Notifier.notifyWidgets(session, instance,
Notifier.PARTICIPANTS_UPDATED);
+ _logger.debug("added user to widget instance: " +
participantId);
return true;
} else {
// No need to create a new participant, it already
existed
Modified:
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/controller/WidgetInstancesController.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/controller/WidgetInstancesController.java?rev=955947&r1=955946&r2=955947&view=diff
==============================================================================
---
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/controller/WidgetInstancesController.java
(original)
+++
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/controller/WidgetInstancesController.java
Fri Jun 18 11:33:51 2010
@@ -16,9 +16,10 @@ package org.apache.wookie.controller;
import java.io.IOException;
import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.Collection;
+import java.net.URLDecoder;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@@ -26,7 +27,6 @@ import javax.servlet.http.HttpServletRes
import javax.servlet.http.HttpSession;
import org.apache.commons.configuration.Configuration;
-import org.apache.jackrabbit.core.persistence.PersistenceManager;
import org.apache.log4j.Logger;
import org.apache.wookie.Messages;
import org.apache.wookie.beans.ISharedData;
@@ -336,24 +336,35 @@ public class WidgetInstancesController e
*/
public static IWidgetInstance findWidgetInstance(HttpServletRequest
request){
IWidgetInstance instance;
-
- IPersistenceManager persistenceManager =
PersistenceManagerFactory.getPersistenceManager();
+
+ IPersistenceManager persistenceManager =
PersistenceManagerFactory.getPersistenceManager();
String id_key = request.getParameter("id_key"); //$NON-NLS-1$
if (id_key != null & id_key != ""){
instance =
persistenceManager.findWidgetInstanceByIdKey(id_key);
return instance;
}
-
- String apiKey = request.getParameter("api_key"); //$NON-NLS-1$
- String userId = request.getParameter("userid"); //$NON-NLS-1$
- String sharedDataKey =
WidgetInstancesController.getSharedDataKey(request);
- String serviceType = request.getParameter("servicetype");
//$NON-NLS-1$
- String widgetId = request.getParameter("widgetid");
//$NON-NLS-1$
- if (widgetId != null){
- instance =
persistenceManager.findWidgetInstanceByGuid(apiKey, userId, sharedDataKey,
widgetId);
- } else {
- instance =
persistenceManager.findWidgetInstance(apiKey, userId, sharedDataKey,
serviceType);
- }
- return instance;
+
+ try {
+ String apiKey =
URLDecoder.decode(request.getParameter("api_key"), "UTF-8"); //$NON-NLS-1$
+ String userId =
URLDecoder.decode(request.getParameter("userid"), "UTF-8"); //$NON-NLS-1$
+ String sharedDataKey =
WidgetInstancesController.getSharedDataKey(request);
+ String widgetId = request.getParameter("widgetid");
+ if (widgetId != null){
+ widgetId = URLDecoder.decode(widgetId,
"UTF-8"); //$NON-NLS-1$
+ _logger.debug("Looking for widget instance with
widgetid of " + widgetId);
+ instance =
persistenceManager.findWidgetInstanceByGuid(apiKey, userId, sharedDataKey,
widgetId);
+ } else {
+ String serviceType =
URLDecoder.decode(request.getParameter("servicetype"), "UTF-8"); //$NON-NLS-1$
+ _logger.debug("Looking for widget instance of
service type " + serviceType);
+ instance =
persistenceManager.findWidgetInstance(apiKey, userId, sharedDataKey,
serviceType);
+ }
+ if (instance == null) {
+ _logger.error("No widget instance for found");
+ }
+ return instance;
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException("Server must support UTF-8
encoding", e);
+ } //$NON-NLS-1$
+
}
}
\ No newline at end of file
Propchange:
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/feature/conformance/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:33:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/src/org/apache/wookie/feature/conformance:827972-831908
+/incubator/wookie/trunk/src/org/apache/wookie/feature/conformance:949078-955931*
Propchange:
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/feature/conformance/Test.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:33:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/src/org/apache/wookie/feature/conformance/Test.java:827972-831908
+/incubator/wookie/trunk/src/org/apache/wookie/feature/conformance/Test.java:949078-955931
Modified:
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/helpers/FlashMessage.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/helpers/FlashMessage.java?rev=955947&r1=955946&r2=955947&view=diff
==============================================================================
---
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/helpers/FlashMessage.java
(original)
+++
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/helpers/FlashMessage.java
Fri Jun 18 11:33:51 2010
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpSession;
public class FlashMessage {
private static FlashMessage _instance;
- private static ArrayList<Message> _messages;
+ private ArrayList<Message> _messages;
public static FlashMessage getInstance(){
if (_instance == null) _instance = new FlashMessage();
Propchange:
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/util/html/HtmlCleaner.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:33:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/src/org/apache/wookie/util/html/HtmlCleaner.java:827972-831908
+/incubator/wookie/trunk/src/org/apache/wookie/util/html/HtmlCleaner.java:949078-955931
Propchange:
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/util/html/HtmlSerializer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:33:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/src/org/apache/wookie/util/html/HtmlSerializer.java:827972-831908
+/incubator/wookie/trunk/src/org/apache/wookie/util/html/HtmlSerializer.java:949078-955931
Propchange:
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/util/html/IHtmlProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:33:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/src/org/apache/wookie/util/html/IHtmlProcessor.java:827972-831908
+/incubator/wookie/trunk/src/org/apache/wookie/util/html/IHtmlProcessor.java:949078-955931
Propchange:
incubator/wookie/branches/pluggablepersistence/src/org/apache/wookie/util/html/StartPageProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:33:51 2010
@@ -0,0 +1 @@
+/incubator/wookie/trunk/src/org/apache/wookie/util/html/StartPageProcessor.java:949078-955931
