MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

javafx packaging: include security permissions when signed (IDEA-105821)

Browse Source
This commit is contained in:
anna
2013-04-23 11:33:57 +02:00
parent bcb983d35b
commit 4bcabde6ca
2 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/javaFX/common-javaFX-plugin/src/org/jetbrains/plugins/javaFX/packaging/JavaFxAntGenerator.java
+5 -1
View File
@@ -118,7 +118,11 @@ public class JavaFxAntGenerator {
if (bundle != JavaFxPackagerConstants.NativeBundles.none) {
deployTag.addAttribute(new Pair<String, String>("nativeBundles", bundle.name()));
}
if (packager.isEnabledSigning()) {
deployTag.add(new SimpleTag("fx:permissions", new Pair<String, String>("elevated", "true")));
}
deployTag.add(new SimpleTag("fx:application", new Pair<String, String>("refid", appId)));
final List<Pair> infoPairs = new ArrayList<Pair>();
plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/packaging/JavaFxAntTaskTest.java
+42 -1
View File
@@ -32,6 +32,7 @@ public class JavaFxAntTaskTest extends UsefulTestCase{
private static final String PRELOADER_CLASS = "preloaderClass";
private static final String TITLE = "title";
private static final String PRELOADER_JAR = "preloaderJar";
private static final String SIGNED = "signed";
public void testJarDeployNoInfo() throws Exception {
doTest("<fx:fileset id=\"all_but_jarDeployNoInfo\" dir=\"temp\" includes=\"*.jar\">\n" +
@@ -93,6 +94,37 @@ public class JavaFxAntTaskTest extends UsefulTestCase{
"</fx:deploy>\n", Collections.singletonMap(TITLE, "My App"));
}
public void testJarDeploySigned() throws Exception {
doTest("<fx:fileset id=\"all_but_jarDeploySigned\" dir=\"temp\" includes=\"*.jar\">\n" +
"<exclude name=\"jarDeploySigned.jar\">\n" +
"</exclude>\n" +
"</fx:fileset>\n" +
"<fx:fileset id=\"all_jarDeploySigned\" dir=\"temp\" includes=\"*.jar\">\n" +
"</fx:fileset>\n" +
"<fx:application id=\"jarDeploySigned_id\" name=\"jarDeploySigned\" mainClass=\"Main\">\n" +
"</fx:application>\n" +
"<fx:jar destfile=\"temp" + File.separator + "jarDeploySigned.jar\">\n" +
"<fx:application refid=\"jarDeploySigned_id\">\n" +
"</fx:application>\n" +
"<fileset dir=\"temp\" excludes=\"*.jar\">\n" +
"</fileset>\n" +
"<fx:resources>\n" +
"<fx:fileset refid=\"all_but_jarDeploySigned\">\n" +
"</fx:fileset>\n" +
"</fx:resources>\n" +
"</fx:jar>\n" +
"<fx:deploy width=\"800\" height=\"400\" updatemode=\"background\" outdir=\"temp" + File.separator + "deploy\" outfile=\"jarDeploySigned\">\n" +
"<fx:permissions elevated=\"true\">\n" +
"</fx:permissions>\n" +
"<fx:application refid=\"jarDeploySigned_id\">\n" +
"</fx:application>\n" +
"<fx:resources>\n" +
"<fx:fileset refid=\"all_jarDeploySigned\">\n" +
"</fx:fileset>\n" +
"</fx:resources>\n" +
"</fx:deploy>\n", Collections.singletonMap(SIGNED, "true"));
}
public void testJarDeployPreloader() throws Exception {
final HashMap<String, String> options = new HashMap<String, String>();
options.put(PRELOADER_CLASS, "MyPreloader");
@@ -155,6 +187,10 @@ public class JavaFxAntTaskTest extends UsefulTestCase{
packager.setPreloaderJar(preloaderJar);
}
if (options.containsKey(SIGNED)) {
packager.setSigned(true);
}
final List<JavaFxAntGenerator.SimpleTag> temp = JavaFxAntGenerator
.createJarAndDeployTasks(packager, artifactFileName, artifactName, "temp");
final StringBuilder buf = new StringBuilder();
@@ -178,6 +214,7 @@ public class JavaFxAntTaskTest extends UsefulTestCase{
private String myPreloaderClass;
private String myPreloaderJar;
private boolean myConvertCss2Bin;
private boolean mySigned;
private MockJavaFxPackager(String outputPath) {
myOutputPath = outputPath;
@@ -211,6 +248,10 @@ public class JavaFxAntTaskTest extends UsefulTestCase{
myPreloaderJar = preloaderJar;
}
public void setSigned(boolean signed) {
mySigned = signed;
}
@Override
protected String getArtifactOutputPath() {
return new File(myOutputPath).getParent();
@@ -302,7 +343,7 @@ public class JavaFxAntTaskTest extends UsefulTestCase{
@Override
public boolean isEnabledSigning() {
return false;
return mySigned;
}
@Override