[jboss-svn-commits] JBL Code SVN: r36278 - in labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server: files and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: kurt.stam at jboss.com
Date: 2010-12-08 15:27:17 -0500 (Wed, 08 Dec 2010)
New Revision: 36278

Added:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/ISO8601.java
Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FeedServlet.java
Log:
GUVNORSOA-47, merging ModeShape Integration r35623, remove dependency on JackRabbit for DateTime formatting

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java	2010-12-08 20:05:31 UTC (rev 36277)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java	2010-12-08 20:27:17 UTC (rev 36278)
@@ -25,6 +25,7 @@
 import java.io.ObjectOutput;
 import java.io.StringWriter;
 import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -49,7 +50,6 @@
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.jackrabbit.util.ISO8601;
 import org.drools.ClockType;
 import org.drools.RuleBase;
 import org.drools.RuleBaseConfiguration;
@@ -112,6 +112,7 @@
 import org.drools.guvnor.server.util.AssetLockManager;
 import org.drools.guvnor.server.util.BRMSSuggestionCompletionLoader;
 import org.drools.guvnor.server.util.Discussion;
+import org.drools.guvnor.server.util.ISO8601;
 import org.drools.guvnor.server.util.LoggingHelper;
 import org.drools.guvnor.server.util.MetaDataMapper;
 import org.drools.guvnor.server.util.TableDisplayHandler;
@@ -184,6 +185,8 @@
 
     private MetaDataMapper              metaDataMapper                    = new MetaDataMapper();
 
+    
+    
     /**
      * Used for a simple cache of binary packages to avoid serialization from
      * the database - for test scenarios.
@@ -1270,7 +1273,6 @@
         AssetItemIterator it = repository.query( q,
                                                  seekArchived,
                                                  dates );
-
         // Add Filter to check Permission
         List<AssetItem> resultList = new ArrayList<AssetItem>();
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FeedServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FeedServlet.java	2010-12-08 20:05:31 UTC (rev 36277)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/FeedServlet.java	2010-12-08 20:27:17 UTC (rev 36278)
@@ -20,6 +20,7 @@
 import org.drools.guvnor.server.security.RoleTypes;
 import org.drools.guvnor.server.security.CategoryPathType;
 import org.drools.guvnor.server.util.Discussion;
+import org.drools.guvnor.server.util.ISO8601;
 import org.drools.guvnor.client.rpc.DiscussionRecord;
 import org.drools.repository.AssetItem;
 import org.drools.repository.PackageItem;
@@ -28,7 +29,6 @@
 import org.jboss.seam.contexts.Contexts;
 import org.jboss.seam.security.Identity;
 import org.jboss.seam.security.AuthorizationException;
-import org.apache.jackrabbit.util.ISO8601;
 import org.mvel2.templates.TemplateRuntime;
 
 import javax.servlet.http.HttpServletRequest;
@@ -44,7 +44,7 @@
 public class FeedServlet extends RepositoryServlet {
 
     private static final String VIEW_URL = "viewUrl";
-
+   
     @Override
     protected void doGet(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
         try {

Copied: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/ISO8601.java (from rev 35623, labs/jbossrules/soa_branches/BRMS-5.1.1/drools-guvnor/src/main/java/org/drools/guvnor/server/util/ISO8601.java)
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/ISO8601.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/util/ISO8601.java	2010-12-08 20:27:17 UTC (rev 36278)
@@ -0,0 +1,29 @@
+package org.drools.guvnor.server.util;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+public class ISO8601 {
+
+	private final static SimpleDateFormat ISO8601Format = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ss.SSSZ");
+	
+	/**
+	 * This turns a Date into a String following the ISO8601 specification.
+	 *
+	 * @param date
+	 * @return
+	 */
+	public static String format( Calendar cal ) {
+		String text = null;
+		if (cal!=null) {
+			Date date = cal.getTime();
+			text = ISO8601Format.format(date);
+			if (text.length() < 29) {
+				//add the colon if it is not there. 
+				text = text.substring(0, 26) + ":" + text.substring(26);
+			}
+		}
+		return text;
+	}
+}