debian/ 0000775 0000000 0000000 00000000000 11723357401 007173 5 ustar debian/libjets3t-java.docs 0000664 0000000 0000000 00000000013 11552214510 012652 0 ustar NOTICE.txt
debian/libjets3t-java-doc.javadoc 0000664 0000000 0000000 00000000054 11552214510 014101 0 ustar build/api usr/share/doc/libjets3t-java/api
debian/source/ 0000775 0000000 0000000 00000000000 11552214510 010464 5 ustar debian/source/format 0000664 0000000 0000000 00000000014 11552214510 011672 0 ustar 3.0 (quilt)
debian/watch 0000664 0000000 0000000 00000000267 11552214510 010222 0 ustar version=3
opts=dversionmangle=s/\+dfsg// \
http://jets3t.s3.amazonaws.com/downloads.html \
http://bitbucket.org/jmurty/jets3t/downloads/jets3t-([\d\.]+).zip debian debian/orig-tar.sh
debian/jets3t.dirs 0000664 0000000 0000000 00000000026 11552214510 011261 0 ustar usr/share/jets3t/jars
debian/libjets3t-java.poms 0000664 0000000 0000000 00000000027 11552214510 012705 0 ustar debian/poms/jets3t.pom
debian/clean 0000664 0000000 0000000 00000000045 11552214510 010170 0 ustar servlets/gatekeeper/*.war
jars/*.jar
debian/jets3t.links 0000664 0000000 0000000 00000001445 11552214510 011446 0 ustar usr/share/jets3t/bin/cockpit.sh usr/bin/jets3t-cockpit
usr/share/jets3t/bin/cockpitlite.sh usr/bin/jets3t-cockpitlite
usr/share/jets3t/bin/uploader.sh usr/bin/jets3t-uploader
usr/share/jets3t/bin/synchronize.sh usr/bin/jets3t-synchronize
etc/jets3t usr/share/jets3t/configs
usr/share/java/jets3t-gui.jar usr/share/jets3t/jars/jets3t-gui.jar
usr/share/java/jets3t-cockpit.jar usr/share/jets3t/jars/jets3t-cockpit.jar
usr/share/java/jets3t-cockpitlite.jar usr/share/jets3t/jars/jets3t-cockpitlite.jar
usr/share/java/jets3t-uploader.jar usr/share/jets3t/jars/jets3t-uploader.jar
usr/share/java/jets3t-synchronize.jar usr/share/jets3t/jars/jets3t-synchronize.jar
usr/share/java/jets3t-deps.jar usr/share/jets3t/jars/jets3t-deps.jar
debian/maven.rules 0000664 0000000 0000000 00000000334 11552214510 011346 0 ustar # Make sure package uses versioned API for servlets
javax.servlet servlet-api * s/2\..*/2.5/ * *
# Version jets3t for 0.x
net.java.dev.jets3t * * s/0\..*/0.x/ * *
commons-httpclient commons-httpclient * s/3\..*/3.x/ * *
debian/compat 0000664 0000000 0000000 00000000002 11552214510 010362 0 ustar 7
debian/poms/ 0000775 0000000 0000000 00000000000 11552214510 010142 5 ustar debian/poms/jets3t.pom 0000664 0000000 0000000 00000003661 11552214510 012101 0 ustar
4.0.0
net.java.dev.jets3t
jets3t
jar
0.8.1
An open source Java toolkit for Amazon S3
JetS3t is a free, open-source Java toolkit and application suite for Amazon Simple Storage Service (Amazon S3), Amazon CloudFront content delivery network, and Google Storage for Developers.
http://www.jets3t.org
Apache License, Version 2.0
http://www.apache.org/licenses/LICENSE-2.0
repo
http://bitbucket.org/jmurty/jets3t/src
commons-codec
commons-codec
1.3
commons-logging
commons-logging
1.1.1
commons-httpclient
commons-httpclient
3.1
commons-codec
commons-codec
commons-logging
commons-logging
com.jamesmurty.utils
java-xmlbuilder
0.4
debian/classpath-debian 0000664 0000000 0000000 00000000432 11552214510 012310 0 ustar usr/share/java/commons-logging.jar
usr/share/java/servlet-api-2.5.jar
usr/share/java/axis.jar
usr/share/java/jaxrpc.jar
usr/share/java/axis-jaxrpc.jar
usr/share/java/commons-codec.jar
usr/share/java/commons-httpclient.jar
usr/share/java/junit.jar
usr/share/java/java-xmlbuilder.jar
debian/jets3t.manpages 0000664 0000000 0000000 00000000165 11552214510 012117 0 ustar build/man/jets3t-cockpit.1
build/man/jets3t-cockpitlite.1
build/man/jets3t-synchronize.1
build/man/jets3t-uploader.1
debian/patches/ 0000775 0000000 0000000 00000000000 11552214510 010613 5 ustar debian/patches/04_add_barebonesbrowserlaunch_source.diff 0000664 0000000 0000000 00000006444 11552214510 020707 0 ustar Author: Miguel Landaeta
Subject: add BareBonesBrowserLaunch class to the source
The reason of this patch is because upstream bundled a library named
BareBonesBrowserLaunch.jar, which contains a simple class file used to
open the default browser installed on system. JDK 1.6 includes a class
to do this, but upstream is targeting users from JDK 1.4 or greater,
so he keeps including this library.
IMO, it is not worth the effort to package that library. So I am including
the source of that library here and giving proper credit in copyright file.
diff -Naur jets3t-0.7.2+dfsg/src/com/centerkey/utils/BareBonesBrowserLaunch.java jets3t-0.7.2+dfsg/src/com/centerkey/utils/BareBonesBrowserLaunch.java
--- jets3t-0.7.2+dfsg/src/com/centerkey/utils/BareBonesBrowserLaunch.java 1969-12-31 20:00:00.000000000 -0400
+++ jets3t-0.7.2+dfsg/src/com/centerkey/utils/BareBonesBrowserLaunch.java 2005-12-20 12:28:16.000000000 -0400
@@ -0,0 +1,57 @@
+package com.centerkey.utils;
+
+import java.lang.reflect.Method;
+import javax.swing.JOptionPane;
+
+/**
+ * Bare Bones Browser Launch for Java
+ * Utility class to open a web page from a Swing application
+ * in the user's default browser.
+ * Supports: Mac OS X, GNU/Linux, Unix, Windows XP
+ * Example Usage:
+ * String url = "http://www.google.com/";
+ * BareBonesBrowserLaunch.openURL(url);
+ * Latest Version: http://www.centerkey.com/java/browser
+ * Author: Dem Pilafian
+ * Public Domain Software -- Free to Use as You Like
+ * @version 1.5, December 10, 2005
+ */
+public class BareBonesBrowserLaunch {
+
+ private static final String errMsg = "Error attempting to launch web browser";
+
+ /**
+ * Opens the specified web page in a web browser
+ * @param url An absolute URL of a web page (ex: "http://www.google.com/")
+ */
+ public static void openURL(String url) {
+ String osName = System.getProperty("os.name");
+ try {
+ if (osName.startsWith("Mac OS")) {
+ Class fileMgr = Class.forName("com.apple.eio.FileManager");
+ Method openURL = fileMgr.getDeclaredMethod("openURL",
+ new Class[] {String.class});
+ openURL.invoke(null, new Object[] {url});
+ }
+ else if (osName.startsWith("Windows"))
+ Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url);
+ else { //assume Unix or Linux
+ String[] browsers = {
+ "firefox", "opera", "konqueror", "epiphany", "mozilla", "netscape" };
+ String browser = null;
+ for (int count = 0; count < browsers.length && browser == null; count++)
+ if (Runtime.getRuntime().exec(
+ new String[] {"which", browsers[count]}).waitFor() == 0)
+ browser = browsers[count];
+ if (browser == null)
+ throw new Exception("Could not find web browser");
+ else
+ Runtime.getRuntime().exec(new String[] {browser, url});
+ }
+ }
+ catch (Exception e) {
+ JOptionPane.showMessageDialog(null, errMsg + ":\n" + e.getLocalizedMessage());
+ }
+ }
+
+ }
debian/patches/06_fix_scripts.diff 0000664 0000000 0000000 00000016670 11552214510 014321 0 ustar Author: Miguel Landaeta
Subject: set correct location of libraries in jets3t scripts
Forwarded: no
Last-Update: 2010-04-13
This patch set the location of default JAVA_HOME and the location of some
needed libraries in jets3t scripts.
--- jets3t-0.8.1+dfsg.orig/bin/synchronize.sh
+++ jets3t-0.8.1+dfsg/bin/synchronize.sh
@@ -8,7 +8,7 @@
# Java Development Kit to use.
# -------------------------------------------------------------------
-: ${JETS3T_HOME:-""}
+: ${JETS3T_HOME:="/usr/share/jets3t"}
: ${JAVA_HOME:-""}
# Check the JETS3T_HOME directory
@@ -33,8 +33,9 @@ if [ -z "$JAVA_HOME" ]; then
# Test whether the 'java' program is available in the system path.
java -version 2> /dev/null
if [ $? -gt 0 ]; then
- echo "Please set the environment variable JAVA_HOME"
- exit 1
+ #echo "Please set the environment variable JAVA_HOME"
+ #exit 1
+ export JAVA_HOME="/usr/lib/jvm/default-java"
else
EXEC=java
fi
@@ -50,15 +51,18 @@ CP=$CLASSPATH:$JETS3T_HOME/configs
# Include resources directory in classpath
CP=$CP:$JETS3T_HOME/resources
+# System libraries path
+: ${JAVA_LIBS:="/usr/share/java"}
+
# Include libraries in classpath
-CP=$CP:$JETS3T_HOME/jars/jets3t-0.8.1.jar
-CP=$CP:$JETS3T_HOME/jars/synchronize-0.8.1.jar
-CP=$CP:$JETS3T_HOME/libs/commons-logging/commons-logging-1.1.1.jar
-CP=$CP:$JETS3T_HOME/libs/commons-codec/commons-codec-1.3.jar
-CP=$CP:$JETS3T_HOME/libs/commons-httpclient/commons-httpclient-3.1.jar
-CP=$CP:$JETS3T_HOME/libs/logging-log4j/log4j-1.2.15.jar
-CP=$CP:$JETS3T_HOME/libs/bouncycastle/bcprov-jdk14-138.jar
-CP=$CP:$JETS3T_HOME/libs/java-xmlbuilder/java-xmlbuilder-0.4.jar
+CP=$CP:$JAVA_LIBS/jets3t.jar
+CP=$CP:$JAVA_LIBS/jets3t-synchronize.jar
+CP=$CP:$JAVA_LIBS/commons-logging.jar
+CP=$CP:$JAVA_LIBS/commons-codec.jar
+CP=$CP:$JAVA_LIBS/commons-httpclient.jar
+CP=$CP:$JAVA_LIBS/log4j-1.2.jar
+CP=$CP:$JAVA_LIBS/bcprov.jar
+CP=$CP:$JAVA_LIBS/java-xmlbuilder.jar
# Convert classpath for cygwin bash
case "`uname -s`" in
--- jets3t-0.8.1+dfsg.orig/bin/cockpit.sh
+++ jets3t-0.8.1+dfsg/bin/cockpit.sh
@@ -8,7 +8,7 @@
# Java Development Kit to use.
# -------------------------------------------------------------------
-: ${JETS3T_HOME:-""}
+: ${JETS3T_HOME:="/usr/share/jets3t"}
: ${JAVA_HOME:-""}
# Check the JETS3T_HOME directory
@@ -33,8 +33,9 @@ if [ -z "$JAVA_HOME" ]; then
# Test whether the 'java' program is available in the system path.
java -version 2> /dev/null
if [ $? -gt 0 ]; then
- echo "Please set the environment variable JAVA_HOME"
- exit 1
+ #echo "Please set the environment variable JAVA_HOME"
+ #exit 1
+ export JAVA_HOME="/usr/lib/jvm/default-java"
else
EXEC=java
fi
@@ -50,17 +51,20 @@ CP=$CLASSPATH:$JETS3T_HOME/configs
# Include resources directory in classpath
CP=$CP:$JETS3T_HOME/resources
+# System libraries path
+: ${JAVA_LIBS:="/usr/share/java"}
+
# Include libraries in classpath
-CP=$CP:$JETS3T_HOME/jars/jets3t-0.8.1.jar
-CP=$CP:$JETS3T_HOME/jars/jets3t-gui-0.8.1.jar
-CP=$CP:$JETS3T_HOME/jars/cockpit-0.8.1.jar
-CP=$CP:$JETS3T_HOME/libs/commons-logging/commons-logging-1.1.1.jar
-CP=$CP:$JETS3T_HOME/libs/commons-codec/commons-codec-1.3.jar
-CP=$CP:$JETS3T_HOME/libs/commons-httpclient/commons-httpclient-3.1.jar
-CP=$CP:$JETS3T_HOME/libs/misc/BareBonesBrowserLaunch.jar
-CP=$CP:$JETS3T_HOME/libs/logging-log4j/log4j-1.2.15.jar
-CP=$CP:$JETS3T_HOME/libs/bouncycastle/bcprov-jdk14-138.jar
-CP=$CP:$JETS3T_HOME/libs/java-xmlbuilder/java-xmlbuilder-0.4.jar
+CP=$CP:$JAVA_LIBS/jets3t.jar
+CP=$CP:$JAVA_LIBS/jets3t-gui.jar
+CP=$CP:$JAVA_LIBS/jets3t-cockpit.jar
+CP=$CP:$JAVA_LIBS/jets3t-deps.jar
+CP=$CP:$JAVA_LIBS/commons-logging.jar
+CP=$CP:$JAVA_LIBS/commons-codec.jar
+CP=$CP:$JAVA_LIBS/commons-httpclient.jar
+CP=$CP:$JAVA_LIBS/log4j-1.2.jar
+CP=$CP:$JAVA_LIBS/bcprov.jar
+CP=$CP:$JAVA_LIBS/java-xmlbuilder.jar
# Convert classpath for cygwin bash
case "`uname -s`" in
--- jets3t-0.8.1+dfsg.orig/bin/cockpitlite.sh
+++ jets3t-0.8.1+dfsg/bin/cockpitlite.sh
@@ -8,7 +8,7 @@
# Java Development Kit to use.
# -------------------------------------------------------------------
-: ${JETS3T_HOME:-""}
+: ${JETS3T_HOME:="/usr/share/jets3t"}
: ${JAVA_HOME:-""}
# Check the JETS3T_HOME directory
@@ -33,8 +33,9 @@ if [ -z "$JAVA_HOME" ]; then
# Test whether the 'java' program is available in the system path.
java -version 2> /dev/null
if [ $? -gt 0 ]; then
- echo "Please set the environment variable JAVA_HOME"
- exit 1
+ #echo "Please set the environment variable JAVA_HOME"
+ #exit 1
+ export JAVA_HOME="/usr/lib/jvm/default-java"
else
EXEC=java
fi
@@ -50,16 +51,19 @@ CP=$CLASSPATH:$JETS3T_HOME/configs
# Include resources directory in classpath
CP=$CP:$JETS3T_HOME/resources
+# System libraries path
+: ${JAVA_LIBS:="/usr/share/java"}
+
# Include libraries in classpath
-CP=$CP:$JETS3T_HOME/jars/jets3t-0.8.1.jar
-CP=$CP:$JETS3T_HOME/jars/jets3t-gui-0.8.1.jar
-CP=$CP:$JETS3T_HOME/jars/cockpitlite-0.8.1.jar
-CP=$CP:$JETS3T_HOME/libs/commons-logging/commons-logging-1.1.1.jar
-CP=$CP:$JETS3T_HOME/libs/commons-codec/commons-codec-1.3.jar
-CP=$CP:$JETS3T_HOME/libs/commons-httpclient/commons-httpclient-3.1.jar
-CP=$CP:$JETS3T_HOME/libs/misc/BareBonesBrowserLaunch.jar
-CP=$CP:$JETS3T_HOME/libs/logging-log4j/log4j-1.2.15.jar
-CP=$CP:$JETS3T_HOME/libs/bouncycastle/bcprov-jdk14-138.jar
+CP=$CP:$JAVA_LIBS/jets3t.jar
+CP=$CP:$JAVA_LIBS/jets3t-gui.jar
+CP=$CP:$JAVA_LIBS/jets3t-cockpitlite.jar
+CP=$CP:$JAVA_LIBS/jets3t-deps.jar
+CP=$CP:$JAVA_LIBS/commons-logging.jar
+CP=$CP:$JAVA_LIBS/commons-codec.jar
+CP=$CP:$JAVA_LIBS/commons-httpclient.jar
+CP=$CP:$JAVA_LIBS/log4j-1.2.jar
+CP=$CP:$JAVA_LIBS/bcprov.jar
# Convert classpath for cygwin bash
case "`uname -s`" in
--- jets3t-0.8.1+dfsg.orig/bin/uploader.sh
+++ jets3t-0.8.1+dfsg/bin/uploader.sh
@@ -8,7 +8,7 @@
# Java Development Kit to use.
# -------------------------------------------------------------------
-: ${JETS3T_HOME:-""}
+: ${JETS3T_HOME:="/usr/share/jets3t"}
: ${JAVA_HOME:-""}
# Check the JETS3T_HOME directory
@@ -33,8 +33,9 @@ if [ -z "$JAVA_HOME" ]; then
# Test whether the 'java' program is available in the system path.
java -version 2> /dev/null
if [ $? -gt 0 ]; then
- echo "Please set the environment variable JAVA_HOME"
- exit 1
+ #echo "Please set the environment variable JAVA_HOME"
+ #exit 1
+ export JAVA_HOME="/usr/lib/jvm/default-java"
else
EXEC=java
fi
@@ -50,15 +51,18 @@ CP=$CLASSPATH:$JETS3T_HOME/configs
# Include resources directory in classpath
CP=$CP:$JETS3T_HOME/resources
+# System libraries path
+: ${JAVA_LIBS:="/usr/share/java"}
+
# Include libraries in classpath
-CP=$CP:$JETS3T_HOME/jars/jets3t-0.8.1.jar
-CP=$CP:$JETS3T_HOME/jars/jets3t-gui-0.8.1.jar
-CP=$CP:$JETS3T_HOME/jars/uploader-0.8.1.jar
-CP=$CP:$JETS3T_HOME/libs/commons-logging/commons-logging-1.1.1.jar
-CP=$CP:$JETS3T_HOME/libs/commons-codec/commons-codec-1.3.jar
-CP=$CP:$JETS3T_HOME/libs/commons-httpclient/commons-httpclient-3.1.jar
-CP=$CP:$JETS3T_HOME/libs/misc/BareBonesBrowserLaunch.jar
-CP=$CP:$JETS3T_HOME/libs/logging-log4j/log4j-1.2.15.jar
+CP=$CP:$JAVA_LIBS/jets3t.jar
+CP=$CP:$JAVA_LIBS/jets3t-gui.jar
+CP=$CP:$JAVA_LIBS/jets3t-uploader.jar
+CP=$CP:$JAVA_LIBS/jets3t-deps.jar
+CP=$CP:$JAVA_LIBS/commons-logging.jar
+CP=$CP:$JAVA_LIBS/commons-codec.jar
+CP=$CP:$JAVA_LIBS/commons-httpclient.jar
+CP=$CP:$JAVA_LIBS/log4j-1.2.jar
# Convert classpath for cygwin bash
case "`uname -s`" in
debian/patches/10_java15.diff 0000664 0000000 0000000 00000001135 11552214510 013034 0 ustar Description: Set source and target classes to Java 1.5.
Since the source code includes annotations, it can not
longer be built with Java 1.4.
Author: Miguel Landaeta
Forwarded: no
Last-Update: 2011-04-14
--- jets3t-0.8.0+dfsg.orig/build.xml
+++ jets3t-0.8.0+dfsg/build.xml
@@ -100,7 +100,7 @@ zip-source-code : Zips the JetS3t sour
srcdir="${dir.src}"
destdir="${dir.build}"
debug="${debug}"
- source="1.4"
+ source="${build.source}"
target="${build.target}">
debian/patches/05_add_thirdparty_targets.diff 0000664 0000000 0000000 00000006401 11552214510 016505 0 ustar Author: Miguel Landaeta
Subject: compile third-party libs from source before the main compilation
Forwarded: no
Last-Update: 2011-04-13
Since BareBonesBrowserLaunch is needed to compile jets3t, they must be
compiled first. So, this patch add some ant targets to do this.
--- jets3t-0.8.0+dfsg.orig/build.xml
+++ jets3t-0.8.0+dfsg/build.xml
@@ -71,11 +71,12 @@ zip-source-code : Zips the JetS3t sour
================================= -->
+
+ depends="rebuild-thirdparty,rebuild-service,rebuild-cockpit,rebuild-cockpitlite,rebuild-synchronize,rebuild-uploader,rebuild-gatekeeper"/>
@@ -105,6 +106,21 @@ zip-source-code : Zips the JetS3t sour
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- jets3t-0.8.0+dfsg.orig/build.properties
+++ jets3t-0.8.0+dfsg/build.properties
@@ -19,6 +19,7 @@ dist.file.synchronize=synchronize-${vers
dist.file.uploader=uploader-${version}.jar
dist.file.gatekeeper=gatekeeper-${version}.war
dist.file.guisupport=jets3t-gui-${version}.jar
+dist.file.thirdparty=jets3t-deps-${version}.jar
# Comment out the lines below to exclude contributions
contribs.include-mx
debian/patches/02_build_with_debian_jars.diff 0000664 0000000 0000000 00000002543 11552214510 016425 0 ustar Author: Miguel Landaeta
Subject: compile jets3t using libraries installed on system
diff --git a/build.xml b/build.xml
index baeccae..6636aae 100644
--- a/build.xml
+++ b/build.xml
@@ -70,7 +70,7 @@ zip-source-code : Zips the JetS3t source code to an archive file with a
Define the script-wide classpath.
================================= -->
-
+
@@ -78,7 +78,7 @@ zip-source-code : Zips the JetS3t source code to an archive file with a
depends="rebuild-service,rebuild-cockpit,rebuild-cockpitlite,rebuild-synchronize,rebuild-uploader,rebuild-gatekeeper"/>
-
+
@@ -241,12 +241,14 @@ to refer to this official keystore.
todir="${dir.applets}"
flatten="true"
>
+
debian/patches/09_rename_app_jars.diff 0000664 0000000 0000000 00000001574 11552214510 015112 0 ustar Author: Miguel Landaeta
Subject: rename apps jars as is recommended in Debian Java Policy
--- jets3t-0.7.3+dfsg/build.properties 2010-03-25 20:39:35.000000000 -0430
+++ jets3t-0.7.3+dfsg/build.properties 2010-03-25 20:40:25.000000000 -0430
@@ -13,10 +13,10 @@
dir.resources=resources
dist.file.service=jets3t-${version}.jar
-dist.file.cockpit=cockpit-${version}.jar
-dist.file.cockpitlite=cockpitlite-${version}.jar
-dist.file.synchronize=synchronize-${version}.jar
-dist.file.uploader=uploader-${version}.jar
+dist.file.cockpit=jets3t-cockpit-${version}.jar
+dist.file.cockpitlite=jets3t-cockpitlite-${version}.jar
+dist.file.synchronize=jets3t-synchronize-${version}.jar
+dist.file.uploader=jets3t-uploader-${version}.jar
dist.file.gatekeeper=gatekeeper-${version}.war
dist.file.guisupport=jets3t-gui-${version}.jar
dist.file.thirdparty=jets3t-deps-${version}.jar
debian/patches/series 0000664 0000000 0000000 00000000367 11552214510 012036 0 ustar 01_replace_uuid_lib.diff
02_build_with_debian_jars.diff
04_add_barebonesbrowserlaunch_source.diff
05_add_thirdparty_targets.diff
06_fix_scripts.diff
07_add_classpath_to_manifest.diff
08_generate_javadoc.diff
09_rename_app_jars.diff
10_java15.diff
debian/patches/01_replace_uuid_lib.diff 0000664 0000000 0000000 00000004671 11552214510 015244 0 ustar Author: Miguel Landaeta
Subject: replace UUID library with the one provided by JDK since 1.5 version
diff -Naur jets3t-0.7.3+dfsg/src/org/jets3t/servlets/gatekeeper/impl/DefaultTransactionIdProvider.java jets3t-0.7.3+dfsg/src/org/jets3t/servlets/gatekeeper/impl/DefaultTransactionIdProvider.java
--- jets3t-0.7.3+dfsg/src/org/jets3t/servlets/gatekeeper/impl/DefaultTransactionIdProvider.java 2010-02-13 12:36:58.000000000 -0430
+++ jets3t-0.7.3+dfsg/src/org/jets3t/servlets/gatekeeper/impl/DefaultTransactionIdProvider.java 2010-03-22 19:24:39.000000000 -0430
@@ -24,8 +24,7 @@
import org.jets3t.service.utils.gatekeeper.GatekeeperMessage;
import org.jets3t.servlets.gatekeeper.ClientInformation;
import org.jets3t.servlets.gatekeeper.TransactionIdProvider;
-import org.safehaus.uuid.UUID;
-import org.safehaus.uuid.UUIDGenerator;
+import java.util.UUID;
/**
* Default TransactionIdProvider implementation that generated random-based UUIDs using the
@@ -51,7 +50,7 @@
public String getTransactionId(GatekeeperMessage requestMessage, ClientInformation clientInformation)
{
// Generate a UUID based on a random generation.
- UUID uuid = UUIDGenerator.getInstance().generateRandomBasedUUID();
+ UUID uuid = UUID.randomUUID();
return uuid.toString();
}
diff -Naur jets3t-0.7.3+dfsg/src/org/jets3t/servlets/gatekeeper/impl/ExternalUuidProvider.java jets3t-0.7.3+dfsg/src/org/jets3t/servlets/gatekeeper/impl/ExternalUuidProvider.java
--- jets3t-0.7.3+dfsg/src/org/jets3t/servlets/gatekeeper/impl/ExternalUuidProvider.java 2010-02-13 12:36:58.000000000 -0430
+++ jets3t-0.7.3+dfsg/src/org/jets3t/servlets/gatekeeper/impl/ExternalUuidProvider.java 2010-03-22 19:25:32.000000000 -0430
@@ -24,8 +24,7 @@
import org.jets3t.service.utils.gatekeeper.GatekeeperMessage;
import org.jets3t.servlets.gatekeeper.ClientInformation;
import org.jets3t.servlets.gatekeeper.TransactionIdProvider;
-import org.safehaus.uuid.UUID;
-import org.safehaus.uuid.UUIDGenerator;
+import java.util.UUID;
/**
* Uses an externally provided UUID obtained from an application property externalUUID
@@ -52,7 +51,7 @@
return externalUuid;
}
// Use a generated UUID based on a random generation as a fallback if the external UUID isn't available.
- UUID uuid = UUIDGenerator.getInstance().generateRandomBasedUUID();
+ UUID uuid = UUID.randomUUID();
return uuid.toString();
}
debian/patches/08_generate_javadoc.diff 0000664 0000000 0000000 00000001445 11552214510 015241 0 ustar Author: Miguel Landaeta
Subject: add ant target to generate javadoc files from source
--- jets3t-0.7.2+dfsg/build.xml 2010-03-22 21:23:25.000000000 -0430
+++ jets3t-0.7.2+dfsg/build.xml 2010-07-30 20:08:56.000000000 -0430
@@ -463,5 +463,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
debian/patches/07_add_classpath_to_manifest.diff 0000664 0000000 0000000 00000001243 11552214510 017135 0 ustar Author: Miguel Landaeta
Subject: include Class-Path header in jets3t public jar
Forwarded: no
Last-Update: 2010-04-13
--- jets3t-0.8.0+dfsg.orig/build.xml
+++ jets3t-0.8.0+dfsg/build.xml
@@ -132,6 +132,9 @@ zip-source-code : Zips the JetS3t sour
+
+
+