241 lines
8.9 KiB
Diff
241 lines
8.9 KiB
Diff
|
diff -Nru jets3t-0.9.3/scripts/cockpitlite.sh jets3t-0.9.3.scripts/scripts/cockpitlite.sh
|
||
|
|
--- jets3t-0.9.3/scripts/cockpitlite.sh 2015-02-15 16:25:18.000000000 +0100
|
||
|
|
+++ jets3t-0.9.3.scripts/scripts/cockpitlite.sh 2015-02-19 00:53:49.130021484 +0100
|
||
|
|
@@ -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,7 @@
|
||
|
|
# 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
|
||
|
|
+ export JAVA_HOME="/usr/lib/jvm/java"
|
||
|
|
else
|
||
|
|
EXEC=java
|
||
|
|
fi
|
||
|
|
@@ -50,16 +49,28 @@
|
||
|
|
# 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-{jets3t-version}.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/jars/jets3t-gui-{jets3t-version}.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/jars/cockpitlite-{jets3t-version}.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/libs/commons-logging/commons-logging-1.1.3.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/libs/commons-codec/commons-codec-1.8.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpclient-4.3.6.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpcore-4.3.3.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/jets3t.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/commons-logging.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/commons-codec.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/httpcomponents/httpclient.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/httpcomponents/httpcore.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/log4j12-1.2.17.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/bcprov.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/java-xmlbuilder.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/base64.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/BareBonesBrowserLaunch.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/jackson/jackson-core-asl.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/jackson/jackson-mapper-asl.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/mx4j/mx4j.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/javamail/mail.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/avalon-framework-api.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/avalon-logkit.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/glassfish-servlet-api.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/jms.jar
|
||
|
|
|
||
|
|
# Convert classpath for cygwin bash
|
||
|
|
case "`uname -s`" in
|
||
|
|
diff -Nru jets3t-0.9.3/scripts/cockpit.sh jets3t-0.9.3.scripts/scripts/cockpit.sh
|
||
|
|
--- jets3t-0.9.3/scripts/cockpit.sh 2015-02-15 16:25:18.000000000 +0100
|
||
|
|
+++ jets3t-0.9.3.scripts/scripts/cockpit.sh 2015-02-19 00:49:36.898974304 +0100
|
||
|
|
@@ -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,7 @@
|
||
|
|
# 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
|
||
|
|
+ export JAVA_HOME="/usr/lib/jvm/java"
|
||
|
|
else
|
||
|
|
EXEC=java
|
||
|
|
fi
|
||
|
|
@@ -50,17 +49,28 @@
|
||
|
|
# 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-{jets3t-version}.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/jars/jets3t-gui-{jets3t-version}.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/jars/cockpit-{jets3t-version}.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/libs/commons-logging/commons-logging-1.1.3.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/libs/commons-codec/commons-codec-1.8.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpclient-4.3.6.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpcore-4.3.3.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-1.0.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/jets3t/jets3t.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/commons-logging.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/commons-codec.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/httpcomponents/httpclient.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/httpcomponents/httpcore.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/log4j12-1.2.17.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/bcprov.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/java-xmlbuilder.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/base64.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/BareBonesBrowserLaunch.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/jackson/jackson-core-asl.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/jackson/jackson-mapper-asl.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/mx4j/mx4j.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/javamail/mail.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/avalon-framework-api.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/avalon-logkit.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/glassfish-servlet-api.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/jms.jar
|
||
|
|
|
||
|
|
# Convert classpath for cygwin bash
|
||
|
|
case "`uname -s`" in
|
||
|
|
diff -Nru jets3t-0.9.3/scripts/synchronize.sh jets3t-0.9.3.scripts/scripts/synchronize.sh
|
||
|
|
--- jets3t-0.9.3/scripts/synchronize.sh 2015-02-15 16:25:18.000000000 +0100
|
||
|
|
+++ jets3t-0.9.3.scripts/scripts/synchronize.sh 2015-02-19 00:53:28.416221993 +0100
|
||
|
|
@@ -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,7 @@
|
||
|
|
# 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
|
||
|
|
+ export JAVA_HOME="/usr/lib/jvm/java"
|
||
|
|
else
|
||
|
|
EXEC=java
|
||
|
|
fi
|
||
|
|
@@ -50,16 +49,28 @@
|
||
|
|
# 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-{jets3t-version}.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/jars/synchronize-{jets3t-version}.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/libs/commons-logging/commons-logging-1.1.3.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/libs/commons-codec/commons-codec-1.8.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpclient-4.3.6.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpcore-4.3.3.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-1.0.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/jets3t/jets3t.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/commons-logging.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/commons-codec.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/httpcomponents/httpclient.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/httpcomponents/httpcore.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/log4j12-1.2.17.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/bcprov.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/java-xmlbuilder.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/base64.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/BareBonesBrowserLaunch.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/jackson/jackson-core-asl.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/jackson/jackson-mapper-asl.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/mx4j/mx4j.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/javamail/mail.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/avalon-framework-api.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/avalon-logkit.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/glassfish-servlet-api.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/jms.jar
|
||
|
|
|
||
|
|
# Convert classpath for cygwin bash
|
||
|
|
case "`uname -s`" in
|
||
|
|
diff -Nru jets3t-0.9.3/scripts/uploader.sh jets3t-0.9.3.scripts/scripts/uploader.sh
|
||
|
|
--- jets3t-0.9.3/scripts/uploader.sh 2015-02-15 16:25:18.000000000 +0100
|
||
|
|
+++ jets3t-0.9.3.scripts/scripts/uploader.sh 2015-02-19 00:49:11.799467598 +0100
|
||
|
|
@@ -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,7 @@
|
||
|
|
# 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
|
||
|
|
+ export JAVA_HOME="/usr/lib/jvm/java"
|
||
|
|
else
|
||
|
|
EXEC=java
|
||
|
|
fi
|
||
|
|
@@ -50,15 +49,28 @@
|
||
|
|
# 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-{jets3t-version}.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/jars/jets3t-gui-{jets3t-version}.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/jars/uploader-{jets3t-version}.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/libs/commons-logging/commons-logging-1.1.3.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/libs/commons-codec/commons-codec-1.8.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpclient-4.3.2.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/libs/httpcomponents/httpcore-4.3.3.jar
|
||
|
|
-CP=$CP:$JETS3T_HOME/libs/logging-log4j/log4j-1.2.15.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/jets3t/jets3t.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/commons-logging.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/commons-codec.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/httpcomponents/httpclient.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/httpcomponents/httpcore.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/log4j12-1.2.17.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/bcprov.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/java-xmlbuilder.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/base64.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/BareBonesBrowserLaunch.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/jackson/jackson-core-asl.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/jackson/jackson-mapper-asl.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/mx4j/mx4j.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/javamail/mail.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/avalon-framework-api.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/avalon-logkit.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/glassfish-servlet-api.jar
|
||
|
|
+CP=$CP:$JAVA_LIBS/jms.jar
|
||
|
|
|
||
|
|
# Convert classpath for cygwin bash
|
||
|
|
case "`uname -s`" in
|