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 2011/04/15 15:40:52 UTC
svn commit: r1092703 - in
/incubator/wookie/trunk/src/org/apache/wookie/beans: IWidget.java
jcr/JCRPersistenceManager.java jcr/wookie-schema.cnd
jpa/JPAPersistenceManager.java
Author: scottbw
Date: Fri Apr 15 13:40:51 2011
New Revision: 1092703
URL: http://svn.apache.org/viewvc?rev=1092703&view=rev
Log:
Fixed named queries and JCR configuration (now passes JCR tests fine) and removed unnecessary imports
Modified:
incubator/wookie/trunk/src/org/apache/wookie/beans/IWidget.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/JCRPersistenceManager.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/wookie-schema.cnd
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/JPAPersistenceManager.java
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=1092703&r1=1092702&r2=1092703&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/beans/IWidget.java (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/beans/IWidget.java Fri Apr 15 13:40:51 2011
@@ -14,9 +14,7 @@
package org.apache.wookie.beans;
-import java.util.ArrayList;
import java.util.Collection;
-import java.util.List;
import org.apache.wookie.util.WidgetFormattingUtils;
import org.apache.wookie.w3c.IW3CXMLConfiguration;
Modified: incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/JCRPersistenceManager.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/JCRPersistenceManager.java?rev=1092703&r1=1092702&r2=1092703&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/JCRPersistenceManager.java (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/JCRPersistenceManager.java Fri Apr 15 13:40:51 2011
@@ -838,7 +838,6 @@ public class JCRPersistenceManager imple
{
Map<String, Object> values = new HashMap<String, Object>();
values.put("sharedDataKey", widgetInstance.getSharedDataKey());
- values.put("widget", widgetInstance.getWidget());
return findByValues(IParticipant.class, values);
}
catch (Exception e)
@@ -867,7 +866,6 @@ public class JCRPersistenceManager imple
{
Map<String, Object> values = new HashMap<String, Object>();
values.put("sharedDataKey", widgetInstance.getSharedDataKey());
- values.put("widget", widgetInstance.getWidget());
values.put("participantId", widgetInstance.getUserId());
IParticipant [] participantViewer = findByValues(IParticipant.class, values);
if (participantViewer.length == 1)
Modified: incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/wookie-schema.cnd
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/wookie-schema.cnd?rev=1092703&r1=1092702&r2=1092703&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/wookie-schema.cnd (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/beans/jcr/wookie-schema.cnd Fri Apr 15 13:40:51 2011
@@ -114,7 +114,6 @@
- wookie:participantDisplayName (string) mandatory
- wookie:participantThumbnailUrl (string)
- wookie:sharedDataKey (string) mandatory
-- wookie:widget (reference) mandatory
[wookie:preference] > nt:base
- wookie:elementId (long)
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=1092703&r1=1092702&r2=1092703&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 Fri Apr 15 13:40:51 2011
@@ -685,7 +685,6 @@ public class JPAPersistenceManager imple
try
{
String sharedDataKey = widgetInstance.getSharedDataKey();
- IWidget widget = widgetInstance.getWidget();
Query query = entityManager.createNamedQuery("PARTICIPANTS");
query.setParameter("sharedDataKey", sharedDataKey);
List<IParticipant> participantsList = query.getResultList();
@@ -719,7 +718,6 @@ public class JPAPersistenceManager imple
try
{
String sharedDataKey = widgetInstance.getSharedDataKey();
- IWidget widget = widgetInstance.getWidget();
String userId = widgetInstance.getUserId();
Query query = entityManager.createNamedQuery("PARTICIPANT_VIEWER");
query.setParameter("sharedDataKey", sharedDataKey);