Author: scottbw
Date: Mon Feb 20 16:17:17 2012
New Revision: 1291342
URL: http://svn.apache.org/viewvc?rev=1291342&view=rev
Log:
Removed references to service types (see WOOKIE-263)
Removed:
incubator/wookie/trunk/src/org/apache/wookie/exceptions/WidgetTypeNotSupportedException.java
Modified:
incubator/wookie/trunk/src/org/apache/wookie/WidgetAdminServlet.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetInstanceImpl.java
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=1291342&r1=1291341&r2=1291342&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/WidgetAdminServlet.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/WidgetAdminServlet.java Mon
Feb 20 16:17:17 2012
@@ -65,12 +65,6 @@ public class WidgetAdminServlet extends
REGISTERGADGET,
// APIKey operations
LISTAPIKEYS, REVOKEAPIKEY,
- // Service operations - to be deprecated
- ADDNEWSERVICE, LISTSERVICES, REMOVESERVICE,
LISTSERVICESFORADDITION,
- // Widget Type operations - to be deprecated
- REMOVESINGLEWIDGETTYPE, REVISETYPES, SETWIDGETTYPES,
- // Widget Default operations - to be deprecated
- SETDEFAULTWIDGET
}
// Get the logger
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=1291342&r1=1291341&r2=1291342&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 16:17:17 2012
@@ -53,9 +53,7 @@ import org.apache.wookie.beans.util.Pers
*/
@Entity(name="Widget")
@Table(name="Widget")
-@NamedQueries({@NamedQuery(name="WIDGET", query="SELECT w FROM Widget w WHERE
w.guid = :guid"),
- @NamedQuery(name="DEFAULT_WIDGET", query="SELECT w FROM
WidgetDefault wd JOIN wd.widget w WHERE wd.widgetContext = :widgetContext"),
- @NamedQuery(name="WIDGETS", query="SELECT w FROM Widget w JOIN
w.widgetTypes wt WHERE wt.widgetContext = :widgetContext")})
+@NamedQueries({@NamedQuery(name="WIDGET", query="SELECT w FROM Widget w WHERE
w.guid = :guid")})
public class WidgetImpl extends LocalizedBeanImpl implements IWidget
{
@Id
Modified:
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetInstanceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetInstanceImpl.java?rev=1291342&r1=1291341&r2=1291342&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetInstanceImpl.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetInstanceImpl.java
Mon Feb 20 16:17:17 2012
@@ -50,8 +50,7 @@ import org.apache.wookie.beans.jpa.Inver
*/
@Entity(name="WidgetInstance")
@Table(name="WidgetInstance")
-@NamedQueries({@NamedQuery(name="WIDGET_INSTANCE", query="SELECT wi FROM
WidgetInstance wi JOIN wi.widget w JOIN w.widgetTypes wt WHERE wi.apiKey =
:apiKey AND wi.userId = :userId AND wi.sharedDataKey = :sharedDataKey AND
wt.widgetContext = :widgetContext"),
- @NamedQuery(name="WIDGET_INSTANCE_GUID", query="SELECT wi FROM
WidgetInstance wi JOIN wi.widget w WHERE wi.apiKey = :apiKey AND wi.userId =
:userId AND wi.sharedDataKey = :sharedDataKey AND w.guid = :guid"),
+@NamedQueries({@NamedQuery(name="WIDGET_INSTANCE_GUID", query="SELECT wi FROM
WidgetInstance wi JOIN wi.widget w WHERE wi.apiKey = :apiKey AND wi.userId =
:userId AND wi.sharedDataKey = :sharedDataKey AND w.guid = :guid"),
@NamedQuery(name="WIDGET_INSTANCE_ID", query="SELECT wi FROM
WidgetInstance wi WHERE wi.idKey = :idKey")})
public class WidgetInstanceImpl implements IWidgetInstance
{
