/hg/release/icedtea-web-1.4: 2 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Wed Nov 13 02:41:37 PST 2013
changeset 7d2759e4bc98 in /hg/release/icedtea-web-1.4
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=7d2759e4bc98
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Nov 13 11:15:18 2013 +0100
Backported enabled access to manifests' attributes from JNLPFile class, implemented http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/manifest.html#app_name
changeset e139942101a9 in /hg/release/icedtea-web-1.4
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.4?cmd=changeset;node=e139942101a9
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Nov 13 11:40:40 2013 +0100
Backported and adapted test-extension to silence stdout/err of itw when run from junit
diffstat:
ChangeLog | 34 ++
NEWS | 1 +
netx/net/sourceforge/jnlp/InformationDesc.java | 22 +-
netx/net/sourceforge/jnlp/JNLPFile.java | 125 +++++++
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 +-
netx/net/sourceforge/jnlp/util/StreamUtils.java | 27 +-
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 | 3 +-
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 | 100 ++++++
tests/test-extensions/net/sourceforge/jnlp/util/FileTestUtils.java | 129 +++++++
tests/test-extensions/net/sourceforge/jnlp/util/logging/NoStdOutErrTest.java | 74 ++++
17 files changed, 831 insertions(+), 51 deletions(-)
diffs (truncated from 1222 to 500 lines):
diff -r acbada276d23 -r e139942101a9 ChangeLog
--- a/ChangeLog Wed Nov 06 14:46:43 2013 +0100
+++ b/ChangeLog Wed Nov 13 11:40:40 2013 +0100
@@ -1,3 +1,37 @@
+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 redirecting 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, dialog centering
+ * tests/test-extensions/net/sourceforge/jnlp/mock/DummyJNLPFileWithJar.java: backported
+ * tests/test-extensions/net/sourceforge/jnlp/util/FileTestUtils.java: backported
+ * netx/net/sourceforge/jnlp/InformationDesc.java: partial backport of constructor change
+
+
2013-11-06 Jiri Vanek <jvanek at redhat.com>
Enabled java console for plugin
diff -r acbada276d23 -r e139942101a9 NEWS
--- a/NEWS Wed Nov 06 14:46:43 2013 +0100
+++ b/NEWS Wed Nov 13 11:40:40 2013 +0100
@@ -10,6 +10,7 @@
New in release 1.4.2 (2013-MM-DD):
* Dialogs center on screen before becoming visible
+* Support for u45 new manifest attributes (Application-Name)
* Plugin
- RH976833: Multiple applets on one page cause deadlock
- Enabled javaconsole
diff -r acbada276d23 -r e139942101a9 netx/net/sourceforge/jnlp/InformationDesc.java
--- a/netx/net/sourceforge/jnlp/InformationDesc.java Wed Nov 06 14:46:43 2013 +0100
+++ b/netx/net/sourceforge/jnlp/InformationDesc.java Wed Nov 13 11:40:40 2013 +0100
@@ -52,18 +52,21 @@
/** the data as list of key,value pairs */
private List<Object> info;
- /** the JNLPFile this information is for */
- private JNLPFile jnlpFile;
/**
* Create an information element object.
*
- * @param jnlpFile file that the information is for
* @param locales the locales the information is for
*/
+ public InformationDesc(Locale locales[]) {
+ this.locales = locales;
+ }
+
+ /**
+ * 1.4 comaptibility
+ */
public InformationDesc(JNLPFile jnlpFile, Locale locales[]) {
- this.jnlpFile = jnlpFile;
- this.locales = locales;
+ this(locales);
}
/**
@@ -171,6 +174,8 @@
}
}
+ // FIXME if there's no larger icon, choose the closest smaller icon
+ // instead of the first
if (best == null)
best = icons[0];
@@ -185,13 +190,6 @@
}
/**
- * Returns the JNLPFile the information is for.
- */
- public JNLPFile getJNLPFile() {
- return jnlpFile;
- }
-
- /**
* Returns whether offline execution allowed.
*/
public boolean isOfflineAllowed() {
diff -r acbada276d23 -r e139942101a9 netx/net/sourceforge/jnlp/JNLPFile.java
--- a/netx/net/sourceforge/jnlp/JNLPFile.java Wed Nov 06 14:46:43 2013 +0100
+++ b/netx/net/sourceforge/jnlp/JNLPFile.java Wed Nov 13 11:40:40 2013 +0100
@@ -28,9 +28,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;
/**
@@ -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.
@@ -118,6 +127,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 {
@@ -301,10 +314,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()){
+ System.err.println("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
@@ -820,4 +869,80 @@
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) {
+ if (JNLPRuntime.isDebug()) {
+ System.err.println("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) {
+ if (JNLPRuntime.isDebug()) {
+ System.err.println("Jars not ready to provide attribute "+ name);
+ }
+ return null;
+ }
+ return loader.checkForAttributeInJars(Arrays.asList(getResources().getJARs()), name);
+ }
+ }
+
}
diff -r acbada276d23 -r e139942101a9 netx/net/sourceforge/jnlp/PluginBridge.java
--- a/netx/net/sourceforge/jnlp/PluginBridge.java Wed Nov 06 14:46:43 2013 +0100
+++ b/netx/net/sourceforge/jnlp/PluginBridge.java Wed Nov 13 11:40:40 2013 +0100
@@ -179,7 +179,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
@@ -226,7 +226,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 acbada276d23 -r e139942101a9 netx/net/sourceforge/jnlp/ResourcesDesc.java
--- a/netx/net/sourceforge/jnlp/ResourcesDesc.java Wed Nov 06 14:46:43 2013 +0100
+++ b/netx/net/sourceforge/jnlp/ResourcesDesc.java Wed Nov 13 11:40:40 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 acbada276d23 -r e139942101a9 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Nov 06 14:46:43 2013 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Wed Nov 13 11:40:40 2013 +0100
@@ -112,7 +112,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
*/
@@ -244,6 +244,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()) {
@@ -258,13 +261,15 @@
initializeExtensions();
initializeResources();
+
// initialize permissions
initializePermissions();
setSecurity();
-
+
installShutdownHooks();
+
}
@@ -807,7 +812,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) {
@@ -824,10 +829,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;
@@ -2349,6 +2354,10 @@
return new AccessControlContext(new ProtectionDomain[] { pd });
}
+
+ public String getMainClass() {
+ return mainClass;
+ }
/*
* Helper class to expose protected URLClassLoader methods.
@@ -2473,6 +2482,6 @@
return null;
}
}
-
-
+
+
}
diff -r acbada276d23 -r e139942101a9 netx/net/sourceforge/jnlp/security/CertWarningPane.java
--- a/netx/net/sourceforge/jnlp/security/CertWarningPane.java Wed Nov 06 14:46:43 2013 +0100
+++ b/netx/net/sourceforge/jnlp/security/CertWarningPane.java Wed Nov 13 11:40:40 2013 +0100
@@ -106,13 +106,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) {
}
@@ -125,10 +126,11 @@
}
try {
- if (file instanceof PluginBridge)
+ if (file instanceof PluginBridge) {
from = file.getCodeBase().getHost();
- else
+ } else {
from = file.getInformation().getHomepage().toString();
+ }
} catch (Exception e) {
}
@@ -145,7 +147,7 @@
topLabelText = R("SHttpsUnverified") + " " + R("Continue");
propertyName = "OptionPane.warningIcon";
iconLocation += "warning.png";
- } else
+ } else {
switch (type) {
case VERIFIED:
topLabelText = R("SSigVerified");
@@ -166,7 +168,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);
@@ -194,8 +196,9 @@
infoPanel.add(nameLabel);
infoPanel.add(publisherLabel);
- if (!(certVerifier instanceof HttpsCertVerifier))
+ if (!(certVerifier instanceof HttpsCertVerifier)) {
infoPanel.add(fromLabel);
More information about the distro-pkg-dev
mailing list