[jbossws-commits] JBossWS SVN: r18296 - in stack/cxf/trunk/modules/testsuite: shared-tests/src/test/ant-import and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: asoldano
Date: 2014-01-30 12:37:40 -0500 (Thu, 30 Jan 2014)
New Revision: 18296

Modified:
   stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
   stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
   stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml
Log:
More on permissions


Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml	2014-01-30 17:13:26 UTC (rev 18295)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml	2014-01-30 17:37:40 UTC (rev 18296)
@@ -119,8 +119,10 @@
 		</classes>
 		<classes dir="${tests.output.dir}/test-resources/jaxws/cxf/clientConfig">
 			<include name="META-INF/jaxws-client-config.xml"/>
-			<include name="META-INF/permissions.xml"/>
 		</classes>
+                <zipfileset dir="${tests.output.dir}/test-resources/jaxws/cxf/clientConfig/META-INF" prefix="META-INF">
+                        <include name="permissions.xml"/>
+                </zipfileset>
 		<manifest>
             <attribute name="Dependencies" value="org.apache.cxf.impl"/> <!-- Apache CXF impl required for testing purposes -->
         </manifest>

Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml	2014-01-30 17:13:26 UTC (rev 18295)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-samples-jars-jaxws.xml	2014-01-30 17:37:40 UTC (rev 18296)
@@ -90,11 +90,13 @@
           <include name="client.wsdl" />
           <include name="validatingClient.wsdl" />
       </zipfileset>
+      <zipfileset dir="${tests.output.dir}/test-resources/jaxws/samples/schemavalidation/META-INF" prefix="META-INF">
+          <include name="permissions.xml"/>
+      </zipfileset>
     </war>
     <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-schemavalidation-client.jar">
       <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/schemavalidation/META-INF">
         <include name="jaxws-client-config.xml" />
-        <include name="permissions.xml" />
       </metainf>
     </jar>
   	

Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml	2014-01-30 17:13:26 UTC (rev 18295)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml	2014-01-30 17:37:40 UTC (rev 18296)
@@ -129,8 +129,10 @@
 			</classes>
 			<classes dir="${tests.output.dir}/test-resources/jaxws/clientConfig">
 				<include name="META-INF/jaxws-client-config.xml" />
-				<include name="META-INF/permissions.xml" />
 			</classes>
+			<zipfileset dir="${tests.output.dir}/test-resources/jaxws/clientConfig/META-INF" prefix="META-INF">
+				<include name="permissions.xml"/>
+			</zipfileset>
 			<manifest>
 				<attribute name="Dependencies" value="org.jboss.ws.common" />
 			</manifest>