incubator-graffito-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raph...@apache.org
Subject svn commit: r124659 - in incubator/graffito/trunk: . components components/src/sql/GraffitoServer components/src/sql/GraffitoServer/mysql jetspeed2-deploy/src/assembly jetspeed2-deploy/src/pages portlets portlets/src/java/org/apache/portals/graffito/portlets portlets/src/java/org/apache/portals/graffito/portlets/resources portlets/src/webapp/WEB-INF portlets/src/webapp/WEB-INF/view site/xdocs
Date Sat, 08 Jan 2005 16:29:45 GMT
Author: raphael
Date: Sat Jan  8 08:29:43 2005
New Revision: 124659

URL: http://svn.apache.org/viewcvs?view=rev&rev=124659
Log:
Synchronizing changes with private repository and finalize move to incubator
Added:
   incubator/graffito/trunk/components/src/sql/GraffitoServer/mysql/drop-ojb.sql
   incubator/graffito/trunk/components/src/sql/GraffitoServer/mysql/drop-security.sql
   incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/BrowserInfo.java
   incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/BrowserPortlet.java
   incubator/graffito/trunk/portlets/src/webapp/WEB-INF/faces-config.xml
   incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/adddocument.vm
   incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/addfolder.vm
   incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/edit.jsp
   incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/edit.vm
   incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/help.html
   incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/view.jsp
   incubator/graffito/trunk/portlets/src/webapp/WEB-INF/web-velocity.xml
Modified:
   incubator/graffito/trunk/components/maven.xml
   incubator/graffito/trunk/components/src/sql/GraffitoServer/delete-db.sql
   incubator/graffito/trunk/components/src/sql/GraffitoServer/mysql/drop-db.sql
   incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-spring.xml
   incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito.psml
   incubator/graffito/trunk/maven.xml
   incubator/graffito/trunk/portlets/project.xml
   incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/resources/messages.properties
   incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/resources/messages_en.properties
   incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/resources/messages_fr.properties
   incubator/graffito/trunk/portlets/src/webapp/WEB-INF/jetspeed-portlet.xml
   incubator/graffito/trunk/portlets/src/webapp/WEB-INF/portlet.xml
   incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/help.vm
   incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/view.vm
   incubator/graffito/trunk/portlets/src/webapp/WEB-INF/web.xml
   incubator/graffito/trunk/site/xdocs/architecture.xml
   incubator/graffito/trunk/site/xdocs/roadmap.xml

Modified: incubator/graffito/trunk/components/maven.xml
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/components/maven.xml?view=diff&rev=124659&p1=incubator/graffito/trunk/components/maven.xml&r1=124658&p2=incubator/graffito/trunk/components/maven.xml&r2=124659
==============================================================================
--- incubator/graffito/trunk/components/maven.xml	(original)
+++ incubator/graffito/trunk/components/maven.xml	Sat Jan  8 08:29:43 2005
@@ -323,6 +323,16 @@
   <goal name="db.drop">    
     <j:set var="database.arg.script" value="./src/sql/GraffitoServer/${org.apache.portals.graffito.database.default.name}/drop-db.sql" />
     <attainGoal name="db.execute" />
+	
+    <j:if test="${jetspeed == 'falseX'}">
+       <j:set var="database.arg.script" value="./src/sql/GraffitoServer/${org.apache.portals.graffito.database.default.name}/drop-security.sql" />
+       <attainGoal name="db.execute" />
+
+       <j:set var="database.arg.script" value="./src/sql/GraffitoServer/${org.apache.portals.graffito.database.default.name}/drop-ojb.sql" />
+       <attainGoal name="db.execute" />
+		
+	</j:if>	
+
   </goal>
 
   <!-- ================================================================ -->
@@ -354,11 +364,7 @@
     <copy todir="${org.apache.jetspeed.deploy.war.dir}/jetspeed/WEB-INF/lib" overwrite="true">	
 	<fileset file="${basedir}/target/${maven.final.name}.jar" />
     </copy>
-  </goal>	
-
-   <preGoal name="deploy">
-        <attainGoal name="jar:install"/>
-   </preGoal>    
+  </goal>	 
 </project>
 
 

Modified: incubator/graffito/trunk/components/src/sql/GraffitoServer/delete-db.sql
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/components/src/sql/GraffitoServer/delete-db.sql?view=diff&rev=124659&p1=incubator/graffito/trunk/components/src/sql/GraffitoServer/delete-db.sql&r1=124658&p2=incubator/graffito/trunk/components/src/sql/GraffitoServer/delete-db.sql&r2=124659
==============================================================================
--- incubator/graffito/trunk/components/src/sql/GraffitoServer/delete-db.sql	(original)
+++ incubator/graffito/trunk/components/src/sql/GraffitoServer/delete-db.sql	Sat Jan  8 08:29:43 2005
@@ -19,23 +19,6 @@
 delete from WEBDAV_SERVER;
 delete from GRAFFITO_DB_SERVER; 
 delete from SERVER;
-
-
-delete from SSO_SITE_TO_CREDENTIALS;
-delete from SSO_SITE_TO_PRINCIPALS;
-delete from SSO_SITE;
-delete from SECURITY_USER_ROLE;
-delete from SECURITY_USER_GROUP;
-delete from SECURITY_GROUP_ROLE;
-delete from PRINCIPAL_PERMISSION;
-delete from SECURITY_PERMISSION;
-delete from SECURITY_CREDENTIAL;
-delete from SECURITY_PRINCIPAL;
-
-  
-  
-  
-  
   
   
 

Modified: incubator/graffito/trunk/components/src/sql/GraffitoServer/mysql/drop-db.sql
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/components/src/sql/GraffitoServer/mysql/drop-db.sql?view=diff&rev=124659&p1=incubator/graffito/trunk/components/src/sql/GraffitoServer/mysql/drop-db.sql&r1=124658&p2=incubator/graffito/trunk/components/src/sql/GraffitoServer/mysql/drop-db.sql&r2=124659
==============================================================================
--- incubator/graffito/trunk/components/src/sql/GraffitoServer/mysql/drop-db.sql	(original)
+++ incubator/graffito/trunk/components/src/sql/GraffitoServer/mysql/drop-db.sql	Sat Jan  8 08:29:43 2005
@@ -21,18 +21,7 @@
 drop table if exists GRAFFITO_DB_SERVER; 
 drop table if exists SERVER;
 
-
-drop table if exists SSO_SITE_TO_CREDENTIALS;
-drop table  if exists SSO_PRINCIPAL_TO_REMOTE_PRINCIPAL;
-drop table  if exists SSO_SITE_TO_PRINCIPALS;
-drop table if exists SSO_SITE;
-drop table if exists SECURITY_USER_ROLE;
-drop table if exists SECURITY_USER_GROUP;
-drop table if exists SECURITY_GROUP_ROLE;
-drop table if exists PRINCIPAL_PERMISSION;
-drop table if exists SECURITY_PERMISSION;
-drop table if exists SECURITY_CREDENTIAL;
-drop table if exists SECURITY_PRINCIPAL;
+
 
 
   

Added: incubator/graffito/trunk/components/src/sql/GraffitoServer/mysql/drop-ojb.sql
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/components/src/sql/GraffitoServer/mysql/drop-ojb.sql?view=auto&rev=124659
==============================================================================
--- (empty file)
+++ incubator/graffito/trunk/components/src/sql/GraffitoServer/mysql/drop-ojb.sql	Sat Jan  8 08:29:43 2005
@@ -0,0 +1,23 @@
+-----------------------------------------------------------------------------
+-- 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.
+-----------------------------------------------------------------------------
+drop table if exists  OJB_HL_SEQ;
+drop table if exists  OJB_LOCKENTRY;
+drop table if exists  OJB_NRM;
+drop table if exists  OJB_DLIST;
+drop table if exists  OJB_DLIST_ENTRIES;
+drop table if exists  OJB_DSET;
+drop table if exists  OJB_DSET_ENTRIES;
+drop table if exists  OJB_DMAP;
\ No newline at end of file

Added: incubator/graffito/trunk/components/src/sql/GraffitoServer/mysql/drop-security.sql
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/components/src/sql/GraffitoServer/mysql/drop-security.sql?view=auto&rev=124659
==============================================================================
--- (empty file)
+++ incubator/graffito/trunk/components/src/sql/GraffitoServer/mysql/drop-security.sql	Sat Jan  8 08:29:43 2005
@@ -0,0 +1,29 @@
+-----------------------------------------------------------------------------
+-- 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.
+-----------------------------------------------------------------------------
+
+drop table if exists PRINCIPAL_PERMISSION;
+drop table if exists SECURITY_CREDENTIAL;
+drop table if exists SSO_SITE_TO_PRINCIPALS;
+drop table if exists SSO_SITE_TO_REMOTE;
+drop table if exists SSO_PRINCIPAL_TO_REMOTE;
+drop table if exists SECURITY_USER_ROLE;
+drop table if exists SECURITY_USER_GROUP;
+drop table if exists SECURITY_GROUP_ROLE;
+  
+drop table if exists SECURITY_PERMISSION; 
+drop table if exists SSO_PRINCIPAL_TO_REMOTE_PRINCIPAL;
+drop table if exists SECURITY_PRINCIPAL;
+drop table if exists SSO_SITE;

Modified: incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-spring.xml
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-spring.xml?view=diff&rev=124659&p1=incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-spring.xml&r1=124658&p2=incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-spring.xml&r2=124659
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-spring.xml	(original)
+++ incubator/graffito/trunk/jetspeed2-deploy/src/assembly/jetspeed-spring.xml	Sat Jan  8 08:29:43 2005
@@ -67,6 +67,9 @@
   	   	  <entry key="ContentServer">
   	   	  	<ref bean="org.apache.portals.graffito.ContentServerService"/>
   	   	  </entry>   		  
+  	   	  <entry key="ContentModel">
+  	   	  	<ref bean="org.apache.portals.graffito.ContentModelService"/>
+  	   	  </entry>   		  		  
   	   	</map>
   	   </constructor-arg>
   </bean>

Modified: incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito.psml
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito.psml?view=diff&rev=124659&p1=incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito.psml&r1=124658&p2=incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito.psml&r2=124659
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito.psml	(original)
+++ incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito.psml	Sat Jan  8 08:29:43 2005
@@ -21,7 +21,7 @@
      portlet-decorator="tigris"
   />
   
-   <title>Graffito Demo</title>
+   <title>Graffito</title>
   <fragment id="graffitoportletspage" type="layout" name="jetspeed::VelocityTwoColumns">
 	     <fragment id="graffitoBrowser" type="portlet" name="graffito::graffitoBrowser">
 		      <property layout="TwoColumns" name="row" value="0" />

Modified: incubator/graffito/trunk/maven.xml
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/maven.xml?view=diff&rev=124659&p1=incubator/graffito/trunk/maven.xml&r1=124658&p2=incubator/graffito/trunk/maven.xml&r2=124659
==============================================================================
--- incubator/graffito/trunk/maven.xml	(original)
+++ incubator/graffito/trunk/maven.xml	Sat Jan  8 08:29:43 2005
@@ -122,7 +122,30 @@
     <goal name="allDeploy"
         description="Deploy all jars and war into J2 for the Graffito Demo">
           	
-    
+    <maven:reactor
+               basedir="${basedir}/components"
+               includes="project.xml"
+               goals="db.scripts.gen"
+               banner="Generate DB Scripts"
+               postProcessing="false"
+               ignoreFailures="false"/>    
+	       
+    <maven:reactor
+               basedir="${basedir}/components"
+               includes="project.xml"
+               goals="db.drop.production"
+               banner="Drop Tables"
+               postProcessing="false"
+               ignoreFailures="false"/>    
+
+     <maven:reactor
+               basedir="${basedir}/components"
+               includes="project.xml"
+               goals="db.create.production"
+               banner="Create Tables "
+               postProcessing="false"
+               ignoreFailures="false"/>    
+        
     <maven:reactor
                basedir="${basedir}/api"
                includes="project.xml"

Modified: incubator/graffito/trunk/portlets/project.xml
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/portlets/project.xml?view=diff&rev=124659&p1=incubator/graffito/trunk/portlets/project.xml&r1=124658&p2=incubator/graffito/trunk/portlets/project.xml&r2=124659
==============================================================================
--- incubator/graffito/trunk/portlets/project.xml	(original)
+++ incubator/graffito/trunk/portlets/project.xml	Sat Jan  8 08:29:43 2005
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- 
  Copyright 2002-2004 The Apache Software Foundation
 
@@ -13,163 +13,186 @@
   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.
- -->
+ -->
 <!--
   $Id: project.xml,v 1.9 2004/12/28 14:29:11 christophe Exp $
--->
-<project>
-	<extend>${basedir}/../project.xml</extend>
-	<id>graffito-portlets</id>
-	<groupId>graffito</groupId>
-	<name>Graffito Portlets</name>
-	<description>Graffito Default Portlets</description>
-	<shortDescription>Graffito Portlets</shortDescription>
-	<repository>
-		<connection>scm:cvs:pserver:anoncvs@cvs.bluesunrise.com:/cvsw:jcms2/portlets</connection>
-	</repository>
-	<dependencies>
-		<dependency>
-			<id>jetspeed-deploy-tools</id>
-			<groupId>jetspeed2</groupId>
-			<version>2.0-M1</version>
-			<properties>
-				<war.bundle>true</war.bundle>
-			</properties>
-		</dependency>
-		<dependency>
-			<id>graffito-api</id>
-			<groupId>graffito</groupId>
-			<version>1.0-a1-dev</version>
-		</dependency>
-		<dependency>
-			<id>servletapi</id>
-			<version>2.3</version>
-			<properties>
-				<war.bundle>false</war.bundle>
-			</properties>
-		</dependency>
-		<dependency>
-			<groupId>portlet-api</groupId>
-			<artifactId>portlet-api</artifactId>
-			<version>1.0</version>
-			<properties>
-				<war.bundle>false</war.bundle>
-			</properties>
-		</dependency>
-		<!-- warred jars -->
-		<dependency>
-			<groupId>commons-beanutils</groupId>
-			<artifactId>commons-beanutils</artifactId>
-			<version>1.6.1</version>
-			<url>http://jakarta.apache.org/commons/beanutils.html</url>
-			<properties>
-				<war.bundle>true</war.bundle>
-			</properties>
-		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.2</version>
-			<url>http://jakarta.apache.org/commons/codec/</url>
-			<properties>
-				<war.bundle>true</war.bundle>
-			</properties>
-		</dependency>
-		<dependency>
-			<groupId>commons-collections</groupId>
-			<artifactId>commons-collections</artifactId>
-			<version>2.1</version>
-			<url>http://jakarta.apache.org/commons/collections.html</url>
-			<properties>
-				<war.bundle>true</war.bundle>
-			</properties>
-		</dependency>
-       <dependency>
-            <groupId>portals-bridges</groupId>
-            <artifactId>portals-bridges-common</artifactId>
-            <version>0.1</version>
-            <type>jar</type>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>		
-        <dependency>
-            <groupId>portals-bridges</groupId>
-            <artifactId>portals-bridges-velocity</artifactId>
-            <version>0.1</version>
-            <type>jar</type>
-            <properties>
-                <war.bundle>true</war.bundle>
-            </properties>
-        </dependency>
-		<dependency>
-		  <id>velocity</id>
-		  <version>1.4</version>
-		  <properties>
-			<war.bundle>true</war.bundle>
-		  </properties>      
-		</dependency>
-		<dependency>
-         <id>velocity-tools</id>
-         <version>1.1</version>
-		  <url>http://jakarta.apache.org/velocity</url>
-		  <properties>
-			<war.bundle>true</war.bundle>
-		  </properties>      
-		</dependency>    
-		
-		<dependency>
-			<groupId>commons-digester</groupId>
-			<artifactId>commons-digester</artifactId>
-			<version>1.5</version>
-			<url>http://jakarta.apache.org/commons/digester.html</url>
-			<properties>
-				<war.bundle>true</war.bundle>
-			</properties>
-		</dependency>
-		<dependency>
-			<id>log4j</id>
-			<version>1.2.8</version>
-			<properties>
-				<war.bundle>true</war.bundle>
-			</properties>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<version>1.0.3</version>
-			<url>http://jakarta.apache.org/commons/logging.html</url>
-			<properties>
-				<war.bundle>true</war.bundle>
-			</properties>
-		</dependency>
-		<dependency>
-			<groupId>commons-el</groupId>
-			<artifactId>commons-el</artifactId>
-			<version>1.0</version>
-			<url>http://jakarta.apache.org/commons/el/</url>
-			<properties>
-				<war.bundle>true</war.bundle>
-			</properties>
-		</dependency>
-	</dependencies>
-	<build>
-		<sourceDirectory>src/java</sourceDirectory>
-	</build>
-	<reports>
-		<report>maven-jdepend-plugin</report>
+-->
+<project>
+	<extend>${basedir}/../project.xml</extend>
+	<id>graffito-portlets</id>
+	<groupId>graffito</groupId>
+	<name>Graffito Portlets</name>
+	<description>Graffito Default Portlets</description>
+	<shortDescription>Graffito Portlets</shortDescription>
+	<repository>
+		<connection>scm:cvs:pserver:anoncvs@cvs.bluesunrise.com:/cvsw:jcms2/portlets</connection>
+	</repository>
+	<dependencies>
+		<dependency>
+			<id>jetspeed-deploy-tools</id>
+			<groupId>jetspeed2</groupId>
+			<version>2.0-M1</version>
+			<properties>
+				<war.bundle>true</war.bundle>
+			</properties>
+		</dependency>
+		<dependency>
+			<id>graffito-api</id>
+			<groupId>graffito</groupId>
+			<version>1.0-a1-dev</version>
+		</dependency>
+		<dependency>
+			<id>servletapi</id>
+			<version>2.3</version>
+			<properties>
+				<war.bundle>false</war.bundle>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>portlet-api</groupId>
+			<artifactId>portlet-api</artifactId>
+			<version>1.0</version>
+			<properties>
+				<war.bundle>false</war.bundle>
+			</properties>
+		</dependency>
+		<!-- warred jars -->
+		<dependency>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+			<version>1.6.1</version>
+			<url>http://jakarta.apache.org/commons/beanutils.html</url>
+			<properties>
+				<war.bundle>true</war.bundle>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.2</version>
+			<url>http://jakarta.apache.org/commons/codec/</url>
+			<properties>
+				<war.bundle>true</war.bundle>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>2.1</version>
+			<url>http://jakarta.apache.org/commons/collections.html</url>
+			<properties>
+				<war.bundle>true</war.bundle>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>portals-bridges</groupId>
+			<artifactId>portals-bridges-common</artifactId>
+			<version>0.1</version>
+			<type>jar</type>
+			<properties>
+				<war.bundle>true</war.bundle>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>portals-bridges</groupId>
+			<artifactId>portals-bridges-velocity</artifactId>
+			<version>0.1</version>
+			<type>jar</type>
+			<properties>
+				<war.bundle>true</war.bundle>
+			</properties>
+		</dependency>
+		<dependency>
+			<id>velocity</id>
+			<version>1.4</version>
+			<properties>
+				<war.bundle>true</war.bundle>
+			</properties>
+		</dependency>
+		<dependency>
+			<id>velocity-tools</id>
+			<version>1.1</version>
+			<url>http://jakarta.apache.org/velocity</url>
+			<properties>
+				<war.bundle>true</war.bundle>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>portals-bridges</groupId>
+			<artifactId>portals-bridges-myfaces</artifactId>
+			<version>0.1</version>
+			<properties>
+				<war.bundle>true</war.bundle>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>myfaces</groupId>
+			<artifactId>myfaces</artifactId>
+			<version>1.0.8-PATCHED</version>
+			<properties>
+				<war.bundle>true</war.bundle>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>jspapi</groupId>
+			<artifactId>jsp-api</artifactId>
+			<version>2.0-20040521</version>
+			<properties>
+				<war.bundle>true</war.bundle>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>commons-digester</groupId>
+			<artifactId>commons-digester</artifactId>
+			<version>1.5</version>
+			<url>http://jakarta.apache.org/commons/digester.html</url>
+			<properties>
+				<war.bundle>true</war.bundle>
+			</properties>
+		</dependency>
+		<dependency>
+			<id>log4j</id>
+			<version>1.2.8</version>
+			<properties>
+				<war.bundle>true</war.bundle>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.0.3</version>
+			<url>http://jakarta.apache.org/commons/logging.html</url>
+			<properties>
+				<war.bundle>true</war.bundle>
+			</properties>
+		</dependency>
+		<dependency>
+			<groupId>commons-el</groupId>
+			<artifactId>commons-el</artifactId>
+			<version>1.0</version>
+			<url>http://jakarta.apache.org/commons/el/</url>
+			<properties>
+				<war.bundle>true</war.bundle>
+			</properties>
+		</dependency>
+	</dependencies>
+	<build>
+		<sourceDirectory>src/java</sourceDirectory>
+	</build>
+	<reports>
+		<report>maven-jdepend-plugin</report>
 		<!--
     <report>maven-checkstyle-plugin</report>
--->
-		<report>maven-pmd-plugin</report>
-		<report>maven-changelog-plugin</report>
-		<report>maven-file-activity-plugin</report>
-		<report>maven-developer-activity-plugin</report>
-		<report>maven-license-plugin</report>
-		<report>maven-javadoc-plugin</report>
-		<report>maven-jxr-plugin</report>
-		<report>maven-junit-report-plugin</report>
-		<report>maven-linkcheck-plugin</report>
-		<report>maven-tasklist-plugin</report>
-	</reports>
+-->
+		<report>maven-pmd-plugin</report>
+		<report>maven-changelog-plugin</report>
+		<report>maven-file-activity-plugin</report>
+		<report>maven-developer-activity-plugin</report>
+		<report>maven-license-plugin</report>
+		<report>maven-javadoc-plugin</report>
+		<report>maven-jxr-plugin</report>
+		<report>maven-junit-report-plugin</report>
+		<report>maven-linkcheck-plugin</report>
+		<report>maven-tasklist-plugin</report>
+	</reports>
 </project>

Added: incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/BrowserInfo.java
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/BrowserInfo.java?view=auto&rev=124659
==============================================================================
--- (empty file)
+++ incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/BrowserInfo.java	Sat Jan  8 08:29:43 2005
@@ -0,0 +1,94 @@
+/*
+ * 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;
+
+import java.util.Collection;
+
+/**
+ * Information on the current content folder displayed in the Graffito Browser Portlet
+ * 
+ * @author <a href="mailto:christophe.lombart@sword-technologies.com">Lombart Christophe </a>
+ * @version $Id: Exp $
+ */
+public class BrowserInfo
+{
+    private String uri;
+
+    private Collection documents;
+
+    private Collection folders;
+
+    /**
+     * @return Returns the documents.
+     */
+    public Collection getDocuments()
+    {
+        return documents;
+    }
+
+    /**
+     * @param documents The documents to set.
+     */
+    public void setDocuments(Collection documents)
+    {
+        this.documents = documents;
+    }
+
+    /**
+     * @return Returns the folders.
+     */
+    public Collection getFolders()
+    {
+        return folders;
+    }
+
+    /**
+     * @param folders The folders to set.
+     */
+    public void setFolders(Collection folders)
+    {
+        this.folders = folders;
+    }
+
+    /**
+     * @return Returns the uri.
+     */
+    public String getUri()
+    {
+        return uri;
+    }
+
+    /**
+     * @param uri The uri to set.
+     */
+    public void setUri(String uri)
+    {
+        this.uri = uri;
+    }
+    
+    /**
+     * @return true if the Browser is empty, else false
+     */
+    public boolean isEmpty()
+    {
+        if ((((documents == null) || (documents.size() == 0))) &&
+            (((folders == null) || (folders.size() == 0)))) 
+        {
+            return true;
+        }
+        else 
+        {
+            return false;
+        }
+    }
+}
\ No newline at end of file

Added: incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/BrowserPortlet.java
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/BrowserPortlet.java?view=auto&rev=124659
==============================================================================
--- (empty file)
+++ incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/BrowserPortlet.java	Sat Jan  8 08:29:43 2005
@@ -0,0 +1,218 @@
+/*
+ * 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;
+
+import java.io.IOException;
+import java.util.Map;
+
+import javax.faces.context.FacesContext;
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletContext;
+import javax.portlet.PortletException;
+import javax.portlet.PortletMode;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.PortletResponse;
+import javax.portlet.PortletSession;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.apache.portals.bridges.myfaces.FacesPortlet;
+import org.apache.portals.graffito.ContentModelService;
+import org.apache.portals.graffito.exception.ContentManagementException;
+import org.apache.velocity.context.Context;
+
+/**
+ * Graffito Content Browser
+ * 
+ * @author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
+ * @version $Id: Exp $
+ */
+public class BrowserPortlet extends FacesPortlet
+{
+    /** JSF Bean to set the browser info object in the JSF Session */
+    private static final String BROWSER_INFO = "browser";
+    
+
+    /** Default uri used to display the content browser */
+    private static final String DEFAULT_CONTENT_SCOPE = "/graffito";
+
+    /** Portlet preference attritube containing the root uri used to display the content browser */
+    private static final String CONTENT_SCOPE = "gaffito.content.scope";
+
+    
+    protected Log log = LogFactory.getLog(BrowserPortlet.class);
+   
+    private ContentModelService modelService;
+
+    
+    /**
+     * @see javax.portlet.Portlet#init(javax.portlet.PortletConfig)
+     */
+    public void init(PortletConfig config) throws PortletException
+    {
+        super.init(config);
+        PortletContext context = getPortletContext();
+
+        modelService = (ContentModelService) context.getAttribute("cps:ContentModel");
+        if (null == modelService)
+        {
+            throw new PortletException("Failed to find the content model service on portlet initialization");
+        }
+
+    }
+    
+    /**
+     * @see org.apache.portals.bridges.myfaces.FacesPortlet#preProcessFaces(javax.faces.context.FacesContext)
+     */
+    protected void preProcessFaces(FacesContext context)
+    {
+        if (null == context.getExternalContext().getSessionMap().get(BROWSER_INFO))
+        {
+            context.getExternalContext().getSessionMap().put(BROWSER_INFO, new BrowserInfo());
+        }
+    }    
+    
+    
+    /**
+     * @see javax.portlet.GenericPortlet#doView(javax.portlet.RenderRequest, javax.portlet.RenderResponse)
+     */
+    public void doView(RenderRequest request, RenderResponse response) throws PortletException, IOException
+    {
+        response.setContentType("text/html");
+        
+        try
+        {
+            BrowserInfo browserInfo = this.getBrowserInfo(request, response);
+            String parentUri = this.getDefaultContentScope(request);                
+            browserInfo.setDocuments(modelService.getDocuments(parentUri));
+            browserInfo.setFolders(modelService.getFolders(parentUri));
+            browserInfo.setUri(parentUri);
+        }
+        catch (ContentManagementException e)
+        {
+            throw new PortletException("Failed to view the portlet - impossible to access to Graffito content store : " + e.getMessage());
+        }
+        
+        super.doView(request, response);
+    }    
+    
+    /**
+     * @see javax.portlet.GenericPortlet#doEdit(javax.portlet.RenderRequest, javax.portlet.RenderResponse)
+     */
+    public void doEdit(RenderRequest request, RenderResponse response) throws PortletException, IOException
+    {
+        response.setContentType("text/html");
+
+        //velocityContext.put(VELOCITY_BROWSER_INFO, browserInfo); 
+//        String page = this.getEditPage(request);
+//        
+//        if (page != null)
+//        {
+//            this.clearEditPage(request);
+//            PortletContext context = getPortletContext();
+//            PortletRequestDispatcher rd = context.getRequestDispatcher(page);            
+//            rd.include(request, response); 
+//            
+//            
+//        }
+//        else
+//        {
+            super.doEdit(request, response);
+//        }
+        
+                   
+    }
+
+    /**
+     * @see javax.portlet.Portlet#processAction(javax.portlet.ActionRequest, javax.portlet.ActionResponse)
+     */
+    public void processAction(ActionRequest request, ActionResponse response) throws PortletException, IOException
+    {
+                
+        if (request.getPortletMode() == PortletMode.EDIT)
+        {            
+            String action = request.getParameter("addfolder");
+            if (action!=null)
+            {
+                //this.setEditPage(request, "/WEB-INF/view/addfolder.vm");
+                return;
+            }
+            
+            action = request.getParameter("adddocument");
+            if (action!=null)
+            {
+                //this.setEditPage(request, "/WEB-INF/view/adddocument.vm");
+                return;
+            }              
+                
+        }
+        else
+        {
+//            String browserAction = request.getParameter("db.browser.action");
+//            if (browserAction != null)
+//            {
+//                if (browserAction.equals("refresh"))
+//                {
+//                   // clearDatabaseBrowserIterator(request);
+//                }
+//                String start = request.getParameter("start");
+//                if (start != null)
+//                {
+//                    response.setRenderParameter("start", start);
+//                }
+//            }
+        }
+
+    }
+
+    protected BrowserInfo getBrowserInfo(PortletRequest request, PortletResponse response) throws PortletException
+    {
+        FacesContext context = getFacesContextFactory().getFacesContext(this.getPortletConfig(), request, response, getLifecycle());
+        preProcessFaces(context);             
+        Map session = context.getExternalContext().getSessionMap();
+        BrowserInfo browserInfo =  (BrowserInfo) session.get(BROWSER_INFO);
+        return browserInfo;
+        
+    }
+
+    protected String getDefaultContentScope(PortletRequest request)
+    {
+        return request.getPreferences().getValue(CONTENT_SCOPE, DEFAULT_CONTENT_SCOPE);
+    }
+    
+//    protected void setEditPage(PortletRequest request, String page)
+//    {
+//        request.getPortletSession().setAttribute("test", page);
+//    }
+//    
+//    protected String getEditPage(PortletRequest request)
+//    {
+//        return (String) request.getPortletSession().getAttribute("test",  PortletSession.PORTLET_SCOPE);
+//    }  
+//    
+//    protected void clearEditPage(PortletRequest request)
+//    {
+//        request.getPortletSession().removeAttribute("test");
+//    }    
+      
+    
+}

Modified: incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/resources/messages.properties
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/resources/messages.properties?view=diff&rev=124659&p1=incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/resources/messages.properties&r1=124658&p2=incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/resources/messages.properties&r2=124659
==============================================================================
--- incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/resources/messages.properties	(original)
+++ incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/resources/messages.properties	Sat Jan  8 08:29:43 2005
@@ -2,7 +2,26 @@
 javax.portlet.short-title = Content Browser
 javax.portlet.keywords = cms, document management
 help.title= Help Mode
-help.text= The Graffito Browser portlet provides a browser of the portal content.
+
+help.text.view = This Graffito portlet provides a browser of the portal content. Use the view mode to navigate across the content repository.
+help.text.edit = Use the edit mode to modify, add or delete folders & documents.
+
+div.path= You are in :  
+div.folders = Folders
+div.documents = Documents 
+
+edit.tab.select=Select
+edit.tab.name=Name
+edit.tab.title=Title
+edit.tab.description=Description
+
+link.addfolder= Add Folder
+link.adddocument = Add Document
+link.delete = Delete
+
+info.nocontent= No content found in this folder
+
 
 error.servers=No content server found
+
 

Modified: incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/resources/messages_en.properties
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/resources/messages_en.properties?view=diff&rev=124659&p1=incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/resources/messages_en.properties&r1=124658&p2=incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/resources/messages_en.properties&r2=124659
==============================================================================
--- incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/resources/messages_en.properties	(original)
+++ incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/resources/messages_en.properties	Sat Jan  8 08:29:43 2005
@@ -2,6 +2,24 @@
 javax.portlet.short-title = Content Browser
 javax.portlet.keywords = cms, document management
 help.title = Help Mode
-help.text = The Graffito Browser portlet provides a browser of the portal content.
+
+help.text.view = This Graffito portlet provides a browser of the portal content. Use the view mode to navigate across the content repository.
+help.text.edit = Use the edit mode to modity, add or delete folders & documents.
+
+
+div.path= You are in : 
+div.folders = Folders
+div.documents = Documents 
+
+edit.tab.select=Select
+edit.tab.name=Name
+edit.tab.title=Title
+edit.tab.description=Description
+
+link.addfolder= Add Folder
+link.adddocument = Add Document
+link.delete = Delete
+
+info.nocontent= No content found in this folder
 
 error.servers=No content server found

Modified: incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/resources/messages_fr.properties
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/resources/messages_fr.properties?view=diff&rev=124659&p1=incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/resources/messages_fr.properties&r1=124658&p2=incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/resources/messages_fr.properties&r2=124659
==============================================================================
--- incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/resources/messages_fr.properties	(original)
+++ incubator/graffito/trunk/portlets/src/java/org/apache/portals/graffito/portlets/resources/messages_fr.properties	Sat Jan  8 08:29:43 2005
@@ -2,6 +2,23 @@
 javax.portlet.short-title = Navigateur
 javax.portlet.keywords = cms, gestion de contenu, gestion documentaire
 help.title = Aide
-help.text = Ce portlet affiche l'ensemble du contenu disponible dans ce portail
+help.text.view = Ce portlet affiche l'ensemble du contenu disponible dans ce portail. Utilisez le mode view pour naviguer dans le répertoire documentaire.
+help.text.edit = Utilisez le mode edit pour ajouter, modifier ou effacer des documents et répertoires.
+
+div.path = Vous êtes dans   
+div.folders = Répertoires  
+div.documents = Documents 
+
+edit.tab.select=Selection
+edit.tab.name=Nom
+edit.tab.title=Titre
+edit.tab.description=Description
+
+link.addfolder= Ajouter un répertoire
+link.adddocument = Ajouter un document
+link.delete = Supprimer
   
+info.nocontent= Ce répertoire n'a pas de contenu  
+
+
 error.servers=Impossible de trouver un serveur de contenu 

Added: incubator/graffito/trunk/portlets/src/webapp/WEB-INF/faces-config.xml
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/portlets/src/webapp/WEB-INF/faces-config.xml?view=auto&rev=124659
==============================================================================
--- (empty file)
+++ incubator/graffito/trunk/portlets/src/webapp/WEB-INF/faces-config.xml	Sat Jan  8 08:29:43 2005
@@ -0,0 +1,47 @@
+<?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 faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN" 
+	"http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
+<faces-config>
+	<application>
+		<locale-config>
+			<default-locale>en</default-locale>
+			<supported-locale>fr</supported-locale>
+			<supported-locale>en</supported-locale>
+		</locale-config>
+	</application>
+	<navigation-rule>
+		<from-view-id>/WEB-INF/view/addfolder.jsp</from-view-id>
+		<navigation-case>
+			<from-outcome>addFolder</from-outcome>
+			<to-view-id>/WEB-INF/view/folder.jsp</to-view-id>
+		</navigation-case>
+	</navigation-rule>
+	<navigation-rule>
+		<from-view-id>/WEB-INF/view/adddocument.jsp</from-view-id>
+		<navigation-case>
+			<from-outcome>addDocument</from-outcome>
+			<to-view-id>/WEB-INF/view/document.jsp</to-view-id>
+		</navigation-case>
+	</navigation-rule>
+	<managed-bean>
+		<managed-bean-name>browser</managed-bean-name>
+		<managed-bean-class>org.apache.portals.graffito.portlets.BrowserInfo</managed-bean-class>
+		<managed-bean-scope>session</managed-bean-scope>
+	</managed-bean>
+</faces-config>
\ No newline at end of file

Modified: incubator/graffito/trunk/portlets/src/webapp/WEB-INF/jetspeed-portlet.xml
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/portlets/src/webapp/WEB-INF/jetspeed-portlet.xml?view=diff&rev=124659&p1=incubator/graffito/trunk/portlets/src/webapp/WEB-INF/jetspeed-portlet.xml&r1=124658&p2=incubator/graffito/trunk/portlets/src/webapp/WEB-INF/jetspeed-portlet.xml&r2=124659
==============================================================================
--- incubator/graffito/trunk/portlets/src/webapp/WEB-INF/jetspeed-portlet.xml	(original)
+++ incubator/graffito/trunk/portlets/src/webapp/WEB-INF/jetspeed-portlet.xml	Sat Jan  8 08:29:43 2005
@@ -30,7 +30,8 @@
     </portlet>
 
 	<js:services>
-		<js:service name='ContentServer'/>		
+		<js:service name='ContentServer'/>	
+		<js:service name='ContentModel'/>	
 	</js:services>
 	
 </portlet-app>

Modified: incubator/graffito/trunk/portlets/src/webapp/WEB-INF/portlet.xml
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/portlets/src/webapp/WEB-INF/portlet.xml?view=diff&rev=124659&p1=incubator/graffito/trunk/portlets/src/webapp/WEB-INF/portlet.xml&r1=124658&p2=incubator/graffito/trunk/portlets/src/webapp/WEB-INF/portlet.xml&r2=124659
==============================================================================
--- incubator/graffito/trunk/portlets/src/webapp/WEB-INF/portlet.xml	(original)
+++ incubator/graffito/trunk/portlets/src/webapp/WEB-INF/portlet.xml	Sat Jan  8 08:29:43 2005
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Copyright 2004 The Apache Software Foundation
 
@@ -14,20 +14,25 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 
--->
-<portlet-app id="graffito" version="1.0">	
-	<portlet>
+-->
+<portlet-app id="graffito" version="1.0">
+	<!--portlet>
 		<description>Graffito Content Browser Portlet</description>
 		<portlet-name>graffitoBrowser</portlet-name>
 		<display-name>Graffito Browser</display-name>
-		<portlet-class>org.apache.portals.graffito.portlets.GraffitoBrowserPortlet</portlet-class>
+		<portlet-class>org.apache.portals.graffito.portlets.GraffitoBrowserPortlet</portlet-class>		
+		<init-param>
+			<name>AllowPreferences</name>
+			<value>true</value>
+		</init-param>
+		
 		<init-param>
 			<name>ViewPage</name>
 			<value>/WEB-INF/view/view.vm</value>
 		</init-param>
 		<init-param>
 			<name>EditPage</name>
-			<value>/WEB-INF/view/edit-prefs.vm</value>
+			<value>/WEB-INF/view/edit.vm</value>
 		</init-param>
 		<init-param>
 			<name>HelpPage</name>
@@ -43,15 +48,50 @@
 		<supported-locale>en</supported-locale>
 		<supported-locale>fr</supported-locale>
 		<resource-bundle>org.apache.portals.graffito.portlets.resources.messages</resource-bundle>
-		<!--portlet-preferences>
-			<preference>
-				<name>windowSize</name>
-				<value>8</value>
-			</preference>
+		<portlet-preferences>
 			<preference>
-				<name>sql</name>
-				<value>select * from SECURITY_PRINCIPAL</value>
+				<name>graffito.content.scope</name>
+				<value>/graffito</value>
 			</preference>
-		</portlet-preferences -->
-	</portlet>
+		</portlet-preferences>
+	</portlet -->
+	<portlet>
+		<description>Graffito Content Browser Portlet</description>
+		<portlet-name>graffitoBrowser</portlet-name>
+		<display-name>Graffito Browser</display-name>
+		<portlet-class>org.apache.portals.graffito.portlets.BrowserPortlet</portlet-class>
+		<init-param>
+			<name>ViewPage</name>
+			<value>/WEB-INF/view/view.jsp</value>
+		</init-param>
+		<init-param>
+			<name>HelpPage</name>
+			<value>/WEB-INF/view/help.html</value>
+		</init-param>
+		<init-param>
+			<name>EditPage</name>
+			<value>/WEB-INF/view/edit.jsp</value>
+		</init-param>
+		<expiration-cache>-1</expiration-cache>
+		<supports>
+			<mime-type>text/html</mime-type>
+			<portlet-mode>VIEW</portlet-mode>
+			<portlet-mode>EDIT</portlet-mode>
+			<portlet-mode>HELP</portlet-mode>
+		</supports>
+		<supported-locale>en</supported-locale>
+		<supported-locale>fr</supported-locale>
+		<resource-bundle>org.apache.portals.graffito.portlets.resources.messages</resource-bundle>
+		<portlet-preferences>
+			<preference>
+				<name>graffito.content.scope</name>
+				<value>/graffito</value>
+			</preference>
+		</portlet-preferences>
+		<portlet-info>
+			<title>Graffito Content Browser</title>
+			<short-title>ContentBrowser</short-title>
+			<keywords>cms, content, document</keywords>
+		</portlet-info>
+	</portlet>
 </portlet-app>

Added: incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/adddocument.vm
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/adddocument.vm?view=auto&rev=124659
==============================================================================
--- (empty file)
+++ incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/adddocument.vm	Sat Jan  8 08:29:43 2005
@@ -0,0 +1,24 @@
+#*
+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.
+*#
+
+#**
+
+@author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
+@version $Id:  Exp $
+
+*#
+
+ADD DOCUMENT
\ No newline at end of file

Added: incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/addfolder.vm
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/addfolder.vm?view=auto&rev=124659
==============================================================================
--- (empty file)
+++ incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/addfolder.vm	Sat Jan  8 08:29:43 2005
@@ -0,0 +1,24 @@
+#*
+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.
+*#
+
+#**
+
+@author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
+@version $Id:  Exp $
+
+*#
+
+ADD FOLDER
\ No newline at end of file

Added: incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/edit.jsp
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/edit.jsp?view=auto&rev=124659
==============================================================================
--- (empty file)
+++ incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/edit.jsp	Sat Jan  8 08:29:43 2005
@@ -0,0 +1 @@
+<h1>Graffito Edit Page</h1>

Added: incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/edit.vm
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/edit.vm?view=auto&rev=124659
==============================================================================
--- (empty file)
+++ incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/edit.vm	Sat Jan  8 08:29:43 2005
@@ -0,0 +1,50 @@
+
+#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
+
+<div class="portlet-menu">$MESSAGES.getString('div.path') $browserInfo.getUri()</div>
+
+<form action="$renderResponse.createActionURL()" method="post">
+	#set ($folders = $browserInfo.getFolders())
+	#set ($documents = $browserInfo.getDocuments())
+	
+	#if($browserInfo.isEmpty())
+		<div class="portlet-msg-info">$MESSAGES.getString('info.nocontent')</div>
+	#else
+	<table>
+			
+		<tr>
+			<th class="portlet-section-header">$MESSAGES.getString('edit.tab.select')</th>
+			<th class="portlet-section-header">$MESSAGES.getString('edit.tab.name')</th>
+			<th class="portlet-section-header">$MESSAGES.getString('edit.tab.title')</th>
+			<th class="portlet-section-header">$MESSAGES.getString('edit.tab.description')</th>
+		</tr>
+		<tr><div class="portlet-menu">$MESSAGES.getString('div.folders')</div></tr>	
+		#foreach ($folder in $folders)
+		<tr>
+			<td class="portlet-section-body"><input type="checkbox"/></th>
+			<td class="portlet-section-body">folder.getName()</th>
+			<td class="portlet-section-body">folder.getTitle()</th>
+			<td class="portlet-section-body">folder.getDescription()</th>
+		</tr>
+		#end
+		<tr><div class="portlet-menu">$MESSAGES.getString('div.documents')</div></tr>
+		#foreach ($document in $documents)
+		<tr>
+			<td class="portlet-section-body"><input type="checkbox"/></th>
+			<td class="portlet-section-body">document.getName()</th>
+			<td class="portlet-section-body">document.getTitle()</th>
+			<td class="portlet-section-body">document.getDescription()</th>
+		</tr>
+		#end
+	</table>	
+	#end
+	
+	<div class="portlet-menu">
+		<input type="submit" name="addfolder" value="$MESSAGES.getString('link.addfolder')" />	
+		<input type="submit" name="adddocument" value="$MESSAGES.getString('link.adddocument')" />	
+	</div>
+	
+</form>
+
+
+

Added: incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/help.html
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/help.html?view=auto&rev=124659
==============================================================================
--- (empty file)
+++ incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/help.html	Sat Jan  8 08:29:43 2005
@@ -0,0 +1 @@
+<h1>Graffito Browser Help Page</h1>

Modified: incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/help.vm
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/help.vm?view=diff&rev=124659&p1=incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/help.vm&r1=124658&p2=incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/help.vm&r2=124659
==============================================================================
--- incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/help.vm	(original)
+++ incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/help.vm	Sat Jan  8 08:29:43 2005
@@ -1 +1,27 @@
-<b>TODO: write help</b>
+#*
+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.
+*#
+
+#**
+
+@author <a href="mailto:christophe.lombart@sword-technologies.com">Christophe Lombart</a>
+@version $Id:  Exp $
+
+*#
+
+#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
+
+<div class="portlet-section-body">$MESSAGES.getString('help.text.view')</div>
+<div class="portlet-section-body">$MESSAGES.getString('help.text.edit')</div>

Added: incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/view.jsp
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/view.jsp?view=auto&rev=124659
==============================================================================
--- (empty file)
+++ incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/view.jsp	Sat Jan  8 08:29:43 2005
@@ -0,0 +1,20 @@
+<%@ page session="true" contentType="text/html;charset=utf-8"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://myfaces.sourceforge.net/tld/myfaces_ext_0_9.tld" prefix="x"%>
+<%@taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
+<%@taglib uri="http://java.sun.com/jstl/core_rt" prefix="c_rt"%>
+
+<f:loadBundle basename="org.apache.portals.graffito.portlets.resources.messages" var="MESSAGE" />
+
+<f:view>
+<div class="portlet-menu"><h:outputText value="#{MESSAGE['div.path']}" /> <h:outputText value="#{browser.uri}" /></div>
+
+
+ <c_rt:set var="isEmpty" value="<%=<h:outputText value="#{browser.isEmpty()}"/>%>"/>
+    <c:if test="${isEmpty}">
+		<div class="portlet-msg-info"><h:outputText value="#{MESSAGE['info.nocontent']}" /></div>		
+    </c:if>
+
+     
+</f:view>

Modified: incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/view.vm
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/view.vm?view=diff&rev=124659&p1=incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/view.vm&r1=124658&p2=incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/view.vm&r2=124659
==============================================================================
--- incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/view.vm	(original)
+++ incubator/graffito/trunk/portlets/src/webapp/WEB-INF/view/view.vm	Sat Jan  8 08:29:43 2005
@@ -22,11 +22,24 @@
 *#
 
 #set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
-#if( $contentServers.size() == 0)
-	<div class="portlet-msg-error">$MESSAGES.getString('error.servers')</div>	
+
+<div class="portlet-menu">$MESSAGES.getString('div.path') $browserInfo.getUri()</div>
+#if( $browserInfo.isEmpty())	
+  	    <div class="portlet-msg-info">$MESSAGES.getString('info.nocontent')</div>		
 #else         
-	#foreach ($server in $contentServers)
-		$server.getAlias() - $server.getTitle()
-	#end
+	
+	<div class="portlet-menu">$MESSAGES.getString('div.folders')</div>
+	#set ($folders = $browserInfo.getFolders())
+	#foreach ($folder in $folders)
+		$folder.getName()
+	#end	
+	
+	
+	<div class="portlet-menu">$MESSAGES.getString('div.documents')</div>
+	#set ($documents = $browserInfo.getDocuments())
+	#foreach ($document in $documents)
+		$document.getName()
+	#end	
+	
 #end
 

Added: incubator/graffito/trunk/portlets/src/webapp/WEB-INF/web-velocity.xml
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/portlets/src/webapp/WEB-INF/web-velocity.xml?view=auto&rev=124659
==============================================================================
--- (empty file)
+++ incubator/graffito/trunk/portlets/src/webapp/WEB-INF/web-velocity.xml	Sat Jan  8 08:29:43 2005
@@ -0,0 +1,38 @@
+<?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>
+	<!-- Define Velocity Servlet -->
+	<servlet>
+		<servlet-name>velocity</servlet-name>
+		<servlet-class>org.apache.portals.bridges.velocity.BridgesVelocityViewServlet</servlet-class>
+		<init-param>
+			<param-name>org.apache.velocity.toolbox</param-name>
+			<param-value>/WEB-INF/velocity/toolbox.xml</param-value>
+		</init-param>
+		<init-param>
+			<param-name>org.apache.velocity.properties</param-name>
+			<param-value>/WEB-INF/velocity/velocity.properties</param-value>
+		</init-param>
+		<load-on-startup>10</load-on-startup>
+	</servlet>
+	<!-- Map *.vm files to Velocity  -->
+	<servlet-mapping>
+		<servlet-name>velocity</servlet-name>
+		<url-pattern>*.vm</url-pattern>
+	</servlet-mapping>
+</web-app>
\ No newline at end of file

Modified: incubator/graffito/trunk/portlets/src/webapp/WEB-INF/web.xml
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/portlets/src/webapp/WEB-INF/web.xml?view=diff&rev=124659&p1=incubator/graffito/trunk/portlets/src/webapp/WEB-INF/web.xml&r1=124658&p2=incubator/graffito/trunk/portlets/src/webapp/WEB-INF/web.xml&r2=124659
==============================================================================
--- incubator/graffito/trunk/portlets/src/webapp/WEB-INF/web.xml	(original)
+++ incubator/graffito/trunk/portlets/src/webapp/WEB-INF/web.xml	Sat Jan  8 08:29:43 2005
@@ -1,38 +1,115 @@
-<?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>
-	<!-- Define Velocity Servlet -->
-	<servlet>
-		<servlet-name>velocity</servlet-name>
-		<servlet-class>org.apache.portals.bridges.velocity.BridgesVelocityViewServlet</servlet-class>
-		<init-param>
-			<param-name>org.apache.velocity.toolbox</param-name>
-			<param-value>/WEB-INF/velocity/toolbox.xml</param-value>
-		</init-param>
-		<init-param>
-			<param-name>org.apache.velocity.properties</param-name>
-			<param-value>/WEB-INF/velocity/velocity.properties</param-value>
-		</init-param>
-		<load-on-startup>10</load-on-startup>
-	</servlet>
-	<!-- Map *.vm files to Velocity  -->
-	<servlet-mapping>
-		<servlet-name>velocity</servlet-name>
-		<url-pattern>*.vm</url-pattern>
-	</servlet-mapping>
-</web-app>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2004 Sun Microsystems, Inc. All Rights Reserved.
+ 
+ Redistribution and use in source and binary forms, with or
+ without modification, are permitted provided that the following
+ conditions are met:
+ 
+ - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+ 
+ - Redistribution in binary form must reproduce the above
+   copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials
+   provided with the distribution.
+    
+ Neither the name of Sun Microsystems, Inc. or the names of
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+  
+ This software is provided "AS IS," without a warranty of any
+ kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
+ WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
+ EXCLUDED. SUN AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY
+ DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT OF OR
+ RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE OR
+ ITS DERIVATIVES. IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE
+ FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT,
+ SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER
+ CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF
+ THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS
+ BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+  
+ You acknowledge that this software is not designed, licensed or
+ intended for use in the design, construction, operation or
+ maintenance of any nuclear facility.
+-->
+<!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>JavaServer Faces Guess Number Sample Application</display-name>
+	<description>JavaServer Faces Guess Number Sample Application</description>
+	<context-param>
+    	<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+    	<param-value>server</param-value>
+	</context-param>
+	<context-param>
+    	<param-name>javax.faces.application.CONFIG_FILES</param-name>
+    	<param-value>/WEB-INF/faces-config.xml</param-value>
+  	</context-param>
+   	<context-param>
+        <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
+        <param-value>true</param-value>
+        <description>
+            This parameter tells MyFaces if javascript code should be allowed in the
+            rendered HTML output.
+            If javascript is allowed, command_link anchors will have javascript code
+            that submits the corresponding form.
+            If javascript is not allowed, the state saving info and nested parameters
+            will be added as url parameters.
+            Default: "true"
+        </description>
+    </context-param>
+    
+    <context-param>
+        <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
+        <param-value>false</param-value>
+        <description>
+            This parameter tells MyFaces if javascript code should be allowed in the
+            rendered HTML output.
+            If javascript is allowed, command_link anchors will have javascript code
+            that submits the corresponding form.
+            If javascript is not allowed, the state saving info and nested parameters
+            will be added as url parameters.
+            Default: "false"
+
+            Setting this param to true should be combined with STATE_SAVING_METHOD "server" for
+            best results.
+
+            This is an EXPERIMENTAL feature. You also have to enable the detector filter/filter mapping below to get
+            JavaScript detection working.
+        </description>
+    </context-param>
+
+    <context-param>
+        <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
+        <param-value>true</param-value>
+        <description>
+            If true, rendered HTML code will be formatted, so that it is "human readable".
+            i.e. additional line separators and whitespace will be written, that do not
+            influence the HTML code.
+            Default: "true"
+        </description>
+    </context-param>
+  
+  	<!-- Listener, that does all the startup work (configuration, init). -->
+  	<listener>
+    	<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+  	</listener>
+  
+  	<!-- Faces Servlet -->
+  	<servlet>
+    	<servlet-name>Faces Servlet</servlet-name>
+    	<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+    	<load-on-startup>1</load-on-startup>
+  	</servlet>
+  	<!-- extension mapping -->
+  	<servlet-mapping>
+  		<servlet-name>Faces Servlet</servlet-name>
+   		<url-pattern>*.jsf</url-pattern>
+  	</servlet-mapping>
+
+</web-app>
+

Modified: incubator/graffito/trunk/site/xdocs/architecture.xml
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/site/xdocs/architecture.xml?view=diff&rev=124659&p1=incubator/graffito/trunk/site/xdocs/architecture.xml&r1=124658&p2=incubator/graffito/trunk/site/xdocs/architecture.xml&r2=124659
==============================================================================
--- incubator/graffito/trunk/site/xdocs/architecture.xml	(original)
+++ incubator/graffito/trunk/site/xdocs/architecture.xml	Sat Jan  8 08:29:43 2005
@@ -44,8 +44,8 @@
 			<subsection name="The Graffito Engine">
 			   <p>The Graffito engine is a container based on 2 distinct layers : The "Graffito services" layer and the "Persistence service" Layer.</p>
 			   <p>
-	       	   The first one, the "Graffito Services" deals with an high level of abstraction. It is composed of different PicoContainer components which are providing an generic API.
-	       	   This API is independant of any CMS content store. Each PicoContainer component solves one of the CMS aspect. 
+	       	   The first one, the "Graffito Services" deals with an high level of abstraction. It is composed of different Spring components which are providing an generic API.
+	       	   This API is independant of any CMS content store. Each components solves one of the CMS aspect. 
 	       	   For example, the model service manages the CMS objects lifecycle (instantiate, create, update, remove) and  the search service gives a way to search content across the complete content tree, ... .	       	   
 	       	   In order to have more abstraction on the content location, the "Graffito Services" layer dispatchs all requests to the "Persistence Service" layer.
 	       	   <p>
@@ -59,7 +59,7 @@
 	       	   	<li>The Workflow Service.</li>
 	       	   	<li>The Event handler Service.</li>
 	       	   </ol>
-	       	   Thanks to the PicoContainer assembling script, it is possible to add new Graffito services.	       	   
+	       	   Thanks to the Spring assembling script, it is possible to add new Graffito services.	       	   
 	       	   </p>
 
 	       	   </p> 

Modified: incubator/graffito/trunk/site/xdocs/roadmap.xml
Url: http://svn.apache.org/viewcvs/incubator/graffito/trunk/site/xdocs/roadmap.xml?view=diff&rev=124659&p1=incubator/graffito/trunk/site/xdocs/roadmap.xml&r1=124658&p2=incubator/graffito/trunk/site/xdocs/roadmap.xml&r2=124659
==============================================================================
--- incubator/graffito/trunk/site/xdocs/roadmap.xml	(original)
+++ incubator/graffito/trunk/site/xdocs/roadmap.xml	Sat Jan  8 08:29:43 2005
@@ -23,7 +23,7 @@
 	<body>
 		<section name="Roadmap">
 			<subsection name="1.0-a1-dev">
-				<p>		1. Mode Service.</p>
+				<p>		1. Model Service.</p>
 				<p>		2. Simple Version Service.</p>
 				<p>		3. Search service based on Lucene.</p>				
 				<p>		4. Security service.</p>

Mime
View raw message