Author: julien_viet
Date: 2011-01-19 22:34:15 -0500 (Wed, 19 Jan 2011)
New Revision: 5795
Modified:
components/mop/trunk/core/pom.xml
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSiteContainer.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSiteContainer.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteContainer.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSiteContainer.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/AdapterTestCase.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/Secured.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/TestMOPService.java
components/mop/trunk/pom.xml
Log:
GTNMOP-30 : Update to Chromattic 1.0.5 / JCR 1.12.6
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2011-01-19 20:40:55 UTC (rev 5794)
+++ components/mop/trunk/core/pom.xml 2011-01-20 03:34:15 UTC (rev 5795)
@@ -98,6 +98,35 @@
<build>
<plugins>
+<!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.1</version>
+ <executions>
+ <execution>
+ <id>default-compile</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <compilerArgument>-proc:none</compilerArgument>
+ </configuration>
+ </execution>
+ <execution>
+ <id>default-testCompile</id>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <phase>compile</phase>
+ <configuration>
+ <compilerArgument>-proc:none</compilerArgument>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
Modified:
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSiteContainer.java
===================================================================
---
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSiteContainer.java 2011-01-19
20:40:55 UTC (rev 5794)
+++
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSiteContainer.java 2011-01-20
03:34:15 UTC (rev 5795)
@@ -18,6 +18,7 @@
*/
package org.gatein.mop.core.api.workspace;
+import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.MappedBy;
@@ -29,6 +30,7 @@
public abstract class GroupSiteContainer extends SiteContainer<GroupSite>
{
+ @OneToOne
@MappedBy("mop:groupsites")
public abstract WorkspaceImpl getWorkspace();
Modified:
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java
===================================================================
---
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java 2011-01-19
20:40:55 UTC (rev 5794)
+++
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java 2011-01-20
03:34:15 UTC (rev 5795)
@@ -53,7 +53,7 @@
@OneToMany(type = RelationshipType.PATH)
@MappedBy("mop:template")
- public abstract Collection<? extends WorkspaceObject> getTemplatizedObjects();
+ public abstract Collection<? extends TemplatizedImpl> getTemplatizedObjects();
@OneToOne
@MappedBy("mop:children")
Modified:
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSiteContainer.java
===================================================================
---
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSiteContainer.java 2011-01-19
20:40:55 UTC (rev 5794)
+++
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSiteContainer.java 2011-01-20
03:34:15 UTC (rev 5795)
@@ -18,6 +18,7 @@
*/
package org.gatein.mop.core.api.workspace;
+import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.MappedBy;
@@ -29,6 +30,7 @@
public abstract class PortalSiteContainer extends SiteContainer<PortalSite>
{
+ @OneToOne
@MappedBy("mop:portalsites")
public abstract WorkspaceImpl getWorkspace();
Modified:
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteContainer.java
===================================================================
---
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteContainer.java 2011-01-19
20:40:55 UTC (rev 5794)
+++
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteContainer.java 2011-01-20
03:34:15 UTC (rev 5795)
@@ -19,9 +19,11 @@
package org.gatein.mop.core.api.workspace;
import org.chromattic.api.annotations.FormattedBy;
+import org.chromattic.api.annotations.MappedBy;
import org.chromattic.api.annotations.OneToMany;
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.Create;
+import org.chromattic.api.annotations.PrimaryType;
import org.gatein.mop.api.workspace.Site;
import org.gatein.mop.core.api.MOPFormatter;
@@ -33,13 +35,13 @@
* @version $Revision$
*/
@FormattedBy(MOPFormatter.class)
-public abstract class SiteContainer<T extends Site>
+@PrimaryType(name = "foo")
+public abstract class SiteContainer<T extends SiteImpl>
{
@OneToMany
public abstract Map<String, T> getSites();
- @OneToOne
public abstract WorkspaceImpl getWorkspace();
public T addSite(String siteName)
Modified:
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSiteContainer.java
===================================================================
---
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSiteContainer.java 2011-01-19
20:40:55 UTC (rev 5794)
+++
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSiteContainer.java 2011-01-20
03:34:15 UTC (rev 5795)
@@ -18,6 +18,7 @@
*/
package org.gatein.mop.core.api.workspace;
+import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.MappedBy;
@@ -29,6 +30,7 @@
public abstract class UserSiteContainer extends SiteContainer<UserSite>
{
+ @OneToOne
@MappedBy("mop:usersites")
public abstract WorkspaceImpl getWorkspace();
Modified:
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java
===================================================================
---
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java 2011-01-19
20:40:55 UTC (rev 5794)
+++
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java 2011-01-20
03:34:15 UTC (rev 5795)
@@ -76,19 +76,19 @@
// Workspace implementation
******************************************************************************************
@SuppressWarnings("unchecked")
- private <S extends Site> SiteContainer<S>
getSiteContainer(ObjectType<S> siteType)
+ private <S extends Site> SiteContainer getSiteContainer(ObjectType<S>
siteType)
{
if (siteType == ObjectType.PORTAL_SITE)
{
- return (SiteContainer<S>)getPortalSites();
+ return getPortalSites();
}
else if (siteType == ObjectType.GROUP_SITE)
{
- return (SiteContainer<S>)getGroupSites();
+ return getGroupSites();
}
else if (siteType == ObjectType.USER_SITE)
{
- return (SiteContainer<S>)getUserSites();
+ return getUserSites();
}
else
{
@@ -98,8 +98,8 @@
public <S extends Site> S getSite(ObjectType<S> siteType, String
siteName)
{
- SiteContainer<S> sites = getSiteContainer(siteType);
- return sites.getSite(siteName);
+ SiteContainer sites = getSiteContainer(siteType);
+ return (S)sites.getSite(siteName);
}
public Collection<Site> getSites()
@@ -109,13 +109,13 @@
public <S extends Site> Collection<S> getSites(ObjectType<S>
siteType)
{
- SiteContainer<S> sites = getSiteContainer(siteType);
+ SiteContainer sites = getSiteContainer(siteType);
return sites.getAllSites();
}
public <S extends Site> S addSite(ObjectType<S> siteType, String name)
{
- SiteContainer<S> sites = getSiteContainer(siteType);
- return sites.addSite(name);
+ SiteContainer sites = getSiteContainer(siteType);
+ return (S)sites.addSite(name);
}
}
Modified:
components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/AdapterTestCase.java
===================================================================
---
components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/AdapterTestCase.java 2011-01-19
20:40:55 UTC (rev 5794)
+++
components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/AdapterTestCase.java 2011-01-20
03:34:15 UTC (rev 5795)
@@ -25,6 +25,9 @@
import org.gatein.mop.core.api.AbstractPOMTestCase;
import org.gatein.mop.core.api.ModelImpl;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien
Viet</a>
* @version $Revision$
@@ -38,12 +41,14 @@
ModelImpl model = pomService.getModel();
Workspace workspace = model.getWorkspace();
Site site = workspace.addSite(ObjectType.PORTAL_SITE, "adaptablefoo");
- assertFalse(site.isAdapted(Secured.class));
+ assertFalse(site.isAdapted(SecuredImpl.class));
Secured secured = site.adapt(Secured.class);
assertNotNull(secured);
assertTrue(site.isAdapted(Secured.class));
- assertTrue(secured.getPermissions().isEmpty());
- secured.getPermissions().add("FOO");
+ secured.setPermissions(new ArrayList<String>());
+ List<String> permissions = secured.getPermissions();
+ assertTrue(permissions.isEmpty());
+ permissions.add("FOO");
model.save();
}
}
Modified:
components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/Secured.java
===================================================================
---
components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/Secured.java 2011-01-19
20:40:55 UTC (rev 5794)
+++
components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/Secured.java 2011-01-20
03:34:15 UTC (rev 5795)
@@ -30,4 +30,5 @@
List<String> getPermissions();
+ void setPermissions(List<String> permissions);
}
Modified:
components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/TestMOPService.java
===================================================================
---
components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/TestMOPService.java 2011-01-19
20:40:55 UTC (rev 5794)
+++
components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/TestMOPService.java 2011-01-20
03:34:15 UTC (rev 5795)
@@ -30,6 +30,7 @@
import org.gatein.mop.core.api.workspace.GroupSite;
import org.gatein.mop.core.api.workspace.GroupSiteContainer;
import org.gatein.mop.core.api.IntegerAttribute;
+import org.gatein.mop.core.api.workspace.LinkImpl;
import org.gatein.mop.core.api.workspace.NavigationContainer;
import org.gatein.mop.core.api.workspace.NavigationImpl;
import org.gatein.mop.core.api.workspace.PageContainer;
@@ -39,19 +40,27 @@
import org.gatein.mop.core.api.workspace.PortalSiteContainer;
import org.gatein.mop.core.api.workspace.SecuredImpl;
import org.gatein.mop.core.api.StringAttribute;
+import org.gatein.mop.core.api.workspace.SiteContainer;
+import org.gatein.mop.core.api.workspace.SiteImpl;
import org.gatein.mop.core.api.workspace.TemplatizedImpl;
import org.gatein.mop.core.api.workspace.UIBodyImpl;
+import org.gatein.mop.core.api.workspace.UIComponentImpl;
import org.gatein.mop.core.api.workspace.UIContainerImpl;
import org.gatein.mop.core.api.workspace.UIWindowImpl;
import org.gatein.mop.core.api.workspace.URLLinkImpl;
import org.gatein.mop.core.api.workspace.UserSite;
import org.gatein.mop.core.api.workspace.UserSiteContainer;
+import org.gatein.mop.core.api.workspace.WorkspaceCustomizationContextImpl;
import org.gatein.mop.core.api.workspace.WorkspaceImpl;
+import org.gatein.mop.core.api.workspace.WorkspaceObjectImpl;
+import org.gatein.mop.core.api.workspace.content.AbstractCustomization;
+import org.gatein.mop.core.api.workspace.content.AbstractCustomizationState;
import org.gatein.mop.core.api.workspace.content.ContextSpecialization;
import org.gatein.mop.core.api.workspace.content.ContextType;
import org.gatein.mop.core.api.workspace.content.ContextTypeContainer;
import org.gatein.mop.core.api.workspace.content.CustomizationContainer;
import org.gatein.mop.core.api.workspace.content.WorkspaceClone;
+import org.gatein.mop.core.api.workspace.content.WorkspaceCustomization;
import org.gatein.mop.core.api.workspace.content.WorkspaceSpecialization;
import org.gatein.mop.core.support.content.gadget.Gadget;
import org.gatein.mop.core.support.content.gadget.GadgetContentProvider;
@@ -85,7 +94,9 @@
builder.setOptionValue(ChromatticBuilder.INSTRUMENTOR_CLASSNAME,
"org.chromattic.apt.InstrumentorImpl");
//
+ builder.add(WorkspaceObjectImpl.class);
builder.add(WorkspaceImpl.class);
+ builder.add(UIComponentImpl.class);
builder.add(UIContainerImpl.class);
builder.add(UIWindowImpl.class);
builder.add(UIBodyImpl.class);
@@ -93,8 +104,11 @@
builder.add(PageContainer.class);
builder.add(NavigationImpl.class);
builder.add(NavigationContainer.class);
+ builder.add(LinkImpl.class);
builder.add(PageLinkImpl.class);
builder.add(URLLinkImpl.class);
+ builder.add(SiteImpl.class);
+ builder.add(SiteContainer.class);
builder.add(PortalSiteContainer.class);
builder.add(PortalSite.class);
builder.add(GroupSiteContainer.class);
@@ -116,9 +130,13 @@
builder.add(CustomizationContainer.class);
builder.add(ContextTypeContainer.class);
builder.add(ContextType.class);
+ builder.add(AbstractCustomization.class);
+ builder.add(AbstractCustomizationState.class);
builder.add(ContextSpecialization.class);
+ builder.add(WorkspaceCustomization.class);
builder.add(WorkspaceClone.class);
builder.add(WorkspaceSpecialization.class);
+ builder.add(WorkspaceCustomizationContextImpl.class);
//
builder.add(PortletPreferencesState.class);
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2011-01-19 20:40:55 UTC (rev 5794)
+++ components/mop/trunk/pom.xml 2011-01-20 03:34:15 UTC (rev 5795)
@@ -127,7 +127,8 @@
<!-- maven-enforcer-plugin -->
<jdk.min.version>1.6</jdk.min.version>
- <org.chromattic.version>1.0.4</org.chromattic.version>
+ <org.chromattic.version>1.0.5</org.chromattic.version>
+
<!--<org.chromattic.version>1.1.0-SNAPSHOT</org.chromattic.version>-->
</properties>