incubator-graffito-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clomb...@apache.org
Subject svn commit: r160458 - in incubator/graffito/trunk/applications: browser/ browser/src/java/org/apache/portals/graffito/portlets/actions/ browser/src/webapp/WEB-INF/tabs/ browser/src/webapp/WEB-INF/view/security/ graffito-portlets/
Date Thu, 07 Apr 2005 20:29:13 GMT
Author: clombart
Date: Thu Apr  7 13:29:11 2005
New Revision: 160458

URL: http://svn.apache.org/viewcvs?view=rev&rev=160458
Log:
* Update J2 dependencies
* Use timestamp for dates

Modified:
    incubator/graffito/trunk/applications/browser/.classpath
    incubator/graffito/trunk/applications/browser/project.xml
    incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/actions/DocumentAction.java
    incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/actions/FolderAction.java
    incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/tabs/tabs.xml
    incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/security/security.vm
    incubator/graffito/trunk/applications/graffito-portlets/.classpath
    incubator/graffito/trunk/applications/graffito-portlets/project.xml

Modified: incubator/graffito/trunk/applications/browser/.classpath
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/browser/.classpath?view=diff&r1=160457&r2=160458
==============================================================================
--- incubator/graffito/trunk/applications/browser/.classpath (original)
+++ incubator/graffito/trunk/applications/browser/.classpath Thu Apr  7 13:29:11 2005
@@ -13,9 +13,9 @@
   </classpathentry>
   <classpathentry kind="var" path="MAVEN_REPO/portlet-api/jars/portlet-api-1.0.jar">
   </classpathentry>
-  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-commons-2.0-M2-dev.jar">
+  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-commons-2.0-M3-dev.jar">
   </classpathentry>
-  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-components-2.0-M2-dev.jar">
+  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-components-2.0-M3-dev.jar">
   </classpathentry>
   <classpathentry kind="var" path="MAVEN_REPO/portals-bridges/jars/portals-bridges-common-0.1.jar">
   </classpathentry>

Modified: incubator/graffito/trunk/applications/browser/project.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/browser/project.xml?view=diff&r1=160457&r2=160458
==============================================================================
--- incubator/graffito/trunk/applications/browser/project.xml (original)
+++ incubator/graffito/trunk/applications/browser/project.xml Thu Apr  7 13:29:11 2005
@@ -42,7 +42,7 @@
 		<dependency>
 			<groupId>jetspeed2</groupId>
 			<artifactId>jetspeed-commons</artifactId>
-			<version>2.0-M2-dev</version>
+			<version>2.0-M3-dev</version>
 			<type>jar</type>
 			<properties>
 				<war.bundle>false</war.bundle>
@@ -51,7 +51,7 @@
 		<dependency>
 			<groupId>jetspeed2</groupId>
 			<artifactId>jetspeed-components</artifactId>
-			<version>2.0-M2-dev</version>
+			<version>2.0-M3-dev</version>
 			<type>jar</type>
 			<properties>
 				<war.bundle>true</war.bundle>

Modified: incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/actions/DocumentAction.java
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/actions/DocumentAction.java?view=diff&r1=160457&r2=160458
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/actions/DocumentAction.java
(original)
+++ incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/actions/DocumentAction.java
Thu Apr  7 13:29:11 2005
@@ -16,6 +16,7 @@
 package org.apache.portals.graffito.portlets.actions;
 
 import java.io.UnsupportedEncodingException;
+import java.sql.Timestamp;
 import java.util.Date;
 
 import javax.portlet.ActionRequest;
@@ -74,8 +75,8 @@
 
         BeanUtil.populate(request, document);
         
-        document.setCreationDate(new Date());
-        document.setLastModified(new Date());
+        document.setCreationDate(new Timestamp(System.currentTimeMillis()));
+        document.setLastModified(new Timestamp(System.currentTimeMillis()));
 
         String parentFolderUri = null;
         if (browserDTO.getCurrentFolder() == null)

Modified: incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/actions/FolderAction.java
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/actions/FolderAction.java?view=diff&r1=160457&r2=160458
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/actions/FolderAction.java
(original)
+++ incubator/graffito/trunk/applications/browser/src/java/org/apache/portals/graffito/portlets/actions/FolderAction.java
Thu Apr  7 13:29:11 2005
@@ -15,6 +15,7 @@
  */
 package org.apache.portals.graffito.portlets.actions;
 
+import java.sql.Timestamp;
 import java.util.Date;
 
 import javax.portlet.ActionRequest;
@@ -77,8 +78,8 @@
             if (browserDTO.isInsert())
             {
 
-                folder.setCreationDate(new Date());
-                folder.setLastModified(new Date());
+                folder.setCreationDate(new Timestamp(System.currentTimeMillis()));
+                folder.setLastModified(new Timestamp(System.currentTimeMillis()));
 
                 String parentFolderUri = null;
                 if (browserDTO.getCurrentFolder() == null)
@@ -97,7 +98,7 @@
             }
             else
             {
-                folder.setLastModified(new Date());
+                folder.setLastModified(new Timestamp(System.currentTimeMillis()));
                 modelService.updateFolder(folder);
             }
 

Modified: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/tabs/tabs.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/tabs/tabs.xml?view=diff&r1=160457&r2=160458
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/tabs/tabs.xml (original)
+++ incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/tabs/tabs.xml Thu Apr
 7 13:29:11 2005
@@ -2,9 +2,11 @@
 	<tab id="folder-edit">
 	    <page id="children" label="tab.folder-edit.children" view= "/WEB-INF/view/folder/folder-children.vm"
/>
   	    <page id="metadata" label="tab.folder-edit.metadata" view= "/WEB-INF/view/folder/folder-metadata.vm"
/>
+  	    <page id="security" label="tab.security" view= "/WEB-INF/view/security/security.vm"
/>		
 	</tab>	
 	<tab id="document-edit">
 	    <page id="content" label="tab.document-edit.content" view= "/WEB-INF/view/document/document-content.vm"
/>
   	    <page id="metadata" label="tab.document-edit.metadata" view= "/WEB-INF/view/document/document-edit-metadata.vm"
/>
+		<page id="security" label="tab.security" view= "/WEB-INF/view/security/security.vm"
/>		
 	</tab>
 </tabs>

Modified: incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/security/security.vm
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/security/security.vm?view=diff&r1=160457&r2=160458
==============================================================================
--- incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/security/security.vm
(original)
+++ incubator/graffito/trunk/applications/browser/src/webapp/WEB-INF/view/security/security.vm
Thu Apr  7 13:29:11 2005
@@ -20,5 +20,45 @@
 @version $Id:  Exp $
 
 *#
+#set ($MESSAGES = $portletConfig.getResourceBundle($renderRequest.Locale))
+#set ($permissions = $browserDTO.getPermissions())
 
-Security
\ No newline at end of file
+<form action="$renderResponse.createActionURL()" method="post">
+	#set ($count = 0)
+	#if($permission.isEmpty())
+		<div class="portlet-msg-info">$MESSAGES.getString('info.nopermission')</div>
+	#else
+	<table>
+			
+		<tr>
+			<th class="portlet-section-header">$MESSAGES.getString('edit.tab.select')</th>
+			<th class="portlet-section-header">$MESSAGES.getString('edit.tab.recursive')</th>
+			<th class="portlet-section-header">$MESSAGES.getString('edit.tab.allchildren')</th>
+			<th class="portlet-section-header">$MESSAGES.getString('edit.tab.permission')</th>
+		</tr>
+
+		#foreach ($permission in $permissions)
+			#set ($count = $count + 1)				
+			#set ($cssClass = "portlet-section-alternate")
+			#if (($count % 2)==0)
+				#set ($cssClass = "portlet-section-body")
+			#end			
+			<tr>
+				<!-- td class="$cssClass"><input type="checkbox" name="uri" value="$folder.getUri()"
/></td -->
+				<!-- td class="$cssClass">$MESSAGES.getString('div.folder')</td -->
+				<!-- td class="$cssClass"><a href="$renderResponse.createRenderURL()?uri=$folder.getUri()">$folder.getName()</a></td
-->
+			</tr>
+
+		#end
+		
+	</table>	
+	#end
+	
+	<div class="portlet-menu">
+		<input type="submit" name="portletAction_folder.create" value="$MESSAGES.getString('link.addfolder')"
class="portlet-dlg-icon-label" />	
+		<input type="submit" name="portletAction_document.selectDocumentType" value="$MESSAGES.getString('link.adddocument')"
class="portlet-dlg-icon-label" />	
+		<input type="submit" name="portletAction_cmsobject.delete" value="$MESSAGES.getString('link.delete')"
class="portlet-dlg-icon-label" />	
+	</div>
+	
+</form>
+#ErrorMessages($ERRORS)

Modified: incubator/graffito/trunk/applications/graffito-portlets/.classpath
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/applications/graffito-portlets/.classpath?view=diff&r1=160457&r2=160458
==============================================================================
--- incubator/graffito/trunk/applications/graffito-portlets/.classpath (original)
+++ incubator/graffito/trunk/applications/graffito-portlets/.classpath Thu Apr  7 13:29:11
2005
@@ -13,9 +13,9 @@
   </classpathentry>
   <classpathentry kind="var" path="MAVEN_REPO/portlet-api/jars/portlet-api-1.0.jar">
   </classpathentry>
-  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-commons-2.0-M2-dev.jar">
+  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-commons-2.0-M3-dev.jar">
   </classpathentry>
-  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-components-2.0-M2-dev.jar">
+  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed-components-2.0-M3-dev.jar">
   </classpathentry>
   <classpathentry kind="var" path="MAVEN_REPO/portals-bridges/jars/portals-bridges-common-0.1.jar">
   </classpathentry>
@@ -41,7 +41,7 @@
   </classpathentry>
   <classpathentry kind="var" path="MAVEN_REPO/commons-fileupload/jars/commons-fileupload-1.0.jar">
   </classpathentry>
-  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed2-taglib-treecontrol-2.0-M2-dev.jar">
+  <classpathentry kind="var" path="MAVEN_REPO/jetspeed2/jars/jetspeed2-taglib-treecontrol-2.0-M3-dev.jar">
   </classpathentry>
   <classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-core-1.1.5.jar">
   </classpathentry>

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=160457&r2=160458
==============================================================================
--- incubator/graffito/trunk/applications/graffito-portlets/project.xml (original)
+++ incubator/graffito/trunk/applications/graffito-portlets/project.xml Thu Apr  7 13:29:11
2005
@@ -43,7 +43,7 @@
 		<dependency>
 			<groupId>jetspeed2</groupId>
 			<artifactId>jetspeed-commons</artifactId>
-			<version>2.0-M2-dev</version>
+			<version>2.0-M3-dev</version>
 			<type>jar</type>
 			<properties>
 				<war.bundle>false</war.bundle>
@@ -52,7 +52,7 @@
 		<dependency>
 			<groupId>jetspeed2</groupId>
 			<artifactId>jetspeed-components</artifactId>
-			<version>2.0-M2-dev</version>
+			<version>2.0-M3-dev</version>
 			<type>jar</type>
 			<properties>
 				<war.bundle>true</war.bundle>
@@ -168,7 +168,7 @@
     <dependency>
         <groupId>jetspeed2</groupId>
         <artifactId>jetspeed2-taglib-treecontrol</artifactId>
-        <version>2.0-M2-dev</version>
+        <version>2.0-M3-dev</version>
         <type>jar</type>
         <properties>
             <war.bundle>true</war.bundle>



Mime
View raw message