10.2.0

pquiring · pquiring · commit 39a83fd57254 · 2015-09-10T10:55:55.000-04:00
diff --git a/base.properties b/base.properties
diff --git a/build.xml b/build.xml
@@ -5,7 +5,7 @@
   <property name="src" location="src"/>
   <property name="build" location="classes"/>
   <property name="home" value="."/>
-  <property name="version" value="10.1.0"/>
+  <property name="version" value="10.2.0"/>
 
   <import file="base.xml"/>
 
diff --git a/deb/control b/deb/control
@@ -1,5 +1,5 @@
 Package: javaforce
-Version: 10.1.0
+Version: 10.2.0
 Architecture: amd64
 Maintainer: Peter Quiring <pquiring@jflinux.org>
 Installed-Size: 290
diff --git a/javaforce.spec b/javaforce.spec
@@ -1,6 +1,6 @@
 Buildroot: /.
 Name: javaforce
-Version: 10.1.0
+Version: 10.2.0
 Release: 1
 Summary: JavaForce Core Library
 License: LGPL
diff --git a/projects/jfproxy/build.xml b/projects/jfproxy/build.xml
@@ -3,28 +3,27 @@
   <!-- set global properties for this build -->
   <property name="app" value="jfproxy"/>
   <property name="home" location="../.."/>
-  <property name="version" value="0.2"/>
+  <property name="version" value="0.3"/>
 
   <import file="../../base.xml"/>
 
   <target name="depjars" description="jar">
-    <copy file="../../jars/javaforce.jar" todir="."/>
+    <copy file="${home}/jars/javaforce.jar" todir="."/>
   </target>
 
-  <target name="jar" description="jar">
+  <target name="jar" depends="depjars" description="jar">
   </target>
 
-  <target name="release-bin" depends="" description="create release zip file">
-    <copy file="../../jars/javaforce.jar" todir="."/>
-    <zip destfile="jfproxy-${version}.zip">
+  <target name="release-bin" depends="depjars" description="create release zip file">
+    <zip destfile="jfproxy-bin-${version}.zip">
       <fileset dir=".">
         <include name="*.jar"/>
         <include name="*.txt"/>
         <include name="run.bat"/>
       </fileset>
       <fileset dir="../.." includes="license.txt"/>
     </zip>
-    <move file="jfproxy-${version}.zip" todir="${home}/release"/>
+    <move file="jfproxy-bin-${version}.zip" todir="${home}/release"/>
   </target>
 
   <!-- sudo ant install -->
diff --git a/projects/jfproxy/deb/control b/projects/jfproxy/deb/control
@@ -1,5 +1,5 @@
 Package: jfproxy
-Version: 0.2
+Version: 0.3
 Architecture: @ARCH@
 Maintainer: Peter Quiring <pquiring@jflinux.org>
 Installed-Size: 1
diff --git a/projects/jfproxy/jfproxy.spec b/projects/jfproxy/jfproxy.spec
@@ -1,6 +1,6 @@
 Buildroot: .
 Name: jfproxy
-Version: 0.2
+Version: 0.3
 Release: 1
 Summary: Proxy Server
 License: LGPL
diff --git a/projects/jfproxy/wix32.xml b/projects/jfproxy/wix32.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" UpgradeCode="{F6420D32-DDFA-42FB-A3A6-20A60EC9BED7}" Version="0.2" Language="1033" Name="jfProxy" Manufacturer="Peter Quiring">
+  <Product Id="*" UpgradeCode="{F6420D32-DDFA-42FB-A3A6-20A60EC9BED7}" Version="0.3" Language="1033" Name="jfProxy" Manufacturer="Peter Quiring">
     <Package InstallerVersion="300" Compressed="yes"/>
     <Media Id="1" Cabinet="files.cab" EmbedCab="yes" />
     <UIRef Id="WixUI_Minimal" />
diff --git a/projects/jfproxy/wix64.xml b/projects/jfproxy/wix64.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" UpgradeCode="{F6420D32-DDFA-42FB-A3A6-20A60EC9BED7}" Version="0.2" Language="1033" Name="jfProxy" Manufacturer="Peter Quiring">
+  <Product Id="*" UpgradeCode="{F6420D32-DDFA-42FB-A3A6-20A60EC9BED7}" Version="0.3" Language="1033" Name="jfProxy" Manufacturer="Peter Quiring">
     <Package InstallerVersion="300" Compressed="yes" Platform="x64"/>
     <Media Id="1" Cabinet="files.cab" EmbedCab="yes" />
     <UIRef Id="WixUI_Minimal" />
diff --git a/projects/jfvideo/src/down.png b/projects/jfvideo/src/down.png
diff --git a/projects/jfvideo/src/up.png b/projects/jfvideo/src/up.png
diff --git a/projects/jfvnc/build.xml b/projects/jfvnc/build.xml
@@ -10,6 +10,8 @@
 
   <import file="../../base.xml"/>
 
+  <target name="depjars"/>
+
   <target name="compile" description="compile the source">
     <!-- Compile the java code from ${src} into ${build} -->
     <mkdir dir="${build}"/>
diff --git a/readme.txt b/readme.txt
@@ -1,7 +1,7 @@
 JavaForce SDK
 =============
 
-Version 10.1.0
+Version 10.2.0
 
 What is it?
 ===========
@@ -90,6 +90,6 @@ Web : pquiring.github.io/javaforce
 
 Git : github.com/pquiring/javaforce
 
-Version 10.1.0
+Version 10.2.0
 
-Released : August 27 2015
+Released : Sept 10, 2015
diff --git a/src/javaforce/JF.java b/src/javaforce/JF.java
@@ -25,7 +25,7 @@
 public class JF {
 
   public static String getVersion() {
-    return "10.1.0";
+    return "10.2.0";
   }
 
   public static void sleep(int milli) {
diff --git a/src/javaforce/service/Proxy.java b/src/javaforce/service/Proxy.java
@@ -104,6 +104,7 @@ private static enum Section {None, Global, BlockDomain, URLChange};
     + "\r\n"
     + "[blockdomain]\r\n"
     + ".*youtube[.]com\r\n"
+    + "\r\n"
     + "[urlchange]\r\n"
     + "#www.example.com/test = www.google.com\r\n";
 
@@ -302,15 +303,16 @@ private void proxy(String req) throws Exception {
         replyError(505, "No host specified");
         return;
       }
+      String hostln = ln[hostidx].substring(6);
       String host;
       int port = 80;
-      int portidx = ln[hostidx].substring(6).indexOf(':');
+      int portidx = hostln.indexOf(':');
       try {
         if (portidx != -1) {
-          host = ln[hostidx].substring(6, portidx);
-          port = Integer.valueOf(ln[hostidx].substring(portidx+1));
+          host = hostln.substring(0, portidx);
+          port = Integer.valueOf(hostln.substring(portidx+1));
         } else {
-          host = ln[hostidx].substring(6);
+          host = hostln;
         }
         //check if host is blocked
         host = host.trim().toLowerCase();
diff --git a/whatsnew.txt b/whatsnew.txt
@@ -1,5 +1,9 @@
 What's new...
 
+Sept 10/2015 : JF 10.2.0 released!
+  - jfProxy/0.3 released!
+    - fixed host:port parsing
+
 Aug 27/2015 : JF 10.1.0 released!
   - added GLMatrix.lookAt()
 
