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 [2/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/por...
Date Wed, 20 Sep 2006 19:37:21 GMT
Modified: incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/core/ContentModelService.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/core/ContentModelService.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/core/ContentModelService.java (original)
+++ incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/core/ContentModelService.java Wed Sep 20 12:37:05 2006
@@ -1,317 +1,317 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * 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.services.core;
-
-import java.util.Collection;
-
-import org.apache.portals.graffito.exception.ContentManagementException;
-import org.apache.portals.graffito.model.core.CmsObject;
-import org.apache.portals.graffito.model.core.Content;
-import org.apache.portals.graffito.model.core.Folder;
-import org.apache.portals.graffito.model.core.Link;
-import org.apache.portals.graffito.model.core.VersionnedContent;
-
-/**
- * <P>CMS Model Service Interface</P>
- *
- * This service maintains Folder, Content and Links.
- * tied to the CMS that are stored in the repository and used to access the CMS.
- *
- * @author <a href="mailto:david@bluesunrise.com">David Sean Taylor</a>
- * @author <a href="mailto:ruchi@bluesunrise.com">Ruchir Gatha</a>
- * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
- * 
- * @version $Id: ContentModelService.java,v 1.1 2004/12/22 21:16:12 christophe Exp $
- *
- */
-public interface ContentModelService
-{
-
-    /**
-     * Factory to create a new Folder object.
-     *
-     * @return an empty factory created folder.
-     * @throws ContentManagementException
-     */
-    public Folder createFolder() throws ContentManagementException;
-
-    /**
-     * Adds a new folder to engine's persistent store.
-     *
-     * @param folder the folder to add.
-     * @throws ContentManagementException
-     */
-    public void addFolder(Folder folder) throws ContentManagementException;
-
-    /**
-     * Remove a folder from the engine's persistent store.
-     *
-     * @param folder the folder to be removed.
-     * @throws ContentManagementException
-     */
-    public void removeFolder(Folder folder) throws ContentManagementException;
-
-    /**
-     * Remove many cms objects
-     *
-     * @param uris an Array of uri's matching to the Cms Object to remove
-     * @throws ContentManagementException
-     */
-    public void removeAll(String[] uris) throws ContentManagementException;    
-    
-    /**
-     * Get a folder from the engine's persistent store.
-     *
-     * @param uri  the uri assigned to the folder to retrieve.
-     * @return folder found or null.
-     * @throws ContentManagementException
-     */
-    public Folder getFolder(String uri) throws ContentManagementException;
-
-    /**
-     * Update a folder in the engine's persistent store.
-     *
-     * @param folder the folder to be updated.
-     * @throws ContentManagementException
-     */
-    public void updateFolder(Folder folder) throws ContentManagementException;
-
-    /**
-     * Factory to create a new Link object.
-     *
-     * @return an empty factory created link.
-     * @throws ContentManagementException
-     */
-    public Link createLink() throws ContentManagementException;
-
-    /**
-     * Adds a Link to engine's persistent store.
-     *
-     * @param link the new Link to add.
-     *
-     * @throws ContentManagementException
-     */
-    public void addLink(Link link) throws ContentManagementException;
-
-    /**
-     * Get a Link from the engine's persistent store.
-     *
-     * @param uri  the uri assigned to the link to retrieve.
-     * @return link found or null.
-     * @throws ContentManagementException
-     */
-    public Link getLink(String uri) throws ContentManagementException;
-
-    /**
-     * Remove a Link from the engine's persistent store.
-     *
-     * @param link the Link to remove.
-     *
-     * @throws ContentManagementException
-     */
-    public void removeLink(Link link) throws ContentManagementException;
-
-    /**
-     * Update a link in the engine's persistent store.
-     *
-     * @param link the link to be updated.
-     * @throws ContentManagementException
-     */
-    public void updateLink(Link link) throws ContentManagementException;
-
-    /**
-     * Adds a content to engine's persistent store.
-     *
-     * @param content the new content
-     *
-     * @throws ContentManagementException
-     */
-    public void addContent(Content content) throws ContentManagementException;
-
-    
-    /**
-     * Factory to create a new empty generic content object.
-     *
-     *  
-     * @return an empty factory created content
-     * 
-     * @throws ContentManagementException
-     */
-    public Content createContent() throws ContentManagementException;
-    
-    /**
-     * Factory to create a new empty content object.
-     *
-     * @param contentName The content class name (News, Article, ...). This name is used by ht persistence service in order to instantiate the correct class 
-     * @return an empty factory created content
-     * 
-     * @throws ContentManagementException
-     */
-    public Content createContent(String contentName) throws ContentManagementException;
-
-    /**
-     * Get a content from the engine's persistent store by uri.
-     *
-     * @param uri uri assigned to the content.
-     * @return Content found or null
-     *
-     * @throws ContentManagementException
-     */
-    public Content getContent(String uri) throws ContentManagementException;
-   
-    /**
-     * Remove a content from the engine's persistent store.
-     *
-     * @param  content the content to remove.
-     *
-     * @throws ContentManagementException
-     */
-    public void removeContent(Content content) throws ContentManagementException;
-
-    /**
-     * Update a content in the engine's persistent store.
-     *
-     * @param content the content to update.
-     *
-     * @throws ContentManagementException
-     */
-    public void updateContent(Content content) throws ContentManagementException;
-
-    /**
-     * Adds a versionned content to engine's persistent store.
-     *
-     * @param versionnedContent the new content
-     *
-     * @throws ContentManagementException
-     */
-    public void addVersionnedContent(VersionnedContent versionnedContent) throws ContentManagementException;
-
-    /**
-     * Factory to create a new empty generic versionned content object.
-     *
-     * @return an empty factory created versionned content
-     * 
-     * @throws ContentManagementException
-     */
-    public VersionnedContent createVersionnedContent() throws ContentManagementException;
-    
-    /**
-     * Factory to create a new empty versionned content object.
-     * 
-     * @param contentName The content class name (News, Article, ...). This name is used by the persistence service in order to instantiate the correct class
-     * @return an empty factory created versionned content
-     * 
-     * @throws ContentManagementException
-     */
-    public VersionnedContent createVersionnedContent(String contentName) throws ContentManagementException;
-
-    /**
-     * Get a versionned content from the engine's persistent store by uri.
-     * This method return the lastest version.
-     *
-     * @param uri uri assigned to the content.
-     * @return Content found or null
-     *
-     * @throws ContentManagementException
-     */
-    public VersionnedContent getVersionnedContent(String uri) throws ContentManagementException;
-
-    /**
-     * Get a versionned content from the engine's persistent store by uri.
-     *
-     * @param uri uri assigned to the document.
-     * @param versionNum the desired version number assigned to the content to retrieve
-     * @return content found or null
-     *
-     * @throws ContentManagementException
-     */
-    public VersionnedContent getVersionnedContent(String uri, String versionNum) throws ContentManagementException;
-    
-    /**
-     * Remove a versionned content from the engine's persistent store.
-     *
-     * @param  versionnedContent the content to remove.
-     *
-     * @throws ContentManagementException
-     */
-    public void removeVersionnedContent(VersionnedContent versionnedContent) throws ContentManagementException;
-
-    /**
-     * Update a versionned content in the engine's persistent store.
-     *
-     * @param versionnedContent the content to update.
-     *
-     * @throws ContentManagementException
-     */
-    public void updateVersionnedContent(VersionnedContent versionnedContent) throws ContentManagementException;
-    
-
-    /**
-     * Get all folder children. It is a collection of CmsObject instances.
-     * 
-     * @param folder the parent folder.
-     * @return the folder children (collection of CmsObject).
-     * @throws ContentManagementException
-     */
-    public Collection getChildren(Folder folder) throws ContentManagementException;
-
-    /**
-     * Get all folder children (documents & folders).
-     * 
-     * @param parentUri the uri from which the children have to be retrieved. It can be an server scope or a folder uri.
-     * @return the folder children (collection of CmsObject).
-     * @throws ContentManagementException
-     */
-    public Collection getChildren(String parentUri) throws ContentManagementException;
-
-    /**
-     * Get all contents found in a parent uri. 
-     * 
-     * @param parentUri The uri from which the documents have be retrieved. It can be an server scope or a folder uri.
-     * @return a collection of {@link Content}
-     * @throws ContentManagementException
-     */
-    public Collection getContents(String parentUri) throws ContentManagementException;
-
-    /**
-     * Get all links found in a parent uri. 
-     * 
-     * @param parentUri The uri from which the links have be retrieved. It can be an server scope or a folder uri.
-     * @return a collection of {@link Link}
-     * @throws ContentManagementException
-     */
-    public Collection getLinks(String parentUri) throws ContentManagementException;
-    
-    /**
-     * Get all folders found in a parent uri. 
-     * 
-     * @param parentUri The uri from which the folders have be retrieved. It can be an server scope or a folder uri.
-     * @return a collection of {@link Folder}
-     * @throws ContentManagementException
-     */
-    public Collection getFolders(String parentUri) throws ContentManagementException;
-    
-    /**
-     * Get a CmsObject from the engine's persistent store.
-     *
-     * @param uri  the uri assigned to the cms object to retrieve.
-     * @return The cms object found or null.
-     * @throws ContentManagementException
-     */
-    public CmsObject getCmsObject(String uri) throws ContentManagementException;
-
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * 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.services.core;
+
+import java.util.Collection;
+
+import org.apache.portals.graffito.exception.ContentManagementException;
+import org.apache.portals.graffito.model.core.CmsObject;
+import org.apache.portals.graffito.model.core.Content;
+import org.apache.portals.graffito.model.core.Folder;
+import org.apache.portals.graffito.model.core.Link;
+import org.apache.portals.graffito.model.core.VersionnedContent;
+
+/**
+ * <P>CMS Model Service Interface</P>
+ *
+ * This service maintains Folder, Content and Links.
+ * tied to the CMS that are stored in the repository and used to access the CMS.
+ *
+ * @author <a href="mailto:david@bluesunrise.com">David Sean Taylor</a>
+ * @author <a href="mailto:ruchi@bluesunrise.com">Ruchir Gatha</a>
+ * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
+ * 
+ * @version $Id: ContentModelService.java,v 1.1 2004/12/22 21:16:12 christophe Exp $
+ *
+ */
+public interface ContentModelService
+{
+
+    /**
+     * Factory to create a new Folder object.
+     *
+     * @return an empty factory created folder.
+     * @throws ContentManagementException
+     */
+    public Folder createFolder() throws ContentManagementException;
+
+    /**
+     * Adds a new folder to engine's persistent store.
+     *
+     * @param folder the folder to add.
+     * @throws ContentManagementException
+     */
+    public void addFolder(Folder folder) throws ContentManagementException;
+
+    /**
+     * Remove a folder from the engine's persistent store.
+     *
+     * @param folder the folder to be removed.
+     * @throws ContentManagementException
+     */
+    public void removeFolder(Folder folder) throws ContentManagementException;
+
+    /**
+     * Remove many cms objects
+     *
+     * @param uris an Array of uri's matching to the Cms Object to remove
+     * @throws ContentManagementException
+     */
+    public void removeAll(String[] uris) throws ContentManagementException;    
+    
+    /**
+     * Get a folder from the engine's persistent store.
+     *
+     * @param uri  the uri assigned to the folder to retrieve.
+     * @return folder found or null.
+     * @throws ContentManagementException
+     */
+    public Folder getFolder(String uri) throws ContentManagementException;
+
+    /**
+     * Update a folder in the engine's persistent store.
+     *
+     * @param folder the folder to be updated.
+     * @throws ContentManagementException
+     */
+    public void updateFolder(Folder folder) throws ContentManagementException;
+
+    /**
+     * Factory to create a new Link object.
+     *
+     * @return an empty factory created link.
+     * @throws ContentManagementException
+     */
+    public Link createLink() throws ContentManagementException;
+
+    /**
+     * Adds a Link to engine's persistent store.
+     *
+     * @param link the new Link to add.
+     *
+     * @throws ContentManagementException
+     */
+    public void addLink(Link link) throws ContentManagementException;
+
+    /**
+     * Get a Link from the engine's persistent store.
+     *
+     * @param uri  the uri assigned to the link to retrieve.
+     * @return link found or null.
+     * @throws ContentManagementException
+     */
+    public Link getLink(String uri) throws ContentManagementException;
+
+    /**
+     * Remove a Link from the engine's persistent store.
+     *
+     * @param link the Link to remove.
+     *
+     * @throws ContentManagementException
+     */
+    public void removeLink(Link link) throws ContentManagementException;
+
+    /**
+     * Update a link in the engine's persistent store.
+     *
+     * @param link the link to be updated.
+     * @throws ContentManagementException
+     */
+    public void updateLink(Link link) throws ContentManagementException;
+
+    /**
+     * Adds a content to engine's persistent store.
+     *
+     * @param content the new content
+     *
+     * @throws ContentManagementException
+     */
+    public void addContent(Content content) throws ContentManagementException;
+
+    
+    /**
+     * Factory to create a new empty generic content object.
+     *
+     *  
+     * @return an empty factory created content
+     * 
+     * @throws ContentManagementException
+     */
+    public Content createContent() throws ContentManagementException;
+    
+    /**
+     * Factory to create a new empty content object.
+     *
+     * @param contentName The content class name (News, Article, ...). This name is used by ht persistence service in order to instantiate the correct class 
+     * @return an empty factory created content
+     * 
+     * @throws ContentManagementException
+     */
+    public Content createContent(String contentName) throws ContentManagementException;
+
+    /**
+     * Get a content from the engine's persistent store by uri.
+     *
+     * @param uri uri assigned to the content.
+     * @return Content found or null
+     *
+     * @throws ContentManagementException
+     */
+    public Content getContent(String uri) throws ContentManagementException;
+   
+    /**
+     * Remove a content from the engine's persistent store.
+     *
+     * @param  content the content to remove.
+     *
+     * @throws ContentManagementException
+     */
+    public void removeContent(Content content) throws ContentManagementException;
+
+    /**
+     * Update a content in the engine's persistent store.
+     *
+     * @param content the content to update.
+     *
+     * @throws ContentManagementException
+     */
+    public void updateContent(Content content) throws ContentManagementException;
+
+    /**
+     * Adds a versionned content to engine's persistent store.
+     *
+     * @param versionnedContent the new content
+     *
+     * @throws ContentManagementException
+     */
+    public void addVersionnedContent(VersionnedContent versionnedContent) throws ContentManagementException;
+
+    /**
+     * Factory to create a new empty generic versionned content object.
+     *
+     * @return an empty factory created versionned content
+     * 
+     * @throws ContentManagementException
+     */
+    public VersionnedContent createVersionnedContent() throws ContentManagementException;
+    
+    /**
+     * Factory to create a new empty versionned content object.
+     * 
+     * @param contentName The content class name (News, Article, ...). This name is used by the persistence service in order to instantiate the correct class
+     * @return an empty factory created versionned content
+     * 
+     * @throws ContentManagementException
+     */
+    public VersionnedContent createVersionnedContent(String contentName) throws ContentManagementException;
+
+    /**
+     * Get a versionned content from the engine's persistent store by uri.
+     * This method return the lastest version.
+     *
+     * @param uri uri assigned to the content.
+     * @return Content found or null
+     *
+     * @throws ContentManagementException
+     */
+    public VersionnedContent getVersionnedContent(String uri) throws ContentManagementException;
+
+    /**
+     * Get a versionned content from the engine's persistent store by uri.
+     *
+     * @param uri uri assigned to the document.
+     * @param versionNum the desired version number assigned to the content to retrieve
+     * @return content found or null
+     *
+     * @throws ContentManagementException
+     */
+    public VersionnedContent getVersionnedContent(String uri, String versionNum) throws ContentManagementException;
+    
+    /**
+     * Remove a versionned content from the engine's persistent store.
+     *
+     * @param  versionnedContent the content to remove.
+     *
+     * @throws ContentManagementException
+     */
+    public void removeVersionnedContent(VersionnedContent versionnedContent) throws ContentManagementException;
+
+    /**
+     * Update a versionned content in the engine's persistent store.
+     *
+     * @param versionnedContent the content to update.
+     *
+     * @throws ContentManagementException
+     */
+    public void updateVersionnedContent(VersionnedContent versionnedContent) throws ContentManagementException;
+    
+
+    /**
+     * Get all folder children. It is a collection of CmsObject instances.
+     * 
+     * @param folder the parent folder.
+     * @return the folder children (collection of CmsObject).
+     * @throws ContentManagementException
+     */
+    public Collection getChildren(Folder folder) throws ContentManagementException;
+
+    /**
+     * Get all folder children (documents & folders).
+     * 
+     * @param parentUri the uri from which the children have to be retrieved. It can be an server scope or a folder uri.
+     * @return the folder children (collection of CmsObject).
+     * @throws ContentManagementException
+     */
+    public Collection getChildren(String parentUri) throws ContentManagementException;
+
+    /**
+     * Get all contents found in a parent uri. 
+     * 
+     * @param parentUri The uri from which the documents have be retrieved. It can be an server scope or a folder uri.
+     * @return a collection of {@link Content}
+     * @throws ContentManagementException
+     */
+    public Collection getContents(String parentUri) throws ContentManagementException;
+
+    /**
+     * Get all links found in a parent uri. 
+     * 
+     * @param parentUri The uri from which the links have be retrieved. It can be an server scope or a folder uri.
+     * @return a collection of {@link Link}
+     * @throws ContentManagementException
+     */
+    public Collection getLinks(String parentUri) throws ContentManagementException;
+    
+    /**
+     * Get all folders found in a parent uri. 
+     * 
+     * @param parentUri The uri from which the folders have be retrieved. It can be an server scope or a folder uri.
+     * @return a collection of {@link Folder}
+     * @throws ContentManagementException
+     */
+    public Collection getFolders(String parentUri) throws ContentManagementException;
+    
+    /**
+     * Get a CmsObject from the engine's persistent store.
+     *
+     * @param uri  the uri assigned to the cms object to retrieve.
+     * @return The cms object found or null.
+     * @throws ContentManagementException
+     */
+    public CmsObject getCmsObject(String uri) throws ContentManagementException;
+
 }

Propchange: incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/core/ContentModelService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/core/ContentPermissionService.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/core/ContentPermissionService.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/core/ContentPermissionService.java (original)
+++ incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/core/ContentPermissionService.java Wed Sep 20 12:37:05 2006
@@ -1,69 +1,69 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * 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.services.core;
-
-import java.security.Permissions;
-
-import org.apache.jetspeed.security.PermissionManager;
-import org.apache.portals.graffito.exception.ContentManagementException;
-import org.apache.portals.graffito.model.core.CmsObject;
-import org.apache.portals.graffito.model.permission.CmsPermission;
-
-
-
-/**
- * Extends the Jetspeed 2 Permission manager in order to manager permission on cms objects
- *
- * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
- * @version $Id: Exp $
- */
-public interface ContentPermissionService extends PermissionManager
-{
-
-    /**
-     * Factory to create a new cms permission object.
-     * 
-     * @param name the permission name
-     * @param actions The authorised actions
-     * @return an empty factory created permission.
-     * @throws ContentManagementException
-     */
-    public CmsPermission createPermission(String name, String actions) throws ContentManagementException;
-    
-    /**
-     * Get all permissions defined for a cms objects
-     * @param cmsObject the cms object 
-     * @return the permissions found
-     */
-    Permissions getPermissions(CmsObject cmsObject);
-
-    /**
-     * Get all permissions defined for a cms objects
-     * @param uri the cms object uri
-     * @return the permissions found
-     */   
-    Permissions getPermissions(String uri);    
-
-    /**
-     * Grant a CmsPermission to a principal
-     * @param principalFullPath the principal full path (eg. /roles/admin)
-     * @param permission The permission to set 
-     * @throws ContentManagementException
-     */    
-    public void grantPermission(String principalFullPath, CmsPermission permission) throws ContentManagementException;
-
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * 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.services.core;
+
+import java.security.Permissions;
+
+import org.apache.jetspeed.security.PermissionManager;
+import org.apache.portals.graffito.exception.ContentManagementException;
+import org.apache.portals.graffito.model.core.CmsObject;
+import org.apache.portals.graffito.model.permission.CmsPermission;
+
+
+
+/**
+ * Extends the Jetspeed 2 Permission manager in order to manager permission on cms objects
+ *
+ * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
+ * @version $Id: Exp $
+ */
+public interface ContentPermissionService extends PermissionManager
+{
+
+    /**
+     * Factory to create a new cms permission object.
+     * 
+     * @param name the permission name
+     * @param actions The authorised actions
+     * @return an empty factory created permission.
+     * @throws ContentManagementException
+     */
+    public CmsPermission createPermission(String name, String actions) throws ContentManagementException;
+    
+    /**
+     * Get all permissions defined for a cms objects
+     * @param cmsObject the cms object 
+     * @return the permissions found
+     */
+    Permissions getPermissions(CmsObject cmsObject);
+
+    /**
+     * Get all permissions defined for a cms objects
+     * @param uri the cms object uri
+     * @return the permissions found
+     */   
+    Permissions getPermissions(String uri);    
+
+    /**
+     * Grant a CmsPermission to a principal
+     * @param principalFullPath the principal full path (eg. /roles/admin)
+     * @param permission The permission to set 
+     * @throws ContentManagementException
+     */    
+    public void grantPermission(String principalFullPath, CmsPermission permission) throws ContentManagementException;
+
 }

Propchange: incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/core/ContentPermissionService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/core/ContentServerService.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/core/ContentServerService.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/core/ContentServerService.java (original)
+++ incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/core/ContentServerService.java Wed Sep 20 12:37:05 2006
@@ -1,119 +1,119 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * 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.services.core;
-
-import java.util.Collection;
-
-import org.apache.portals.graffito.exception.ContentManagementException;
-import org.apache.portals.graffito.model.server.FileSystemServer;
-import org.apache.portals.graffito.model.server.GraffitoServer;
-import org.apache.portals.graffito.model.server.Server;
-import org.apache.portals.graffito.model.server.WebdavServer;
-
-
-/**
- * <P>Content Server Interface</P>
- *
- * This service maintains server references and their integration into the virtual content tree.
- * 
- * In this version, all servers are plugged on the root content tree level.
- * Later, we plan to "mount" external servers anywhere in the content tree.
- *
- * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
- *
- * @version $Id: ContentServerService.java,v 1.1 2004/12/22 21:16:12 christophe Exp $
- *
- *
- */
-
-public interface ContentServerService
-{
-    /**
-     * Factory to create a new WEBDAV server reference object
-     *
-     * @return an empty factory created WEBDAV server reference
-     * 
-     * @throws ContentManagementException
-     */
-    public WebdavServer createWebdavServer() throws ContentManagementException;
-
-    
-    /**
-     * Factory to create a new Graffito server reference object
-     *
-     * @return an empty factory created Graffito server 
-     * @throws ContentManagementException
-     */
-    public GraffitoServer createGraffitoServer() throws ContentManagementException;
-
-    /**
-     * Factory to create a new File System server reference object
-     *
-     * @return an empty factory created File System server 
-     * @throws ContentManagementException
-     */
-    public FileSystemServer createFileSystemServer() throws ContentManagementException;
-    
-    /**
-     * Adds a new server to engine's persistent store.
-     *
-     * @param server the server to add
-     * 
-     * @throws ContentManagementException
-     */
-    public void addServer(Server server) throws ContentManagementException;
-
-    /**
-     * Remove a server from the engine's persistent store.
-     * 
-     * This method delete only the server reference (not its associated content tree).
-     *
-     * @param server the server reference to remove.
-     * 
-     * @throws ContentManagementException
-     */
-    public void removeServer(Server server) throws ContentManagementException;
-
-    /**
-     * Get a server reference from the engine's persistent store.
-     *
-     * @param scope the scope assigned to the server to retrieve.
-     * @return server found or null.
-     * 
-     * @throws ContentManagementException
-     */
-    public Server getServer(String scope) throws ContentManagementException;
-
-    /**
-     * Update a server reference into the engine's persistent store.
-     *
-     * @param server the server to be updated.
-     * @throws ContentManagementException
-     */
-    public void updateServer(Server server) throws ContentManagementException;
-    
-    /**
-     * Get all server references defined into the engine's persistence store.
-     * 
-     * @return a collection of {@link Server}
-     * 
-     * @throws ContentManagementException
-     */
-    public Collection getAllServers()  throws ContentManagementException;
-
-
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * 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.services.core;
+
+import java.util.Collection;
+
+import org.apache.portals.graffito.exception.ContentManagementException;
+import org.apache.portals.graffito.model.server.FileSystemServer;
+import org.apache.portals.graffito.model.server.GraffitoServer;
+import org.apache.portals.graffito.model.server.Server;
+import org.apache.portals.graffito.model.server.WebdavServer;
+
+
+/**
+ * <P>Content Server Interface</P>
+ *
+ * This service maintains server references and their integration into the virtual content tree.
+ * 
+ * In this version, all servers are plugged on the root content tree level.
+ * Later, we plan to "mount" external servers anywhere in the content tree.
+ *
+ * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
+ *
+ * @version $Id: ContentServerService.java,v 1.1 2004/12/22 21:16:12 christophe Exp $
+ *
+ *
+ */
+
+public interface ContentServerService
+{
+    /**
+     * Factory to create a new WEBDAV server reference object
+     *
+     * @return an empty factory created WEBDAV server reference
+     * 
+     * @throws ContentManagementException
+     */
+    public WebdavServer createWebdavServer() throws ContentManagementException;
+
+    
+    /**
+     * Factory to create a new Graffito server reference object
+     *
+     * @return an empty factory created Graffito server 
+     * @throws ContentManagementException
+     */
+    public GraffitoServer createGraffitoServer() throws ContentManagementException;
+
+    /**
+     * Factory to create a new File System server reference object
+     *
+     * @return an empty factory created File System server 
+     * @throws ContentManagementException
+     */
+    public FileSystemServer createFileSystemServer() throws ContentManagementException;
+    
+    /**
+     * Adds a new server to engine's persistent store.
+     *
+     * @param server the server to add
+     * 
+     * @throws ContentManagementException
+     */
+    public void addServer(Server server) throws ContentManagementException;
+
+    /**
+     * Remove a server from the engine's persistent store.
+     * 
+     * This method delete only the server reference (not its associated content tree).
+     *
+     * @param server the server reference to remove.
+     * 
+     * @throws ContentManagementException
+     */
+    public void removeServer(Server server) throws ContentManagementException;
+
+    /**
+     * Get a server reference from the engine's persistent store.
+     *
+     * @param scope the scope assigned to the server to retrieve.
+     * @return server found or null.
+     * 
+     * @throws ContentManagementException
+     */
+    public Server getServer(String scope) throws ContentManagementException;
+
+    /**
+     * Update a server reference into the engine's persistent store.
+     *
+     * @param server the server to be updated.
+     * @throws ContentManagementException
+     */
+    public void updateServer(Server server) throws ContentManagementException;
+    
+    /**
+     * Get all server references defined into the engine's persistence store.
+     * 
+     * @return a collection of {@link Server}
+     * 
+     * @throws ContentManagementException
+     */
+    public Collection getAllServers()  throws ContentManagementException;
+
+
+}

Propchange: incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/core/ContentServerService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/core/ContentVersionService.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/core/ContentVersionService.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/core/ContentVersionService.java (original)
+++ incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/core/ContentVersionService.java Wed Sep 20 12:37:05 2006
@@ -1,82 +1,82 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * 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.services.core;
-
-import org.apache.portals.graffito.exception.CmsInstantiateException;
-import org.apache.portals.graffito.exception.ContentManagementException;
-import org.apache.portals.graffito.model.core.HistoryElement;
-import org.apache.portals.graffito.model.core.VersionnedContent;
-
-
-/**
- * <P>CMS Version Service Interface</P>
- *
- * This service maintains content versions and history.
- * The version number is composed of a Major & minor section like the following structure : "majorNum.minorNum"
- * TODO : Later we will add branch management with content merge, content comparaison, ...
- * 
- * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
- * 
- * @version $Id: ContentVersionService.java,v 1.1 2004/12/22 21:16:12 christophe Exp $
- */
-public interface ContentVersionService 
-{  
-   /**
-    * Get the last history element associated to an uri
-    * 
-    * @param uri The uri assigned to the versioned content
-    * 
-    * @return The last history element
-    * @exception ContentManagementException when it is impossible to get the history
-    */ 
-   public HistoryElement getHistory(String uri)  throws ContentManagementException;;
-   
-   /**
-    * Get the history element associated to a specific versionned content
-    * 
-    * @param versionnedContent The versionned content for which the history element is required
-    * 
-    * @return The last history element
-    * @exception ContentManagementException when it is impossible to get the history
-    */
-   public HistoryElement getHistory(VersionnedContent versionnedContent) throws ContentManagementException;
-   
-   /**
-    * Create a new major versionned content. 
-    * @param uri The content uri
-    * @return The new versionned content
-    * @throws CmsInstantiateException
-    */
-   public VersionnedContent createMajorVersion(String uri) throws CmsInstantiateException;
-  
-   /**
-    * Create a new minor versionned content. 
-    * @param uri The content uri
-    * @return The new versionned conntent
-    * @throws CmsInstantiateException
-    */   
-   public VersionnedContent createMinorVersion(String uri) throws CmsInstantiateException;
-   
-   /**
-    * Add a new version in the Document history
-    * @param uri The uri for wich the history has to be modified
-    * @param previousContent The versionned content before the new one to add
-    * @param newContent The new versionned content to insert into the history
-    * @throws CmsInstantiateException
-    */
-   void addInHistory(String uri, VersionnedContent previousContent, VersionnedContent newContent) throws CmsInstantiateException;
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * 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.services.core;
+
+import org.apache.portals.graffito.exception.CmsInstantiateException;
+import org.apache.portals.graffito.exception.ContentManagementException;
+import org.apache.portals.graffito.model.core.HistoryElement;
+import org.apache.portals.graffito.model.core.VersionnedContent;
+
+
+/**
+ * <P>CMS Version Service Interface</P>
+ *
+ * This service maintains content versions and history.
+ * The version number is composed of a Major & minor section like the following structure : "majorNum.minorNum"
+ * TODO : Later we will add branch management with content merge, content comparaison, ...
+ * 
+ * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
+ * 
+ * @version $Id: ContentVersionService.java,v 1.1 2004/12/22 21:16:12 christophe Exp $
+ */
+public interface ContentVersionService 
+{  
+   /**
+    * Get the last history element associated to an uri
+    * 
+    * @param uri The uri assigned to the versioned content
+    * 
+    * @return The last history element
+    * @exception ContentManagementException when it is impossible to get the history
+    */ 
+   public HistoryElement getHistory(String uri)  throws ContentManagementException;;
+   
+   /**
+    * Get the history element associated to a specific versionned content
+    * 
+    * @param versionnedContent The versionned content for which the history element is required
+    * 
+    * @return The last history element
+    * @exception ContentManagementException when it is impossible to get the history
+    */
+   public HistoryElement getHistory(VersionnedContent versionnedContent) throws ContentManagementException;
+   
+   /**
+    * Create a new major versionned content. 
+    * @param uri The content uri
+    * @return The new versionned content
+    * @throws CmsInstantiateException
+    */
+   public VersionnedContent createMajorVersion(String uri) throws CmsInstantiateException;
+  
+   /**
+    * Create a new minor versionned content. 
+    * @param uri The content uri
+    * @return The new versionned conntent
+    * @throws CmsInstantiateException
+    */   
+   public VersionnedContent createMinorVersion(String uri) throws CmsInstantiateException;
+   
+   /**
+    * Add a new version in the Document history
+    * @param uri The uri for wich the history has to be modified
+    * @param previousContent The versionned content before the new one to add
+    * @param newContent The new versionned content to insert into the history
+    * @throws CmsInstantiateException
+    */
+   void addInHistory(String uri, VersionnedContent previousContent, VersionnedContent newContent) throws CmsInstantiateException;
+}

Propchange: incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/core/ContentVersionService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/dm/DocumentModelService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/search/ContentIndexService.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/search/ContentIndexService.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/search/ContentIndexService.java (original)
+++ incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/search/ContentIndexService.java Wed Sep 20 12:37:05 2006
@@ -1,83 +1,83 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * 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.services.search;
-
-import java.util.Collection;
-
-import org.apache.portals.graffito.model.core.CmsObject;
-
-
-/**
- * Cms Index Service. This service can be used to add, remove or update CmsObjects into a index
- *
- * 
- * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
- * 
- * @version $Id: ContentIndexService.java,v 1.1 2004/12/22 21:16:12 christophe Exp $
- */
-public interface ContentIndexService
-{
-   
-    /**
-     * Add a CmsObject entry
-     * 
-     * @param cmsObject The CmsObject to add into the index
-     * @return true if the object is correclty added
-     */
-    public boolean add(CmsObject cmsObject);
-
-    /**
-     * Add a collection of CmsObject entries
-     * 
-     * @param cmsObjects the CmsObject collection to add into the index
-     * @return true if the collection is correctly added
-     */
-    public boolean add(Collection cmsObjects);
-
-    /**
-     * Remove a CmsObject entry
-     * 
-     * @param cmsObject the CmsObject to remove from the index
-     * @return true if the object is correctly removed
-     */
-    public boolean remove(CmsObject cmsObject);
-
-    /**
-     * Remove a collection of CmsObject entries
-     * 
-     * @param cmsObjects the CmsObject collection to remove from the index
-     * @return true if the collection is correctly removed
-     */
-    public boolean remove(Collection cmsObjects);
-
-    /**
-     * Update a CmsObject entry
-     * 
-     * @param cmsObject the CmsObject to update from the index
-     * @return  true if the CmsObject is correctly removed
-     */
-    public boolean update(CmsObject cmsObject);
-
-    /**
-     * Update a CmsObject entries
-     * 
-     * @param cmsObjects the CmsObject collection to update from the index
-     * @return True if the object is correctly updated in the index
-     */
-    public boolean update(Collection cmsObjects);
-
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * 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.services.search;
+
+import java.util.Collection;
+
+import org.apache.portals.graffito.model.core.CmsObject;
+
+
+/**
+ * Cms Index Service. This service can be used to add, remove or update CmsObjects into a index
+ *
+ * 
+ * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
+ * 
+ * @version $Id: ContentIndexService.java,v 1.1 2004/12/22 21:16:12 christophe Exp $
+ */
+public interface ContentIndexService
+{
+   
+    /**
+     * Add a CmsObject entry
+     * 
+     * @param cmsObject The CmsObject to add into the index
+     * @return true if the object is correclty added
+     */
+    public boolean add(CmsObject cmsObject);
+
+    /**
+     * Add a collection of CmsObject entries
+     * 
+     * @param cmsObjects the CmsObject collection to add into the index
+     * @return true if the collection is correctly added
+     */
+    public boolean add(Collection cmsObjects);
+
+    /**
+     * Remove a CmsObject entry
+     * 
+     * @param cmsObject the CmsObject to remove from the index
+     * @return true if the object is correctly removed
+     */
+    public boolean remove(CmsObject cmsObject);
+
+    /**
+     * Remove a collection of CmsObject entries
+     * 
+     * @param cmsObjects the CmsObject collection to remove from the index
+     * @return true if the collection is correctly removed
+     */
+    public boolean remove(Collection cmsObjects);
+
+    /**
+     * Update a CmsObject entry
+     * 
+     * @param cmsObject the CmsObject to update from the index
+     * @return  true if the CmsObject is correctly removed
+     */
+    public boolean update(CmsObject cmsObject);
+
+    /**
+     * Update a CmsObject entries
+     * 
+     * @param cmsObjects the CmsObject collection to update from the index
+     * @return True if the object is correctly updated in the index
+     */
+    public boolean update(Collection cmsObjects);
+
+}

Propchange: incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/search/ContentIndexService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/search/ContentSearchService.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/search/ContentSearchService.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/search/ContentSearchService.java (original)
+++ incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/search/ContentSearchService.java Wed Sep 20 12:37:05 2006
@@ -1,60 +1,60 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * 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.services.search;
-
-import org.apache.portals.graffito.exception.ContentManagementException;
-
-
-/**
- * Cms Search Service.
- *
- * 
- * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
- * 
- * @version $Id: ContentSearchService.java,v 1.1 2004/12/22 21:16:12 christophe Exp $
- */
-public interface ContentSearchService
-{
-
-    /**
-     * Search on CmsObjects
-     * 
-     * @param filter Filter used to search CmsObject
-     * @return result wich match to the search criteria
-     * 
-     * @throws ContentManagementException
-     */
-    public SearchResults searchCmsObjects(Filter filter) throws ContentManagementException;
-
-    /**
-     * Search on CmsObjects
-     * 
-     * @param filter Filter used to search CmsObject
-     * @param cmsObjectClass The cms object class (Content, folder, ...) 
-     * @return result wich match to the search criteria
-     * 
-     * @throws ContentManagementException
-     */
-    public SearchResults searchCmsObjects(Class cmsObjectClass, Filter filter) throws ContentManagementException;
-    
-    /**
-     * Create a new Filter
-     * 
-     * @return a new Filter instance
-     */
-    public Filter newFilter();    
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * 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.services.search;
+
+import org.apache.portals.graffito.exception.ContentManagementException;
+
+
+/**
+ * Cms Search Service.
+ *
+ * 
+ * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
+ * 
+ * @version $Id: ContentSearchService.java,v 1.1 2004/12/22 21:16:12 christophe Exp $
+ */
+public interface ContentSearchService
+{
+
+    /**
+     * Search on CmsObjects
+     * 
+     * @param filter Filter used to search CmsObject
+     * @return result wich match to the search criteria
+     * 
+     * @throws ContentManagementException
+     */
+    public SearchResults searchCmsObjects(Filter filter) throws ContentManagementException;
+
+    /**
+     * Search on CmsObjects
+     * 
+     * @param filter Filter used to search CmsObject
+     * @param cmsObjectClass The cms object class (Content, folder, ...) 
+     * @return result wich match to the search criteria
+     * 
+     * @throws ContentManagementException
+     */
+    public SearchResults searchCmsObjects(Class cmsObjectClass, Filter filter) throws ContentManagementException;
+    
+    /**
+     * Create a new Filter
+     * 
+     * @return a new Filter instance
+     */
+    public Filter newFilter();    
+}

Propchange: incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/search/ContentSearchService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/search/Filter.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/search/Filter.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/search/Filter.java (original)
+++ incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/search/Filter.java Wed Sep 20 12:37:05 2006
@@ -1,143 +1,143 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * 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.services.search;
-
-import java.util.Collection;
-
-/**
- * 
- * Graffito Filter interface.
- *
- * @version $Ip:  Exp $
- *
- */
-public interface Filter
-{
-    
-    /**
-     * Set the filter scope. The scope is an URI prefix specifying where to search in the content tree.
-     * For example, if the scope is '/myserver1/myfolder', the search engine will search all objects
-     * which are located below '/myserver1/myfolder'.
-     * 
-     * @param scope The filter scope
-     *  
-     */
-    public void setScope(String scope);
-    
-    /**
-     * Get the filter scope.
-     * 
-     * @return The filter scope
-     */
-    public String getScope();
-    
-    /**
-     * Search content based on a fullTextSearch. 
-     * Depending on the full text search engine, you can also filter on properties.
-     * 
-     * @param fullTextSearch The full text search string  
-     */
-    public void addFullTextSearch(String fullTextSearch);
-
-    /**
-     * Search content based on a fullTextSearch. 
-     * Depending on the full text search engine, you can also filter on properties.
-     * 
-     * @param fullTextSearch The full text search string
-     * @param field The field to be searched  
-     */    
-    public void addFullTextSearch(String fullTextSearch, String field);
-    
-    /**
-     * @return the full text search field
-     * 
-     */
-    public String getSearchField();
-    
-	/**
-	 * @see org.apache.ojb.broker.query.Criteria#addBetween(java.lang.String, java.lang.Object, java.lang.Object)
-	 */
-	public void addBetween(String arg0, Object arg1, Object arg2);
-
-	/**
-	 * @see org.apache.ojb.broker.query.Criteria#addEqualTo(java.lang.String, java.lang.Object)
-	 */
-	public void addEqualTo(String arg0, Object arg1);
-
-	/**
-	 * @see org.apache.ojb.broker.query.Criteria#addGreaterOrEqualThan(java.lang.String, java.lang.Object)
-	 */
-	public void addGreaterOrEqualThan(String arg0, Object arg1);
-
-	/**
-	 * @see org.apache.ojb.broker.query.Criteria#addGreaterThan(java.lang.String, java.lang.Object)
-	 */
-	public void addGreaterThan(String arg0, Object arg1);
-
-	/**
-	 * @see org.apache.ojb.broker.query.Criteria#addIn(java.lang.String, java.util.Collection)
-	 */      
-	public void addIn(String attribute, Collection values);
-
-	/**
-	 * @see org.apache.ojb.broker.query.Criteria#addLessOrEqualThan(java.lang.String, java.lang.Object)
-	 */
-	public void addLessOrEqualThan(String arg0, Object arg1);
-
-	/**
-	 * @see org.apache.ojb.broker.query.Criteria#addLike(java.lang.Object, java.lang.Object)
-	 */
-	public void addLike(Object arg0, Object arg1);
-
-	/**
-	 * @see org.apache.ojb.broker.query.Criteria#addNotBetween(java.lang.String, java.lang.Object, java.lang.Object)
-	 */
-	public abstract void addNotBetween(String arg0, Object arg1, Object arg2);
-
-	/**
-	 * @see org.apache.ojb.broker.query.Criteria#addNotEqualTo(java.lang.String, java.lang.Object)
-	 */
-	public void addNotEqualTo(String arg0, Object arg1);
-
-	/**
-	 * @see org.apache.ojb.broker.query.Criteria#addNotLike(java.lang.String, java.lang.Object)
-	 */
-	public void addNotLike(String arg0, Object arg1);
-
-	/**
-	 * @see org.apache.ojb.broker.query.Criteria#addNotNull(java.lang.String)
-	 */
-	public void addNotNull(String arg0);
-
-	public void addIsNull(String arg0);
-	
-	/**
-	 * @see org.apache.ojb.broker.query.Criteria#addOrCriteria(org.apache.ojb.broker.query.Criteria)
-	 */
-	public void addOrFilter(Filter arg0);
-
-	/**
-	 * @see org.apache.ojb.broker.query.Criteria#addOrderByAscending(java.lang.String)
-	 */
-	public void addOrderByAscending(String arg0);
-
-	/**
-	 * @see org.apache.ojb.broker.query.Criteria#addOrderByDescending(java.lang.String)
-	 */
-	public void addOrderByDescending(String arg0);
-
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * 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.services.search;
+
+import java.util.Collection;
+
+/**
+ * 
+ * Graffito Filter interface.
+ *
+ * @version $Ip:  Exp $
+ *
+ */
+public interface Filter
+{
+    
+    /**
+     * Set the filter scope. The scope is an URI prefix specifying where to search in the content tree.
+     * For example, if the scope is '/myserver1/myfolder', the search engine will search all objects
+     * which are located below '/myserver1/myfolder'.
+     * 
+     * @param scope The filter scope
+     *  
+     */
+    public void setScope(String scope);
+    
+    /**
+     * Get the filter scope.
+     * 
+     * @return The filter scope
+     */
+    public String getScope();
+    
+    /**
+     * Search content based on a fullTextSearch. 
+     * Depending on the full text search engine, you can also filter on properties.
+     * 
+     * @param fullTextSearch The full text search string  
+     */
+    public void addFullTextSearch(String fullTextSearch);
+
+    /**
+     * Search content based on a fullTextSearch. 
+     * Depending on the full text search engine, you can also filter on properties.
+     * 
+     * @param fullTextSearch The full text search string
+     * @param field The field to be searched  
+     */    
+    public void addFullTextSearch(String fullTextSearch, String field);
+    
+    /**
+     * @return the full text search field
+     * 
+     */
+    public String getSearchField();
+    
+	/**
+	 * @see org.apache.ojb.broker.query.Criteria#addBetween(java.lang.String, java.lang.Object, java.lang.Object)
+	 */
+	public void addBetween(String arg0, Object arg1, Object arg2);
+
+	/**
+	 * @see org.apache.ojb.broker.query.Criteria#addEqualTo(java.lang.String, java.lang.Object)
+	 */
+	public void addEqualTo(String arg0, Object arg1);
+
+	/**
+	 * @see org.apache.ojb.broker.query.Criteria#addGreaterOrEqualThan(java.lang.String, java.lang.Object)
+	 */
+	public void addGreaterOrEqualThan(String arg0, Object arg1);
+
+	/**
+	 * @see org.apache.ojb.broker.query.Criteria#addGreaterThan(java.lang.String, java.lang.Object)
+	 */
+	public void addGreaterThan(String arg0, Object arg1);
+
+	/**
+	 * @see org.apache.ojb.broker.query.Criteria#addIn(java.lang.String, java.util.Collection)
+	 */      
+	public void addIn(String attribute, Collection values);
+
+	/**
+	 * @see org.apache.ojb.broker.query.Criteria#addLessOrEqualThan(java.lang.String, java.lang.Object)
+	 */
+	public void addLessOrEqualThan(String arg0, Object arg1);
+
+	/**
+	 * @see org.apache.ojb.broker.query.Criteria#addLike(java.lang.Object, java.lang.Object)
+	 */
+	public void addLike(Object arg0, Object arg1);
+
+	/**
+	 * @see org.apache.ojb.broker.query.Criteria#addNotBetween(java.lang.String, java.lang.Object, java.lang.Object)
+	 */
+	public abstract void addNotBetween(String arg0, Object arg1, Object arg2);
+
+	/**
+	 * @see org.apache.ojb.broker.query.Criteria#addNotEqualTo(java.lang.String, java.lang.Object)
+	 */
+	public void addNotEqualTo(String arg0, Object arg1);
+
+	/**
+	 * @see org.apache.ojb.broker.query.Criteria#addNotLike(java.lang.String, java.lang.Object)
+	 */
+	public void addNotLike(String arg0, Object arg1);
+
+	/**
+	 * @see org.apache.ojb.broker.query.Criteria#addNotNull(java.lang.String)
+	 */
+	public void addNotNull(String arg0);
+
+	public void addIsNull(String arg0);
+	
+	/**
+	 * @see org.apache.ojb.broker.query.Criteria#addOrCriteria(org.apache.ojb.broker.query.Criteria)
+	 */
+	public void addOrFilter(Filter arg0);
+
+	/**
+	 * @see org.apache.ojb.broker.query.Criteria#addOrderByAscending(java.lang.String)
+	 */
+	public void addOrderByAscending(String arg0);
+
+	/**
+	 * @see org.apache.ojb.broker.query.Criteria#addOrderByDescending(java.lang.String)
+	 */
+	public void addOrderByDescending(String arg0);
+
+}

Propchange: incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/search/Filter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/search/SearchResults.java
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/search/SearchResults.java?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/search/SearchResults.java (original)
+++ incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/search/SearchResults.java Wed Sep 20 12:37:05 2006
@@ -1,123 +1,123 @@
-/*
- * Copyright 2004-2005 The Apache Software Foundation or its licensors,
- *                     as applicable.
- *
- * 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.services.search;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.portals.graffito.model.core.CmsObject;
-
-
-/**
- * Container for search result entries
- *
- * @author <a href="mailto:taylor@apache.org">David Sean taylor</a>
- * @version $Id: SearchResults.java,v 1.1 2004/12/22 21:16:12 christophe Exp $
- */
-public class SearchResults
-{
-    private List results = null;
-
-    /**
-     */
-    public SearchResults()
-    {
-        init(0);
-    }
-
-    /**
-     * 
-     * @param initialCapacity
-     */
-    public SearchResults(int initialCapacity)
-    {
-        init(initialCapacity);
-    }
-
-    /**
-     * 
-     * @param initialCapacity
-     */
-    private void init(int initialCapacity)
-    {
-        results = new ArrayList(initialCapacity);
-    }
-
-    /**
-     * 
-     * @param searchResult
-     * @return 
-     */
-    public boolean add(CmsObject cmsObject)
-    {
-        return results.add(cmsObject);
-    }
-
-    /**
-     * 
-     * @param index
-     * @param searchResult
-     */
-    public void add(int index, CmsObject cmsObject)
-    {
-        results.add(index, cmsObject);
-        return;
-    }
-    
-    /**
-     * 
-     * @param index
-     * @param searchResult
-     */
-    public void addAll(Collection cmsObjects)
-    {
-        results.addAll(cmsObjects);
-        return;
-    }
-    
-
-    /**
-     * 
-     * @param index
-     * @return 
-     */
-    public CmsObject get(int index)
-    {
-        return(CmsObject) results.get(index);
-    }
-
-    /**
-     * 
-     * @return 
-     */
-    public int size()
-    {
-        return results.size();
-    }
-
-    /**
-     * 
-     * @return 
-     */
-    public List getResults()
-    {
-        return this.results;
-    }
-    
-}
+/*
+ * Copyright 2004-2005 The Apache Software Foundation or its licensors,
+ *                     as applicable.
+ *
+ * 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.services.search;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.portals.graffito.model.core.CmsObject;
+
+
+/**
+ * Container for search result entries
+ *
+ * @author <a href="mailto:taylor@apache.org">David Sean taylor</a>
+ * @version $Id: SearchResults.java,v 1.1 2004/12/22 21:16:12 christophe Exp $
+ */
+public class SearchResults
+{
+    private List results = null;
+
+    /**
+     */
+    public SearchResults()
+    {
+        init(0);
+    }
+
+    /**
+     * 
+     * @param initialCapacity
+     */
+    public SearchResults(int initialCapacity)
+    {
+        init(initialCapacity);
+    }
+
+    /**
+     * 
+     * @param initialCapacity
+     */
+    private void init(int initialCapacity)
+    {
+        results = new ArrayList(initialCapacity);
+    }
+
+    /**
+     * 
+     * @param searchResult
+     * @return 
+     */
+    public boolean add(CmsObject cmsObject)
+    {
+        return results.add(cmsObject);
+    }
+
+    /**
+     * 
+     * @param index
+     * @param searchResult
+     */
+    public void add(int index, CmsObject cmsObject)
+    {
+        results.add(index, cmsObject);
+        return;
+    }
+    
+    /**
+     * 
+     * @param index
+     * @param searchResult
+     */
+    public void addAll(Collection cmsObjects)
+    {
+        results.addAll(cmsObjects);
+        return;
+    }
+    
+
+    /**
+     * 
+     * @param index
+     * @return 
+     */
+    public CmsObject get(int index)
+    {
+        return(CmsObject) results.get(index);
+    }
+
+    /**
+     * 
+     * @return 
+     */
+    public int size()
+    {
+        return results.size();
+    }
+
+    /**
+     * 
+     * @return 
+     */
+    public List getResults()
+    {
+        return this.results;
+    }
+    
+}

Propchange: incubator/graffito/trunk/api/src/java/org/apache/portals/graffito/services/search/SearchResults.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/graffito/trunk/api/xdocs/stylesheets/maven-j2.css
URL: http://svn.apache.org/viewvc/incubator/graffito/trunk/api/xdocs/stylesheets/maven-j2.css?view=diff&rev=448311&r1=448310&r2=448311
==============================================================================
--- incubator/graffito/trunk/api/xdocs/stylesheets/maven-j2.css (original)
+++ incubator/graffito/trunk/api/xdocs/stylesheets/maven-j2.css Wed Sep 20 12:37:05 2006
@@ -1,212 +1,212 @@
-/*
----------------------- 
-Theme Style
-----------------------
-*/
-body {
-	background-color: #fff;
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	margin-left: auto;
-	margin-right: auto;
-	background-repeat: repeat-y;
-	font-size: 13px;
-	padding: 0px;
-}
-
-td,select,input,li {
-	font-family: Verdana, Helvetica, Arial, sans-serif;
-	font-size: 12px;
-	color: #333333;
-}
-
-code {
-	font-size: 12px;
-}
-
-a {
-	text-decoration: none;
-}
-
-a:link {
-	color: #47a;
-}
-
-a:visited {
-	color: #666666;
-}
-
-a:active,a:hover {
-	color: #990000;
-}
-
-#legend li.externalLink {
-	background: url(../images/external.png) left top no-repeat;
-	padding-left: 18px;
-}
-
-a.externalLink,a.externalLink:link,a.externalLink:visited,a.externalLink:active,a.externalLink:hover
-	{
-	background: url(../images/external.png) right center no-repeat;
-	padding-right: 18px;
-}
-
-#legend li.newWindow {
-	background: url(../images/newwindow.png) left top no-repeat;
-	padding-left: 18px;
-}
-
-a.newWindow,a.newWindow:link,a.newWindow:visited,a.newWindow:active,a.newWindow:hover
-	{
-	background: url(../images/newwindow.png) right center no-repeat;
-	padding-right: 18px;
-}
-
-h2 {
-	font-size: 17px;
-	color: #333333;
-}
-
-h3 {
-	padding: 4px 4px 4px 24px;
-	color: #666;
-	background-color: #ccc;
-	font-weight: bold;
-	font-size: 14px;
-	background-image: url(../images/h3.jpg);
-	background-repeat: no-repeat;
-	background-position: left bottom;
-}
-
-p {
-	line-height: 1.3em;
-	font-size: 12px;
-	color: #000;
-}
-
-#breadcrumbs {
-	height: 6px;
-	background-image: url(../images/breadcrumbs.jpg);
-	padding: 5px 10px 14px 20px;
-}
-
-* html #breadcrumbs {
-	padding-bottom: 8px;
-}
-
-#leftColumn {
-	margin: 10px 0 10px 0;
-	border-top-color: #ccc;
-	border-top-style: solid;
-	border-top-width: 1px;
-	border-right-color: #ccc;
-	border-right-style: solid;
-	border-right-width: 1px;
-	border-bottom-color: #ccc;
-	border-bottom-style: solid;
-	border-bottom-width: 1px;
-	padding-right: 5px;
-	padding-left: 5px;
-}
-
-#navcolumn h5 {
-	font-size: smaller;
-	border-bottom: 1px solid #aaaaaa;
-	padding-top: 2px;
-	padding-left: 9px;
-	color: #49635a;
-	background-image: url(../images/h5.jpg);
-	background-repeat: no-repeat;
-	background-position: left bottom;
-}
-
-table.bodyTable th {
-	color: white;
-	background-color: #bbb;
-	text-align: left;
-	font-weight: bold;
-}
-
-table.bodyTable th,table.bodyTable td {
-	font-size: 11px;
-}
-
-table.bodyTable tr.a {
-	background-color: #ddd;
-}
-
-table.bodyTable tr.b {
-	background-color: #eee;
-}
-
-.source {
-	border: 1px solid #999;
-	overflow: auto
-}
-
-dt {
-	padding: 4px 4px 4px 24px;
-	color: #333333;
-	background-color: #ccc;
-	font-weight: bold;
-	font-size: 14px;
-	background-image: url(../images/h3.jpg);
-	background-repeat: no-repeat;
-	background-position: left bottom;
-}
-
-.subsectionTitle {
-	font-size: 13px;
-	font-weight: bold;
-	color: #666;
-}
-
-table {
-	font-size: 10px;
-}
-
-.xright a:link,.xright a:visited,.xright a:active {
-	color: #666;
-}
-
-.xright a:hover {
-	color: #003300;
-}
-
-#banner {
-	height: 93px;
-	background: url(../images/banner.jpg);
-}
-
-#navcolumn ul {
-	margin: 5px 0 15px -0em;
-}
-
-#navcolumn ul a {
-	color: #333333;
-}
-
-#navcolumn ul a:hover {
-	color: red;
-}
-
-#intro {
-	border: solid #ccc 1px;
-	margin: 6px 0px 0px 0px;
-	padding: 10px 40px 10px 40px;
-}
-
-.subsection {
-	margin-left: 3px;
-	color: #333333;
-}
-
-.subsection p {
-	font-size: 12px;
-}
-
-#footer {
-	padding: 10px;
-	margin: 20px 0px 20px 0px;
-	border-top: solid #ccc 1px;
-	color: #333333;
+/*
+---------------------- 
+Theme Style
+----------------------
+*/
+body {
+	background-color: #fff;
+	font-family: Verdana, Helvetica, Arial, sans-serif;
+	margin-left: auto;
+	margin-right: auto;
+	background-repeat: repeat-y;
+	font-size: 13px;
+	padding: 0px;
+}
+
+td,select,input,li {
+	font-family: Verdana, Helvetica, Arial, sans-serif;
+	font-size: 12px;
+	color: #333333;
+}
+
+code {
+	font-size: 12px;
+}
+
+a {
+	text-decoration: none;
+}
+
+a:link {
+	color: #47a;
+}
+
+a:visited {
+	color: #666666;
+}
+
+a:active,a:hover {
+	color: #990000;
+}
+
+#legend li.externalLink {
+	background: url(../images/external.png) left top no-repeat;
+	padding-left: 18px;
+}
+
+a.externalLink,a.externalLink:link,a.externalLink:visited,a.externalLink:active,a.externalLink:hover
+	{
+	background: url(../images/external.png) right center no-repeat;
+	padding-right: 18px;
+}
+
+#legend li.newWindow {
+	background: url(../images/newwindow.png) left top no-repeat;
+	padding-left: 18px;
+}
+
+a.newWindow,a.newWindow:link,a.newWindow:visited,a.newWindow:active,a.newWindow:hover
+	{
+	background: url(../images/newwindow.png) right center no-repeat;
+	padding-right: 18px;
+}
+
+h2 {
+	font-size: 17px;
+	color: #333333;
+}
+
+h3 {
+	padding: 4px 4px 4px 24px;
+	color: #666;
+	background-color: #ccc;
+	font-weight: bold;
+	font-size: 14px;
+	background-image: url(../images/h3.jpg);
+	background-repeat: no-repeat;
+	background-position: left bottom;
+}
+
+p {
+	line-height: 1.3em;
+	font-size: 12px;
+	color: #000;
+}
+
+#breadcrumbs {
+	height: 6px;
+	background-image: url(../images/breadcrumbs.jpg);
+	padding: 5px 10px 14px 20px;
+}
+
+* html #breadcrumbs {
+	padding-bottom: 8px;
+}
+
+#leftColumn {
+	margin: 10px 0 10px 0;
+	border-top-color: #ccc;
+	border-top-style: solid;
+	border-top-width: 1px;
+	border-right-color: #ccc;
+	border-right-style: solid;
+	border-right-width: 1px;
+	border-bottom-color: #ccc;
+	border-bottom-style: solid;
+	border-bottom-width: 1px;
+	padding-right: 5px;
+	padding-left: 5px;
+}
+
+#navcolumn h5 {
+	font-size: smaller;
+	border-bottom: 1px solid #aaaaaa;
+	padding-top: 2px;
+	padding-left: 9px;
+	color: #49635a;
+	background-image: url(../images/h5.jpg);
+	background-repeat: no-repeat;
+	background-position: left bottom;
+}
+
+table.bodyTable th {
+	color: white;
+	background-color: #bbb;
+	text-align: left;
+	font-weight: bold;
+}
+
+table.bodyTable th,table.bodyTable td {
+	font-size: 11px;
+}
+
+table.bodyTable tr.a {
+	background-color: #ddd;
+}
+
+table.bodyTable tr.b {
+	background-color: #eee;
+}
+
+.source {
+	border: 1px solid #999;
+	overflow: auto
+}
+
+dt {
+	padding: 4px 4px 4px 24px;
+	color: #333333;
+	background-color: #ccc;
+	font-weight: bold;
+	font-size: 14px;
+	background-image: url(../images/h3.jpg);
+	background-repeat: no-repeat;
+	background-position: left bottom;
+}
+
+.subsectionTitle {
+	font-size: 13px;
+	font-weight: bold;
+	color: #666;
+}
+
+table {
+	font-size: 10px;
+}
+
+.xright a:link,.xright a:visited,.xright a:active {
+	color: #666;
+}
+
+.xright a:hover {
+	color: #003300;
+}
+
+#banner {
+	height: 93px;
+	background: url(../images/banner.jpg);
+}
+
+#navcolumn ul {
+	margin: 5px 0 15px -0em;
+}
+
+#navcolumn ul a {
+	color: #333333;
+}
+
+#navcolumn ul a:hover {
+	color: red;
+}
+
+#intro {
+	border: solid #ccc 1px;
+	margin: 6px 0px 0px 0px;
+	padding: 10px 40px 10px 40px;
+}
+
+.subsection {
+	margin-left: 3px;
+	color: #333333;
+}
+
+.subsection p {
+	font-size: 12px;
+}
+
+#footer {
+	padding: 10px;
+	margin: 20px 0px 20px 0px;
+	border-top: solid #ccc 1px;
+	color: #333333;
 }

Propchange: incubator/graffito/trunk/api/xdocs/stylesheets/maven-j2.css
------------------------------------------------------------------------------
    svn:eol-style = native

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



Mime
View raw message