portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r314803 [1/2] - in /portals/jetspeed-2/trunk: components/page-manager/src/java/JETSPEED-INF/castor/ components/page-manager/src/java/JETSPEED-INF/ojb/ components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/ components/page-mana...
Date Wed, 12 Oct 2005 06:35:51 GMT
Author: rwatler
Date: Tue Oct 11 23:35:19 2005
New Revision: 314803

URL: http://svn.apache.org/viewcvs?rev=314803&view=rev
Log:
preparation work for DB PageManager impl

Added:
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java
      - copied, changed from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java
      - copied, changed from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderMetaDataImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuDefinitionImpl.java
      - copied, changed from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuDefinitionImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuElementImpl.java
      - copied, changed from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuElementImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuExcludeDefinitionImpl.java
      - copied, changed from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuExcludeDefinitionImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuIncludeDefinitionImpl.java
      - copied, changed from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuIncludeDefinitionImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuMetadataImpl.java
      - copied, changed from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuMetadataImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuOptionsDefinitionImpl.java
      - copied, changed from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuOptionsDefinitionImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuSeparatorDefinitionImpl.java
      - copied, changed from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuSeparatorDefinitionImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java   (with props)
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java   (with props)
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageDecorator.java   (with props)
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java   (with props)
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/impl/
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/impl/NodeImpl.java   (with props)
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/impl/NodeSetImpl.java   (with props)
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/AbstractNode.java
      - copied, changed from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/AbstractNode.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java
      - copied, changed from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/CastorFileSystemDocumentHandler.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/DocumentHandlerFactoryImpl.java
      - copied, changed from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/DocumentHandlerFactoryImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java
      - copied, changed from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/FileSystemFolderHandler.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/NodeOrderCompartaor.java
      - copied, changed from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/NodeOrderCompartaor.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/NodeSetImpl.java
      - copied, changed from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/NodeSetImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/psml/
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java
      - copied, changed from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/CastorXmlPageManager.java
Removed:
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderMetaDataImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuDefinitionImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuElementImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuExcludeDefinitionImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuIncludeDefinitionImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuMetadataImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuOptionsDefinitionImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuSeparatorDefinitionImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/AbstractNode.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/CastorFileSystemDocumentHandler.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/DocumentHandlerFactoryImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/FileSystemFolderHandler.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/NodeOrderCompartaor.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/NodeSetImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/CastorXmlPageManager.java
Modified:
    portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/castor/page-mapping.xml
    portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/LinkImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageSecurityImpl.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/AbstractPageManager.java
    portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java
    portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java
    portals/jetspeed-2/trunk/components/portal-site/src/test/JETSPEED-INF/spring/test-spring.xml
    portals/jetspeed-2/trunk/etc/schema/phase2-schema.xml
    portals/jetspeed-2/trunk/etc/sql/drop.sql
    portals/jetspeed-2/trunk/etc/sql/oracle/drop.sql
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/page-manager.xml

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/castor/page-mapping.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/castor/page-mapping.xml?rev=314803&r1=314802&r2=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/castor/page-mapping.xml (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/castor/page-mapping.xml Tue Oct 11 23:35:19 2005
@@ -41,7 +41,7 @@
     </field>
 
 	<field name="menuDefinitions"
-           type="org.apache.jetspeed.om.folder.impl.MenuDefinitionImpl" 
+           type="org.apache.jetspeed.om.folder.psml.MenuDefinitionImpl" 
            collection="collection">
       <bind-xml name="menu"/>
     </field>
@@ -150,7 +150,7 @@
     </field>
   </class>
   
-  <class name="org.apache.jetspeed.om.folder.impl.FolderMetaDataImpl">
+  <class name="org.apache.jetspeed.om.folder.psml.FolderMetaDataImpl">
     <map-to xml="folder"/>
 
     <field name="hidden" type="boolean">
@@ -187,13 +187,13 @@
     </field>
 
 	<field name="menuDefinitions"
-           type="org.apache.jetspeed.om.folder.impl.MenuDefinitionImpl" 
+           type="org.apache.jetspeed.om.folder.psml.MenuDefinitionImpl" 
            collection="collection">
       <bind-xml name="menu"/>
     </field>
   </class>
 
-  <class name="org.apache.jetspeed.om.folder.impl.MenuDefinitionImpl">
+  <class name="org.apache.jetspeed.om.folder.psml.MenuDefinitionImpl">
     <map-to xml="menu"/>
 
     <field name="name" type="java.lang.String">
@@ -243,42 +243,42 @@
     </field>
 
 	<field name="menuElementImpls"
-           type="org.apache.jetspeed.om.folder.impl.MenuElementImpl" 
+           type="org.apache.jetspeed.om.folder.psml.MenuElementImpl" 
            collection="collection">
       <bind-xml name="menu-element"/>
     </field>
   </class>
 
-  <class name="org.apache.jetspeed.om.folder.impl.MenuElementImpl">
+  <class name="org.apache.jetspeed.om.folder.psml.MenuElementImpl">
     <map-to xml="menu-element"/>
 
     <field name="options"
-           type="org.apache.jetspeed.om.folder.impl.MenuOptionsDefinitionImpl">
+           type="org.apache.jetspeed.om.folder.psml.MenuOptionsDefinitionImpl">
       <bind-xml name="options"/>
     </field>
 
     <field name="menu"
-           type="org.apache.jetspeed.om.folder.impl.MenuDefinitionImpl">
+           type="org.apache.jetspeed.om.folder.psml.MenuDefinitionImpl">
       <bind-xml name="menu"/>
     </field>
 
     <field name="separator"
-           type="org.apache.jetspeed.om.folder.impl.MenuSeparatorDefinitionImpl">
+           type="org.apache.jetspeed.om.folder.psml.MenuSeparatorDefinitionImpl">
       <bind-xml name="separator"/>
     </field>
 
     <field name="include"
-           type="org.apache.jetspeed.om.folder.impl.MenuIncludeDefinitionImpl">
+           type="org.apache.jetspeed.om.folder.psml.MenuIncludeDefinitionImpl">
       <bind-xml name="include"/>
     </field>
 
     <field name="exclude"
-           type="org.apache.jetspeed.om.folder.impl.MenuExcludeDefinitionImpl">
+           type="org.apache.jetspeed.om.folder.psml.MenuExcludeDefinitionImpl">
       <bind-xml name="exclude"/>
     </field>
   </class>
 
-  <class name="org.apache.jetspeed.om.folder.impl.MenuOptionsDefinitionImpl">
+  <class name="org.apache.jetspeed.om.folder.psml.MenuOptionsDefinitionImpl">
     <map-to xml="options"/>
 
     <field name="options" type="java.lang.String">
@@ -310,7 +310,7 @@
     </field>    
   </class>
 
-  <class name="org.apache.jetspeed.om.folder.impl.MenuSeparatorDefinitionImpl">
+  <class name="org.apache.jetspeed.om.folder.psml.MenuSeparatorDefinitionImpl">
     <map-to xml="separator"/>
 
     <field name="skin" type="java.lang.String">
@@ -336,7 +336,7 @@
     </field>
   </class>
 
-  <class name="org.apache.jetspeed.om.folder.impl.MenuIncludeDefinitionImpl">
+  <class name="org.apache.jetspeed.om.folder.psml.MenuIncludeDefinitionImpl">
     <map-to xml="include"/>
 
     <field name="name" type="java.lang.String">
@@ -348,7 +348,7 @@
     </field>
   </class>
 
-  <class name="org.apache.jetspeed.om.folder.impl.MenuExcludeDefinitionImpl">
+  <class name="org.apache.jetspeed.om.folder.psml.MenuExcludeDefinitionImpl">
     <map-to xml="exclude"/>
 
     <field name="name" type="java.lang.String">

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml?rev=314803&r1=314802&r2=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml Tue Oct 11 23:35:19 2005
@@ -13,12 +13,11 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<!--
-    - Folder
--->
 
 <descriptor-repository version="1.0">
 
+   <!-- Folder mapping -->
+
    <class-descriptor
       class="org.apache.jetspeed.om.folder.impl.FolderImpl"
       table="FOLDER"
@@ -31,25 +30,60 @@
          autoincrement="false"
       />
 
+      <field-descriptor
+        name="parentId"
+        column="PARENT_ID"
+        jdbc-type="VARCHAR"
+        access="anonymous"
+      />
+
       <reference-descriptor
           name="parent"
           class-ref="org.apache.jetspeed.om.folder.impl.FolderImpl"
-          auto-delete="true"
-          auto-update = "false"
-          auto-retrieve = "false"
+          auto-delete="false"
+          auto-update="false"
+          auto-retrieve="false"
           >
          <foreignkey field-ref="parentId"/>
       </reference-descriptor>
 
+      <collection-descriptor
+          name="folders"
+          element-class-ref="org.apache.jetspeed.om.folder.impl.FolderImpl"
+          auto-delete="true"
+          auto-update="false"
+          auto-retrieve="false"
+      >
+         <inverse-foreignkey field-ref="parentId"/>
+      </collection-descriptor>
+
+      <collection-descriptor
+          name="pages"
+          element-class-ref="org.apache.jetspeed.om.page.impl.PageImpl"
+          auto-delete="true"
+          auto-update="false"
+          auto-retrieve="false"
+      >
+         <inverse-foreignkey field-ref="parentId"/>
+      </collection-descriptor>
+
+      <field-descriptor
+         name="name"
+         column="NAME"
+         jdbc-type="VARCHAR"
+      />
+
       <field-descriptor
          name="title"
          column="TITLE"
          jdbc-type="VARCHAR"
       />
-    </class-descriptor>
+   </class-descriptor>
+
+   <!-- Page mapping -->
 
    <class-descriptor
-      class="org.apache.jetspeed.om.page.psml.PageImpl"
+      class="org.apache.jetspeed.om.page.impl.PageImpl"
       table="PAGE"
    >
       <field-descriptor
@@ -61,11 +95,176 @@
       />
 
       <field-descriptor
+        name="parentId"
+        column="PARENT_ID"
+        jdbc-type="VARCHAR"
+        access="anonymous"
+      />
+
+      <reference-descriptor
+          name="parent"
+          class-ref="org.apache.jetspeed.om.folder.impl.FolderImpl"
+          auto-delete="false"
+          auto-update="false"
+          auto-retrieve="false"
+          >
+         <foreignkey field-ref="parentId"/>
+      </reference-descriptor>
+
+      <collection-descriptor
+          name="fragments"
+          element-class-ref="org.apache.jetspeed.om.page.impl.FragmentImpl"
+          auto-delete="true"
+          auto-update="false"
+          auto-retrieve="false"
+      >
+         <inverse-foreignkey field-ref="pageId"/>
+      </collection-descriptor>
+
+      <collection-descriptor
+          name="decorators"
+          element-class-ref="org.apache.jetspeed.om.page.impl.PageDecorator"
+          auto-delete="true"
+          auto-update="false"
+          auto-retrieve="false"
+      >
+         <inverse-foreignkey field-ref="pageId"/>
+      </collection-descriptor>
+
+      <field-descriptor
+         name="name"
+         column="NAME"
+         jdbc-type="VARCHAR"
+      />
+
+      <field-descriptor
          name="title"
          column="TITLE"
          jdbc-type="VARCHAR"
       />
-    </class-descriptor>
 
+      <field-descriptor
+         name="skin"
+         column="SKIN"
+         jdbc-type="VARCHAR"
+      />
+   </class-descriptor>
+
+   <class-descriptor
+      class="org.apache.jetspeed.om.page.impl.PageDecorator"
+      table="PAGE_DECORATOR"
+   >
+      <field-descriptor
+         name="id"
+         column="DECORATOR_ID"
+         jdbc-type="INTEGER"
+         primarykey="true"
+         autoincrement="true"
+      />
+
+      <field-descriptor
+        name="pageId"
+        column="PAGE_ID"
+        jdbc-type="VARCHAR"
+        access="anonymous"
+      />
+
+      <field-descriptor
+         name="name"
+         column="NAME"
+         jdbc-type="VARCHAR"
+      />
+
+      <field-descriptor
+         name="decorator"
+         column="DECORATOR"
+         jdbc-type="VARCHAR"
+      />
+   </class-descriptor>
+
+   <!-- Fragment mapping -->
+
+   <class-descriptor
+      class="org.apache.jetspeed.om.page.impl.FragmentImpl"
+      table="FRAGMENT"
+   >
+      <field-descriptor
+         name="id"
+         column="FRAGMENT_ID"
+         jdbc-type="INTEGER"
+         primarykey="true"
+         autoincrement="true"
+      />
+
+      <field-descriptor
+        name="parentId"
+        column="PARENT_ID"
+        jdbc-type="INTEGER"
+        access="anonymous"
+      />
+
+      <reference-descriptor
+          name="parent"
+          class-ref="org.apache.jetspeed.om.page.impl.FragmentImpl"
+          auto-delete="false"
+          auto-update="false"
+          auto-retrieve="false"
+          >
+         <foreignkey field-ref="parentId"/>
+      </reference-descriptor>
+
+      <collection-descriptor
+          name="fragments"
+          element-class-ref="org.apache.jetspeed.om.page.impl.FragmentImpl"
+          auto-delete="true"
+          auto-update="false"
+          auto-retrieve="false"
+      >
+         <inverse-foreignkey field-ref="parentId"/>
+      </collection-descriptor>
+
+      <field-descriptor
+        name="pageId"
+        column="PAGE_ID"
+        jdbc-type="VARCHAR"
+        access="anonymous"
+      />
+
+      <field-descriptor
+         name="name"
+         column="NAME"
+         jdbc-type="VARCHAR"
+      />
+
+      <field-descriptor
+         name="title"
+         column="TITLE"
+         jdbc-type="VARCHAR"
+      />
+
+      <field-descriptor
+         name="type"
+         column="TYPE"
+         jdbc-type="VARCHAR"
+      />
+
+      <field-descriptor
+         name="skin"
+         column="SKIN"
+         jdbc-type="VARCHAR"
+      />
+
+      <field-descriptor
+         name="decorator"
+         column="DECORATOR"
+         jdbc-type="VARCHAR"
+      />
+
+      <field-descriptor
+         name="state"
+         column="STATE"
+         jdbc-type="VARCHAR"
+      />
+   </class-descriptor>
 
 </descriptor-repository>

Copied: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java (from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java)
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java?p2=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java&p1=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java&r1=306811&r2=314803&rev=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java Tue Oct 11 23:35:19 2005
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jetspeed.om.folder.impl;
+package org.apache.jetspeed.om.folder.psml;
 
 import java.security.AccessController;
 import java.io.File;
@@ -35,17 +35,17 @@
 import org.apache.jetspeed.om.page.PageSecurity;
 import org.apache.jetspeed.page.PageManager;
 import org.apache.jetspeed.page.PageNotFoundException;
-import org.apache.jetspeed.page.document.AbstractNode;
 import org.apache.jetspeed.page.document.DocumentException;
 import org.apache.jetspeed.page.document.DocumentHandlerFactory;
 import org.apache.jetspeed.page.document.DocumentNotFoundException;
 import org.apache.jetspeed.page.document.FolderHandler;
 import org.apache.jetspeed.page.document.Node;
 import org.apache.jetspeed.page.document.NodeException;
-import org.apache.jetspeed.page.document.NodeOrderCompartaor;
 import org.apache.jetspeed.page.document.NodeSet;
-import org.apache.jetspeed.page.document.NodeSetImpl;
 import org.apache.jetspeed.page.document.UnsupportedDocumentTypeException;
+import org.apache.jetspeed.page.document.psml.AbstractNode;
+import org.apache.jetspeed.page.document.psml.NodeOrderCompartaor;
+import org.apache.jetspeed.page.document.psml.NodeSetImpl;
 import org.apache.jetspeed.security.FolderPermission;
 
 /**

Copied: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java (from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderMetaDataImpl.java)
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java?p2=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java&p1=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderMetaDataImpl.java&r1=306811&r2=314803&rev=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderMetaDataImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java Tue Oct 11 23:35:19 2005
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jetspeed.om.folder.impl;
+package org.apache.jetspeed.om.folder.psml;
 
 import java.util.Iterator;
 import java.util.List;
 import java.util.Vector;
 
 import org.apache.jetspeed.om.folder.FolderMetaData;
-import org.apache.jetspeed.page.document.AbstractNode;
+import org.apache.jetspeed.page.document.psml.AbstractNode;
 
 /**
  * <p>

Copied: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuDefinitionImpl.java (from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuDefinitionImpl.java)
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuDefinitionImpl.java?p2=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuDefinitionImpl.java&p1=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuDefinitionImpl.java&r1=306811&r2=314803&rev=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuDefinitionImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuDefinitionImpl.java Tue Oct 11 23:35:19 2005
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jetspeed.om.folder.impl;
+package org.apache.jetspeed.om.folder.psml;
 
 import java.util.ArrayList;
 import java.util.Iterator;

Copied: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuElementImpl.java (from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuElementImpl.java)
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuElementImpl.java?p2=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuElementImpl.java&p1=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuElementImpl.java&r1=306811&r2=314803&rev=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuElementImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuElementImpl.java Tue Oct 11 23:35:19 2005
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jetspeed.om.folder.impl;
+package org.apache.jetspeed.om.folder.psml;
 
 /**
  * This class implements a wrapper used to implement

Copied: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuExcludeDefinitionImpl.java (from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuExcludeDefinitionImpl.java)
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuExcludeDefinitionImpl.java?p2=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuExcludeDefinitionImpl.java&p1=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuExcludeDefinitionImpl.java&r1=306811&r2=314803&rev=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuExcludeDefinitionImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuExcludeDefinitionImpl.java Tue Oct 11 23:35:19 2005
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jetspeed.om.folder.impl;
+package org.apache.jetspeed.om.folder.psml;
 
 import org.apache.jetspeed.om.folder.MenuExcludeDefinition;
 

Copied: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuIncludeDefinitionImpl.java (from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuIncludeDefinitionImpl.java)
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuIncludeDefinitionImpl.java?p2=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuIncludeDefinitionImpl.java&p1=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuIncludeDefinitionImpl.java&r1=306811&r2=314803&rev=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuIncludeDefinitionImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuIncludeDefinitionImpl.java Tue Oct 11 23:35:19 2005
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jetspeed.om.folder.impl;
+package org.apache.jetspeed.om.folder.psml;
 
 import org.apache.jetspeed.om.folder.MenuIncludeDefinition;
 

Copied: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuMetadataImpl.java (from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuMetadataImpl.java)
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuMetadataImpl.java?p2=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuMetadataImpl.java&p1=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuMetadataImpl.java&r1=306811&r2=314803&rev=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuMetadataImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuMetadataImpl.java Tue Oct 11 23:35:19 2005
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jetspeed.om.folder.impl;
+package org.apache.jetspeed.om.folder.psml;
 
 import java.util.Collection;
 import java.util.Locale;

Copied: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuOptionsDefinitionImpl.java (from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuOptionsDefinitionImpl.java)
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuOptionsDefinitionImpl.java?p2=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuOptionsDefinitionImpl.java&p1=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuOptionsDefinitionImpl.java&r1=306811&r2=314803&rev=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuOptionsDefinitionImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuOptionsDefinitionImpl.java Tue Oct 11 23:35:19 2005
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jetspeed.om.folder.impl;
+package org.apache.jetspeed.om.folder.psml;
 
 import org.apache.jetspeed.om.folder.MenuOptionsDefinition;
 

Copied: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuSeparatorDefinitionImpl.java (from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuSeparatorDefinitionImpl.java)
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuSeparatorDefinitionImpl.java?p2=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuSeparatorDefinitionImpl.java&p1=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuSeparatorDefinitionImpl.java&r1=306811&r2=314803&rev=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/MenuSeparatorDefinitionImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/MenuSeparatorDefinitionImpl.java Tue Oct 11 23:35:19 2005
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jetspeed.om.folder.impl;
+package org.apache.jetspeed.om.folder.psml;
 
 import org.apache.jetspeed.om.folder.MenuSeparatorDefinition;
 

Added: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java?rev=314803&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java (added)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java Tue Oct 11 23:35:19 2005
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.om.page.impl;
+
+import org.apache.jetspeed.om.page.BaseElement;
+import org.apache.jetspeed.om.common.SecurityConstraints;
+
+/**
+ * BaseElementImpl
+ *
+ * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
+ * @version $Id$
+ */
+public abstract class BaseElementImpl implements BaseElement
+{
+    private String id;
+    private String name;
+    private String title;
+
+    /**
+     * getName
+     *
+     * @return element name
+     */
+    public String getName()
+    {
+        return name;
+    }
+
+    /**
+     * setName
+     *
+     * @param name element name
+     */
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.common.SecuredResource#getConstraintsEnabled()
+     */
+    public boolean getConstraintsEnabled()
+    {
+        return false; // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.common.SecuredResource#getSecurityConstraints()
+     */
+    public SecurityConstraints getSecurityConstraints()
+    {
+        return null; // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.common.SecuredResource#setSecurityConstraints(org.apache.jetspeed.om.common.SecurityConstraints)
+     */
+    public void setSecurityConstraints(SecurityConstraints constraints)
+    {
+        // NYI
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.common.SecuredResource#checkConstraints(java.lang.String)
+     */
+    public void checkConstraints(String actions) throws SecurityException
+    {
+        // NYI
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.common.SecuredResource#getPermissionsEnabled()
+     */
+    public boolean getPermissionsEnabled()
+    {
+        return false; // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.common.SecuredResource#checkPermissions(java.lang.String)
+     */
+    public void checkPermissions(String actions) throws SecurityException
+    {
+        // NYI
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.common.SecuredResource#checkAccess(java.lang.String)
+     */
+    public void checkAccess(String actions) throws SecurityException
+    {
+        // NYI
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.BaseElement#getId()
+     */
+    public String getId()
+    {
+        return id;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.BaseElement#setId(java.lang.String)
+     */
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.BaseElement#getTitle()
+     */
+    public String getTitle()
+    {
+        return title;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.BaseElement#setTitle(java.lang.String)
+     */
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.BaseElement#getShortTitle()
+     */
+    public String getShortTitle()
+    {
+        return null; // NYI
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.BaseElement#setShortTitle(java.lang.String)
+     */
+    public void setShortTitle(String title)
+    {
+        // NYI
+    }
+}

Propchange: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java?rev=314803&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java (added)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java Tue Oct 11 23:35:19 2005
@@ -0,0 +1,179 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.om.page.impl;
+
+import java.util.List;
+
+import org.apache.jetspeed.om.page.Fragment;
+import org.apache.jetspeed.om.page.Property;
+
+/**
+ * FragmentImpl
+ *
+ * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
+ * @version $Id$
+ */
+public class FragmentImpl extends BaseElementImpl implements Fragment
+{
+    private String type;
+    private String skin;
+    private String decorator;
+    private String state;
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getType()
+     */
+    public String getType()
+    {
+        return type;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setType(java.lang.String)
+     */
+    public void setType(String type)
+    {
+        this.type = type;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getSkin()
+     */
+    public String getSkin()
+    {
+        return skin;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setSkin(java.lang.String)
+     */
+    public void setSkin(String skinName)
+    {
+        this.skin = skin;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getDecorator()
+     */
+    public String getDecorator()
+    {
+        return decorator;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setDecorator(java.lang.String)
+     */
+    public void setDecorator(String decoratorName)
+    {
+        this.decorator = decoratorName;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getState()
+     */
+    public String getState()
+    {
+        return state;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#setState(java.lang.String)
+     */
+    public void setState(String state)
+    {
+        this.state = state;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getFragments()
+     */
+    public List getFragments()
+    {
+        return null; // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getLayoutProperties()
+     */
+    public List getLayoutProperties()
+    {
+        return null; // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getProperties(java.lang.String)
+     */
+    public List getProperties(String layoutName)
+    {
+        return null; // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getPropertyValue(java.lang.String,java.lang.String)
+     */
+    public String getPropertyValue(String layout, String propName)
+    {
+        return null; // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#getPropertyValue(java.lang.String,java.lang.String,java.lang.String)
+     */
+    public void setPropertyValue(String layout, String propName, String value)
+    {
+        // NYI
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#addProperty(org.apache.jetspeed.om.page.Property)
+     */
+    public void addProperty(Property p)
+    {
+        // NYI
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#removeProperty(org.apache.jetspeed.om.page.Property)
+     */
+    public void removeProperty(Property p)
+    {
+        // NYI
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#clearProperties(java.lang.String)
+     */
+    public void clearProperties(String layoutName)
+    {
+        // NYI
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#isReference()
+     */
+    public boolean isReference()
+    {
+        return false; // NYI
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Fragment#clone()
+     */
+    public Object clone() throws CloneNotSupportedException
+    {
+        return null; // NYI
+    }    
+}

Propchange: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageDecorator.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageDecorator.java?rev=314803&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageDecorator.java (added)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageDecorator.java Tue Oct 11 23:35:19 2005
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.om.page.impl;
+
+/**
+ * PageDecorator
+ *
+ * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
+ * @version $Id$
+ */
+public class PageDecorator
+{
+    private int id;
+    private String name;
+    private String decorator;
+}

Propchange: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageDecorator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java?rev=314803&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java (added)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java Tue Oct 11 23:35:19 2005
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.om.page.impl;
+
+import java.util.List;
+
+import org.apache.jetspeed.om.page.Defaults;
+import org.apache.jetspeed.om.page.Fragment;
+import org.apache.jetspeed.om.page.Page;
+import org.apache.jetspeed.page.document.impl.NodeImpl;
+
+/**
+ * PageImpl
+ *
+ * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
+ * @version $Id$
+ */
+public class PageImpl extends NodeImpl implements Page
+{
+    private String skin;
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Page#getDefaultSkin()
+     */
+    public String getDefaultSkin()
+    {
+        return skin;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Page#setDefaultSkin(java.lang.String)
+     */
+    public void setDefaultSkin(String skinName)
+    {
+        this.skin = skinName;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Page#getDefaultDecorator(java.lang.String)
+     */
+    public String getDefaultDecorator(String fragmentType)
+    {
+        return null; // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Page#getDefaultDecorator(java.lang.String,java.lang.String)
+     */
+    public void setDefaultDecorator(String decoratorName, String fragmentType)
+    {
+        // NYI
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Page#getRootFragment()
+     */
+    public Fragment getRootFragment()
+    {
+        return null; //NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Page#setRootFragment(org.apache.jetspeed.om.page.Fragment)
+     */
+    public void setRootFragment(Fragment fragment)
+    {
+        // NYI
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Page#getFragmentById(java.lang.String)
+     */
+    public Fragment getFragmentById(String id)
+    {
+        return null; // NYI
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Page#clone()
+     */
+    public Object clone() throws CloneNotSupportedException
+    {
+        return null; // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Page#getMenuDefinitions()
+     */
+    public List getMenuDefinitions()
+    {
+        return null; // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Page#setMenuDefinitions(java.util.List)
+     */
+    public void setMenuDefinitions(List definitions)
+    {
+        // NYI
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.om.page.Page#getDefaults()
+     */
+    public Defaults getDefaults()
+    {
+        return null; // NYI
+    }    
+}

Propchange: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java?rev=314803&r1=314802&r2=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java Tue Oct 11 23:35:19 2005
@@ -33,7 +33,7 @@
 import org.apache.jetspeed.page.document.DocumentHandlerFactory;
 import org.apache.jetspeed.page.document.Node;
 import org.apache.jetspeed.page.document.NodeSet;
-import org.apache.jetspeed.page.document.NodeSetImpl;
+import org.apache.jetspeed.page.document.psml.NodeSetImpl;
 import org.apache.jetspeed.security.FolderPermission;
 import org.apache.jetspeed.security.GroupPrincipal;
 import org.apache.jetspeed.security.PagePermission;

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/LinkImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/LinkImpl.java?rev=314803&r1=314802&r2=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/LinkImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/LinkImpl.java Tue Oct 11 23:35:19 2005
@@ -16,7 +16,7 @@
 package org.apache.jetspeed.om.page.psml;
 
 import org.apache.jetspeed.om.page.Link;
-import org.apache.jetspeed.page.document.AbstractNode;
+import org.apache.jetspeed.page.document.psml.AbstractNode;
 
 
 /**

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java?rev=314803&r1=314802&r2=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java Tue Oct 11 23:35:19 2005
@@ -20,11 +20,11 @@
 import java.util.List;
 import java.util.Stack;
 
-import org.apache.jetspeed.om.folder.impl.MenuDefinitionImpl;
+import org.apache.jetspeed.om.folder.psml.MenuDefinitionImpl;
 import org.apache.jetspeed.om.page.Defaults;
 import org.apache.jetspeed.om.page.Fragment;
 import org.apache.jetspeed.om.page.Page;
-import org.apache.jetspeed.page.document.AbstractNode;
+import org.apache.jetspeed.page.document.psml.AbstractNode;
 
 /**
  * @version $Id$

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageSecurityImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageSecurityImpl.java?rev=314803&r1=314802&r2=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageSecurityImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageSecurityImpl.java Tue Oct 11 23:35:19 2005
@@ -22,7 +22,7 @@
 
 import org.apache.jetspeed.om.page.PageSecurity;
 import org.apache.jetspeed.om.page.SecurityConstraintsDef;
-import org.apache.jetspeed.page.document.AbstractNode;
+import org.apache.jetspeed.page.document.psml.AbstractNode;
 
 
 /**

Added: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/impl/NodeImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/impl/NodeImpl.java?rev=314803&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/impl/NodeImpl.java (added)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/impl/NodeImpl.java Tue Oct 11 23:35:19 2005
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.page.document.impl;
+
+import java.util.Locale;
+
+import org.apache.jetspeed.om.common.GenericMetadata;
+import org.apache.jetspeed.om.page.impl.BaseElementImpl;
+import org.apache.jetspeed.page.document.Node;
+
+/**
+ * NodeImpl
+ *
+ * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
+ * @version $Id$
+ */
+public abstract class NodeImpl extends BaseElementImpl implements Node
+{
+    private NodeImpl parent;
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.page.document.Node#getParent()
+     */
+    public Node getParent()
+    {
+        return parent;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.page.document.Node#setParent(org.apache.jetspeed.page.document.Node)
+     */
+    public void setParent(Node parent)
+    {
+        this.parent = (NodeImpl)parent;
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.page.document.Node#getPath()
+     */
+    public String getPath()
+    {
+        return null; // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.page.document.Node#setPath(java.lang.String)
+     */
+    public void setPath(String path)
+    {
+        // NYI
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.page.document.Node#getmetadata()
+     */
+    public GenericMetadata getMetadata()
+    {
+        return null; // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.page.document.Node#getTitle(java.util.Locale)
+     */
+    public String getTitle(Locale locale)
+    {
+        return null; // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.page.document.Node#getShortTitle(java.util.Locale)
+     */
+    public String getShortTitle(Locale locale)
+    {
+        return null; // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.page.document.Node#getType()
+     */
+    public String getType()
+    {
+        return null; // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.page.document.Node#getUrl()
+     */
+    public String getUrl()
+    {
+        return null; // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.page.document.Node#isHidden()
+     */
+    public boolean isHidden()
+    {
+        return false; // NYI
+    }    
+}

Propchange: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/impl/NodeImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/impl/NodeSetImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/impl/NodeSetImpl.java?rev=314803&view=auto
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/impl/NodeSetImpl.java (added)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/impl/NodeSetImpl.java Tue Oct 11 23:35:19 2005
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.page.document.impl;
+
+import java.util.Iterator;
+
+import org.apache.jetspeed.page.document.Node;
+import org.apache.jetspeed.page.document.NodeSet;
+
+/**
+ * NodeSetImpl
+ *
+ * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
+ * @version $Id$
+ */
+public class NodeSetImpl implements NodeSet
+{
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.page.document.NodeSet#add(org.apache.jetspeed.page.document.Node)
+     */
+    public void add(Node node)
+    {
+        // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.page.document.NodeSet#get(java.lang.String)
+     */
+    public Node get(String name)
+    {
+        return null; // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.page.document.NodeSet#iterator()
+     */
+    public Iterator iterator()
+    {
+        return null; // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.page.document.NodeSet#subset(java.lang.String)
+     */
+    public NodeSet subset(String type)
+    {
+        return null; // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.page.document.NodeSet#inclusiveSubset(java.lang.String)
+     */
+    public NodeSet inclusiveSubset(String regex)
+    {
+        return null; // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.page.document.NodeSet#exclusiveSubset(java.lang.String)
+     */
+    public NodeSet exclusiveSubset(String regex)
+    {
+        return null; // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.page.document.NodeSet#size()
+     */
+    public int size()
+    {
+        return -1; // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.page.document.NodeSet#contains(org.apache.jetspeed.page.document.Node)
+     */
+    public boolean contains(Node node)
+    {
+        return false; // NYI
+    }
+    
+    /* (non-Javadoc)
+     * @see org.apache.jetspeed.page.document.NodeSet#isEmpty()
+     */
+    public boolean isEmpty()
+    {
+        return true; // NYI
+    }
+}

Propchange: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/impl/NodeSetImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/AbstractNode.java (from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/AbstractNode.java)
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/AbstractNode.java?p2=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/AbstractNode.java&p1=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/AbstractNode.java&r1=306811&r2=314803&rev=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/AbstractNode.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/AbstractNode.java Tue Oct 11 23:35:19 2005
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jetspeed.page.document;
+package org.apache.jetspeed.page.document.psml;
 
 import java.util.Collection;
 import java.util.List;

Copied: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java (from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/CastorFileSystemDocumentHandler.java)
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java?p2=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java&p1=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/CastorFileSystemDocumentHandler.java&r1=306811&r2=314803&rev=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/CastorFileSystemDocumentHandler.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java Tue Oct 11 23:35:19 2005
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jetspeed.page.document;
+package org.apache.jetspeed.page.document.psml;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -34,7 +34,7 @@
 import org.apache.jetspeed.cache.file.FileCache;
 import org.apache.jetspeed.cache.file.FileCacheEntry;
 import org.apache.jetspeed.cache.file.FileCacheEventListener;
-import org.apache.jetspeed.om.folder.impl.FolderImpl;
+import org.apache.jetspeed.om.folder.psml.FolderImpl;
 import org.apache.jetspeed.om.page.Document;
 import org.apache.jetspeed.om.page.psml.AbstractBaseElement;
 import org.apache.jetspeed.page.PageNotFoundException;
@@ -55,6 +55,15 @@
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderAdapter;
+
+import org.apache.jetspeed.page.document.DocumentException;
+import org.apache.jetspeed.page.document.DocumentHandlerFactory;
+import org.apache.jetspeed.page.document.DocumentNotFoundException;
+import org.apache.jetspeed.page.document.FailedToDeleteDocumentException;
+import org.apache.jetspeed.page.document.FailedToUpdateDocumentException;
+import org.apache.jetspeed.page.document.Node;
+import org.apache.jetspeed.page.document.NodeException;
+import org.apache.jetspeed.page.document.NodeNotFoundException;
 
 /**
  * <p>

Copied: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/DocumentHandlerFactoryImpl.java (from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/DocumentHandlerFactoryImpl.java)
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/DocumentHandlerFactoryImpl.java?p2=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/DocumentHandlerFactoryImpl.java&p1=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/DocumentHandlerFactoryImpl.java&r1=306811&r2=314803&rev=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/DocumentHandlerFactoryImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/DocumentHandlerFactoryImpl.java Tue Oct 11 23:35:19 2005
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jetspeed.page.document;
+package org.apache.jetspeed.page.document.psml;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -25,6 +25,8 @@
 import org.apache.jetspeed.page.document.FolderHandler;
 import org.apache.jetspeed.page.document.UnsupportedDocumentTypeException;
 import org.apache.jetspeed.util.ArgUtil;
+
+import org.apache.jetspeed.page.document.Node;
 
 /**
  * <p>

Copied: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java (from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/FileSystemFolderHandler.java)
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java?p2=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java&p1=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/FileSystemFolderHandler.java&r1=306811&r2=314803&rev=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/FileSystemFolderHandler.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java Tue Oct 11 23:35:19 2005
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jetspeed.page.document;
+package org.apache.jetspeed.page.document.psml;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -30,8 +30,21 @@
 import org.apache.jetspeed.om.folder.FolderNotFoundException;
 import org.apache.jetspeed.om.folder.InvalidFolderException;
 import org.apache.jetspeed.om.folder.Reset;
-import org.apache.jetspeed.om.folder.impl.FolderImpl;
+import org.apache.jetspeed.om.folder.psml.FolderImpl;
 import org.apache.jetspeed.om.page.Document;
+
+import org.apache.jetspeed.page.document.DocumentHandler;
+import org.apache.jetspeed.page.document.DocumentHandlerFactory;
+import org.apache.jetspeed.page.document.DocumentNotFoundException;
+import org.apache.jetspeed.page.document.FailedToDeleteDocumentException;
+import org.apache.jetspeed.page.document.FailedToDeleteFolderException;
+import org.apache.jetspeed.page.document.FailedToUpdateDocumentException;
+import org.apache.jetspeed.page.document.FailedToUpdateFolderException;
+import org.apache.jetspeed.page.document.FolderHandler;
+import org.apache.jetspeed.page.document.Node;
+import org.apache.jetspeed.page.document.NodeException;
+import org.apache.jetspeed.page.document.NodeSet;
+import org.apache.jetspeed.page.document.UnsupportedDocumentTypeException;
 
 /**
  * <p>

Copied: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/NodeOrderCompartaor.java (from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/NodeOrderCompartaor.java)
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/NodeOrderCompartaor.java?p2=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/NodeOrderCompartaor.java&p1=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/NodeOrderCompartaor.java&r1=306811&r2=314803&rev=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/NodeOrderCompartaor.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/NodeOrderCompartaor.java Tue Oct 11 23:35:19 2005
@@ -4,7 +4,7 @@
  * TODO To change the template for this generated file go to
  * Window - Preferences - Java - Code Generation - Code and Comments
  */
-package org.apache.jetspeed.page.document;
+package org.apache.jetspeed.page.document.psml;
 
 import java.util.Comparator;
 import java.util.List;
@@ -106,4 +106,4 @@
         
     }
 
-}
\ No newline at end of file
+}

Copied: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/NodeSetImpl.java (from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/NodeSetImpl.java)
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/NodeSetImpl.java?p2=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/NodeSetImpl.java&p1=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/NodeSetImpl.java&r1=306811&r2=314803&rev=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/NodeSetImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/NodeSetImpl.java Tue Oct 11 23:35:19 2005
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.jetspeed.page.document;
+package org.apache.jetspeed.page.document.psml;
 
 import java.util.Comparator;
 import java.util.HashMap;
@@ -21,6 +21,9 @@
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.regex.Pattern;
+
+import org.apache.jetspeed.page.document.Node;
+import org.apache.jetspeed.page.document.NodeSet;
 
 /**
  * <p>

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/AbstractPageManager.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/AbstractPageManager.java?rev=314803&r1=314802&r2=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/AbstractPageManager.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/AbstractPageManager.java Tue Oct 11 23:35:19 2005
@@ -33,12 +33,12 @@
 import org.apache.jetspeed.om.folder.MenuIncludeDefinition;
 import org.apache.jetspeed.om.folder.MenuOptionsDefinition;
 import org.apache.jetspeed.om.folder.MenuSeparatorDefinition;
-import org.apache.jetspeed.om.folder.impl.FolderImpl;
-import org.apache.jetspeed.om.folder.impl.MenuDefinitionImpl;
-import org.apache.jetspeed.om.folder.impl.MenuExcludeDefinitionImpl;
-import org.apache.jetspeed.om.folder.impl.MenuIncludeDefinitionImpl;
-import org.apache.jetspeed.om.folder.impl.MenuOptionsDefinitionImpl;
-import org.apache.jetspeed.om.folder.impl.MenuSeparatorDefinitionImpl;
+import org.apache.jetspeed.om.folder.psml.FolderImpl;
+import org.apache.jetspeed.om.folder.psml.MenuDefinitionImpl;
+import org.apache.jetspeed.om.folder.psml.MenuExcludeDefinitionImpl;
+import org.apache.jetspeed.om.folder.psml.MenuIncludeDefinitionImpl;
+import org.apache.jetspeed.om.folder.psml.MenuOptionsDefinitionImpl;
+import org.apache.jetspeed.om.folder.psml.MenuSeparatorDefinitionImpl;
 import org.apache.jetspeed.om.page.Fragment;
 import org.apache.jetspeed.om.page.Link;
 import org.apache.jetspeed.om.page.Page;

Copied: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java (from r306811, portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/CastorXmlPageManager.java)
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java?p2=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java&p1=portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/CastorXmlPageManager.java&r1=306811&r2=314803&rev=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/CastorXmlPageManager.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java Tue Oct 11 23:35:19 2005
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.jetspeed.page.impl;
+package org.apache.jetspeed.page.psml;
 
 import java.io.FileNotFoundException;
 import java.util.List;
@@ -30,7 +30,7 @@
 import org.apache.jetspeed.om.folder.Folder;
 import org.apache.jetspeed.om.folder.FolderNotFoundException;
 import org.apache.jetspeed.om.folder.InvalidFolderException;
-import org.apache.jetspeed.om.folder.impl.FolderImpl;
+import org.apache.jetspeed.om.folder.psml.FolderImpl;
 import org.apache.jetspeed.om.page.ContentPage;
 import org.apache.jetspeed.om.page.Link;
 import org.apache.jetspeed.om.page.Page;
@@ -45,8 +45,9 @@
 import org.apache.jetspeed.page.document.FolderHandler;
 import org.apache.jetspeed.page.document.Node;
 import org.apache.jetspeed.page.document.NodeException;
-import org.apache.jetspeed.page.document.NodeSetImpl;
 import org.apache.jetspeed.page.document.UnsupportedDocumentTypeException;
+import org.apache.jetspeed.page.document.psml.NodeSetImpl;
+import org.apache.jetspeed.page.impl.AbstractPageManager;
 
 /**
  * This service is responsible for loading and saving PSML pages serialized to

Modified: portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java?rev=314803&r1=314802&r2=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java Tue Oct 11 23:35:19 2005
@@ -48,15 +48,15 @@
 import org.apache.jetspeed.om.page.Page;
 import org.apache.jetspeed.om.page.PageSecurity;
 import org.apache.jetspeed.om.page.Property;
-import org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler;
 import org.apache.jetspeed.page.document.DocumentHandler;
 import org.apache.jetspeed.page.document.DocumentHandlerFactory;
-import org.apache.jetspeed.page.document.DocumentHandlerFactoryImpl;
 import org.apache.jetspeed.page.document.DocumentNotFoundException;
 import org.apache.jetspeed.page.document.FailedToDeleteFolderException;
-import org.apache.jetspeed.page.document.FileSystemFolderHandler;
 import org.apache.jetspeed.page.document.FolderHandler;
-import org.apache.jetspeed.page.impl.CastorXmlPageManager;
+import org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler;
+import org.apache.jetspeed.page.document.psml.DocumentHandlerFactoryImpl;
+import org.apache.jetspeed.page.document.psml.FileSystemFolderHandler;
+import org.apache.jetspeed.page.psml.CastorXmlPageManager;
 import org.apache.jetspeed.util.DirectoryHelper;
 
 /**

Modified: portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java?rev=314803&r1=314802&r2=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java Tue Oct 11 23:35:19 2005
@@ -103,11 +103,10 @@
             Folder folder = pageManager.newFolder("/");
             folder.setTitle("Root");
             pageManager.updateFolder(folder);
-            
         }
         catch (Exception e)
         {
-            fail("could not add root folder");
+            fail("could not add root folder: "+e);
         }
     }
     
@@ -118,12 +117,11 @@
             Folder root = pageManager.getFolder("/");
             assertNotNull("folder should be found", root);
             pageManager.removeFolder(root);
-            
         }
         catch (Exception e)
         {
-            fail("could not remove root folder");
+            fail("could not remove root folder: "+e);
         }
         
     }
-}
\ No newline at end of file
+}

Modified: portals/jetspeed-2/trunk/components/portal-site/src/test/JETSPEED-INF/spring/test-spring.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal-site/src/test/JETSPEED-INF/spring/test-spring.xml?rev=314803&r1=314802&r2=314803&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/src/test/JETSPEED-INF/spring/test-spring.xml (original)
+++ portals/jetspeed-2/trunk/components/portal-site/src/test/JETSPEED-INF/spring/test-spring.xml Tue Oct 11 23:35:19 2005
@@ -44,7 +44,7 @@
     
   <!-- DocumentHandlerFactory -->
   <bean id="PsmlDocumentHandler"      
-       class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >         
+       class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >         
        <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
        <constructor-arg index="1"><value>.psml</value></constructor-arg>
        <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.Page</value></constructor-arg>       
@@ -53,7 +53,7 @@
   </bean>
   
   <bean id="LinkDocumentHandler"       
-       class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >         
+       class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >         
        <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
        <constructor-arg index="1"><value>.link</value></constructor-arg>
        <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.Link</value></constructor-arg>       
@@ -62,7 +62,7 @@
   </bean>
   
   <bean id="FolderMetaDataDocumentHandler"         
-       class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >         
+       class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >         
        <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
        <constructor-arg index="1"><value>folder.metadata</value></constructor-arg>
        <constructor-arg index="2" ><value>org.apache.jetspeed.om.folder.FolderMetaData</value></constructor-arg>       
@@ -71,7 +71,7 @@
   </bean>
   
   <bean id="PageSecurityDocumentHandler"       
-       class="org.apache.jetspeed.page.document.CastorFileSystemDocumentHandler" >         
+       class="org.apache.jetspeed.page.document.psml.CastorFileSystemDocumentHandler" >         
        <constructor-arg index="0"><value>/JETSPEED-INF/castor/page-mapping.xml</value></constructor-arg>
        <constructor-arg index="1"><value>page.security</value></constructor-arg>
        <constructor-arg index="2" ><value>org.apache.jetspeed.om.page.PageSecurity</value></constructor-arg>       
@@ -80,7 +80,7 @@
   </bean>
   
   <bean id="DocumentHandlerFactory"        
-       class="org.apache.jetspeed.page.document.DocumentHandlerFactoryImpl" >      
+       class="org.apache.jetspeed.page.document.psml.DocumentHandlerFactoryImpl" >      
         <constructor-arg>
         <map>
           <entry key=".psml">
@@ -101,7 +101,7 @@
   
   <!-- FolderHandler -->
   <bean id="FolderHandler"         
-       class="org.apache.jetspeed.page.document.FileSystemFolderHandler" >         
+       class="org.apache.jetspeed.page.document.psml.FileSystemFolderHandler" >         
        <constructor-arg index="0"><value>target/testdata/pages</value></constructor-arg>
        <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
        <constructor-arg index="2"><ref bean="PageFileCache"/></constructor-arg>        
@@ -110,7 +110,7 @@
   <!-- PageManager -->
   <bean id="org.apache.jetspeed.page.PageManager" 
        name="pageManager"
-       class="org.apache.jetspeed.page.impl.CastorXmlPageManager">         
+       class="org.apache.jetspeed.page.psml.CastorXmlPageManager">         
        <constructor-arg index="0"><ref bean="IdGenerator"/></constructor-arg>
        <constructor-arg index="1"><ref bean="DocumentHandlerFactory"/></constructor-arg>
        <constructor-arg index="2"><ref bean="FolderHandler"/></constructor-arg>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message