Author: julien_viet
Date: 2010-02-08 12:32:04 -0500 (Mon, 08 Feb 2010)
New Revision: 1560
Added:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/AppFormatter.java
Modified:
portal/trunk/component/application-registry/src/main/java/conf/application-nodetypes.xml
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistry.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/RemoteGadgetData.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java
Log:
- use "app:" prefix for application jcr persistence of names
- actually rename "content" to "application" for application related
stuff (was a wrong good idea from me)
Modified:
portal/trunk/component/application-registry/src/main/java/conf/application-nodetypes.xml
===================================================================
---
portal/trunk/component/application-registry/src/main/java/conf/application-nodetypes.xml 2010-02-08
16:44:23 UTC (rev 1559)
+++
portal/trunk/component/application-registry/src/main/java/conf/application-nodetypes.xml 2010-02-08
17:32:04 UTC (rev 1560)
@@ -41,21 +41,21 @@
<supertype>mix:referenceable</supertype>
</supertypes>
<propertyDefinitions>
- <propertyDefinition name="title" requiredType="String"
autoCreated="false" mandatory="true" onParentVersion="COPY"
protected="false" multiple="false">
+ <propertyDefinition name="app:title" requiredType="String"
autoCreated="false" mandatory="true" onParentVersion="COPY"
protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="description" requiredType="String"
autoCreated="false" mandatory="false" onParentVersion="COPY"
protected="false" multiple="false">
+ <propertyDefinition name="app:description"
requiredType="String" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false"
multiple="false">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="thumbnail" requiredType="String"
autoCreated="false" mandatory="false" onParentVersion="COPY"
protected="false" multiple="false">
+ <propertyDefinition name="app:thumbnail"
requiredType="String" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false"
multiple="false">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="referenceurl"
requiredType="String" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false"
multiple="false">
+ <propertyDefinition name="app:referenceurl"
requiredType="String" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false"
multiple="false">
<valueConstraints/>
</propertyDefinition>
</propertyDefinitions>
<childNodeDefinitions>
- <childNodeDefinition name="data"
defaultPrimaryType="app:gadgetdata" autoCreated="false"
mandatory="true"
+ <childNodeDefinition name="app:data"
defaultPrimaryType="app:gadgetdata" autoCreated="false"
mandatory="true"
onParentVersion="COPY" protected="false"
sameNameSiblings="false">
<requiredPrimaryTypes>
<requiredPrimaryType>app:gadgetdata</requiredPrimaryType>
@@ -76,12 +76,12 @@
<supertype>app:gadgetdata</supertype>
</supertypes>
<propertyDefinitions>
- <propertyDefinition name="filename" requiredType="String"
autoCreated="false" mandatory="true" onParentVersion="COPY"
protected="false" multiple="false">
+ <propertyDefinition name="app:filename"
requiredType="String" autoCreated="false" mandatory="true"
onParentVersion="COPY" protected="false"
multiple="false">
<valueConstraints/>
</propertyDefinition>
</propertyDefinitions>
<childNodeDefinitions>
- <childNodeDefinition name="resources"
defaultPrimaryType="nt:folder" autoCreated="false"
mandatory="true"
+ <childNodeDefinition name="app:resources"
defaultPrimaryType="nt:folder" autoCreated="false"
mandatory="true"
onParentVersion="COPY" protected="false"
sameNameSiblings="false">
<requiredPrimaryTypes>
<requiredPrimaryType>nt:folder</requiredPrimaryType>
@@ -95,78 +95,78 @@
<supertype>app:gadgetdata</supertype>
</supertypes>
<propertyDefinitions>
- <propertyDefinition name="url" requiredType="String"
autoCreated="false" mandatory="true" onParentVersion="COPY"
protected="false" multiple="false">
+ <propertyDefinition name="app:url" requiredType="String"
autoCreated="false" mandatory="true" onParentVersion="COPY"
protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
</propertyDefinitions>
</nodeType>
- <nodeType name="app:contentregistry" isMixin="false"
hasOrderableChildNodes="true" primaryItemName="">
+ <nodeType name="app:applicationregistry" isMixin="false"
hasOrderableChildNodes="true" primaryItemName="">
<supertypes>
<supertype>nt:base</supertype>
<supertype>mix:referenceable</supertype>
</supertypes>
<childNodeDefinitions>
- <childNodeDefinition name="*"
defaultPrimaryType="app:contentcategory" autoCreated="false"
mandatory="false"
+ <childNodeDefinition name="*"
defaultPrimaryType="app:category" autoCreated="false"
mandatory="false"
onParentVersion="COPY" protected="false"
sameNameSiblings="false">
<requiredPrimaryTypes>
- <requiredPrimaryType>app:contentcategory</requiredPrimaryType>
+ <requiredPrimaryType>app:category</requiredPrimaryType>
</requiredPrimaryTypes>
</childNodeDefinition>
</childNodeDefinitions>
</nodeType>
- <nodeType name="app:contentcategory" isMixin="false"
hasOrderableChildNodes="true" primaryItemName="">
+ <nodeType name="app:category" isMixin="false"
hasOrderableChildNodes="true" primaryItemName="">
<supertypes>
<supertype>nt:base</supertype>
<supertype>mix:referenceable</supertype>
</supertypes>
<propertyDefinitions>
- <propertyDefinition name="displayname" requiredType="String"
autoCreated="false" mandatory="false" onParentVersion="COPY"
protected="false" multiple="true">
+ <propertyDefinition name="app:displayname"
requiredType="String" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false"
multiple="true">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="description" requiredType="String"
autoCreated="false" mandatory="false" onParentVersion="COPY"
protected="false" multiple="false">
+ <propertyDefinition name="app:description"
requiredType="String" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false"
multiple="false">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="creationdate" requiredType="Date"
autoCreated="false" mandatory="false" onParentVersion="COPY"
protected="false" multiple="false">
+ <propertyDefinition name="app:creationdate"
requiredType="Date" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false"
multiple="false">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="lastmodificationdate"
requiredType="Date" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false"
multiple="false">
+ <propertyDefinition name="app:lastmodificationdate"
requiredType="Date" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false"
multiple="false">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="accesspermissions"
requiredType="String" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false"
multiple="true">
+ <propertyDefinition name="app:accesspermissions"
requiredType="String" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false"
multiple="true">
<valueConstraints/>
</propertyDefinition>
</propertyDefinitions>
<childNodeDefinitions>
- <childNodeDefinition name="*"
defaultPrimaryType="app:content" autoCreated="false"
mandatory="false"
+ <childNodeDefinition name="*"
defaultPrimaryType="app:application" autoCreated="false"
mandatory="false"
onParentVersion="COPY" protected="false"
sameNameSiblings="false">
<requiredPrimaryTypes>
- <requiredPrimaryType>app:content</requiredPrimaryType>
+ <requiredPrimaryType>app:application</requiredPrimaryType>
</requiredPrimaryTypes>
</childNodeDefinition>
</childNodeDefinitions>
</nodeType>
- <nodeType name="app:content" isMixin="false"
hasOrderableChildNodes="false" primaryItemName="">
+ <nodeType name="app:application" isMixin="false"
hasOrderableChildNodes="false" primaryItemName="">
<supertypes>
<supertype>nt:base</supertype>
<supertype>mix:referenceable</supertype>
</supertypes>
<propertyDefinitions>
- <propertyDefinition name="displayname"
requiredType="String" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false"
multiple="true">
+ <propertyDefinition name="app:displayname"
requiredType="String" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false"
multiple="true">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="description"
requiredType="String" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false"
multiple="false">
+ <propertyDefinition name="app:description"
requiredType="String" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false"
multiple="false">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="creationdate"
requiredType="Date" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false"
multiple="false">
+ <propertyDefinition name="app:creationdate"
requiredType="Date" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false"
multiple="false">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="lastmodificationdate"
requiredType="Date" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false"
multiple="false">
+ <propertyDefinition name="app:lastmodificationdate"
requiredType="Date" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false"
multiple="false">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="accesspermissions"
requiredType="String" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false"
multiple="true">
+ <propertyDefinition name="app:accesspermissions"
requiredType="String" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false"
multiple="true">
<valueConstraints/>
</propertyDefinition>
</propertyDefinitions>
Added:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/AppFormatter.java
===================================================================
---
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/AppFormatter.java
(rev 0)
+++
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/AppFormatter.java 2010-02-08
17:32:04 UTC (rev 1560)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+ */
+
+package org.exoplatform.application;
+
+import org.chromattic.ext.format.AbstractEncodingObjectFormatter;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien
Viet</a>
+ * @version $Revision$
+ */
+public class AppFormatter extends AbstractEncodingObjectFormatter
+{
+
+ public String getPrefix()
+ {
+ return "app:";
+ }
+}
Modified:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java
===================================================================
---
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java 2010-02-08
16:44:23 UTC (rev 1559)
+++
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java 2010-02-08
17:32:04 UTC (rev 1560)
@@ -18,42 +18,39 @@
*/
package org.exoplatform.application.gadget.impl;
-import org.chromattic.api.annotations.Create;
-import org.chromattic.api.annotations.MappedBy;
-import org.chromattic.api.annotations.Name;
+import org.chromattic.api.annotations.*;
import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.OneToOne;
-import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.Property;
import org.chromattic.ext.ntdef.NTFolder;
+import org.exoplatform.application.AppFormatter;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien
Viet</a>
* @version $Revision$
*/
@PrimaryType(name = "app:gadgetdefinition")
+(a)FormattedBy(AppFormatter.class)
public abstract class GadgetDefinition
{
@Name
public abstract String getName();
- @Property(name = "title")
+ @Property(name = "app:title")
public abstract String getTitle();
public abstract void setTitle(String title);
- @Property(name = "description")
+ @Property(name = "app:description")
public abstract String getDescription();
public abstract void setDescription(String description);
- @Property(name = "thumbnail")
+ @Property(name = "app:thumbnail")
public abstract String getThumbnail();
public abstract void setThumbnail(String thumbnail);
- @Property(name = "referenceurl")
+ @Property(name = "app:referenceurl")
public abstract String getReferenceURL();
public abstract void setReferenceURL(String referenceURL);
Modified:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistry.java
===================================================================
---
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistry.java 2010-02-08
16:44:23 UTC (rev 1559)
+++
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistry.java 2010-02-08
17:32:04 UTC (rev 1560)
@@ -19,8 +19,10 @@
package org.exoplatform.application.gadget.impl;
import org.chromattic.api.annotations.Create;
+import org.chromattic.api.annotations.FormattedBy;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToMany;
+import org.exoplatform.application.AppFormatter;
import java.util.Collection;
import java.util.Map;
@@ -30,6 +32,7 @@
* @version $Revision$
*/
@PrimaryType(name = "app:gadgetregistry")
+(a)FormattedBy(AppFormatter.class)
public abstract class GadgetRegistry
{
Modified:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java
===================================================================
---
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java 2010-02-08
16:44:23 UTC (rev 1559)
+++
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetRegistryServiceImpl.java 2010-02-08
17:32:04 UTC (rev 1560)
@@ -110,10 +110,10 @@
{
Chromattic chromattic = chromatticLifeCycle.getChromattic();
ChromatticSession session = chromattic.openSession();
- GadgetRegistry registry = session.findByPath(GadgetRegistry.class,
"gadgets");
+ GadgetRegistry registry = session.findByPath(GadgetRegistry.class,
"app:gadgets");
if (registry == null)
{
- registry = session.insert(GadgetRegistry.class, "gadgets");
+ registry = session.insert(GadgetRegistry.class, "app:gadgets");
}
return registry;
}
@@ -238,7 +238,7 @@
if (data instanceof LocalGadgetData)
{
LocalGadgetData localData = (LocalGadgetData)data;
- url = "jcr/repository/portal-system/gadgets/" + def.getName() +
"/data/resources/" + localData.getFileName();
+ url = "jcr/repository/portal-system/production/app:gadgets/app:" +
def.getName() + "/app:data/app:resources/" + localData.getFileName();
}
else
{
Modified:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java
===================================================================
---
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java 2010-02-08
16:44:23 UTC (rev 1559)
+++
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java 2010-02-08
17:32:04 UTC (rev 1560)
@@ -21,15 +21,12 @@
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.apache.shindig.gadgets.spec.ModulePrefs;
-import org.chromattic.api.annotations.ManyToOne;
-import org.chromattic.api.annotations.MappedBy;
+import org.chromattic.api.annotations.*;
import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.OneToOne;
-import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.Property;
import org.chromattic.ext.ntdef.NTFile;
import org.chromattic.ext.ntdef.Resource;
import org.chromattic.ext.ntdef.NTFolder;
+import org.exoplatform.application.AppFormatter;
import org.exoplatform.application.gadget.EncodingDetector;
@@ -42,6 +39,7 @@
* @version $Revision$
*/
@PrimaryType(name = "app:localgadgetdata")
+(a)FormattedBy(AppFormatter.class)
public abstract class LocalGadgetData extends GadgetData
{
@@ -51,7 +49,7 @@
@ManyToOne
public abstract GadgetDefinition getDefinition();
- @Property(name = "filename")
+ @Property(name = "app:filename")
public abstract String getFileName();
public abstract void setFileName(String fileName);
Modified:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/RemoteGadgetData.java
===================================================================
---
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/RemoteGadgetData.java 2010-02-08
16:44:23 UTC (rev 1559)
+++
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/RemoteGadgetData.java 2010-02-08
17:32:04 UTC (rev 1560)
@@ -18,18 +18,21 @@
*/
package org.exoplatform.application.gadget.impl;
+import org.chromattic.api.annotations.FormattedBy;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
+import org.exoplatform.application.AppFormatter;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien
Viet</a>
* @version $Revision$
*/
@PrimaryType(name = "app:remotegadgetdata")
+(a)FormattedBy(AppFormatter.class)
public abstract class RemoteGadgetData extends GadgetData
{
- @Property(name = "url")
+ @Property(name = "app:url")
public abstract String getURL();
public abstract void setURL(String url);
Modified:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java
===================================================================
---
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2010-02-08
16:44:23 UTC (rev 1559)
+++
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2010-02-08
17:32:04 UTC (rev 1560)
@@ -91,10 +91,10 @@
public ContentRegistry getContentRegistry()
{
ChromatticSession session = lifeCycle.getChromattic().openSession();
- ContentRegistry registry = session.findByPath(ContentRegistry.class,
"contents");
+ ContentRegistry registry = session.findByPath(ContentRegistry.class,
"app:applications");
if (registry == null)
{
- registry = session.insert(ContentRegistry.class, "contents");
+ registry = session.insert(ContentRegistry.class, "app:applications");
}
return registry;
}
Modified:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java
===================================================================
---
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java 2010-02-08
16:44:23 UTC (rev 1559)
+++
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/CategoryDefinition.java 2010-02-08
17:32:04 UTC (rev 1560)
@@ -24,6 +24,7 @@
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToMany;
import org.chromattic.api.annotations.Property;
+import org.exoplatform.application.AppFormatter;
import org.exoplatform.portal.pom.config.POMSession;
import org.gatein.mop.api.content.ContentType;
import org.gatein.mop.api.content.Customization;
@@ -38,8 +39,8 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien
Viet</a>
* @version $Revision$
*/
-@PrimaryType(name = "app:contentcategory")
-(a)FormattedBy(MOPFormatter.class)
+@PrimaryType(name = "app:category")
+(a)FormattedBy(AppFormatter.class)
public abstract class CategoryDefinition
{
@@ -49,27 +50,27 @@
@Name
public abstract String getName();
- @Property(name = "displayname")
+ @Property(name = "app:displayname")
public abstract String getDisplayName();
public abstract void setDisplayName(String displayName);
- @Property(name = "description")
+ @Property(name = "app:description")
public abstract String getDescription();
public abstract void setDescription(String description);
- @Property(name = "creationdate")
+ @Property(name = "app:creationdate")
public abstract Date getCreationDate();
public abstract void setCreationDate(Date date);
- @Property(name = "lastmodificationdate")
+ @Property(name = "app:lastmodificationdate")
public abstract Date getLastModificationDate();
public abstract void setLastModificationDate(Date date);
- @Property(name = "accesspermissions")
+ @Property(name = "app:accesspermissions")
public abstract List<String> getAccessPermissions();
public abstract void setAccessPermissions(List<String> accessPermissions);
Modified:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java
===================================================================
---
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java 2010-02-08
16:44:23 UTC (rev 1559)
+++
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentDefinition.java 2010-02-08
17:32:04 UTC (rev 1560)
@@ -18,11 +18,8 @@
*/
package org.exoplatform.application.registry.impl;
-import org.chromattic.api.annotations.Id;
-import org.chromattic.api.annotations.ManyToOne;
-import org.chromattic.api.annotations.Name;
-import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.Property;
+import org.chromattic.api.annotations.*;
+import org.exoplatform.application.AppFormatter;
import org.exoplatform.portal.pom.config.POMSession;
import org.gatein.mop.api.content.Customization;
import org.gatein.mop.api.workspace.Workspace;
@@ -34,7 +31,8 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien
Viet</a>
* @version $Revision$
*/
-@PrimaryType(name = "app:content")
+@PrimaryType(name = "app:application")
+(a)FormattedBy(AppFormatter.class)
public abstract class ContentDefinition
{
@@ -44,27 +42,27 @@
@Name
public abstract String getName();
- @Property(name = "displayname")
+ @Property(name = "app:displayname")
public abstract String getDisplayName();
public abstract void setDisplayName(String displayName);
- @Property(name = "description")
+ @Property(name = "app:description")
public abstract String getDescription();
public abstract void setDescription(String description);
- @Property(name = "creationdate")
+ @Property(name = "app:creationdate")
public abstract Date getCreationDate();
public abstract void setCreationDate(Date date);
- @Property(name = "lastmodificationdate")
+ @Property(name = "app:lastmodificationdate")
public abstract Date getLastModificationDate();
public abstract void setLastModificationDate(Date date);
- @Property(name = "accesspermissions")
+ @Property(name = "app:accesspermissions")
public abstract List<String> getAccessPermissions();
public abstract void setAccessPermissions(List<String> accessPermissions);
Modified:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java
===================================================================
---
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java 2010-02-08
16:44:23 UTC (rev 1559)
+++
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ContentRegistry.java 2010-02-08
17:32:04 UTC (rev 1560)
@@ -19,8 +19,10 @@
package org.exoplatform.application.registry.impl;
import org.chromattic.api.annotations.Create;
+import org.chromattic.api.annotations.FormattedBy;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.OneToMany;
+import org.exoplatform.application.AppFormatter;
import java.util.List;
import java.util.Map;
@@ -29,7 +31,8 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien
Viet</a>
* @version $Revision$
*/
-@PrimaryType(name = "app:contentregistry")
+@PrimaryType(name = "app:applicationregistry")
+(a)FormattedBy(AppFormatter.class)
public abstract class ContentRegistry
{