Author: jalkanen
Date: Sun May 4 23:32:15 2008
New Revision: 653307
URL: http://svn.apache.org/viewvc?rev=653307&view=rev
Log:
Removed JUG UUID generation libraries to favour the Java built-in ones.
Removed:
incubator/jspwiki/trunk/lib/jug-asl-2.0.0.jar
Modified:
incubator/jspwiki/trunk/.classpath
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/CookieAuthenticationLoginModule.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/progress/ProgressManager.java
Modified: incubator/jspwiki/trunk/.classpath
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.classpath?rev=653307&r1=653306&r2=653307&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.classpath (original)
+++ incubator/jspwiki/trunk/.classpath Sun May 4 23:32:15 2008
@@ -30,7 +30,6 @@
<classpathentry kind="lib" path="lib/commons-httpclient-3.0.1.jar"/>
<classpathentry kind="lib" path="lib/jakarta-taglibs-jstl-1.1.2.jar"/>
<classpathentry kind="lib"
path="lib/jakarta-tablibs-standard-1.1.2.jar"/>
- <classpathentry kind="lib" path="lib/jug-asl-2.0.0.jar"/>
<classpathentry kind="lib" path="lib/commons-fileupload-1.2.1.jar"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM
1.5.0"/>
<classpathentry kind="output" path="classes"/>
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=653307&r1=653306&r2=653307&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun May 4 23:32:15 2008
@@ -1,5 +1,12 @@
2008-04-20 Janne Jalkanen <[EMAIL PROTECTED]>
+ * 2.7.0-svn-17
+
+ * Removed JUG UUID generation libraries to favour the Java
+ built-in ones.
+
+2008-04-20 Janne Jalkanen <[EMAIL PROTECTED]>
+
* 2.7.0-svn-16
* Moved the rest of the PluginResources class into etc/i18n, as
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=653307&r1=653306&r2=653307&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Sun May 4
23:32:15 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "16";
+ public static final String BUILD = "17";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/CookieAuthenticationLoginModule.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/CookieAuthenticationLoginModule.java?rev=653307&r1=653306&r2=653307&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/CookieAuthenticationLoginModule.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/login/CookieAuthenticationLoginModule.java
Sun May 4 23:32:15 2008
@@ -21,6 +21,7 @@
package com.ecyrd.jspwiki.auth.login;
import java.io.*;
+import java.util.UUID;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.UnsupportedCallbackException;
@@ -30,8 +31,6 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.log4j.Logger;
-import org.safehaus.uuid.UUID;
-import org.safehaus.uuid.UUIDGenerator;
import com.ecyrd.jspwiki.FileUtil;
import com.ecyrd.jspwiki.TextUtil;
@@ -241,7 +240,7 @@
// get rid of jug.jar
public static void setLoginCookie( WikiEngine engine, HttpServletResponse
response, String username )
{
- UUID uid = UUIDGenerator.getInstance().generateRandomBasedUUID();
+ UUID uid = UUID.randomUUID();
int days = TextUtil.getIntegerProperty( engine.getWikiProperties(),
PROP_LOGIN_EXPIRY_DAYS,
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/progress/ProgressManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/progress/ProgressManager.java?rev=653307&r1=653306&r2=653307&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/progress/ProgressManager.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/progress/ProgressManager.java
Sun May 4 23:32:15 2008
@@ -22,9 +22,9 @@
import java.util.HashMap;
import java.util.Map;
+import java.util.UUID;
import org.apache.log4j.Logger;
-import org.safehaus.uuid.UUIDGenerator;
import com.ecyrd.jspwiki.rpc.RPCCallable;
import com.ecyrd.jspwiki.rpc.json.JSONRPCManager;
@@ -37,10 +37,10 @@
*
* @since 2.6
*/
-// FIXME: Gotta synchronize
+// FIXME: Needs synchronization, I think
public class ProgressManager
{
- private Map m_progressingTasks = new HashMap();
+ private Map<String,ProgressItem> m_progressingTasks = new
HashMap<String,ProgressItem>();
/**
* The name of the progress tracker JSON object. The current value is
"[EMAIL PROTECTED]",
@@ -63,7 +63,7 @@
*/
public String getNewProgressIdentifier()
{
- return
UUIDGenerator.getInstance().generateRandomBasedUUID().toString();
+ return UUID.randomUUID().toString();
}
/**
@@ -116,14 +116,15 @@
/**
* Provides access to a progress indicator, assuming you know the ID.
- *
- * @author Janne Jalkanen
+ * Progress of zero (0) means that the progress has just started, and a
progress of
+ * 100 means that it is complete.
*/
public class JSONTracker implements RPCCallable
{
/**
* Returns upload progress in percents so far.
- * @param progressId
+ * @param progressId The string representation of the progress ID
that you want to know the
+ * progress of.
* @return a value between 0 to 100 indicating the progress
*/
public int getProgress( String progressId )
