Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions harness/apisupport.harness/arch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,6 @@
-->
<answer id="exec-property">
<p>

<api type="export" group="systemproperty" name="netbeans.user" category="devel">
During runtime the JNLP launcher enhances the behaviour of the <code>netbeans.user</code>
property as defined in the NetBeans core. In addition to standard
Expand All @@ -531,18 +530,6 @@
with the correct location of user directory.
</api>
</p>

<p>

<api type="export" group="systemproperty" name="netbeans.jnlp.fixPolicy" category="devel">
During runtime the JNLP launcher checks whether value <code>true</code> is assigned
to this system property. If it is "true" a special security policy is applied
for all the code base - it is granting all permissions to all code bases.
<strong>Use with care!</strong>. It allows you e.g. to have the module
jar files unsigned (they must also not require the all-permissions in
their .jnlp file for this to to work).
</api>
</p>
</answer>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
package org.netbeans.modules.apisupport.jnlplauncher;

import java.io.File;
import java.security.Policy;

/** The JNLP entry point. Does not do much, in future it can do more
* of JNLP related stuff.
Expand All @@ -35,7 +34,6 @@ public class Main extends Object {
* @throws Exception for lots of reasons
*/
public static void main (String args[]) throws Exception {
fixPolicy();
fixNetBeansUser();
org.netbeans.Main.main(args);
}
Expand All @@ -62,21 +60,4 @@ static final void fixNetBeansUser() {
userDir.substring(uh + PREFIX.length());
System.setProperty("netbeans.user", newDir); // NOI18N
}

/**
* Attempt to give the rest of NetBeans all the
* permissions. The jars besides the one containing this class
* don't have to be signed with this.
*/
static final void fixPolicy() {
if (Boolean.getBoolean("netbeans.jnlp.fixPolicy")) { // NOI18N
// Grant all the code all persmission
Policy.setPolicy(new RuntimePolicy());
// Replace the security manager by a fresh copy
// that does the delegation to the permissions system
// -- just to make sure that there is nothing left
// from the JWS
System.setSecurityManager(new SecurityManager());
}
}
}
11 changes: 0 additions & 11 deletions harness/apisupport.harness/release/jnlp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@
</information>
<security><all-permissions/></security>
<resources>
<!-- The following property is needed when running with unsigned jars: -->
<property name="netbeans.jnlp.fixPolicy" value="$${netbeans.jnlp.fixPolicy}"/>
<extension name='branding' href='branding.jnlp' />
<!-- The following line will be replaced with an automatically generated list of resources: -->
<!--$${jnlp.resources}-->
Expand Down Expand Up @@ -304,14 +302,6 @@

<loadfile property="jnlp.resources" srcfile="${jnlp.master.dir}/resources.xml"/>

<condition property="netbeans.jnlp.fixPolicy">
<isfalse value="${jnlp.sign.jars}"/>
</condition>
<!-- Anyone knows a better way to negate a property value? -->
<condition property="netbeans.jnlp.fixPolicy" value="false">
<istrue value="${jnlp.sign.jars}"/>
</condition>

<condition property="app.icon.safe" value="${app.icon}" else=".png">
<isset property="app.icon" />
</condition>
Expand All @@ -330,7 +320,6 @@
<replacestring from="$${app.title}" to="${app.title}"/>
<replacestring from="$${app.icon}" to="master.${app.icon.ext}"/>
<replacestring from="$${branding.token}" to="${branding.token}"/>
<replacestring from="$${netbeans.jnlp.fixPolicy}" to="${netbeans.jnlp.fixPolicy}"/>
</filterchain>
</copy>
<jnlpupdatemanifeststartup appname="${app.name}"
Expand Down

This file was deleted.