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/11/19 22:30:47 UTC
svn commit: r1204079 - in /incubator/wookie/trunk: etc/ddl-schema/
modules/jcr/src/org/apache/wookie/beans/jcr/
modules/jcr/src/org/apache/wookie/beans/jcr/impl/
scripts/migration/0.9.1-to-0.9.2/
src-tests/org/apache/wookie/tests/flatpack/ src/META-INF...
Author: scottbw
Date: Sat Nov 19 21:30:46 2011
New Revision: 1204079
URL: http://svn.apache.org/viewvc?rev=1204079&view=rev
Log:
Removed Token and updated schema and migration scripts. Token was only a placeholder for planned oAuth support, and was replaced by the actual oAuthToken implementation in WOOKIE-100.
Removed:
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/TokenImpl.java
incubator/wookie/trunk/src/org/apache/wookie/beans/IToken.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/TokenImpl.java
Modified:
incubator/wookie/trunk/etc/ddl-schema/wookie-schema.xml
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/JCRPersistenceManager.java
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/WidgetInstanceImpl.java
incubator/wookie/trunk/scripts/migration/0.9.1-to-0.9.2/mysql.sql
incubator/wookie/trunk/src-tests/org/apache/wookie/tests/flatpack/WidgetInstanceMock.java
incubator/wookie/trunk/src/META-INF/persistence.xml
incubator/wookie/trunk/src/org/apache/wookie/beans/IWidgetInstance.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/JPAPersistenceManager.java
incubator/wookie/trunk/src/org/apache/wookie/beans/jpa/impl/WidgetInstanceImpl.java
Modified: incubator/wookie/trunk/etc/ddl-schema/wookie-schema.xml
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/etc/ddl-schema/wookie-schema.xml?rev=1204079&r1=1204078&r2=1204079&view=diff
==============================================================================
--- incubator/wookie/trunk/etc/ddl-schema/wookie-schema.xml (original)
+++ incubator/wookie/trunk/etc/ddl-schema/wookie-schema.xml Sat Nov 19 21:30:46 2011
@@ -288,24 +288,6 @@
</index>
</table>
- <table name="Token">
- <column name="id" primaryKey="true" required="true" type="INTEGER"/>
- <column name="jpa_version" type="INTEGER"/>
- <column name="requestUrl" required="true" size="255" type="VARCHAR"/>
- <column name="accessUrl" required="true" size="255" type="VARCHAR"/>
- <column name="authzUrl" required="true" size="255" type="VARCHAR"/>
- <column name="requestToken" required="true" size="255" type="VARCHAR"/>
- <column name="accessToken" required="true" size="255" type="VARCHAR"/>
- <column name="tokenSecret" required="true" size="255" type="VARCHAR"/>
- <column name="widget_instance_id" type="INTEGER"/>
- <foreign-key foreignTable="WidgetInstance" name="FKToken1">
- <reference foreign="id" local="widget_instance_id"/>
- </foreign-key>
- <index name="IXToken1">
- <index-column name="widget_instance_id"/>
- </index>
- </table>
-
<table name="OAuthToken">
<column name="id" primaryKey="true" required="true" type="INTEGER"/>
<column name="jpa_version" type="INTEGER"/>
Modified: incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/JCRPersistenceManager.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/JCRPersistenceManager.java?rev=1204079&r1=1204078&r2=1204079&view=diff
==============================================================================
--- incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/JCRPersistenceManager.java (original)
+++ incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/JCRPersistenceManager.java Sat Nov 19 21:30:46 2011
@@ -63,7 +63,6 @@ import org.apache.wookie.beans.IPreferen
import org.apache.wookie.beans.IPreferenceDefault;
import org.apache.wookie.beans.ISharedData;
import org.apache.wookie.beans.IStartFile;
-import org.apache.wookie.beans.IToken;
import org.apache.wookie.beans.IWidget;
import org.apache.wookie.beans.IWidgetDefault;
import org.apache.wookie.beans.IWidgetIcon;
@@ -81,7 +80,6 @@ import org.apache.wookie.beans.jcr.impl.
import org.apache.wookie.beans.jcr.impl.PreferenceImpl;
import org.apache.wookie.beans.jcr.impl.SharedDataImpl;
import org.apache.wookie.beans.jcr.impl.StartFileImpl;
-import org.apache.wookie.beans.jcr.impl.TokenImpl;
import org.apache.wookie.beans.jcr.impl.WidgetDefaultImpl;
import org.apache.wookie.beans.jcr.impl.WidgetIconImpl;
import org.apache.wookie.beans.jcr.impl.WidgetImpl;
@@ -128,7 +126,6 @@ public class JCRPersistenceManager imple
INTERFACE_TO_CLASS_MAP.put(IPreferenceDefault.class, PreferenceDefaultImpl.class);
INTERFACE_TO_CLASS_MAP.put(ISharedData.class, SharedDataImpl.class);
INTERFACE_TO_CLASS_MAP.put(IStartFile.class, StartFileImpl.class);
- INTERFACE_TO_CLASS_MAP.put(IToken.class, TokenImpl.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);
Modified: incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/WidgetInstanceImpl.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/WidgetInstanceImpl.java?rev=1204079&r1=1204078&r2=1204079&view=diff
==============================================================================
--- incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/WidgetInstanceImpl.java (original)
+++ incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/WidgetInstanceImpl.java Sat Nov 19 21:30:46 2011
@@ -23,7 +23,6 @@ import org.apache.jackrabbit.ocm.mapper.
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
import org.apache.wookie.beans.IPreference;
-import org.apache.wookie.beans.IToken;
import org.apache.wookie.beans.IWidget;
import org.apache.wookie.beans.IWidgetInstance;
import org.apache.wookie.beans.jcr.IPathBean;
@@ -85,9 +84,6 @@ public class WidgetInstanceImpl implemen
@org.apache.jackrabbit.ocm.mapper.impl.annotation.Collection(jcrName="wookie:preferences", elementClassName=PreferenceImpl.class)
private Collection<PreferenceImpl> preferenceImpls;
- @org.apache.jackrabbit.ocm.mapper.impl.annotation.Collection(jcrName="wookie:tokens", elementClassName=TokenImpl.class)
- private Collection<TokenImpl> tokenImpls;
-
/* (non-Javadoc)
* @see org.apache.wookie.beans.IWidgetInstance#getApiKey()
*/
@@ -280,53 +276,6 @@ public class WidgetInstanceImpl implemen
}
/* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidgetInstance#getTokens()
- */
- public Collection<IToken> getTokens()
- {
- if (tokenImpls == null)
- {
- tokenImpls = new ArrayList<TokenImpl>();
- }
- return new IdCollection<TokenImpl,IToken>(tokenImpls);
- }
-
- /* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidgetInstance#setTokens(java.util.Collection)
- */
- public void setTokens(Collection<IToken> tokens)
- {
- getTokens().clear();
- if (tokens != null)
- {
- for (IToken token : tokens)
- {
- getTokens().add((TokenImpl)token);
- }
- }
- }
-
- /**
- * Get token implementations collection.
- *
- * @return token implementations collection
- */
- public Collection<TokenImpl> getTokenImpls()
- {
- return tokenImpls;
- }
-
- /**
- * Set token implementations collection.
- *
- * @param tokenImpls token implementations collection
- */
- public void setTokenImpls(Collection<TokenImpl> tokenImpls)
- {
- this.tokenImpls = tokenImpls;
- }
-
- /* (non-Javadoc)
* @see org.apache.wookie.beans.IWidgetInstance#getUserId()
*/
public String getUserId()
Modified: incubator/wookie/trunk/scripts/migration/0.9.1-to-0.9.2/mysql.sql
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/scripts/migration/0.9.1-to-0.9.2/mysql.sql?rev=1204079&r1=1204078&r2=1204079&view=diff
==============================================================================
--- incubator/wookie/trunk/scripts/migration/0.9.1-to-0.9.2/mysql.sql (original)
+++ incubator/wookie/trunk/scripts/migration/0.9.1-to-0.9.2/mysql.sql Sat Nov 19 21:30:46 2011
@@ -42,9 +42,18 @@ CREATE INDEX IXOAuthToken1 ON OAuthToken
ALTER TABLE OAuthToken ADD CONSTRAINT FKOAuthToken1 FOREIGN KEY (widget_instance_id) REFERENCES WidgetInstance (id);
+
+
+# -----------------------------------------------------------------------
+# Token replaced by oAuth Token table above
+#
+# -----------------------------------------------------------------------
+DROP TABLE IF EXISTS Token;
+
# -----------------------------------------------------------------------
# Access Request and WhiteList are now managed using a properties file
#
# -----------------------------------------------------------------------
DROP TABLE IF EXISTS AccessRequest;
-DROP TABLE IF EXISTS whitelist;
\ No newline at end of file
+DROP TABLE IF EXISTS whitelist;
+
Modified: incubator/wookie/trunk/src-tests/org/apache/wookie/tests/flatpack/WidgetInstanceMock.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/src-tests/org/apache/wookie/tests/flatpack/WidgetInstanceMock.java?rev=1204079&r1=1204078&r2=1204079&view=diff
==============================================================================
--- incubator/wookie/trunk/src-tests/org/apache/wookie/tests/flatpack/WidgetInstanceMock.java (original)
+++ incubator/wookie/trunk/src-tests/org/apache/wookie/tests/flatpack/WidgetInstanceMock.java Sat Nov 19 21:30:46 2011
@@ -18,7 +18,6 @@ import java.util.Collection;
import org.apache.wookie.beans.IPreference;
import org.apache.wookie.beans.ISharedData;
-import org.apache.wookie.beans.IToken;
import org.apache.wookie.beans.IWidget;
import org.apache.wookie.beans.IWidgetInstance;
@@ -233,19 +232,6 @@ public class WidgetInstanceMock implemen
}
/* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidgetInstance#getTokens()
- */
- public Collection<IToken> getTokens() {
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidgetInstance#setTokens(java.util.Collection)
- */
- public void setTokens(Collection<IToken> tokens) {
- }
-
- /* (non-Javadoc)
* @see org.apache.wookie.beans.IWidgetInstance#getSharedData()
*/
public ISharedData[] getSharedData() {
Modified: incubator/wookie/trunk/src/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/src/META-INF/persistence.xml?rev=1204079&r1=1204078&r2=1204079&view=diff
==============================================================================
--- incubator/wookie/trunk/src/META-INF/persistence.xml (original)
+++ incubator/wookie/trunk/src/META-INF/persistence.xml Sat Nov 19 21:30:46 2011
@@ -33,7 +33,6 @@
<class>org.apache.wookie.beans.jpa.impl.PreferenceImpl</class>
<class>org.apache.wookie.beans.jpa.impl.SharedDataImpl</class>
<class>org.apache.wookie.beans.jpa.impl.StartFileImpl</class>
- <class>org.apache.wookie.beans.jpa.impl.TokenImpl</class>
<class>org.apache.wookie.beans.jpa.impl.WidgetDefaultImpl</class>
<class>org.apache.wookie.beans.jpa.impl.WidgetIconImpl</class>
<class>org.apache.wookie.beans.jpa.impl.WidgetImpl</class>
Modified: incubator/wookie/trunk/src/org/apache/wookie/beans/IWidgetInstance.java
URL: http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/beans/IWidgetInstance.java?rev=1204079&r1=1204078&r2=1204079&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/beans/IWidgetInstance.java (original)
+++ incubator/wookie/trunk/src/org/apache/wookie/beans/IWidgetInstance.java Sat Nov 19 21:30:46 2011
@@ -201,20 +201,6 @@ public interface IWidgetInstance extends
* @param preferences preferences collection
*/
void setPreferences(Collection<IPreference> preferences);
-
- /**
- * Get collection of widget instance tokens.
- *
- * @return tokens collection
- */
- Collection<IToken> getTokens();
-
- /**
- * Set collection of widget instance tokens.
- *
- * @param tokens tokens collection
- */
- void setTokens(Collection<IToken> tokens);
/**
* Get preference with specified key for widget instance.
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=1204079&r1=1204078&r2=1204079&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 Sat Nov 19 21:30:46 2011
@@ -61,7 +61,6 @@ import org.apache.wookie.beans.IPreferen
import org.apache.wookie.beans.IPreferenceDefault;
import org.apache.wookie.beans.ISharedData;
import org.apache.wookie.beans.IStartFile;
-import org.apache.wookie.beans.IToken;
import org.apache.wookie.beans.IWidget;
import org.apache.wookie.beans.IWidgetDefault;
import org.apache.wookie.beans.IWidgetIcon;
@@ -81,7 +80,6 @@ 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.TokenImpl;
import org.apache.wookie.beans.jpa.impl.WidgetDefaultImpl;
import org.apache.wookie.beans.jpa.impl.WidgetIconImpl;
import org.apache.wookie.beans.jpa.impl.WidgetImpl;
@@ -128,7 +126,6 @@ public class JPAPersistenceManager imple
INTERFACE_TO_CLASS_MAP.put(IPreferenceDefault.class, PreferenceDefaultImpl.class);
INTERFACE_TO_CLASS_MAP.put(ISharedData.class, SharedDataImpl.class);
INTERFACE_TO_CLASS_MAP.put(IStartFile.class, StartFileImpl.class);
- INTERFACE_TO_CLASS_MAP.put(IToken.class, TokenImpl.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);
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=1204079&r1=1204078&r2=1204079&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 Sat Nov 19 21:30:46 2011
@@ -38,7 +38,6 @@ import org.apache.openjpa.persistence.Ex
import org.apache.openjpa.persistence.Type;
import org.apache.wookie.beans.IPreference;
-import org.apache.wookie.beans.IToken;
import org.apache.wookie.beans.IWidget;
import org.apache.wookie.beans.IWidgetInstance;
import org.apache.wookie.beans.jpa.InverseRelationshipCollection;
@@ -126,10 +125,6 @@ public class WidgetInstanceImpl implemen
@ElementDependent
private Collection<PreferenceImpl> preferences;
- @OneToMany(mappedBy="widgetInstance", fetch=FetchType.LAZY, cascade=CascadeType.ALL)
- @ElementDependent
- private Collection<TokenImpl> tokens;
-
/* (non-Javadoc)
* @see org.apache.wookie.beans.IWidgetInstance#getApiKey()
*/
@@ -262,33 +257,6 @@ public class WidgetInstanceImpl implemen
}
/* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidgetInstance#getTokens()
- */
- public Collection<IToken> getTokens()
- {
- if (tokens == null)
- {
- tokens = new ArrayList<TokenImpl>();
- }
- return new InverseRelationshipCollection<WidgetInstanceImpl,TokenImpl,IToken>(this, tokens);
- }
-
- /* (non-Javadoc)
- * @see org.apache.wookie.beans.IWidgetInstance#setTokens(java.util.Collection)
- */
- public void setTokens(Collection<IToken> tokens)
- {
- getTokens().clear();
- if (tokens != null)
- {
- for (IToken token : tokens)
- {
- getTokens().add((TokenImpl)token);
- }
- }
- }
-
- /* (non-Javadoc)
* @see org.apache.wookie.beans.IWidgetInstance#getUserId()
*/
public String getUserId()