gmane.comp.java.openjdk.distro-packaging.devel
http://blog.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel
hourly11901-01-01T00:00+00:00Gmanehttp://gmane.org/img/gmane-25t.png
http://gmane.org
[rfc][icedtea-web] Ignore invalid .jar files specified for plugin
http://comments.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/18742
<pre>So, first patch that isn't something trivial, I'll definitely need
people to weigh in on this one.
The proprietary plug-in seems to just skip over any malformed .jar files
and carry on loading. This patch emulates that behaviour.
This alleviates some of the symptoms of
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1011
However, the plugin should still parse folders differently and look for
resources in folders like the proprietary plug-in does.
ChangeLog:
2012-05-25 Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Ignore invalid jar files, like the oracle plugin does.
* netx/net/sourceforge/jnlp/tools/JarCertVerifier.java: Added extra
possible verification result, INVALID_JAR. This value occurs if the
.jar file could not be properly loaded. The .jar file is then ignored.
</pre>Adam Domurad2012-05-25T19:17:48/hg/icedtea-web: Changed for-loops over iterators and indices to...
http://comments.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/18740
<pre>changeset 6df151bb5320 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=6df151bb5320
author: Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Fri May 25 11:44:13 2012 -0400
Changed for-loops over iterators and indices to for-each loops if they
were sufficient and clearer.
diffstat:
ChangeLog | 18 ++++
netx/net/sourceforge/jnlp/JNLPFile.java | 4 +-
netx/net/sourceforge/jnlp/PluginBridge.java | 4 +-
netx/net/sourceforge/jnlp/ResourcesDesc.java | 17 ++--
netx/net/sourceforge/jnlp/cache/CacheUtil.java | 31 ++++----
netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java | 8 +-
netx/net/sourceforge/jnlp/cache/Resource.java | 3 +-
netx/net/sourceforge/jnlp/cache/ResourceTracker.java | 37 ++++-----
netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java | 4 +-
netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java | 7 +-
plugin/icedteanp/java/netscape/javascript/JSObject.java | 11 +-
plugin/icedteanp/java/sun/applet/JavaConsole.java | 4 +-
plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java | 4 +-
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 22 ++--
14 files changed, 94 insertions(+), 80 deletions(-)
diffs (422 lines):
diff -r 082f04822f12 -r 6df151bb5320 ChangeLog
--- a/ChangeLogFri May 25 11:23:47 2012 -0400
+++ b/ChangeLogFri May 25 11:44:13 2012 -0400
< at >< at > -1,3 +1,21 < at >< at >
+2012-05-25 Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
+
+Changed for-loops over iterators and indices to for-each loops if they
+were sufficient and clearer.
+* netx/net/sourceforge/jnlp/JNLPFile.java: Changed for-loops that could
+be expressed more clearly as for-each loops.
+* netx/net/sourceforge/jnlp/PluginBridge.java: Same
+* netx/net/sourceforge/jnlp/ResourcesDesc.java: Same
+* netx/net/sourceforge/jnlp/cache/CacheUtil.java: Same
+* netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java: Same
+* netx/net/sourceforge/jnlp/cache/Resource.java: Same
+* netx/net/sourceforge/jnlp/cache/ResourceTracker.java: Same
+* netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java: Same
+* netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java: Same
+* plugin/icedteanp/java/netscape/javascript/JSObject.java: Same
+* plugin/icedteanp/java/sun/applet/JavaConsole.java: Same
+* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Same
+
2012-05-23 Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Removed instances of snprintf where buffer size was not known. Added
buffer size constant for allocating buffers for numeric conversions.
diff -r 082f04822f12 -r 6df151bb5320 netx/net/sourceforge/jnlp/JNLPFile.java
--- a/netx/net/sourceforge/jnlp/JNLPFile.javaFri May 25 11:23:47 2012 -0400
+++ b/netx/net/sourceforge/jnlp/JNLPFile.javaFri May 25 11:44:13 2012 -0400
< at >< at > -396,9 +396,7 < at >< at >
public <T> List<T> getResources(Class<T> launchType) {
List<T> result = new ArrayList<T>();
- for (int i = 0; i < resources.size(); i++) {
- ResourcesDesc rescDesc = resources.get(i);
-
+ for (ResourcesDesc rescDesc : resources) {
if (localMatches(locale, rescDesc.getLocales())
&& stringMatches(os, rescDesc.getOS())
&& stringMatches(arch, rescDesc.getArch()))
diff -r 082f04822f12 -r 6df151bb5320 netx/net/sourceforge/jnlp/PluginBridge.java
--- a/netx/net/sourceforge/jnlp/PluginBridge.javaFri May 25 11:23:47 2012 -0400
+++ b/netx/net/sourceforge/jnlp/PluginBridge.javaFri May 25 11:44:13 2012 -0400
< at >< at > -204,9 +204,7 < at >< at >
List<JARDesc> jarDescs = new ArrayList<JARDesc>();
jarDescs.addAll(sharedResources.getResources(JARDesc.class));
- Iterator<String> it = jars.iterator();
- while(it.hasNext()) {
- String name = it.next();
+ for (String name : jars) {
if (name.length() > 0)
jarDescs.add(new JARDesc(new URL(codeBase, name),
null, null, false, true, false, true));
diff -r 082f04822f12 -r 6df151bb5320 netx/net/sourceforge/jnlp/ResourcesDesc.java
--- a/netx/net/sourceforge/jnlp/ResourcesDesc.javaFri May 25 11:23:47 2012 -0400
+++ b/netx/net/sourceforge/jnlp/ResourcesDesc.javaFri May 25 11:44:13 2012 -0400
< at >< at > -75,9 +75,10 < at >< at >
public JARDesc getMainJAR() {
JARDesc jars[] = getJARs();
- for (int i = 0; i < jars.length; i++)
- if (jars[i].isMain())
- return jars[i];
+ for (JARDesc jar : jars) {
+ if (jar.isMain())
+ return jar;
+ }
if (jars.length > 0)
return jars[0];
< at >< at > -160,8 +161,7 < at >< at >
public Map<String, String> getPropertiesMap() {
Map<String, String> properties = new HashMap<String, String>();
List<PropertyDesc> resources = getResources(PropertyDesc.class);
- for (int i = 0; i < resources.size(); i++) {
- PropertyDesc prop = resources.get(i);
+ for (PropertyDesc prop : resources) {
properties.put(prop.getKey(), prop.getValue());
}
< at >< at > -205,9 +205,10 < at >< at >
public <T> List<T> getResources(Class<T> type) {
List<T> result = new ArrayList<T>();
- for (int i = 0; i < resources.size(); i++)
- if (type.isAssignableFrom(resources.get(i).getClass()))
- result.add(type.cast(resources.get(i)));
+ for (Object resource : resources) {
+ if (type.isAssignableFrom(resource.getClass()))
+ result.add(type.cast(resource));
+ }
return result;
}
diff -r 082f04822f12 -r 6df151bb5320 netx/net/sourceforge/jnlp/cache/CacheUtil.java
--- a/netx/net/sourceforge/jnlp/cache/CacheUtil.javaFri May 25 11:23:47 2012 -0400
+++ b/netx/net/sourceforge/jnlp/cache/CacheUtil.javaFri May 25 11:44:13 2012 -0400
< at >< at > -500,9 +500,9 < at >< at >
// only resources not starting out downloaded are displayed
List<URL> urlList = new ArrayList<URL>();
- for (int i = 0; i < resources.length; i++) {
- if (!tracker.checkResource(resources[i]))
- urlList.add(resources[i]);
+ for (URL url : resources) {
+ if (!tracker.checkResource(url))
+ urlList.add(url);
}
URL undownloaded[] = urlList.toArray(new URL[urlList.size()]);
< at >< at > -512,28 +512,29 < at >< at >
long read = 0;
long total = 0;
- for (int i = 0; i < undownloaded.length; i++) {
+ for (URL url : undownloaded) {
// add in any -1's; they're insignificant
- total += tracker.getTotalSize(undownloaded[i]);
- read += tracker.getAmountRead(undownloaded[i]);
+ total += tracker.getTotalSize(url);
+ read += tracker.getAmountRead(url);
}
int percent = (int) ((100 * read) / Math.max(1, total));
- for (int i = 0; i < undownloaded.length; i++)
- listener.progress(undownloaded[i], "version",
- tracker.getAmountRead(undownloaded[i]),
- tracker.getTotalSize(undownloaded[i]),
+ for (URL url : undownloaded) {
+ listener.progress(url, "version",
+ tracker.getAmountRead(url),
+ tracker.getTotalSize(url),
percent);
+ }
} while (!tracker.waitForResources(resources, indicator.getUpdateRate()));
// make sure they read 100% until indicator closes
- for (int i = 0; i < undownloaded.length; i++)
- listener.progress(undownloaded[i], "version",
- tracker.getTotalSize(undownloaded[i]),
- tracker.getTotalSize(undownloaded[i]),
+ for (URL url : undownloaded) {
+ listener.progress(url, "version",
+ tracker.getTotalSize(url),
+ tracker.getTotalSize(url),
100);
-
+ }
} catch (InterruptedException ex) {
if (JNLPRuntime.isDebug())
ex.printStackTrace();
diff -r 082f04822f12 -r 6df151bb5320 netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java
--- a/netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.javaFri May 25 11:23:47 2012 -0400
+++ b/netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.javaFri May 25 11:44:13 2012 -0400
< at >< at > -106,9 +106,11 < at >< at >
frame.getContentPane().setLayout(new GridBagLayout());
}
- if (resources != null)
- for (int i = 0; i < resources.length; i++)
- result.addProgressPanel(resources[i], null);
+ if (resources != null) {
+ for (URL url : resources) {
+ result.addProgressPanel(url, null);
+ }
+ }
frame.getContentPane().add(result, vertical);
frame.pack();
diff -r 082f04822f12 -r 6df151bb5320 netx/net/sourceforge/jnlp/cache/Resource.java
--- a/netx/net/sourceforge/jnlp/cache/Resource.javaFri May 25 11:23:47 2012 -0400
+++ b/netx/net/sourceforge/jnlp/cache/Resource.javaFri May 25 11:44:13 2012 -0400
< at >< at > -272,8 +272,7 < at >< at >
send = trackers.hardList();
}
- for (int i = 0; i < send.size(); i++) {
- ResourceTracker rt = send.get(i);
+ for (ResourceTracker rt : send) {
rt.fireDownloadEvent(this);
}
}
diff -r 082f04822f12 -r 6df151bb5320 netx/net/sourceforge/jnlp/cache/ResourceTracker.java
--- a/netx/net/sourceforge/jnlp/cache/ResourceTracker.javaFri May 25 11:23:47 2012 -0400
+++ b/netx/net/sourceforge/jnlp/cache/ResourceTracker.javaFri May 25 11:44:13 2012 -0400
< at >< at > -331,13 +331,13 < at >< at >
}
DownloadEvent event = new DownloadEvent(this, resource);
- for (int i = 0; i < l.length; i++) {
+ for (DownloadListener dl : l) {
if (0 != ((ERROR | DOWNLOADED) & status))
- l[i].downloadCompleted(event);
+ dl.downloadCompleted(event);
else if (0 != (DOWNLOADING & status))
- l[i].downloadStarted(event);
+ dl.downloadStarted(event);
else if (0 != (CONNECTING & status))
- l[i].updateStarted(event);
+ dl.updateStarted(event);
}
}
< at >< at > -449,8 +449,9 < at >< at >
synchronized (resources) {
// keep the lock so getResource doesn't have to aquire it each time
- for (int i = 0; i < urls.length; i++)
+ for (int i = 0; i < urls.length; i++) {
resources[i] = getResource(urls[i]);
+ }
}
if (resources.length > 0)
< at >< at > -868,8 +869,7 < at >< at >
resource.toString() + " : " + urls);
}
URL bestUrl = null;
- for (int i = 0; i < urls.size(); i++) {
- URL url = urls.get(i);
+ for (URL url : urls) {
try {
URLConnection connection = url.openConnection();
connection.addRequestProperty("Accept-Encoding", "pack200-gzip, gzip");
< at >< at > -999,8 +999,7 < at >< at >
Resource result = null;
int score = Integer.MAX_VALUE;
- for (int i = 0; i < source.size(); i++) {
- Resource resource = source.get(i);
+ for (Resource resource : source) {
boolean selectable = false;
synchronized (resource) {
< at >< at > -1011,9 +1010,10 < at >< at >
if (selectable) {
int activeCount = 0;
- for (int j = 0; j < active.size(); j++)
- if (active.get(j) == resource.getTracker())
+ for (ResourceTracker rt : active) {
+ if (rt == resource.getTracker())
activeCount++;
+ }
// try to spread out the downloads so that a slow host
// won't monopolize the downloads
< at >< at > -1034,9 +1034,7 < at >< at >
*/
private Resource getResource(URL location) {
synchronized (resources) {
- for (int i = 0; i < resources.size(); i++) {
- Resource resource = resources.get(i);
-
+ for (Resource resource : resources) {
if (CacheUtil.urlEquals(resource.location, location))
return resource;
}
< at >< at > -1058,8 +1056,9 < at >< at >
long startTime = System.currentTimeMillis();
// start them downloading / connecting in background
- for (int i = 0; i < resources.length; i++)
- startResource(resources[i]);
+ for (Resource resource : resources) {
+ startResource(resource);
+ }
// wait for completion
while (true) {
< at >< at > -1067,11 +1066,11 < at >< at >
synchronized (lock) {
// check for completion
- for (int i = 0; i < resources.length; i++) {
+ for (Resource resource : resources) {
//NetX Deadlocking may be solved by removing this
//synch block.
- synchronized (resources[i]) {
- if (!resources[i].isSet(DOWNLOADED | ERROR)) {
+ synchronized (resource) {
+ if (!resource.isSet(DOWNLOADED | ERROR)) {
finished = false;
break;
}
diff -r 082f04822f12 -r 6df151bb5320 netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java
--- a/netx/net/sourceforge/jnlp/runtime/AppletEnvironment.javaFri May 25 11:23:47 2012 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/AppletEnvironment.javaFri May 25 11:44:13 2012 -0400
< at >< at > -116,8 +116,8 < at >< at >
destroyed = true;
List<AppletAudioClip> clips = weakClips.hardList();
- for (int i = 0; i < clips.size(); i++) {
- clips.get(i).dispose();
+ for (AppletAudioClip clip : clips) {
+ clip.dispose();
}
}
diff -r 082f04822f12 -r 6df151bb5320 netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java
--- a/netx/net/sourceforge/jnlp/runtime/ApplicationInstance.javaFri May 25 11:23:47 2012 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/ApplicationInstance.javaFri May 25 11:44:13 2012 -0400
< at >< at > -231,8 +231,8 < at >< at >
PrivilegedAction<Object> installProps = new PrivilegedAction<Object>() {
public Object run() {
- for (int i = 0; i < props.length; i++) {
- System.setProperty(props[i].getKey(), props[i].getValue());
+ for (PropertyDesc propDesc : props) {
+ System.setProperty(propDesc.getKey(), propDesc.getValue());
}
return null;
< at >< at > -272,8 +272,7 < at >< at >
try {
// destroy resources
- for (int i = 0; i < weakWindows.size(); i++) {
- Window w = weakWindows.get(i);
+ for (Window w : weakWindows) {
if (w != null)
w.dispose();
}
diff -r 082f04822f12 -r 6df151bb5320 plugin/icedteanp/java/netscape/javascript/JSObject.java
--- a/plugin/icedteanp/java/netscape/javascript/JSObject.javaFri May 25 11:23:47 2012 -0400
+++ b/plugin/icedteanp/java/netscape/javascript/JSObject.javaFri May 25 11:44:13 2012 -0400
< at >< at > -130,9 +130,9 < at >< at >
StackTraceElement[] stack = Thread.currentThread().getStackTrace();
boolean mayProceed = false;
- for (int i = 0; i < stack.length; i++) {
- if (stack[i].getClassName().equals("netscape.javascript.JSObject") &&
- stack[i].getMethodName().equals("getWindow")) {
+ for (StackTraceElement element : stack) {
+ if (element.getClassName().equals("netscape.javascript.JSObject") &&
+ element.getMethodName().equals("getWindow")) {
mayProceed = true;
}
}
< at >< at > -209,8 +209,9 < at >< at >
args = new Object[0];
PluginDebug.debug("JSObject.call ", methodName);
- for (int i = 0; i < args.length; i++)
- PluginDebug.debug(" ", args[i]);
+ for (Object arg : args) {
+ PluginDebug.debug(" ", arg);
+ }
PluginDebug.debug("");
return PluginAppletViewer.call(internal, methodName, args);
}
diff -r 082f04822f12 -r 6df151bb5320 plugin/icedteanp/java/sun/applet/JavaConsole.java
--- a/plugin/icedteanp/java/sun/applet/JavaConsole.javaFri May 25 11:23:47 2012 -0400
+++ b/plugin/icedteanp/java/sun/applet/JavaConsole.javaFri May 25 11:44:13 2012 -0400
< at >< at > -308,8 +308,8 < at >< at >
boolean toShowConsole = false;
- for (int i = 0; i < args.length; i++) {
- if (args[i] == "--show-console") {
+ for (String arg : args) {
+ if ("--show-console".equals(arg)) {
toShowConsole = true;
}
}
diff -r 082f04822f12 -r 6df151bb5320 plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.javaFri May 25 11:23:47 2012 -0400
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.javaFri May 25 11:44:13 2012 -0400
< at >< at > -1295,9 +1295,7 < at >< at >
Permissions grantedPermissions = new Permissions();
- for (int i = 0; i < nsPrivilegeList.length; i++) {
- String privilege = nsPrivilegeList[i];
-
+ for (String privilege : nsPrivilegeList) {
if (privilege.equals("UniversalBrowserRead")) {
BrowserReadPermission bp = new BrowserReadPermission();
grantedPermissions.add(bp);
diff -r 082f04822f12 -r 6df151bb5320 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.javaFri May 25 11:23:47 2012 -0400
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.javaFri May 25 11:44:13 2012 -0400
< at >< at > -237,27 +237,27 < at >< at >
// ","-separated list. No error-checking will be done on the list.
String[] events = eventList.split(",");
- for (int i = 0; i < events.length; i++) {
- PluginDebug.debug("Adding event to queue: ", events[i]);
- if (events[i].equals("dispose"))
+ for (String event : events) {
+ PluginDebug.debug("Adding event to queue: ", event);
+ if ("dispose".equals(event))
panel.sendEvent(AppletPanel.APPLET_DISPOSE);
- else if (events[i].equals("load"))
+ else if ("load".equals(event))
panel.sendEvent(AppletPanel.APPLET_LOAD);
- else if (events[i].equals("init"))
+ else if ("init".equals(event))
panel.sendEvent(AppletPanel.APPLET_INIT);
- else if (events[i].equals("start"))
+ else if ("start".equals(event))
panel.sendEvent(AppletPanel.APPLET_START);
- else if (events[i].equals("stop"))
+ else if ("stop".equals(event))
panel.sendEvent(AppletPanel.APPLET_STOP);
- else if (events[i].equals("destroy"))
+ else if ("destroy".equals(event))
panel.sendEvent(AppletPanel.APPLET_DESTROY);
- else if (events[i].equals("quit"))
+ else if ("quit".equals(event))
panel.sendEvent(AppletPanel.APPLET_QUIT);
- else if (events[i].equals("error"))
+ else if ("error".equals(event))
panel.sendEvent(AppletPanel.APPLET_ERROR);
else
// non-fatal error if we get an unrecognized event
- PluginDebug.debug("Unrecognized event name: ", events[i]);
+ PluginDebug.debug("Unrecognized event name: ", event);
}
while (!panel.emptyEventQueue())
</pre>adomurad-HMOWzH9t1bryS2n3IP37Vh1hho49/T1E< at >public.gmane.org2012-05-25T15:44:55/hg/icedtea-web: Introduced constant NUM_STR_BUFFER_SIZE to repl...
http://comments.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/18739
<pre>changeset 082f04822f12 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=082f04822f12
author: Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Fri May 25 11:23:47 2012 -0400
Introduced constant NUM_STR_BUFFER_SIZE to replace magic constants.
Clarified some uses of snprintf.
diffstat:
ChangeLog | 13 ++++
plugin/icedteanp/IcedTeaNPPlugin.cc | 6 +-
plugin/icedteanp/IcedTeaPluginUtils.cc | 106 +++++++++++++++-----------------
plugin/icedteanp/IcedTeaPluginUtils.h | 4 +
4 files changed, 71 insertions(+), 58 deletions(-)
diffs (199 lines):
diff -r 9d422db340b8 -r 082f04822f12 ChangeLog
--- a/ChangeLogFri May 25 10:34:24 2012 -0400
+++ b/ChangeLogFri May 25 11:23:47 2012 -0400
< at >< at > -1,3 +1,16 < at >< at >
+2012-05-23 Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
+Removed instances of snprintf where buffer size was not known. Added
+buffer size constant for allocating buffers for numeric conversions.
+* plugin/icedteanp/IcedTeaNPPlugin.cc: Removed usage of snprintf for
+simple blanking of strings. Buffer size was misguided previously.
+Used NUM_STR_BUFFER_SIZE constant to replace magic numbers/
+* plugin/icedteanp/IcedTeaPluginUtils.cc: Made
+NPVariantToString(NPVariant variant, std::string* result) use two
+space indentation. Used NUM_STR_BUFFER_SIZE constant to replace magic
+numbers.
+* plugin/icedteanp/IcedTeaPluginUtils.h: Added constant,
+NUM_STR_BUFFER_SIZE.
+
2012-05-24 Danesh Dadachanji <ddadacha-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Fix use of src dir instead of build dir when whitelisting.
diff -r 9d422db340b8 -r 082f04822f12 plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.ccFri May 25 10:34:24 2012 -0400
+++ b/plugin/icedteanp/IcedTeaNPPlugin.ccFri May 25 11:23:47 2012 -0400
< at >< at > -1227,9 +1227,9 < at >< at >
{
// clear the "instance X status" parts
- snprintf(parts[0], sizeof(""), "");
- snprintf(parts[1], sizeof(""), "");
- snprintf(parts[2], sizeof(""), "");
+ strcpy(parts[0], "");
+ strcpy(parts[1], "");
+ strcpy(parts[2], "");
// join the rest
gchar* status_message = g_strjoinv(" ", parts);
diff -r 9d422db340b8 -r 082f04822f12 plugin/icedteanp/IcedTeaPluginUtils.cc
--- a/plugin/icedteanp/IcedTeaPluginUtils.ccFri May 25 10:34:24 2012 -0400
+++ b/plugin/icedteanp/IcedTeaPluginUtils.ccFri May 25 11:23:47 2012 -0400
< at >< at > -146,16 +146,15 < at >< at >
void
IcedTeaPluginUtilities::JSIDToString(void* id, std::string* result)
{
-
-char id_str[20]; // max = long long = 8446744073709551615 == 19 chars
+char id_str[NUM_STR_BUFFER_SIZE];
if (sizeof(void*) == sizeof(long long))
{
-snprintf(id_str, sizeof(id_str), "%llu", id);
+snprintf(id_str, NUM_STR_BUFFER_SIZE, "%llu", id);
}
else
{
-snprintf(id_str, sizeof(id_str), "%lu", id); // else use long
+snprintf(id_str, NUM_STR_BUFFER_SIZE, "%lu", id); // else use long
}
result->append(id_str);
< at >< at > -256,9 +255,8 < at >< at >
void
IcedTeaPluginUtilities::itoa(int i, std::string* result)
{
-// largest possible integer is 10 digits long
-char int_str[11];
-snprintf(int_str, sizeof(int_str), "%d", i);
+char int_str[NUM_STR_BUFFER_SIZE];
+snprintf(int_str, NUM_STR_BUFFER_SIZE, "%d", i);
result->append(int_str);
}
< at >< at > -368,12 +366,11 < at >< at >
ostream << length;
-// UTF-8 characters are 4-bytes max + space + '\0'
-char hex_value[10];
+char hex_value[NUM_STR_BUFFER_SIZE];
for (int i = 0; i < str->length(); i++)
{
-snprintf(hex_value, sizeof(hex_value)," %hx", str->at(i));
+snprintf(hex_value, NUM_STR_BUFFER_SIZE," %hx", str->at(i));
ostream << hex_value;
}
< at >< at > -679,54 +676,53 < at >< at >
void
IcedTeaPluginUtilities::NPVariantToString(NPVariant variant, std::string* result)
{
-char str[32]; // enough for everything except string
-char* largestr = NULL;
-
- if (NPVARIANT_IS_VOID(variant))
- {
- snprintf(str, sizeof(str), "%p", variant);
- }
- else if (NPVARIANT_IS_NULL(variant))
- {
- snprintf(str, sizeof(str), "NULL");
- }
- else if (NPVARIANT_IS_BOOLEAN(variant))
- {
- if (NPVARIANT_TO_BOOLEAN(variant))
- snprintf(str, sizeof(str), "true");
- else
- snprintf(str, sizeof(str), "false");
- }
- else if (NPVARIANT_IS_INT32(variant))
- {
- snprintf(str, sizeof(str), "%d", NPVARIANT_TO_INT32(variant));
- }
- else if (NPVARIANT_IS_DOUBLE(variant))
- {
- snprintf(str, sizeof(str), "%f", NPVARIANT_TO_DOUBLE(variant));;
- }
- else if (NPVARIANT_IS_STRING(variant))
- {
+ char str[NUM_STR_BUFFER_SIZE]; // enough for everything except string
+ char* largestr = NULL;
+ if (NPVARIANT_IS_VOID(variant))
+ {
+ snprintf(str, NUM_STR_BUFFER_SIZE, "%p", variant);
+ }
+ else if (NPVARIANT_IS_NULL(variant))
+ {
+ snprintf(str, NUM_STR_BUFFER_SIZE, "NULL");
+ }
+ else if (NPVARIANT_IS_BOOLEAN(variant))
+ {
+ if (NPVARIANT_TO_BOOLEAN(variant))
+ snprintf(str, NUM_STR_BUFFER_SIZE, "true");
+ else
+ snprintf(str, NUM_STR_BUFFER_SIZE, "false");
+ }
+ else if (NPVARIANT_IS_INT32(variant))
+ {
+ snprintf(str, NUM_STR_BUFFER_SIZE, "%d", NPVARIANT_TO_INT32(variant));
+ }
+ else if (NPVARIANT_IS_DOUBLE(variant))
+ {
+ snprintf(str, NUM_STR_BUFFER_SIZE, "%f", NPVARIANT_TO_DOUBLE(variant));
+ }
+ else if (NPVARIANT_IS_STRING(variant))
+ {
#if MOZILLA_VERSION_COLLAPSED < 1090200
- size_t buffersize = sizeof(char)*NPVARIANT_TO_STRING(variant).utf8length;
- largestr = (char*) malloc(buffersize);
- snprintf(str, buffersize, "%s", NPVARIANT_TO_STRING(variant).utf8characters);
+ size_t buffersize = sizeof(char)*NPVARIANT_TO_STRING(variant).utf8length;
+ largestr = (char*) malloc(buffersize);
+ snprintf(str, buffersize, "%s", NPVARIANT_TO_STRING(variant).utf8characters);
#else
- size_t buffersize = sizeof(char)*NPVARIANT_TO_STRING(variant).UTF8Length;
- largestr = (char*) malloc(buffersize);
- snprintf(str, buffersize, "%s", NPVARIANT_TO_STRING(variant).UTF8Characters);
+ size_t buffersize = sizeof(char)*NPVARIANT_TO_STRING(variant).UTF8Length;
+ largestr = (char*) malloc(buffersize);
+ snprintf(str, buffersize, "%s", NPVARIANT_TO_STRING(variant).UTF8Characters);
#endif
- }
- else
- {
- snprintf(str, sizeof(str), "[Object %p]", variant);
- }
- if (largestr != NULL){
- result->append(largestr);
- free(largestr);
- } else {
- result->append(str);
- }
+ }
+ else
+ {
+ snprintf(str, NUM_STR_BUFFER_SIZE, "[Object %p]", variant);
+ }
+ if (largestr != NULL){
+ result->append(largestr);
+ free(largestr);
+ } else {
+ result->append(str);
+ }
}
bool
diff -r 9d422db340b8 -r 082f04822f12 plugin/icedteanp/IcedTeaPluginUtils.h
--- a/plugin/icedteanp/IcedTeaPluginUtils.hFri May 25 10:34:24 2012 -0400
+++ b/plugin/icedteanp/IcedTeaPluginUtils.hFri May 25 11:23:47 2012 -0400
< at >< at > -96,6 +96,10 < at >< at >
(*c >= 'a' && *c <= 'f') || \
(*c >= 'A' && *c <= 'F'))
+//long long max ~ 19 chars + terminator
+//leave some room for converting strings like "<var> = %d"
+const size_t NUM_STR_BUFFER_SIZE = 32;
+
/*
* This struct holds data specific to a Java operation requested by the plugin
*/
</pre>adomurad-HMOWzH9t1bryS2n3IP37Vh1hho49/T1E< at >public.gmane.org2012-05-25T15:24:26vm_start_mutex use in IcedTeaNPPlugin.cc looks fishy
http://comments.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/18737
<pre>The usage of "vm_start_mutex" in IcedTeaNPPlugin.cc looks buggy to me.
Won't each thread just create and lock it's own mutex, thereby voiding the
raison d'être of the mutex?
Martin
</pre>Martin Olsson2012-05-23T14:50:19[PATCH] fix mutex related crash + cleanup .hgignore
http://comments.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/18735
<pre>Two patches for icedtea-web attached.</pre>Martin Olsson2012-05-23T14:46:58which package do I need to avoid: "package org.junit does not exist"
http://comments.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/18734
<pre>When I try to run tests using:
rm -rf ~/ice
mkdir ~/ice
./autogen.sh
./configure --prefix=/home/molsson/ice
--with-jdk-home=/usr/lib/jvm/java-6-openjdk-amd64
make
make check
make install
make run-netx-dist-tests
Then I get this error:
tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ResourcesTest.java:42:
package org.junit does not exist
Full error:
http://pastebin.com/4MTg03ni
...I assume I need to install some missing package (junit?), any ideas on
which one? I'm on Ubuntu 12.04
</pre>Martin Olsson2012-05-23T14:45:06/hg/icedtea-web: Fix whitelisting to use src dir instead of buil...
http://comments.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/18731
<pre>changeset 9d422db340b8 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=9d422db340b8
author: Danesh Dadachanji <ddadacha-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Fri May 25 10:34:24 2012 -0400
Fix whitelisting to use src dir instead of build dir.
diffstat:
ChangeLog | 6 ++++++
Makefile.am | 2 +-
2 files changed, 7 insertions(+), 1 deletions(-)
diffs (25 lines):
diff -r 2c84a314c411 -r 9d422db340b8 ChangeLog
--- a/ChangeLogThu May 24 15:37:30 2012 -0400
+++ b/ChangeLogFri May 25 10:34:24 2012 -0400
< at >< at > -1,3 +1,9 < at >< at >
+2012-05-24 Danesh Dadachanji <ddadacha-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
+
+Fix use of src dir instead of build dir when whitelisting.
+* Makefile.am (REPRODUCERS_CLASS_WHITELIST): Use abs_top_srcdir
+instead of abs_top_builddir.
+
2012-05-23 Martin Olsson <martin-Gwph8TgvYLDLoDKTGw+V6w< at >public.gmane.org>
* plugin/icedteanp/IcedTeaPluginUtils.cc:
diff -r 2c84a314c411 -r 9d422db340b8 Makefile.am
--- a/Makefile.amThu May 24 15:37:30 2012 -0400
+++ b/Makefile.amFri May 25 10:34:24 2012 -0400
< at >< at > -32,7 +32,7 < at >< at >
JUNIT_RUNNER_JAR=$(abs_top_builddir)/junit-runner.jar
UNIT_CLASS_NAMES = $(abs_top_builddir)/unit_class_names
REPRODUCERS_CLASS_NAMES = $(abs_top_builddir)/reproducers_class_names
-REPRODUCERS_CLASS_WHITELIST = $(abs_top_builddir)/netx-dist-tests-whitelist
+REPRODUCERS_CLASS_WHITELIST = $(abs_top_srcdir)/netx-dist-tests-whitelist
EMMA_JAVA_ARGS=-Xmx2G
META_MANIFEST = META-INF/MANIFEST.MF
</pre>ddadacha-HMOWzH9t1bryS2n3IP37Vh1hho49/T1E< at >public.gmane.org2012-05-25T14:35:06[rfc][icedtea-web] Simple for-each loop style patch
http://comments.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/18729
<pre>Hey all. I find the for-each syntax that Java 1.5 to be pretty clear in
intent when it comes to data structure iteration. I went through the
code and changed some occurrences of explicit index/iterator loops to
for-each.
OK for HEAD ? (Ran with run-netx-dist-tests with 21/104 failures)
Changelog:
2012-05-25 Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Changed for-loops over iterators and indices to for-each loops if they
were sufficient and clearer.
*netx/net/sourceforge/jnlp/JNLPFile.java: Changed for-loops that could
be expressed more clearly as for-each loops.
*netx/net/sourceforge/jnlp/PluginBridge.java: Same
*netx/net/sourceforge/jnlp/ResourcesDesc.java: Same
*netx/net/sourceforge/jnlp/cache/CacheUtil.java: Same
*netx/net/sourceforge/jnlp/cache/DefaultDownloadIndicator.java: Same
*netx/net/sourceforge/jnlp/cache/Resource.java: Same
*netx/net/sourceforge/jnlp/cache/ResourceTracker.java: Same
*netx/net/sourceforge/jnlp/runtime/AppletEnvironment.java: Same
*netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java: Same
*plugin/icedteanp/java/netscape/javascript/JSObject.java: Same
*plugin/icedteanp/java/sun/applet/JavaConsole.java: Same
*plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Same
</pre>Adam Domurad2012-05-25T13:56:22/hg/icedtea7: Bump to OpenJDK7u6 b10.
http://comments.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/18728
<pre>changeset 2c3c929e038c in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=2c3c929e038c
author: Andrew John Hughes <ahughes-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Fri May 25 14:04:55 2012 +0100
Bump to OpenJDK7u6 b10.
2012-05-25 Andrew John Hughes <ahughes-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
* Makefile.am:
(OPENJDK_VERSION): Bump to b10.
(JDK_UPDATE_VERSION): Bump to u6.
(CORBA_CHANGESET): Update to IcedTea7 forest head.
(HOTSPOT_CHANGESET): Likewise.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(HOTSPOT_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(STRIP_POLICY): Changed from ALT_STRIP_POLICY
due to upstream changes.
* patches/boot/ecj-diamond.patch:
Recreated, new case added in java.io.FileDescriptor.
* patches/boot/ecj-trywithresources.patch:
New case added (also in java.io.FileDescriptor).
* patches/boot/hotspot-jdk-dependency.patch:
Recreated.
* patches/boot/use_target_6_for_bootstrap_classes.patch,
Added new case in sun.security.action (caused timezone
generation application to fail, presumably due to variable
moving from private to package-private).
diffstat:
ChangeLog | 30 +
Makefile.am | 34 +-
patches/boot/ecj-diamond.patch | 1016 ++++++++--------
patches/boot/ecj-trywithresources.patch | 190 +-
patches/boot/hotspot-jdk-dependency.patch | 12 +-
patches/boot/use_target_6_for_bootstrap_classes.patch | 13 +
6 files changed, 683 insertions(+), 612 deletions(-)
diffs (truncated from 3375 to 500 lines):
diff -r 9d852f22c417 -r 2c3c929e038c ChangeLog
--- a/ChangeLogWed May 23 20:07:09 2012 +0100
+++ b/ChangeLogFri May 25 14:04:55 2012 +0100
< at >< at > -1,3 +1,33 < at >< at >
+2012-05-25 Andrew John Hughes <ahughes-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
+
+* Makefile.am:
+(OPENJDK_VERSION): Bump to b10.
+(JDK_UPDATE_VERSION): Bump to u6.
+(CORBA_CHANGESET): Update to IcedTea7 forest head.
+(HOTSPOT_CHANGESET): Likewise.
+(JAXP_CHANGESET): Likewise.
+(JAXWS_CHANGESET): Likewise.
+(JDK_CHANGESET): Likewise.
+(LANGTOOLS_CHANGESET): Likewise.
+(OPENJDK_CHANGESET): Likewise.
+(CORBA_SHA256SUM): Likewise.
+(HOTSPOT_SHA256SUM): Likewise.
+(JAXP_SHA256SUM): Likewise.
+(JAXWS_SHA256SUM): Likewise.
+(JDK_SHA256SUM): Likewise.
+(STRIP_POLICY): Changed from ALT_STRIP_POLICY
+due to upstream changes.
+* patches/boot/ecj-diamond.patch:
+Recreated, new case added in java.io.FileDescriptor.
+* patches/boot/ecj-trywithresources.patch:
+New case added (also in java.io.FileDescriptor).
+* patches/boot/hotspot-jdk-dependency.patch:
+Recreated.
+* patches/boot/use_target_6_for_bootstrap_classes.patch,
+Added new case in sun.security.action (caused timezone
+generation application to fail, presumably due to variable
+moving from private to package-private).
+
2012-05-23 Andrew John Hughes <ahughes-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
* Makefile.am:
diff -r 9d852f22c417 -r 2c3c929e038c Makefile.am
--- a/Makefile.amWed May 23 20:07:09 2012 +0100
+++ b/Makefile.amFri May 25 14:04:55 2012 +0100
< at >< at > -1,24 +1,24 < at >< at >
# Dependencies
-OPENJDK_VERSION = b13
-JDK_UPDATE_VERSION = 04
+OPENJDK_VERSION = b10
+JDK_UPDATE_VERSION = 06
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
-CORBA_CHANGESET = 139542079986
-HOTSPOT_CHANGESET = 5be91de8b779
-JAXP_CHANGESET = 10808c0ac008
-JAXWS_CHANGESET = 06cd92271215
-JDK_CHANGESET = bba3b86618d0
-LANGTOOLS_CHANGESET = 8634c8f95ff7
-OPENJDK_CHANGESET = 6670fad22684
+CORBA_CHANGESET = f60db5e849b2
+HOTSPOT_CHANGESET = 09d95d97bb19
+JAXP_CHANGESET = ac8bf0b8bd4a
+JAXWS_CHANGESET = 2d41be955e9b
+JDK_CHANGESET = 3f748460de83
+LANGTOOLS_CHANGESET = 93e9eae30c44
+OPENJDK_CHANGESET = f51ab5aecdc8
-CORBA_SHA256SUM = ebc23393b46ae9bcbf0b231ce0b6e58dfb94a82861c5c52d6189c936328614cd
-HOTSPOT_SHA256SUM = babb11cf54c6299fe2f0730968316958b71a1dd5e7c2d5d698ac7d905bfc2ccc
-JAXP_SHA256SUM = a8c600e3419d8586acb3f7f444bea399aac174d58f2127cb4c0a3ffd3cffdd17
-JAXWS_SHA256SUM = f896fbc4dd9eeb68015afe0378638fc646b9b08047cf9c382a33542f44454def
-JDK_SHA256SUM = 63a5b6f565ca793371ebc9f46026e978bc7eee36d1849e61a2b9d470b0add300
-LANGTOOLS_SHA256SUM = bad80067828740510fe8f7c430dfb90d1ec1c895a93fa56b16d8223a8c757bd3
-OPENJDK_SHA256SUM = 5256c8e7c9144ff8a23e83574a82a42874c4c7722057e8194ceb70fe15a5de06
+CORBA_SHA256SUM = b850b59422c9b73bc99df5f3457bdff71358b9ff7064adb84f13f2f3ee2df708
+HOTSPOT_SHA256SUM = e4fe84a920df0971babfbab338faaa0db447d173099f4333c24f92f4a65410f0
+JAXP_SHA256SUM = 4c0b3377556674b52fa6e9ddbd20e60426bf8e65806b8bbce5104f90a445b8e6
+JAXWS_SHA256SUM = c013e3311af9858016f348e38e84d727222b0097fe9737320f57d1ea7269331a
+JDK_SHA256SUM = 67f7f4042e7008753acf4dd5f482b84ef0b5b8f0538aff3fe5670da47e49b32b
+LANGTOOLS_SHA256SUM = fc7d8adf15de321622153732a81d2e37fd89d3aa0b44986898e8fcdceac85b85
+OPENJDK_SHA256SUM = e53301a75d5ce44dbb7a3e3202c797f155755f6d688d0dde4ed6e9d8e87855c8
CACAO_VERSION = a567bcb7f589
CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9
< at >< at > -437,7 +437,7 < at >< at >
USE_SYSTEM_CUPS="true" \
CUPS_LIBS="${CUPS_LIBS}" \
CUPS_CFLAGS="${CUPS_CFLAGS}" \
-ALT_STRIP_POLICY=no_strip
+STRIP_POLICY=no_strip
if ENABLE_CACAO
ICEDTEA_ENV += \
diff -r 9d852f22c417 -r 2c3c929e038c patches/boot/ecj-diamond.patch
--- a/patches/boot/ecj-diamond.patchWed May 23 20:07:09 2012 +0100
+++ b/patches/boot/ecj-diamond.patchFri May 25 14:04:55 2012 +0100
< at >< at > -1,6 +1,6 < at >< at >
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java2012-03-21 17:09:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java2012-03-22 11:28:14.027881166 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java2012-05-23 20:38:09.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java2012-05-23 22:43:01.731314647 +0100
< at >< at > -103,9 +103,9 < at >< at >
return this.def.compareTo(that.def);
}
< at >< at > -72,8 +72,8 < at >< at >
for (int i = 0; i < layout.length(); i++) {
if (layout.charAt(i++) != '[')
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java2012-03-22 11:18:05.190037791 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java2012-03-22 11:28:14.047881492 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java2012-05-23 22:28:08.716575342 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java2012-05-23 22:43:01.743314841 +0100
< at >< at > -257,7 +257,7 < at >< at >
assert(basicCodings[_meta_default] == null);
assert(basicCodings[_meta_canon_min] != null);
< at >< at > -142,8 +142,8 < at >< at >
return true;
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java2012-03-22 11:18:05.066035805 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java2012-03-22 11:28:14.047881492 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java2012-05-23 22:28:08.596573363 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java2012-05-23 22:43:01.743314841 +0100
< at >< at > -466,7 +466,7 < at >< at >
void readInnerClasses(Class cls) throws IOException {
< at >< at > -154,8 +154,8 < at >< at >
InnerClass ic =
new InnerClass(readClassRef(),
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java2012-03-21 17:09:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java2012-03-22 11:28:14.047881492 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java2012-05-23 20:38:09.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java2012-05-23 22:43:01.747314905 +0100
< at >< at > -743,9 +743,9 < at >< at >
// Steps 1/2/3 are interdependent, and may be iterated.
// Steps 4 and 5 may be decided independently afterward.
< at >< at > -192,8 +192,8 < at >< at >
if (popset.add(values[i])) popvals.add(values[i]);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java2012-03-21 17:09:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java2012-03-22 11:28:14.047881492 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java2012-05-23 20:38:09.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java2012-05-23 22:43:01.747314905 +0100
< at >< at > -402,7 +402,7 < at >< at >
private static Map<Coding, Coding> codeMap;
< at >< at > -204,8 +204,8 < at >< at >
Coding x1 = codeMap.get(x0);
if (x1 == null) codeMap.put(x0, x1 = x0);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java2012-03-21 17:09:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java2012-03-22 11:28:14.047881492 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java2012-05-23 20:38:09.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java2012-05-23 22:43:01.747314905 +0100
< at >< at > -915,7 +915,7 < at >< at >
public static
Index[] partition(Index ix, int[] keys) {
< at >< at > -234,8 +234,8 < at >< at >
Entry e = work.previous();
work.remove(); // pop stack
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java2012-03-22 11:18:05.190037791 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java2012-03-22 11:28:14.047881492 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java2012-05-23 22:28:08.716575342 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java2012-05-23 22:43:01.747314905 +0100
< at >< at > -59,7 +59,7 < at >< at >
ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource");
< at >< at > -273,8 +273,8 < at >< at >
for (String optline : options.split("\n")) {
String[] words = optline.split("\\p{Space}+");
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java2012-03-21 17:09:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java2012-03-22 11:28:14.047881492 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java2012-05-23 20:38:09.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java2012-05-23 22:43:01.747314905 +0100
< at >< at > -45,7 +45,7 < at >< at >
private final ArrayList<E> flist;
< at >< at > -285,8 +285,8 < at >< at >
for (int i = 0 ; i < capacity ; i++) {
flist.add(null);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java2012-03-21 17:09:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java2012-03-22 11:28:14.051881557 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java2012-05-23 20:38:09.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Fixups.java2012-05-23 22:43:01.747314905 +0100
< at >< at > -126,11 +126,11 < at >< at >
public void setBytes(byte[] newBytes) {
if (bytes == newBytes) return;
< at >< at > -311,8 +311,8 < at >< at >
static final int LOC_SHIFT = 1;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java2012-03-22 11:18:05.070035870 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java2012-03-22 11:28:14.051881557 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java2012-05-23 22:28:08.600573429 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java2012-05-23 22:43:01.747314905 +0100
< at >< at > -112,7 +112,7 < at >< at >
public static final Attribute.Layout attrSourceFileSpecial;
public static final Map<Attribute.Layout, Attribute> attrDefs;
< at >< at > -477,8 +477,8 < at >< at >
// Add to the end of ths list:
if (!fileSet.contains(cls.file))
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java2012-03-22 11:18:05.194037856 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java2012-03-22 11:28:14.051881557 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java2012-05-23 22:28:08.716575342 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java2012-05-23 22:43:01.747314905 +0100
< at >< at > -686,7 +686,7 < at >< at >
cp_Signature_classes.expectLength(getIntTotal(numSigClasses));
cp_Signature_classes.readFrom(in);
< at >< at > -592,8 +592,8 < at >< at >
ClassEntry thisClass = curClass.thisClass;
ClassEntry superClass = curClass.superClass;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java2012-03-22 11:18:05.194037856 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java2012-03-22 11:28:14.051881557 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java2012-05-23 22:28:08.724575474 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java2012-05-23 22:43:01.747314905 +0100
< at >< at > -116,7 +116,7 < at >< at >
int[][] attrCounts; // count attr. occurences
< at >< at > -649,8 +649,8 < at >< at >
for (Class cls : pkg.classes) {
if (!cls.hasInnerClasses()) continue;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java2012-03-21 17:09:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java2012-03-22 11:28:14.051881557 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java2012-05-23 20:38:09.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java2012-05-23 22:43:01.747314905 +0100
< at >< at > -181,8 +181,8 < at >< at >
final Map<Attribute.Layout, Attribute> attrDefs;
final Map<Attribute.Layout, String> attrCommands;
< at >< at > -681,8 +681,8 < at >< at >
for (JarEntry je : Collections.list(jf.entries())) {
InFile inFile = new InFile(jf, je);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java2012-03-21 17:09:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java2012-03-22 11:28:14.051881557 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java2012-05-23 20:38:09.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java2012-05-23 22:43:01.747314905 +0100
< at >< at > -309,7 +309,7 < at >< at >
// As each new value is added, we assert that the value
// was not already in the set.
< at >< at > -693,8 +693,8 < at >< at >
maxForDebug += fillp;
int min = Integer.MIN_VALUE; // farthest from the center
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java2012-03-22 11:18:05.194037856 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java2012-03-22 11:28:14.051881557 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java2012-05-23 22:28:08.724575474 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java2012-05-23 22:43:01.747314905 +0100
< at >< at > -47,8 +47,8 < at >< at >
*/
< at >< at > -716,8 +716,8 < at >< at >
while (res.remove(null));
return res;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java2012-03-21 17:09:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java2012-03-22 11:28:14.051881557 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java2012-05-23 20:38:09.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java2012-05-23 22:43:01.747314905 +0100
< at >< at > -58,12 +58,12 < at >< at >
private final Map<String, MemberEntry> memberEntries;
< at >< at > -738,8 +738,8 < at >< at >
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java2012-03-22 11:18:05.194037856 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java2012-03-22 11:28:14.051881557 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java2012-05-23 22:28:08.724575474 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java2012-05-23 22:43:01.747314905 +0100
< at >< at > -232,7 +232,7 < at >< at >
props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50");
pkg.ensureAllClassFiles();
< at >< at > -750,8 +750,8 < at >< at >
String name = file.nameString;
JarEntry je = new JarEntry(Utils.getJarEntryName(name));
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java2012-03-22 11:18:05.194037856 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java2012-03-22 11:28:14.051881557 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java2012-05-23 22:28:08.724575474 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java2012-05-23 22:43:01.747314905 +0100
< at >< at > -132,7 +132,7 < at >< at >
// Keep a TLS point to the global data and environment.
// This makes it simpler to supply environmental options
< at >< at > -762,8 +762,8 < at >< at >
// convenience methods to access the TL globals
static TLGlobals getTLGlobals() {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java2012-03-21 17:09:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java2012-03-22 11:28:14.055881623 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java2012-05-23 20:38:09.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java2012-05-23 22:43:01.751314972 +0100
< at >< at > -1284,7 +1284,7 < at >< at >
*/
public Collection<?> toCollection() throws SQLException {
< at >< at > -783,8 +783,8 < at >< at >
// create a copy
CachedRowSetImpl crsTemp;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java2012-03-21 17:09:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java2012-03-22 11:28:14.055881623 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java2012-05-23 20:38:09.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java2012-05-23 22:43:01.751314972 +0100
< at >< at > -222,7 +222,7 < at >< at >
// either of the setter methods have been set.
if(boolColId){
< at >< at > -795,8 +795,8 < at >< at >
if( (strMatchKey = (cRowset.getMatchColumnNames())[i]) != null) {
iMatchKey = cRowset.findColumn(strMatchKey);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java2012-03-21 17:09:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java2012-03-22 11:28:14.055881623 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java2012-05-23 20:38:09.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java2012-05-23 22:43:01.751314972 +0100
< at >< at > -99,10 +99,10 < at >< at >
throws UnsupportedCallbackException
{
< at >< at > -811,8 +811,8 < at >< at >
ConfirmationInfo confirmation = new ConfirmationInfo();
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java2012-03-21 17:09:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java2012-03-22 11:28:14.055881623 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java2012-05-23 20:38:09.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java2012-05-23 22:43:01.751314972 +0100
< at >< at > -152,7 +152,7 < at >< at >
// new configuration
< at >< at > -841,8 +841,8 < at >< at >
String value;
while (peek(";") == false) {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java2012-03-21 17:09:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java2012-03-22 11:28:14.055881623 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java2012-05-23 20:38:09.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java2012-05-23 22:43:01.751314972 +0100
< at >< at > -184,7 +184,7 < at >< at >
private UnixNumericUserPrincipal UIDPrincipal;
private UnixNumericGroupPrincipal GIDPrincipal;
< at >< at > -853,8 +853,8 < at >< at >
// initial state
private Subject subject;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java2012-03-21 17:09:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java2012-03-22 11:28:14.055881623 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java2012-05-23 20:38:09.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java2012-05-23 22:43:01.751314972 +0100
< at >< at > -658,7 +658,7 < at >< at >
throw new FailedLoginException(
"Unable to find X.509 certificate chain in keystore");
< at >< at > -865,8 +865,8 < at >< at >
certList.add(fromKeyStore[i]);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java2012-03-21 17:09:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java2012-03-22 11:28:14.055881623 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java2012-05-23 20:38:09.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java2012-05-23 22:43:01.751314972 +0100
< at >< at > -76,7 +76,7 < at >< at >
private SolarisNumericUserPrincipal UIDPrincipal;
private SolarisNumericGroupPrincipal GIDPrincipal;
< at >< at > -877,8 +877,8 < at >< at >
/**
* Initialize this <code>LoginModule</code>.
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java2012-03-21 17:09:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java2012-03-22 11:28:14.055881623 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java2012-05-23 20:38:09.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java2012-05-23 22:43:01.751314972 +0100
< at >< at > -70,7 +70,7 < at >< at >
private UnixNumericUserPrincipal UIDPrincipal;
private UnixNumericGroupPrincipal GIDPrincipal;
< at >< at > -889,8 +889,8 < at >< at >
/**
* Initialize this <code>LoginModule</code>.
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java2012-03-21 17:09:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java2012-03-22 11:28:14.055881623 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java2012-05-23 20:38:09.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java2012-05-23 22:43:01.751314972 +0100
< at >< at > -1180,7 +1180,7 < at >< at >
// Done
return certs;
< at >< at > -901,8 +901,8 < at >< at >
while (i < certs.length) {
userCertList.add(certs[i]);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java2012-03-21 17:09:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java2012-03-22 11:28:14.055881623 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java2012-05-23 20:38:09.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java2012-05-23 22:43:01.755315042 +0100
< at >< at > -59,7 +59,7 < at >< at >
// Maps ThreadReference to ThreadTrace instances
< at >< at > -913,8 +913,8 < at >< at >
EventThread(VirtualMachine vm, String[] excludes, PrintWriter writer) {
super("event-handler");
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java
---- openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java2012-03-21 17:09:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java2012-03-22 11:28:14.055881623 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java2012-05-23 20:38:09.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java2012-05-23 22:43:01.755315042 +0100
< at >< at > -95,7 +95,7 < at >< at >
public final static int IGNORE_ALL_BEANINFO = 3;
< at >< at > -925,8 +925,8 < at >< at >
private Class beanClass;
private BeanInfo explicitBeanInfo;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java
---- openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java2012-03-21 17:09:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java2012-03-22 11:28:14.055881623 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java2012-05-23 20:38:09.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java2012-05-23 22:43:01.755315042 +0100
< at >< at > -42,7 +42,7 < at >< at >
*/
final class ThreadGroupContext {
< at >< at > -946,8 +946,8 < at >< at >
return this.beanInfoCache.put(type, info);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java2012-03-21 17:09:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java2012-03-22 11:28:14.055881623 +0000
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java2012-05-23 20:38:09.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java2012-05-23 22:43:01.755315042 +0100
< at >< at > -34,7 +34,7 < at >< at >
*/
< at >< at > -966,21 +966,9 < at >< at >
// reverse the list to maintain previous jdk deletion order.
// Last in first deleted.
-diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java2012-03-21 17:09:55.000000000 +0000
-+++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java2012-03-22 11:28:14.059881688 +0000
-< at >< at > -57,7 +57,7 < at >< at >
- private volatile boolean closed = false;
-
- private static final ThreadLocal<Boolean> runningFinalize =
</pre>andrew-HMOWzH9t1bryS2n3IP37Vh1hho49/T1E< at >public.gmane.org2012-05-25T13:05:11[rfc] [icedtea-web] get rid of repated sout/serr in reproducerstestcases
http://comments.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/18727
<pre>Hi!
I would like to get rid of repeating std out/err reprint in reproducers by moving this into
ServerAccess class. This patch is adding simple loging interface for stdout/err and (mainly) is
hiding reprinting (logging since now:-) of processes out/err and "connectng: " message into
executeProcess.
My goal in longer term is to have html file (generated from logged xml file probably) which I will
be able to link (anchor inlcuded) from current test results html files.And so I will be able to
quickly find whats wrong. Now it is becoming little bit painfull. >(Both stdou/err of processes and
searching in looong output file)
Saad, Danesh - you have number of reproducers in development. Please count with this change.
Thanx in advance
J.
diff -r 2c84a314c411 tests/jnlp_tests/signed/AppletTestSigned/testcases/AppletTestSignedTests.java
--- a/tests/jnlp_tests/signed/AppletTestSigned/testcases/AppletTestSignedTests.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/signed/AppletTestSigned/testcases/AppletTestSignedTests.javaFri May 25 14:36:05 2012 +0200
< at >< at > -51,11 +51,7 < at >< at >
< at >Test
public void AppletTestSignedTest() throws Exception {
- System.out.println("connecting AppletTestSigned request");
- System.err.println("connecting AppletTestSigned request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/AppletTestSigned.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
evaluateSignedApplet(pr);
Assert.assertFalse(pr.wasTerminated);
Assert.assertEquals((Integer) 0, pr.returnValue);
< at >< at > -82,13 +78,9 < at >< at >
< at >Test
public void AppletTestSignedFirefoxTest() throws Exception {
- System.out.println("connecting AppletTestSigned in firefox request");
- System.err.println("connecting AppletTestSigned in firefox request");
ServerAccess.PROCESS_TIMEOUT = 30 * 1000;
try {
ServerAccess.ProcessResult pr = server.executeBrowser("/AppletTestSigned.html");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
evaluateSignedApplet(pr);
Assert.assertTrue(pr.wasTerminated);
//Assert.assertEquals((Integer) 0, pr.returnValue); due to destroy is null
diff -r 2c84a314c411 tests/jnlp_tests/signed/CacheReproducer/testcases/CacheReproducerTest.java
--- a/tests/jnlp_tests/signed/CacheReproducer/testcases/CacheReproducerTest.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/signed/CacheReproducer/testcases/CacheReproducerTest.javaFri May 25 14:36:05 2012 +0200
< at >< at > -258,11 +258,7 < at >< at >
< at >Override
public void run() {
try {
- System.out.println("connecting deadlocktest request");
- System.err.println("connecting deadlocktest request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(verbosed, "/deadlocktest.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
} catch (Exception ex) {
throw new RuntimeException(ex);
}
< at >< at > -271,8 +267,6 < at >< at >
t.start();
Thread.sleep(1000);
pr = tryToClearcache();
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String q = "Can not clear cache at this time";
Assert.assertTrue("Stderr should contain " + q + ", but did not.", pr.stderr.contains(q));
assertCacheIsNotEmpty();
< at >< at > -338,8 +332,6 < at >< at >
}
private static void clearAndEvaluateCache(boolean force) throws Exception {
- System.out.println("clearing cache");
- System.err.println("clearing cache");
if (force) {
if (netxLock.isFile()) {
boolean b = netxLock.delete();
< at >< at > -458,11 +450,7 < at >< at >
}
private static ServerAccess.ProcessResult runSimpleTest1(List<String> args, String s) throws Exception {
- System.out.println("connecting " + s + " request");
- System.err.println("connecting " + s + " request");
ServerAccess.ProcessResult pr2 = server.executeJavawsHeadless(args, "/" + s + ".jnlp");
- System.out.println(pr2.stdout);
- System.err.println(pr2.stderr);
return pr2;
}
< at >< at > -483,8 +471,6 < at >< at >
private static ProcessResult tryToClearcache() throws Exception {
ServerAccess.ProcessResult pr1 = ServerAccess.executeProcess(clear);
- System.out.println(pr1.stdout);
- System.err.println(pr1.stderr);
return pr1;
}
}
diff -r 2c84a314c411 tests/jnlp_tests/signed/MissingJar/testcases/MissingJarTest.java
--- a/tests/jnlp_tests/signed/MissingJar/testcases/MissingJarTest.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/signed/MissingJar/testcases/MissingJarTest.javaFri May 25 14:36:05 2012 +0200
< at >< at > -50,8 +50,6 < at >< at >
private final List<String> l = Collections.unmodifiableList(Arrays.asList(new String[]{"-Xtrustall"}));
private void evaluateResult(ProcessResult pr) {
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String c = "only fixed classloader can initialize this app";
Assert.assertTrue("stdout should contains `" + c + "`, but didn't ", pr.stdout.contains(c));
String cc = "ClassNotFoundException";
< at >< at > -62,33 +60,25 < at >< at >
< at >Test
public void MissingJarTest1() throws Exception {
- System.out.println("connecting MissingJar1 request");
- System.err.println("connecting MissingJar1 request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar.jnlp");
evaluateResult(pr);
}
< at >Test
public void MissingJarTest2() throws Exception {
- System.out.println("connecting MissingJar2 request");
- System.err.println("connecting MissingJar2 request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar2.jnlp");
evaluateResult(pr);
}
< at >Test
public void MissingJarTest3() throws Exception {
- System.out.println("connecting MissingJar3 request");
- System.err.println("connecting MissingJar3 request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar3.jnlp");
evaluateResult(pr);
}
< at >Test
public void MissingJarTest4() throws Exception {
- System.out.println("connecting MissingJar4 request");
- System.err.println("connecting MissingJar4 request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(l, "/MissingJar4.jnlp");
evaluateResult(pr);
}
-}
\ No newline at end of file
+}
diff -r 2c84a314c411 tests/jnlp_tests/signed/ReadPropertiesBySignedHack/testcases/ReadPropertiesBySignedHackTest.java
--- a/tests/jnlp_tests/signed/ReadPropertiesBySignedHack/testcases/ReadPropertiesBySignedHackTest.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/signed/ReadPropertiesBySignedHack/testcases/ReadPropertiesBySignedHackTest.javaFri May 25 14:36:05 2012 +0200
< at >< at > -52,11 +52,7 < at >< at >
< at >Test
public void ReadPropertiesBySignedHackWithjoutXtrustAll() throws Exception {
//no request for permissions
- System.out.println("connecting ReadPropertiesBySignedHack request");
- System.err.println("connecting ReadPropertiesBySignedHack request");
ServerAccess.ProcessResult pr=server.executeJavawsHeadless(l,"/ReadPropertiesBySignedHack.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="java.lang.SecurityException: class \"ReadProperties\"'s signer information does not match signer information of other classes in the same package";
Assert.assertTrue("Stderr should contains "+s+" but did not",pr.stderr.contains(s));
String ss="ClassNotFoundException";
diff -r 2c84a314c411 tests/jnlp_tests/signed/ReadPropertiesSigned/testcases/ReadPropertiesSignedTest.java
--- a/tests/jnlp_tests/signed/ReadPropertiesSigned/testcases/ReadPropertiesSignedTest.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/signed/ReadPropertiesSigned/testcases/ReadPropertiesSignedTest.javaFri May 25 14:36:05 2012 +0200
< at >< at > -53,11 +53,7 < at >< at >
< at >Test
public void ReadSignedPropertiesWithoutPermissionsWithXtrustAll() throws Exception {
//no request for permissions
- System.out.println("connecting ReadPropertiesSigned1 request");
- System.err.println("connecting ReadPropertiesSigned1 request");
ServerAccess.ProcessResult pr=server.executeJavawsHeadless(l,"/ReadPropertiesSigned1.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
Assert.assertTrue("Stderr should match "+accessMatcher+" but did not",pr.stderr.matches(accessMatcher));
String ss="ClassNotFoundException";
Assert.assertFalse("Stderr should not contains "+ss+" but did",pr.stderr.contains(ss));
< at >< at > -69,11 +65,7 < at >< at >
< at >Test
public void ReadSignedPropertiesWithPermissionsWithXtrustAll() throws Exception {
//request for allpermissions
- System.out.println("connecting ReadPropertiesSigned2 request");
- System.err.println("connecting ReadPropertiesSigned2 request");
ServerAccess.ProcessResult pr=server.executeJavawsHeadless(l,"/ReadPropertiesSigned2.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
Assert.assertFalse("Stderr should NOT match "+accessMatcher+" but did",pr.stderr.matches(accessMatcher));
String ss="ClassNotFoundException";
Assert.assertFalse("Stderr should not contains "+ss+" but did",pr.stderr.contains(ss));
< at >< at > -84,11 +76,7 < at >< at >
< at >Test
public void EnsureXtrustallNotAffectingUnsignedBehaviour() throws Exception {
- System.err.println("connecting ReadPropertiesSigned3 request");
- System.out.println("connecting ReadPropertiesSigned3 request");
ServerAccess.ProcessResult pr=server.executeJavawsHeadless(l,"/ReadProperties1.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
Assert.assertTrue("Stderr should match "+accessMatcher+" but did not",pr.stderr.matches(accessMatcher));
String ss="ClassNotFoundException";
Assert.assertFalse("Stderr should not contains "+ss+" but did",pr.stderr.contains(ss));
diff -r 2c84a314c411 tests/jnlp_tests/signed/Spaces can be everywhere signed/testcases/SpacesCanBeEverywhereTestsSigned.java
--- a/tests/jnlp_tests/signed/Spaces can be everywhere signed/testcases/SpacesCanBeEverywhereTestsSigned.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/signed/Spaces can be everywhere signed/testcases/SpacesCanBeEverywhereTestsSigned.javaFri May 25 14:36:05 2012 +0200
< at >< at > -53,8 +53,6 < at >< at >
< at >Test
< at >NeedsDisplay
public void SpacesCanBeEverywhereLocalAppletTestsJnlp2Signed() throws Exception {
- System.out.println("connecting NotOnly spaces can kill ěščřž too signed.jnlp request");
- System.err.println("connecting NotOnly spaces can kill ěščřž too signed.jnlp request");
List<String> commands=new ArrayList<String>(1);
commands.add(server.getJavawsLocation());
commands.add(server.getDir()+"/NotOnly spaces can kill ěščřž too signed.jnlp");
< at >< at > -83,8 +81,6 < at >< at >
* only on ocal files, and probably only from test run - it can be ignored
*/
ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands);
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Signed spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "xception";
< at >< at > -97,11 +93,7 < at >< at >
< at >Test
< at >NeedsDisplay
public void SpacesCanBeEverywhereRemoteAppletTestsJnlp2Signed() throws Exception {
- System.out.println("connecting NotOnly spaces can kill ěščřž too signed.jnlp request");
- System.err.println("connecting NotOnly spaces can kill ěščřž too signed.jnlp request");
ServerAccess.ProcessResult pr = server.executeJavaws("/NotOnly%20spaces%20can%20kill%20%C4%9B%C5%A1%C4%8D%C5%99%C5%BE%20too%20signed.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Signed spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "xception";
< at >< at > -113,11 +105,7 < at >< at >
< at >Test
< at >NeedsDisplay
public void SpacesCanBeEverywhereRemoteAppletTestsHtml2Signed() throws Exception {
- System.out.println("connecting spaces applet Tests signed.html request");
- System.err.println("connecting spaces applet Tests signed.html request");
ServerAccess.ProcessResult pr = server.executeBrowser("/spaces+applet+Tests+signed.html");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Signed spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "xception";
< at >< at > -129,11 +117,7 < at >< at >
< at >Bug(id={"PR811","http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-October/016144.html"})
< at >Test
public void SpacesCanBeEverywhereRemoteTests1Signed() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereRemoteTests1 signed request");
- System.err.println("connecting SpacesCanBeEverywhereRemoteTests1 signed request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere1%20signed.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s = "Good simple javaws exapmle";
Assert.assertTrue("stdout should contains `" + s + "`, but did not", pr.stdout.contains(s));
String cc = "ClassNotFoundException";
< at >< at > -145,11 +129,7 < at >< at >
< at >Bug(id="PR811")
< at >Test
public void SpacesCanBeEverywhereRemoteTests2Signed() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereRemoteTests2 signed request");
- System.err.println("connecting SpacesCanBeEverywhereRemoteTests2 signed request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere2%20signed.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Signed spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "ClassNotFoundException";
< at >< at > -161,11 +141,7 < at >< at >
< at >Bug(id="PR811")
< at >Test
public void SpacesCanBeEverywhereRemoteTests2Signed_withQuery1() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereRemoteTests2 signed request");
- System.err.println("connecting SpacesCanBeEverywhereRemoteTests2 signed request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere2%20signed.jnlp?test=20");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Signed spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "ClassNotFoundException";
< at >< at > -177,11 +153,8 < at >< at >
< at >Bug(id="PR811")
< at >Test
public void SpacesCanBeEverywhereRemoteTests2Signed_withQuery2() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereRemoteTests2 signed request");
- System.err.println("connecting SpacesCanBeEverywhereRemoteTests2 signed request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere2%20signed.jnlp?test%3D20");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
+
String s="Signed spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "ClassNotFoundException";
< at >< at > -193,11 +166,7 < at >< at >
< at >Bug(id="PR811")
< at >Test
public void SpacesCanBeEverywhereRemoteTests3Signed() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereRemoteTests3signed request");
- System.err.println("connecting SpacesCanBeEverywhereRemoteTests3signed request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/SpacesCanBeEverywhere1signed.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Signed spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "ClassNotFoundException";
< at >< at > -210,15 +179,11 < at >< at >
< at >Bug(id="PR804")
< at >Test
public void SpacesCanBeEverywhereLocalTests1Signed() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereLocalTests1 request");
- System.err.println("connecting SpacesCanBeEverywhereLocalTests1 request");
List<String> commands=new ArrayList<String>(4);
commands.add(server.getJavawsLocation());
commands.add(ServerAccess.HEADLES_OPTION);
commands.add("Spaces can be everywhere1.jnlp");
ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands,server.getDir());
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s = "Good simple javaws exapmle";
Assert.assertTrue("stdout should contains `" + s + "`, but did not", pr.stdout.contains(s));
String cc = "ClassNotFoundException";
< at >< at > -230,15 +195,11 < at >< at >
< at >Bug(id="PR804")
< at >Test
public void SpacesCanBeEverywhereLocalTests2Signed() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereLocalTests2 signed request");
- System.err.println("connecting SpacesCanBeEverywhereLocalTests2 signed request");
List<String> commands=new ArrayList<String>(4);
commands.add(server.getJavawsLocation());
commands.add(ServerAccess.HEADLES_OPTION);
commands.add("Spaces can be everywhere2 signed.jnlp");
ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands,server.getDir());
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Signed spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "ClassNotFoundException";
< at >< at > -250,15 +211,11 < at >< at >
< at >Bug(id="PR804")
< at >Test
public void SpacesCanBeEverywhereLocalTests4Signed() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereLocalTests2 signed request");
- System.err.println("connecting SpacesCanBeEverywhereLocalTests2 signed request");
List<String> commands=new ArrayList<String>(4);
commands.add(server.getJavawsLocation());
commands.add(ServerAccess.HEADLES_OPTION);
commands.add(server.getDir()+"/Spaces can be everywhere2 signed.jnlp");
ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands);
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Signed spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "ClassNotFoundException";
< at >< at > -270,15 +227,11 < at >< at >
< at >Bug(id="PR804")
< at >Test
public void SpacesCanBeEverywhereLocalTests3Signed() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereLocalTests3signed request");
- System.err.println("connecting SpacesCanBeEverywhereLocalTests3signed request");
List<String> commands=new ArrayList<String>(4);
commands.add(server.getJavawsLocation());
commands.add(ServerAccess.HEADLES_OPTION);
commands.add("SpacesCanBeEverywhere1signed.jnlp");
ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands,server.getDir());
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Signed spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "ClassNotFoundException";
diff -r 2c84a314c411 tests/jnlp_tests/simple/AccessClassInPackage/testcases/AccessClassInPackageTest.java
--- a/tests/jnlp_tests/simple/AccessClassInPackage/testcases/AccessClassInPackageTest.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/simple/AccessClassInPackage/testcases/AccessClassInPackageTest.javaFri May 25 14:36:05 2012 +0200
< at >< at > -101,11 +101,7 < at >< at >
< at >Test
public void AccessClassInPackageJAVAXJNLP() throws Exception {
- System.out.println("AccessClassInPackageJAVAXJNLP");
- System.err.println("AccessClassInPackageJAVAXJNLP");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/" + files[0]);
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
commonPitfall(pr);
testShouldPass(pr, pass[0]);
testShouldNOTFail(pr, badExceptions[0]);
< at >< at > -113,11 +109,7 < at >< at >
< at >Test
public void AccessClassInPackageSELF() throws Exception {
- System.out.println("AccessClassInPackageSELF");
- System.err.println("AccessClassInPackageSELF");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/" + files[1]);
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
commonPitfall(pr);
testShouldPass(pr, pass[1]);
testShouldNOTFail(pr, badExceptions[1]);
< at >< at > -125,11 +117,7 < at >< at >
< at >Test
public void AccessClassInPackageNETSF() throws Exception {
- System.out.println("AccessClassInPackageNETSF");
- System.err.println("AccessClassInPackageNETSF");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/" + files[2]);
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
commonPitfall(pr);
testShouldFail(pr, badExceptions[2]);
testShouldNOTPass(pr, pass[2]);
< at >< at > -137,11 +125,7 < at >< at >
< at >Test
public void AccessClassInPackageSUNSEC() throws Exception {
- System.out.println("AccessClassInPackageSUNSEC");
- System.err.println("AccessClassInPackageSUNSEC");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/" + files[3]);
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
commonPitfall(pr);
commonPitfall(pr);
testShouldFail(pr, badExceptions[3]);
< at >< at > -151,11 +135,7 < at >< at >
//now signed vaiants
< at >Test
public void AccessClassInPackageSignedJAVAXJNLP() throws Exception {
- System.out.println("AccessClassInPackageSignedJAVAXJNLP");
- System.err.println("AccessClassInPackageSignedJAVAXJNLP");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(xta, "/" + filesSigned[0]);
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
commonPitfall(pr);
testShouldPass(pr, pass[0]);
testShouldNOTFail(pr, badExceptions[0]);
< at >< at > -163,11 +143,7 < at >< at >
< at >Test
public void AccessClassInPackageSignedSELF() throws Exception {
- System.out.println("AccessClassInPackageSignedSELF");
- System.err.println("AccessClassInPackageSignedSELF");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(xta, "/" + filesSigned[1]);
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
commonPitfall(pr);
testShouldPass(pr, pass[1]);
testShouldNOTFail(pr, badExceptions[1]);
< at >< at > -175,11 +151,7 < at >< at >
< at >Test
public void AccessClassInPackageSignedNETSF() throws Exception {
- System.out.println("AccessClassInPackageSignedNETSF");
- System.err.println("AccessClassInPackageSignedNETSF");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(xta, "/" + filesSigned[2]);
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
commonPitfall(pr);
testShouldPass(pr, pass[2]);
testShouldNOTFail(pr, badExceptions[2]);
< at >< at > -187,11 +159,7 < at >< at >
< at >Test
public void AccessClassInPackageSignedSUNSEC() throws Exception {
- System.out.println("AccessClassInPackageSignedSUNSEC");
- System.err.println("AccessClassInPackageSignedSUNSEC");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(xta, "/" + filesSigned[3]);
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
commonPitfall(pr);
testShouldPass(pr, pass[3]);
testShouldNOTFail(pr, badExceptions[3]);
diff -r 2c84a314c411 tests/jnlp_tests/simple/AddShutdownHook/testcases/AddShutdownHookTest.java
--- a/tests/jnlp_tests/simple/AddShutdownHook/testcases/AddShutdownHookTest.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/simple/AddShutdownHook/testcases/AddShutdownHookTest.javaFri May 25 14:36:05 2012 +0200
< at >< at > -46,11 +46,7 < at >< at >
< at >Test
public void AddShutdownHookTestLunch1() throws Exception {
- System.out.println("connecting AddShutdownHook request");
- System.err.println("connecting AddShutdownHook request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/AddShutdownHook.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s = "(?s).*java.security.AccessControlException.{0,5}access denied.{0,5}java.lang.RuntimePermission.{0,5}" + "shutdownHooks" + ".*";
Assert.assertTrue("stderr should match "+s+" but didn't",pr.stderr.matches(s));
String cc="ClassNotFoundException";
diff -r 2c84a314c411 tests/jnlp_tests/simple/AllStackTraces/testcases/AllStackTracesTest.java
--- a/tests/jnlp_tests/simple/AllStackTraces/testcases/AllStackTracesTest.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/simple/AllStackTraces/testcases/AllStackTracesTest.javaFri May 25 14:36:05 2012 +0200
< at >< at > -48,11 +48,7 < at >< at >
< at >Test
public void AllStackTracesTest1() throws Exception {
- System.out.println("connecting AllStackTraces request");
- System.err.println("connecting AllStackTraces request");
ServerAccess.ProcessResult pr=server.executeJavawsHeadless(null,"/AllStackTraces.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String c = "(?s).*java.security.AccessControlException.{0,5}access denied.{0,5}java.lang.RuntimePermission.{0,5}" + "getStackTrace" + ".*";
Assert.assertTrue("stderr should match `"+c+"`, but didn't ",pr.stderr.matches(c));
String cc="ClassNotFoundException";
diff -r 2c84a314c411 tests/jnlp_tests/simple/AppletTest/testcases/AppletTestTests.java
--- a/tests/jnlp_tests/simple/AppletTest/testcases/AppletTestTests.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/simple/AppletTest/testcases/AppletTestTests.javaFri May 25 14:36:05 2012 +0200
< at >< at > -47,11 +47,7 < at >< at >
< at >Test
public void AppletTest() throws Exception {
- System.out.println("connecting AppletTest request");
- System.err.println("connecting AppletTest request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/AppletTest.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
evaluateApplet(pr);
Assert.assertFalse(pr.wasTerminated);
Assert.assertEquals((Integer) 0, pr.returnValue);
< at >< at > -78,13 +74,9 < at >< at >
< at >Test
public void AppletInFirefoxTest() throws Exception {
- System.out.println("connecting AppletInFirefoxTest request");
- System.err.println("connecting AppletInFirefoxTest request");
server.PROCESS_TIMEOUT = 30 * 1000;
try {
ServerAccess.ProcessResult pr = server.executeBrowser("/appletAutoTests.html");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
pr.process.destroy();
evaluateApplet(pr);
Assert.assertTrue(pr.wasTerminated);
diff -r 2c84a314c411 tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.java
--- a/tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/simple/CheckServices/testcases/CheckServicesTests.javaFri May 25 14:36:05 2012 +0200
< at >< at > -47,11 +47,7 < at >< at >
< at >Test
public void CheckServices() throws Exception {
- System.out.println("connecting CheckServices request");
- System.err.println("connecting CheckServices request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/CheckServices.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s0 = "Codebase for applet was found in constructor";
Assert.assertTrue("CheckServices stdout should contain `" + s0 + "' bud didn't.", pr.stdout.contains(s0));
String s1 = "Codebase for applet was found in init()";
diff -r 2c84a314c411 tests/jnlp_tests/simple/CreateClassLoader/testcases/CreateClassLoaderTest.java
--- a/tests/jnlp_tests/simple/CreateClassLoader/testcases/CreateClassLoaderTest.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/simple/CreateClassLoader/testcases/CreateClassLoaderTest.javaFri May 25 14:36:05 2012 +0200
< at >< at > -46,11 +46,7 < at >< at >
< at >Test
public void CreateClassLoaderLunch1() throws Exception {
- System.out.println("connecting CreateClassLoader request");
- System.err.println("connecting CreateClassLoader request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/CreateClassLoader.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s = "(?s).*java.security.AccessControlException.{0,5}access denied.{0,5}java.lang.RuntimePermission.{0,5}" + "createClassLoader" + ".*";
Assert.assertTrue("Stderr should match "+s+" but didn't",pr.stderr.matches(s));
String cc="ClassNotFoundException";
diff -r 2c84a314c411 tests/jnlp_tests/simple/InformationTitleVendorParser/testcases/InformationTitleVendorParserTest.java
--- a/tests/jnlp_tests/simple/InformationTitleVendorParser/testcases/InformationTitleVendorParserTest.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/simple/InformationTitleVendorParser/testcases/InformationTitleVendorParserTest.javaFri May 25 14:36:05 2012 +0200
< at >< at > -45,11 +45,7 < at >< at >
private static ServerAccess server = new ServerAccess();
public void runTest(String jnlpName, String exceptionMessage) throws Exception {
- System.out.println("connecting InformationTitleVendorParser request, testing " + jnlpName);
- System.err.println("connecting InformationTitleVendorParser request, testing " + jnlpName);
ServerAccess.ProcessResult pr=server.executeJavawsHeadless(null,"/" + jnlpName + ".jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s1 = "Good simple javaws exapmle";
Assert.assertFalse("test" + jnlpName + " stdout should not contain " + s1 + " but did.", pr.stdout.contains(s1));
// Looking for "Could not read or parse the JNLP file. (${DESCRIPTION})"
diff -r 2c84a314c411 tests/jnlp_tests/simple/ManifestedJar1/testcases/ManifestedJar1Test.java
--- a/tests/jnlp_tests/simple/ManifestedJar1/testcases/ManifestedJar1Test.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/simple/ManifestedJar1/testcases/ManifestedJar1Test.javaFri May 25 14:36:05 2012 +0200
< at >< at > -85,11 +85,7 < at >< at >
*/
public void manifestedJar1nothing2nothingNoAppDesc() throws Exception {
String id = "ManifestedJar-1nothing2nothingNoAppDesc";
- System.out.println("connecting " + id + " request");
- System.err.println("connecting " + id + " request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/" + id + ".jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
assertManifestedJar1(id, pr);
assertNotDead(id, pr);
}
< at >< at > -101,11 +97,7 < at >< at >
< at >Test
public void manifestedJar1noAppDesc() throws Exception {
String id = "ManifestedJar-1noAppDesc";
- System.out.println("connecting " + id + " request");
- System.err.println("connecting " + id + " request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/" + id + ".jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
assertManifestedJar1(id, pr);
assertNotDead(id, pr);
}
< at >< at > -117,11 +109,7 < at >< at >
< at >Test
public void manifestedJar1mainNoAppDesc() throws Exception {
String id = "ManifestedJar-1mainNoAppDesc";
- System.out.println("connecting " + id + " request");
- System.err.println("connecting " + id + " request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/" + id + ".jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
assertManifestedJar1(id, pr);
assertNotDead(id, pr);
}
< at >< at > -133,11 +121,7 < at >< at >
< at >Test
public void ManifestedJar1mainHaveAppDesc() throws Exception {
String id = "ManifestedJar-1mainHaveAppDesc";
- System.out.println("connecting " + id + " request");
- System.err.println("connecting " + id + " request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/" + id + ".jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
assertManifestedJar2(id, pr);
assertNotDead(id, pr);
}
< at >< at > -149,11 +133,7 < at >< at >
< at >Test
public void ManifestedJar1main2nothingNoAppDesc() throws Exception {
String id = "ManifestedJar-1main2nothingNoAppDesc";
- System.out.println("connecting " + id + " request");
- System.err.println("connecting " + id + " request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/" + id + ".jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
assertManifestedJar2(id, pr);
assertNotDead(id, pr);
}
< at >< at > -165,11 +145,7 < at >< at >
< at >Test
public void manifestedJar1main2nothingNoAppDesc() throws Exception {
String id = "ManifestedJar-1main2nothingNoAppDesc";
- System.out.println("connecting " + id + " request");
- System.err.println("connecting " + id + " request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/" + id + ".jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
assertManifestedJar2(id, pr);
assertNotDead(id, pr);
}
< at >< at > -184,11 +160,7 < at >< at >
< at >Test
public void manifestedJar1main2mainNoAppDesc() throws Exception {
String id = "ManifestedJar-1main2mainNoAppDesc";
- System.out.println("connecting " + id + " request");
- System.err.println("connecting " + id + " request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/" + id + ".jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
assertManifestedJar1(id, pr);
assertNotDead(id, pr);
}
< at >< at > -202,11 +174,7 < at >< at >
< at >Test
public void manifestedJar1main2mainAppDesc() throws Exception {
String id = "ManifestedJar-1main2mainAppDesc";
- System.out.println("connecting " + id + " request");
- System.err.println("connecting " + id + " request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/" + id + ".jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
assertNotManifestedJar1(id, pr);
assertNotManifestedJar2(id, pr);
assertNotDead(id, pr);
< at >< at > -221,11 +189,7 < at >< at >
< at >Test
public void manifestedJar1noAppDescAtAll() throws Exception {
String id = "ManifestedJar-1noAppDescAtAll";
- System.out.println("connecting " + id + " request");
- System.err.println("connecting " + id + " request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/" + id + ".jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
assertNotManifestedJar1(id, pr);
assertNotManifestedJar2(id, pr);
assertAppError(id, pr);
< at >< at > -244,11 +208,7 < at >< at >
< at >Test
public void manifestedJar1nothing2nothingAppDesc() throws Exception {
String id = "ManifestedJar-1nothing2nothingAppDesc";
- System.out.println("connecting " + id + " request");
- System.err.println("connecting " + id + " request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/" + id + ".jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
assertNotManifestedJar2(id, pr);
assertNotManifestedJar1(id, pr);
assertNotDead(id, pr);
diff -r 2c84a314c411 tests/jnlp_tests/simple/ReadEnvironment/testcases/ReadEnvironmentTest.java
--- a/tests/jnlp_tests/simple/ReadEnvironment/testcases/ReadEnvironmentTest.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/simple/ReadEnvironment/testcases/ReadEnvironmentTest.javaFri May 25 14:36:05 2012 +0200
< at >< at > -46,11 +46,7 < at >< at >
< at >Test
public void ReadEnvironmentLunch1() throws Exception {
- System.out.println("connecting ReadEnvironment request");
- System.err.println("connecting ReadEnvironment request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/ReadEnvironment.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s = "(?s).*java.security.AccessControlException.{0,5}access denied.{0,5}java.lang.RuntimePermission.{0,5}" + "getenv.USER" + ".*";
Assert.assertTrue("stderr should match"+s+"but didn't",pr.stderr.matches(s));
String cc="ClassNotFoundException";
diff -r 2c84a314c411 tests/jnlp_tests/simple/ReadProperties/testcases/ReadPropertiesTest.java
--- a/tests/jnlp_tests/simple/ReadProperties/testcases/ReadPropertiesTest.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/simple/ReadProperties/testcases/ReadPropertiesTest.javaFri May 25 14:36:05 2012 +0200
< at >< at > -47,11 +47,7 < at >< at >
< at >Test
public void ReadPropertiesLunch1() throws Exception {
- System.out.println("connecting ReadProperties1 request");
- System.err.println("connecting ReadProperties1 request");
ServerAccess.ProcessResult pr=server.executeJavawsHeadless(null,"/ReadProperties1.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s = "(?s).*java.security.AccessControlException.{0,5}access denied.{0,5}java.util.PropertyPermission.{0,5}" + "user.name.{0,5}read" + ".*";
Assert.assertTrue("stderr should match "+s+" but didn't",pr.stderr.matches(s));
String cc="ClassNotFoundException";
< at >< at > -63,11 +59,7 < at >< at >
< at >Test
public void ReadPropertiesLunch2() throws Exception {
- System.out.println("connecting ReadProperties2 request");
- System.err.println("connecting ReadProperties2 request");
ServerAccess.ProcessResult pr=server.executeJavawsHeadless(null,"/ReadProperties2.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s = "(?s).*java.security.AccessControlException.{0,5}access denied.{0,5}java.util.PropertyPermission.{0,5}" + "user.home.{0,5}read" + ".*";
Assert.assertTrue("stderr should match "+s+" but didn't",pr.stderr.matches(s));
String cc="ClassNotFoundException";
diff -r 2c84a314c411 tests/jnlp_tests/simple/RedirectStreams/testcases/RedirectStreamsTest.java
--- a/tests/jnlp_tests/simple/RedirectStreams/testcases/RedirectStreamsTest.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/simple/RedirectStreams/testcases/RedirectStreamsTest.javaFri May 25 14:36:05 2012 +0200
< at >< at > -45,11 +45,7 < at >< at >
< at >Test
public void RedirectStreamsTest1() throws Exception {
- System.out.println("connecting RedirectStreams request");
- System.err.println("connecting RedirectStreams request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/RedirectStreams.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s = "(?s).*java.security.AccessControlException.{0,5}access denied.{0,5}java.lang.RuntimePermission.{0,5}" + "setIO" + ".*";
Assert.assertTrue("Stderr should match "+s+" but didn't",pr.stderr.matches(s));
String cc="ClassNotFoundException";
diff -r 2c84a314c411 tests/jnlp_tests/simple/ReplaceSecurityManager/testcases/ReplaceSecurityManagerTest.java
--- a/tests/jnlp_tests/simple/ReplaceSecurityManager/testcases/ReplaceSecurityManagerTest.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/simple/ReplaceSecurityManager/testcases/ReplaceSecurityManagerTest.javaFri May 25 14:36:05 2012 +0200
< at >< at > -45,11 +45,7 < at >< at >
< at >Test
public void ReplaceSecurityManagerLunch1() throws Exception {
- System.out.println("connecting ReplaceSecurityManager request");
- System.err.println("connecting ReplaceSecurityManager request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/ReplaceSecurityManager.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s = "(?s).*java.security.AccessControlException.{0,5}access denied.{0,5}java.lang.RuntimePermission.{0,5}" + "setSecurityManager" + ".*";
Assert.assertTrue("stderr should match "+s+" but didn't",pr.stderr.matches(s));
String cc="ClassNotFoundException";
diff -r 2c84a314c411 tests/jnlp_tests/simple/SetContextClassLoader/testcases/SetContextClassLoaderTest.java
--- a/tests/jnlp_tests/simple/SetContextClassLoader/testcases/SetContextClassLoaderTest.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/simple/SetContextClassLoader/testcases/SetContextClassLoaderTest.javaFri May 25 14:36:05 2012 +0200
< at >< at > -45,11 +45,7 < at >< at >
< at >Test
public void SetContextClassLoader1() throws Exception {
- System.out.println("connecting SetContextClassLoader request");
- System.err.println("connecting SetContextClassLoader request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/SetContextClassLoader.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s = "(?s).*java.security.AccessControlException.{0,5}access denied.{0,5}java.lang.RuntimePermission.{0,5}" + "setContextClassLoader" + ".*";
Assert.assertTrue("stderr should match "+s+" but didn't",pr.stderr.matches(s));
String cc="ClassNotFoundException";
diff -r 2c84a314c411 tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.java
--- a/tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/simple/Spaces can be everywhere/testcases/SpacesCanBeEverywhereTests.javaFri May 25 14:36:05 2012 +0200
< at >< at > -53,8 +53,6 < at >< at >
< at >Test
< at >NeedsDisplay
public void SpacesCanBeEverywhereLocalAppletTestsJnlp2() throws Exception {
- System.out.println("connecting NotOnly spaces can kill ěščřž too.jnlp request");
- System.err.println("connecting NotOnly spaces can kill ěščřž too.jnlp request");
List<String> commands=new ArrayList<String>(1);
commands.add(server.getJavawsLocation());
commands.add(server.getDir()+"/NotOnly spaces can kill ěščřž too.jnlp");
< at >< at > -83,8 +81,6 < at >< at >
* only on ocal files, and probably only from test run - it can be ignored
*/
ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands);
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "xception";
< at >< at > -97,11 +93,7 < at >< at >
< at >Test
< at >NeedsDisplay
public void SpacesCanBeEverywhereRemoteAppletTestsJnlp2() throws Exception {
- System.out.println("connecting NotOnly spaces can kill ěščřž too.jnlp request");
- System.err.println("connecting NotOnly spaces can kill ěščřž too.jnlp request");
ServerAccess.ProcessResult pr = server.executeJavaws("/NotOnly%20spaces%20can%20kill%20%C4%9B%C5%A1%C4%8D%C5%99%C5%BE%20too.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "xception";
< at >< at > -113,11 +105,7 < at >< at >
< at >Test
< at >NeedsDisplay
public void SpacesCanBeEverywhereRemoteAppletTestsHtml2() throws Exception {
- System.out.println("connecting spaces applet Tests.html request");
- System.err.println("connecting spaces applet Tests.html request");
ServerAccess.ProcessResult pr = server.executeBrowser("/spaces+applet+Tests.html");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "xception";
< at >< at > -129,11 +117,7 < at >< at >
< at >Bug(id={"PR811","http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2011-October/016144.html"})
< at >Test
public void SpacesCanBeEverywhereRemoteTests1() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereRemoteTests1 request");
- System.err.println("connecting SpacesCanBeEverywhereRemoteTests1 request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere1.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s = "Good simple javaws exapmle";
Assert.assertTrue("stdout should contains `" + s + "`, but did not", pr.stdout.contains(s));
String cc = "ClassNotFoundException";
< at >< at > -145,11 +129,7 < at >< at >
< at >Bug(id="PR811")
< at >Test
public void SpacesCanBeEverywhereRemoteTests2() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereRemoteTests2 request");
- System.err.println("connecting SpacesCanBeEverywhereRemoteTests2 request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere2.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "ClassNotFoundException";
< at >< at > -161,11 +141,7 < at >< at >
< at >Bug(id="PR811")
< at >Test
public void SpacesCanBeEverywhereRemoteTests2_withQuery1() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereRemoteTests2 request");
- System.err.println("connecting SpacesCanBeEverywhereRemoteTests2 request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere2.jnlp?test=10");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "ClassNotFoundException";
< at >< at > -178,11 +154,7 < at >< at >
< at >Bug(id="PR811")
< at >Test
public void SpacesCanBeEverywhereRemoteTests2_withQuery2() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereRemoteTests2 request");
- System.err.println("connecting SpacesCanBeEverywhereRemoteTests2 request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/Spaces%20can%20be%20everywhere2.jnlp?test%3D10");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "ClassNotFoundException";
< at >< at > -194,11 +166,7 < at >< at >
< at >Bug(id="PR811")
< at >Test
public void SpacesCanBeEverywhereRemoteTests3() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereRemoteTests3 request");
- System.err.println("connecting SpacesCanBeEverywhereRemoteTests3 request");
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, "/SpacesCanBeEverywhere1.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "ClassNotFoundException";
< at >< at > -211,15 +179,11 < at >< at >
< at >Bug(id="PR804")
< at >Test
public void SpacesCanBeEverywhereLocalTests1() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereLocalTests1 request");
- System.err.println("connecting SpacesCanBeEverywhereLocalTests1 request");
List<String> commands=new ArrayList<String>(4);
commands.add(server.getJavawsLocation());
commands.add(ServerAccess.HEADLES_OPTION);
commands.add("Spaces can be everywhere1.jnlp");
ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands,server.getDir());
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s = "Good simple javaws exapmle";
Assert.assertTrue("stdout should contains `" + s + "`, but did not", pr.stdout.contains(s));
String cc = "ClassNotFoundException";
< at >< at > -231,15 +195,11 < at >< at >
< at >Bug(id="PR804")
< at >Test
public void SpacesCanBeEverywhereLocalTests2() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereLocalTests2 request");
- System.err.println("connecting SpacesCanBeEverywhereLocalTests2 request");
List<String> commands=new ArrayList<String>(4);
commands.add(server.getJavawsLocation());
commands.add(ServerAccess.HEADLES_OPTION);
commands.add("Spaces can be everywhere2.jnlp");
ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands,server.getDir());
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "ClassNotFoundException";
< at >< at > -251,15 +211,11 < at >< at >
< at >Bug(id="PR804")
< at >Test
public void SpacesCanBeEverywhereLocalTests4() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereLocalTests2 request");
- System.err.println("connecting SpacesCanBeEverywhereLocalTests2 request");
List<String> commands=new ArrayList<String>(4);
commands.add(server.getJavawsLocation());
commands.add(ServerAccess.HEADLES_OPTION);
commands.add(server.getDir()+"/Spaces can be everywhere2.jnlp");
ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands);
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "ClassNotFoundException";
< at >< at > -271,15 +227,11 < at >< at >
< at >Bug(id="PR804")
< at >Test
public void SpacesCanBeEverywhereLocalTests3() throws Exception {
- System.out.println("connecting SpacesCanBeEverywhereLocalTests3 request");
- System.err.println("connecting SpacesCanBeEverywhereLocalTests3 request");
List<String> commands=new ArrayList<String>(4);
commands.add(server.getJavawsLocation());
commands.add(ServerAccess.HEADLES_OPTION);
commands.add("SpacesCanBeEverywhere1.jnlp");
ServerAccess.ProcessResult pr = ServerAccess.executeProcess(commands,server.getDir());
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Spaces can be everywhere.jsr was launched correctly";
Assert.assertTrue("stdout should contains `"+s+"`, but did not",pr.stdout.contains(s));
String cc = "ClassNotFoundException";
diff -r 2c84a314c411 tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.java
--- a/tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/simple/deadlocktest/testcases/DeadLockTestTest.javaFri May 25 14:36:05 2012 +0200
< at >< at > -55,7 +55,7 < at >< at >
< at >BeforeClass
public static void printJavas() throws Exception {
- System.out.println("Currently runnng javas1 " + countJavaInstances());
+ ServerAccess.logO("Currently runnng javas1 " + countJavaInstances());
}
< at >< at > -71,15 +71,11 < at >< at >
public void testDeadLockTestTerminatedBody(String jnlp) throws Exception {
List<String> before = countJavaInstances();
- System.out.println("java1 "+jnlp+" : " + before.size());
- System.out.println("connecting " + jnlp + " request");
- System.err.println("connecting " + jnlp + " request");
+ ServerAccess.logO("java1 "+jnlp+" : " + before.size());
ServerAccess.ProcessResult pr = server.executeJavawsHeadless(null, jnlp);
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
assertDeadlockTestLaunched(pr);
List<String> after = countJavaInstances();
- System.out.println("java2 "+jnlp+" : " + after.size());
+ ServerAccess.logO("java2 "+jnlp+" : " + after.size());
String ss="This process is hanging more than 30s. Should be killed";
Assert.assertFalse("stdout shoud not contains: "+ss+", but did",pr.stdout.contains(ss));
// Assert.assertTrue(pr.stderr.contains("xception"));, exception is thrown by engine,not by application
< at >< at > -87,7 +83,7 < at >< at >
Assert.assertEquals(null, pr.returnValue);//killed process have no value
killDiff(before, after);
List<String> afterKill = countJavaInstances();
- System.out.println("java3 "+jnlp+" : " + afterKill.size());
+ ServerAccess.logO("java3 "+jnlp+" : " + afterKill.size());
Assert.assertEquals("assert that just old javas remians", 0, (before.size() - afterKill.size()));
}
< at >< at > -99,25 +95,21 < at >< at >
< at >Test
public void testSimpletest1lunchFork() throws Exception {
- System.out.println("connecting " + deadlocktest_1 + " request");
- System.err.println("connecting " + deadlocktest_1 + " request");
List<String> before = countJavaInstances();
- System.out.println("java4: " + before.size());
+ ServerAccess.logO("java4: " + before.size());
BackgroundDeadlock bd = new BackgroundDeadlock(deadlocktest_1, null);
bd.start();
Thread.sleep(ServerAccess.PROCESS_TIMEOUT * 2 / 3);
List<String> during = countJavaInstances();
- System.out.println("java5: " + during.size());
+ ServerAccess.logO("java5: " + during.size());
waitForBackgroundDeadlock(bd);
List<String> after = countJavaInstances();
- System.out.println("java6: " + after.size());
+ ServerAccess.logO("java6: " + after.size());
Assert.assertNotNull("proces inside background deadlock cant be null. It was.", bd.getPr());
- System.out.println(bd.getPr().stdout);
- System.err.println(bd.getPr().stderr);
assertDeadlockTestLaunched(bd.getPr());
killDiff(before, during);
List<String> afterKill = countJavaInstances();
- System.out.println("java66: " + afterKill.size());
+ ServerAccess.logO("java66: " + afterKill.size());
Assert.assertEquals("assert that just old javas remians", 0, (before.size() - afterKill.size()));
// div by two is caused by jav in java process hierarchy
Assert.assertEquals("launched JVMs must be exactly 2, was " + (during.size() - before.size()) / 2, 2, (during.size() - before.size()) / 2);
< at >< at > -125,25 +117,21 < at >< at >
< at >Test
public void testSimpletest1lunchNoFork() throws Exception {
- System.out.println("connecting " + deadlocktest_1 + " Xnofork request");
- System.err.println("connecting " + deadlocktest_1 + " Xnofork request");
List<String> before = countJavaInstances();
- System.out.println("java7: " + before.size());
+ ServerAccess.logO("java7: " + before.size());
BackgroundDeadlock bd = new BackgroundDeadlock(deadlocktest_1, Arrays.asList(new String[]{"-Xnofork"}));
bd.start();
Thread.sleep(ServerAccess.PROCESS_TIMEOUT * 2 / 3);
List<String> during = countJavaInstances();
- System.out.println("java8: " + during.size());
+ ServerAccess.logO("java8: " + during.size());
waitForBackgroundDeadlock(bd);
List<String> after = countJavaInstances();
- System.out.println("java9: " + after.size());
+ ServerAccess.logO("java9: " + after.size());
Assert.assertNotNull("proces inside background deadlock cant be null. It was.", bd.getPr());
- System.out.println(bd.getPr().stdout);
- System.err.println(bd.getPr().stderr);
assertDeadlockTestLaunched(bd.getPr());
killDiff(before, during);
List<String> afterKill = countJavaInstances();
- System.out.println("java99: " + afterKill.size());
+ ServerAccess.logO("java99: " + afterKill.size());
Assert.assertEquals("assert that just old javas remians", 0, (before.size() - afterKill.size()));
// div by two is caused by jav in java process hierarchy
Assert.assertEquals("launched JVMs must be exactly 1, was " + (during.size() - before.size()) / 2, 1, (during.size() - before.size()) / 2);
< at >< at > -168,12 +156,15 < at >< at >
if (old.contains(string)) {
continue;
}
- System.out.println("Killing " + string);
- ServerAccess.ProcessResult pr = ServerAccess.executeProcess(Arrays.asList(new String[]{"kill", "-9", string}));
+ ServerAccess.logO("Killing " + string);
+ ServerAccess.PROCES_LOG = false;
+ try {
+ ServerAccess.ProcessResult pr = ServerAccess.executeProcess(Arrays.asList(new String[]{"kill", "-9", string}));
+ } finally {
+ ServerAccess.PROCES_LOG = true;
+ }
result.add(string);
- //System.out.println(pr.stdout);
- // System.err.println(pr.stderr);
- System.out.println("Killed " + string);
+ ServerAccess.logO("Killed " + string);
}
return result;
}
< at >< at > -181,23 +172,26 < at >< at >
private static List<String> countJavaInstances() throws Exception {
ensureLinux();
List<String> result = new ArrayList<String>();
- ServerAccess.ProcessResult pr = ServerAccess.executeProcess(Arrays.asList(new String[]{"ps", "-eo", "pid,ppid,stat,fname"}));
- Matcher m = Pattern.compile("\\s*\\d+\\s+\\d+ .+ java\\s*").matcher(pr.stdout);
- //System.out.println(pr.stdout);
- //System.err.println(pr.stderr);
+ ServerAccess.PROCES_LOG = false;
+ try {
+ ServerAccess.ProcessResult pr = ServerAccess.executeProcess(Arrays.asList(new String[]{"ps", "-eo", "pid,ppid,stat,fname"}));
+ Matcher m = Pattern.compile("\\s*\\d+\\s+\\d+ .+ java\\s*").matcher(pr.stdout);
int i = 0;
while (m.find()) {
i++;
String ss = m.group();
- //System.out.println(i+": "+ss);
+ //ServerAccess.logO(i+": "+ss);
result.add(ss.trim().split("\\s+")[0]);
}
+ } finally {
+ ServerAccess.PROCES_LOG = true;
+ }
return result;
}
public static void main(String[] args) throws Exception {
- System.out.println(countJavaInstances());
+ ServerAccess.logO(""+countJavaInstances());
}
private void assertDeadlockTestLaunched(ProcessResult pr) {
diff -r 2c84a314c411 tests/jnlp_tests/simple/simpletest1/testcases/SimpleTest1Test.java
--- a/tests/jnlp_tests/simple/simpletest1/testcases/SimpleTest1Test.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/simple/simpletest1/testcases/SimpleTest1Test.javaFri May 25 14:36:05 2012 +0200
< at >< at > -49,11 +49,7 < at >< at >
< at >Test
public void testSimpletest1lunchOk() throws Exception {
- System.out.println("connecting simpletest1 request");
- System.err.println("connecting simpletest1 request");
ServerAccess.ProcessResult pr=server.executeJavawsHeadless(null,"/simpletest1.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
String s="Good simple javaws exapmle";
Assert.assertTrue("testSimpletest1lunchOk stdout should contains "+s+" bud didn't",pr.stdout.contains(s));
String ss="xception";
< at >< at > -62,8 +58,4 < at >< at >
Assert.assertEquals((Integer)0, pr.returnValue);
}
-
-
-
-
- }
+ }
diff -r 2c84a314c411 tests/jnlp_tests/simple/simpletest2/testcases/SimpleTest2Test.java
--- a/tests/jnlp_tests/simple/simpletest2/testcases/SimpleTest2Test.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/jnlp_tests/simple/simpletest2/testcases/SimpleTest2Test.javaFri May 25 14:36:05 2012 +0200
< at >< at > -47,11 +47,7 < at >< at >
< at >Test
public void testSimpletest2lunchException() throws Exception {
- System.out.println("connecting simpletest2 request");
- System.err.println("connecting simpletest2 request");
ServerAccess.ProcessResult pr=server.executeJavawsHeadless(null,"/simpletest2.jnlp");
- System.out.println(pr.stdout);
- System.err.println(pr.stderr);
Assert.assertTrue("stdout should be < 1 , but was "+pr.stdout.trim().length(),pr.stdout.trim().length() < 1);
String s="Correct exception";
Assert.assertTrue("stderr should contains "+s+" but didn't",pr.stderr.contains(s));
diff -r 2c84a314c411 tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.java
--- a/tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.javaThu May 24 15:37:30 2012 -0400
+++ b/tests/netx/jnlp_testsengine/net/sourceforge/jnlp/ServerAccess.javaFri May 25 14:36:05 2012 +0200
< at >< at > -116,6 +116,10 < at >< at >
* all terminated processes are stored here. As wee need to 'wait' to termination to be finished.
*/
private static Set<Thread> terminated = new HashSet<Thread>();
+ /**
+ * this flag is indicating whether ooutput of executeProcess should be logged. By default true.
+ */
+ public static boolean PROCES_LOG=true;
/**
* main method of this class prints out random free port
< at >< at > -720,9 +724,72 < at >< at >
return executeProcess(args, dir, null, null);
}
- public static ProcessResult executeProcess(final List<String> args,File dir,ContentReaderListener stdoutl,ContentReaderListener stderrl) throws Exception {
- ThreadedProcess t = new ThreadedProcess(args,dir);
+ private static String createConnectionMessage(ThreadedProcess t) {
+ return "Connecting " + t.getCommandLine();
+ }
+
+ public static void logE(String s) {
+ log(s, false, true);
+ }
+
+ public static void logO(String s) {
+ log(s, true, false);
+ }
+
+ private static void log(String message, boolean out, boolean err) {
+ String idded;
+ StackTraceElement ste = getTestMethod();
+ String fullId=ste.getClassName()+"."+ste.getMethodName();
+ if (message.contains("\n")) {
+ idded = fullId + ": \n" + message+"\n"+fullId+" ---";
+ } else {
+ idded = fullId + ": " + message;
+
+ }
+ if (out) {
+ System.out.println(idded);
+ }
+ if (err) {
+ System.err.println(idded);
+ }
+ }
+
+ private static StackTraceElement getTestMethod() {
+ return getTestMethod(Thread.currentThread().getStackTrace());
+ }
+
+ private static StackTraceElement getTestMethod(StackTraceElement[] stack) {
+ //0 is always thread
+ //1 is net.sourceforge.jnlp.ServerAccess
+ StackTraceElement result = stack[1];
+ String baseClass = stack[1].getClassName();
+ int i = 2;
+ for (; i < stack.length; i++) {
+ result = stack[i];//at least moving up
+ if (!baseClass.equals(stack[i].getClassName())) {
+ break;
+ }
+ }
+ //now we are out of net.sourceforge.jnlp.ServerAccess
+ //method we need (the test) is highest from following class
+ baseClass = stack[i].getClassName();
+ for (; i < stack.length; i++) {
+ if (!baseClass.equals(stack[i].getClassName())) {
+ break;
+ }
+ result = stack[i];
+ }
+
+ return result;
+ }
+
+ public static ProcessResult executeProcess(final List<String> args, File dir, ContentReaderListener stdoutl, ContentReaderListener stderrl) throws Exception {
+ ThreadedProcess t = new ThreadedProcess(args, dir);
+ if (PROCES_LOG) {
+ String connectionMesaage = createConnectionMessage(t);
+ log(connectionMesaage, true, true);
+ }
ProcessAssasin pa = new ProcessAssasin(t, PROCESS_TIMEOUT);
pa.start();
t.start();
< at >< at > -753,7 +820,12 < at >< at >
pa.setCanRun(false);
// System.out.println(t.getP().exitValue()); when process is killed, this throws exception
- return new ProcessResult(crs.getContent(), cre.getContent(), t.getP(), pa.wasTerminated(), t.getExitCode(), null);
+ ProcessResult pr=new ProcessResult(crs.getContent(), cre.getContent(), t.getP(), pa.wasTerminated(), t.getExitCode(), null);
+ if (PROCES_LOG) {
+ log(pr.stdout, true, false);
+ log(pr.stderr, false, true);
+ }
+ return pr;
}
/**
</pre>Jiri Vanek2012-05-25T12:55:28/hg/gfx-test: * src/org/gfxtest/testsuites/PrintTestLines.java:
http://comments.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/18726
<pre>changeset b56f62052e46 in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=b56f62052e46
author: Pavel Tisnovsky <ptisnovs-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Fri May 25 12:07:03 2012 +0200
* src/org/gfxtest/testsuites/PrintTestLines.java:
Added new tests to this test suite.
diffstat:
ChangeLog | 5 +
src/org/gfxtest/testsuites/PrintTestLines.java | 239 ++++++++++++++++++++++++-
2 files changed, 241 insertions(+), 3 deletions(-)
diffs (317 lines):
diff -r ab51d1f4d8ba -r b56f62052e46 ChangeLog
--- a/ChangeLogThu May 24 11:41:36 2012 +0200
+++ b/ChangeLogFri May 25 12:07:03 2012 +0200
< at >< at > -1,3 +1,8 < at >< at >
+2012-05-25 Pavel Tisnovsky <ptisnovs-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
+
+* src/org/gfxtest/testsuites/PrintTestLines.java:
+Added new tests to this test suite.
+
2012-05-24 Pavel Tisnovsky <ptisnovs-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
* src/org/gfxtest/framework/PrintTest.java:
diff -r ab51d1f4d8ba -r b56f62052e46 src/org/gfxtest/testsuites/PrintTestLines.java
--- a/src/org/gfxtest/testsuites/PrintTestLines.javaThu May 24 11:41:36 2012 +0200
+++ b/src/org/gfxtest/testsuites/PrintTestLines.javaFri May 25 12:07:03 2012 +0200
< at >< at > -114,6 +114,7 < at >< at >
// render the line
graphics.drawLine(x1, y, x2, y);
}
+
// cleanup rendering
horizontalLineDrawCallbacks.cleanup();
}
< at >< at > -156,6 +157,7 < at >< at >
// render the line
graphics.drawLine(x, y1, x, y2);
}
+
// cleanup rendering
verticalLineDrawCallbacks.cleanup();
}
< at >< at > -221,6 +223,7 < at >< at >
// render the line
graphics.drawLine(x1, y1, x2, y2);
}
+
// cleanup rendering
diagonalLineDrawCallbacks.cleanup();
}
< at >< at > -395,6 +398,7 < at >< at >
/**
* Test basic behavior of method Graphics.drawLine().
* Horizontal lines are rendered with various width and end caps set to CAP_ROUND.
+ * Join style is set bevel style.
* Color of all rendered lines are set to black.
*
* < at >param image
< at >< at > -432,6 +436,7 < at >< at >
/**
* Test basic behavior of method Graphics.drawLine().
* Horizontal lines are rendered with various width and end caps set to CAP_SQUARE.
+ * Join style is set bevel style.
* Color of all rendered lines are set to black.
*
* < at >param image
< at >< at > -468,6 +473,234 < at >< at >
/**
* Test basic behavior of method Graphics.drawLine().
+ * Horizontal lines are rendered with various width and end caps set to CAP_BUTT.
+ * Join style is set miter style.
+ * Color of all rendered lines are set to black.
+ *
+ * < at >param image
+ * image to which lines are to be drawn
+ * < at >param graphics2d
+ * graphics canvas
+ * < at >return test result status - PASSED, FAILED or ERROR
+ */
+ public TestResult testDrawHorizontalLinesChangeWidthCapButtJoinMiter(TestImage image, Graphics2D graphics)
+ {
+ drawHorizontalLines(image, graphics, VERTICAL_STEP << 1, new HorizontalLineDrawCallbacks()
+ {
+ /**
+ * Stroke width.
+ */
+ float strokeWidth = 0.0f;
+
+ /**
+ * Callback function called before each line is rendered.
+ */
+ < at >Override
+ public void iterationCallBack(int y, int index)
+ {
+ // set stroke width
+ this.graphics.setStroke(new BasicStroke(this.strokeWidth, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER));
+ // set new stroke width
+ this.strokeWidth = this.strokeWidth < MAX_STROKE_WIDTH ? this.strokeWidth + STROKE_WIDTH_DELTA : this.strokeWidth;
+ }
+ });
+
+ // test return value
+ return TestResult.PASSED;
+ }
+
+ /**
+ * Test basic behavior of method Graphics.drawLine().
+ * Horizontal lines are rendered with various width and end caps set to CAP_ROUND.
+ * Join style is set miter style.
+ * Color of all rendered lines are set to black.
+ *
+ * < at >param image
+ * image to which lines are to be drawn
+ * < at >param graphics2d
+ * graphics canvas
+ * < at >return test result status - PASSED, FAILED or ERROR
+ */
+ public TestResult testDrawHorizontalLinesChangeWidthCapRoundJoinMiter(TestImage image, Graphics2D graphics)
+ {
+ drawHorizontalLines(image, graphics, VERTICAL_STEP << 1, new HorizontalLineDrawCallbacks()
+ {
+ /**
+ * Stroke width.
+ */
+ float strokeWidth = 0.0f;
+
+ /**
+ * Callback function called before each line is rendered.
+ */
+ < at >Override
+ public void iterationCallBack(int y, int index)
+ {
+ // set stroke width
+ this.graphics.setStroke(new BasicStroke(this.strokeWidth, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER));
+ // set new stroke width
+ this.strokeWidth = this.strokeWidth < MAX_STROKE_WIDTH ? this.strokeWidth + STROKE_WIDTH_DELTA : this.strokeWidth;
+ }
+ });
+
+ // test return value
+ return TestResult.PASSED;
+ }
+
+ /**
+ * Test basic behavior of method Graphics.drawLine().
+ * Horizontal lines are rendered with various width and end caps set to CAP_SQUARE.
+ * Join style is set miter style.
+ * Color of all rendered lines are set to black.
+ *
+ * < at >param image
+ * image to which lines are to be drawn
+ * < at >param graphics2d
+ * graphics canvas
+ * < at >return test result status - PASSED, FAILED or ERROR
+ */
+ public TestResult testDrawHorizontalLinesChangeWidthCapSquareJoinMiter(TestImage image, Graphics2D graphics)
+ {
+ drawHorizontalLines(image, graphics, VERTICAL_STEP << 1, new HorizontalLineDrawCallbacks()
+ {
+ /**
+ * Stroke width.
+ */
+ float strokeWidth = 0.0f;
+
+ /**
+ * Callback function called before each line is rendered.
+ */
+ < at >Override
+ public void iterationCallBack(int y, int index)
+ {
+ // set stroke width
+ this.graphics.setStroke(new BasicStroke(this.strokeWidth, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_MITER));
+ // set new stroke width
+ this.strokeWidth = this.strokeWidth < MAX_STROKE_WIDTH ? this.strokeWidth + STROKE_WIDTH_DELTA : this.strokeWidth;
+ }
+ });
+
+ // test return value
+ return TestResult.PASSED;
+ }
+
+ /**
+ * Test basic behavior of method Graphics.drawLine().
+ * Horizontal lines are rendered with various width and end caps set to CAP_BUTT.
+ * Join style is set round style.
+ * Color of all rendered lines are set to black.
+ *
+ * < at >param image
+ * image to which lines are to be drawn
+ * < at >param graphics2d
+ * graphics canvas
+ * < at >return test result status - PASSED, FAILED or ERROR
+ */
+ public TestResult testDrawHorizontalLinesChangeWidthCapButtJoinRound(TestImage image, Graphics2D graphics)
+ {
+ drawHorizontalLines(image, graphics, VERTICAL_STEP << 1, new HorizontalLineDrawCallbacks()
+ {
+ /**
+ * Stroke width.
+ */
+ float strokeWidth = 0.0f;
+
+ /**
+ * Callback function called before each line is rendered.
+ */
+ < at >Override
+ public void iterationCallBack(int y, int index)
+ {
+ // set stroke width
+ this.graphics.setStroke(new BasicStroke(this.strokeWidth, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND));
+ // set new stroke width
+ this.strokeWidth = this.strokeWidth < MAX_STROKE_WIDTH ? this.strokeWidth + STROKE_WIDTH_DELTA : this.strokeWidth;
+ }
+ });
+
+ // test return value
+ return TestResult.PASSED;
+ }
+
+ /**
+ * Test basic behavior of method Graphics.drawLine().
+ * Horizontal lines are rendered with various width and end caps set to CAP_ROUND.
+ * Join style is set round style.
+ * Color of all rendered lines are set to black.
+ *
+ * < at >param image
+ * image to which lines are to be drawn
+ * < at >param graphics2d
+ * graphics canvas
+ * < at >return test result status - PASSED, FAILED or ERROR
+ */
+ public TestResult testDrawHorizontalLinesChangeWidthCapRoundJoinRound(TestImage image, Graphics2D graphics)
+ {
+ drawHorizontalLines(image, graphics, VERTICAL_STEP << 1, new HorizontalLineDrawCallbacks()
+ {
+ /**
+ * Stroke width.
+ */
+ float strokeWidth = 0.0f;
+
+ /**
+ * Callback function called before each line is rendered.
+ */
+ < at >Override
+ public void iterationCallBack(int y, int index)
+ {
+ // set stroke width
+ this.graphics.setStroke(new BasicStroke(this.strokeWidth, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
+ // set new stroke width
+ this.strokeWidth = this.strokeWidth < MAX_STROKE_WIDTH ? this.strokeWidth + STROKE_WIDTH_DELTA : this.strokeWidth;
+ }
+ });
+
+ // test return value
+ return TestResult.PASSED;
+ }
+
+ /**
+ * Test basic behavior of method Graphics.drawLine().
+ * Horizontal lines are rendered with various width and end caps set to CAP_SQUARE.
+ * Join style is set round style.
+ * Color of all rendered lines are set to black.
+ *
+ * < at >param image
+ * image to which lines are to be drawn
+ * < at >param graphics2d
+ * graphics canvas
+ * < at >return test result status - PASSED, FAILED or ERROR
+ */
+ public TestResult testDrawHorizontalLinesChangeWidthCapSquareJoinRound(TestImage image, Graphics2D graphics)
+ {
+ drawHorizontalLines(image, graphics, VERTICAL_STEP << 1, new HorizontalLineDrawCallbacks()
+ {
+ /**
+ * Stroke width.
+ */
+ float strokeWidth = 0.0f;
+
+ /**
+ * Callback function called before each line is rendered.
+ */
+ < at >Override
+ public void iterationCallBack(int y, int index)
+ {
+ // set stroke width
+ this.graphics.setStroke(new BasicStroke(this.strokeWidth, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_ROUND));
+ // set new stroke width
+ this.strokeWidth = this.strokeWidth < MAX_STROKE_WIDTH ? this.strokeWidth + STROKE_WIDTH_DELTA : this.strokeWidth;
+ }
+ });
+
+ // test return value
+ return TestResult.PASSED;
+ }
+
+ /**
+ * Test basic behavior of method Graphics.drawLine().
* Vertical lines are rendered with default width and default end caps.
* Color of all rendered lines are set to black.
*
< at >< at > -606,7 +839,7 < at >< at >
* graphics canvas
* < at >return test result status - PASSED, FAILED or ERROR
*/
- public TestResult testDrawVerticalLinesChangeWidthCapButt(TestImage image, Graphics2D graphics)
+ public TestResult testDrawVerticalLinesChangeWidthCapButtJoinBevel(TestImage image, Graphics2D graphics)
{
drawVerticalLines(image, graphics, HORIZONTAL_STEP << 1, new VerticalLineDrawCallbacks()
{
< at >< at > -643,7 +876,7 < at >< at >
* graphics canvas
* < at >return test result status - PASSED, FAILED or ERROR
*/
- public TestResult testDrawVerticalLinesChangeWidthCapRound(TestImage image, Graphics2D graphics)
+ public TestResult testDrawVerticalLinesChangeWidthCapRoundJoinBevel(TestImage image, Graphics2D graphics)
{
drawVerticalLines(image, graphics, HORIZONTAL_STEP << 1, new VerticalLineDrawCallbacks()
{
< at >< at > -680,7 +913,7 < at >< at >
* graphics canvas
* < at >return test result status - PASSED, FAILED or ERROR
*/
- public TestResult testDrawVerticalLinesChangeWidthCapSquare(TestImage image, Graphics2D graphics)
+ public TestResult testDrawVerticalLinesChangeWidthCapSquareJoinBevel(TestImage image, Graphics2D graphics)
{
drawVerticalLines(image, graphics, HORIZONTAL_STEP << 1, new VerticalLineDrawCallbacks()
{
</pre>ptisnovs-HMOWzH9t1bryS2n3IP37Vh1hho49/T1E< at >public.gmane.org2012-05-25T10:04:21/hg/icedtea-web: Fixed spaces -> tabs in ChangeLog
http://comments.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/18720
<pre>changeset 2c84a314c411 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2c84a314c411
author: Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Thu May 24 15:37:30 2012 -0400
Fixed spaces -> tabs in ChangeLog
diffstat:
ChangeLog | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diffs (21 lines):
diff -r c6e355e0c034 -r 2c84a314c411 ChangeLog
--- a/ChangeLogThu May 24 14:59:04 2012 -0400
+++ b/ChangeLogThu May 24 15:37:30 2012 -0400
< at >< at > -1,7 +1,7 < at >< at >
2012-05-23 Martin Olsson <martin-Gwph8TgvYLDLoDKTGw+V6w< at >public.gmane.org>
- * plugin/icedteanp/IcedTeaPluginUtils.cc:
- Tiny fixup for changeset 383; don't do free(stack_variable).
+* plugin/icedteanp/IcedTeaPluginUtils.cc:
+Tiny fixup for changeset 383; don't do free(stack_variable).
2012-05-20 Jiri Vanek <jvanek-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
< at >< at > -23,6 +23,7 < at >< at >
If there is no match, will not be included.
2012-05-24 Martin Olsson <martin-Gwph8TgvYLDLoDKTGw+V6w< at >public.gmane.org>
+
* plugin/icedteanp/IcedTeaPluginUtils.cc:
Fix two typos.
</pre>adomurad-HMOWzH9t1bryS2n3IP37Vh1hho49/T1E< at >public.gmane.org2012-05-24T19:38:11/hg/icedtea-web: Removed residual free(str) on stack variable.
http://comments.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/18718
<pre>changeset c6e355e0c034 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c6e355e0c034
author: Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Thu May 24 14:59:04 2012 -0400
Removed residual free(str) on stack variable.
diffstat:
ChangeLog | 5 +++++
plugin/icedteanp/IcedTeaPluginUtils.cc | 1 -
2 files changed, 5 insertions(+), 1 deletions(-)
diffs (23 lines):
diff -r 7b3855664763 -r c6e355e0c034 ChangeLog
--- a/ChangeLogThu May 24 19:57:14 2012 +0200
+++ b/ChangeLogThu May 24 14:59:04 2012 -0400
< at >< at > -1,3 +1,8 < at >< at >
+2012-05-23 Martin Olsson <martin-Gwph8TgvYLDLoDKTGw+V6w< at >public.gmane.org>
+
+ * plugin/icedteanp/IcedTeaPluginUtils.cc:
+ Tiny fixup for changeset 383; don't do free(stack_variable).
+
2012-05-20 Jiri Vanek <jvanek-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Reproducers engine enhanced for jars in subdirectories by "." naming convention
diff -r 7b3855664763 -r c6e355e0c034 plugin/icedteanp/IcedTeaPluginUtils.cc
--- a/plugin/icedteanp/IcedTeaPluginUtils.ccThu May 24 19:57:14 2012 +0200
+++ b/plugin/icedteanp/IcedTeaPluginUtils.ccThu May 24 14:59:04 2012 -0400
< at >< at > -707,7 +707,6 < at >< at >
}
else if (NPVARIANT_IS_STRING(variant))
{
- free(str);
#if MOZILLA_VERSION_COLLAPSED < 1090200
size_t buffersize = sizeof(char)*NPVARIANT_TO_STRING(variant).utf8length;
largestr = (char*) malloc(buffersize);
</pre>adomurad-HMOWzH9t1bryS2n3IP37Vh1hho49/T1E< at >public.gmane.org2012-05-24T18:59:11/hg/icedtea-web: 2 new changesets
http://comments.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/18714
<pre>changeset 52fbab80caf4 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=52fbab80caf4
author: Jiri Vanek <jvanek-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Thu May 24 19:52:17 2012 +0200
Introduced whitelist for reproducers
changeset 7b3855664763 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=7b3855664763
author: Jiri Vanek <jvanek-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Thu May 24 19:57:14 2012 +0200
Reproducers engine enhanced for jars in subdirectories by "." naming convention
diffstat:
ChangeLog | 19 ++++++++++++++++
Makefile.am | 54 ++++++++++++++++++++++++++++++++++++++++++++--
netx-dist-tests-whitelist | 1 +
3 files changed, 71 insertions(+), 3 deletions(-)
diffs (122 lines):
diff -r 2c4154754aef -r 7b3855664763 ChangeLog
--- a/ChangeLogThu May 24 10:31:44 2012 -0400
+++ b/ChangeLogThu May 24 19:57:14 2012 +0200
< at >< at > -1,3 +1,22 < at >< at >
+2012-05-20 Jiri Vanek <jvanek-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
+
+Reproducers engine enhanced for jars in subdirectories by "." naming convention
+* Makefile.am: (stamps/change-dots-to-paths.stamp) new target to copy jars
+with dots (.jar omitted) to the java-like package/directory structure in
+jnlp_test_server
+(EXPORTED_TEST_CERT) now depends on stamps/change-dots-to-paths.stamp
+(clean-netx-dist-tests) removes stamps/change-dots-to-paths.stamp too.
+
+2012-05-24 Jiri Vanek <jvanek-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
+
+Introduced whitelist for reproducers
+* netx-dist-tests-whitelist: new file, contains regular expressions
+(separated by space) for expr to select testcases which only will be
+run. By default set to all by expression .*
+* Makefile.am: (REPRODUCERS_CLASS_NAMES) When class with testcases is
+going to be included in list, it is at first check for match in whitelist.
+If there is no match, will not be included.
+
2012-05-24 Martin Olsson <martin-Gwph8TgvYLDLoDKTGw+V6w< at >public.gmane.org>
* plugin/icedteanp/IcedTeaPluginUtils.cc:
Fix two typos.
diff -r 2c4154754aef -r 7b3855664763 Makefile.am
--- a/Makefile.amThu May 24 10:31:44 2012 -0400
+++ b/Makefile.amThu May 24 19:57:14 2012 +0200
< at >< at > -32,6 +32,7 < at >< at >
JUNIT_RUNNER_JAR=$(abs_top_builddir)/junit-runner.jar
UNIT_CLASS_NAMES = $(abs_top_builddir)/unit_class_names
REPRODUCERS_CLASS_NAMES = $(abs_top_builddir)/reproducers_class_names
+REPRODUCERS_CLASS_WHITELIST = $(abs_top_builddir)/netx-dist-tests-whitelist
EMMA_JAVA_ARGS=-Xmx2G
META_MANIFEST = META-INF/MANIFEST.MF
< at >< at > -544,8 +545,40 < at >< at >
mkdir -p stamps && \
touch $< at >
+stamps/change-dots-to-paths.stamp: stamps/netx-dist-tests-sign-some-reproducers.stamp
+pushd $(JNLP_TESTS_SERVER_DEPLOYDIR); \
+types=(simple signed); \
+for which in "$${types[< at >]}" ; do \
+ . $(abs_top_srcdir)/NEW_LINE_IFS ; \
+ simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
+ IFS="$$IFS_BACKUP" ; \
+ for dir in "$${simpleReproducers[< at >]}" ; do \
+ if test "$${dir:0:1}" = "." ; then \
+ echo "reproducer $$dir starts with dot. It is forbidden" ; \
+ exit 5; \
+ fi; \
+ if test "$${dir:(-1)}" = "." ; then \
+ echo "reproducer $$dir ends with dot. It is forbidden" ; \
+ exit 5; \
+ fi; \
+ q=`expr index "$$dir" .`; \
+ r=$$? ; \
+ if [ $$r = 0 ]; then \
+ slashed_dir="./$${dir//.//}" ; \
+ path="`dirname $$slashed_dir`" ; \
+ file="`basename $$slashed_dir`.jar" ; \
+ echo "copying $$dir.jar to $$path as $$file" ; \
+ mkdir --parents $$path ; \
+ cp $$dir".jar" "$$path"/"$$file" ; \
+ fi ; \
+ done ; \
+done ; \
+popd ; \
+mkdir -p stamps && \
+touch $< at >
+
#this always tries to remove previous testcert
-$(EXPORTED_TEST_CERT): stamps/netx-dist-tests-sign-some-reproducers.stamp netx-dist-tests-remove-cert-from-public
+$(EXPORTED_TEST_CERT): stamps/change-dots-to-paths.stamp netx-dist-tests-remove-cert-from-public
keytool -export -alias $(TEST_CERT_ALIAS) -file $(EXPORTED_TEST_CERT) -storepass $(PRIVATE_KEYSTORE_PASS) -keystore $(PRIVATE_KEYSTORE_NAME)
stamps/netx-dist-tests-import-cert-to-public: $(EXPORTED_TEST_CERT)
< at >< at > -587,13 +620,27 < at >< at >
mkdir -p stamps && \
touch $< at >
-$(REPRODUCERS_CLASS_NAMES):
+$(REPRODUCERS_CLASS_NAMES): $(REPRODUCERS_CLASS_WHITELIST)
+whiteListed=`cat $(REPRODUCERS_CLASS_WHITELIST)`; \
cd $(JNLP_TESTS_ENGINE_DIR) ; \
class_names= ; \
for test in `find -type f` ; do \
class_name=`echo $$test | sed -e 's|\.class$$||' -e 's|^\./||'` ; \
class_name=`echo $$class_name | sed -e 's|/|.|g' ` ; \
- class_names="$$class_names $$class_name" ; \
+ INLCUDE="NO" ; \
+ for x in $$whiteListed ; do \
+ q=`expr match "$$class_name" "$$x"`; \
+ r=$$? ; \
+ if [ $$r = 0 ]; then \
+ echo "$$class_name will be included in reproducers testcases because of $$x pattern in $(REPRODUCERS_CLASS_WHITELIST). Matching was $$q"; \
+ INLCUDE="YES" ; \
+ fi; \
+ done; \
+ if [ "$$INLCUDE" = "YES" ]; then \
+ class_names="$$class_names $$class_name" ; \
+ else \
+ echo "$$class_name had no match in $(REPRODUCERS_CLASS_WHITELIST). Excluding"; \
+ fi; \
done ; \
echo $$class_names > $(REPRODUCERS_CLASS_NAMES)
< at >< at > -955,6 +1002,7 < at >< at >
rm -f stamps/netx-dist-tests-prepare-reproducers.stamp
rm -f stamps/netx-dist-tests-compile-testcases.stamp
rm -f stamps/netx-dist-tests-sign-some-reproducers.stamp
+rm -f stamps/change-dots-to-paths.stamp
rm -f junit-jnlp-dist-simple.txt
rm -f junit-jnlp-dist-signed.txt
rm -f $(REPRODUCERS_CLASS_NAMES)
diff -r 2c4154754aef -r 7b3855664763 netx-dist-tests-whitelist
--- /dev/nullThu Jan 01 00:00:00 1970 +0000
+++ b/netx-dist-tests-whitelistThu May 24 19:57:14 2012 +0200
< at >< at > -0,0 +1,1 < at >< at >
+.*
</pre>jvanek-HMOWzH9t1bryS2n3IP37Vh1hho49/T1E< at >public.gmane.org2012-05-24T17:54:39[rfc][icedtea-web] Removal of 'magic' numbers and more consistentbuffer sizes in C++ side of plugin
http://comments.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/18704
<pre>Hey all. This is a response to comments from Pavel on a patch that I
created earlier. I decided to re-post with [rfc] in the name to be
clear. This addresses the issue of magic numbers being used for the
buffer sizes, and the somewhat unclear 'sizeof' usage (that I originally
used) to get the buffer size. As well it avoids using snprintf for
emptying a string, opting for the somewhat clearer strcpy.
Changelog:
2012-05-23 Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Removed instances of snprintf where buffer size was not known.
Added
buffer size constant for allocating buffers for numeric
conversions.
* plugin/icedteanp/IcedTeaNPPlugin.cc: Removed usage of snprintf
for
simple blanking of strings. Buffer size was misguided
previously.
Used NUM_STR_BUFFER_SIZE constant to replace magic numbers.
* plugin/icedteanp/IcedTeaPluginUtils.cc: Made
NPVariantToString(NPVariant variant, std::string* result) use
space
indentation. Used NUM_STR_BUFFER_SIZE constant to replace magic
numbers.
* plugin/icedteanp/IcedTeaPluginUtils.h: Added constant,
NUM_STR_BUFFER_SIZE.
</pre>Adam Domurad2012-05-24T14:59:18/hg/MauveTestCoverage: * src/ReportGenerator.java:
http://comments.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/18703
<pre>changeset 8d326a855021 in /hg/MauveTestCoverage
details: http://icedtea.classpath.org/hg/MauveTestCoverage?cmd=changeset;node=8d326a855021
author: Pavel Tisnovsky <ptisnovs-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Thu May 24 16:55:09 2012 +0200
* src/ReportGenerator.java:
Fixed an exception occuring when class list
contains an empty line (usually at the end
of file).
diffstat:
ChangeLog | 7 +++++++
src/ReportGenerator.java | 10 +++++++++-
2 files changed, 16 insertions(+), 1 deletions(-)
diffs (34 lines):
diff -r b6c8372f5723 -r 8d326a855021 ChangeLog
--- a/ChangeLogWed May 16 10:59:45 2012 +0200
+++ b/ChangeLogThu May 24 16:55:09 2012 +0200
< at >< at > -1,3 +1,10 < at >< at >
+2012-05-24 Pavel Tisnovsky <ptisnovs-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
+
+* src/ReportGenerator.java:
+Fixed an exception occuring when class list
+contains an empty line (usually at the end
+of file).
+
2012-05-16 Pavel Tisnovsky <ptisnovs-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
* src/ClassInfo.java:
diff -r b6c8372f5723 -r 8d326a855021 src/ReportGenerator.java
--- a/src/ReportGenerator.javaWed May 16 10:59:45 2012 +0200
+++ b/src/ReportGenerator.javaThu May 24 16:55:09 2012 +0200
< at >< at > -71,7 +71,15 < at >< at >
// set of classes should be sorted
Set<String> allClasses = new TreeSet<String>();
// add all lines read from a file to a set (and sort them)
- allClasses.addAll(fileContent);
+ // we have to exclude all empty lines
+ for (String className : fileContent)
+ {
+ // add only non empty lines
+ if (className != null && !className.trim().isEmpty())
+ {
+ allClasses.add(className.trim());
+ }
+ }
return allClasses;
}
</pre>ptisnovs-HMOWzH9t1bryS2n3IP37Vh1hho49/T1E< at >public.gmane.org2012-05-24T14:52:36/hg/icedtea-web: 3 new changesets
http://comments.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/18701
<pre>changeset f19299dd8144 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=f19299dd8144
author: Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Thu May 24 10:21:14 2012 -0400
Backed out changeset 43a78616b1dd
changeset bb68413d52fb in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=bb68413d52fb
author: Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Thu May 24 10:28:47 2012 -0400
Finished commit rollbacks.
changeset 2c4154754aef in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2c4154754aef
author: Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Thu May 24 10:31:44 2012 -0400
Reapplied the patches, sorry for the mess!
diffstat:
ChangeLog | 58 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 9 deletions(-)
diffs (75 lines):
diff -r 43a78616b1dd -r 2c4154754aef ChangeLog
--- a/ChangeLogThu May 24 09:12:38 2012 -0400
+++ b/ChangeLogThu May 24 10:31:44 2012 -0400
< at >< at > -2,6 +2,46 < at >< at >
* plugin/icedteanp/IcedTeaPluginUtils.cc:
Fix two typos.
+2012-05-23 Deepak Bhole <dbhole-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
+
+* AUTHORS: Added Martin Olsson to list.
+
+2012-05-23 Martin Olsson <martin-Gwph8TgvYLDLoDKTGw+V6w< at >public.gmane.org>
+
+* plugin/icedteanp/IcedTeaNPPlugin.cc:
+Use g_mutex_free instead of g_free to free appletviewer_mutex (fixes
+crash).
+
+2012-05-23 Deepak Bhole <dbhole-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
+
+* ChangeLog: Converted spaces to tabs in an older entry
+
+2012-05-23 Jiri Vanek <jvanek-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
+
+* netx/net/sourceforge/jnlp/resources/Messages.properties: fixed error
+in PBadNonrelativeUrl
+
+2012-05-23 Jiri Vanek <jvanek-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
+
+Added more debugging outputs
+* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
+(getCodeSourceSecurity): added output message when no SecurityDesc is found
+for some url/resource
+* netx/net/sourceforge/jnlp/resources/Messages.properties: added LNoSecInstance
+and LCertFoundIn values
+* netx/net/sourceforge/jnlp/security/KeyStores.java: (getPathToKeystore):
+new method, able to search for file used for creating of KeyStore if possible
+* netx/net/sourceforge/jnlp/security/CertificateUtils.java: (inKeyStores)
+using getPathToKeystore for debug output
+
+2012-05-23 Jiri Vanek <jvanek-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
+
+* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: (getPermissions):
+Any exception from this method is consumed somewhere. I have cough exception,
+reprint it in debug mode and re-throw (to be lost). Main condition in this
+method had several possible NullPointer exceptions. Separated and thrown before
+this condition.
+
2012-05-23 Jiri Vanek <jvanek-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Enhanced about dialog
< at >< at > -22,15 +62,15 < at >< at >
2012-05-22 Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
- Changed allocation of small, fixed-size buffers to stack-based
- allocations. Changed occurences of sprintf to the safer function
- snprintf, added buffer information. While unlikely to change
- functionality, snprintf adds an extra check to prevent buffer
- overflows.
- * plugin/icedteanp/IcedTeaNPPlugin.cc: Allocation of small buffers
- using malloc changed to stack allocation & changed sprintf calls to
- buffer-size aware snprintf calls.
- * plugin/icedteanp/IcedTeaPluginUtils.cc: Same as above.
+Changed allocation of small, fixed-size buffers to stack-based
+allocations. Changed occurences of sprintf to the safer function
+snprintf, added buffer information. While unlikely to change
+functionality, snprintf adds an extra check to prevent buffer
+overflows.
+* plugin/icedteanp/IcedTeaNPPlugin.cc: Allocation of small buffers
+using malloc changed to stack allocation & changed sprintf calls to
+buffer-size aware snprintf calls.
+* plugin/icedteanp/IcedTeaPluginUtils.cc: Same as above.
2012-05-22 Jiri Vanek <jvanek-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
</pre>adomurad-HMOWzH9t1bryS2n3IP37Vh1hho49/T1E< at >public.gmane.org2012-05-24T14:34:28/hg/icedtea-web: 2 new changesets
http://comments.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/18698
<pre>changeset cb6d6d2e086a in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=cb6d6d2e086a
author: Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Thu May 24 09:10:41 2012 -0400
Added Martin Olsson's typo fix
changeset 43a78616b1dd in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=43a78616b1dd
author: Adam Domurad <adomurad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Thu May 24 09:12:38 2012 -0400
fixing conflict in ChangeLog
diffstat:
AUTHORS | 1 +
ChangeLog | 4 +
netx/net/sourceforge/jnlp/resources/Messages.properties | 6 +-
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 89 ++++++++++-----
netx/net/sourceforge/jnlp/security/CertificateUtils.java | 3 +-
netx/net/sourceforge/jnlp/security/KeyStores.java | 15 ++
plugin/icedteanp/IcedTeaNPPlugin.cc | 4 +-
plugin/icedteanp/IcedTeaPluginUtils.cc | 4 +-
8 files changed, 88 insertions(+), 38 deletions(-)
diffs (267 lines):
diff -r 7041304bfc62 -r 43a78616b1dd AUTHORS
--- a/AUTHORSWed May 23 14:56:30 2012 +0200
+++ b/AUTHORSThu May 24 09:12:38 2012 -0400
< at >< at > -17,6 +17,7 < at >< at >
Jon A. Maxwell <jmaxwell-Rn4VEauK+AKRv+LV9MX5uipxlwaOVQ5f< at >public.gmane.org>
Thomas Meyer <thomas-VsYtu1Qij5c< at >public.gmane.org>
Saad Mohammad <smohammad-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
+Martin Olsson <martin-Gwph8TgvYLDLoDKTGw+V6w< at >public.gmane.org>
Andrew Su <asu-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Joshua Sumali <jsumali-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Jiri Vanek <jvanek-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
diff -r 7041304bfc62 -r 43a78616b1dd ChangeLog
--- a/ChangeLogWed May 23 14:56:30 2012 +0200
+++ b/ChangeLogThu May 24 09:12:38 2012 -0400
< at >< at > -1,3 +1,7 < at >< at >
+2012-05-24 Martin Olsson <martin-Gwph8TgvYLDLoDKTGw+V6w< at >public.gmane.org>
+* plugin/icedteanp/IcedTeaPluginUtils.cc:
+Fix two typos.
+
2012-05-23 Jiri Vanek <jvanek-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
Enhanced about dialog
diff -r 7041304bfc62 -r 43a78616b1dd netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.propertiesWed May 23 14:56:30 2012 +0200
+++ b/netx/net/sourceforge/jnlp/resources/Messages.propertiesThu May 24 09:12:38 2012 -0400
< at >< at > -81,7 +81,9 < at >< at >
LSignedAppJarUsingUnsignedJar=Signed application using unsigned jars.
LSignedAppJarUsingUnsignedJarInfo=The main application jar is signed, but some of the jars it is using aren't.
LSignedJNLPFileDidNotMatch=The signed JNLP file did not match the launching JNLP file.
-
+LNoSecInstance=Error: No security instance for {0}. The application may have trouble continuing
+LCertFoundIn={0} found in cacerts ({1})
+
JNotApplet=File is not an applet.
JNotApplication=File is not an application.
JNotComponent=File is not a component.
< at >< at > -122,7 +124,7 < at >< at >
PBadHeight=Invalid applet height.
PUrlNotInCodebase=Relative URL does not specify a subdirectory of the codebase. (node={0}, href={1}, base={2})
PBadRelativeUrl=Invalid relative URL (node={0}, href={1}, base={2})
-PBadNonrelativeUrl=Invalid non-relative URL (node={0}, href={0}).
+PBadNonrelativeUrl=Invalid non-relative URL (node={0}, href={1})
PNeedsAttribute=The {0} element must specify a {1} attribute.
PBadXML=Invalid XML document syntax.
PBadHeapSize=Invalid value for heap size ({0})
diff -r 7041304bfc62 -r 43a78616b1dd netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.javaWed May 23 14:56:30 2012 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.javaThu May 24 09:12:38 2012 -0400
< at >< at > -895,44 +895,66 < at >< at >
* Returns the permissions for the CodeSource.
*/
protected PermissionCollection getPermissions(CodeSource cs) {
- Permissions result = new Permissions();
+ try {
+ Permissions result = new Permissions();
- // should check for extensions or boot, automatically give all
- // access w/o security dialog once we actually check certificates.
+ // should check for extensions or boot, automatically give all
+ // access w/o security dialog once we actually check certificates.
- // copy security permissions from SecurityDesc element
- if (security != null) {
- // Security desc. is used only to track security settings for the
- // application. However, an application may comprise of multiple
- // jars, and as such, security must be evaluated on a per jar basis.
+ // copy security permissions from SecurityDesc element
+ if (security != null) {
+ // Security desc. is used only to track security settings for the
+ // application. However, an application may comprise of multiple
+ // jars, and as such, security must be evaluated on a per jar basis.
- // set default perms
- PermissionCollection permissions = security.getSandBoxPermissions();
+ // set default perms
+ PermissionCollection permissions = security.getSandBoxPermissions();
- // If more than default is needed:
- // 1. Code must be signed
- // 2. ALL or J2EE permissions must be requested (note: plugin requests ALL automatically)
- if (cs.getCodeSigners() != null &&
- (getCodeSourceSecurity(cs.getLocation()).getSecurityType().equals(SecurityDesc.ALL_PERMISSIONS) ||
- getCodeSourceSecurity(cs.getLocation()).getSecurityType().equals(SecurityDesc.J2EE_PERMISSIONS))) {
+ // If more than default is needed:
+ // 1. Code must be signed
+ // 2. ALL or J2EE permissions must be requested (note: plugin requests ALL automatically)
+ if (cs == null) {
+ throw new RuntimeException("Code source was null");
+ }
+ if (cs.getLocation() == null) {
+ throw new RuntimeException("Code source location was null");
+ }
+ if (getCodeSourceSecurity(cs.getLocation()) == null) {
+ throw new RuntimeException("Code source security was null");
+ }
+ if (getCodeSourceSecurity(cs.getLocation()).getSecurityType() == null) {
+ throw new RuntimeException("Code source security type was null");
+ }
+ if (cs.getCodeSigners() != null
+ && (getCodeSourceSecurity(cs.getLocation()).getSecurityType().equals(SecurityDesc.ALL_PERMISSIONS)
+ || getCodeSourceSecurity(cs.getLocation()).getSecurityType().equals(SecurityDesc.J2EE_PERMISSIONS))) {
- permissions = getCodeSourceSecurity(cs.getLocation()).getPermissions(cs);
+ permissions = getCodeSourceSecurity(cs.getLocation()).getPermissions(cs);
+ }
+
+ Enumeration<Permission> e = permissions.elements();
+ while (e.hasMoreElements()) {
+ result.add(e.nextElement());
+ }
}
- Enumeration<Permission> e = permissions.elements();
- while (e.hasMoreElements())
- result.add(e.nextElement());
+ // add in permission to read the cached JAR files
+ for (int i = 0; i < resourcePermissions.size(); i++) {
+ result.add(resourcePermissions.get(i));
+ }
+
+ // add in the permissions that the user granted.
+ for (int i = 0; i < runtimePermissions.size(); i++) {
+ result.add(runtimePermissions.get(i));
+ }
+
+ return result;
+ } catch (RuntimeException ex) {
+ if (JNLPRuntime.isDebug()) {
+ ex.printStackTrace();
+ }
+ throw ex;
}
-
- // add in permission to read the cached JAR files
- for (int i = 0; i < resourcePermissions.size(); i++)
- result.add(resourcePermissions.get(i));
-
- // add in the permissions that the user granted.
- for (int i = 0; i < runtimePermissions.size(); i++)
- result.add(runtimePermissions.get(i));
-
- return result;
}
protected void addPermission(Permission p) {
< at >< at > -1732,7 +1754,12 < at >< at >
*/
protected SecurityDesc getCodeSourceSecurity(URL source) {
- return jarLocationSecurityMap.get(source);
+ SecurityDesc sec=jarLocationSecurityMap.get(source);
+ if (sec == null){
+ System.out.println(Translator.R("LNoSecInstance",source.toString()));
+ }
+ return sec;
+
}
/**
diff -r 7041304bfc62 -r 43a78616b1dd netx/net/sourceforge/jnlp/security/CertificateUtils.java
--- a/netx/net/sourceforge/jnlp/security/CertificateUtils.javaWed May 23 14:56:30 2012 +0200
+++ b/netx/net/sourceforge/jnlp/security/CertificateUtils.javaThu May 24 09:12:38 2012 -0400
< at >< at > -60,6 +60,7 < at >< at >
import java.util.Random;
import net.sourceforge.jnlp.runtime.JNLPRuntime;
+import net.sourceforge.jnlp.runtime.Translator;
import net.sourceforge.jnlp.util.replacements.BASE64Encoder;
import sun.security.provider.X509Factory;
< at >< at > -173,7 +174,7 < at >< at >
if (c.equals(keyStores[i].getCertificate(alias))) {
if (JNLPRuntime.isDebug()) {
- System.out.println(c.getSubjectX500Principal().getName() + " found in cacerts");
+ System.out.println(Translator.R("LCertFoundIn", c.getSubjectX500Principal().getName(), KeyStores.getPathToKeystore(keyStores[i].hashCode())));
}
return true;
diff -r 7041304bfc62 -r 43a78616b1dd netx/net/sourceforge/jnlp/security/KeyStores.java
--- a/netx/net/sourceforge/jnlp/security/KeyStores.javaWed May 23 14:56:30 2012 +0200
+++ b/netx/net/sourceforge/jnlp/security/KeyStores.javaThu May 24 09:12:38 2012 -0400
< at >< at > -47,7 +47,9 < at >< at >
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.StringTokenizer;
import net.sourceforge.jnlp.config.DeploymentConfiguration;
< at >< at > -75,6 +77,8 < at >< at >
CLIENT_CERTS,
}
+ public static final Map<Integer,String> keystoresPaths=new HashMap<Integer, String>();
+
private static DeploymentConfiguration config = null;
private static final String KEYSTORE_TYPE = "JKS";
< at >< at > -133,12 +137,23 < at >< at >
KeyStore ks = null;
try {
ks = createKeyStoreFromFile(new File(location), create, DEFAULT_PASSWORD);
+ //hashcode is used instead of instance so when no references are left
+ //to keystore, then this will not be blocker for garbage collection
+ keystoresPaths.put(ks.hashCode(),location);
} catch (Exception e) {
e.printStackTrace();
}
return ks;
}
+ public static String getPathToKeystore(int k) {
+ String s = keystoresPaths.get(k);
+ if (s == null) {
+ return "unknown keystore location";
+ }
+ return s;
+ }
+
/**
* Returns an array of KeyStore that contain certificates that are trusted.
* The KeyStores contain certificates from different sources.
diff -r 7041304bfc62 -r 43a78616b1dd plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.ccWed May 23 14:56:30 2012 +0200
+++ b/plugin/icedteanp/IcedTeaNPPlugin.ccThu May 24 09:12:38 2012 -0400
< at >< at > -427,7 +427,7 < at >< at >
goto cleanup_done;
cleanup_appletviewer_mutex:
- g_free (data->appletviewer_mutex);
+ g_mutex_free (data->appletviewer_mutex);
data->appletviewer_mutex = NULL;
// cleanup_instance_string:
< at >< at > -2000,7 +2000,7 < at >< at >
tofree->window_width = 0;
// cleanup_appletviewer_mutex:
- g_free (tofree->appletviewer_mutex);
+ g_mutex_free (tofree->appletviewer_mutex);
tofree->appletviewer_mutex = NULL;
// cleanup_instance_string:
diff -r 7041304bfc62 -r 43a78616b1dd plugin/icedteanp/IcedTeaPluginUtils.cc
--- a/plugin/icedteanp/IcedTeaPluginUtils.ccWed May 23 14:56:30 2012 +0200
+++ b/plugin/icedteanp/IcedTeaPluginUtils.ccThu May 24 09:12:38 2012 -0400
< at >< at > -289,7 +289,7 < at >< at >
*
* < at >param str The string to split
* < at >param The delimiters to split on
- * < at >return A string vector containing the aplit components
+ * < at >return A string vector containing the split components
*/
std::vector<std::string*>*
< at >< at > -1068,7 +1068,7 < at >< at >
if(ret)
PLUGIN_DEBUG("Error: Unable to initialize message queue mutex: %d\n", ret);
-PLUGIN_DEBUG("Mutexs %p and %p initialized\n", &subscriber_mutex, &msg_queue_mutex);
+PLUGIN_DEBUG("Mutexes %p and %p initialized\n", &subscriber_mutex, &msg_queue_mutex);
}
/**
</pre>adomurad-HMOWzH9t1bryS2n3IP37Vh1hho49/T1E< at >public.gmane.org2012-05-24T13:12:42[Bug 1011] New: ZipException when a folder is in the classpath
http://comments.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/18696
<pre>http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1011
Priority: P3
Bug ID: 1011
CC: unassigned-HMOWzH9t1bryS2n3IP37Vh1hho49/T1E< at >public.gmane.org
Assignee: dbhole-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org
Summary: ZipException when a folder is in the classpath
Severity: normal
Classification: Unclassified
OS: Linux
Reporter: damieng-whniv8GeeGkdnm+yROfE0A< at >public.gmane.org
Hardware: x86_64
Status: NEW
Version: 1.2
Component: Plugin
Product: IcedTea-Web
I use an applet with the following archive attribute :
archive="MyApplet.jar,config/"
With the config folder in the classpath, it can load configuration files that
are not in a jar archive. This works well when Apache does not use the Indexes
option, there is just a warning about not finding config/. But when a web page
is generated for the folder, IcedTea throws the following ZipException because
it is trying to unzip the HTML as if it were a jar archive. The applet never
loads.
java.util.zip.ZipException: error in opening zip file
at java.util.zip.ZipFile.open(Native Method)
at java.util.zip.ZipFile.<init>(ZipFile.java:214)
at java.util.zip.ZipFile.<init>(ZipFile.java:144)
at java.util.jar.JarFile.<init>(JarFile.java:152)
at java.util.jar.JarFile.<init>(JarFile.java:103)
at net.sourceforge.jnlp.tools.JarSigner.verifyJar(JarSigner.java:241)
at net.sourceforge.jnlp.tools.JarSigner.verifyJars(JarSigner.java:201)
at
net.sourceforge.jnlp.runtime.JNLPClassLoader.verifyJars(JNLPClassLoader.java:1286)
at
net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader.java:476)
at
net.sourceforge.jnlp.runtime.JNLPClassLoader.<init>(JNLPClassLoader.java:201)
at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:320)
at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:701)
at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:676)
at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:886)
java.util.zip.ZipException: error in opening zip file
at java.util.zip.ZipFile.open(Native Method)
at java.util.zip.ZipFile.<init>(ZipFile.java:214)
at java.util.zip.ZipFile.<init>(ZipFile.java:144)
at java.util.jar.JarFile.<init>(JarFile.java:152)
at java.util.jar.JarFile.<init>(JarFile.java:103)
at net.sourceforge.jnlp.tools.JarSigner.verifyJar(JarSigner.java:241)
at net.sourceforge.jnlp.tools.JarSigner.verifyJars(JarSigner.java:201)
at
net.sourceforge.jnlp.runtime.JNLPClassLoader.verifyJars(JNLPClassLoader.java:1286)
at
net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader.java:476)
at
net.sourceforge.jnlp.runtime.JNLPClassLoader.<init>(JNLPClassLoader.java:201)
at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:320)
at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:701)
at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:676)
at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:886)
net.sourceforge.jnlp.LaunchException: Fatal: Initialization Error: Could not
initialize applet.
at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:735)
at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:676)
at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:886)
Caused by: net.sourceforge.jnlp.LaunchException: Fatal: Initialization Error: A
fatal error occurred while trying to verify jars.
at
net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader.java:482)
at
net.sourceforge.jnlp.runtime.JNLPClassLoader.<init>(JNLPClassLoader.java:201)
at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:320)
at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:701)
... 2 more
Caused by:
net.sourceforge.jnlp.LaunchException: Fatal: Initialization Error: A fatal
error occurred while trying to verify jars.
at
net.sourceforge.jnlp.runtime.JNLPClassLoader.initializeResources(JNLPClassLoader.java:482)
at
net.sourceforge.jnlp.runtime.JNLPClassLoader.<init>(JNLPClassLoader.java:201)
at
net.sourceforge.jnlp.runtime.JNLPClassLoader.getInstance(JNLPClassLoader.java:320)
at net.sourceforge.jnlp.Launcher.createApplet(Launcher.java:701)
at net.sourceforge.jnlp.Launcher.getApplet(Launcher.java:676)
at net.sourceforge.jnlp.Launcher$TgThread.run(Launcher.java:886)
java.lang.NullPointerException
at net.sourceforge.jnlp.NetxPanel.runLoader(NetxPanel.java:154)
at sun.applet.AppletPanel.run(AppletPanel.java:379)
at java.lang.Thread.run(Thread.java:722)
java.lang.NullPointerException
at sun.applet.AppletPanel.run(AppletPanel.java:429)
at java.lang.Thread.run(Thread.java:722)
</pre>bugzilla-daemon-HMOWzH9t1bryS2n3IP37Vh1hho49/T1E< at >public.gmane.org2012-05-24T12:36:00[Bug 1010] New: accessEventQueue exception when displaying a modaldialog in the event queue
http://comments.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/18695
<pre>http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1010
Priority: P3
Bug ID: 1010
CC: unassigned-HMOWzH9t1bryS2n3IP37Vh1hho49/T1E< at >public.gmane.org
Assignee: dbhole-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org
Summary: accessEventQueue exception when displaying a modal
dialog in the event queue
Severity: major
Classification: Unclassified
OS: Linux
Reporter: damieng-whniv8GeeGkdnm+yROfE0A< at >public.gmane.org
Hardware: x86_64
Status: NEW
Version: 1.2
Component: Plugin
Product: IcedTea-Web
Displaying a modal dialog in the event queue with JOptionPane results in the
following exception being raised. Firefox does not quit properly after the java
process is killed. I was using firefox 12. No problem occurs with Oracle JRE
and plugin.
Exception in thread "AWT-EventQueue-1" java.security.AccessControlException:
access denied ("java.awt.AWTPermission" "accessEventQueue")
at
java.security.AccessControlContext.checkPermission(AccessControlContext.java:366)
at
java.security.AccessController.checkPermission(AccessController.java:555)
at java.lang.SecurityManager.checkPermission(SecurityManager.java:549)
at
net.sourceforge.jnlp.runtime.JNLPSecurityManager.checkPermission(JNLPSecurityManager.java:284)
at
java.lang.SecurityManager.checkAwtEventQueueAccess(SecurityManager.java:1415)
at
net.sourceforge.jnlp.runtime.JNLPSecurityManager.checkAwtEventQueueAccess(JNLPSecurityManager.java:466)
at java.awt.Toolkit.getSystemEventQueue(Toolkit.java:1721)
at java.awt.Dialog.show(Dialog.java:1070)
at javax.swing.JOptionPane.showOptionDialog(JOptionPane.java:871)
at javax.swing.JOptionPane.showMessageDialog(JOptionPane.java:668)
at javax.swing.JOptionPane.showMessageDialog(JOptionPane.java:639)
</pre>bugzilla-daemon-HMOWzH9t1bryS2n3IP37Vh1hho49/T1E< at >public.gmane.org2012-05-24T09:46:57/hg/gfx-test: * src/org/gfxtest/framework/PrintTest.java:
http://comments.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/18694
<pre>changeset ab51d1f4d8ba in /hg/gfx-test
details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=ab51d1f4d8ba
author: Pavel Tisnovsky <ptisnovs-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
date: Thu May 24 11:41:36 2012 +0200
* src/org/gfxtest/framework/PrintTest.java:
Added new constants required by tests.
* src/org/gfxtest/testsuites/PrintTestArcs.java:
Basic functionality of this test suite.
diffstat:
ChangeLog | 7 +
src/org/gfxtest/framework/PrintTest.java | 10 +
src/org/gfxtest/testsuites/PrintTestArcs.java | 146 +++++++++++++++++++++++++-
3 files changed, 162 insertions(+), 1 deletions(-)
diffs (202 lines):
diff -r 9d3dfd9343a9 -r ab51d1f4d8ba ChangeLog
--- a/ChangeLogTue May 22 12:03:36 2012 +0200
+++ b/ChangeLogThu May 24 11:41:36 2012 +0200
< at >< at > -1,3 +1,10 < at >< at >
+2012-05-24 Pavel Tisnovsky <ptisnovs-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
+
+* src/org/gfxtest/framework/PrintTest.java:
+Added new constants required by tests.
+* src/org/gfxtest/testsuites/PrintTestArcs.java:
+Basic functionality of this test suite.
+
2012-05-22 Pavel Tisnovsky <ptisnovs-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
* src/org/gfxtest/testsuites/PrintTestCircles.java:
diff -r 9d3dfd9343a9 -r ab51d1f4d8ba src/org/gfxtest/framework/PrintTest.java
--- a/src/org/gfxtest/framework/PrintTest.javaTue May 22 12:03:36 2012 +0200
+++ b/src/org/gfxtest/framework/PrintTest.javaThu May 24 11:41:36 2012 +0200
< at >< at > -70,6 +70,16 < at >< at >
protected static final int CIRCLE_RADIUS_STEP = 10;
/**
+ * Offset between two arcs.
+ */
+ protected static final int ARC_RADIUS_STEP = 10;
+
+ /**
+ * Minimum radius of a circle or an arc.
+ */
+ protected static final int MINIMUM_RADIUS = 10;
+
+ /**
* Horizontal distance between two lines.
*/
protected static final int HORIZONTAL_STEP = 10;
diff -r 9d3dfd9343a9 -r ab51d1f4d8ba src/org/gfxtest/testsuites/PrintTestArcs.java
--- a/src/org/gfxtest/testsuites/PrintTestArcs.javaTue May 22 12:03:36 2012 +0200
+++ b/src/org/gfxtest/testsuites/PrintTestArcs.javaThu May 24 11:41:36 2012 +0200
< at >< at > -40,7 +40,14 < at >< at >
package org.gfxtest.testsuites;
+import java.awt.Color;
+import java.awt.Graphics2D;
+
+
+
import org.gfxtest.framework.PrintTest;
+import org.gfxtest.framework.TestImage;
+import org.gfxtest.framework.TestResult;
import org.gfxtest.framework.annotations.GraphicsPrimitive;
import org.gfxtest.framework.annotations.GraphicsPrimitives;
import org.gfxtest.framework.annotations.RenderStyle;
< at >< at > -65,7 +72,86 < at >< at >
< at >Zoom(1)
public class PrintTestArcs extends PrintTest
{
-
+
+ /**
+ * Method which renders set of arcs using various colors and
+ * stroke styles. For each arc, the callback function/method is called to
+ * perform all required setup.
+ *
+ * < at >param image
+ * image to which arcs are to be drawn
+ * < at >param graphics2d
+ * graphics canvas
+ * < at >param radiusStep
+ * between two near arcs
+ * < at >param arcDrawCallback
+ * class containing set of callback methods
+ */
+ private void drawArcs(TestImage image, Graphics2D graphics2d, int radiusStep, CommonArcDrawCallbacks arcDrawCallback)
+ {
+ // setup rendering
+ arcDrawCallback.setup(image, graphics2d);
+
+ // image width and height
+ final int width = image.getWidth();
+ final int height = image.getHeight();
+
+ // horizontal coordinates of arc center
+ final int xc = width >> 1;
+ final int yc = height >> 1;
+
+ // maximum radius
+ final int maxRadius = Math.min(width, height) - BORDER;
+
+ // index to color palette
+ int colorIndex = 0;
+
+ // arc start angle
+ int startAngle = 0;
+
+ // draw all arcs onto a paper
+ for (int radius = MINIMUM_RADIUS; radius < maxRadius; radius += radiusStep)
+ {
+ // setup can be made for each arc
+ arcDrawCallback.iterationCallBack(xc, yc, radius, maxRadius, colorIndex++);
+ startAngle += 4;
+ // render the arc
+ graphics2d.drawArc(xc - radius, yc - radius, radius << 1, radius << 1, startAngle, 270);
+ }
+
+ // cleanup rendering
+ arcDrawCallback.cleanup();
+ }
+
+ /**
+ * Test basic behavior of method Graphics.drawOval().
+ * Color of all rendered arcs are set to black.
+ *
+ * < at >param image
+ * image to which arcs are to be drawn
+ * < at >param graphics2d
+ * graphics canvas
+ * < at >return test result status - PASSED, FAILED or ERROR
+ */
+ public TestResult testDrawArcBasicStyle(TestImage image, Graphics2D graphics2d)
+ {
+ drawArcs(image, graphics2d, ARC_RADIUS_STEP, new CommonArcDrawCallbacks()
+ {
+ /**
+ * Callback function called before each arc is rendered.
+ */
+ < at >Override
+ public void iterationCallBack(int x, int y, int radius, int maxRadius, int index)
+ {
+ // nothing need to be changed
+ return;
+ }
+ });
+
+ // test return value
+ return TestResult.PASSED;
+ }
+
/**
* Entry point to the test suite.
*
< at >< at > -77,3 +163,61 < at >< at >
new PrintTestArcs().runTestSuite(args);
}
}
+
+/**
+ * Class representing set of callback methods called for each rendered arc.
+ *
+ * < at >author Pavel Tisnovsky
+ */
+abstract class CommonArcDrawCallbacks
+{
+ /**
+ * Image to which arcs are to be drawn.
+ */
+ protected TestImage image;
+
+ /**
+ * Graphics canvas.
+ */
+ protected Graphics2D graphics;
+
+ /**
+ * Setup phase.
+ *
+ * < at >param image
+ * image to which arcs are to be drawn
+ * < at >param graphics2d
+ * graphics canvas
+ */
+ public void setup(TestImage image, Graphics2D graphics)
+ {
+ this.image = image;
+ this.graphics = graphics;
+ // set drawing color
+ graphics.setColor(Color.BLACK);
+ }
+
+ /**
+ * This method is called for each rendered horizontal arc.
+ *
+ * < at >param x
+ * horizontal coordinate of a arc center
+ * < at >param y
+ * vertical coordinate of a arc center
+ * < at >param radius
+ * arc radius
+ * < at >param maxRadius
+ * maximum allowable arc radius
+ * < at >param colorIndex
+ * color index
+ */
+ public abstract void iterationCallBack(int x, int y, int radius, int maxRadius, int colorIndex);
+
+ /**
+ * Cleanup phase.
+ */
+ public void cleanup()
+ {
+ return;
+ }
+}
</pre>ptisnovs-HMOWzH9t1bryS2n3IP37Vh1hho49/T1E< at >public.gmane.org2012-05-24T09:38:54Search EngineSearch the mailing list at Gmanequery
http://search.gmane.org/?group=$group=gmane.comp.java.openjdk.distro-packaging.devel