chemistry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From f...@apache.org
Subject svn commit: r1530919 - in /chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start: workbench-axis2.sh workbench-cxf.sh workbench.sh
Date Thu, 10 Oct 2013 11:14:55 GMT
Author: fmui
Date: Thu Oct 10 11:14:55 2013
New Revision: 1530919

URL: http://svn.apache.org/r1530919
Log:
Workbench: improved proxy settings for UNIX

Modified:
    chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-axis2.sh
    chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-cxf.sh
    chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench.sh

Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-axis2.sh
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-axis2.sh?rev=1530919&r1=1530918&r2=1530919&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-axis2.sh
(original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-axis2.sh
Thu Oct 10 11:14:55 2013
@@ -49,10 +49,15 @@ if [ -n "$http_proxy" ]; then
 fi
 
 if [ -n "$https_proxy" ]; then
-  HTTPS_PROXY_HOST=$(echo $https_proxy | sed 's/http:\/\/\(.*\):.*/\1/')
-  HTTPS_PROXY_PORT=$(echo $https_proxy | sed 's/http:\/\/.*:\(.*\)/\1/')
+  HTTPS_PROXY_HOST=$(echo $https_proxy | sed 's/https*:\/\/\(.*\):.*/\1/')
+  HTTPS_PROXY_PORT=$(echo $https_proxy | sed 's/https*:\/\/.*:\(.*\)/\1/')
   JAVA_OPTS="$JAVA_OPTS -Dhttps.proxyHost=$HTTPS_PROXY_HOST -Dhttps.proxyPort=$HTTPS_PROXY_PORT"
 fi
 
+if [ -n "$no_proxy" ]; then
+  NON_PROXY_HOSTS=$(echo $no_proxy | sed 's/[[:space:]]//g; s/^\./\*\./g; s/,\./,\*\./g;
s/\.$/\.\*/g; s/\.,/\.\*,/g; s/,/|/g;')
+  JAVA_OPTS="$JAVA_OPTS -Dhttp.nonProxyHosts=$NON_PROXY_HOSTS"
+fi
+
 
 exec $JAVA $JAVA_OPTS $CUSTOM_JAVA_OPTS -classpath $WCP org.apache.chemistry.opencmis.workbench.Workbench
&
\ No newline at end of file

Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-cxf.sh
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-cxf.sh?rev=1530919&r1=1530918&r2=1530919&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-cxf.sh
(original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench-cxf.sh
Thu Oct 10 11:14:55 2013
@@ -49,10 +49,15 @@ if [ -n "$http_proxy" ]; then
 fi
 
 if [ -n "$https_proxy" ]; then
-  HTTPS_PROXY_HOST=$(echo $https_proxy | sed 's/http:\/\/\(.*\):.*/\1/')
-  HTTPS_PROXY_PORT=$(echo $https_proxy | sed 's/http:\/\/.*:\(.*\)/\1/')
+  HTTPS_PROXY_HOST=$(echo $https_proxy | sed 's/https*:\/\/\(.*\):.*/\1/')
+  HTTPS_PROXY_PORT=$(echo $https_proxy | sed 's/https*:\/\/.*:\(.*\)/\1/')
   JAVA_OPTS="$JAVA_OPTS -Dhttps.proxyHost=$HTTPS_PROXY_HOST -Dhttps.proxyPort=$HTTPS_PROXY_PORT"
 fi
 
+if [ -n "$no_proxy" ]; then
+  NON_PROXY_HOSTS=$(echo $no_proxy | sed 's/[[:space:]]//g; s/^\./\*\./g; s/,\./,\*\./g;
s/\.$/\.\*/g; s/\.,/\.\*,/g; s/,/|/g;')
+  JAVA_OPTS="$JAVA_OPTS -Dhttp.nonProxyHosts=$NON_PROXY_HOSTS"
+fi
+
 
 exec $JAVA $JAVA_OPTS $CUSTOM_JAVA_OPTS -classpath $WCP org.apache.chemistry.opencmis.workbench.Workbench
&
\ No newline at end of file

Modified: chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench.sh
URL: http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench.sh?rev=1530919&r1=1530918&r2=1530919&view=diff
==============================================================================
--- chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench.sh
(original)
+++ chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/start/workbench.sh
Thu Oct 10 11:14:55 2013
@@ -49,10 +49,15 @@ if [ -n "$http_proxy" ]; then
 fi
 
 if [ -n "$https_proxy" ]; then
-  HTTPS_PROXY_HOST=$(echo $https_proxy | sed 's/http:\/\/\(.*\):.*/\1/')
-  HTTPS_PROXY_PORT=$(echo $https_proxy | sed 's/http:\/\/.*:\(.*\)/\1/')
+  HTTPS_PROXY_HOST=$(echo $https_proxy | sed 's/https*:\/\/\(.*\):.*/\1/')
+  HTTPS_PROXY_PORT=$(echo $https_proxy | sed 's/https*:\/\/.*:\(.*\)/\1/')
   JAVA_OPTS="$JAVA_OPTS -Dhttps.proxyHost=$HTTPS_PROXY_HOST -Dhttps.proxyPort=$HTTPS_PROXY_PORT"
 fi
 
+if [ -n "$no_proxy" ]; then
+  NON_PROXY_HOSTS=$(echo $no_proxy | sed 's/[[:space:]]//g; s/^\./\*\./g; s/,\./,\*\./g;
s/\.$/\.\*/g; s/\.,/\.\*,/g; s/,/|/g;')
+  JAVA_OPTS="$JAVA_OPTS -Dhttp.nonProxyHosts=$NON_PROXY_HOSTS"
+fi
+
 
 exec $JAVA $JAVA_OPTS $CUSTOM_JAVA_OPTS -classpath $WCP org.apache.chemistry.opencmis.workbench.Workbench
&
\ No newline at end of file



Mime
View raw message