/hg/icedtea-web: 2 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Thu May 2 07:05:37 PDT 2013
changeset f20482af9a95 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=f20482af9a95
author: Jiri Vanek <jvanek at redhat.com>
date: Thu May 02 16:00:17 2013 +0200
Fix for portalbank.no (trying get after failed head requests) and tests
changeset 882d1bc0ff8f in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=882d1bc0ff8f
author: Jiri Vanek <jvanek at redhat.com>
date: Thu May 02 16:05:57 2013 +0200
Merge with: Fix for portalbank.no (trying get after failed head requests) and tests
diffstat:
ChangeLog | 42 +
netx/net/sourceforge/jnlp/Version.java | 38 +-
netx/net/sourceforge/jnlp/cache/Resource.java | 2 +
netx/net/sourceforge/jnlp/cache/ResourceTracker.java | 65 +-
netx/net/sourceforge/jnlp/util/HttpUtils.java | 76 ++
netx/net/sourceforge/jnlp/util/StreamUtils.java | 13 -
tests/netx/unit/net/sourceforge/jnlp/VersionTest.java | 98 +++
tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java | 308 ++++++++-
tests/netx/unit/net/sourceforge/jnlp/util/HttpUtilsTest.java | 248 ++++++++
tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java | 37 +
tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java | 17 +-
tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java | 30 +-
tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java | 45 +-
13 files changed, 883 insertions(+), 136 deletions(-)
diffs (truncated from 1318 to 500 lines):
diff -r 55c943c320fd -r 882d1bc0ff8f ChangeLog
--- a/ChangeLog Thu May 02 15:31:55 2013 +0200
+++ b/ChangeLog Thu May 02 16:05:57 2013 +0200
@@ -1,3 +1,45 @@
+2013-05-02 Jiri Vanek <jvanek at redhat.com>
+
+ Added various tests related to portalbank.no fixes
+ * netx/net/sourceforge/jnlp/cache/Resource.java: added fixme to warn
+ before wrong url comparator
+ * netx/net/sourceforge/jnlp/Version.java: removed useless main. Its
+ purpose moved to new
+ * tests/netx/unit/net/sourceforge/jnlp/VersionTest: some small tests to
+ version class
+ * tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java:
+ added tests to (getUrlResponseCode) and (findBestUrl)
+ * tests/netx/unit/net/sourceforge/jnlp/util/HttpUtilsTest.java: added tests for
+ (consumeAndCloseConnectionSilently) and (consumeAndCloseConnection)
+ * tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest: added license header
+ * tests/test-extensions/net/sourceforge/jnlp/ServerLauncher.java: and
+ * tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java: added
+ support for simulation of not working HEAD request.
+
+2013-05-02 Jiri Vanek <jvanek at redhat.com>
+
+ Fix for portalbank.no (trying get after failed head requests)
+ * net/sourceforge/jnlp/cache/ResourceTracker : (findBestUrl)
+ now trying GET after each error request of HEAD type. Changed and
+ added debug messages. (getUrlResponseCode) closing of stream
+ moved to separate method HttpUtils.consumeAndCloseConnectionSilently
+ * net/sourceforge/jnlp/util/HttpUtils.java: new file designed for
+ http utils. Now contains (consumeAndCloseConnection) and
+ (consumeAndCloseConnectionSilently) which calls consumeAndCloseConnection
+ but do not rethrow exception
+ * netx/net/sourceforge/jnlp/util/StreamUtils.java: removed
+ (consumeAndCloseInputStream) now improved and moved to HttpUtils
+
+2013-05-02 Jana Fabrikova <jfabriko at redhat.com>
+
+ * tests/test-extensions/net/sourceforge/jnlp/awt/AWTHelper.java:
+ refactoring - removing initStrGiven variable - now it only
+ matters if the initStr is null or not. Modifying the following
+ two methods: (charReaded) - if initStr is null the run method
+ can not be started from charReaded and the presence of initStr
+ is not checked in stdout. Method (getInitStrAsRule) returns rule
+ that is always true if initStr is null.
+
2013-05-02 Jiri Vanek <jvanek at redhat.com>
Renamed cz locales to be more general
diff -r 55c943c320fd -r 882d1bc0ff8f netx/net/sourceforge/jnlp/Version.java
--- a/netx/net/sourceforge/jnlp/Version.java Thu May 02 15:31:55 2013 +0200
+++ b/netx/net/sourceforge/jnlp/Version.java Thu May 02 16:05:57 2013 +0200
@@ -308,42 +308,6 @@
public String toString() {
return versionString;
- }
-
- /**
- * Test.
- */
- /*
- public static void main(String args[]) {
- Version jvms[] = {
- new Version("1.1* 1.3*"),
- new Version("1.2+"),
- };
-
- Version versions[] = {
- new Version("1.1"),
- new Version("1.1.8"),
- new Version("1.2"),
- new Version("1.3"),
- new Version("2.0"),
- new Version("1.3.1"),
- new Version("1.2.1"),
- new Version("1.3.1-beta"),
- new Version("1.1 1.2"),
- new Version("1.2 1.3"),
- };
-
- for (int j = 0; j < jvms.length; j++) {
- for (int v = 0; v < versions.length; v++) {
- System.out.print( jvms[j].toString() + " " );
- if (!jvms[j].matches(versions[v]))
- System.out.print( "!" );
- System.out.println( "matches " + versions[v].toString() );
- }
- }
-
- System.out.println("Test completed");
- }
- */
+ }
}
diff -r 55c943c320fd -r 882d1bc0ff8f netx/net/sourceforge/jnlp/cache/Resource.java
--- a/netx/net/sourceforge/jnlp/cache/Resource.java Thu May 02 15:31:55 2013 +0200
+++ b/netx/net/sourceforge/jnlp/cache/Resource.java Thu May 02 16:05:57 2013 +0200
@@ -109,6 +109,8 @@
synchronized (resources) {
Resource resource = new Resource(location, requestVersion, updatePolicy);
+ //FIXME - url ignores port during its comparison
+ //this may affect test-suites
int index = resources.indexOf(resource);
if (index >= 0) { // return existing object
Resource result = resources.get(index);
diff -r 55c943c320fd -r 882d1bc0ff8f netx/net/sourceforge/jnlp/cache/ResourceTracker.java
--- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Thu May 02 15:31:55 2013 +0200
+++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.java Thu May 02 16:05:57 2013 +0200
@@ -24,14 +24,10 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLConnection;
-import java.net.URLDecoder;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayList;
@@ -49,7 +45,7 @@
import net.sourceforge.jnlp.event.DownloadEvent;
import net.sourceforge.jnlp.event.DownloadListener;
import net.sourceforge.jnlp.runtime.JNLPRuntime;
-import net.sourceforge.jnlp.util.StreamUtils;
+import net.sourceforge.jnlp.util.HttpUtils;
import net.sourceforge.jnlp.util.UrlUtils;
import net.sourceforge.jnlp.util.WeakList;
@@ -118,6 +114,9 @@
/** max threads */
private static final int maxThreads = 5;
+
+ /** methods used to try individual URLs when choosing best*/
+ private static final String[] requestMethods = {"HEAD", "GET"};
/** running threads */
private static int threads = 0;
@@ -859,7 +858,7 @@
* @return the response code if HTTP connection, or HttpURLConnection.HTTP_OK if not.
* @throws IOException
*/
- private static int getUrlResponseCode(URL url, Map<String, String> requestProperties, String requestMethod) throws IOException {
+ static int getUrlResponseCode(URL url, Map<String, String> requestProperties, String requestMethod) throws IOException {
URLConnection connection = url.openConnection();
for (Map.Entry<String, String> property : requestProperties.entrySet()){
@@ -874,7 +873,7 @@
/* Fully consuming current request helps with connection re-use
* See http://docs.oracle.com/javase/1.5.0/docs/guide/net/http-keepalive.html */
- StreamUtils.consumeAndCloseInputStream(httpConnection.getInputStream());
+ HttpUtils.consumeAndCloseConnectionSilently(httpConnection);
return responseCode;
}
@@ -891,7 +890,7 @@
* @param resource the resource
* @return the best URL, or null if all failed to resolve
*/
- private URL findBestUrl(Resource resource) {
+ URL findBestUrl(Resource resource) {
DownloadOptions options = downloadOptions.get(resource);
if (options == null) {
options = new DownloadOptions(false, false);
@@ -903,33 +902,33 @@
resource.toString() + " : " + urls);
}
- for (URL url : urls) {
- try {
- Map<String, String> requestProperties = new HashMap<String, String>();
- requestProperties.put("Accept-Encoding", "pack200-gzip, gzip");
+ for (String requestMethod : requestMethods) {
+ for (URL url : urls) {
+ try {
+ Map<String, String> requestProperties = new HashMap<String, String>();
+ requestProperties.put("Accept-Encoding", "pack200-gzip, gzip");
- int responseCode = getUrlResponseCode(url, requestProperties, "HEAD");
+ int responseCode = getUrlResponseCode(url, requestProperties, requestMethod);
- if (responseCode == HttpURLConnection.HTTP_NOT_IMPLEMENTED ) {
- System.err.println("NOTE: The server does not appear to support HEAD requests, falling back to GET requests.");
- /* Fallback: use GET request in the rare case the server does not support HEAD requests */
- responseCode = getUrlResponseCode(url, requestProperties, "GET");
- }
-
- /* Check if within valid response code range */
- if (responseCode >= 200 && responseCode < 300) {
- if (JNLPRuntime.isDebug()) {
- System.err.println("best url for " + resource.toString() + " is " + url.toString());
- }
- return url; /* This is the best URL */
- }
- } catch (IOException e) {
- // continue to next candidate
- if (JNLPRuntime.isDebug()) {
- System.err.println("While processing " + url.toString() + " for resource " + resource.toString() + " got " + e);
- }
- }
- }
+ if (responseCode < 200 || responseCode >= 300) {
+ if (JNLPRuntime.isDebug()) {
+ System.err.println("For "+resource.toString()+" the server returned " + responseCode + " code for "+requestMethod+" request for " + url.toExternalForm());
+ }
+ }else {
+ if (JNLPRuntime.isDebug()) {
+ System.out.println("best url for " + resource.toString() + " is " + url.toString() + " by " + requestMethod);
+ }
+ return url; /* This is the best URL */
+ }
+ } catch (IOException e) {
+ // continue to next candidate
+ if (JNLPRuntime.isDebug()) {
+ System.err.println("While processing " + url.toString() + " by " + requestMethod + " for resource " + resource.toString() + " got " + e + ": ");
+ e.printStackTrace();
+ }
+ }
+ }
+ }
/* No valid URL, return null */
return null;
diff -r 55c943c320fd -r 882d1bc0ff8f netx/net/sourceforge/jnlp/util/HttpUtils.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/util/HttpUtils.java Thu May 02 16:05:57 2013 +0200
@@ -0,0 +1,76 @@
+/*
+ Copyright (C) 2011 Red Hat, Inc.
+
+ This file is part of IcedTea.
+
+ IcedTea is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 2.
+
+ IcedTea is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with IcedTea; see the file COPYING. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library. Thus, the terms and
+ conditions of the GNU General Public License cover the whole
+ combination.
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting executable under
+ terms of your choice, provided that you also meet, for each linked
+ independent module, the terms and conditions of the license of that
+ module. An independent module is a module which is not derived from
+ or based on this library. If you modify this library, you may extend
+ this exception to your version of the library, but you are not
+ obligated to do so. If you do not wish to do so, delete this
+ exception statement from your version.
+ */
+package net.sourceforge.jnlp.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+
+public class HttpUtils {
+
+ /**
+ * Ensure a HttpURLConnection is fully read, required for correct behavior.
+ * Captured IOException is consumed and printed
+ */
+ public static void consumeAndCloseConnectionSilently(HttpURLConnection c) {
+ try {
+ consumeAndCloseConnection(c);
+ } catch (IOException ex) {
+ ex.printStackTrace(System.err);
+ }
+ }
+
+ /**
+ * Ensure a HttpURLConnection is fully read, required for correct behavior
+ *
+ * @throws IOException
+ */
+ public static void consumeAndCloseConnection(HttpURLConnection c) throws IOException {
+ InputStream in = null;
+ try {
+ in = c.getInputStream();
+ byte[] throwAwayBuffer = new byte[256];
+ while (in.read(throwAwayBuffer) > 0) {
+ /* ignore contents */
+ }
+ } finally {
+ if (in != null) {
+ in.close();
+ }
+ }
+ }
+}
diff -r 55c943c320fd -r 882d1bc0ff8f netx/net/sourceforge/jnlp/util/StreamUtils.java
--- a/netx/net/sourceforge/jnlp/util/StreamUtils.java Thu May 02 15:31:55 2013 +0200
+++ b/netx/net/sourceforge/jnlp/util/StreamUtils.java Thu May 02 16:05:57 2013 +0200
@@ -45,19 +45,6 @@
public class StreamUtils {
- /**
- * Ensure a stream is fully read, required for correct behaviour in some
- * APIs, namely HttpURLConnection.
- * @throws IOException
- */
- public static void consumeAndCloseInputStream(InputStream in) throws IOException {
- byte[] throwAwayBuffer = new byte[256];
- while (in.read(throwAwayBuffer) > 0) {
- /* ignore contents */
- }
- in.close();
- }
-
/***
* Closes a stream, without throwing IOException.
* In case of IOException, prints the stack trace to System.err.
diff -r 55c943c320fd -r 882d1bc0ff8f tests/netx/unit/net/sourceforge/jnlp/VersionTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/netx/unit/net/sourceforge/jnlp/VersionTest.java Thu May 02 16:05:57 2013 +0200
@@ -0,0 +1,98 @@
+/*
+ Copyright (C) 2011 Red Hat, Inc.
+
+ This file is part of IcedTea.
+
+ IcedTea is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 2.
+
+ IcedTea is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with IcedTea; see the file COPYING. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library. Thus, the terms and
+ conditions of the GNU General Public License cover the whole
+ combination.
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting executable under
+ terms of your choice, provided that you also meet, for each linked
+ independent module, the terms and conditions of the license of that
+ module. An independent module is a module which is not derived from
+ or based on this library. If you modify this library, you may extend
+ this exception to your version of the library, but you are not
+ obligated to do so. If you do not wish to do so, delete this
+ exception statement from your version.
+ */
+package net.sourceforge.jnlp;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class VersionTest {
+
+ private static boolean[] results = {true,
+ true,
+ false,
+ true,
+ false,
+ true,
+ false,
+ true,
+ false,
+ false,
+ false,
+ false,
+ true,
+ true,
+ true,
+ true,
+ true,
+ true,
+ false,
+ true};
+ private static Version jvms[] = {
+ new Version("1.1* 1.3*"),
+ new Version("1.2+"),};
+ private static Version versions[] = {
+ new Version("1.1"),
+ new Version("1.1.8"),
+ new Version("1.2"),
+ new Version("1.3"),
+ new Version("2.0"),
+ new Version("1.3.1"),
+ new Version("1.2.1"),
+ new Version("1.3.1-beta"),
+ new Version("1.1 1.2"),
+ new Version("1.2 1.3"),};
+
+ @Test
+ public void testMatches() {
+
+ int i = 0;
+ for (int j = 0; j < jvms.length; j++) {
+ for (int v = 0; v < versions.length; v++) {
+ i++;
+ String debugOutput = i + " " + jvms[j].toString() + " ";
+ if (!jvms[j].matches(versions[v])) {
+ debugOutput += "!";
+ }
+ debugOutput += "matches " + versions[v].toString();
+ ServerAccess.logOutputReprint(debugOutput);
+ Assert.assertEquals(results[i - 1], jvms[j].matches(versions[v]));
+ }
+ }
+
+
+ }
+}
diff -r 55c943c320fd -r 882d1bc0ff8f tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java
--- a/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java Thu May 02 15:31:55 2013 +0200
+++ b/tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java Thu May 02 16:05:57 2013 +0200
@@ -1,54 +1,70 @@
/* ResourceTrackerTest.java
-Copyright (C) 2012 Red Hat, Inc.
+ Copyright (C) 2012 Red Hat, Inc.
-This file is part of IcedTea.
+ This file is part of IcedTea.
-IcedTea is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 2.
+ IcedTea is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 2.
-IcedTea is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
+ IcedTea is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with IcedTea; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
+ You should have received a copy of the GNU General Public License
+ along with IcedTea; see the file COPYING. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library. Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library. Thus, the terms and
+ conditions of the GNU General Public License cover the whole
+ combination.
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module. An independent module is a module which is not derived from
-or based on this library. If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so. If you do not wish to do so, delete this
-exception statement from your version.
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting executable under
+ terms of your choice, provided that you also meet, for each linked
+ independent module, the terms and conditions of the license of that
+ module. An independent module is a module which is not derived from
+ or based on this library. If you modify this library, you may extend
More information about the distro-pkg-dev
mailing list