incubator-graffito-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clomb...@apache.org
Subject svn commit: r448311 [10/25] - in /incubator/graffito/trunk: ./ api/ api/src/java/org/apache/portals/graffito/context/ api/src/java/org/apache/portals/graffito/exception/ api/src/java/org/apache/portals/graffito/services/core/ api/src/java/org/apache/po...
Date Wed, 20 Sep 2006 19:37:21 GMT
Modified: incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/portlets/util/ServiceAccessor.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/portlets/util/ServiceAccessor.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/portlets/util/ServiceAccessor.java (original)
+++ incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/portlets/util/ServiceAccessor.java Wed Sep 20 12:37:05 2006
@@ -1,88 +1,88 @@
-/*
- * Copyright 2000-2004 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.portals.graffito.portlets.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.jetspeed.services.JetspeedPortletServices;
-import org.apache.jetspeed.services.PortletServices;
-import org.apache.portals.graffito.services.core.ContentModelService;
-import org.apache.portals.graffito.services.core.ContentServerService;
-import org.apache.portals.graffito.services.dm.DocumentModelService;
-import org.apache.portals.graffito.services.search.ContentSearchService;
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.xml.XmlBeanFactory;
-import org.springframework.core.io.InputStreamResource;
-
-/**
- * Spring static accessor singleton.
- *
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @version $Id: $
- */
-public class ServiceAccessor
-{
-    private static BeanFactory springFactory = null;
-    
-    private static boolean useJetspeedServices = true;
-
-    public static ContentModelService getModelService()
-    {        
-        return (ContentModelService) getService("ContentModel");
-    }
-
-    public static DocumentModelService getDocumentService()
-    {        
-        return (DocumentModelService) getService("DocumentModel");
-    }
-    
-    public static ContentServerService getServerService()
-    {
-        return (ContentServerService)getService("ContentServer");
-    }
-
-    public static ContentSearchService getSearchService()
-    {
-        return (ContentSearchService)getService("ContentSearch");        
-    }
-    
-    public static BeanFactory getFactory()
-    {
-        return springFactory;
-    }
-
-    static public void initializeSpring(InputStream is)
-    throws IOException
-    {
-        springFactory = new XmlBeanFactory(new InputStreamResource(is));
-        is.close();        
-    }
-        
-    public static Object getService(String serviceName)
-    {
-        if (useJetspeedServices)
-        {
-            // FIXME: better to use jetspeed-portlet.xml to define the requested service            
-            PortletServices services = JetspeedPortletServices.getSingleton();
-            return services.getService(serviceName);            
-        }
-        else
-        {
-            return springFactory.getBean(serviceName);
-        }
-    }
+/*
+ * Copyright 2000-2004 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.portals.graffito.portlets.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.jetspeed.services.JetspeedPortletServices;
+import org.apache.jetspeed.services.PortletServices;
+import org.apache.portals.graffito.services.core.ContentModelService;
+import org.apache.portals.graffito.services.core.ContentServerService;
+import org.apache.portals.graffito.services.dm.DocumentModelService;
+import org.apache.portals.graffito.services.search.ContentSearchService;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.core.io.InputStreamResource;
+
+/**
+ * Spring static accessor singleton.
+ *
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id: $
+ */
+public class ServiceAccessor
+{
+    private static BeanFactory springFactory = null;
+    
+    private static boolean useJetspeedServices = true;
+
+    public static ContentModelService getModelService()
+    {        
+        return (ContentModelService) getService("ContentModel");
+    }
+
+    public static DocumentModelService getDocumentService()
+    {        
+        return (DocumentModelService) getService("DocumentModel");
+    }
+    
+    public static ContentServerService getServerService()
+    {
+        return (ContentServerService)getService("ContentServer");
+    }
+
+    public static ContentSearchService getSearchService()
+    {
+        return (ContentSearchService)getService("ContentSearch");        
+    }
+    
+    public static BeanFactory getFactory()
+    {
+        return springFactory;
+    }
+
+    static public void initializeSpring(InputStream is)
+    throws IOException
+    {
+        springFactory = new XmlBeanFactory(new InputStreamResource(is));
+        is.close();        
+    }
+        
+    public static Object getService(String serviceName)
+    {
+        if (useJetspeedServices)
+        {
+            // FIXME: better to use jetspeed-portlet.xml to define the requested service            
+            PortletServices services = JetspeedPortletServices.getSingleton();
+            return services.getService(serviceName);            
+        }
+        else
+        {
+            return springFactory.getBean(serviceName);
+        }
+    }
 }

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/portlets/util/ServiceAccessor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/servlets/FileServlet.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/servlets/FileServlet.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/servlets/FileServlet.java (original)
+++ incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/servlets/FileServlet.java Wed Sep 20 12:37:05 2006
@@ -1,75 +1,75 @@
-/*
- * Copyright 2000-2004 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.portals.graffito.servlets;
-        
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.portals.graffito.exception.ContentManagementException;
-import org.apache.portals.graffito.model.dm.Document;
-import org.apache.portals.graffito.portlets.util.ServiceAccessor;
-import org.apache.portals.graffito.services.dm.DocumentModelService;
-
-public class FileServlet extends HttpServlet {
-	
-	public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
-	{
-		String uri = request.getParameter("uri");
-		
-		DocumentModelService cms = ServiceAccessor.getDocumentService();
-		try {
-			Document doc = cms.getDocument(uri);
-			response.setContentType(doc.getContentType());
-			
-			drain(doc.getDocumentStream().getContentStream(), response.getOutputStream());
-		} catch (ContentManagementException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		
-	}
-	
-	private static final int BLOCK_SIZE = 4096;
-
-    public static void drain(InputStream r,OutputStream w) throws IOException
-    {
-        byte[] bytes=new byte[BLOCK_SIZE];
-        try
-        {
-          int length=r.read(bytes);
-          while(length!=-1)
-          {
-              if(length!=0)
-                  {
-                      w.write(bytes,0,length);
-                  }
-              length=r.read(bytes);
-          }
-      }
-      finally
-      {
-        bytes=null;
-      }
-
-    }
-
-}
+/*
+ * Copyright 2000-2004 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.portals.graffito.servlets;
+        
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.portals.graffito.exception.ContentManagementException;
+import org.apache.portals.graffito.model.dm.Document;
+import org.apache.portals.graffito.portlets.util.ServiceAccessor;
+import org.apache.portals.graffito.services.dm.DocumentModelService;
+
+public class FileServlet extends HttpServlet {
+	
+	public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
+	{
+		String uri = request.getParameter("uri");
+		
+		DocumentModelService cms = ServiceAccessor.getDocumentService();
+		try {
+			Document doc = cms.getDocument(uri);
+			response.setContentType(doc.getContentType());
+			
+			drain(doc.getDocumentStream().getContentStream(), response.getOutputStream());
+		} catch (ContentManagementException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+	}
+	
+	private static final int BLOCK_SIZE = 4096;
+
+    public static void drain(InputStream r,OutputStream w) throws IOException
+    {
+        byte[] bytes=new byte[BLOCK_SIZE];
+        try
+        {
+          int length=r.read(bytes);
+          while(length!=-1)
+          {
+              if(length!=0)
+                  {
+                      w.write(bytes,0,length);
+                  }
+              length=r.read(bytes);
+          }
+      }
+      finally
+      {
+        bytes=null;
+      }
+
+    }
+
+}

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/servlets/FileServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/servlets/SpringInitializerServlet.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/servlets/SpringInitializerServlet.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/servlets/SpringInitializerServlet.java (original)
+++ incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/servlets/SpringInitializerServlet.java Wed Sep 20 12:37:05 2006
@@ -1,65 +1,65 @@
-/*
- * Copyright 2000-2004 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.portals.graffito.servlets;
-
-import java.io.InputStream;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-
-import org.apache.portals.graffito.portlets.util.ServiceAccessor;
-
-/**
- * Initialize Spring at servlet startup
- *
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @version $Id: SpringInitializerServlet.java,v 1.2 2005/02/16 22:58:36 david Exp $
- */
-public class SpringInitializerServlet
-    extends HttpServlet
-{        
-    public static final long serialVersionUID = 1;
-
-    
-    public synchronized final void init(ServletConfig config) 
-    throws ServletException
-    {
-        synchronized (this.getClass())
-        {            
-            super.init(config);
-            ServletContext context = getServletContext();
-
-            try
-            {
-                String assembly = getInitParameter("assembly");                
-                InputStream is = context.getResourceAsStream(assembly);                                
-                ServiceAccessor.initializeSpring(is);                                
-            }
-            catch (Exception e)
-            {
-                e.printStackTrace();
-                throw new ServletException("Failed to load Spring assembly", e);
-            }
-        }
-    }
-
-    public final void destroy()
-    {
-    }
-    
+/*
+ * Copyright 2000-2004 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.portals.graffito.servlets;
+
+import java.io.InputStream;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+
+import org.apache.portals.graffito.portlets.util.ServiceAccessor;
+
+/**
+ * Initialize Spring at servlet startup
+ *
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id: SpringInitializerServlet.java,v 1.2 2005/02/16 22:58:36 david Exp $
+ */
+public class SpringInitializerServlet
+    extends HttpServlet
+{        
+    public static final long serialVersionUID = 1;
+
+    
+    public synchronized final void init(ServletConfig config) 
+    throws ServletException
+    {
+        synchronized (this.getClass())
+        {            
+            super.init(config);
+            ServletContext context = getServletContext();
+
+            try
+            {
+                String assembly = getInitParameter("assembly");                
+                InputStream is = context.getResourceAsStream(assembly);                                
+                ServiceAccessor.initializeSpring(is);                                
+            }
+            catch (Exception e)
+            {
+                e.printStackTrace();
+                throw new ServletException("Failed to load Spring assembly", e);
+            }
+        }
+    }
+
+    public final void destroy()
+    {
+    }
+    
 }

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/servlets/SpringInitializerServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml (original)
+++ incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml Wed Sep 20 12:37:05 2006
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2004 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.
--->
-<portlet-app id="graffito-portlets" version="1.0" 
-    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" 
-    xmlns:js="http://portals.apache.org/jetspeed" 
-    xmlns:dc="http://www.purl.org/dc">
-    
-    <portlet>
-        <portlet-name>graffitoTree</portlet-name>
-        <dc:title>Graffito Tree Portlet</dc:title>
-        <dc:creator>Graffito Team</dc:creator>
-    </portlet>
-    <portlet>
-        <portlet-name>graffitoDocViewer</portlet-name>
-        <dc:title>Graffito Document Viewer Portlet</dc:title>
-        <dc:creator>Graffito Team</dc:creator>
-    </portlet>			
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2004 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.
+-->
+<portlet-app id="graffito-portlets" version="1.0" 
+    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" 
+    xmlns:js="http://portals.apache.org/jetspeed" 
+    xmlns:dc="http://www.purl.org/dc">
+    
+    <portlet>
+        <portlet-name>graffitoTree</portlet-name>
+        <dc:title>Graffito Tree Portlet</dc:title>
+        <dc:creator>Graffito Team</dc:creator>
+    </portlet>
+    <portlet>
+        <portlet-name>graffitoDocViewer</portlet-name>
+        <dc:title>Graffito Document Viewer Portlet</dc:title>
+        <dc:creator>Graffito Team</dc:creator>
+    </portlet>			
 </portlet-app>

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/web.xml?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/web.xml (original)
+++ incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/web.xml Wed Sep 20 12:37:05 2006
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright 2004 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.
--->
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-	<display-name>Graffito Demo</display-name>
-	<description>Graffito Demo Application</description>
-	<servlet>
-		<servlet-name>JetspeedContainer</servlet-name>
-		<display-name>Jetspeed Container</display-name>
-		<description>MVC Servlet for Jetspeed Portlet Applications</description>
-		<servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
-	</servlet>
-	
-	<servlet>
-		<servlet-name>GraffitoFile</servlet-name>
-		<display-name>Graffito File servlet</display-name>
-		<description>Servlet used to view a document</description>
-		<servlet-class>org.apache.portals.graffito.servlets.FileServlet</servlet-class>
-	</servlet>
-		
-	<servlet-mapping>
-		<servlet-name> JetspeedContainer </servlet-name>
-		<url-pattern> /container/* </url-pattern>
-	</servlet-mapping>
-	
-	<servlet-mapping>
-		<servlet-name>GraffitoFile</servlet-name>
-		<url-pattern>/FileServlet/*</url-pattern>
-	</servlet-mapping>	
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2004 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.
+-->
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+	<display-name>Graffito Demo</display-name>
+	<description>Graffito Demo Application</description>
+	<servlet>
+		<servlet-name>JetspeedContainer</servlet-name>
+		<display-name>Jetspeed Container</display-name>
+		<description>MVC Servlet for Jetspeed Portlet Applications</description>
+		<servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
+	</servlet>
+	
+	<servlet>
+		<servlet-name>GraffitoFile</servlet-name>
+		<display-name>Graffito File servlet</display-name>
+		<description>Servlet used to view a document</description>
+		<servlet-class>org.apache.portals.graffito.servlets.FileServlet</servlet-class>
+	</servlet>
+		
+	<servlet-mapping>
+		<servlet-name> JetspeedContainer </servlet-name>
+		<url-pattern> /container/* </url-pattern>
+	</servlet-mapping>
+	
+	<servlet-mapping>
+		<servlet-name>GraffitoFile</servlet-name>
+		<url-pattern>/FileServlet/*</url-pattern>
+	</servlet-mapping>	
 </web-app>

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/checkstyle.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/commons/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/commons/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/commons/project.xml
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/commons/project.xml?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/commons/project.xml (original)
+++ incubator/graffito/trunk/commons/project.xml Wed Sep 20 12:37:05 2006
@@ -1 +1,78 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2004 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.
-->
<project>
<extend>${basedir}/../project.xml</extend>
  <pomVersion>3</pomVersion>
  <id>graffito-commons</id>
  <groupId>org.apache.portals.graffito</groupId>
  <name>Graffito Commons</name>
  <currentVersion>1.0-a1-dev</currentVersion>
  <package>org.apache.portals.graffito</package>
  <description>
	  Tools, utility classes and exceptions used in the different Graffi
 to subproject
  </description>
  <shortDescription>Graffito Commons </shortDescription>

<repository>
    <connection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/commons</connection>
    <developerConnection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/commons</developerConnection>
    <url>http://svn.apache.org/viewcvs</url>
  </repository>
  
  <dependencies>
    <dependency>
      <id>graffito-api</id>
      <groupId>org.apache.portals.graffito</groupId>
      <version>${graffito.version}</version>
      <properties>
        <war.bundle>true</war.bundle>
      </properties>
    </dependency>    
  </dependencies>
  <build>
    <sourceDirectory>src/java</sourceDirectory>
     <resources>
      <resource>
        <directory>${basedir}/src/java</directory>
        <excludes>
          <exclude>**/*.java</exclude>
        </excludes>
      </resource>
    </resources>
    <unitTestSourceDirectory>src/test</unitTestSourc
 eDirectory>
    <unitTest>
       <includes>
        <include>**/Test*.java</include>
      </includes>
      <excludes>
      </excludes>
      <resources>
        <resource>
          <directory>${basedir}/src/test</directory>
          <excludes>
          <exclude>**/*.java</exclude>
          </excludes>
        </resource>
      </resources>
    </unitTest>
    
  </build>
  <reports>  
	  <report>maven-pmd-plugin</report>
	  <report>maven-junit-report-plugin</report>
	  <report>maven-javadoc-plugin</report>
  </reports>     
</project>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2004 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.
+-->
+<project>
+<extend>${basedir}/../project.xml</extend>
+  <pomVersion>3</pomVersion>
+  <id>graffito-commons</id>
+  <groupId>org.apache.portals.graffito</groupId>
+  <name>Graffito Commons</name>
+  <currentVersion>1.0-a1-dev</currentVersion>
+  <package>org.apache.portals.graffito</package>
+  <description>
+	  Tools, utility classes and exceptions used in the different Graffito subproject
+  </description>
+  <shortDescription>Graffito Commons </shortDescription>
+
+<repository>
+    <connection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/commons</connection>
+    <developerConnection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/commons</developerConnection>
+    <url>http://svn.apache.org/viewcvs</url>
+  </repository>
+  
+  <dependencies>
+    <dependency>
+      <id>graffito-api</id>
+      <groupId>org.apache.portals.graffito</groupId>
+      <version>${graffito.version}</version>
+      <properties>
+        <war.bundle>true</war.bundle>
+      </properties>
+    </dependency>    
+  </dependencies>
+  <build>
+    <sourceDirectory>src/java</sourceDirectory>
+     <resources>
+      <resource>
+        <directory>${basedir}/src/java</directory>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </resource>
+    </resources>
+    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+    <unitTest>
+       <includes>
+        <include>**/Test*.java</include>
+      </includes>
+      <excludes>
+      </excludes>
+      <resources>
+        <resource>
+          <directory>${basedir}/src/test</directory>
+          <excludes>
+          <exclude>**/*.java</exclude>
+          </excludes>
+        </resource>
+      </resources>
+    </unitTest>
+    
+  </build>
+  <reports>  
+	  <report>maven-pmd-plugin</report>
+	  <report>maven-junit-report-plugin</report>
+	  <report>maven-javadoc-plugin</report>
+  </reports>     
+</project>

Propchange: incubator/graffito/trunk/commons/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/commons/src/java/org/apache/portals/graffito/util/StreamUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/commons/src/java/org/apache/portals/graffito/util/UriUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/commons/src/test/org/apache/portals/graffito/util/TestUriUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/components/maven.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/components/project.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/components/project.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/components/src/java/META-INF/graffito-access-control.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/components/src/java/META-INF/graffito-without-access-control.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/components/src/java/META-INF/repository_graffito.xml
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/components/src/java/META-INF/repository_graffito.xml?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/components/src/java/META-INF/repository_graffito.xml (original)
+++ incubator/graffito/trunk/components/src/java/META-INF/repository_graffito.xml Wed Sep 20 12:37:05 2006
@@ -1,884 +1,884 @@
-<!-- 
- Copyright 2002-2004 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.
- -->
- <!--
-    G R A F F I T O     S T O R E 
--->	
-<descriptor-repository version="1.0">
-
-	<class-descriptor class="org.apache.portals.graffito.model.core.CmsObject">
-	      <extent-class class-ref="org.apache.portals.graffito.model.core.impl.FolderImpl" />
- 	      <extent-class class-ref="org.apache.portals.graffito.model.core.impl.ContentImpl" />
-	      <extent-class class-ref="org.apache.portals.graffito.model.core.impl.LinkImpl" />		  
- 	      <extent-class class-ref="org.apache.portals.graffito.model.core.impl.VersionnedContentImpl" />		  
-	      <extent-class class-ref="org.apache.portals.graffito.model.dm.impl.DocumentImpl" />
-	</class-descriptor>
-
-	<class-descriptor class="org.apache.portals.graffito.model.core.Folder">
-	      <extent-class class-ref="org.apache.portals.graffito.model.core.impl.FolderImpl" />
-	</class-descriptor>    
-	
-	<class-descriptor class="org.apache.portals.graffito.model.core.Content">
-	      <extent-class class-ref="org.apache.portals.graffito.model.core.impl.ContentImpl" />
-		  <extent-class class-ref="org.apache.portals.graffito.model.core.VersionnedContent" />
-		  <extent-class class-ref="org.apache.portals.graffito.model.dm.Document" />
-	</class-descriptor> 	   
-
-	<class-descriptor class="org.apache.portals.graffito.model.core.VersionnedContent">
-	      <extent-class class-ref="org.apache.portals.graffito.model.core.impl.VersionnedContentImpl" />
-	      <extent-class class-ref="org.apache.portals.graffito.model.dm.impl.DocumentImpl" />		  
-	</class-descriptor> 	   
-
-	<class-descriptor class="org.apache.portals.graffito.model.core.Link">
-	      <extent-class class-ref="org.apache.portals.graffito.model.core.impl.LinkImpl" />
-	</class-descriptor>  	
-	<class-descriptor class="org.apache.portals.graffito.model.dm.Document">
-	      <extent-class class-ref="org.apache.portals.graffito.model.dm.impl.DocumentImpl" />
-	</class-descriptor> 
-	
-	<class-descriptor class="org.apache.portals.graffito.model.dm.DocumentStream">
-	      <extent-class class-ref="org.apache.portals.graffito.model.dm.impl.DocumentStreamImpl" />
-	</class-descriptor>	
-	
-	<class-descriptor class="org.apache.portals.graffito.model.core.HistoryElement">
-	      <extent-class class-ref="org.apache.portals.graffito.model.core.impl.HistoryElementImpl" />
-	</class-descriptor>  	
-	
-	<class-descriptor
-	    class="org.apache.portals.graffito.model.core.impl.FolderImpl"
-	    table="CMS_OBJECT" >
-	    <field-descriptor 
-		name="objectId" 
-		jdbc-type="BIGINT"
-		column="OBJECT_ID" 
-		primarykey="true"
-		autoincrement="true"
-	    />
-	    
-	    <field-descriptor 
-		name="parentId" 
-		jdbc-type="BIGINT"
-		column="PARENT_ID" 
-		
-	    />
-					    	    				
-	    <field-descriptor 
-		name="name" 
-		jdbc-type="VARCHAR"
-		column="NAME" 
-	    />
-		
-	    <field-descriptor 
-		name="uri" 
-		jdbc-type="VARCHAR"
-		column="URI" 
-	    />
-	
-	    <field-descriptor 
-		name="creationDate" 
-		jdbc-type="TIMESTAMP"
-		column="CREATION_DATE" 
-	       
-	    />
-	    <field-descriptor 
-		name="lastModified" 
-		jdbc-type="TIMESTAMP"
-		column="DELTA" 
-		
-	    />
-	
-	    <field-descriptor 
-		name="ojbConcreteClass" 
-		jdbc-type="VARCHAR"
-		column="CLASS_NAME"                 
-	    />
-	    
-	    <reference-descriptor name="parentFolder" 
-		 class-ref="org.apache.portals.graffito.model.core.Folder"
-		 proxy="true" 
-		 auto-retrieve="true"
-		 auto-update="link" 
-		 auto-delete="false" >
-		 <foreignkey field-ref="parentId"/>
-	    </reference-descriptor> 
-	    
-	   <collection-descriptor
-	     name="folders"
-	     element-class-ref="org.apache.portals.graffito.model.core.Folder"        
-	     auto-retrieve="true"      
-	     auto-update="link"
-	     auto-delete="true"
-	     proxy="true"
-             > 
-	       <inverse-foreignkey field-ref="parentId"/>
-	   </collection-descriptor>    
-	
-	
-	   <collection-descriptor
-	     name="contents"
-	     element-class-ref="org.apache.portals.graffito.model.core.Content"   
-	     auto-retrieve="true"      
-	     auto-update="link"
-	     auto-delete="true" 
-	     proxy="true"
-	     > 
-	       <inverse-foreignkey field-ref="parentId"/>
-	   </collection-descriptor>    
-		 
-	   <collection-descriptor
-	     name="properties"
-	     element-class-ref="org.apache.portals.graffito.model.core.impl.PropertyImpl"    
-	     auto-retrieve="true"      
-	     auto-update="true"
-	     auto-delete="true"
-	     proxy="true" > 
-		 
-	       <inverse-foreignkey field-ref="objectId"/>
-	   </collection-descriptor> 	    
-	</class-descriptor>
-
-	<class-descriptor
-	    class="org.apache.portals.graffito.model.core.impl.ContentImpl"
-	    table="CMS_OBJECT" >
-	    <field-descriptor 
-		name="objectId" 
-		jdbc-type="BIGINT"
-		column="OBJECT_ID" 
-		primarykey="true"
-		autoincrement="true"
-	    />
-	    
-	    <field-descriptor 
-		name="parentId" 
-		jdbc-type="BIGINT"
-		column="PARENT_ID" 
-		
-	    />
-					    	    				
-	    <field-descriptor 
-		name="name" 
-		jdbc-type="VARCHAR"
-		column="NAME" 
-	    />
-		
-	    <field-descriptor 
-		name="uri" 
-		jdbc-type="VARCHAR"
-		column="URI" 
-	    />
-	
-	    <field-descriptor 
-		name="creationDate" 
-		jdbc-type="TIMESTAMP"
-		column="CREATION_DATE" 
-	       
-	    />
-	    <field-descriptor 
-		name="lastModified" 
-		jdbc-type="TIMESTAMP"
-		column="DELTA" 
-		
-	    />
-	
-	    <field-descriptor 
-		name="ojbConcreteClass" 
-		jdbc-type="VARCHAR"
-		column="CLASS_NAME"                 
-	    />
-	    
-	    <reference-descriptor name="parentFolder" 
-		 class-ref="org.apache.portals.graffito.model.core.Folder"
-		 proxy="true" 
-		 auto-retrieve="true"
-		 auto-update="link" 
-		 auto-delete="false" >
-		 <foreignkey field-ref="parentId"/>
-	    </reference-descriptor> 
-	          
-	
-	   <collection-descriptor
-	     name="properties"
-	     element-class-ref="org.apache.portals.graffito.model.core.impl.PropertyImpl"    
-	     auto-retrieve="true"      
-	     auto-update="true"
-	     auto-delete="true"
-	     proxy="true" > 		 
-	       <inverse-foreignkey field-ref="objectId"/>
-	   </collection-descriptor>    
-	</class-descriptor>
-	
-	<class-descriptor
-	    class="org.apache.portals.graffito.model.core.impl.VersionnedContentImpl"
-	    table="CMS_OBJECT" >
-	    
-	    <field-descriptor 
-		name="objectId" 
-		jdbc-type="BIGINT"
-		column="OBJECT_ID" 
-		primarykey="true"
-		autoincrement="true"
-	    />
-	    
-	    <field-descriptor 
-		name="versionNumber" 
-		jdbc-type="VARCHAR"
-		column="VERSION_NUM"		
-	    />  	    
-	    
-	    <field-descriptor 
-		name="isLastVersion" 
-		jdbc-type="INTEGER"
-		column="IS_LAST_VERSION"	
-               conversion="org.apache.ojb.broker.accesslayer.conversions.Boolean2IntFieldConversion"		
-	    />  		    
-		
-	    <field-descriptor 
-		name="parentId" 
-		jdbc-type="BIGINT"
-		column="PARENT_ID" 		
-	    />
-	   	 
-	    <field-descriptor 
-		name="name" 
-		jdbc-type="VARCHAR"
-		column="NAME" 
-	    />
-		
-	    <field-descriptor 
-		name="uri" 
-		jdbc-type="VARCHAR"
-		column="URI" 
-	    />
-	
-	    <field-descriptor 
-		name="creationDate" 
-		jdbc-type="TIMESTAMP"
-		column="CREATION_DATE" 
-	       
-	    />
-	    <field-descriptor 
-		name="lastModified" 
-		jdbc-type="TIMESTAMP"
-		column="DELTA" 
-		
-	    />
-				
-	    
-	    <field-descriptor 
-		name="ojbConcreteClass" 
-		jdbc-type="VARCHAR"
-		column="CLASS_NAME"                 
-	    />
-	    
-	    <reference-descriptor name="parentFolder" 
-		 class-ref="org.apache.portals.graffito.model.core.impl.FolderImpl"
-		 proxy="true" 
-		 auto-retrieve="true"
-		 auto-update="link" 
-		 auto-delete="false" >
-		 <foreignkey field-ref="parentId"/>
-	    </reference-descriptor>		
-
-	   <collection-descriptor
-	     name="properties"
-	     element-class-ref="org.apache.portals.graffito.model.core.impl.PropertyImpl"    
-	     auto-retrieve="true"      
-	     auto-update="true"
-	     auto-delete="true"
-	     proxy="true" > 
-		 
-	       <inverse-foreignkey field-ref="objectId"/>
-	   </collection-descriptor> 	    		    
-
-	   <!-- collection-descriptor
-	     name="historyElements"
-	     element-class-ref="org.apache.portals.graffito.model.core.HistoryElement"   
-	     auto-retrieve="true"      
-	      auto-update="false"
-	     auto-delete="true" 
-	     proxy="true"
-	     > 
-	       <inverse-foreignkey field-ref="versionnedContentId"/>
-	   </collection-descriptor -->    
-
-	</class-descriptor>
-	
-	
-	<class-descriptor
-	    class="org.apache.portals.graffito.model.core.impl.LinkImpl"
-	    table="CMS_OBJECT" >
-	    <field-descriptor 
-		name="objectId" 
-		jdbc-type="BIGINT"
-		column="OBJECT_ID" 
-		primarykey="true"
-		autoincrement="true"
-	    />
-			    	      		    
-		
-	    <field-descriptor 
-		name="parentId" 
-		jdbc-type="BIGINT"
-		column="PARENT_ID" 
-		
-	    />
-	    
-	    <field-descriptor 
-		name="targetCmsObjectId" 
-		jdbc-type="BIGINT"
-		column="LINK_TARGET_ID" 
-		
-	    />
-		
-	    <field-descriptor 
-		name="name" 
-		jdbc-type="VARCHAR"
-		column="NAME" 
-	    />
-		
-	    <field-descriptor 
-		name="uri" 
-		jdbc-type="VARCHAR"
-		column="URI" 
-	    />
-	
-	    <field-descriptor 
-		name="creationDate" 
-		jdbc-type="TIMESTAMP"
-		column="CREATION_DATE" 
-	       
-	    />
-	    <field-descriptor 
-		name="lastModified" 
-		jdbc-type="TIMESTAMP"
-		column="DELTA" 
-		
-	    />
-	
-	    <field-descriptor 
-		name="ojbConcreteClass" 
-		jdbc-type="VARCHAR"
-		column="CLASS_NAME"                 
-	    />
-	    
-	    <reference-descriptor name="parentFolder" 
-		 class-ref="org.apache.portals.graffito.model.core.impl.FolderImpl"
-		 proxy="true" 
-		 auto-retrieve="true"
-		 auto-update="link" 
-		 auto-delete="false" >
-		 <foreignkey field-ref="parentId"/>
-	    </reference-descriptor> 
-	    
-	    <reference-descriptor name="targetCmsObject" 
-		 class-ref="org.apache.portals.graffito.model.core.CmsObject"
-		 proxy="true" 
-		 auto-retrieve="true"
-		 auto-update="true" 
-		 auto-delete="false" >
-		 <foreignkey field-ref="targetCmsObjectId"/>
-	    </reference-descriptor>    
-
-	   <collection-descriptor
-	     name="properties"
-	     element-class-ref="org.apache.portals.graffito.model.core.impl.PropertyImpl"    
-	     auto-retrieve="true"      
-	     auto-update="true"
-	     auto-delete="true"
-	     proxy="true" > 
-		 
-	       <inverse-foreignkey field-ref="objectId"/>
-	   </collection-descriptor> 	    
-	</class-descriptor>	    
-	
-	
-	<class-descriptor
-	    class="org.apache.portals.graffito.model.dm.impl.DocumentImpl"
-	    table="CMS_OBJECT" >
-	    
-	    <field-descriptor 
-		name="objectId" 
-		jdbc-type="BIGINT"
-		column="OBJECT_ID" 
-		primarykey="true"
-		autoincrement="true"
-	    />
-
-	    <field-descriptor 
-		name="documentStreamId" 
-		jdbc-type="BIGINT"
-		column="DOCUMENT_STREAM_ID" 
-	    />	    
-	    
-	    <field-descriptor 
-		name="versionNumber" 
-		jdbc-type="VARCHAR"
-		column="VERSION_NUM"		
-	    />  	    
-	    
-	    <field-descriptor 
-		name="isLastVersion" 
-		jdbc-type="INTEGER"
-		column="IS_LAST_VERSION"	
-               conversion="org.apache.ojb.broker.accesslayer.conversions.Boolean2IntFieldConversion"		
-	    />  		    
-		
-	    <field-descriptor 
-		name="parentId" 
-		jdbc-type="BIGINT"
-		column="PARENT_ID" 		
-	    />
-	   	 
-	    <field-descriptor 
-		name="name" 
-		jdbc-type="VARCHAR"
-		column="NAME" 
-	    />
-	    <field-descriptor 
-		name="uri" 
-		jdbc-type="VARCHAR"
-		column="URI" 
-	    />
-	
-	    <field-descriptor 
-		name="creationDate" 
-		jdbc-type="TIMESTAMP"
-		column="CREATION_DATE" 
-	       
-	    />
-	    <field-descriptor 
-		name="lastModified" 
-		jdbc-type="TIMESTAMP"
-		column="DELTA" 
-		
-	    />
-		
-  
-	    <field-descriptor 
-		name="size" 
-		jdbc-type="BIGINT"
-		column="CONTENT_SIZE"
-	    />
-		
-
-	
-	    <field-descriptor 
-		name="contentType" 
-		jdbc-type="VARCHAR"
-		column="CONTENT_TYPE" 
-	    />    
-	    
-	    <field-descriptor 
-		name="ojbConcreteClass" 
-		jdbc-type="VARCHAR"
-		column="CLASS_NAME"                 
-	    />
-	    
-	    <reference-descriptor name="parentFolder" 
-		 class-ref="org.apache.portals.graffito.model.core.impl.FolderImpl"
-		 proxy="true" 
-		 auto-retrieve="true"
-		 auto-update="link" 
-		 auto-delete="false" >
-		 <foreignkey field-ref="parentId"/>
-	    </reference-descriptor>		
-
-	    <reference-descriptor name="documentStream" 
-		 class-ref="org.apache.portals.graffito.model.dm.impl.DocumentStreamImpl"		 
-		 proxy="true" 
-		 auto-retrieve="true"
-		 auto-update="true" 
-		 auto-delete="true" >
-		 <foreignkey field-ref="documentStreamId"/>
-	    </reference-descriptor>	
-
-	   <collection-descriptor
-	     name="properties"
-	     element-class-ref="org.apache.portals.graffito.model.core.impl.PropertyImpl"    
-	     auto-retrieve="true"      
-	     auto-update="true"
-	     auto-delete="true"
-	     proxy="true" > 
-		 
-	       <inverse-foreignkey field-ref="objectId"/>
-	   </collection-descriptor>     			    
-    
-	</class-descriptor>
-	
-	    
-	<class-descriptor 
-	
-	    class="org.apache.portals.graffito.model.dm.impl.DocumentStreamImpl"
-	    table="DOCUMENT_STREAM" >
-	    
- 	    <field-descriptor 	        
-		name="documentStreamId" 
-		jdbc-type="BIGINT"
-		column="DOCUMENT_STREAM_ID" 
-		primarykey="true"
-                autoincrement="true"		
-	    />
-	      
-	    <field-descriptor 
-		name="content" 
-		jdbc-type="LONGVARBINARY"
-		column="CONTENT"        
-	    /> 
-
-        <field-descriptor
-        name="encoding"
-        jdbc-type="VARCHAR"
-        column="ENCODING"
-        />
-	        
-        <field-descriptor
-        name="isoCode"
-        jdbc-type="VARCHAR"
-        column="ISO_CODE"
-        />			
-	</class-descriptor>
-	
-	<class-descriptor
-	    class="org.apache.portals.graffito.model.core.impl.PropertyImpl"
-	    table="PROPERTY" >
-
-	    <field-descriptor 
-		name="id" 
-		jdbc-type="BIGINT"
-		column="PROPERTY_ID" 
-		primarykey="true"
-		autoincrement="true"
-	    />
-	    
-	    <field-descriptor 
-		name="objectId" 
-		jdbc-type="BIGINT"
-		column="OBJECT_ID" 
-	    />
-
-	    <field-descriptor 
-		name="name" 
-		jdbc-type="VARCHAR"
-		column="NAME" 
-	    />	    
-	    
-	    <field-descriptor 
-		name="value" 
-		jdbc-type="VARCHAR"
-		column="VALUE"		
-	    />  	    
-	    
-	</class-descriptor>
-	
-	<class-descriptor
-	    class="org.apache.portals.graffito.model.core.impl.HistoryElementImpl"
-	    table="VERSION_HISTORY" >
-
-	    <field-descriptor 
-		name="historyElementId" 
-		jdbc-type="BIGINT"
-		column="HISTORY_ID" 
-		primarykey="true"		
-		autoincrement="true"
-	    />
-	    
-	    <field-descriptor 
-		name="versionnedContentId" 
-		jdbc-type="BIGINT"
-		column="OBJECT_ID" 
-		
-	    />
-	    
-	    <field-descriptor 
-		name="previousId" 
-		jdbc-type="BIGINT"
-		column="PREVIOUS_ID" 		
-	    />	    
-	    	    
-	    <reference-descriptor name="versionnedContent" 
-		 class-ref="org.apache.portals.graffito.model.core.impl.VersionnedContentImpl"
-		 proxy="true" 
-		 auto-retrieve="true"
-		 auto-update="object" 
-		 auto-delete="false" >
-		 <foreignkey field-ref="versionnedContentId"/>
-	    </reference-descriptor>		
-
-	    <reference-descriptor name="previous" 
-		 class-ref="org.apache.portals.graffito.model.core.HistoryElement"
-		 proxy="true" 
-		 auto-retrieve="true"
-		 auto-update="link" 
-		 auto-delete="true" >
-		 <foreignkey field-ref="previousId"/>
-	    </reference-descriptor>		
-
-		
-	</class-descriptor>
-	
-	<!--
-	
-		    S E R V E R                   
-	-->
-	
-	<class-descriptor class="org.apache.portals.graffito.model.server.Server">	    		     
-	      <extent-class class-ref="org.apache.portals.graffito.model.server.impl.WebdavServerImpl" />
-	      <extent-class class-ref="org.apache.portals.graffito.model.server.impl.GraffitoServerImpl" />      
-	      <extent-class class-ref="org.apache.portals.graffito.model.server.impl.FileSystemServerImpl" />		  
-	</class-descriptor>       
-	
-	<class-descriptor class="org.apache.portals.graffito.model.server.WebdavServer">
-	      <extent-class class-ref="org.apache.portals.graffito.model.server.impl.WebdavServerImpl" />
-	</class-descriptor>       
-	
-	<class-descriptor class="org.apache.portals.graffito.model.server.GraffitoServer">
-	      <extent-class class-ref="org.apache.portals.graffito.model.server.impl.GraffitoServerImpl" />
-	</class-descriptor>       
-	
-	<class-descriptor class="org.apache.portals.graffito.model.server.FileSystemServer">
-	      <extent-class class-ref="org.apache.portals.graffito.model.server.impl.FileSystemServerImpl" />
-	</class-descriptor>       
-		
-	<class-descriptor
-	    class="org.apache.portals.graffito.model.server.impl.ServerImpl"
-	    table="SERVER"
-	>
-	    <field-descriptor
-		name="serverId"
-		column="SERVER_ID"
-		jdbc-type="INTEGER"
-		primarykey="true"
-		autoincrement="true"
-	    />
-	    <field-descriptor
-		name="scope"
-		column="SCOPE"
-		jdbc-type="VARCHAR"
-	    />
-	    <field-descriptor
-		name="alias"
-		column="ALIAS"
-		jdbc-type="VARCHAR"
-	    />
-	
-	    <field-descriptor
-		name="description"
-		column="DESCRIPTION"
-		jdbc-type="VARCHAR"
-	    />
-	
-	    <field-descriptor
-		name="storeClassName"
-		column="PLUGIN_CLASS_NAME"
-		jdbc-type="VARCHAR"
-	    />
-		
-	    <field-descriptor
-		name="title"
-		column="TITLE"
-		jdbc-type="VARCHAR"
-	    />
-			
-	</class-descriptor>
-	
-	
-	
-	<class-descriptor
-	    class="org.apache.portals.graffito.model.server.impl.WebdavServerImpl"
-	    table="WEBDAV_SERVER"
-	>
-	    <field-descriptor
-		name="serverId"
-		column="SERVER_ID"
-		jdbc-type="INTEGER"
-		primarykey="true"
-		autoincrement="true"
-	    />
-	
-	    <field-descriptor
-		name="url"
-		column="URL"
-		jdbc-type="VARCHAR"
-	    />
-	
-	    <field-descriptor
-		name="isSecureServer"
-		column= "IS_SECURE_SERVER"
-		jdbc-type="VARCHAR"
-	
-	    />
-	    <field-descriptor
-		name="useCurrentLogin"
-		column="USE_CURRENT_LOGIN"
-		jdbc-type="VARCHAR"
-	    />
-	
-	    <field-descriptor
-		name="login"
-		column="LOGIN"
-		jdbc-type="VARCHAR"
-	    />
-	    
-	    <field-descriptor
-		name="password"
-		column="PASSWORD"
-		jdbc-type="VARCHAR"
-	    />
-	
-	    <reference-descriptor name="super"
-		class-ref="org.apache.portals.graffito.model.server.impl.ServerImpl"
-		auto-retrieve="true"
-		auto-update="true"
-		auto-delete="true"
-	    >
-		<foreignkey field-ref="serverId"/>
-	    </reference-descriptor>
-	    
-	</class-descriptor>
-	
-	<class-descriptor
-	    class="org.apache.portals.graffito.model.server.impl.GraffitoServerImpl"
-	    table="GRAFFITO_DB_SERVER"
-	>
-	    <field-descriptor
-		name="serverId"
-		column="SERVER_ID"
-		jdbc-type="INTEGER"
-		primarykey="true"
-		autoincrement="true"
-	    />
-	
-	    <field-descriptor
-		name="plateform"
-		column="PLATEFORM"
-		jdbc-type="VARCHAR"
-	    />
-	    
-	    <field-descriptor
-		name="dbAlias"
-		column="DB_ALIAS"
-		jdbc-type="VARCHAR"
-	    />
-		
-	    <field-descriptor
-		name="jdbcLevel"
-		column="JDBC_LEVEL"
-		jdbc-type="VARCHAR"
-	    />
-	
-	    <field-descriptor
-		name="datasource"
-		column="DATASOURCE"
-		jdbc-type="VARCHAR"
-	    />     
-	    
-	    <field-descriptor
-		name="driver"
-		column="DRIVER"
-		jdbc-type="VARCHAR"
-	    />       
-	
-	    <field-descriptor
-		name="protocol"
-		column="PROTOCOL"
-		jdbc-type="VARCHAR"
-	    />
-	
-	    <field-descriptor
-		name="subProtocol"
-		column="SUBPROTOCOL"
-		jdbc-type="VARCHAR"
-	    />
-		     
-	    <field-descriptor
-		name="login"
-		column="LOGIN"
-		jdbc-type="VARCHAR"
-	    />
-	
-	    <field-descriptor
-		name="password"
-		column="PASSWORD"
-		jdbc-type="VARCHAR"
-	    />
-		    
-	    <reference-descriptor name="super"
-		class-ref="org.apache.portals.graffito.model.server.impl.ServerImpl"
-		auto-retrieve="true"
-		auto-update="true"
-		auto-delete="true"
-	    >
-		<foreignkey field-ref="serverId"/>
-	    </reference-descriptor>
-	    
-	</class-descriptor>
-
-
-	<class-descriptor
-	    class="org.apache.portals.graffito.model.server.impl.FileSystemServerImpl"
-	    table="GRAFFITO_FS_SERVER"
-	>
-	    <field-descriptor
-		name="serverId"
-		column="SERVER_ID"
-		jdbc-type="INTEGER"
-		primarykey="true"
-		autoincrement="true"
-	    />
-	
-	    <field-descriptor
-		name="root"
-		column="ROOT"
-		jdbc-type="VARCHAR"
-	    />
-	    		    
-	    <reference-descriptor name="super"
-		class-ref="org.apache.portals.graffito.model.server.impl.ServerImpl"
-		auto-retrieve="true"
-		auto-update="true"
-		auto-delete="true"
-	    >
-		<foreignkey field-ref="serverId"/>
-	    </reference-descriptor>
-	    
-	</class-descriptor>
-	
-	<!--
-	
-		    GRAFFITO  METADATA  CLASSES	
-			   
-	-->
-	
-	<class-descriptor 
-	
-	    class="org.apache.portals.graffito.model.core.impl.SysCmsClass"
-	    table="SYS_CMS_CLASSES" >
-	    
-	    <field-descriptor 
-		name="cmsClassId" 
-		jdbc-type="VARCHAR"
-		column="CMS_CLASS_ID" 
-		primarykey="true"
-	
-	    />
-	    <field-descriptor 
-		name="cmsClass" 
-		jdbc-type="VARCHAR"
-		column="CMS_CLASS"
-		
-	    />
-	 
-	</class-descriptor>
-</descriptor-repository>
+<!-- 
+ Copyright 2002-2004 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.
+ -->
+ <!--
+    G R A F F I T O     S T O R E 
+-->	
+<descriptor-repository version="1.0">
+
+	<class-descriptor class="org.apache.portals.graffito.model.core.CmsObject">
+	      <extent-class class-ref="org.apache.portals.graffito.model.core.impl.FolderImpl" />
+ 	      <extent-class class-ref="org.apache.portals.graffito.model.core.impl.ContentImpl" />
+	      <extent-class class-ref="org.apache.portals.graffito.model.core.impl.LinkImpl" />		  
+ 	      <extent-class class-ref="org.apache.portals.graffito.model.core.impl.VersionnedContentImpl" />		  
+	      <extent-class class-ref="org.apache.portals.graffito.model.dm.impl.DocumentImpl" />
+	</class-descriptor>
+
+	<class-descriptor class="org.apache.portals.graffito.model.core.Folder">
+	      <extent-class class-ref="org.apache.portals.graffito.model.core.impl.FolderImpl" />
+	</class-descriptor>    
+	
+	<class-descriptor class="org.apache.portals.graffito.model.core.Content">
+	      <extent-class class-ref="org.apache.portals.graffito.model.core.impl.ContentImpl" />
+		  <extent-class class-ref="org.apache.portals.graffito.model.core.VersionnedContent" />
+		  <extent-class class-ref="org.apache.portals.graffito.model.dm.Document" />
+	</class-descriptor> 	   
+
+	<class-descriptor class="org.apache.portals.graffito.model.core.VersionnedContent">
+	      <extent-class class-ref="org.apache.portals.graffito.model.core.impl.VersionnedContentImpl" />
+	      <extent-class class-ref="org.apache.portals.graffito.model.dm.impl.DocumentImpl" />		  
+	</class-descriptor> 	   
+
+	<class-descriptor class="org.apache.portals.graffito.model.core.Link">
+	      <extent-class class-ref="org.apache.portals.graffito.model.core.impl.LinkImpl" />
+	</class-descriptor>  	
+	<class-descriptor class="org.apache.portals.graffito.model.dm.Document">
+	      <extent-class class-ref="org.apache.portals.graffito.model.dm.impl.DocumentImpl" />
+	</class-descriptor> 
+	
+	<class-descriptor class="org.apache.portals.graffito.model.dm.DocumentStream">
+	      <extent-class class-ref="org.apache.portals.graffito.model.dm.impl.DocumentStreamImpl" />
+	</class-descriptor>	
+	
+	<class-descriptor class="org.apache.portals.graffito.model.core.HistoryElement">
+	      <extent-class class-ref="org.apache.portals.graffito.model.core.impl.HistoryElementImpl" />
+	</class-descriptor>  	
+	
+	<class-descriptor
+	    class="org.apache.portals.graffito.model.core.impl.FolderImpl"
+	    table="CMS_OBJECT" >
+	    <field-descriptor 
+		name="objectId" 
+		jdbc-type="BIGINT"
+		column="OBJECT_ID" 
+		primarykey="true"
+		autoincrement="true"
+	    />
+	    
+	    <field-descriptor 
+		name="parentId" 
+		jdbc-type="BIGINT"
+		column="PARENT_ID" 
+		
+	    />
+					    	    				
+	    <field-descriptor 
+		name="name" 
+		jdbc-type="VARCHAR"
+		column="NAME" 
+	    />
+		
+	    <field-descriptor 
+		name="uri" 
+		jdbc-type="VARCHAR"
+		column="URI" 
+	    />
+	
+	    <field-descriptor 
+		name="creationDate" 
+		jdbc-type="TIMESTAMP"
+		column="CREATION_DATE" 
+	       
+	    />
+	    <field-descriptor 
+		name="lastModified" 
+		jdbc-type="TIMESTAMP"
+		column="DELTA" 
+		
+	    />
+	
+	    <field-descriptor 
+		name="ojbConcreteClass" 
+		jdbc-type="VARCHAR"
+		column="CLASS_NAME"                 
+	    />
+	    
+	    <reference-descriptor name="parentFolder" 
+		 class-ref="org.apache.portals.graffito.model.core.Folder"
+		 proxy="true" 
+		 auto-retrieve="true"
+		 auto-update="link" 
+		 auto-delete="false" >
+		 <foreignkey field-ref="parentId"/>
+	    </reference-descriptor> 
+	    
+	   <collection-descriptor
+	     name="folders"
+	     element-class-ref="org.apache.portals.graffito.model.core.Folder"        
+	     auto-retrieve="true"      
+	     auto-update="link"
+	     auto-delete="true"
+	     proxy="true"
+             > 
+	       <inverse-foreignkey field-ref="parentId"/>
+	   </collection-descriptor>    
+	
+	
+	   <collection-descriptor
+	     name="contents"
+	     element-class-ref="org.apache.portals.graffito.model.core.Content"   
+	     auto-retrieve="true"      
+	     auto-update="link"
+	     auto-delete="true" 
+	     proxy="true"
+	     > 
+	       <inverse-foreignkey field-ref="parentId"/>
+	   </collection-descriptor>    
+		 
+	   <collection-descriptor
+	     name="properties"
+	     element-class-ref="org.apache.portals.graffito.model.core.impl.PropertyImpl"    
+	     auto-retrieve="true"      
+	     auto-update="true"
+	     auto-delete="true"
+	     proxy="true" > 
+		 
+	       <inverse-foreignkey field-ref="objectId"/>
+	   </collection-descriptor> 	    
+	</class-descriptor>
+
+	<class-descriptor
+	    class="org.apache.portals.graffito.model.core.impl.ContentImpl"
+	    table="CMS_OBJECT" >
+	    <field-descriptor 
+		name="objectId" 
+		jdbc-type="BIGINT"
+		column="OBJECT_ID" 
+		primarykey="true"
+		autoincrement="true"
+	    />
+	    
+	    <field-descriptor 
+		name="parentId" 
+		jdbc-type="BIGINT"
+		column="PARENT_ID" 
+		
+	    />
+					    	    				
+	    <field-descriptor 
+		name="name" 
+		jdbc-type="VARCHAR"
+		column="NAME" 
+	    />
+		
+	    <field-descriptor 
+		name="uri" 
+		jdbc-type="VARCHAR"
+		column="URI" 
+	    />
+	
+	    <field-descriptor 
+		name="creationDate" 
+		jdbc-type="TIMESTAMP"
+		column="CREATION_DATE" 
+	       
+	    />
+	    <field-descriptor 
+		name="lastModified" 
+		jdbc-type="TIMESTAMP"
+		column="DELTA" 
+		
+	    />
+	
+	    <field-descriptor 
+		name="ojbConcreteClass" 
+		jdbc-type="VARCHAR"
+		column="CLASS_NAME"                 
+	    />
+	    
+	    <reference-descriptor name="parentFolder" 
+		 class-ref="org.apache.portals.graffito.model.core.Folder"
+		 proxy="true" 
+		 auto-retrieve="true"
+		 auto-update="link" 
+		 auto-delete="false" >
+		 <foreignkey field-ref="parentId"/>
+	    </reference-descriptor> 
+	          
+	
+	   <collection-descriptor
+	     name="properties"
+	     element-class-ref="org.apache.portals.graffito.model.core.impl.PropertyImpl"    
+	     auto-retrieve="true"      
+	     auto-update="true"
+	     auto-delete="true"
+	     proxy="true" > 		 
+	       <inverse-foreignkey field-ref="objectId"/>
+	   </collection-descriptor>    
+	</class-descriptor>
+	
+	<class-descriptor
+	    class="org.apache.portals.graffito.model.core.impl.VersionnedContentImpl"
+	    table="CMS_OBJECT" >
+	    
+	    <field-descriptor 
+		name="objectId" 
+		jdbc-type="BIGINT"
+		column="OBJECT_ID" 
+		primarykey="true"
+		autoincrement="true"
+	    />
+	    
+	    <field-descriptor 
+		name="versionNumber" 
+		jdbc-type="VARCHAR"
+		column="VERSION_NUM"		
+	    />  	    
+	    
+	    <field-descriptor 
+		name="isLastVersion" 
+		jdbc-type="INTEGER"
+		column="IS_LAST_VERSION"	
+               conversion="org.apache.ojb.broker.accesslayer.conversions.Boolean2IntFieldConversion"		
+	    />  		    
+		
+	    <field-descriptor 
+		name="parentId" 
+		jdbc-type="BIGINT"
+		column="PARENT_ID" 		
+	    />
+	   	 
+	    <field-descriptor 
+		name="name" 
+		jdbc-type="VARCHAR"
+		column="NAME" 
+	    />
+		
+	    <field-descriptor 
+		name="uri" 
+		jdbc-type="VARCHAR"
+		column="URI" 
+	    />
+	
+	    <field-descriptor 
+		name="creationDate" 
+		jdbc-type="TIMESTAMP"
+		column="CREATION_DATE" 
+	       
+	    />
+	    <field-descriptor 
+		name="lastModified" 
+		jdbc-type="TIMESTAMP"
+		column="DELTA" 
+		
+	    />
+				
+	    
+	    <field-descriptor 
+		name="ojbConcreteClass" 
+		jdbc-type="VARCHAR"
+		column="CLASS_NAME"                 
+	    />
+	    
+	    <reference-descriptor name="parentFolder" 
+		 class-ref="org.apache.portals.graffito.model.core.impl.FolderImpl"
+		 proxy="true" 
+		 auto-retrieve="true"
+		 auto-update="link" 
+		 auto-delete="false" >
+		 <foreignkey field-ref="parentId"/>
+	    </reference-descriptor>		
+
+	   <collection-descriptor
+	     name="properties"
+	     element-class-ref="org.apache.portals.graffito.model.core.impl.PropertyImpl"    
+	     auto-retrieve="true"      
+	     auto-update="true"
+	     auto-delete="true"
+	     proxy="true" > 
+		 
+	       <inverse-foreignkey field-ref="objectId"/>
+	   </collection-descriptor> 	    		    
+
+	   <!-- collection-descriptor
+	     name="historyElements"
+	     element-class-ref="org.apache.portals.graffito.model.core.HistoryElement"   
+	     auto-retrieve="true"      
+	      auto-update="false"
+	     auto-delete="true" 
+	     proxy="true"
+	     > 
+	       <inverse-foreignkey field-ref="versionnedContentId"/>
+	   </collection-descriptor -->    
+
+	</class-descriptor>
+	
+	
+	<class-descriptor
+	    class="org.apache.portals.graffito.model.core.impl.LinkImpl"
+	    table="CMS_OBJECT" >
+	    <field-descriptor 
+		name="objectId" 
+		jdbc-type="BIGINT"
+		column="OBJECT_ID" 
+		primarykey="true"
+		autoincrement="true"
+	    />
+			    	      		    
+		
+	    <field-descriptor 
+		name="parentId" 
+		jdbc-type="BIGINT"
+		column="PARENT_ID" 
+		
+	    />
+	    
+	    <field-descriptor 
+		name="targetCmsObjectId" 
+		jdbc-type="BIGINT"
+		column="LINK_TARGET_ID" 
+		
+	    />
+		
+	    <field-descriptor 
+		name="name" 
+		jdbc-type="VARCHAR"
+		column="NAME" 
+	    />
+		
+	    <field-descriptor 
+		name="uri" 
+		jdbc-type="VARCHAR"
+		column="URI" 
+	    />
+	
+	    <field-descriptor 
+		name="creationDate" 
+		jdbc-type="TIMESTAMP"
+		column="CREATION_DATE" 
+	       
+	    />
+	    <field-descriptor 
+		name="lastModified" 
+		jdbc-type="TIMESTAMP"
+		column="DELTA" 
+		
+	    />
+	
+	    <field-descriptor 
+		name="ojbConcreteClass" 
+		jdbc-type="VARCHAR"
+		column="CLASS_NAME"                 
+	    />
+	    
+	    <reference-descriptor name="parentFolder" 
+		 class-ref="org.apache.portals.graffito.model.core.impl.FolderImpl"
+		 proxy="true" 
+		 auto-retrieve="true"
+		 auto-update="link" 
+		 auto-delete="false" >
+		 <foreignkey field-ref="parentId"/>
+	    </reference-descriptor> 
+	    
+	    <reference-descriptor name="targetCmsObject" 
+		 class-ref="org.apache.portals.graffito.model.core.CmsObject"
+		 proxy="true" 
+		 auto-retrieve="true"
+		 auto-update="true" 
+		 auto-delete="false" >
+		 <foreignkey field-ref="targetCmsObjectId"/>
+	    </reference-descriptor>    
+
+	   <collection-descriptor
+	     name="properties"
+	     element-class-ref="org.apache.portals.graffito.model.core.impl.PropertyImpl"    
+	     auto-retrieve="true"      
+	     auto-update="true"
+	     auto-delete="true"
+	     proxy="true" > 
+		 
+	       <inverse-foreignkey field-ref="objectId"/>
+	   </collection-descriptor> 	    
+	</class-descriptor>	    
+	
+	
+	<class-descriptor
+	    class="org.apache.portals.graffito.model.dm.impl.DocumentImpl"
+	    table="CMS_OBJECT" >
+	    
+	    <field-descriptor 
+		name="objectId" 
+		jdbc-type="BIGINT"
+		column="OBJECT_ID" 
+		primarykey="true"
+		autoincrement="true"
+	    />
+
+	    <field-descriptor 
+		name="documentStreamId" 
+		jdbc-type="BIGINT"
+		column="DOCUMENT_STREAM_ID" 
+	    />	    
+	    
+	    <field-descriptor 
+		name="versionNumber" 
+		jdbc-type="VARCHAR"
+		column="VERSION_NUM"		
+	    />  	    
+	    
+	    <field-descriptor 
+		name="isLastVersion" 
+		jdbc-type="INTEGER"
+		column="IS_LAST_VERSION"	
+               conversion="org.apache.ojb.broker.accesslayer.conversions.Boolean2IntFieldConversion"		
+	    />  		    
+		
+	    <field-descriptor 
+		name="parentId" 
+		jdbc-type="BIGINT"
+		column="PARENT_ID" 		
+	    />
+	   	 
+	    <field-descriptor 
+		name="name" 
+		jdbc-type="VARCHAR"
+		column="NAME" 
+	    />
+	    <field-descriptor 
+		name="uri" 
+		jdbc-type="VARCHAR"
+		column="URI" 
+	    />
+	
+	    <field-descriptor 
+		name="creationDate" 
+		jdbc-type="TIMESTAMP"
+		column="CREATION_DATE" 
+	       
+	    />
+	    <field-descriptor 
+		name="lastModified" 
+		jdbc-type="TIMESTAMP"
+		column="DELTA" 
+		
+	    />
+		
+  
+	    <field-descriptor 
+		name="size" 
+		jdbc-type="BIGINT"
+		column="CONTENT_SIZE"
+	    />
+		
+
+	
+	    <field-descriptor 
+		name="contentType" 
+		jdbc-type="VARCHAR"
+		column="CONTENT_TYPE" 
+	    />    
+	    
+	    <field-descriptor 
+		name="ojbConcreteClass" 
+		jdbc-type="VARCHAR"
+		column="CLASS_NAME"                 
+	    />
+	    
+	    <reference-descriptor name="parentFolder" 
+		 class-ref="org.apache.portals.graffito.model.core.impl.FolderImpl"
+		 proxy="true" 
+		 auto-retrieve="true"
+		 auto-update="link" 
+		 auto-delete="false" >
+		 <foreignkey field-ref="parentId"/>
+	    </reference-descriptor>		
+
+	    <reference-descriptor name="documentStream" 
+		 class-ref="org.apache.portals.graffito.model.dm.impl.DocumentStreamImpl"		 
+		 proxy="true" 
+		 auto-retrieve="true"
+		 auto-update="true" 
+		 auto-delete="true" >
+		 <foreignkey field-ref="documentStreamId"/>
+	    </reference-descriptor>	
+
+	   <collection-descriptor
+	     name="properties"
+	     element-class-ref="org.apache.portals.graffito.model.core.impl.PropertyImpl"    
+	     auto-retrieve="true"      
+	     auto-update="true"
+	     auto-delete="true"
+	     proxy="true" > 
+		 
+	       <inverse-foreignkey field-ref="objectId"/>
+	   </collection-descriptor>     			    
+    
+	</class-descriptor>
+	
+	    
+	<class-descriptor 
+	
+	    class="org.apache.portals.graffito.model.dm.impl.DocumentStreamImpl"
+	    table="DOCUMENT_STREAM" >
+	    
+ 	    <field-descriptor 	        
+		name="documentStreamId" 
+		jdbc-type="BIGINT"
+		column="DOCUMENT_STREAM_ID" 
+		primarykey="true"
+                autoincrement="true"		
+	    />
+	      
+	    <field-descriptor 
+		name="content" 
+		jdbc-type="LONGVARBINARY"
+		column="CONTENT"        
+	    /> 
+
+        <field-descriptor
+        name="encoding"
+        jdbc-type="VARCHAR"
+        column="ENCODING"
+        />
+	        
+        <field-descriptor
+        name="isoCode"
+        jdbc-type="VARCHAR"
+        column="ISO_CODE"
+        />			
+	</class-descriptor>
+	
+	<class-descriptor
+	    class="org.apache.portals.graffito.model.core.impl.PropertyImpl"
+	    table="PROPERTY" >
+
+	    <field-descriptor 
+		name="id" 
+		jdbc-type="BIGINT"
+		column="PROPERTY_ID" 
+		primarykey="true"
+		autoincrement="true"
+	    />
+	    
+	    <field-descriptor 
+		name="objectId" 
+		jdbc-type="BIGINT"
+		column="OBJECT_ID" 
+	    />
+
+	    <field-descriptor 
+		name="name" 
+		jdbc-type="VARCHAR"
+		column="NAME" 
+	    />	    
+	    
+	    <field-descriptor 
+		name="value" 
+		jdbc-type="VARCHAR"
+		column="VALUE"		
+	    />  	    
+	    
+	</class-descriptor>
+	
+	<class-descriptor
+	    class="org.apache.portals.graffito.model.core.impl.HistoryElementImpl"
+	    table="VERSION_HISTORY" >
+
+	    <field-descriptor 
+		name="historyElementId" 
+		jdbc-type="BIGINT"
+		column="HISTORY_ID" 
+		primarykey="true"		
+		autoincrement="true"
+	    />
+	    
+	    <field-descriptor 
+		name="versionnedContentId" 
+		jdbc-type="BIGINT"
+		column="OBJECT_ID" 
+		
+	    />
+	    
+	    <field-descriptor 
+		name="previousId" 
+		jdbc-type="BIGINT"
+		column="PREVIOUS_ID" 		
+	    />	    
+	    	    
+	    <reference-descriptor name="versionnedContent" 
+		 class-ref="org.apache.portals.graffito.model.core.impl.VersionnedContentImpl"
+		 proxy="true" 
+		 auto-retrieve="true"
+		 auto-update="object" 
+		 auto-delete="false" >
+		 <foreignkey field-ref="versionnedContentId"/>
+	    </reference-descriptor>		
+
+	    <reference-descriptor name="previous" 
+		 class-ref="org.apache.portals.graffito.model.core.HistoryElement"
+		 proxy="true" 
+		 auto-retrieve="true"
+		 auto-update="link" 
+		 auto-delete="true" >
+		 <foreignkey field-ref="previousId"/>
+	    </reference-descriptor>		
+
+		
+	</class-descriptor>
+	
+	<!--
+	
+		    S E R V E R                   
+	-->
+	
+	<class-descriptor class="org.apache.portals.graffito.model.server.Server">	    		     
+	      <extent-class class-ref="org.apache.portals.graffito.model.server.impl.WebdavServerImpl" />
+	      <extent-class class-ref="org.apache.portals.graffito.model.server.impl.GraffitoServerImpl" />      
+	      <extent-class class-ref="org.apache.portals.graffito.model.server.impl.FileSystemServerImpl" />		  
+	</class-descriptor>       
+	
+	<class-descriptor class="org.apache.portals.graffito.model.server.WebdavServer">
+	      <extent-class class-ref="org.apache.portals.graffito.model.server.impl.WebdavServerImpl" />
+	</class-descriptor>       
+	
+	<class-descriptor class="org.apache.portals.graffito.model.server.GraffitoServer">
+	      <extent-class class-ref="org.apache.portals.graffito.model.server.impl.GraffitoServerImpl" />
+	</class-descriptor>       
+	
+	<class-descriptor class="org.apache.portals.graffito.model.server.FileSystemServer">
+	      <extent-class class-ref="org.apache.portals.graffito.model.server.impl.FileSystemServerImpl" />
+	</class-descriptor>       
+		
+	<class-descriptor
+	    class="org.apache.portals.graffito.model.server.impl.ServerImpl"
+	    table="SERVER"
+	>
+	    <field-descriptor
+		name="serverId"
+		column="SERVER_ID"
+		jdbc-type="INTEGER"
+		primarykey="true"
+		autoincrement="true"
+	    />
+	    <field-descriptor
+		name="scope"
+		column="SCOPE"
+		jdbc-type="VARCHAR"
+	    />
+	    <field-descriptor
+		name="alias"
+		column="ALIAS"
+		jdbc-type="VARCHAR"
+	    />
+	
+	    <field-descriptor
+		name="description"
+		column="DESCRIPTION"
+		jdbc-type="VARCHAR"
+	    />
+	
+	    <field-descriptor
+		name="storeClassName"
+		column="PLUGIN_CLASS_NAME"
+		jdbc-type="VARCHAR"
+	    />
+		
+	    <field-descriptor
+		name="title"
+		column="TITLE"
+		jdbc-type="VARCHAR"
+	    />
+			
+	</class-descriptor>
+	
+	
+	
+	<class-descriptor
+	    class="org.apache.portals.graffito.model.server.impl.WebdavServerImpl"
+	    table="WEBDAV_SERVER"
+	>
+	    <field-descriptor
+		name="serverId"
+		column="SERVER_ID"
+		jdbc-type="INTEGER"
+		primarykey="true"
+		autoincrement="true"
+	    />
+	
+	    <field-descriptor
+		name="url"
+		column="URL"
+		jdbc-type="VARCHAR"
+	    />
+	
+	    <field-descriptor
+		name="isSecureServer"
+		column= "IS_SECURE_SERVER"
+		jdbc-type="VARCHAR"
+	
+	    />
+	    <field-descriptor
+		name="useCurrentLogin"
+		column="USE_CURRENT_LOGIN"
+		jdbc-type="VARCHAR"
+	    />
+	
+	    <field-descriptor
+		name="login"
+		column="LOGIN"
+		jdbc-type="VARCHAR"
+	    />
+	    
+	    <field-descriptor
+		name="password"
+		column="PASSWORD"
+		jdbc-type="VARCHAR"
+	    />
+	
+	    <reference-descriptor name="super"
+		class-ref="org.apache.portals.graffito.model.server.impl.ServerImpl"
+		auto-retrieve="true"
+		auto-update="true"
+		auto-delete="true"
+	    >
+		<foreignkey field-ref="serverId"/>
+	    </reference-descriptor>
+	    
+	</class-descriptor>
+	
+	<class-descriptor
+	    class="org.apache.portals.graffito.model.server.impl.GraffitoServerImpl"
+	    table="GRAFFITO_DB_SERVER"
+	>
+	    <field-descriptor
+		name="serverId"
+		column="SERVER_ID"
+		jdbc-type="INTEGER"
+		primarykey="true"
+		autoincrement="true"
+	    />
+	
+	    <field-descriptor
+		name="plateform"
+		column="PLATEFORM"
+		jdbc-type="VARCHAR"
+	    />
+	    
+	    <field-descriptor
+		name="dbAlias"
+		column="DB_ALIAS"
+		jdbc-type="VARCHAR"
+	    />
+		
+	    <field-descriptor
+		name="jdbcLevel"
+		column="JDBC_LEVEL"
+		jdbc-type="VARCHAR"
+	    />
+	
+	    <field-descriptor
+		name="datasource"
+		column="DATASOURCE"
+		jdbc-type="VARCHAR"
+	    />     
+	    
+	    <field-descriptor
+		name="driver"
+		column="DRIVER"
+		jdbc-type="VARCHAR"
+	    />       
+	
+	    <field-descriptor
+		name="protocol"
+		column="PROTOCOL"
+		jdbc-type="VARCHAR"
+	    />
+	
+	    <field-descriptor
+		name="subProtocol"
+		column="SUBPROTOCOL"
+		jdbc-type="VARCHAR"
+	    />
+		     
+	    <field-descriptor
+		name="login"
+		column="LOGIN"
+		jdbc-type="VARCHAR"
+	    />
+	
+	    <field-descriptor
+		name="password"
+		column="PASSWORD"
+		jdbc-type="VARCHAR"
+	    />
+		    
+	    <reference-descriptor name="super"
+		class-ref="org.apache.portals.graffito.model.server.impl.ServerImpl"
+		auto-retrieve="true"
+		auto-update="true"
+		auto-delete="true"
+	    >
+		<foreignkey field-ref="serverId"/>
+	    </reference-descriptor>
+	    
+	</class-descriptor>
+
+
+	<class-descriptor
+	    class="org.apache.portals.graffito.model.server.impl.FileSystemServerImpl"
+	    table="GRAFFITO_FS_SERVER"
+	>
+	    <field-descriptor
+		name="serverId"
+		column="SERVER_ID"
+		jdbc-type="INTEGER"
+		primarykey="true"
+		autoincrement="true"
+	    />
+	
+	    <field-descriptor
+		name="root"
+		column="ROOT"
+		jdbc-type="VARCHAR"
+	    />
+	    		    
+	    <reference-descriptor name="super"
+		class-ref="org.apache.portals.graffito.model.server.impl.ServerImpl"
+		auto-retrieve="true"
+		auto-update="true"
+		auto-delete="true"
+	    >
+		<foreignkey field-ref="serverId"/>
+	    </reference-descriptor>
+	    
+	</class-descriptor>
+	
+	<!--
+	
+		    GRAFFITO  METADATA  CLASSES	
+			   
+	-->
+	
+	<class-descriptor 
+	
+	    class="org.apache.portals.graffito.model.core.impl.SysCmsClass"
+	    table="SYS_CMS_CLASSES" >
+	    
+	    <field-descriptor 
+		name="cmsClassId" 
+		jdbc-type="VARCHAR"
+		column="CMS_CLASS_ID" 
+		primarykey="true"
+	
+	    />
+	    <field-descriptor 
+		name="cmsClass" 
+		jdbc-type="VARCHAR"
+		column="CMS_CLASS"
+		
+	    />
+	 
+	</class-descriptor>
+</descriptor-repository>

Propchange: incubator/graffito/trunk/components/src/java/META-INF/repository_graffito.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/components/src/java/META-INF/security-atn.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/components/src/java/META-INF/security-atz.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/components/src/java/META-INF/security-managers.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/components/src/java/META-INF/security-providers.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/components/src/java/META-INF/security-spi-atn.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/components/src/java/META-INF/security-spi-atz.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/components/src/java/META-INF/security-spi.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/components/src/java/org/apache/portals/graffito/context/impl/CmsRequestContextImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/components/src/java/org/apache/portals/graffito/context/impl/CmsRequestContextManagerImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/components/src/java/org/apache/portals/graffito/model/core/impl/CmsObjectImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/components/src/java/org/apache/portals/graffito/model/core/impl/ContentImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/components/src/java/org/apache/portals/graffito/model/core/impl/FolderImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/components/src/java/org/apache/portals/graffito/model/core/impl/HistoryElementImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/components/src/java/org/apache/portals/graffito/model/core/impl/LinkImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/components/src/java/org/apache/portals/graffito/model/core/impl/PropertyImpl.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/components/src/java/org/apache/portals/graffito/model/core/impl/PropertyImpl.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/components/src/java/org/apache/portals/graffito/model/core/impl/PropertyImpl.java (original)
+++ incubator/graffito/trunk/components/src/java/org/apache/portals/graffito/model/core/impl/PropertyImpl.java Wed Sep 20 12:37:05 2006
@@ -1,92 +1,92 @@
-/*
- * Copyright 2000-2004 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.portals.graffito.model.core.impl;
-
-/**
- *
- * CmsObject property
- * 
- * @author <a href="mailto:christophe.lombart@gmail.com">Lombart Christophe </a>
- * @version $Id: Exp $
- */
-public class PropertyImpl
-{
-    protected Long id; 
-    protected Long objectId;
-    protected String name;
-    protected String value;
-    
-    
-    
-    /**
-     * @return Returns the id.
-     */
-    public Long getId()
-    {
-        return id;
-    }
-    /**
-     * @param id The id to set.
-     */
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-    /**
-     * @return Returns the objectId.
-     */
-    public Long getObjectId()
-    {
-        return objectId;
-    }
-    
-    /**
-     * @param objectId The objectId to set.
-     */
-    public void setObjectId(Long objectId)
-    {
-        this.objectId = objectId;
-    }
-        
-    /**
-     * @return Returns the name.
-     */
-    public String getName()
-    {
-        return name;
-    }
-    /**
-     * @param name The name to set.
-     */
-    public void setName(String name)
-    {
-        this.name = name;
-    }
-    /**
-     * @return Returns the value.
-     */
-    public String getValue()
-    {
-        return value;
-    }
-    /**
-     * @param value The value to set.
-     */
-    public void setValue(String value)
-    {
-        this.value = value;
-    }
-}
+/*
+ * Copyright 2000-2004 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.portals.graffito.model.core.impl;
+
+/**
+ *
+ * CmsObject property
+ * 
+ * @author <a href="mailto:christophe.lombart@gmail.com">Lombart Christophe </a>
+ * @version $Id: Exp $
+ */
+public class PropertyImpl
+{
+    protected Long id; 
+    protected Long objectId;
+    protected String name;
+    protected String value;
+    
+    
+    
+    /**
+     * @return Returns the id.
+     */
+    public Long getId()
+    {
+        return id;
+    }
+    /**
+     * @param id The id to set.
+     */
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+    /**
+     * @return Returns the objectId.
+     */
+    public Long getObjectId()
+    {
+        return objectId;
+    }
+    
+    /**
+     * @param objectId The objectId to set.
+     */
+    public void setObjectId(Long objectId)
+    {
+        this.objectId = objectId;
+    }
+        
+    /**
+     * @return Returns the name.
+     */
+    public String getName()
+    {
+        return name;
+    }
+    /**
+     * @param name The name to set.
+     */
+    public void setName(String name)
+    {
+        this.name = name;
+    }
+    /**
+     * @return Returns the value.
+     */
+    public String getValue()
+    {
+        return value;
+    }
+    /**
+     * @param value The value to set.
+     */
+    public void setValue(String value)
+    {
+        this.value = value;
+    }
+}

Propchange: incubator/graffito/trunk/components/src/java/org/apache/portals/graffito/model/core/impl/PropertyImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/components/src/java/org/apache/portals/graffito/model/core/impl/SysCmsClass.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/components/src/java/org/apache/portals/graffito/model/core/impl/VersionnedContentImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/components/src/java/org/apache/portals/graffito/model/dm/impl/DocumentImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message