Author: scottbw
Date: Thu Jun 14 14:51:58 2012
New Revision: 1350276
URL: http://svn.apache.org/viewvc?rev=1350276&view=rev
Log:
Updated JCR module to use updated APIs
Removed:
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/IInverseRelationship.java
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/InverseRelationshipCollection.java
Modified:
incubator/wookie/trunk/modules/jcr/ivy.xml
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/IdCollection.java
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/AuthorImpl.java
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/DescriptionImpl.java
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/FeatureImpl.java
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/LicenseImpl.java
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/LocalizedBeanImpl.java
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/NameImpl.java
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/ParamImpl.java
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/ParticipantImpl.java
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/PreferenceDefaultImpl.java
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/StartFileImpl.java
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/WidgetIconImpl.java
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/WidgetImpl.java
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/WidgetInstanceImpl.java
Modified: incubator/wookie/trunk/modules/jcr/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/modules/jcr/ivy.xml?rev=1350276&r1=1350275&r2=1350276&view=diff
==============================================================================
--- incubator/wookie/trunk/modules/jcr/ivy.xml (original)
+++ incubator/wookie/trunk/modules/jcr/ivy.xml Thu Jun 14 14:51:58 2012
@@ -24,9 +24,10 @@
</configurations>
<dependencies>
- <dependency org="org.apache.wookie" name="wookie"
rev="latest.integration" conf="deploy->default">
+ <dependency org="org.apache.wookie" name="wookie"
rev="0.11.0-incubating-SNAPSHOT" conf="deploy->default">
+ <artifact name="wookie" type="war" ext="war" conf="deploy->default"/>
</dependency>
- <dependency org="org.apache.wookie" name="wookie-parser"
rev="latest.integration" conf="deploy->default">
+ <dependency org="org.apache.wookie" name="wookie-parser"
rev="0.11.0-incubating-SNAPSHOT" conf="deploy->default">
</dependency>
<dependency org="commons-pool" name="commons-pool" rev="1.3"
conf="deploy->default">
</dependency>
Modified:
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/IdCollection.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/IdCollection.java?rev=1350276&r1=1350275&r2=1350276&view=diff
==============================================================================
---
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/IdCollection.java
(original)
+++
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/IdCollection.java
Thu Jun 14 14:51:58 2012
@@ -14,9 +14,9 @@
package org.apache.wookie.beans.jcr;
-import java.util.AbstractCollection;
-import java.util.Collection;
+import java.util.AbstractList;
import java.util.Iterator;
+import java.util.List;
/**
* IdCollection - collection that manages collection element ids.
@@ -24,21 +24,15 @@ import java.util.Iterator;
* @author <a href="mailto:[email protected]";>Randy Watler</a>
* @version $Id$
*/
-public class IdCollection<I extends IIdElement,M> extends AbstractCollection<M>
+public class IdCollection<I extends IIdElement,M> extends AbstractList<M>
implements List<M>
{
- private Collection<I> managedCollection;
+ private List<I> managedCollection;
- /**
- * Construct managing collection.
- *
- * @param managedCollection managed collection
- */
- public IdCollection(Collection<I> managedCollection)
- {
- this.managedCollection = managedCollection;
+ public IdCollection(List<I> managedList){
+ this.managedCollection = managedList;
}
- /* (non-Javadoc)
+ /* (non-Javadoc)
* @see java.util.AbstractCollection#add(java.lang.Object)
*/
@SuppressWarnings("unchecked")
@@ -118,5 +112,14 @@ public class IdCollection<I extends IIdE
public int size()
{
return managedCollection.size();
- }
+ }
+
+ /* (non-Javadoc)
+ * @see java.util.AbstractList#get(int)
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public M get(int arg0) {
+ return (M) managedCollection.get(arg0);
+ }
}
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=1350276&r1=1350275&r2=1350276&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
Thu Jun 14 14:51:58 2012
@@ -51,19 +51,18 @@ import org.apache.jackrabbit.ocm.query.F
import org.apache.jackrabbit.ocm.query.Query;
import org.apache.jackrabbit.ocm.query.QueryManager;
import org.apache.wookie.beans.IBean;
-import org.apache.wookie.beans.IDescription;
-import org.apache.wookie.beans.IFeature;
-import org.apache.wookie.beans.ILicense;
-import org.apache.wookie.beans.IName;
+import org.apache.wookie.w3c.IDescription;
+import org.apache.wookie.w3c.IFeature;
+import org.apache.wookie.w3c.ILicense;
+import org.apache.wookie.w3c.IName;
import org.apache.wookie.beans.IOAuthToken;
-import org.apache.wookie.beans.IParam;
+import org.apache.wookie.w3c.IParam;
import org.apache.wookie.beans.IParticipant;
import org.apache.wookie.beans.IPreference;
-import org.apache.wookie.beans.IPreferenceDefault;
import org.apache.wookie.beans.ISharedData;
-import org.apache.wookie.beans.IStartFile;
+import org.apache.wookie.w3c.IContent;
import org.apache.wookie.beans.IWidget;
-import org.apache.wookie.beans.IWidgetIcon;
+import org.apache.wookie.w3c.IIcon;
import org.apache.wookie.beans.IWidgetInstance;
import org.apache.wookie.beans.jcr.impl.DescriptionImpl;
import org.apache.wookie.beans.jcr.impl.FeatureImpl;
@@ -114,11 +113,11 @@ public class JCRPersistenceManager imple
INTERFACE_TO_CLASS_MAP.put(IParam.class, ParamImpl.class);
INTERFACE_TO_CLASS_MAP.put(IParticipant.class, ParticipantImpl.class);
INTERFACE_TO_CLASS_MAP.put(IPreference.class, PreferenceImpl.class);
- INTERFACE_TO_CLASS_MAP.put(IPreferenceDefault.class,
PreferenceDefaultImpl.class);
+ INTERFACE_TO_CLASS_MAP.put(org.apache.wookie.w3c.IPreference.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(IContent.class, StartFileImpl.class);
INTERFACE_TO_CLASS_MAP.put(IWidget.class, WidgetImpl.class);
- INTERFACE_TO_CLASS_MAP.put(IWidgetIcon.class, WidgetIconImpl.class);
+ INTERFACE_TO_CLASS_MAP.put(IIcon.class, WidgetIconImpl.class);
INTERFACE_TO_CLASS_MAP.put(IWidgetInstance.class,
WidgetInstanceImpl.class);
BEAN_INTERFACE_TO_CLASS_MAP.put(IParticipant.class,
ParticipantImpl.class);
Modified:
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/AuthorImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/AuthorImpl.java?rev=1350276&r1=1350275&r2=1350276&view=diff
==============================================================================
---
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/AuthorImpl.java
(original)
+++
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/AuthorImpl.java
Thu Jun 14 14:51:58 2012
@@ -15,9 +15,8 @@ package org.apache.wookie.beans.jcr.impl
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-import org.apache.wookie.beans.IAuthor;
+import org.apache.wookie.w3c.IAuthor;
import org.apache.wookie.beans.jcr.IIdElement;
-import org.apache.wookie.w3c.ILocalizedElement;
/**
* JCR Implementation of Author bean
@@ -56,7 +55,7 @@ public class AuthorImpl extends Localiz
/* (non-Javadoc)
* @see org.apache.wookie.beans.IAuthor#getAuthor()
*/
- public String getAuthor() {
+ public String getAuthorName() {
return this.author;
}
@@ -77,7 +76,7 @@ public class AuthorImpl extends Localiz
/* (non-Javadoc)
* @see org.apache.wookie.beans.IAuthor#setAuthor(java.lang.String)
*/
- public void setAuthor(String author) {
+ public void setAuthorName(String author) {
this.author = author;
}
Modified:
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/DescriptionImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/DescriptionImpl.java?rev=1350276&r1=1350275&r2=1350276&view=diff
==============================================================================
---
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/DescriptionImpl.java
(original)
+++
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/DescriptionImpl.java
Thu Jun 14 14:51:58 2012
@@ -17,7 +17,7 @@ package org.apache.wookie.beans.jcr.impl
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-import org.apache.wookie.beans.IDescription;
+import org.apache.wookie.w3c.IDescription;
import org.apache.wookie.beans.jcr.IIdElement;
/**
@@ -38,7 +38,7 @@ public class DescriptionImpl extends Loc
/* (non-Javadoc)
* @see org.apache.wookie.beans.IDescription#getContent()
*/
- public String getContent()
+ public String getDescription()
{
return content;
}
@@ -46,7 +46,7 @@ public class DescriptionImpl extends Loc
/* (non-Javadoc)
* @see org.apache.wookie.beans.IDescription#setContent(java.lang.String)
*/
- public void setContent(String text)
+ public void setDescription(String text)
{
this.content = text;
}
Modified:
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/FeatureImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/FeatureImpl.java?rev=1350276&r1=1350275&r2=1350276&view=diff
==============================================================================
---
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/FeatureImpl.java
(original)
+++
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/FeatureImpl.java
Thu Jun 14 14:51:58 2012
@@ -16,12 +16,13 @@ package org.apache.wookie.beans.jcr.impl
import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-import org.apache.wookie.beans.IFeature;
-import org.apache.wookie.beans.IParam;
+import org.apache.wookie.w3c.IFeature;
+import org.apache.wookie.w3c.IParam;
import org.apache.wookie.beans.jcr.IIdElement;
import org.apache.wookie.beans.jcr.IdCollection;
@@ -44,7 +45,7 @@ public class FeatureImpl implements IFea
private Boolean required;
@org.apache.jackrabbit.ocm.mapper.impl.annotation.Collection(jcrName="wookie:parameters",
elementClassName=ParamImpl.class)
- private Collection<ParamImpl> parameterImpls;
+ private List<ParamImpl> parameterImpls;
/* (non-Javadoc)
* @see org.apache.wookie.beans.jcr.IIdElement#getElementId()
@@ -65,7 +66,7 @@ public class FeatureImpl implements IFea
/* (non-Javadoc)
* @see org.apache.wookie.beans.IFeature#getFeatureName()
*/
- public String getFeatureName()
+ public String getName()
{
return featureName;
}
@@ -73,7 +74,7 @@ public class FeatureImpl implements IFea
/* (non-Javadoc)
* @see org.apache.wookie.beans.IFeature#setFeatureName(java.lang.String)
*/
- public void setFeatureName(String featureName)
+ public void setName(String featureName)
{
this.featureName = featureName;
}
@@ -81,7 +82,7 @@ public class FeatureImpl implements IFea
/* (non-Javadoc)
* @see org.apache.wookie.beans.IFeature#getParameters()
*/
- public Collection<IParam> getParameters()
+ public List<IParam> getParameters()
{
if (parameterImpls == null)
{
@@ -93,14 +94,14 @@ public class FeatureImpl implements IFea
/* (non-Javadoc)
* @see
org.apache.wookie.beans.IFeature#setParameters(java.util.Collection)
*/
- public void setParameters(Collection<IParam> parameters)
+ public void setParameters(List<IParam> parameters)
{
getParameters().clear();
if (parameters != null)
{
for (IParam parameter : parameters)
{
- getParameters().add((ParamImpl)parameter);
+ getParameters().add(parameter);
}
}
}
@@ -120,7 +121,7 @@ public class FeatureImpl implements IFea
*
* @param parameterImpls parameter implementations collection
*/
- public void setParameterImpls(Collection<ParamImpl> parameterImpls)
+ public void setParameterImpls(List<ParamImpl> parameterImpls)
{
this.parameterImpls = parameterImpls;
}
Modified:
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/LicenseImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/LicenseImpl.java?rev=1350276&r1=1350275&r2=1350276&view=diff
==============================================================================
---
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/LicenseImpl.java
(original)
+++
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/LicenseImpl.java
Thu Jun 14 14:51:58 2012
@@ -16,7 +16,7 @@ package org.apache.wookie.beans.jcr.impl
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-import org.apache.wookie.beans.ILicense;
+import org.apache.wookie.w3c.ILicense;
import org.apache.wookie.beans.jcr.IIdElement;
/**
@@ -72,7 +72,7 @@ public class LicenseImpl extends Localiz
/* (non-Javadoc)
* @see org.apache.wookie.beans.ILicense#getText()
*/
- public String getText()
+ public String getLicenseText()
{
return text;
}
@@ -80,7 +80,7 @@ public class LicenseImpl extends Localiz
/* (non-Javadoc)
* @see org.apache.wookie.beans.ILicense#setText(java.lang.String)
*/
- public void setText(String text)
+ public void setLicenseText(String text)
{
this.text = text;
}
Modified:
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/LocalizedBeanImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/LocalizedBeanImpl.java?rev=1350276&r1=1350275&r2=1350276&view=diff
==============================================================================
---
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/LocalizedBeanImpl.java
(original)
+++
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/LocalizedBeanImpl.java
Thu Jun 14 14:51:58 2012
@@ -17,7 +17,8 @@ package org.apache.wookie.beans.jcr.impl
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-import org.apache.wookie.beans.ILocalizedBean;
+import org.apache.wookie.w3c.IDirectional;
+import org.apache.wookie.w3c.ILocalized;
/**
* LocalizedBeanImpl - JCR OCM ILocalizedBean implementation.
@@ -26,7 +27,7 @@ import org.apache.wookie.beans.ILocalize
* @version $Id$
*/
@Node(isAbstract=true)
-public abstract class LocalizedBeanImpl implements ILocalizedBean
+public abstract class LocalizedBeanImpl implements ILocalized, IDirectional
{
@Field(jcrName="wookie:dir")
private String dir;
@@ -65,4 +66,13 @@ public abstract class LocalizedBeanImpl
{
this.lang = lang;
}
+
+ /* (non-Javadoc)
+ * @see org.apache.wookie.w3c.IDirectional#isValid()
+ */
+ public boolean isValid() {
+ return true;
+ }
+
+
}
Modified:
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/NameImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/NameImpl.java?rev=1350276&r1=1350275&r2=1350276&view=diff
==============================================================================
---
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/NameImpl.java
(original)
+++
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/NameImpl.java
Thu Jun 14 14:51:58 2012
@@ -17,7 +17,7 @@ package org.apache.wookie.beans.jcr.impl
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-import org.apache.wookie.beans.IName;
+import org.apache.wookie.w3c.IName;
import org.apache.wookie.beans.jcr.IIdElement;
/**
@@ -73,7 +73,7 @@ public class NameImpl extends LocalizedB
/* (non-Javadoc)
* @see org.apache.wookie.beans.IName#getShortName()
*/
- public String getShortName()
+ public String getShort()
{
return shortName;
}
@@ -81,7 +81,7 @@ public class NameImpl extends LocalizedB
/* (non-Javadoc)
* @see org.apache.wookie.beans.IName#setShortName(java.lang.String)
*/
- public void setShortName(String shortName)
+ public void setShort(String shortName)
{
this.shortName = shortName;
}
Modified:
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/ParamImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/ParamImpl.java?rev=1350276&r1=1350275&r2=1350276&view=diff
==============================================================================
---
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/ParamImpl.java
(original)
+++
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/ParamImpl.java
Thu Jun 14 14:51:58 2012
@@ -17,7 +17,7 @@ package org.apache.wookie.beans.jcr.impl
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-import org.apache.wookie.beans.IParam;
+import org.apache.wookie.w3c.IParam;
import org.apache.wookie.beans.jcr.IIdElement;
/**
Modified:
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/ParticipantImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/ParticipantImpl.java?rev=1350276&r1=1350275&r2=1350276&view=diff
==============================================================================
---
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/ParticipantImpl.java
(original)
+++
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/ParticipantImpl.java
Thu Jun 14 14:51:58 2012
@@ -44,6 +44,9 @@ public class ParticipantImpl implements
@Field(jcrName="wookie:sharedDataKey")
private String sharedDataKey;
+
+ @Field(jcrName="wookie:role")
+ private String role;
/* (non-Javadoc)
* @see org.apache.wookie.beans.IBean#getId()
@@ -155,6 +158,21 @@ public class ParticipantImpl implements
public void setSharedDataKey(String sharedDataKey)
{
this.sharedDataKey = sharedDataKey;
- }
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.wookie.beans.IParticipant#getRole()
+ */
+ public String getRole() {
+ // TODO Auto-generated method stub
+ return role;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.wookie.beans.IParticipant#setRole(java.lang.String)
+ */
+ public void setRole(String role) {
+ this.role = role;
+ }
}
Modified:
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/PreferenceDefaultImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/PreferenceDefaultImpl.java?rev=1350276&r1=1350275&r2=1350276&view=diff
==============================================================================
---
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/PreferenceDefaultImpl.java
(original)
+++
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/PreferenceDefaultImpl.java
Thu Jun 14 14:51:58 2012
@@ -17,7 +17,7 @@ package org.apache.wookie.beans.jcr.impl
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-import org.apache.wookie.beans.IPreferenceDefault;
+import org.apache.wookie.w3c.IPreference;
import org.apache.wookie.beans.jcr.IIdElement;
/**
@@ -27,7 +27,7 @@ import org.apache.wookie.beans.jcr.IIdEl
* @version $Id$
*/
@Node(jcrType="wookie:preferenceDefault", discriminator=false)
-public class PreferenceDefaultImpl implements IPreferenceDefault, IIdElement
+public class PreferenceDefaultImpl implements IPreference, IIdElement
{
@Field(id=true, jcrName="wookie:elementId")
private long elementId = -1;
@@ -60,7 +60,7 @@ public class PreferenceDefaultImpl imple
/* (non-Javadoc)
* @see org.apache.wookie.beans.IPreferenceDefault#getPreference()
*/
- public String getPreference()
+ public String getName()
{
return preference;
}
@@ -68,7 +68,7 @@ public class PreferenceDefaultImpl imple
/* (non-Javadoc)
* @see
org.apache.wookie.beans.IPreferenceDefault#setPreference(java.lang.String)
*/
- public void setPreference(String preference)
+ public void setName(String preference)
{
this.preference = preference;
}
Modified:
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/StartFileImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/StartFileImpl.java?rev=1350276&r1=1350275&r2=1350276&view=diff
==============================================================================
---
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/StartFileImpl.java
(original)
+++
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/StartFileImpl.java
Thu Jun 14 14:51:58 2012
@@ -17,7 +17,7 @@ package org.apache.wookie.beans.jcr.impl
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-import org.apache.wookie.beans.IStartFile;
+import org.apache.wookie.w3c.IContent;
import org.apache.wookie.beans.jcr.IIdElement;
/**
@@ -27,7 +27,7 @@ import org.apache.wookie.beans.jcr.IIdEl
* @version $Id$
*/
@Node(jcrType="wookie:startFile", discriminator=false)
-public class StartFileImpl implements IStartFile, IIdElement
+public class StartFileImpl extends LocalizedBeanImpl implements IContent,
IIdElement
{
@Field(id=true, jcrName="wookie:elementId")
private long elementId = -1;
@@ -44,7 +44,7 @@ public class StartFileImpl implements IS
/* (non-Javadoc)
* @see org.apache.wookie.beans.IStartFile#getCharset()
*/
- public String getCharset()
+ public String getCharSet()
{
return charset;
}
@@ -52,7 +52,7 @@ public class StartFileImpl implements IS
/* (non-Javadoc)
* @see org.apache.wookie.beans.IStartFile#setCharset(java.lang.String)
*/
- public void setCharset(String charset)
+ public void setCharSet(String charset)
{
this.charset = charset;
}
@@ -92,7 +92,7 @@ public class StartFileImpl implements IS
/* (non-Javadoc)
* @see org.apache.wookie.beans.IStartFile#getUrl()
*/
- public String getUrl()
+ public String getSrc()
{
return url;
}
@@ -100,8 +100,24 @@ public class StartFileImpl implements IS
/* (non-Javadoc)
* @see org.apache.wookie.beans.IStartFile#setUrl(java.lang.String)
*/
- public void setUrl(String url)
+ public void setSrc(String url)
{
this.url = url;
}
+
+ /* (non-Javadoc)
+ * @see org.apache.wookie.w3c.IContent#getType()
+ */
+ public String getType() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.wookie.w3c.IContent#setType(java.lang.String)
+ */
+ public void setType(String type) {
+ // TODO Auto-generated method stub
+
+ }
}
Modified:
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/WidgetIconImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/WidgetIconImpl.java?rev=1350276&r1=1350275&r2=1350276&view=diff
==============================================================================
---
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/WidgetIconImpl.java
(original)
+++
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/WidgetIconImpl.java
Thu Jun 14 14:51:58 2012
@@ -17,7 +17,7 @@ package org.apache.wookie.beans.jcr.impl
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-import org.apache.wookie.beans.IWidgetIcon;
+import org.apache.wookie.w3c.IIcon;
import org.apache.wookie.beans.jcr.IIdElement;
/**
@@ -27,7 +27,7 @@ import org.apache.wookie.beans.jcr.IIdEl
* @version $Id$
*/
@Node(jcrType="wookie:widgetIcon", discriminator=false)
-public class WidgetIconImpl implements IWidgetIcon, IIdElement
+public class WidgetIconImpl implements IIcon, IIdElement
{
@Field(id=true, jcrName="wookie:elementId")
private long elementId = -1;
Modified:
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/WidgetImpl.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/WidgetImpl.java?rev=1350276&r1=1350275&r2=1350276&view=diff
==============================================================================
---
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/WidgetImpl.java
(original)
+++
incubator/wookie/trunk/modules/jcr/src/org/apache/wookie/beans/jcr/impl/WidgetImpl.java
Thu Jun 14 14:51:58 2012
@@ -16,19 +16,21 @@ package org.apache.wookie.beans.jcr.impl
import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Field;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Node;
-import org.apache.wookie.beans.IAuthor;
-import org.apache.wookie.beans.IDescription;
-import org.apache.wookie.beans.IFeature;
-import org.apache.wookie.beans.ILicense;
-import org.apache.wookie.beans.IName;
-import org.apache.wookie.beans.IPreferenceDefault;
-import org.apache.wookie.beans.IStartFile;
+import org.apache.wookie.w3c.IAccess;
+import org.apache.wookie.w3c.IAuthor;
+import org.apache.wookie.w3c.IDescription;
+import org.apache.wookie.w3c.IFeature;
+import org.apache.wookie.w3c.ILicense;
+import org.apache.wookie.w3c.IName;
+import org.apache.wookie.w3c.IPreference;
+import org.apache.wookie.w3c.IContent;
import org.apache.wookie.beans.IWidget;
-import org.apache.wookie.beans.IWidgetIcon;
+import org.apache.wookie.w3c.IIcon;
import org.apache.wookie.beans.jcr.IPathBean;
import org.apache.wookie.beans.jcr.IUuidBean;
import org.apache.wookie.beans.jcr.IdCollection;
@@ -73,28 +75,28 @@ public class WidgetImpl extends Localize
private String version;
@org.apache.jackrabbit.ocm.mapper.impl.annotation.Collection(jcrName="wookie:features",
elementClassName=FeatureImpl.class)
- private Collection<FeatureImpl> featureImpls;
+ private List<FeatureImpl> featureImpls;
@org.apache.jackrabbit.ocm.mapper.impl.annotation.Collection(jcrName="wookie:widgetIcons",
elementClassName=WidgetIconImpl.class)
- private Collection<WidgetIconImpl> widgetIconImpls;
+ private List<WidgetIconImpl> widgetIconImpls;
@org.apache.jackrabbit.ocm.mapper.impl.annotation.Collection(jcrName="wookie:licenses",
elementClassName=LicenseImpl.class)
- private Collection<LicenseImpl> licenseImpls;
+ private List<LicenseImpl> licenseImpls;
@org.apache.jackrabbit.ocm.mapper.impl.annotation.Collection(jcrName="wookie:names",
elementClassName=NameImpl.class)
- private Collection<NameImpl> nameImpls;
+ private List<NameImpl> nameImpls;
@org.apache.jackrabbit.ocm.mapper.impl.annotation.Collection(jcrName="wookie:authors",
elementClassName=NameImpl.class)
- private Collection<AuthorImpl> authorImpls;
+ private List<AuthorImpl> authorImpls;
@org.apache.jackrabbit.ocm.mapper.impl.annotation.Collection(jcrName="wookie:descriptions",
elementClassName=DescriptionImpl.class)
- private Collection<DescriptionImpl> descriptionImpls;
+ private List<DescriptionImpl> descriptionImpls;
@org.apache.jackrabbit.ocm.mapper.impl.annotation.Collection(jcrName="wookie:startFiles",
elementClassName=StartFileImpl.class)
- private Collection<StartFileImpl> startFileImpls;
+ private List<StartFileImpl> startFileImpls;
@org.apache.jackrabbit.ocm.mapper.impl.annotation.Collection(jcrName="wookie:preferenceDefaults",
elementClassName=PreferenceDefaultImpl.class)
- private Collection<PreferenceDefaultImpl> preferenceDefaultImpls;
+ private List<PreferenceDefaultImpl> preferenceDefaultImpls;
/* (non-Javadoc)
* @see org.apache.wookie.beans.IWidget#getPackagePath()
@@ -113,7 +115,7 @@ public class WidgetImpl extends Localize
/* (non-Javadoc)
* @see org.apache.wookie.beans.IWidget#getDescriptions()
*/
- public Collection<IDescription> getDescriptions()
+ public List<IDescription> getDescriptions()
{
if (descriptionImpls == null)
{
@@ -166,7 +168,7 @@ public class WidgetImpl extends Localize
*
* @param descriptionImpls description implementations collection
*/
- public void setDescriptionImpls(Collection<DescriptionImpl>
descriptionImpls)
+ public void setDescriptionImpls(List<DescriptionImpl> descriptionImpls)
{
this.descriptionImpls = descriptionImpls;
}
@@ -174,7 +176,7 @@ public class WidgetImpl extends Localize
/* (non-Javadoc)
* @see org.apache.wookie.beans.IWidget#getFeatures()
*/
- public Collection<IFeature> getFeatures()
+ public List<IFeature> getFeatures()
{
if (featureImpls == null)
{
@@ -213,7 +215,7 @@ public class WidgetImpl extends Localize
*
* @param featureImpls feature implementations collection
*/
- public void setFeatureImpls(Collection<FeatureImpl> featureImpls)
+ public void setFeatureImpls(List<FeatureImpl> featureImpls)
{
this.featureImpls = featureImpls;
}
@@ -221,7 +223,7 @@ public class WidgetImpl extends Localize
/* (non-Javadoc)
* @see org.apache.wookie.beans.IWidget#getGuid()
*/
- public String getGuid()
+ public String getIdentifier()
{
return guid;
}
@@ -229,7 +231,7 @@ public class WidgetImpl extends Localize
/* (non-Javadoc)
* @see org.apache.wookie.beans.IWidget#setGuid(java.lang.String)
*/
- public void setGuid(String guid)
+ public void setIdentifier(String guid)
{
this.guid = guid;
}
@@ -261,7 +263,7 @@ public class WidgetImpl extends Localize
/* (non-Javadoc)
* @see org.apache.wookie.beans.IWidget#getLicenses()
*/
- public Collection<ILicense> getLicenses()
+ public List<ILicense> getLicenses()
{
if (licenseImpls == null)
{
@@ -300,7 +302,7 @@ public class WidgetImpl extends Localize
*
* @param licenseImpls license implementations collection
*/
- public void setLicenseImpls(Collection<LicenseImpl> licenseImpls)
+ public void setLicenseImpls(List<LicenseImpl> licenseImpls)
{
this.licenseImpls = licenseImpls;
}
@@ -308,7 +310,7 @@ public class WidgetImpl extends Localize
/* (non-Javadoc)
* @see org.apache.wookie.beans.IWidget#getNames()
*/
- public Collection<IName> getNames()
+ public List<IName> getNames()
{
if (nameImpls == null)
{
@@ -347,12 +349,12 @@ public class WidgetImpl extends Localize
*
* @param nameImpls name implementations collection
*/
- public void setNameImpls(Collection<NameImpl> nameImpls)
+ public void setNameImpls(List<NameImpl> nameImpls)
{
this.nameImpls = nameImpls;
}
- public Collection<IAuthor> getAuthors()
+ public List<IAuthor> getAuthors()
{
if (authorImpls == null)
{
@@ -408,7 +410,7 @@ public class WidgetImpl extends Localize
/**
* Set author implementations collection.
*/
- public void setAuthorImpls(Collection<AuthorImpl> authorImpls)
+ public void setAuthorImpls(List<AuthorImpl> authorImpls)
{
this.authorImpls = authorImpls;
}
@@ -456,26 +458,26 @@ public class WidgetImpl extends Localize
/* (non-Javadoc)
* @see org.apache.wookie.beans.IWidget#getPreferenceDefaults()
*/
- public Collection<IPreferenceDefault> getPreferenceDefaults()
+ public List<IPreference> getPreferences()
{
if (preferenceDefaultImpls == null)
{
preferenceDefaultImpls = new ArrayList<PreferenceDefaultImpl>();
}
- return new
IdCollection<PreferenceDefaultImpl,IPreferenceDefault>(preferenceDefaultImpls);
+ return new
IdCollection<PreferenceDefaultImpl,IPreference>(preferenceDefaultImpls);
}
/* (non-Javadoc)
* @see
org.apache.wookie.beans.IWidget#setPreferenceDefaults(java.util.Collection)
*/
- public void setPreferenceDefaults(Collection<IPreferenceDefault>
preferenceDefaults)
+ public void setPreferences(Collection<IPreference> preferenceDefaults)
{
- getPreferenceDefaults().clear();
+ getPreferences().clear();
if (preferenceDefaults != null)
{
- for (IPreferenceDefault preferenceDefault : preferenceDefaults)
+ for (IPreference preferenceDefault : preferenceDefaults)
{
-
getPreferenceDefaults().add((PreferenceDefaultImpl)preferenceDefault);
+ getPreferences().add((PreferenceDefaultImpl)preferenceDefault);
}
}
}
@@ -495,7 +497,7 @@ public class WidgetImpl extends Localize
*
* @param preferenceDefaultImpls preference default implementations
collection
*/
- public void setPreferenceDefaultImpls(Collection<PreferenceDefaultImpl>
preferenceDefaultImpls)
+ public void setPreferenceDefaultImpls(List<PreferenceDefaultImpl>
preferenceDefaultImpls)
{
this.preferenceDefaultImpls = preferenceDefaultImpls;
}
@@ -503,26 +505,26 @@ public class WidgetImpl extends Localize
/* (non-Javadoc)
* @see org.apache.wookie.beans.IWidget#getStartFiles()
*/
- public Collection<IStartFile> getStartFiles()
+ public List<IContent> getContentList()
{
if (startFileImpls == null)
{
startFileImpls = new ArrayList<StartFileImpl>();
}
- return new IdCollection<StartFileImpl,IStartFile>(startFileImpls);
+ return new IdCollection<StartFileImpl,IContent>(startFileImpls);
}
/* (non-Javadoc)
* @see org.apache.wookie.beans.IWidget#setStartFiles(java.util.Collection)
*/
- public void setStartFiles(Collection<IStartFile> startFiles)
+ public void setContentList(Collection<IContent> startFiles)
{
- getStartFiles().clear();
+ getContentList().clear();
if (startFiles != null)
{
- for (IStartFile startFile : startFiles)
+ for (IContent startFile : startFiles)
{
- getStartFiles().add((StartFileImpl)startFile);
+ getContentList().add((StartFileImpl)startFile);
}
}
}
@@ -542,7 +544,7 @@ public class WidgetImpl extends Localize
*
* @param startFileImpls start file implementations collection
*/
- public void setStartFileImpls(Collection<StartFileImpl> startFileImpls)
+ public void setStartFileImpls(List<StartFileImpl> startFileImpls)
{
this.startFileImpls = startFileImpls;
}
@@ -583,26 +585,26 @@ public class WidgetImpl extends Localize
/* (non-Javadoc)
* @see org.apache.wookie.beans.IWidget#getWidgetIcons()
*/
- public Collection<IWidgetIcon> getWidgetIcons()
+ public List<IIcon> getIcons()
{
if (widgetIconImpls == null)
{
widgetIconImpls = new ArrayList<WidgetIconImpl>();
}
- return new IdCollection<WidgetIconImpl,IWidgetIcon>(widgetIconImpls);
+ return new IdCollection<WidgetIconImpl,IIcon>(widgetIconImpls);
}
/* (non-Javadoc)
* @see
org.apache.wookie.beans.IWidget#setWidgetIcons(java.util.Collection)
*/
- public void setWidgetIcons(Collection<IWidgetIcon> widgetIcons)
+ public void setIcons(Collection<IIcon> widgetIcons)
{
- getWidgetIcons().clear();
+ getIcons().clear();
if (widgetIcons != null)
{
- for (IWidgetIcon widgetIcon : widgetIcons)
+ for (IIcon widgetIcon : widgetIcons)
{
- getWidgetIcons().add((WidgetIconImpl)widgetIcon);
+ getIcons().add((WidgetIconImpl)widgetIcon);
}
}
}
@@ -622,7 +624,7 @@ public class WidgetImpl extends Localize
*
* @param widgetIconImpls widget icon implementations collection
*/
- public void setWidgetIconImpls(Collection<WidgetIconImpl> widgetIconImpls)
+ public void setWidgetIconImpls(List<WidgetIconImpl> widgetIconImpls)
{
this.widgetIconImpls = widgetIconImpls;
}
@@ -646,7 +648,7 @@ public class WidgetImpl extends Localize
/* (non-Javadoc)
* @see org.apache.wookie.beans.IWidget#getWidgetTitle(java.lang.String)
*/
- public String getWidgetTitle(String locale)
+ public String getLocalName(String locale)
{
return Utilities.getWidgetTitle(this, locale);
}
@@ -658,4 +660,18 @@ public class WidgetImpl extends Localize
public void setDefaultLocale(String locale){
this.defaultLocale = locale;
}
+
+ /* (non-Javadoc)
+ * @see org.apache.wookie.w3c.W3CWidget#getAccessList()
+ */
+ public List<IAccess> getAccessList() {
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.wookie.w3c.W3CWidget#getViewModes()
+ */
+ public String getViewModes() {
+ return null;
+ }
}
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=1350276&r1=1350275&r2=1350276&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
Thu Jun 14 14:51:58 2012
@@ -16,6 +16,7 @@ package org.apache.wookie.beans.jcr.impl
import java.util.ArrayList;
import java.util.Collection;
+import java.util.List;
import
org.apache.jackrabbit.ocm.manager.beanconverter.impl.ReferenceBeanConverterImpl;
import org.apache.jackrabbit.ocm.mapper.impl.annotation.Bean;
@@ -82,7 +83,7 @@ public class WidgetInstanceImpl implemen
private WidgetImpl widgetImpl;
@org.apache.jackrabbit.ocm.mapper.impl.annotation.Collection(jcrName="wookie:preferences",
elementClassName=PreferenceImpl.class)
- private Collection<PreferenceImpl> preferenceImpls;
+ private List<PreferenceImpl> preferenceImpls;
/* (non-Javadoc)
* @see org.apache.wookie.beans.IWidgetInstance#getApiKey()
@@ -155,7 +156,7 @@ public class WidgetInstanceImpl implemen
{
if (path == null)
{
- path =
nodeRootPath+"/"+JCRPersistenceManager.escapeJCRName(userId)+"/"+JCRPersistenceManager.escapeJCRName(apiKey)+"/"+JCRPersistenceManager.escapeJCRName(sharedDataKey)+"/"+JCRPersistenceManager.escapeJCRName(widgetImpl.getGuid());
+ path =
nodeRootPath+"/"+JCRPersistenceManager.escapeJCRName(userId)+"/"+JCRPersistenceManager.escapeJCRName(apiKey)+"/"+JCRPersistenceManager.escapeJCRName(sharedDataKey)+"/"+JCRPersistenceManager.escapeJCRName(widgetImpl.getIdentifier());
}
return path;
}
@@ -254,7 +255,7 @@ public class WidgetInstanceImpl implemen
*
* @param preferenceImpls preference implementations collection
*/
- public void setPreferenceImpls(Collection<PreferenceImpl> preferenceImpls)
+ public void setPreferenceImpls(List<PreferenceImpl> preferenceImpls)
{
this.preferenceImpls = preferenceImpls;
}
