incubator-graffito-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clomb...@apache.org
Subject svn commit: r159966 - in incubator/graffito/trunk: ./ applications/browser/src/webapp/WEB-INF/ applications/graffito-portlets/ applications/graffito-portlets/src/java/org/apache/portals/graffito/portlets/ applications/graffito-portlets/src/java/org/apache/portals/graffito/portlets/util/ applications/graffito-portlets/src/webapp/ applications/graffito-portlets/src/webapp/WEB-INF/ applications/graffito-portlets/src/webapp/WEB-INF/view/ applications/graffito-portlets/src/webapp/images/ jetspeed2-deploy/src/pages/
Date Sun, 03 Apr 2005 21:02:03 GMT
Author: clombart
Date: Sun Apr  3 14:02:00 2005
New Revision: 159966

URL: http://svn.apache.org/viewcvs?view=rev&rev=159966
Log:
* Add jsp & config files in the Graffito portlet application. 
* Add this application in a new J2 psml file
* Add this application in the maven goals
* Minor changes in the Graffito browser application

Added:
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/portlet.tld
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/portlet.xml
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/treecontrol.tld
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/view/
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/view/content-tree.jsp
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/web.xml
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/BlueTile.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Connector.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Context.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Datasource.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/DefaultContext.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/EnvironmentEntries.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Groups.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Host.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Logger.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Login.jpg   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/LoginBackgroundTile.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Mailsession.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/PaperTexture.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Realm.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/ResourceLink.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Roles.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Server.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Service.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/TomcatBanner.jpg   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Users.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Valve.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/folder_16_pad.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/handledownlast.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/handledownmiddle.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/handlerightlast.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/handlerightmiddle.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/linelastnode.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/linemiddlenode.gif   (with props)
    incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/linevertical.gif   (with props)
    incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito-browser.psml
    incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito-samples.psml
Removed:
    incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito.psml
Modified:
    incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/portlet.xml
    incubator/graffito/trunk/applications/graffito-portlets/project.properties
    incubator/graffito/trunk/applications/graffito-portlets/project.xml
    incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/portlets/DocumentPortlet.java
    incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/portlets/TreePortlet.java
    incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/portlets/util/ServiceAccessor.java
    incubator/graffito/trunk/maven.xml

Modified: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/portlet.xml?view=diff&r1=159965&r2=159966
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/portlet.xml (original)
+++ incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/portlet.xml Sun Apr  3 14:02:00 2005
@@ -109,7 +109,12 @@
 				<name>graffito.content.scope</name>
 				<value>/graffito</value>
 			</preference>
-		</portlet-preferences>
+		</portlet-preferences>
+	    <portlet-info>
+		  <title>Graffito Browser</title>
+	      <short-title>Graffito Browser</short-title>
+		  <keywords>graffito, cms</keywords>
+	    </portlet-info>		
 	</portlet>  
 </portlet-app>
 

Modified: incubator/graffito/trunk/applications/graffito-portlets/project.properties
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/project.properties?view=diff&r1=159965&r2=159966
==============================================================================
--- incubator/graffito/trunk/applications/graffito-portlets/project.properties (original)
+++ incubator/graffito/trunk/applications/graffito-portlets/project.properties Sun Apr  3 14:02:00 2005
@@ -34,7 +34,7 @@
 # COMPILE & WAR
 #-----------------------------------------------------------------------------------------------------
 maven.compile.deprecation=on
-# org.apache.jetspeed.portlet.app.name=graffito-browser
+# org.apache.jetspeed.portlet.app.name=graffito-demo
 
 
 

Modified: incubator/graffito/trunk/applications/graffito-portlets/project.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/project.xml?view=diff&r1=159965&r2=159966
==============================================================================
--- incubator/graffito/trunk/applications/graffito-portlets/project.xml (original)
+++ incubator/graffito/trunk/applications/graffito-portlets/project.xml Sun Apr  3 14:02:00 2005
@@ -7,9 +7,9 @@
 	<description>Graffito Portlets</description>
 	<shortDescription>Graffito Portlets</shortDescription>
 	<repository>
-		<connection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/applications/browser</connection>
+		<connection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/applications/graffito-portlets</connection>
 		<developerConnection>
-			scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/applications/browser</developerConnection>
+			scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/applications/graffito-portlets</developerConnection>
 		<url>http://svn.apache.org/viewcvs</url>
 	</repository>
 	<dependencies>
@@ -179,9 +179,10 @@
       <id>springframework:spring-core</id>
       <version>1.1.5</version>
       <properties>
-        <war.bundle>false</war.bundle>
+        <war.bundle>true</war.bundle>
       </properties>
     </dependency>
+
         
 	</dependencies>
 	<build>

Modified: incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/portlets/DocumentPortlet.java
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/portlets/DocumentPortlet.java?view=diff&r1=159965&r2=159966
==============================================================================
--- incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/portlets/DocumentPortlet.java (original)
+++ incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/portlets/DocumentPortlet.java Sun Apr  3 14:02:00 2005
@@ -78,7 +78,7 @@
         	try 
             {
 				Document doc = cms.getDocument(currentFile);
-				if (doc.getContentType().indexOf("html") != -1)
+				if ((doc.getContentType().indexOf("html") != -1)  || (doc.getContentType().indexOf("text") != -1))
 				{
                     String title = doc.getProperty("title");
                     if (title == null)
@@ -101,10 +101,6 @@
 						response.getPortletOutputStream().write("');</script>".getBytes());
 					}
 				}
-				else if (doc.getContentType().indexOf("pdf") != -1)
-				{
-                    renderPDF(request, response, currentFile, doc);
-				}
                 else if (doc.getContentType().indexOf("gif") != -1)
                 {
                     String title = doc.getProperty("title");
@@ -115,10 +111,15 @@
                     response.getPortletOutputStream().write(currentDocument.getBytes());
                     response.getPortletOutputStream().write(anchors.getBytes());                
                     response.getPortletOutputStream().write(DIV_START.getBytes());
-                    String gif = "<IMG SRC='" + "/images/" + doc.getName() + "'/>";
+                    String gif = "<IMG SRC='" + request.getContextPath() + "/FileServlet?uri=" + doc.getUri() + "'/>";
                     response.getPortletOutputStream().write(gif.getBytes());
                     response.getPortletOutputStream().write(DIV_END.getBytes());                    
                 }
+				
+				else 
+				{
+                    renderBinaryDoc(request, response, currentFile, doc);
+				}
 			} 
             catch (ContentManagementException e) 
             {
@@ -133,7 +134,7 @@
         return "<hr/><a href='#'>Top</a>&nbsp;<a href='#010'>Sample Anchor 1</a>&nbsp;<a href='#014'>Sample Anchor 2</a>&nbsp;<a href='#020'>Sample Anchor 3</a><hr/>";
     }
     
-    private void renderPDF(RenderRequest request, RenderResponse response, String currentFile, Document doc)
+    private void renderBinaryDoc(RenderRequest request, RenderResponse response, String currentFile, Document doc)
     throws IOException
     {
         String title = doc.getProperty("title");
@@ -142,11 +143,11 @@
         
         String contextPath = request.getContextPath();
         String linkage = "<a target='_new' href='" + 
-            contextPath + "/servlet/FileServlet?uri=" + currentFile + "'>View in New Window</a>";        
+            contextPath + "/FileServlet?uri=" + currentFile + "'>View in New Window</a>";        
         String currentDocument = "<div>Document: <b>" + title + "</b>&nbsp" + linkage;
         response.getPortletOutputStream().write(currentDocument.getBytes());
         
-        String iframe = "<iframe src=\"" + contextPath + "/servlet/FileServlet?uri=" + currentFile + "\"";
+        String iframe = "<iframe src=\"" + contextPath + "/FileServlet?uri=" + currentFile + "\"";
         if (request.getWindowState().equals(WindowState.MAXIMIZED))
             iframe += " height=\"800\" width=\"100%\"";
         else

Modified: incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/portlets/TreePortlet.java
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/portlets/TreePortlet.java?view=diff&r1=159965&r2=159966
==============================================================================
--- incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/portlets/TreePortlet.java (original)
+++ incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/portlets/TreePortlet.java Sun Apr  3 14:02:00 2005
@@ -86,13 +86,7 @@
             //request.getPortletSession().removeAttribute("tree_anchor");
         }
         
-        Object refresh = request.getPortletSession().getAttribute("refresh_page");
-        if(refresh != null)
-        {
-        	request.getPortletSession().removeAttribute("refresh_page");
-        	request.setAttribute("refresh_page", refresh);
-        }
-        
+       
         request.setAttribute("j2_tree", control);
 
         super.doView(request, response);
@@ -102,15 +96,14 @@
     throws PortletException,
           IOException
     {
-    	/*
-    	Object refresh = actionRequest.getPortletSession().getAttribute("refresh_page");
+    	
+    	Object refresh = actionRequest.getParameter("refresh_page");
         if(refresh != null)
-        {
-        	//attempt to fix safari bug.  if processAction 
-        	actionRequest.getPortletSession().removeAttribute("refresh_page");
+        {        	
+        	actionRequest.getPortletSession().removeAttribute("j2_tree");
         	return;
         }
-        */
+        
         TreeControl control = (TreeControl) actionRequest.getPortletSession().getAttribute("j2_tree");
         //assert control != null
         if (control != null)

Modified: incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/portlets/util/ServiceAccessor.java
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/portlets/util/ServiceAccessor.java?view=diff&r1=159965&r2=159966
==============================================================================
--- incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/portlets/util/ServiceAccessor.java (original)
+++ incubator/graffito/trunk/applications/graffito-portlets/src/java/org/apache/portals/graffito/portlets/util/ServiceAccessor.java Sun Apr  3 14:02:00 2005
@@ -37,7 +37,7 @@
 {
     private static BeanFactory springFactory = null;
     
-    private static boolean useJetspeedServices = false;
+    private static boolean useJetspeedServices = true;
 
     public static ContentModelService getModelService()
     {        

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml?view=auto&rev=159966
==============================================================================
--- incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml (added)
+++ incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml Sun Apr  3 14:02:00 2005
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<portlet-app id="graffito-portlets" version="1.0" 
+    xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" 
+    xmlns:js="http://portals.apache.org/jetspeed" 
+    xmlns:dc="http://www.purl.org/dc">
+    
+    <portlet>
+        <portlet-name>graffitoTree</portlet-name>
+        <dc:title>Graffito Tree Portlet</dc:title>
+        <dc:creator>Graffito Team</dc:creator>
+    </portlet>
+    <portlet>
+        <portlet-name>graffitoDocViewer</portlet-name>
+        <dc:title>Graffito Document Viewer Portlet</dc:title>
+        <dc:creator>Graffito Team</dc:creator>
+    </portlet>			
+</portlet-app>
\ No newline at end of file

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/portlet.tld
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/portlet.tld?view=auto&rev=159966
==============================================================================
--- incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/portlet.tld (added)
+++ incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/portlet.tld Sun Apr  3 14:02:00 2005
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+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 taglib PUBLIC
+  "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
+  "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
+<taglib>
+    <tlibversion>1.0</tlibversion>
+    <jspversion>1.1</jspversion>
+    <shortname>Tags for portlets</shortname>
+    <tag>
+        <name>defineObjects</name>
+        <tagclass>org.apache.pluto.tags.DefineObjectsTag</tagclass>
+        <teiclass>org.apache.pluto.tags.DefineObjectsTag$TEI</teiclass>
+        <bodycontent>empty</bodycontent>
+    </tag>
+    <tag>
+        <name>param</name>
+        <tagclass>org.apache.pluto.tags.ParamTag</tagclass>
+        <bodycontent>empty</bodycontent>
+        <attribute>
+            <name>name</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>value</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    <tag>
+        <name>actionURL</name>
+        <tagclass>org.apache.pluto.tags.ActionURLTag</tagclass>
+        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
+        <bodycontent>JSP</bodycontent>
+        <attribute>
+            <name>windowState</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>portletMode</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>secure</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    <tag>
+        <name>renderURL</name>
+        <tagclass>org.apache.pluto.tags.RenderURLTag</tagclass>
+        <teiclass>org.apache.pluto.tags.BasicURLTag$TEI</teiclass>
+        <bodycontent>JSP</bodycontent>
+        <attribute>
+            <name>windowState</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>portletMode</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>secure</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+        <attribute>
+            <name>var</name>
+            <required>false</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+    <tag>
+        <name>namespace</name>
+        <tagclass>org.apache.pluto.tags.NamespaceTag</tagclass>
+        <bodycontent>empty</bodycontent>
+    </tag>
+</taglib>

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/portlet.xml?view=auto&rev=159966
==============================================================================
--- incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/portlet.xml (added)
+++ incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/portlet.xml Sun Apr  3 14:02:00 2005
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<portlet-app id="graffito-portlets" version="1.0">
+	<portlet id="graffitoTree">
+		<description>Graffito Content Tree Portlet</description>
+		<portlet-name>graffitoTree</portlet-name>
+		<display-name>Graffito Tree</display-name>
+		<portlet-class>org.apache.portals.graffito.portlets.TreePortlet</portlet-class>		
+        <init-param>
+    	   <description>This parameter sets the template used in view mode.</description>
+		   <name>ViewPage</name>
+			 <value>/WEB-INF/view/content-tree.jsp</value>
+        </init-param>   		
+		<init-param>
+			<name>AllowPreferences</name>
+			<value>true</value>
+		</init-param>		
+		<init-param>
+			<name>scope</name>
+			<value>/graffito</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>
+	    <portlet-info>
+		  <title>Graffito Tree</title>
+	      <short-title>Graffito Tree</short-title>
+		  <keywords>graffito,tree,cms</keywords>
+	    </portlet-info>		
+   </portlet>  
+	<portlet id="graffitoDocumentViewer">
+		<description>Graffito Document Viewer Portlet</description>
+		<portlet-name>graffitoDocViewer</portlet-name>
+		<display-name>Graffito Document Viewer</display-name>
+		<portlet-class>org.apache.portals.graffito.portlets.DocumentPortlet</portlet-class>		
+         				<expiration-cache>-1</expiration-cache>
+		<supports>
+			<mime-type>text/html</mime-type>
+			<portlet-mode>VIEW</portlet-mode>
+			<portlet-mode>HELP</portlet-mode>
+		</supports>
+	    <portlet-info>
+		  <title>Graffito Document Viewer</title>
+	      <short-title>Graffito Viewer</short-title>
+		  <keywords>graffito, doucment, viewer, cms</keywords>
+	    </portlet-info>		
+   </portlet>    
+</portlet-app>
+

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/treecontrol.tld
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/treecontrol.tld?view=auto&rev=159966
==============================================================================
--- incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/treecontrol.tld (added)
+++ incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/treecontrol.tld Sun Apr  3 14:02:00 2005
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE taglib
+  PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
+         "http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
+<!-- 
+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.
+-->
+
+
+<taglib>
+
+  <tlib-version>1.0</tlib-version>
+  <jsp-version>1.2</jsp-version>
+  <short-name>Tags for Content Tree View</short-name>
+  
+  <!-- ========== Tree Control Tag ======================================== -->
+
+  <tag>
+
+    <name>tree</name>
+    <tag-class>org.apache.jetspeed.portlets.tags.PortletTreeControlTag</tag-class>
+    <body-content>empty</body-content>
+    <description>
+      Render a "tree" control, based on the current state of a data object
+      of type org.apache.webapp.admin.TreeControl, which is identified
+      by the name specified in the "tree" attribute, in the JSP scope
+      specified by the "scope" attribute.
+    </description>
+
+    <attribute>
+      <name>action</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description>
+        Hyperlink to which expand/contract actions should be sent,
+        with a string "${node}" marking where the node name of the
+        affected node should be included (which will usually be as
+        the value of a request parameter).
+      </description>
+    </attribute>
+
+    <attribute>
+      <name>images</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description>
+        Name of a directory containing the images for our icons,
+        relative to the page including this tag.  If not specified,
+        defaults to "images".
+      </description>
+    </attribute>
+
+    <attribute>
+      <name>scope</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description>
+        The JSP scope within which the "tree" attribute is to be found
+        (page, request, session, or application).  If not specified, the
+        "tree" attribute will be searched for in any scope.
+      </description>
+    </attribute>
+
+    <attribute>
+      <name>style</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description>
+        The CSS style class to be applied to the entire rendered output
+        of the tree control.  If not specified, no overall style class
+        is applied.
+      </description>
+    </attribute>
+
+    <attribute>
+      <name>styleSelected</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description>
+        The CSS style class to be applied to the text of any node that
+        is currently selected.  If not specified, no style class will be
+        applied to the text of the selected node.
+      </description>
+    </attribute>
+
+    <attribute>
+      <name>styleUnselected</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description>
+        The CSS style class to be applied to the text of any node that
+        is *not* currently selected.  If not specified, no style class will
+         be applied to the text of non-selected nodes.
+      </description>
+    </attribute>
+
+    <attribute>
+      <name>tree</name>
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <description>
+        Name of the attribute (in the scope specified by the "scope"
+        attribute, if any) under which an object of type
+        org.apache.webapp.admin.TreeControl is stored.  This object
+        represents the entire current state of the tree, including
+        a representation of the hierarchical representation of the
+        nodes, plus the current expanded/ or contracted state of
+        non-leaf nodes.
+      </description>
+    </attribute>
+
+  </tag>
+
+</taglib>
\ No newline at end of file

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/view/content-tree.jsp
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/view/content-tree.jsp?view=auto&rev=159966
==============================================================================
--- incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/view/content-tree.jsp (added)
+++ incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/view/content-tree.jsp Sun Apr  3 14:02:00 2005
@@ -0,0 +1,30 @@
+<%--
+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.
+--%>
+<%@ page session="true" contentType="text/html;charset=utf-8"%>
+<%@ taglib uri='/WEB-INF/portlet.tld' prefix='portlet'%>
+<%@ taglib uri="/WEB-INF/treecontrol.tld" prefix="treecontrol" %>
+
+
+
+<portlet:defineObjects/>
+
+
+
+<treecontrol:tree tree="j2_tree" images='<%=renderRequest.getContextPath()+ "/images" %>' scope="portlet_request"
+          action=""
+          style="tree-control"
+          styleSelected="portlet-section-alternate"          
+  />
+  <br>
+  <a href="<%=renderResponse.createActionURL() + "?refresh_page" %>">Refresh Content Tree</a>
+  

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/web.xml?view=auto&rev=159966
==============================================================================
--- incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/web.xml (added)
+++ incubator/graffito/trunk/applications/graffito-portlets/src/webapp/WEB-INF/web.xml Sun Apr  3 14:02:00 2005
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2004 The Apache Software Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+	<display-name>Graffito Demo</display-name>
+	<description>Graffito Demo Application</description>
+	<servlet>
+		<servlet-name>JetspeedContainer</servlet-name>
+		<display-name>Jetspeed Container</display-name>
+		<description>MVC Servlet for Jetspeed Portlet Applications</description>
+		<servlet-class>org.apache.jetspeed.container.JetspeedContainerServlet</servlet-class>
+	</servlet>
+	
+	<servlet>
+		<servlet-name>GraffitoFile</servlet-name>
+		<display-name>Graffito File servlet</display-name>
+		<description>Servlet used to view a document</description>
+		<servlet-class>org.apache.portals.graffito.servlets.FileServlet</servlet-class>
+	</servlet>
+		
+	<servlet-mapping>
+		<servlet-name> JetspeedContainer </servlet-name>
+		<url-pattern> /container/* </url-pattern>
+	</servlet-mapping>
+	
+	<servlet-mapping>
+		<servlet-name>GraffitoFile</servlet-name>
+		<url-pattern>/FileServlet/*</url-pattern>
+	</servlet-mapping>	
+</web-app>
\ No newline at end of file

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/BlueTile.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/BlueTile.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/BlueTile.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Connector.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Connector.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Connector.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Context.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Context.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Context.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Datasource.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Datasource.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Datasource.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/DefaultContext.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/DefaultContext.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/DefaultContext.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/EnvironmentEntries.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/EnvironmentEntries.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/EnvironmentEntries.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Groups.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Groups.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Groups.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Host.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Host.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Host.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Logger.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Logger.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Logger.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Login.jpg
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Login.jpg?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Login.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/LoginBackgroundTile.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/LoginBackgroundTile.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/LoginBackgroundTile.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Mailsession.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Mailsession.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Mailsession.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/PaperTexture.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/PaperTexture.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/PaperTexture.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Realm.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Realm.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Realm.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/ResourceLink.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/ResourceLink.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/ResourceLink.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Roles.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Roles.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Roles.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Server.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Server.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Server.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Service.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Service.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Service.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/TomcatBanner.jpg
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/TomcatBanner.jpg?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/TomcatBanner.jpg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Users.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Users.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Users.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Valve.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Valve.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/Valve.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/folder_16_pad.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/folder_16_pad.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/folder_16_pad.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/handledownlast.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/handledownlast.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/handledownlast.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/handledownmiddle.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/handledownmiddle.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/handledownmiddle.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/handlerightlast.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/handlerightlast.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/handlerightlast.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/handlerightmiddle.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/handlerightmiddle.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/handlerightmiddle.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/linelastnode.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/linelastnode.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/linelastnode.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/linemiddlenode.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/linemiddlenode.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/linemiddlenode.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/linevertical.gif
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/linevertical.gif?view=auto&rev=159966
==============================================================================
Binary file - no diff available.

Propchange: incubator/graffito/trunk/applications/graffito-portlets/src/webapp/images/linevertical.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito-browser.psml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito-browser.psml?view=auto&rev=159966
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito-browser.psml (added)
+++ incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito-browser.psml Sun Apr  3 14:02:00 2005
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<page id="/graffito.psml" hidden="false">
+    <security-constraints>
+        <security-constraints-ref>user</security-constraints-ref>
+    </security-constraints>
+    <title>Graffito</title>
+    <short-title>Graffito</short-title>
+    <defaults skin="orange" layout-decorator="tigris" portlet-decorator="tigris"/>
+    <fragment id="gf-1" type="layout" name="jetspeed-layouts::VelocityOneColumn">
+        <fragment id="graffitoBrowser" type="portlet" name="graffito-browser::graffitoBrowser">
+            <property name="row" value="0" layout="OneColumn"/>
+            <property name="column" value="0" layout="OneColumn"/>
+        </fragment>
+    </fragment>
+</page>

Added: incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito-samples.psml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito-samples.psml?view=auto&rev=159966
==============================================================================
--- incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito-samples.psml (added)
+++ incubator/graffito/trunk/jetspeed2-deploy/src/pages/graffito-samples.psml Sun Apr  3 14:02:00 2005
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<page id="/graffito-samples.psml" hidden="false">
+    <security-constraints>
+        <security-constraints-ref>user</security-constraints-ref>
+    </security-constraints>
+    <title>Graffito Tree</title>
+    <short-title>Graffito Tree</short-title>
+    <defaults skin="orange" layout-decorator="tigris" portlet-decorator="tigris" />
+    
+  <fragment id="graffitoSamples" type="layout" name="jetspeed-layouts::VelocityTwoColumns">
+    <fragment id="graffitoTree" type="portlet" name="graffito-portlets::graffitoTree">
+      <property layout="TwoColumns" name="row" value="0" />
+      <property layout="TwoColumns" name="column" value="0" />
+    </fragment>
+    <fragment id="graffitoDocumentViewer" type="portlet" name="graffito-portlets::graffitoDocViewer">
+      <property layout="TwoColumns" name="row" value="0" />
+      <property layout="TwoColumns" name="column" value="1" />
+    </fragment>
+  </fragment>    
+</page>

Modified: incubator/graffito/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/maven.xml?view=diff&r1=159965&r2=159966
==============================================================================
--- incubator/graffito/trunk/maven.xml (original)
+++ incubator/graffito/trunk/maven.xml Sun Apr  3 14:02:00 2005
@@ -97,8 +97,8 @@
      <maven:reactor
                basedir="${basedir}/applications/graffito-portlets"
                includes="project.xml"
-               goals="jar:install"
-               banner="Build and Install the Graffito Portlets JAR in your Maven Repo"
+               goals="war:install"
+               banner="Build and Install the Graffito Portlets War in your Maven Repo"
                postProcessing="false"
                ignoreFailures="false"/>
                
@@ -164,6 +164,13 @@
                postProcessing="false"
                ignoreFailures="false"/>
 
+     <maven:reactor
+               basedir="${basedir}/applications/graffito-portlets"
+               includes="project.xml"
+               goals="deploy"
+               banner="Deploy the Graffito Portlets application WAR"
+               postProcessing="false"
+               ignoreFailures="false"/>	       
      <maven:reactor
                basedir="${basedir}/jetspeed2-deploy"
                includes="project.xml"



Mime
View raw message