Author: jim.ma Date: 2015-06-17 04:28:00 -0400 (Wed, 17 Jun 2015) New Revision: 19795 Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFDefaultClientConfigurationTestCase.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF/default-client-permissions.xml stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/permissions.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/HandlerChainTestCaseForked.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/clientConfig/META-INF/permissions.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3282/META-INF/permissions.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/eardeployment/META-INF/permissions.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/publish/META-INF/permissions.xml Log: Remove java.security.AllPermission in permission.xml Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFDefaultClientConfigurationTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFDefaultClientConfigurationTestCase.java 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/clientConfig/CXFDefaultClientConfigurationTestCase.java 2015-06-17 08:28:00 UTC (rev 19795) @@ -76,7 +76,7 @@ public static WebArchive createDeployment2() { WebArchive archive = ShrinkWrap.create(WebArchive.class, CLIENT_DEP + ".war"); archive.setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.apache.cxf.impl\n")) + + "Dependencies: org.apache.cxf.impl,org.jboss.as.server \n")) .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/cxf/clientConfig/META-INF/jaxws-client-config.xml"), "META-INF/jaxws-client-config.xml") .addClass(org.jboss.test.ws.jaxws.cxf.clientConfig.Endpoint.class) .addClass(org.jboss.test.ws.jaxws.cxf.clientConfig.Helper.class) Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/schemavalidation/DefaultSchemaValidationTestCaseForked.java 2015-06-17 08:28:00 UTC (rev 19795) @@ -64,7 +64,8 @@ public static WebArchive createClientDeployment() { WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-schemavalidation-client.war"); archive - .addManifest() + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.as.server\n")) .addClass(org.jboss.test.ws.jaxws.samples.schemavalidation.Hello.class) .addClass(org.jboss.test.ws.jaxws.samples.schemavalidation.Helper.class) .addPackage("org.jboss.test.ws.jaxws.samples.schemavalidation.types") Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF/default-client-permissions.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF/default-client-permissions.xml 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/cxf/clientConfig/META-INF/default-client-permissions.xml 2015-06-17 08:28:00 UTC (rev 19795) @@ -5,14 +5,6 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd" version="7"> <permission> - <class-name>java.security.AllPermission</class-name> - </permission> - <!-- TODO: Look at why grant org.jboss.as.server.security.ServerPermission doesn't work--> - <!--permission> - <class-name>java.lang.RuntimePermission</class-name> - <name>org.jboss.ws.LOOKUP_SERVER_INTEGRATION_SERVER_CONFIG</name> - </permission> - <permission> <class-name>org.jboss.as.server.security.ServerPermission</class-name> <name>getCurrentServiceContainer</name> </permission> @@ -43,5 +35,5 @@ <class-name>java.io.FilePermission</class-name> <name>&lt;&lt;ALL FILES&gt;&gt;</name> <actions>read</actions> - </permission--> + </permission> </permissions> Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/permissions.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/permissions.xml 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/schemavalidation/META-INF/permissions.xml 2015-06-17 08:28:00 UTC (rev 19795) @@ -5,11 +5,10 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd" version="7"> <permission> - <class-name>java.security.AllPermission</class-name> + <class-name>org.jboss.as.server.security.ServerPermission</class-name> + <name>getCurrentServiceContainer</name> </permission> - <!--Permission("org.jboss.as.server.security.ServerPermission" "getCurrentServiceContainer") is required--> - - <!--permission> + <permission> <class-name>java.util.PropertyPermission</class-name> <name>jboss.bind.address</name> <actions>read</actions> @@ -41,5 +40,5 @@ <class-name>java.io.FilePermission</class-name> <name>&lt;&lt;ALL FILES&gt;&gt;</name> <actions>read</actions> - </permission--> + </permission> </permissions> Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2015-06-17 08:28:00 UTC (rev 19795) @@ -70,7 +70,7 @@ WebArchive archive = ShrinkWrap.create(WebArchive.class, IN_CONTAINER_CLIENT_DEPLOYMENT + ".war"); archive .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.ws.common\n")) + + "Dependencies: org.jboss.ws.common,org.jboss.as.server \n")) .addAsResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/clientConfig/META-INF/jaxws-client-config.xml"), "META-INF/jaxws-client-config.xml") .addClass(org.jboss.test.helper.ClientHelper.class) .addClass(org.jboss.test.helper.TestServlet.class) Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/HandlerChainTestCaseForked.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/HandlerChainTestCaseForked.java 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/HandlerChainTestCaseForked.java 2015-06-17 08:28:00 UTC (rev 19795) @@ -65,7 +65,7 @@ WebArchive archive = ShrinkWrap.create(WebArchive.class, INCONTAINER_CLIENT + ".war"); archive .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client\n")) + + "Dependencies: org.jboss.ws.cxf.jbossws-cxf-client,org.jboss.as.server \n")) .addClass(org.jboss.test.ws.jaxws.jbws3282.Endpoint.class) .addClass(org.jboss.test.ws.jaxws.jbws3282.Helper.class) .addClass(org.jboss.test.ws.jaxws.jbws3282.TestUtils.class) Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2015-06-17 08:28:00 UTC (rev 19795) @@ -83,7 +83,7 @@ WebArchive archive2 = ShrinkWrap.create(WebArchive.class, "jaxws-samples-eardeployment-pojo.war"); archive2 .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.logging,org.jboss.ws.common\n")) + + "Dependencies: org.jboss.logging,org.jboss.ws.common,org.jboss.as.server\n")) .addClass(org.jboss.test.ws.jaxws.samples.eardeployment.JSEBean.class) .addClass(org.jboss.test.ws.jaxws.samples.eardeployment.SupportServlet.class) .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/jboss-web.xml"), "jboss-web.xml") @@ -93,7 +93,8 @@ EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-samples-eardeployment.ear"); archive - .addManifest() + .setManifest(new StringAsset("Manifest-Version: 1.0\n" + + "Dependencies: org.jboss.as.server\n")) .addAsModule(archive1) .addAsModule(archive2) .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/META-INF/permissions.xml"), "permissions.xml"); Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishTestCase.java 2015-06-17 08:28:00 UTC (rev 19795) @@ -54,7 +54,7 @@ WebArchive archive = ShrinkWrap.create(WebArchive.class,"endpoint-publish.war"); archive .setManifest(new StringAsset("Manifest-Version: 1.0\n" - + "Dependencies: org.jboss.ws.common\n")) + + "Dependencies: org.jboss.ws.common,org.jboss.as.server \n")) .addAsResource("org/jboss/test/ws/publish/WEB-INF/wsdl/EndpointImpl3.xml", "WEB-INF/wsdl/EndpointImpl3.xml") .addAsResource("org/jboss/test/ws/publish/WEB-INF/wsdl/EndpointImpl4.xml", "WEB-INF/wsdl/EndpointImpl4.xml") .addClass(org.jboss.test.ws.publish.Endpoint.class) Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/clientConfig/META-INF/permissions.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/clientConfig/META-INF/permissions.xml 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/clientConfig/META-INF/permissions.xml 2015-06-17 08:28:00 UTC (rev 19795) @@ -5,11 +5,10 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd" version="7"> <permission> - <class-name>java.security.AllPermission</class-name> + <class-name>org.jboss.as.server.security.ServerPermission</class-name> + <name>getCurrentServiceContainer</name> </permission> - <!--Permission("org.jboss.as.server.security.ServerPermission" "getCurrentServiceContainer") is required--> - - <!--permission> + <permission> <class-name>java.util.PropertyPermission</class-name> <name>jboss.bind.address</name> <actions>read</actions> @@ -41,5 +40,5 @@ <class-name>java.io.FilePermission</class-name> <name>&lt;&lt;ALL FILES&gt;&gt;</name> <actions>read</actions> - </permission--> + </permission> </permissions> Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3282/META-INF/permissions.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3282/META-INF/permissions.xml 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3282/META-INF/permissions.xml 2015-06-17 08:28:00 UTC (rev 19795) @@ -5,11 +5,10 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd" version="7"> <permission> - <class-name>java.security.AllPermission</class-name> + <class-name>org.jboss.as.server.security.ServerPermission</class-name> + <name>getCurrentServiceContainer</name> </permission> - <!--Permission("org.jboss.as.server.security.ServerPermission" "getCurrentServiceContainer") is required--> - - <!--permission> + <permission> <class-name>java.util.PropertyPermission</class-name> <name>jboss.bind.address</name> <actions>read</actions> @@ -41,5 +40,5 @@ <class-name>java.io.FilePermission</class-name> <name>&lt;&lt;ALL FILES&gt;&gt;</name> <actions>read</actions> - </permission--> + </permission> </permissions> Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/eardeployment/META-INF/permissions.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/eardeployment/META-INF/permissions.xml 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/eardeployment/META-INF/permissions.xml 2015-06-17 08:28:00 UTC (rev 19795) @@ -5,11 +5,10 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd" version="7"> <permission> - <class-name>java.security.AllPermission</class-name> + <class-name>org.jboss.as.server.security.ServerPermission</class-name> + <name>getCurrentServiceContainer</name> </permission> - <!--Permission("org.jboss.as.server.security.ServerPermission" "getCurrentServiceContainer") is required--> - - <!--permission> + <permission> <class-name>java.util.PropertyPermission</class-name> <name>jboss.bind.address</name> <actions>read</actions> @@ -41,5 +40,5 @@ <class-name>java.io.FilePermission</class-name> <name>&lt;&lt;ALL FILES&gt;&gt;</name> <actions>read</actions> - </permission--> + </permission> </permissions> Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/publish/META-INF/permissions.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/publish/META-INF/permissions.xml 2015-06-16 22:24:17 UTC (rev 19794) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/resources/publish/META-INF/permissions.xml 2015-06-17 08:28:00 UTC (rev 19795) @@ -5,11 +5,14 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd" version="7"> <permission> - <class-name>java.security.AllPermission</class-name> + <class-name>org.jboss.as.server.security.ServerPermission</class-name> + <name>getCurrentServiceContainer</name> </permission> - <!--Permission("org.jboss.as.server.security.ServerPermission" "getCurrentServiceContainer") is required--> - - <!--permission> + <permission> + <class-name>javax.xml.ws.WebServicePermission</class-name> + <name>publishEndpoint</name> + </permission> + <permission> <class-name>java.util.PropertyPermission</class-name> <name>jboss.bind.address</name> <actions>read</actions> @@ -40,6 +43,6 @@ <permission> <class-name>java.io.FilePermission</class-name> <name>&lt;&lt;ALL FILES&gt;&gt;</name> - <actions>read</actions> - </permission--> + <actions>read,write,delete</actions> + </permission> </permissions>