Merge "fixed jersey2-all-examples job on solaris, added missing privileged action, updated policy files"

Author: japod

core-common/src/test/resources/surefire.policy

@@ -55,6 +55,7 @@ grant codebase "file:${project.build.directory}/test-classes/-" {
 };
 
 grant codebase "file:${project.build.directory}/classes/-" {
+  permission java.lang.RuntimePermission "accessClassInPackage.sun.misc";
   permission java.lang.RuntimePermission "accessDeclaredMembers";
   permission java.lang.RuntimePermission "getClassLoader";
   permission java.util.PropertyPermission "*", "read";

core-server/src/main/java/org/glassfish/jersey/server/internal/RuntimeExecutorsBinder.java

@@ -39,6 +39,9 @@
  */
 package org.glassfish.jersey.server.internal;
 
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
@@ -109,8 +112,15 @@ public void rejectedExecution(Runnable r, ThreadPoolExecutor executor) {
         }
 
         @Override
-        public void dispose(ScheduledExecutorService instance) {
-            instance.shutdown();
+        public void dispose(final ScheduledExecutorService instance) {
+            AccessController.doPrivileged(new PrivilegedAction(){
+
+                @Override
+                public Object run() {
+                    instance.shutdown();
+                    return null;
+                }
+            });
         }
     }
 

examples/osgi-helloworld-webapp/functional-test/src/test/resources/felix.policy

@@ -61,6 +61,7 @@ allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*jersey-common*
 allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*jersey-common*"] (java.lang.reflect.ReflectPermission "suppressAccessChecks") } "suppressAccessChecksToJerseyCommon";
 allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*jersey-common*"] (java.net.SocketPermission "*" "connect,resolve") } "socketPermissionToJerseyCommon";
 allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*jersey-common*"] (java.lang.RuntimePermission "accessDeclaredMembers") } "accessDeclaredMembersToJerseyCommon";
+allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*jersey-common*"] (java.lang.RuntimePermission "accessClassInPackage.sun.misc") } "accessClassInPackageSunMisc";
 allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*jersey-common*"] (java.lang.RuntimePermission "getClassLoader") } "getCLToJerseyCommon";
 allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*jersey-common*"] (java.util.PropertyPermission "*" "read") } "propReadToJerseyCommon";
 allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*jersey-common*"] (java.io.FilePermission "<<ALL FILES>>" "read,write") } "fileReadToJerseyCommon";
@@ -72,4 +73,5 @@ allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*jersey-server*
 allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*jersey-server*"] (java.lang.RuntimePermission "getClassLoader") } "getClassLoaderToJerseyServer";
 allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*jersey-server*"] (java.util.PropertyPermission "*" "read") } "propReadToJerseyServer";
 allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*jersey-server*"] (java.io.FilePermission "<<ALL FILES>>" "read,write") } "fileReadToJerseyServer";
+allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*jersey-server*"] (java.lang.RuntimePermission "modifyThread") } "modifyThreadToJerseyServer";
 allow { [org.osgi.service.condpermadmin.BundleLocationCondition "*jersey-container*"] (java.security.AllPermission) } "allToJerseyContainer";