/hg/icedtea-web: 2 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Wed Nov 13 01:05:50 PST 2013
changeset fb182f92152b in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=fb182f92152b
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Nov 13 09:48:41 2013 +0100
Enabled access to manifests' attributes from JNLPFile class, implemented http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/manifest.html#app_name
changeset 9ed10fe70cb7 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=9ed10fe70cb7
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Nov 13 10:05:32 2013 +0100
Added test-extension to silence stdout/err of itw when run from junit
diffstat:
ChangeLog | 30 +
NEWS | 1 +
netx/net/sourceforge/jnlp/JNLPFile.java | 121 +++++++
netx/net/sourceforge/jnlp/PluginBridge.java | 13 +-
netx/net/sourceforge/jnlp/ResourcesDesc.java | 29 +-
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 27 +-
netx/net/sourceforge/jnlp/security/CertWarningPane.java | 21 +-
tests/netx/unit/net/sourceforge/jnlp/JNLPFileTest.java | 3 +-
tests/netx/unit/net/sourceforge/jnlp/ParserBasic.java | 7 +-
tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java | 5 +-
tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPFileTest.java | 162 ++++++++++
tests/netx/unit/net/sourceforge/jnlp/runtime/ResourcesDescTest.java | 105 ++++++
tests/test-extensions/net/sourceforge/jnlp/mock/DummyJNLPFileWithJar.java | 8 +-
tests/test-extensions/net/sourceforge/jnlp/util/logging/NoStdOutErrTest.java | 89 +++++
14 files changed, 581 insertions(+), 40 deletions(-)
diffs (truncated from 920 to 500 lines):
diff -r d6caaf4298af -r 9ed10fe70cb7 ChangeLog
--- a/ChangeLog Sun Nov 10 11:30:43 2013 +0100
+++ b/ChangeLog Wed Nov 13 10:05:32 2013 +0100
@@ -1,3 +1,33 @@
+2013-11-13 Jiri Vanek <jvanek at redhat.com>
+
+ Added test-extension to silence stdout/err of itw when run from junit
+ * tests/netx/unit/net/sourceforge/jnlp/JNLPFileTest.java: now extends NoStdOutErrTest
+ * tests/netx/unit/net/sourceforge/jnlp/ParserBasic.java: same
+ * tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java: same
+ * tests/test-extensions/net/sourceforge/jnlp/util/logging/NoStdOutErrTest.java:
+ new class with (disableStds) BeforeClass method and (restoreStds) AfterClass
+ method which are responsible for silence all itw messages from extending test.
+
+2013-11-13 Jiri Vanek <jvanek at redhat.com>
+
+ Enabled access to manifests' attributes from JNLPFile class
+ Implemented http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/manifest.html#app_name
+ * netx/net/sourceforge/jnlp/JNLPFile.java: Added (manifestsAttributes) field.
+ Added (ManifestsAttributes) inner class, to encapsulate access to attributes.
+ (getTitle) can handle manifests too.
+ * netx/net/sourceforge/jnlp/PluginBridge.java: is following app_name recommendations.
+ * netx/net/sourceforge/jnlp/ResourcesDesc.java: (getMainJAR) made more granular
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: (init) inject itself
+ to file's ManifestsAttributes. (checkForAttributeInJars) renamed field
+ mainClassInThisJar to attributeInThisJar. Added getter for mainClass.
+ * netx/net/sourceforge/jnlp/security/CertWarningPane.java: bracketing cleanup.
+ * tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPFileTest.java: new test to
+ check new functionalites
+ * tests/netx/unit/net/sourceforge/jnlp/runtime/ResourcesDescTest.java: same
+ * tests/test-extensions/net/sourceforge/jnlp/mock/DummyJNLPFileWithJar.java:
+ can set info
+ * NEWS: mentioned first u45 attribute
+
2013-11-10 Jiri Vanek <jvanek at redhat.com>
Fixed lock in awt threads. JavaConsole window is now disposed instead of hidden.
diff -r d6caaf4298af -r 9ed10fe70cb7 NEWS
--- a/NEWS Sun Nov 10 11:30:43 2013 +0100
+++ b/NEWS Wed Nov 13 10:05:32 2013 +0100
@@ -13,6 +13,7 @@
* JDK older then 1.5 no longer supported
* IcedTea-Web is now following XDG .config and .cache specification(RH947647)
* A console for debugging plugin and javaws
+* Support for u45 new manifest attributes (Application-Name)
* Cache Viewer
- Can be closed by ESC key
- Enabling and disabling of operational buttons is handled properly
diff -r d6caaf4298af -r 9ed10fe70cb7 netx/net/sourceforge/jnlp/JNLPFile.java
--- a/netx/net/sourceforge/jnlp/JNLPFile.java Sun Nov 10 11:30:43 2013 +0100
+++ b/netx/net/sourceforge/jnlp/JNLPFile.java Wed Nov 13 10:05:32 2013 +0100
@@ -27,9 +27,11 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
+import java.util.jar.Attributes;
import net.sourceforge.jnlp.cache.ResourceTracker;
import net.sourceforge.jnlp.cache.UpdatePolicy;
+import net.sourceforge.jnlp.runtime.JNLPClassLoader;
import net.sourceforge.jnlp.runtime.JNLPRuntime;
import net.sourceforge.jnlp.util.logging.OutputController;
@@ -51,6 +53,13 @@
* @version $Revision: 1.21 $
*/
public class JNLPFile {
+
+
+ public static final String APP_NAME = "Application-Name";
+ public static final String CALLER_ALLOWABLE = "Caller-Allowable-Codebase";
+ public static final String APP_LIBRARY_ALLOWABLE = "Application-Library-Allowable-Codebase";
+
+
// todo: save the update policy, then if file was not updated
// then do not check resources for being updated.
@@ -121,6 +130,10 @@
* List of acceptable properties (not-special)
*/
private String[] generalProperties = SecurityDesc.getJnlpRIAPermissions();
+
+ /** important manifests' attributes */
+ private final ManifestsAttributes manifestsAttributes = new ManifestsAttributes();
+
{ // initialize defaults if security allows
try {
@@ -293,10 +306,46 @@
/**
* Returns the JNLP file's best localized title. This method returns the same
* value as InformationDesc.getTitle().
+ *
+ * Since jdk7 u45, also manifest title, and mainclass are taken to consideration;
+ * See PluginBridge
*/
public String getTitle() {
+ String jnlpTitle = getTitleFromJnlp();
+ String manifestTitle = getTitleFromManifest();
+ if (jnlpTitle != null && manifestTitle != null) {
+ if (jnlpTitle.equals(manifestTitle)) {
+ return jnlpTitle;
+ }
+ return jnlpTitle+" ("+manifestTitle+")";
+ }
+ if (jnlpTitle != null && manifestTitle == null) {
+ return jnlpTitle;
+ }
+ if (jnlpTitle == null && manifestTitle != null) {
+ return manifestTitle;
+ }
+ String mainClass = getManifestsAttributes().getMainClass();
+ return mainClass;
+ }
+
+ /**
+ * Returns the JNLP file's best localized title. This method returns the same
+ * value as InformationDesc.getTitle().
+ */
+ public String getTitleFromJnlp() {
return getInformation().getTitle();
}
+
+ public String getTitleFromManifest() {
+ String inManifestTitle = getManifestsAttributes().getApplicationName();
+ if (inManifestTitle == null && getManifestsAttributes().isLoader()){
+ OutputController.getLogger().log(OutputController.Level.WARNING_ALL,"Application title was not found in manifest. Check with application vendor");
+ }
+ return inManifestTitle;
+ }
+
+
/**
* Returns the JNLP file's best localized vendor. This method returns the same
@@ -818,4 +867,76 @@
public void setSignedJNLPAsMissing() {
missingSignedJNLP = true;
}
+
+ public ManifestsAttributes getManifestsAttributes() {
+ return manifestsAttributes;
+ }
+
+
+ public class ManifestsAttributes{
+ private JNLPClassLoader loader;
+
+
+ public void setLoader(JNLPClassLoader loader) {
+ this.loader = loader;
+ }
+
+ public boolean isLoader() {
+ return loader != null;
+ }
+
+
+
+ /**
+ * main class can be defined outside of manifest.
+ * This method is mostly for completeness
+ */
+ public String getMainClass(){
+ if (loader == null) {
+ OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "Jars not ready to provide main class");
+ return null;
+ }
+ return loader.getMainClass();
+ }
+
+ /**
+ * http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/manifest.html#app_name
+ */
+ public String getApplicationName(){
+ return getAttribute(APP_NAME);
+ }
+
+ /**
+ * http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/manifest.html#caller_allowable
+ */
+ public String getCallerAllowableCodebase(){
+ return getAttribute(CALLER_ALLOWABLE);
+ }
+
+ /**
+ * http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/manifest.html#app_library
+ */
+ public String getApplicationLibraryAllowableCodebase(){
+ return getAttribute(APP_LIBRARY_ALLOWABLE);
+ }
+
+ /**
+ * get custom attribute.
+ */
+ public String getAttribute(String name){
+ return getAttribute(new Attributes.Name(name));
+ }
+
+ /**
+ * get standard attribute
+ */
+ public String getAttribute(Attributes.Name name){
+ if (loader == null) {
+ OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "Jars not ready to provide attribute "+ name);
+ return null;
+ }
+ return loader.checkForAttributeInJars(Arrays.asList(getResources().getJARs()), name);
+ }
+ }
+
}
diff -r d6caaf4298af -r 9ed10fe70cb7 netx/net/sourceforge/jnlp/PluginBridge.java
--- a/netx/net/sourceforge/jnlp/PluginBridge.java Sun Nov 10 11:30:43 2013 +0100
+++ b/netx/net/sourceforge/jnlp/PluginBridge.java Wed Nov 13 10:05:32 2013 +0100
@@ -184,7 +184,7 @@
// the class name should be of the form foo.bar.Baz not foo/bar/Baz
String mainClass = main.replace('/', '.');
- launchType = new AppletDesc(params.getAppletTitle(), mainClass, documentBase, width,
+ launchType = new AppletDesc(getTitle(), mainClass, documentBase, width,
height, params.getUnmodifiableMap());
if (main.endsWith(".class")) //single class file only
@@ -231,7 +231,18 @@
return new DownloadOptions(usePack, useVersion);
}
+ @Override
public String getTitle() {
+ String inManifestTitle = super.getTitleFromManifest();
+ if (inManifestTitle != null) {
+ return inManifestTitle;
+ }
+ //specification is recommending main class instead of html parameter
+ //http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/manifest.html#app_name
+ String mainClass = getManifestsAttributes().getMainClass();
+ if (mainClass != null) {
+ return mainClass;
+ }
return params.getAppletTitle();
}
diff -r d6caaf4298af -r 9ed10fe70cb7 netx/net/sourceforge/jnlp/ResourcesDesc.java
--- a/netx/net/sourceforge/jnlp/ResourcesDesc.java Sun Nov 10 11:30:43 2013 +0100
+++ b/netx/net/sourceforge/jnlp/ResourcesDesc.java Wed Nov 13 10:05:32 2013 +0100
@@ -67,23 +67,30 @@
return resources.toArray(new JREDesc[resources.size()]);
}
+ public static JARDesc getMainJAR(JARDesc jars[] ) {
+ return getMainJAR(Arrays.asList(jars));
+ }
+
+ public static JARDesc getMainJAR(List<JARDesc> jars) {
+ for (JARDesc jar : jars) {
+ if (jar.isMain()) {
+ return jar;
+ }
+ }
+
+ if (jars.size() > 0) {
+ return jars.get(0);
+ } else {
+ return null;
+ }
+ }
/**
* Returns the main JAR for these resources. There first JAR
* is returned if no JARs are specified as the main JAR, and if
* there are no JARs defined then null is returned.
*/
public JARDesc getMainJAR() {
- JARDesc jars[] = getJARs();
-
- for (JARDesc jar : jars) {
- if (jar.isMain())
- return jar;
- }
-
- if (jars.length > 0)
- return jars[0];
- else
- return null;
+ return getMainJAR(getJARs());
}
/**
diff -r d6caaf4298af -r 9ed10fe70cb7 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Sun Nov 10 11:30:43 2013 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Nov 13 10:05:32 2013 +0100
@@ -115,7 +115,7 @@
/** Signed JNLP File and Template */
final public static String TEMPLATE = "JNLP-INF/APPLICATION_TEMPLATE.JNLP";
final public static String APPLICATION = "JNLP-INF/APPLICATION.JNLP";
-
+
/** Actions to specify how cache is to be managed **/
public static enum DownloadAction {
DOWNLOAD_TO_CACHE, REMOVE_FROM_CACHE, CHECK_CACHE
@@ -200,7 +200,7 @@
/** Name of the application's main class */
private String mainClass = null;
-
+
/**
* Variable to track how many times this loader is in use
*/
@@ -245,6 +245,9 @@
this.mainClass = mainName;
+ //as it is harmless, we can set is as soon as possible.
+ file.getManifestsAttributes().setLoader(this);
+
AppVerifier verifier;
if (file instanceof PluginBridge && !((PluginBridge)file).useJNLPHref()) {
@@ -259,13 +262,15 @@
initializeExtensions();
initializeResources();
+
// initialize permissions
initializePermissions();
setSecurity();
-
+
installShutdownHooks();
+
}
@@ -786,7 +791,7 @@
String result = null;
// Check main jar
- JARDesc mainJarDesc = file.getResources().getMainJAR();
+ JARDesc mainJarDesc = ResourcesDesc.getMainJAR(jars);
result = getManifestAttribute(mainJarDesc.getLocation(), name);
if (result != null) {
@@ -803,10 +808,10 @@
// Still not found? Iterate and set if only 1 was found
for (JARDesc jarDesc: jars) {
- String mainClassInThisJar = getManifestAttribute(jarDesc.getLocation(), name);
- if (mainClassInThisJar != null) {
+ String attributeInThisJar = getManifestAttribute(jarDesc.getLocation(), name);
+ if (attributeInThisJar != null) {
if (result == null) { // first main class
- result = mainClassInThisJar;
+ result = attributeInThisJar;
} else { // There is more than one main class. Set to null and break.
result = null;
break;
@@ -2193,6 +2198,10 @@
return new AccessControlContext(new ProtectionDomain[] { pd });
}
+
+ public String getMainClass() {
+ return mainClass;
+ }
/*
* Helper class to expose protected URLClassLoader methods.
@@ -2317,6 +2326,6 @@
return null;
}
}
-
-
+
+
}
diff -r d6caaf4298af -r 9ed10fe70cb7 netx/net/sourceforge/jnlp/security/CertWarningPane.java
--- a/netx/net/sourceforge/jnlp/security/CertWarningPane.java Sun Nov 10 11:30:43 2013 +0100
+++ b/netx/net/sourceforge/jnlp/security/CertWarningPane.java Wed Nov 13 10:05:32 2013 +0100
@@ -107,13 +107,14 @@
//these strings -- we just want to fill in as many as possible.
try {
if ((certVerifier instanceof HttpsCertVerifier) &&
- (c instanceof X509Certificate))
+ (c instanceof X509Certificate)) {
name = SecurityUtil.getCN(((X509Certificate) c)
.getSubjectX500Principal().getName());
- else if (file instanceof PluginBridge)
+ } else if (file instanceof PluginBridge) {
name = file.getTitle();
- else
+ } else {
name = file.getInformation().getTitle();
+ }
} catch (Exception e) {
}
@@ -126,10 +127,11 @@
}
try {
- if (file instanceof PluginBridge)
+ if (file instanceof PluginBridge) {
from = file.getCodeBase().getHost();
- else
+ } else {
from = file.getInformation().getHomepage().toString();
+ }
} catch (Exception e) {
}
@@ -146,7 +148,7 @@
topLabelText = R("SHttpsUnverified") + " " + R("Continue");
propertyName = "OptionPane.warningIcon";
iconLocation += "warning.png";
- } else
+ } else {
switch (type) {
case VERIFIED:
topLabelText = R("SSigVerified");
@@ -167,7 +169,7 @@
bottomLabelText += " " + R("SWarnFullPermissionsIgnorePolicy");
break;
}
-
+ }
ImageIcon icon = new ImageIcon((new sun.misc.Launcher())
.getClassLoader().getResource(iconLocation));
JLabel topLabel = new JLabel(htmlWrap(topLabelText), icon, SwingConstants.LEFT);
@@ -195,8 +197,9 @@
infoPanel.add(nameLabel);
infoPanel.add(publisherLabel);
- if (!(certVerifier instanceof HttpsCertVerifier))
+ if (!(certVerifier instanceof HttpsCertVerifier)) {
infoPanel.add(fromLabel);
+ }
infoPanel.add(alwaysTrust);
infoPanel.setBorder(BorderFactory.createEmptyBorder(25, 25, 25, 25));
@@ -225,7 +228,7 @@
add(infoPanel);
add(buttonPanel);
- JLabel bottomLabel = new JLabel(htmlWrap(bottomLabelText));;
+ JLabel bottomLabel = new JLabel(htmlWrap(bottomLabelText));
JButton moreInfo = new JButton(R("ButMoreInformation"));
moreInfo.addActionListener(new MoreInfoButtonListener());
diff -r d6caaf4298af -r 9ed10fe70cb7 tests/netx/unit/net/sourceforge/jnlp/JNLPFileTest.java
--- a/tests/netx/unit/net/sourceforge/jnlp/JNLPFileTest.java Sun Nov 10 11:30:43 2013 +0100
+++ b/tests/netx/unit/net/sourceforge/jnlp/JNLPFileTest.java Wed Nov 13 10:05:32 2013 +0100
@@ -47,11 +47,12 @@
import net.sourceforge.jnlp.JNLPFile.Match;
import net.sourceforge.jnlp.annotations.Bug;
import net.sourceforge.jnlp.mock.MockJNLPFile;
+import net.sourceforge.jnlp.util.logging.NoStdOutErrTest;
import org.junit.Assert;
import org.junit.Test;
-public class JNLPFileTest {
+public class JNLPFileTest extends NoStdOutErrTest{
Locale jvmLocale = new Locale("en", "CA", "utf8");
MockJNLPFile file = new MockJNLPFile(jvmLocale);
diff -r d6caaf4298af -r 9ed10fe70cb7 tests/netx/unit/net/sourceforge/jnlp/ParserBasic.java
--- a/tests/netx/unit/net/sourceforge/jnlp/ParserBasic.java Sun Nov 10 11:30:43 2013 +0100
+++ b/tests/netx/unit/net/sourceforge/jnlp/ParserBasic.java Wed Nov 13 10:05:32 2013 +0100
@@ -37,20 +37,17 @@
package net.sourceforge.jnlp;
-import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.List;
-import net.sourceforge.jnlp.runtime.CodeBaseClassLoaderTest;
import net.sourceforge.jnlp.mock.DummyJNLPFile;
+import net.sourceforge.jnlp.util.logging.NoStdOutErrTest;
-import org.junit.After;
import org.junit.Assert;
-import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
/** Test that the parser works with basic jnlp files */
-public class ParserBasic {
+public class ParserBasic extends NoStdOutErrTest{
private static Node root;
private static Parser parser;
diff -r d6caaf4298af -r 9ed10fe70cb7 tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java
--- a/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java Sun Nov 10 11:30:43 2013 +0100
+++ b/tests/netx/unit/net/sourceforge/jnlp/runtime/JNLPClassLoaderTest.java Wed Nov 13 10:05:32 2013 +0100
@@ -42,9 +42,7 @@
import static org.junit.Assert.fail;
More information about the distro-pkg-dev
mailing list