Author: agilliland
Date: Tue Jul 3 15:10:17 2007
New Revision: 552998
URL: http://svn.apache.org/viewvc?view=rev&rev=552998
Log:
beginning to make some use out of the Roller Core component by moving a couple
utility classes in that were redundant between Planet and Weblogger code.
Added:
roller/trunk/components/core/src/java/org/apache/roller/util/DateUtil.java
- copied, changed from r552896,
roller/trunk/apps/planet/src/java/org/apache/roller/util/DateUtil.java
roller/trunk/components/core/src/java/org/apache/roller/util/ISO8601DateParser.java
- copied, changed from r552896,
roller/trunk/apps/planet/src/java/org/apache/roller/util/ISO8601DateParser.java
Removed:
roller/trunk/apps/planet/src/java/org/apache/roller/util/DateUtil.java
roller/trunk/apps/planet/src/java/org/apache/roller/util/ISO8601DateParser.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/DateUtil.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/ISO8601DateParser.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateWeblogManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/RollerTask.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarTag.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldUtilities.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/Blacklist.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AppModuleGenerator.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AppModuleParser.java
roller/trunk/components/core/build.xml
roller/trunk/components/core/src/java/org/apache/roller/util/UUIDGenerator.java
roller/trunk/tools/roller-core/roller-core.jar
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateWeblogManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateWeblogManagerImpl.java?view=diff&rev=552998&r1=552997&r2=552998
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateWeblogManagerImpl.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/hibernate/HibernateWeblogManagerImpl.java
Tue Jul 3 15:10:17 2007
@@ -51,7 +51,7 @@
import org.apache.roller.weblogger.pojos.WeblogEntryTagAggregate;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.WeblogEntryAttribute;
-import org.apache.roller.weblogger.util.DateUtil;
+import org.apache.roller.util.DateUtil;
import org.hibernate.Criteria;
import org.hibernate.HibernateException;
import org.hibernate.Query;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java?view=diff&rev=552998&r1=552997&r2=552998
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAWeblogManagerImpl.java
Tue Jul 3 15:10:17 2007
@@ -57,7 +57,7 @@
import org.apache.roller.weblogger.pojos.WeblogEntryAttribute;
import org.apache.roller.weblogger.pojos.StatCountCountComparator;
import org.apache.roller.weblogger.pojos.User;
-import org.apache.roller.weblogger.util.DateUtil;
+import org.apache.roller.util.DateUtil;
/*
* JPAWeblogManagerImpl.java
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/RollerTask.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/RollerTask.java?view=diff&rev=552998&r1=552997&r2=552998
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/RollerTask.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/runnable/RollerTask.java
Tue Jul 3 15:10:17 2007
@@ -25,7 +25,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.config.WebloggerConfig;
-import org.apache.roller.weblogger.util.DateUtil;
+import org.apache.roller.util.DateUtil;
/**
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java?view=diff&rev=552998&r1=552997&r2=552998
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/WeblogEntry.java
Tue Jul 3 15:10:17 2007
@@ -49,7 +49,7 @@
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.plugins.entry.WeblogEntryPlugin;
import org.apache.roller.weblogger.business.WeblogManager;
-import org.apache.roller.weblogger.util.DateUtil;
+import org.apache.roller.util.DateUtil;
import org.apache.roller.weblogger.util.I18nMessages;
import org.apache.roller.weblogger.util.URLUtilities;
import org.apache.roller.util.UUIDGenerator;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java?view=diff&rev=552998&r1=552997&r2=552998
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/BigWeblogCalendarModel.java
Tue Jul 3 15:10:17 2007
@@ -29,7 +29,7 @@
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.ui.rendering.util.WeblogPageRequest;
-import org.apache.roller.weblogger.util.DateUtil;
+import org.apache.roller.util.DateUtil;
import org.apache.roller.weblogger.util.URLUtilities;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarTag.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarTag.java?view=diff&rev=552998&r1=552997&r2=552998
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarTag.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/CalendarTag.java
Tue Jul 3 15:10:17 2007
@@ -21,7 +21,7 @@
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.util.DateUtil;
+import org.apache.roller.util.DateUtil;
import java.io.PrintWriter;
import java.io.StringWriter;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java?view=diff&rev=552998&r1=552997&r2=552998
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java
Tue Jul 3 15:10:17 2007
@@ -33,7 +33,7 @@
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.ui.rendering.util.WeblogPageRequest;
-import org.apache.roller.weblogger.util.DateUtil;
+import org.apache.roller.util.DateUtil;
import org.apache.roller.weblogger.util.URLUtilities;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java?view=diff&rev=552998&r1=552997&r2=552998
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SearchResultsModel.java
Tue Jul 3 15:10:17 2007
@@ -44,7 +44,7 @@
import org.apache.roller.weblogger.ui.rendering.pagers.SearchResultsPager;
import org.apache.roller.weblogger.ui.rendering.pagers.WeblogEntriesPager;
import org.apache.roller.weblogger.ui.rendering.util.WeblogSearchRequest;
-import org.apache.roller.weblogger.util.DateUtil;
+import org.apache.roller.util.DateUtil;
import org.apache.roller.weblogger.util.I18nMessages;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java?view=diff&rev=552998&r1=552997&r2=552998
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/UtilitiesModel.java
Tue Jul 3 15:10:17 2007
@@ -37,7 +37,7 @@
import org.apache.roller.weblogger.pojos.wrapper.WeblogWrapper;
import org.apache.roller.weblogger.ui.core.RollerSession;
import org.apache.roller.weblogger.ui.rendering.util.WeblogRequest;
-import org.apache.roller.weblogger.util.DateUtil;
+import org.apache.roller.util.DateUtil;
import org.apache.roller.weblogger.util.RegexUtil;
import org.apache.roller.weblogger.util.Utilities;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java?view=diff&rev=552998&r1=552997&r2=552998
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/AbstractWeblogEntriesPager.java
Tue Jul 3 15:10:17 2007
@@ -30,7 +30,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.config.WebloggerRuntimeConfig;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.util.DateUtil;
+import org.apache.roller.util.DateUtil;
import org.apache.roller.weblogger.util.I18nMessages;
import org.apache.roller.weblogger.util.URLUtilities;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java?view=diff&rev=552998&r1=552997&r2=552998
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesDayPager.java
Tue Jul 3 15:10:17 2007
@@ -35,7 +35,7 @@
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper;
-import org.apache.roller.weblogger.util.DateUtil;
+import org.apache.roller.util.DateUtil;
import org.apache.roller.weblogger.util.I18nMessages;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java?view=diff&rev=552998&r1=552997&r2=552998
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesMonthPager.java
Tue Jul 3 15:10:17 2007
@@ -33,7 +33,7 @@
import org.apache.roller.weblogger.pojos.WeblogEntry;
import org.apache.roller.weblogger.pojos.Weblog;
import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper;
-import org.apache.roller.weblogger.util.DateUtil;
+import org.apache.roller.util.DateUtil;
import org.apache.roller.weblogger.util.I18nMessages;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java?view=diff&rev=552998&r1=552997&r2=552998
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/ContextLoader.java
Tue Jul 3 15:10:17 2007
@@ -47,7 +47,7 @@
import org.apache.roller.weblogger.ui.core.RollerSession;
import org.apache.roller.weblogger.ui.rendering.util.WeblogEntryCommentForm;
import org.apache.roller.weblogger.ui.rendering.util.WeblogPageRequest;
-import org.apache.roller.weblogger.util.DateUtil;
+import org.apache.roller.util.DateUtil;
import org.apache.roller.weblogger.util.RegexUtil;
import org.apache.roller.weblogger.util.URLUtilities;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldUtilities.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldUtilities.java?view=diff&rev=552998&r1=552997&r2=552998
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldUtilities.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldUtilities.java
Tue Jul 3 15:10:17 2007
@@ -29,7 +29,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.roller.weblogger.util.DateUtil;
+import org.apache.roller.util.DateUtil;
import org.apache.roller.weblogger.util.RegexUtil;
import org.apache.roller.weblogger.util.Utilities;
import org.apache.commons.codec.binary.Base64;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java?view=diff&rev=552998&r1=552997&r2=552998
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/velocity/deprecated/OldWeblogPageModel.java
Tue Jul 3 15:10:17 2007
@@ -54,7 +54,7 @@
import org.apache.roller.weblogger.pojos.wrapper.WeblogEntryWrapper;
import org.apache.roller.weblogger.pojos.wrapper.WeblogWrapper;
import org.apache.roller.weblogger.ui.core.RollerSession;
-import org.apache.roller.weblogger.util.DateUtil;
+import org.apache.roller.util.DateUtil;
import org.apache.commons.lang.StringUtils;
import org.apache.roller.weblogger.pojos.WeblogHitCount;
import org.apache.roller.weblogger.pojos.ThemeTemplate;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java?view=diff&rev=552998&r1=552997&r2=552998
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/WeblogConfigBean.java
Tue Jul 3 15:10:17 2007
@@ -26,7 +26,7 @@
import org.apache.roller.weblogger.business.WeblogManager;
import org.apache.roller.weblogger.pojos.WeblogCategory;
import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.util.DateUtil;
+import org.apache.roller.util.DateUtil;
/**
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/Blacklist.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/Blacklist.java?view=diff&rev=552998&r1=552997&r2=552998
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/Blacklist.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/Blacklist.java
Tue Jul 3 15:10:17 2007
@@ -42,6 +42,7 @@
import java.util.regex.PatternSyntaxException;
import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.commons.lang.StringUtils;
+import org.apache.roller.util.DateUtil;
/**
* Loads MT-Blacklist style blacklist from disk and allows callers to test
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AppModuleGenerator.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AppModuleGenerator.java?view=diff&rev=552998&r1=552997&r2=552998
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AppModuleGenerator.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AppModuleGenerator.java
Tue Jul 3 15:10:17 2007
@@ -20,7 +20,7 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import org.apache.roller.weblogger.util.DateUtil;
+import org.apache.roller.util.DateUtil;
import org.apache.roller.weblogger.util.Utilities;
import org.jdom.Element;
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AppModuleParser.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AppModuleParser.java?view=diff&rev=552998&r1=552997&r2=552998
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AppModuleParser.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/atomprotocol/AppModuleParser.java
Tue Jul 3 15:10:17 2007
@@ -17,7 +17,7 @@
*/
package org.apache.roller.weblogger.webservices.atomprotocol;
-import org.apache.roller.weblogger.util.DateUtil;
+import org.apache.roller.util.DateUtil;
import org.jdom.Element;
import org.jdom.Namespace;
Modified: roller/trunk/components/core/build.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/components/core/build.xml?view=diff&rev=552998&r1=552997&r2=552998
==============================================================================
--- roller/trunk/components/core/build.xml (original)
+++ roller/trunk/components/core/build.xml Tue Jul 3 15:10:17 2007
@@ -35,7 +35,7 @@
<property name="build.lib" value="${build}/lib"/>
<fileset id="core-jars" dir="${tools}">
- <include name="lib/commons-id-0.1-SNAPSHOT.jar"/>
+ <include name="lib/commons-lang-2.1.jar"/>
</fileset>
<path id="core.path">
Copied:
roller/trunk/components/core/src/java/org/apache/roller/util/DateUtil.java
(from r552896,
roller/trunk/apps/planet/src/java/org/apache/roller/util/DateUtil.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/components/core/src/java/org/apache/roller/util/DateUtil.java?view=diff&rev=552998&p1=roller/trunk/apps/planet/src/java/org/apache/roller/util/DateUtil.java&r1=552896&p2=roller/trunk/components/core/src/java/org/apache/roller/util/DateUtil.java&r2=552998
==============================================================================
--- roller/trunk/apps/planet/src/java/org/apache/roller/util/DateUtil.java
(original)
+++ roller/trunk/components/core/src/java/org/apache/roller/util/DateUtil.java
Tue Jul 3 15:10:17 2007
@@ -30,6 +30,8 @@
/**
* General purpose date utilities.
+ *
+ * TODO: all date handling functions need to be aware of locale and timezone.
*/
public abstract class DateUtil {
Copied:
roller/trunk/components/core/src/java/org/apache/roller/util/ISO8601DateParser.java
(from r552896,
roller/trunk/apps/planet/src/java/org/apache/roller/util/ISO8601DateParser.java)
URL:
http://svn.apache.org/viewvc/roller/trunk/components/core/src/java/org/apache/roller/util/ISO8601DateParser.java?view=diff&rev=552998&p1=roller/trunk/apps/planet/src/java/org/apache/roller/util/ISO8601DateParser.java&r1=552896&p2=roller/trunk/components/core/src/java/org/apache/roller/util/ISO8601DateParser.java&r2=552998
==============================================================================
---
roller/trunk/apps/planet/src/java/org/apache/roller/util/ISO8601DateParser.java
(original)
+++
roller/trunk/components/core/src/java/org/apache/roller/util/ISO8601DateParser.java
Tue Jul 3 15:10:17 2007
@@ -13,11 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.roller.util;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.TimeZone;
+
/**
* ISO 8601 date parsing utility. Designed for parsing the ISO subset used in
Modified:
roller/trunk/components/core/src/java/org/apache/roller/util/UUIDGenerator.java
URL:
http://svn.apache.org/viewvc/roller/trunk/components/core/src/java/org/apache/roller/util/UUIDGenerator.java?view=diff&rev=552998&r1=552997&r2=552998
==============================================================================
---
roller/trunk/components/core/src/java/org/apache/roller/util/UUIDGenerator.java
(original)
+++
roller/trunk/components/core/src/java/org/apache/roller/util/UUIDGenerator.java
Tue Jul 3 15:10:17 2007
@@ -18,7 +18,7 @@
package org.apache.roller.util;
-import org.apache.commons.id.uuid.VersionFourGenerator;
+import java.util.UUID;
/**
@@ -26,9 +26,6 @@
*/
public class UUIDGenerator {
- private static final VersionFourGenerator uuidGenerator = new
VersionFourGenerator();
-
-
// non-instantiable
private UUIDGenerator() {}
@@ -37,7 +34,7 @@
* Generate a new UUID.
*/
public static String generateUUID() {
- return uuidGenerator.nextIdentifier().toString();
+ return UUID.randomUUID().toString();
}
}
Modified: roller/trunk/tools/roller-core/roller-core.jar
URL:
http://svn.apache.org/viewvc/roller/trunk/tools/roller-core/roller-core.jar?view=diff&rev=552998&r1=552997&r2=552998
==============================================================================
Binary files - no diff available.
