[gatein-commits] gatein SVN: r2130 - in components/mop/trunk/core/src: main/java/org/gatein/mop/core/api/workspace and 1 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Mar 10 16:39:06 EST 2010
Author: julien_viet
Date: 2010-03-10 16:39:05 -0500 (Wed, 10 Mar 2010)
New Revision: 2130
Added:
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/Attribute.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/AttributesImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/BooleanAttribute.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/DateAttribute.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/IntegerAttribute.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/PathAttribute.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/StringAttribute.java
Removed:
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/Attribute.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/AttributesImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/BooleanAttribute.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/DateAttribute.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/IntegerAttribute.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PathAttribute.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/StringAttribute.java
Modified:
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/TemplatizedImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/TestMOPService.java
Log:
move attribute stuff to upper package in the impl
Copied: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/Attribute.java (from rev 2128, components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/Attribute.java)
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/Attribute.java (rev 0)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/Attribute.java 2010-03-10 21:39:05 UTC (rev 2130)
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2010 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.gatein.mop.core.api;
+
+import org.chromattic.api.annotations.PrimaryType;
+import org.chromattic.api.annotations.Property;
+import org.gatein.mop.api.Scope;
+
+/**
+ * @author <a href="mailto:julien.viet at exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+ at PrimaryType(name = "mop:attribute")
+public abstract class Attribute<T>
+{
+
+ public abstract T getValue();
+
+ public abstract void setValue(T value);
+
+ @Property(name = "mop:scope")
+ public abstract Scope getScope();
+
+ public abstract void setScope(Scope scope);
+
+}
Copied: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/AttributesImpl.java (from rev 2128, components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/AttributesImpl.java)
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/AttributesImpl.java (rev 0)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/AttributesImpl.java 2010-03-10 21:39:05 UTC (rev 2130)
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2010 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.gatein.mop.core.api;
+
+import org.chromattic.api.NameConflictResolution;
+import org.chromattic.api.annotations.Create;
+import org.chromattic.api.annotations.FormattedBy;
+import org.chromattic.api.annotations.NamingPolicy;
+import org.chromattic.api.annotations.OneToMany;
+import org.chromattic.api.annotations.PrimaryType;
+import org.gatein.mop.core.api.MOPFormatter;
+import org.gatein.mop.core.util.AbstractAttributes;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:julien.viet at exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+ at PrimaryType(name = "mop:attributes")
+ at FormattedBy(MOPFormatter.class)
+ at NamingPolicy(onDuplicate = NameConflictResolution.REPLACE)
+public abstract class AttributesImpl extends AbstractAttributes
+{
+
+ @OneToMany
+ public abstract Map<String, Attribute> getChildren();
+
+ @Create
+ public abstract IntegerAttribute createInteger();
+
+ @Create
+ public abstract BooleanAttribute createBoolean();
+
+ @Create
+ public abstract DateAttribute createDate();
+
+ @Create
+ public abstract StringAttribute createString();
+
+ @Override
+ protected Object get(String name)
+ {
+ Map<String, Attribute> children = getChildren();
+ Attribute child = children.get(name);
+ return child != null ? child.getValue() : null;
+ }
+
+ @Override
+ protected void set(String name, Object o)
+ {
+ Map<String, Attribute> children = getChildren();
+ if (o != null)
+ {
+ if (o instanceof Integer)
+ {
+ IntegerAttribute i = createInteger();
+ children.put(name, i);
+ i.setValue((Integer)o);
+ }
+ else if (o instanceof Boolean)
+ {
+ BooleanAttribute b = createBoolean();
+ children.put(name, b);
+ b.setValue((Boolean)o);
+ }
+ else if (o instanceof Date)
+ {
+ DateAttribute d = createDate();
+ children.put(name, d);
+ d.setValue((Date)o);
+ }
+ else
+ {
+ StringAttribute s = createString();
+ children.put(name, s);
+ s.setValue((String)o);
+ }
+ }
+ else
+ {
+ children.remove(name);
+ }
+ }
+
+ public Set<String> getKeys()
+ {
+ Map<String, Attribute> children = getChildren();
+ return children.keySet();
+ }
+}
Copied: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/BooleanAttribute.java (from rev 2128, components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/BooleanAttribute.java)
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/BooleanAttribute.java (rev 0)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/BooleanAttribute.java 2010-03-10 21:39:05 UTC (rev 2130)
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2010 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.gatein.mop.core.api;
+
+import org.chromattic.api.annotations.PrimaryType;
+import org.chromattic.api.annotations.Property;
+
+/**
+ * @author <a href="mailto:julien.viet at exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+ at PrimaryType(name = "mop:booleanattribute")
+public abstract class BooleanAttribute extends Attribute<Boolean>
+{
+
+ @Property(name = "mop:value")
+ public abstract Boolean getValue();
+
+ public abstract void setValue(Boolean value);
+}
\ No newline at end of file
Copied: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/DateAttribute.java (from rev 2128, components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/DateAttribute.java)
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/DateAttribute.java (rev 0)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/DateAttribute.java 2010-03-10 21:39:05 UTC (rev 2130)
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2010 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.gatein.mop.core.api;
+
+import org.chromattic.api.annotations.PrimaryType;
+import org.chromattic.api.annotations.Property;
+
+import java.util.Date;
+
+/**
+ * @author <a href="mailto:julien.viet at exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+ at PrimaryType(name = "mop:dateattribute")
+public abstract class DateAttribute extends Attribute<Date>
+{
+
+ @Property(name = "mop:value")
+ public abstract Date getValue();
+
+ public abstract void setValue(Date value);
+}
\ No newline at end of file
Copied: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/IntegerAttribute.java (from rev 2128, components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/IntegerAttribute.java)
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/IntegerAttribute.java (rev 0)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/IntegerAttribute.java 2010-03-10 21:39:05 UTC (rev 2130)
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2010 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.gatein.mop.core.api;
+
+import org.chromattic.api.annotations.PrimaryType;
+import org.chromattic.api.annotations.Property;
+
+/**
+ * @author <a href="mailto:julien.viet at exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+ at PrimaryType(name = "mop:integerattribute")
+public abstract class IntegerAttribute extends Attribute<Integer>
+{
+
+ @Property(name = "mop:value")
+ public abstract Integer getValue();
+
+ public abstract void setValue(Integer value);
+}
\ No newline at end of file
Copied: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/PathAttribute.java (from rev 2128, components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PathAttribute.java)
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/PathAttribute.java (rev 0)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/PathAttribute.java 2010-03-10 21:39:05 UTC (rev 2130)
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2010 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.gatein.mop.core.api;
+
+import org.chromattic.api.RelationshipType;
+import org.chromattic.api.annotations.ManyToOne;
+import org.chromattic.api.annotations.MappedBy;
+import org.chromattic.api.annotations.PrimaryType;
+
+/**
+ * @author <a href="mailto:julien.viet at exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+ at PrimaryType(name = "mop:pathattribute")
+public abstract class PathAttribute extends Attribute<Object>
+{
+
+ @ManyToOne(type = RelationshipType.PATH)
+ @MappedBy("mop:value")
+ public abstract Object getValue();
+
+ public abstract void setValue(Object value);
+
+}
Copied: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/StringAttribute.java (from rev 2128, components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/StringAttribute.java)
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/StringAttribute.java (rev 0)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/StringAttribute.java 2010-03-10 21:39:05 UTC (rev 2130)
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2010 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.gatein.mop.core.api;
+
+import org.chromattic.api.annotations.PrimaryType;
+import org.chromattic.api.annotations.Property;
+
+/**
+ * @author <a href="mailto:julien.viet at exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+ at PrimaryType(name = "mop:stringattribute")
+public abstract class StringAttribute extends Attribute<String>
+{
+
+ @Property(name = "mop:value")
+ public abstract String getValue();
+
+ public abstract void setValue(String value);
+}
Deleted: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/Attribute.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/Attribute.java 2010-03-10 21:35:07 UTC (rev 2129)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/Attribute.java 2010-03-10 21:39:05 UTC (rev 2130)
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2010 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.gatein.mop.core.api.workspace;
-
-import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.Property;
-import org.gatein.mop.api.Scope;
-
-/**
- * @author <a href="mailto:julien.viet at exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
- at PrimaryType(name = "mop:attribute")
-public abstract class Attribute<T>
-{
-
- public abstract T getValue();
-
- public abstract void setValue(T value);
-
- @Property(name = "mop:scope")
- public abstract Scope getScope();
-
- public abstract void setScope(Scope scope);
-
-}
Deleted: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/AttributesImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/AttributesImpl.java 2010-03-10 21:35:07 UTC (rev 2129)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/AttributesImpl.java 2010-03-10 21:39:05 UTC (rev 2130)
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2010 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.gatein.mop.core.api.workspace;
-
-import org.chromattic.api.NameConflictResolution;
-import org.chromattic.api.annotations.Create;
-import org.chromattic.api.annotations.FormattedBy;
-import org.chromattic.api.annotations.NamingPolicy;
-import org.chromattic.api.annotations.OneToMany;
-import org.chromattic.api.annotations.PrimaryType;
-import org.gatein.mop.core.api.MOPFormatter;
-import org.gatein.mop.core.util.AbstractAttributes;
-
-import java.util.Date;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * @author <a href="mailto:julien.viet at exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
- at PrimaryType(name = "mop:attributes")
- at FormattedBy(MOPFormatter.class)
- at NamingPolicy(onDuplicate = NameConflictResolution.REPLACE)
-public abstract class AttributesImpl extends AbstractAttributes
-{
-
- @OneToMany
- public abstract Map<String, Attribute> getChildren();
-
- @Create
- public abstract IntegerAttribute createInteger();
-
- @Create
- public abstract BooleanAttribute createBoolean();
-
- @Create
- public abstract DateAttribute createDate();
-
- @Create
- public abstract StringAttribute createString();
-
- @Override
- protected Object get(String name)
- {
- Map<String, Attribute> children = getChildren();
- Attribute child = children.get(name);
- return child != null ? child.getValue() : null;
- }
-
- @Override
- protected void set(String name, Object o)
- {
- Map<String, Attribute> children = getChildren();
- if (o != null)
- {
- if (o instanceof Integer)
- {
- IntegerAttribute i = createInteger();
- children.put(name, i);
- i.setValue((Integer)o);
- }
- else if (o instanceof Boolean)
- {
- BooleanAttribute b = createBoolean();
- children.put(name, b);
- b.setValue((Boolean)o);
- }
- else if (o instanceof Date)
- {
- DateAttribute d = createDate();
- children.put(name, d);
- d.setValue((Date)o);
- }
- else
- {
- StringAttribute s = createString();
- children.put(name, s);
- s.setValue((String)o);
- }
- }
- else
- {
- children.remove(name);
- }
- }
-
- public Set<String> getKeys()
- {
- Map<String, Attribute> children = getChildren();
- return children.keySet();
- }
-}
Deleted: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/BooleanAttribute.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/BooleanAttribute.java 2010-03-10 21:35:07 UTC (rev 2129)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/BooleanAttribute.java 2010-03-10 21:39:05 UTC (rev 2130)
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2010 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.gatein.mop.core.api.workspace;
-
-import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.Property;
-
-/**
- * @author <a href="mailto:julien.viet at exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
- at PrimaryType(name = "mop:booleanattribute")
-public abstract class BooleanAttribute extends Attribute<Boolean>
-{
-
- @Property(name = "mop:value")
- public abstract Boolean getValue();
-
- public abstract void setValue(Boolean value);
-}
\ No newline at end of file
Deleted: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/DateAttribute.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/DateAttribute.java 2010-03-10 21:35:07 UTC (rev 2129)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/DateAttribute.java 2010-03-10 21:39:05 UTC (rev 2130)
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2010 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.gatein.mop.core.api.workspace;
-
-import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.Property;
-
-import java.util.Date;
-
-/**
- * @author <a href="mailto:julien.viet at exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
- at PrimaryType(name = "mop:dateattribute")
-public abstract class DateAttribute extends Attribute<Date>
-{
-
- @Property(name = "mop:value")
- public abstract Date getValue();
-
- public abstract void setValue(Date value);
-}
\ No newline at end of file
Deleted: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/IntegerAttribute.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/IntegerAttribute.java 2010-03-10 21:35:07 UTC (rev 2129)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/IntegerAttribute.java 2010-03-10 21:39:05 UTC (rev 2130)
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2010 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.gatein.mop.core.api.workspace;
-
-import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.Property;
-
-/**
- * @author <a href="mailto:julien.viet at exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
- at PrimaryType(name = "mop:integerattribute")
-public abstract class IntegerAttribute extends Attribute<Integer>
-{
-
- @Property(name = "mop:value")
- public abstract Integer getValue();
-
- public abstract void setValue(Integer value);
-}
\ No newline at end of file
Deleted: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PathAttribute.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PathAttribute.java 2010-03-10 21:35:07 UTC (rev 2129)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PathAttribute.java 2010-03-10 21:39:05 UTC (rev 2130)
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2010 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.gatein.mop.core.api.workspace;
-
-import org.chromattic.api.RelationshipType;
-import org.chromattic.api.annotations.ManyToOne;
-import org.chromattic.api.annotations.MappedBy;
-import org.chromattic.api.annotations.PrimaryType;
-
-/**
- * @author <a href="mailto:julien.viet at exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
- at PrimaryType(name = "mop:pathattribute")
-public abstract class PathAttribute extends Attribute<Object>
-{
-
- @ManyToOne(type = RelationshipType.PATH)
- @MappedBy("mop:value")
- public abstract Object getValue();
-
- public abstract void setValue(Object value);
-
-}
Deleted: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/StringAttribute.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/StringAttribute.java 2010-03-10 21:35:07 UTC (rev 2129)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/StringAttribute.java 2010-03-10 21:39:05 UTC (rev 2130)
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2010 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.gatein.mop.core.api.workspace;
-
-import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.Property;
-
-/**
- * @author <a href="mailto:julien.viet at exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
- at PrimaryType(name = "mop:stringattribute")
-public abstract class StringAttribute extends Attribute<String>
-{
-
- @Property(name = "mop:value")
- public abstract String getValue();
-
- public abstract void setValue(String value);
-}
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/TemplatizedImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/TemplatizedImpl.java 2010-03-10 21:35:07 UTC (rev 2129)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/TemplatizedImpl.java 2010-03-10 21:39:05 UTC (rev 2130)
@@ -25,6 +25,7 @@
import org.gatein.mop.api.Scope;
import org.gatein.mop.api.workspace.Page;
import org.gatein.mop.api.workspace.Templatized;
+import org.gatein.mop.core.api.PathAttribute;
/**
* @author <a href="mailto:julien.viet at exoplatform.com">Julien Viet</a>
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java 2010-03-10 21:35:07 UTC (rev 2129)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java 2010-03-10 21:39:05 UTC (rev 2130)
@@ -22,6 +22,7 @@
import org.gatein.mop.api.workspace.WorkspaceObject;
import org.gatein.mop.api.workspace.ObjectType;
import org.gatein.mop.api.content.CustomizationContext;
+import org.gatein.mop.core.api.AttributesImpl;
import org.gatein.mop.core.api.MOPFormatter;
import org.gatein.mop.core.api.ModelImpl;
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 2010-03-10 21:35:07 UTC (rev 2129)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/TestMOPService.java 2010-03-10 21:39:05 UTC (rev 2130)
@@ -20,25 +20,25 @@
import org.chromattic.api.Chromattic;
import org.chromattic.api.ChromatticBuilder;
+import org.gatein.mop.core.api.Attribute;
+import org.gatein.mop.core.api.AttributesImpl;
import org.gatein.mop.core.api.MOPService;
+import org.gatein.mop.core.api.PathAttribute;
import org.gatein.mop.core.api.content.ContentManagerRegistry;
-import org.gatein.mop.core.api.workspace.Attribute;
-import org.gatein.mop.core.api.workspace.AttributesImpl;
-import org.gatein.mop.core.api.workspace.BooleanAttribute;
-import org.gatein.mop.core.api.workspace.DateAttribute;
+import org.gatein.mop.core.api.BooleanAttribute;
+import org.gatein.mop.core.api.DateAttribute;
import org.gatein.mop.core.api.workspace.GroupSite;
import org.gatein.mop.core.api.workspace.GroupSiteContainer;
-import org.gatein.mop.core.api.workspace.IntegerAttribute;
+import org.gatein.mop.core.api.IntegerAttribute;
import org.gatein.mop.core.api.workspace.NavigationContainer;
import org.gatein.mop.core.api.workspace.NavigationImpl;
import org.gatein.mop.core.api.workspace.PageContainer;
import org.gatein.mop.core.api.workspace.PageImpl;
import org.gatein.mop.core.api.workspace.PageLinkImpl;
-import org.gatein.mop.core.api.workspace.PathAttribute;
import org.gatein.mop.core.api.workspace.PortalSite;
import org.gatein.mop.core.api.workspace.PortalSiteContainer;
import org.gatein.mop.core.api.workspace.SecuredImpl;
-import org.gatein.mop.core.api.workspace.StringAttribute;
+import org.gatein.mop.core.api.StringAttribute;
import org.gatein.mop.core.api.workspace.TemplatizedImpl;
import org.gatein.mop.core.api.workspace.UIBodyImpl;
import org.gatein.mop.core.api.workspace.UIContainerImpl;
More information about the gatein-commits
mailing list