[gatein-commits] gatein SVN: r1175 - in components/mop/trunk/core/src/main/java/org/gatein/mop/core/api: workspace and 1 other directory.
Author: julien_viet
Date: 2010-01-06 10:27:28 -0500 (Wed, 06 Jan 2010)
New Revision: 1175
Modified:
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java
Log:
- navigation container must use @FormattedBy
- model workspace stored under mop:workspace
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java
===================================================================
---
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java 2010-01-06
13:33:19 UTC (rev 1174)
+++
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java 2010-01-06
15:27:28 UTC (rev 1175)
@@ -135,10 +135,10 @@
{
if (workspace == null)
{
- workspace = session.findByPath(WorkspaceImpl.class, "workspace");
+ workspace = session.findByPath(WorkspaceImpl.class, "mop:workspace");
if (workspace == null)
{
- workspace = session.insert(WorkspaceImpl.class, "workspace");
+ workspace = session.insert(WorkspaceImpl.class, "mop:workspace");
}
}
return workspace;
Modified:
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java
===================================================================
---
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java 2010-01-06
13:33:19 UTC (rev 1174)
+++
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java 2010-01-06
15:27:28 UTC (rev 1175)
@@ -18,11 +18,13 @@
*/
package org.gatein.mop.core.api.workspace;
+import org.chromattic.api.annotations.FormattedBy;
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.chromattic.api.annotations.RelatedMappedBy;
+import org.gatein.mop.core.api.MOPFormatter;
import java.util.List;
import java.util.Map;
@@ -32,6 +34,7 @@
* @version $Revision$
*/
@PrimaryType(name = "mop:navigationcontainer")
+(a)FormattedBy(MOPFormatter.class)
public abstract class NavigationContainer
{