December 2011 - jbossws-commits - Jboss List Archives

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-14 18:23:44 -0500 (Wed, 14 Dec 2011) New Revision: 15381 Added: common/branches/JBWS-3393/ Log: Branching for working on AS6 support removal

13 years

1
0
0 / 0

JBossWS SVN: r15380 - in stack/cxf/branches/JBWS-3393/modules/testsuite: cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms and 9 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-14 17:51:45 -0500 (Wed, 14 Dec 2011) New Revision: 15380 Removed: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/cxf/jms/META-INF-as6/ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jboss-service.xml stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/login-config.xml Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java Log: Updates to the testsuiteUpdates to the testsuites Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/scripts/cxf-jars-jaxws.xml 2011-12-14 22:51:45 UTC (rev 15380) @@ -123,16 +123,6 @@ </war>  - <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as6.war" - needxmlfile='false'> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jms/TestServlet.class"/> - <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld*.class"/> - </classes> - <zipfileset - dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as6/wsdl" - prefix="WEB-INF/classes/META-INF/wsdl"/> - </war> <war warfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as7.war" needxmlfile='false'> <classes dir="${tests.output.dir}/test-classes"> @@ -148,15 +138,6 @@ </war>  - <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as6-client.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld*.class"/> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as6"> - <include name="wsdl/**/*" /> - <include name="jboss-dependency.xml"/> - </metainf> - </jar> <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-api-as7-client.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/cxf/jms/HelloWorld*.class"/> @@ -165,11 +146,6 @@ <include name="wsdl/**/*" /> </metainf> </jar> - <jar jarfile="${tests.output.dir}/test-libs/hornetq-testqueue-as6.sar"> - <fileset dir="${tests.output.dir}/test-resources/jaxws/cxf/jms/META-INF-as6"> - <include name="hornetq-jms.xml"/> - </fileset> - </jar>  <jar destfile="${tests.output.dir}/test-libs/jaxws-cxf-jms-only-deployment.jar"> Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2011-12-14 22:51:45 UTC (rev 15380) @@ -213,28 +213,12 @@ <include name="jboss-web.xml"/> <include name="jbossws-cxf.xml"/> <include name="wsdl/*"/> -  - </webinf> <manifest> <attribute name="Dependencies" value="org.jboss.ws.cxf.jbossws-cxf-server"/> </manifest> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-username-digest-service.sar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/username-digest/WEB-INF"> - <include name="jboss-service.xml"/> - <include name="login-config.xml"/> - <include name="jbossws-users.properties"/> - <include name="jbossws-roles.properties"/> - </metainf> - </jar> -  <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsseEJB.jar"> <fileset dir="${tests.output.dir}/test-classes"> Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointAPITestCase.java 2011-12-14 22:51:45 UTC (rev 15380) @@ -44,24 +44,19 @@ { public static Test suite() { - if (isTargetJBoss6()) { - return new JBossWSCXFTestSetup(JMSEndpointAPITestCase.class, "hornetq-testqueue-as6.sar,jaxws-cxf-jms-api-as6-client.jar,jaxws-cxf-jms-api-as6.war"); - } else { - return new JBossWSCXFTestSetup(JMSEndpointAPITestCase.class, "jaxws-cxf-jms-api-as7-client.jar,jaxws-cxf-jms-api-as7.war"); - } + return new JBossWSCXFTestSetup(JMSEndpointAPITestCase.class, "jaxws-cxf-jms-api-as7-client.jar,jaxws-cxf-jms-api-as7.war"); } public void testServerSide() throws Exception { - final String asSuffix = isTargetJBoss6() ? "as6" : "as7"; - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-api-" + asSuffix); + URL url = new URL("http://" + getServerHost() + ":8080/jaxws-cxf-jms-api-as7"); BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); assertEquals("true", br.readLine()); } public void testClientSide() throws Exception { - if (!isTargetJBoss6()) { + if (isTargetJBoss7()) { System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available yet on AS7"); return; } Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms/JMSEndpointOnlyDeploymentTestCase.java 2011-12-14 22:51:45 UTC (rev 15380) @@ -55,7 +55,7 @@ public void testJMSEndpointClientSide() throws Exception { - if (!isTargetJBoss6()) + if (isTargetJBoss7()) { System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available yet on AS7"); return; Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/jms_http/JMSHTTPEndpointDeploymentTestCase.java 2011-12-14 22:51:45 UTC (rev 15380) @@ -55,7 +55,7 @@ public void testJMSEndpointClientSide() throws Exception { - if (!isTargetJBoss6()) + if (isTargetJBoss7()) { System.out.println("FIXME: can't lookup ConnectionFactory, remote JNDI binding not available yet on AS7"); return; Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationTestCase.java 2011-12-14 22:51:45 UTC (rev 15380) @@ -52,7 +52,7 @@ public static Test suite() { - return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-username-authorize.war", !isTargetJBoss6()); + return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-username-authorize.war", true); } public void testAuthorized() throws Exception Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseDigest/UsernameDigestTestCase.java 2011-12-14 22:51:45 UTC (rev 15380) @@ -54,28 +54,20 @@ public static Test suite() { JBossWSCXFTestSetup testSetup; - if (!isTargetJBoss6()) - { - testSetup = new JBossWSCXFTestSetup(UsernameDigestTestCase.class, "jaxws-samples-wsse-username-digest.war"); - Map<String, String> authenticationOptions = new HashMap<String, String>(); - authenticationOptions.put("usersProperties", - getResourceFile("jaxws/samples/wsse/username-digest/WEB-INF/jbossws-users.properties").getAbsolutePath()); - authenticationOptions.put("rolesProperties", - getResourceFile("jaxws/samples/wsse/username-digest/WEB-INF/jbossws-roles.properties").getAbsolutePath()); - authenticationOptions.put("hashAlgorithm", "SHA"); - authenticationOptions.put("hashEncoding", "BASE64"); - authenticationOptions.put("hashCharset", "UTF-8"); - authenticationOptions.put("hashUserPassword", "false"); - authenticationOptions.put("hashStorePassword", "true"); - authenticationOptions.put("storeDigestCallback", UsernameTokenCallback.class.getName()); - authenticationOptions.put("unauthenticatedIdentity", "anonymous"); - testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions); - } - else - { - testSetup = new JBossWSCXFTestSetup(UsernameDigestTestCase.class, - "jaxws-samples-wsse-username-digest-service.sar jaxws-samples-wsse-username-digest.war"); - } + testSetup = new JBossWSCXFTestSetup(UsernameDigestTestCase.class, "jaxws-samples-wsse-username-digest.war"); + Map<String, String> authenticationOptions = new HashMap<String, String>(); + authenticationOptions.put("usersProperties", + getResourceFile("jaxws/samples/wsse/username-digest/WEB-INF/jbossws-users.properties").getAbsolutePath()); + authenticationOptions.put("rolesProperties", + getResourceFile("jaxws/samples/wsse/username-digest/WEB-INF/jbossws-roles.properties").getAbsolutePath()); + authenticationOptions.put("hashAlgorithm", "SHA"); + authenticationOptions.put("hashEncoding", "BASE64"); + authenticationOptions.put("hashCharset", "UTF-8"); + authenticationOptions.put("hashUserPassword", "false"); + authenticationOptions.put("hashStorePassword", "true"); + authenticationOptions.put("storeDigestCallback", UsernameTokenCallback.class.getName()); + authenticationOptions.put("unauthenticatedIdentity", "anonymous"); + testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions); return testSetup; } Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsseEJB/WsseEjbTestCase.java 2011-12-14 22:51:45 UTC (rev 15380) @@ -49,7 +49,7 @@ public static Test suite() { - return new JBossWSCXFTestSetup(WsseEjbTestCase.class, "jaxws-samples-wsseEJB.jar", !isTargetJBoss6()); + return new JBossWSCXFTestSetup(WsseEjbTestCase.class, "jaxws-samples-wsseEJB.jar", true); } private EjbEndpoint getPort() throws Exception @@ -79,14 +79,7 @@ } catch (Exception ex) { - if (isTargetJBoss6()) - { - assertEquals("Caller unauthorized", ex.getMessage()); - } - else - { - assertTrue(ex.getMessage().contains("EjbEndpoint is not allowed")); - } + assertTrue(ex.getMessage().contains("EjbEndpoint is not allowed")); } } Deleted: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/jboss-service.xml 2011-12-14 22:51:45 UTC (rev 15380) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<server xmlns="urn:jboss:service:7.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd"> -  -  -  - <mbean code="org.jboss.security.auth.login.DynamicLoginConfig" - name="jboss:service=DynamicLoginConfig"> - <attribute name="AuthConfig">META-INF/login-config.xml</attribute> -  - <depends optional-attribute-name="LoginConfigService"> - jboss.security:service=XMLLoginConfig - </depends> -  - <depends optional-attribute-name="SecurityManagerService"> - jboss.security:service=JaasSecurityManager - </depends> - </mbean> -</server> Deleted: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-spring-tests/src/test/resources/jaxws/samples/wsse/username-digest/WEB-INF/login-config.xml 2011-12-14 22:51:45 UTC (rev 15380) @@ -1,25 +0,0 @@ -<?xml version='1.0'?> -<!DOCTYPE policy PUBLIC - "-//JBoss//DTD JBOSS Security Config 3.0//EN" - "http://www.jboss.org/j2ee/dtd/security_config.dtd"> -<policy> - - <application-policy name="JBossWSDigest"> - <authentication> - <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" - flag="required"> - <module-option name="usersProperties">META-INF/jbossws-users.properties</module-option> - <module-option name="rolesProperties">META-INF/jbossws-roles.properties</module-option> - <module-option name="hashAlgorithm">SHA</module-option> - <module-option name="hashEncoding">BASE64</module-option> - <module-option name="hashCharset">UTF-8</module-option> - <module-option name="hashUserPassword">false</module-option> - <module-option name="hashStorePassword">true</module-option> - <module-option name="storeDigestCallback">org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallback</module-option> - <module-option name="unauthenticatedIdentity">anonymous</module-option> - </login-module> - </authentication> - </application-policy> - -</policy> - Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-12-14 22:51:45 UTC (rev 15380) @@ -384,15 +384,6 @@ </manifest> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaas-digest-service.sar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF"> - <include name="jboss-service.xml"/> - <include name="login-config.xml"/> - <include name="jbossws-users.properties"/> - <include name="jbossws-roles.properties"/> - </metainf> - </jar> -  <jar destfile="${tests.output.dir}/test-libs/jaxws-samples-wsse-policy-username-jaas-ejb.jar"> <fileset dir="${tests.output.dir}/test-classes"> Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationDigestTestCase.java 2011-12-14 22:51:45 UTC (rev 15380) @@ -50,28 +50,20 @@ public static Test suite() { JBossWSCXFTestSetup testSetup; - if (!isTargetJBoss6()) - { - testSetup = new JBossWSCXFTestSetup(UsernameAuthorizationDigestTestCase.class, "jaxws-samples-wsse-policy-username-jaas-digest.war"); - Map<String, String> authenticationOptions = new HashMap<String, String>(); - authenticationOptions.put("usersProperties", - getResourceFile("jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-users.properties").getAbsolutePath()); - authenticationOptions.put("rolesProperties", - getResourceFile("jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-roles.properties").getAbsolutePath()); - authenticationOptions.put("hashAlgorithm", "SHA"); - authenticationOptions.put("hashEncoding", "BASE64"); - authenticationOptions.put("hashCharset", "UTF-8"); - authenticationOptions.put("hashUserPassword", "false"); - authenticationOptions.put("hashStorePassword", "true"); - authenticationOptions.put("storeDigestCallback", UsernameTokenCallback.class.getName()); - authenticationOptions.put("unauthenticatedIdentity", "anonymous"); - testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions); - } - else - { - testSetup = new JBossWSCXFTestSetup(UsernameAuthorizationDigestTestCase.class, - "jaxws-samples-wsse-policy-username-jaas-digest-service.sar jaxws-samples-wsse-policy-username-jaas-digest.war"); - } + testSetup = new JBossWSCXFTestSetup(UsernameAuthorizationDigestTestCase.class, "jaxws-samples-wsse-policy-username-jaas-digest.war"); + Map<String, String> authenticationOptions = new HashMap<String, String>(); + authenticationOptions.put("usersProperties", + getResourceFile("jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-users.properties").getAbsolutePath()); + authenticationOptions.put("rolesProperties", + getResourceFile("jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jbossws-roles.properties").getAbsolutePath()); + authenticationOptions.put("hashAlgorithm", "SHA"); + authenticationOptions.put("hashEncoding", "BASE64"); + authenticationOptions.put("hashCharset", "UTF-8"); + authenticationOptions.put("hashUserPassword", "false"); + authenticationOptions.put("hashStorePassword", "true"); + authenticationOptions.put("storeDigestCallback", UsernameTokenCallback.class.getName()); + authenticationOptions.put("unauthenticatedIdentity", "anonymous"); + testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions); return testSetup; } Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationEJBTestCase.java 2011-12-14 22:51:45 UTC (rev 15380) @@ -45,7 +45,7 @@ public static Test suite() { - return new JBossWSCXFTestSetup(UsernameAuthorizationEJBTestCase.class, "jaxws-samples-wsse-policy-username-jaas-ejb.jar", !isTargetJBoss6()); + return new JBossWSCXFTestSetup(UsernameAuthorizationEJBTestCase.class, "jaxws-samples-wsse-policy-username-jaas-ejb.jar", true); } public void test() throws Exception Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wsse/policy/jaas/UsernameAuthorizationTestCase.java 2011-12-14 22:51:45 UTC (rev 15380) @@ -46,7 +46,7 @@ public static Test suite() { - return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-policy-username-jaas.war", !isTargetJBoss6()); + return new JBossWSCXFTestSetup(UsernameAuthorizationTestCase.class, "jaxws-samples-wsse-policy-username-jaas.war", true); } public void test() throws Exception Deleted: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jboss-service.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jboss-service.xml 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/jboss-service.xml 2011-12-14 22:51:45 UTC (rev 15380) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<server xmlns="urn:jboss:service:7.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd"> -  -  -  - <mbean code="org.jboss.security.auth.login.DynamicLoginConfig" - name="jboss:service=DynamicLoginConfig"> - <attribute name="AuthConfig">META-INF/login-config.xml</attribute> -  - <depends optional-attribute-name="LoginConfigService"> - jboss.security:service=XMLLoginConfig - </depends> -  - <depends optional-attribute-name="SecurityManagerService"> - jboss.security:service=JaasSecurityManager - </depends> - </mbean> -</server> Deleted: stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/login-config.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/login-config.xml 2011-12-14 22:51:09 UTC (rev 15379) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/cxf-tests/src/test/resources/jaxws/samples/wsse/policy/jaas/digest/WEB-INF/login-config.xml 2011-12-14 22:51:45 UTC (rev 15380) @@ -1,25 +0,0 @@ -<?xml version='1.0'?> -<!DOCTYPE policy PUBLIC - "-//JBoss//DTD JBOSS Security Config 3.0//EN" - "http://www.jboss.org/j2ee/dtd/security_config.dtd"> -<policy> - - <application-policy name="JBossWSDigest"> - <authentication> - <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" - flag="required"> - <module-option name="usersProperties">META-INF/jbossws-users.properties</module-option> - <module-option name="rolesProperties">META-INF/jbossws-roles.properties</module-option> - <module-option name="hashAlgorithm">SHA</module-option> - <module-option name="hashEncoding">BASE64</module-option> - <module-option name="hashCharset">UTF-8</module-option> - <module-option name="hashUserPassword">false</module-option> - <module-option name="hashStorePassword">true</module-option> - <module-option name="storeDigestCallback">org.jboss.wsf.stack.cxf.security.authentication.callback.UsernameTokenCallback</module-option> - <module-option name="unauthenticatedIdentity">anonymous</module-option> - </login-module> - </authentication> - </application-policy> - -</policy> -

13 years

1
0
0 / 0

JBossWS SVN: r15379 - in stack/native/branches/JBWS-3393/modules/testsuite/native-tests: src/test/java/org/jboss/test/ws/jaxws/jbws1988 and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-14 17:51:09 -0500 (Wed, 14 Dec 2011) New Revision: 15379 Removed: stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1988/META-INF/jboss-service.xml stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1988/META-INF/login-config.xml stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2116/META-INF/jboss-service.xml stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2116/META-INF/login-config.xml Modified: stack/native/branches/JBWS-3393/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/CertAuthTestCase.java stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java Log: Updates to the testsuite Modified: stack/native/branches/JBWS-3393/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml =================================================================== --- stack/native/branches/JBWS-3393/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-12-14 22:49:55 UTC (rev 15378) +++ stack/native/branches/JBWS-3393/modules/testsuite/native-tests/scripts/build-jars-jaxws.xml 2011-12-14 22:51:09 UTC (rev 15379) @@ -266,14 +266,6 @@ <include name="jboss.xml" /> </metainf> </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws1988-config.sar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1988/META-INF"> - <include name="jboss-service.xml" /> - <include name="login-config.xml" /> - <include name="jbossws-users.properties" /> - <include name="jbossws-roles.properties" /> - </metainf> - </jar>  <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws1991.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws1991/META-INF/MANIFEST.MF"> @@ -366,14 +358,6 @@ <include name="bob-sign.jks" /> </metainf> </jar> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-jbws2116-config.sar"> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws2116/META-INF"> - <include name="jboss-service.xml" /> - <include name="login-config.xml" /> - <include name="keystore.jks" /> - <include name="jbossws-roles.properties" /> - </metainf> - </jar>  <jar destfile="${tests.output.dir}/test-libs/jaxws-jbws2166-A.jar" manifest="${tests.output.dir}/test-resources/jaxws/jbws2166/META-INF/MANIFEST.MF"> Modified: stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java =================================================================== --- stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) +++ stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1988/UsernameAuthTestCase.java 2011-12-14 22:51:09 UTC (rev 15379) @@ -49,28 +49,20 @@ public static Test suite() throws Exception { JBossWSTestSetup testSetup; - if (!isTargetJBoss6()) - { - testSetup = new JBossWSTestSetup(UsernameAuthTestCase.class, "jaxws-jbws1988.jar"); - Map<String, String> authenticationOptions = new HashMap<String, String>(); - authenticationOptions.put("usersProperties", - getResourceFile("jaxws/jbws1988/META-INF/jbossws-users.properties").getAbsolutePath()); - authenticationOptions.put("rolesProperties", - getResourceFile("jaxws/jbws1988/META-INF/jbossws-roles.properties").getAbsolutePath()); - authenticationOptions.put("hashAlgorithm", "SHA"); - authenticationOptions.put("hashEncoding", "BASE64"); - authenticationOptions.put("hashCharset", "UTF-8"); - authenticationOptions.put("hashUserPassword", "false"); - authenticationOptions.put("hashStorePassword", "true"); - authenticationOptions.put("storeDigestCallback", "org.jboss.ws.extensions.security.auth.callback.UsernameTokenCallback"); - authenticationOptions.put("unauthenticatedIdentity", "anonymous"); - testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions); - } - else - { - testSetup = new JBossWSTestSetup(UsernameAuthTestCase.class, - "jaxws-jbws1988-config.sar jaxws-jbws1988.jar"); - } + testSetup = new JBossWSTestSetup(UsernameAuthTestCase.class, "jaxws-jbws1988.jar"); + Map<String, String> authenticationOptions = new HashMap<String, String>(); + authenticationOptions.put("usersProperties", + getResourceFile("jaxws/jbws1988/META-INF/jbossws-users.properties").getAbsolutePath()); + authenticationOptions.put("rolesProperties", + getResourceFile("jaxws/jbws1988/META-INF/jbossws-roles.properties").getAbsolutePath()); + authenticationOptions.put("hashAlgorithm", "SHA"); + authenticationOptions.put("hashEncoding", "BASE64"); + authenticationOptions.put("hashCharset", "UTF-8"); + authenticationOptions.put("hashUserPassword", "false"); + authenticationOptions.put("hashStorePassword", "true"); + authenticationOptions.put("storeDigestCallback", "org.jboss.ws.extensions.security.auth.callback.UsernameTokenCallback"); + authenticationOptions.put("unauthenticatedIdentity", "anonymous"); + testSetup.addSecurityDomainRequirement("JBossWSDigest", authenticationOptions); return testSetup; } Modified: stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java =================================================================== --- stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) +++ stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java 2011-12-14 22:51:09 UTC (rev 15379) @@ -21,7 +21,6 @@ */ package org.jboss.test.ws.jaxws.jbws1991; -import java.io.File; import java.net.URL; import javax.xml.namespace.QName; @@ -46,7 +45,7 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(UsernameAuthTestCase.class, "jaxws-jbws1991.jar", !isTargetJBoss6()); + return new JBossWSTestSetup(UsernameAuthTestCase.class, "jaxws-jbws1991.jar", true); } public void testAuth() throws Exception Modified: stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java =================================================================== --- stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java 2011-12-14 22:49:55 UTC (rev 15378) +++ stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1999/JBWS1999TestCase.java 2011-12-14 22:51:09 UTC (rev 15379) @@ -56,7 +56,7 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(JBWS1999TestCase.class, "jaxws-jbws1999.war", !isTargetJBoss6()); + return new JBossWSTestSetup(JBWS1999TestCase.class, "jaxws-jbws1999.war", true); } public void testNoSecurity() throws Exception Modified: stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/CertAuthTestCase.java =================================================================== --- stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/CertAuthTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) +++ stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2116/CertAuthTestCase.java 2011-12-14 22:51:09 UTC (rev 15379) @@ -55,22 +55,14 @@ public static Test suite() throws Exception { JBossWSTestSetup testSetup; - if (!isTargetJBoss6()) - { - testSetup = new JBossWSTestSetup(CertAuthTestCase.class, "jaxws-jbws2116.jar"); - Map<String, String> authenticationOptions = new HashMap<String, String>(); - authenticationOptions.put("rolesProperties", - getResourceFile("jaxws/jbws2116/META-INF/jbossws-roles.properties").getAbsolutePath()); - authenticationOptions.put("KeyStoreURL", "jaxws/jbws2116/META-INF/keystore.jks"); - authenticationOptions.put("KeyStorePass", "password"); - authenticationOptions.put("unauthenticatedIdentity", "anonymous"); - testSetup.addSecurityDomainRequirement("JBossWSCert", authenticationOptions); - } - else - { - testSetup = new JBossWSTestSetup(CertAuthTestCase.class, - "jaxws-jbws2116-config.sar jaxws-jbws2116.jar"); - } + testSetup = new JBossWSTestSetup(CertAuthTestCase.class, "jaxws-jbws2116.jar"); + Map<String, String> authenticationOptions = new HashMap<String, String>(); + authenticationOptions.put("rolesProperties", + getResourceFile("jaxws/jbws2116/META-INF/jbossws-roles.properties").getAbsolutePath()); + authenticationOptions.put("KeyStoreURL", "jaxws/jbws2116/META-INF/keystore.jks"); + authenticationOptions.put("KeyStorePass", "password"); + authenticationOptions.put("unauthenticatedIdentity", "anonymous"); + testSetup.addSecurityDomainRequirement("JBossWSCert", authenticationOptions); return testSetup; } Modified: stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java =================================================================== --- stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) +++ stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/SecureNewsTestCase.java 2011-12-14 22:51:09 UTC (rev 15379) @@ -41,7 +41,7 @@ return new JBossWSTestSetup ( SecureNewsTestCase.class, - "jaxws-samples-news-step2-newspaper.jar, jaxws-samples-news-step2-agency-client.jar", !isTargetJBoss6() + "jaxws-samples-news-step2-newspaper.jar, jaxws-samples-news-step2-agency-client.jar", true ); } Modified: stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java =================================================================== --- stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) +++ stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleDispatchTestCase.java 2011-12-14 22:51:09 UTC (rev 15379) @@ -21,7 +21,6 @@ */ package org.jboss.test.ws.jaxws.samples.wssecurity; -import java.io.File; import java.io.StringReader; import java.net.URL; import java.util.Map; @@ -59,7 +58,7 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(SimpleDispatchTestCase.class, "jaxws-samples-wssecurity-username.war jaxws-samples-wssecurity-encrypt.war", !isTargetJBoss6()); + return new JBossWSTestSetup(SimpleDispatchTestCase.class, "jaxws-samples-wssecurity-username.war jaxws-samples-wssecurity-encrypt.war", true); } @Override Modified: stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java =================================================================== --- stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) +++ stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleUsernameTestCase.java 2011-12-14 22:51:09 UTC (rev 15379) @@ -47,7 +47,7 @@ public static Test suite() throws Exception { - return new JBossWSTestSetup(SimpleUsernameTestCase.class, "jaxws-samples-wssecurity-username.war", !isTargetJBoss6()); + return new JBossWSTestSetup(SimpleUsernameTestCase.class, "jaxws-samples-wssecurity-username.war", true); } @Override Deleted: stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java =================================================================== --- stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) +++ stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/tools/scripts/ScriptTestCase.java 2011-12-14 22:51:09 UTC (rev 15379) @@ -1,64 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.tools.scripts; - -import java.io.File; -import org.jboss.wsf.test.JBossWSTest; - -/** - * JBWS-1793: Provide a test case for the tools scripts that reside under JBOSS_HOME/bin - * - * @author Heiko.Braun(a)jboss.com - */ -public class ScriptTestCase extends JBossWSTest -{ - private static final String FS = System.getProperty("file.separator"); // '/' on unix, '\' on windows - private static final String PS = System.getProperty("path.separator"); // ':' on unix, ';' on windows - private String TOOLS_CONFIG = getResourceFile("tools" + FS + "scripts" + FS + "wstools-config.xml").getAbsolutePath(); - private static final String EXT = ":".equals( PS ) ? ".sh" : ".bat"; - - private String JBOSS_HOME; - - protected void setUp() throws Exception - { - super.setUp(); - - JBOSS_HOME = System.getProperty("jboss.home"); - } - - public void testWSToolsFromCommandLine() throws Exception - { - if (!isTargetJBoss6()) return; // wstools.sh(.bat) not available since AS7 - - // use absolute path for the output to be re-usable - File dest = createResourceFile("wstools" + FS + "java"); - dest.mkdirs(); - - String command = JBOSS_HOME + FS + "bin" + FS + "wstools" + EXT + " -config " + TOOLS_CONFIG + " -dest "+ dest.getAbsolutePath(); - executeCommand(command); - - File javaSource = getResourceFile("wstools" + FS + "java" + FS + "org" + FS + "jboss" + FS + "test" + FS + "ws" + FS + "jbws810" + FS + "PhoneBookService.java"); - - assertTrue("Service endpoint interface not generated", javaSource.exists()); - } - -} Deleted: stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1988/META-INF/jboss-service.xml =================================================================== --- stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1988/META-INF/jboss-service.xml 2011-12-14 22:49:55 UTC (rev 15378) +++ stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1988/META-INF/jboss-service.xml 2011-12-14 22:51:09 UTC (rev 15379) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<server xmlns="urn:jboss:service:7.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd"> -  -  -  - <mbean code="org.jboss.security.auth.login.DynamicLoginConfig" - name="jboss:service=DynamicLoginConfig"> - <attribute name="AuthConfig">META-INF/login-config.xml</attribute> -  - <depends optional-attribute-name="LoginConfigService"> - jboss.security:service=XMLLoginConfig - </depends> -  - <depends optional-attribute-name="SecurityManagerService"> - jboss.security:service=JaasSecurityManager - </depends> - </mbean> -</server> Deleted: stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1988/META-INF/login-config.xml =================================================================== --- stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1988/META-INF/login-config.xml 2011-12-14 22:49:55 UTC (rev 15378) +++ stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/resources/jaxws/jbws1988/META-INF/login-config.xml 2011-12-14 22:51:09 UTC (rev 15379) @@ -1,25 +0,0 @@ -<?xml version='1.0'?> -<!DOCTYPE policy PUBLIC - "-//JBoss//DTD JBOSS Security Config 3.0//EN" - "http://www.jboss.org/j2ee/dtd/security_config.dtd"> - -<policy> - - <application-policy name="JBossWSDigest"> - <authentication> - <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule" - flag="required"> - <module-option name="usersProperties">META-INF/jbossws-users.properties</module-option> - <module-option name="rolesProperties">META-INF/jbossws-roles.properties</module-option> - <module-option name="hashAlgorithm">SHA</module-option> - <module-option name="hashEncoding">BASE64</module-option> - <module-option name="hashUserPassword">false</module-option> - <module-option name="hashStorePassword">true</module-option> - <module-option name="storeDigestCallback">org.jboss.ws.extensions.security.auth.callback.UsernameTokenCallback</module-option> - <module-option name="unauthenticatedIdentity">anonymous</module-option> - </login-module> - </authentication> - </application-policy> - -</policy> - Deleted: stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2116/META-INF/jboss-service.xml =================================================================== --- stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2116/META-INF/jboss-service.xml 2011-12-14 22:49:55 UTC (rev 15378) +++ stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2116/META-INF/jboss-service.xml 2011-12-14 22:51:09 UTC (rev 15379) @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<server xmlns="urn:jboss:service:7.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd"> -  -  -  - <mbean code="org.jboss.security.plugins.JaasSecurityDomain" - name="jboss.security:service=SecurityDomain"> - <constructor> - <arg type="java.lang.String" value="JBossWSCert"/> - </constructor> - <attribute name="KeyStoreURL">resource:META-INF/keystore.jks</attribute> - <attribute name="KeyStorePass">password</attribute> - <depends>jboss.security:service=JaasSecurityManager</depends> - </mbean> -  -  -  - <mbean code="org.jboss.security.auth.login.DynamicLoginConfig" - name="jboss:service=DynamicLoginConfig"> - <attribute name="AuthConfig">META-INF/login-config.xml</attribute> -  - <depends optional-attribute-name="LoginConfigService"> - jboss.security:service=XMLLoginConfig - </depends> -  - <depends optional-attribute-name="SecurityManagerService"> - jboss.security:service=JaasSecurityManager - </depends> - </mbean> -</server> Deleted: stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2116/META-INF/login-config.xml =================================================================== --- stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2116/META-INF/login-config.xml 2011-12-14 22:49:55 UTC (rev 15378) +++ stack/native/branches/JBWS-3393/modules/testsuite/native-tests/src/test/resources/jaxws/jbws2116/META-INF/login-config.xml 2011-12-14 22:51:09 UTC (rev 15379) @@ -1,20 +0,0 @@ -<?xml version='1.0'?> -<!DOCTYPE policy PUBLIC - "-//JBoss//DTD JBOSS Security Config 3.0//EN" - "http://www.jboss.org/j2ee/dtd/security_config.dtd"> - -<policy> - - <application-policy name="JBossWSCert"> - <authentication> - <login-module code="org.jboss.security.auth.spi.CertRolesLoginModule" - flag="required"> - <module-option name="rolesProperties">META-INF/jbossws-roles.properties</module-option> - <module-option name="unauthenticatedIdentity">anonymous</module-option> - <module-option name="securityDomain">java:/jaas/JBossWSCert</module-option> - </login-module> - </authentication> - </application-policy> - -</policy> -

13 years

1
0
0 / 0

JBossWS SVN: r15378 - in shared-testsuite/branches/JBWS-3393: testsuite/src/test/ant-import and 17 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-14 17:49:55 -0500 (Wed, 14 Dec 2011) New Revision: 15378 Removed: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/console/ Modified: shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTest.java shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/ant-import/build-jars-jaxws.xml shared-testsuite/branches/JBWS-3393/testsuite/src/test/ant-import/build-samples-jaxws.xml shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java Log: Updates to the testsuites Modified: shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTest.java =================================================================== --- shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -206,6 +206,21 @@ return JBossWSTestHelper.isTargetJBoss6(); } + public static boolean isTargetJBoss7() + { + return JBossWSTestHelper.isTargetJBoss7(); + } + + public static boolean isTargetJBoss70() + { + return JBossWSTestHelper.isTargetJBoss70(); + } + + public static boolean isTargetJBoss71() + { + return JBossWSTestHelper.isTargetJBoss71(); + } + public static boolean isIntegrationNative() { return JBossWSTestHelper.isIntegrationNative(); Modified: shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -102,6 +102,24 @@ return target.startsWith("jboss6"); } + public static boolean isTargetJBoss7() + { + String target = getIntegrationTarget(); + return target.startsWith("jboss7"); + } + + public static boolean isTargetJBoss70() + { + String target = getIntegrationTarget(); + return target.startsWith("jboss70"); + } + + public static boolean isTargetJBoss71() + { + String target = getIntegrationTarget(); + return target.startsWith("jboss71"); + } + public static boolean isIntegrationNative() { String vendor = getImplementationVendor(); Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-12-14 22:49:55 UTC (rev 15378) @@ -283,23 +283,6 @@ </jar>  - <war warfile="${tests.output.dir}/test-libs/as6/jaxws-jbws1581-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class" /> - <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF"> - <include name="jboss-web.xml" /> - </webinf> - </war> - <jar jarfile="${tests.output.dir}/test-libs/as6/jaxws-jbws1581.ear"> - <fileset dir="${tests.output.dir}/test-libs/as6"> - <include name="jaxws-jbws1581-pojo.war" /> - </fileset> - <metainf dir="${tests.output.dir}/test-resources/jaxws/jbws1581/META-INF"> - <include name="jboss-app.xml" /> - </metainf> - </jar> <war warfile="${tests.output.dir}/test-libs/jaxws-jbws1581-pojo.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws1581/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class" /> Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/ant-import/build-samples-jaxws.xml =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/ant-import/build-samples-jaxws.xml 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/ant-import/build-samples-jaxws.xml 2011-12-14 22:49:55 UTC (rev 15378) @@ -507,18 +507,7 @@ </classes> </war> -  - <jar destfile="${tests.output.dir}/test-libs/management-recording-native.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/management/recording/Endpoint.class"/> - <include name="org/jboss/test/ws/management/recording/EndpointImpl.class"/> - <include name="org/jboss/test/ws/management/recording/MyManaged*.class"/> - <include name="org/jboss/test/ws/management/recording/ExtManaged*.class"/> - </fileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.logging"/> - </manifest> - </jar> +  <jar destfile="${tests.output.dir}/test-libs/management-recording-as7.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/management/recording/Endpoint.class"/> @@ -528,18 +517,6 @@ <attribute name="Dependencies" value="org.jboss.logging"/> </manifest> </jar> - <jar destfile="${tests.output.dir}/test-libs/management-recording.jar"> - <fileset dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/management/recording/Endpoint.class"/> - <include name="org/jboss/test/ws/management/recording/EndpointWithHandlerImpl.class"/> - <include name="org/jboss/test/ws/management/recording/MyManaged*.class"/> - <include name="org/jboss/test/ws/management/recording/ExtManaged*.class"/> - <include name="org/jboss/test/ws/management/recording/*.xml"/> - </fileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.logging"/> - </manifest> - </jar>  <war Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -80,7 +80,7 @@ public void testBasicSecuredSLSB() throws Exception { InitialContext iniCtx = getInitialContext(); - OrganizationHome home = (OrganizationHome)iniCtx.lookup(isTargetJBoss6() ? "ejb/BasicSecuredSLSB" : "ejb:/jaxrpc-samples-secureejb//BasicSecuredSLSB!" + OrganizationHome.class.getName()); + OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb:/jaxrpc-samples-secureejb//BasicSecuredSLSB!" + OrganizationHome.class.getName()); OrganizationRemote bean = home.create(); String info = bean.getContactInfo("mafia"); Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -52,7 +52,7 @@ public void testEJBClient() throws Exception { InitialContext iniCtx = getInitialContext(); - EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup(isTargetJBoss6() ? "/EJBClient" : "ejb:/jaxrpc-samples-serviceref-ejb-client//EJBClient!" + EJBRemoteHome.class.getName()); + EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("ejb:/jaxrpc-samples-serviceref-ejb-client//EJBClient!" + EJBRemoteHome.class.getName()); EJBRemote ejbRemote = ejbHome.create(); String helloWorld = "Hello World!"; Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -43,10 +43,7 @@ { public static Test suite() { - String archives = isTargetJBoss6() - ? "as6/jaxws-jbws1581.ear, jaxws-jbws1581-ejb3.jar" - : "jaxws-jbws1581.ear, jaxws-jbws1581-ejb3.jar"; - return new JBossWSTestSetup(JBWS1581EarTestCase.class, archives); + return new JBossWSTestSetup(JBWS1581EarTestCase.class, "jaxws-jbws1581.ear, jaxws-jbws1581-ejb3.jar"); } public void testWSDLAccess() throws Exception @@ -58,7 +55,7 @@ public void testEJBVehicle() throws Exception { - EJB3Remote remote = (EJB3Remote)getInitialContext().lookup(isTargetJBoss6() ? "/EJB3Bean/remote" : "ejb:/jaxws-jbws1581-ejb3//EJB3Bean!" + EJB3Remote.class.getName()); + EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("ejb:/jaxws-jbws1581-ejb3//EJB3Bean!" + EJB3Remote.class.getName()); String retStr = remote.runTest("Hello World!"); assertEquals("Hello World!", retStr); } Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -43,10 +43,7 @@ { public static Test suite() { - String archives = isTargetJBoss6() - ? "as6/jaxws-jbws1581-pojo.war, jaxws-jbws1581-ejb3.jar" - : "jaxws-jbws1581-pojo.war, jaxws-jbws1581-ejb3.jar"; - return new JBossWSTestSetup(JBWS1581WarTestCase.class, archives); + return new JBossWSTestSetup(JBWS1581WarTestCase.class, "jaxws-jbws1581-pojo.war, jaxws-jbws1581-ejb3.jar"); } public void testWSDLAccess() throws Exception @@ -58,7 +55,7 @@ public void testEJBVehicle() throws Exception { - EJB3Remote remote = (EJB3Remote)getInitialContext().lookup(isTargetJBoss6() ? "/EJB3Bean/remote" : "ejb:/jaxws-jbws1581-ejb3//EJB3Bean!" + EJB3Remote.class.getName()); + EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("ejb:/jaxws-jbws1581-ejb3//EJB3Bean!" + EJB3Remote.class.getName()); String retStr = remote.runTest("Hello World!"); assertEquals("Hello World!", retStr); } Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -45,7 +45,7 @@ public static Test suite() { - return new JBossWSTestSetup(JBWS2241TestCase.class, "jaxws-jbws2241.jar", !isTargetJBoss6()); + return new JBossWSTestSetup(JBWS2241TestCase.class, "jaxws-jbws2241.jar", true); } public void setUp() throws MalformedURLException Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -40,7 +40,7 @@ { public static Test suite() { - return new JBossWSTestSetup(JBWS2307MTOMTestCase.class, "jaxws-jbws2307-client.war, jaxws-jbws2307-service.war", !isTargetJBoss6()); + return new JBossWSTestSetup(JBWS2307MTOMTestCase.class, "jaxws-jbws2307-client.war, jaxws-jbws2307-service.war", true); } public void testMTOM() throws Exception Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -40,7 +40,7 @@ { public static Test suite() { - return new JBossWSTestSetup(JBWS2307TestCase.class, "jaxws-jbws2307-client.war, jaxws-jbws2307-service.war", !isTargetJBoss6()); + return new JBossWSTestSetup(JBWS2307TestCase.class, "jaxws-jbws2307-client.war, jaxws-jbws2307-service.war", true); } public void testClient() throws Exception Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -40,7 +40,7 @@ { public static Test suite() { - return new JBossWSTestSetup(JBWS2527TestCase.class, "", !isTargetJBoss6()); + return new JBossWSTestSetup(JBWS2527TestCase.class, "", true); } public void test() throws Exception Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -64,8 +64,7 @@ public void testServletAccess() throws Exception { - boolean clCheck = !isTargetJBoss6(); - URL url = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3223-servlet?param=hello-world&clCheck=" + clCheck); + URL url = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3223-servlet?param=hello-world&clCheck=true"); BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); assertEquals("hello-world", br.readLine()); } Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -57,7 +57,7 @@ public void testRemoteAccess() throws Exception { InitialContext iniCtx = getInitialContext(); - EJB3RemoteBusinessInterface ejb3Remote = (EJB3RemoteBusinessInterface)iniCtx.lookup(isTargetJBoss6() ? "/FooBean01/remote" : "ejb:/jaxws-jbws944//FooBean01!" + EJB3RemoteBusinessInterface.class.getName()); + EJB3RemoteBusinessInterface ejb3Remote = (EJB3RemoteBusinessInterface)iniCtx.lookup("ejb:/jaxws-jbws944//FooBean01!" + EJB3RemoteBusinessInterface.class.getName()); String helloWorld = "Hello world!"; Object retObj = ejb3Remote.echo(helloWorld); @@ -69,7 +69,7 @@ public void testNarrowedRemoteAccess() throws Exception { InitialContext iniCtx = getInitialContext(); - Object obj = iniCtx.lookup(isTargetJBoss6() ? "/FooBean01/home" : "ejb:/jaxws-jbws944//FooBean01!" + EJB3RemoteHome.class.getName()); + Object obj = iniCtx.lookup("ejb:/jaxws-jbws944//FooBean01!" + EJB3RemoteHome.class.getName()); EJB3RemoteHome ejb3Home = (EJB3RemoteHome)PortableRemoteObject.narrow(obj, EJB3RemoteHome.class); EJB3RemoteInterface ejb3Remote = ejb3Home.create(); Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -44,7 +44,7 @@ public static Test suite() { - return new JBossWSTestSetup(WebServiceContextEJBTestCase.class, "jaxws-samples-context.jar", !isTargetJBoss6()); + return new JBossWSTestSetup(WebServiceContextEJBTestCase.class, "jaxws-samples-context.jar", true); } public void setUp() throws Exception Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -44,7 +44,7 @@ public static Test suite() { - return new JBossWSTestSetup(WebServiceContextJSETestCase.class, "jaxws-samples-context.war", !isTargetJBoss6()); + return new JBossWSTestSetup(WebServiceContextJSETestCase.class, "jaxws-samples-context.war", true); } public void setUp() throws Exception Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -48,7 +48,7 @@ public static Test suite() { - return new JBossWSTestSetup(SecurityDomainTestCase.class, "jaxws-samples-securityDomain.jar", !isTargetJBoss6()); + return new JBossWSTestSetup(SecurityDomainTestCase.class, "jaxws-samples-securityDomain.jar", true); } private SecureEndpoint getPort() throws Exception Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -73,7 +73,7 @@ public void testEJBClient() throws Exception { InitialContext iniCtx = getInitialContext(); - EJBRemote ejbRemote = (EJBRemote)iniCtx.lookup(isTargetJBoss6() ? "/EJBClient/remote" : "ejb:/jaxws-samples-serviceref-ejb-client//EJBClient!" + EJBRemote.class.getName()); + EJBRemote ejbRemote = (EJBRemote)iniCtx.lookup("ejb:/jaxws-samples-serviceref-ejb-client//EJBClient!" + EJBRemote.class.getName()); String helloWorld = "Hello World!"; Object retObj = ejbRemote.echo(helloWorld); Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -42,7 +42,7 @@ public static Test suite() { - return new JBossWSTestSetup(WebServiceRefSecTestCase.class, "jaxws-samples-webservicerefsec.jar", !isTargetJBoss6()); + return new JBossWSTestSetup(WebServiceRefSecTestCase.class, "jaxws-samples-webservicerefsec.jar", true); } public void testServletClient() throws Exception Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -153,15 +153,7 @@ assertNotNull(response); assertNotNull(response.getDataHandler().getContent()); - File tmpDir = null; - if (isTargetJBoss6()) - { - tmpDir = new File(System.getProperty("jboss.home") + FS + "server" + FS + System.getProperty("jboss.server.instance") + FS + "tmp" + FS + "jbossws"); - } - else - { - tmpDir = new File(System.getProperty("jboss.home") + FS + "standalone" + FS + "tmp" + FS + "jbossws"); - } + File tmpDir = new File(System.getProperty("jboss.home") + FS + "standalone" + FS + "tmp" + FS + "jbossws"); assertTrue("Temp dir doesn't exist: " + tmpDir, tmpDir.exists()); //[JBWS-2834]: windows file delete issue Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -76,11 +76,6 @@ assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsprovide" + ".bat").exists()); assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsconsume" + ".sh").exists()); assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsconsume" + ".bat").exists()); - - if (!isTargetJBoss6()) return; // wsrunclient not available since AS7x - - assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsrunclient" + ".sh").exists()); - assertTrue(new File(JBOSS_HOME + FS + "bin" + FS + "wsrunclient" + ".bat").exists()); } protected void tearDown() throws Exception Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -22,7 +22,6 @@ package org.jboss.test.ws.management.recording; import java.net.URL; -import java.rmi.RMISecurityManager; import javax.management.MBeanServerConnection; import javax.management.ObjectName; @@ -48,27 +47,13 @@ protected void setUp() throws Exception { - if (!isTargetJBoss6()) { - endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithConfigImpl"; - JBossWSTestHelper.deploy("management-recording-as7.jar"); - } else if (isIntegrationNative()) { - endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointImpl"; - JBossWSTestHelper.deploy("management-recording-native.jar"); - } else { - endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithHandlerImpl"; - JBossWSTestHelper.deploy("management-recording.jar"); - } + endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithConfigImpl"; + JBossWSTestHelper.deploy("management-recording-as7.jar"); } protected void tearDown() throws Exception { - if (!isTargetJBoss6()) { - JBossWSTestHelper.undeploy("management-recording-as7.jar"); - } else if (isIntegrationNative()) { - JBossWSTestHelper.undeploy("management-recording-native.jar"); - } else { - JBossWSTestHelper.undeploy("management-recording.jar"); - } + JBossWSTestHelper.undeploy("management-recording-as7.jar"); } public void testAddCustomProcessor() throws Exception Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -55,27 +55,13 @@ protected void setUp() throws Exception { - if (!isTargetJBoss6()) { - endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithConfigImpl"; - JBossWSTestHelper.deploy("management-recording-as7.jar"); - } else if (isIntegrationNative()) { - endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointImpl"; - JBossWSTestHelper.deploy("management-recording-native.jar"); - } else { - endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithHandlerImpl"; - JBossWSTestHelper.deploy("management-recording.jar"); - } + endpointObjectName = "jboss.ws:context=management-recording,endpoint=EndpointWithConfigImpl"; + JBossWSTestHelper.deploy("management-recording-as7.jar"); } protected void tearDown() throws Exception { - if (!isTargetJBoss6()) { - JBossWSTestHelper.undeploy("management-recording-as7.jar"); - } else if (isIntegrationNative()) { - JBossWSTestHelper.undeploy("management-recording-native.jar"); - } else { - JBossWSTestHelper.undeploy("management-recording.jar"); - } + JBossWSTestHelper.undeploy("management-recording-as7.jar"); } public void testRecording() throws Exception Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java 2011-12-14 21:21:49 UTC (rev 15377) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java 2011-12-14 22:49:55 UTC (rev 15378) @@ -149,13 +149,7 @@ sb.append("project.name=" + projectName + "\n"); sb.append("project.jboss.home=" + jbossHome.replace('\\', '/') + "\n"); sb.append("project.type=jar\n"); - if (isTargetJBoss6()) { - sb.append("project.jboss.conf=default\n"); - } - else - { - sb.append("project.jboss.conf=standalone\n"); - } + sb.append("project.jboss.conf=standalone\n"); sb.append("workspace.home=" + binDistroDir.getAbsolutePath().replace('\\', '/') + "\n"); BufferedWriter out = new BufferedWriter(new FileWriter(file)); out.write(sb.toString());

13 years

1
0
0 / 0

JBossWS SVN: r15377 - in shared-testsuite/branches/JBWS-3393: testsuite/src/test/ant-import and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-14 16:21:49 -0500 (Wed, 14 Dec 2011) New Revision: 15377 Modified: shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java shared-testsuite/branches/JBWS-3393/testsuite/src/test/ant-import/build-testsuite.xml Log: Removing references to AS6 in test support classes and build-testsuite.xml Modified: shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2011-12-14 21:11:55 UTC (rev 15376) +++ shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2011-12-14 21:21:49 UTC (rev 15377) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * Copyright 2011, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -28,15 +28,11 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.UnknownHostException; -import java.util.Hashtable; import java.util.Map; import javax.management.MBeanServerConnection; -import javax.management.ObjectName; import javax.management.remote.JMXConnectorFactory; import javax.management.remote.JMXServiceURL; -import javax.naming.InitialContext; -import javax.naming.NamingException; import javax.xml.namespace.QName; import javax.xml.transform.Source; import javax.xml.ws.Service; @@ -44,7 +40,6 @@ import javax.xml.ws.soap.SOAPBinding; import org.jboss.logging.Logger; -import org.jboss.ws.common.ObjectNameFactory; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployer.Deployer; @@ -54,6 +49,7 @@ * * @author Thomas.Diesler(a)jboss.org * @author ropalka(a)redhat.com + * @author alessio.soldano(a)jboss.com */ public class JBossWSTestHelper { @@ -176,19 +172,19 @@ } } - @SuppressWarnings("unchecked") public static MBeanServerConnection getServer() { if (server == null) { - if (getIntegrationTarget().startsWith("jboss7")) - { - server = getAS7ServerConnection(); - } - else - { - server = getAS6ServerConnection(); - } + String integrationTarget = getIntegrationTarget(); + if (integrationTarget.startsWith("jboss7")) + { + server = getAS7ServerConnection(); + } + else + { + throw new IllegalStateException("Unsupported target container: " + integrationTarget); + } } return server; } @@ -205,21 +201,6 @@ } } - private static MBeanServerConnection getAS6ServerConnection() - { - Hashtable jndiEnv = null; - try - { - InitialContext iniCtx = new InitialContext(); - jndiEnv = iniCtx.getEnvironment(); - return (MBeanServerConnection)iniCtx.lookup("jmx/invoker/RMIAdaptor"); - } - catch (NamingException ex) - { - throw new RuntimeException("Cannot obtain MBeanServerConnection using jndi props: " + jndiEnv, ex); - } - } - public static String getIntegrationTarget() { if (integrationTarget == null) @@ -229,36 +210,7 @@ if (integrationTarget == null) throw new IllegalStateException("Cannot obtain system property: " + SYSPROP_JBOSSWS_INTEGRATION_TARGET); - LOGGER.warn("TODO: [JBWS-3211] include AS 7.x into integrationTarget mismatch check"); - if (!integrationTarget.startsWith("jboss7")) - { - // Read the JBoss SpecificationVersion - String jbossVersion = null; - try - { - ObjectName oname = ObjectNameFactory.create("jboss.system:type=Server"); - jbossVersion = (String)getServer().getAttribute(oname, "VersionNumber"); - if (jbossVersion == null) - throw new IllegalStateException("Cannot obtain jboss version"); - - if (jbossVersion.startsWith("5.1")) - jbossVersion = "jboss51"; - else if (jbossVersion.startsWith("5.0")) - jbossVersion = "jboss50"; - else if (jbossVersion.startsWith("6.1")) - jbossVersion = "jboss61"; - else if (jbossVersion.startsWith("6.0")) - jbossVersion = "jboss60"; - else throw new IllegalStateException("Unsupported jboss version: " + jbossVersion); - } - catch (Exception ex) - { - throw new RuntimeException(ex); - } - - if (integrationTarget.startsWith(jbossVersion) == false) - throw new IllegalStateException("Integration target mismatch: " + integrationTarget + ".startsWith(" + jbossVersion + ")"); - } + LOGGER.warn("TODO: [JBWS-3211] implement integrationTarget mismatch check for AS 7.x"); } return integrationTarget; Modified: shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java =================================================================== --- shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2011-12-14 21:11:55 UTC (rev 15376) +++ shared-testsuite/branches/JBWS-3393/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2011-12-14 21:21:49 UTC (rev 15377) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * Copyright 2011, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -45,6 +45,7 @@ * A test setup that deploys/undeploys archives * * @author Thomas.Diesler(a)jboss.org + * @author alessio.soldano(a)jboss.com * @since 14-Oct-2004 */ public class JBossWSTestSetup extends TestSetup Modified: shared-testsuite/branches/JBWS-3393/testsuite/src/test/ant-import/build-testsuite.xml =================================================================== --- shared-testsuite/branches/JBWS-3393/testsuite/src/test/ant-import/build-testsuite.xml 2011-12-14 21:11:55 UTC (rev 15376) +++ shared-testsuite/branches/JBWS-3393/testsuite/src/test/ant-import/build-testsuite.xml 2011-12-14 21:21:49 UTC (rev 15377) @@ -31,12 +31,6 @@ <target name="tests-prepare" depends="prepare">  - <condition property="jboss.home" value="${jboss600.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss600"/> - </condition> - <condition property="jboss.home" value="${jboss610.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss610"/> - </condition> <condition property="jboss.home" value="${jboss700.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss700"/> </condition> @@ -102,16 +96,8 @@ <mkdir dir="${tests.output.dir}"/> <delete file="${tests.output.dir}/test.log" failonerror="false"/> - <property name="jboss.client" value="${jboss.home}/client"/> <property name="jboss.lib" value="${jboss.home}/lib"/> - <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/> - <condition property="jboss.server.lib" value="${jboss.home}/common/lib" else="${jboss.server}/lib"> - <available file="${jboss.home}/common/lib"/> - </condition> - <property name="jboss.server.deploy" value="${jboss.server}/deploy"/> - <property name="jboss.server.deployers" value="${jboss.server}/deployers"/> -  <condition property="endorsed.dirs" value="${jboss.home}/lib/endorsed${path.separator}${jboss.home}/modules/javax/xml/ws/api/main/"> <isset property="jboss.home"/> @@ -130,7 +116,7 @@ </tstamp> </target> - <target name="tests-classpath" depends="tests-classpath-jboss710,tests-classpath-jboss700,tests-classpath-jboss60"> + <target name="tests-classpath" depends="tests-classpath-jboss710,tests-classpath-jboss700"> <path id="tests.javac.classpath"> <path refid="ws.stack.classpath"/> <path refid="integration.target.javac.classpath"/> @@ -141,86 +127,6 @@ </path> </target> - <target name="tests-classpath-jboss60" depends="tests-prepare" if="jbossws.integration.jboss60"> - - <path id="integration.target.javac.classpath"> - <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> - <pathelement location="${jboss.client}/jboss-annotations-api_1.1_spec.jar"/> - <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss.client}/jboss-appclient.jar"/> - <pathelement location="${jboss.client}/jboss-common-core.jar"/> - <pathelement location="${jboss.client}/jboss-ejb-api_3.1_spec.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/> - <pathelement location="${jboss.client}/jboss-jaxr-api_1.0_spec.jar"/> - <pathelement location="${jboss.client}/jboss-logging.jar"/> - <pathelement location="${jboss.client}/jboss-logging-spi.jar"/> - <pathelement location="${jboss.client}/jboss-metadata-client.jar"/> - <pathelement location="${jboss.client}/jboss-metadata-common.jar"/> - <pathelement location="${jboss.client}/jboss-remoting.jar"/> - <pathelement location="${jboss.client}/jboss-servlet-api_3.0_spec.jar"/> - <pathelement location="${jboss.client}/jbossxb.jar"/> - <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.client}/stax-api.jar"/> - <pathelement location="${jboss.client}/wsdl4j.jar"/> - <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss.server.lib}/servlet-api.jar"/> - </path> - -  - <path id="integration.target.client.classpath"> - <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/javassist.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> - <pathelement location="${jboss.client}/jaxb-impl.jar"/> - <pathelement location="${jboss.client}/jaxb-xjc.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> - <pathelement location="${jboss.client}/jboss-appclient.jar"/> - <pathelement location="${jboss.client}/jboss-ejb3-ext-api.jar"/> - <pathelement location="${jboss.client}/jboss-metadata-client.jar"/> - <pathelement location="${jboss.client}/jboss-metadata-common.jar"/> - <pathelement location="${jboss.client}/jboss-remoting.jar"/> - <pathelement location="${jboss.client}/jbossxb.jar"/> - <pathelement location="${jboss.client}/jbossall-client.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> - <pathelement location="${jboss.client}/log4j.jar"/> - <pathelement location="${jboss.client}/mail.jar"/> - <pathelement location="${jboss.client}/stax-api.jar"/> - <pathelement location="${jboss.client}/trove.jar"/> - <pathelement location="${jboss.client}/jboss-javaee.jar"/> -  - <pathelement location="${jboss.lib}/jboss-classloader.jar"/> - <pathelement location="${jboss.lib}/jboss-classloading.jar"/> - <pathelement location="${jboss.lib}/jboss-classloading-vfs.jar"/> - <pathelement location="${jboss.lib}/jboss-dependency.jar"/> - <pathelement location="${jboss.lib}/jboss-vfs.jar"/> - <pathelement location="${jboss.lib}/jboss-kernel.jar"/> - <pathelement location="${jboss.lib}/jboss-reflect.jar"/> - <pathelement location="${jboss.lib}/jboss-system.jar"/> - <pathelement location="${jboss.server.lib}/jboss.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss.server.lib}/jbossws-native-core.jar"/>  - <pathelement location="${jboss.server.lib}/jnpserver.jar"/> - <pathelement location="${jboss.server.lib}/jboss-ejb3-core.jar"/> - <pathelement location="${jboss.server.lib}/jboss-ejb3-vfs-spi.jar"/> - <pathelement location="${jboss.server.lib}/hibernate-core.jar"/> - <pathelement location="${jboss.server.lib}/netty.jar"/>  - <pathelement location="${jboss.server.lib}/servlet-api.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> - <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> - <pathelement location="${tools.jar}"/> - </path> - </target> - <target name="tests-classpath-jboss700" depends="tests-prepare" if="jbossws.integration.jboss700"> <path id="integration.target.javac.classpath"> @@ -626,7 +532,6 @@ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol"/> <sysproperty key="java.security.policy" value="${tests.output.dir}/test-classes/tst.policy"/> <sysproperty key="jboss.home" value="${jboss.home}"/> - <sysproperty key="jboss.server.instance" value="${jboss.server.instance}"/> <sysproperty key="jboss.bind.address" value="${node0}"/> <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> <sysproperty key="jbossws.deployer.authentication.username" value="${jbossws.deployer.authentication.username}"/> @@ -681,7 +586,6 @@ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol"/> <sysproperty key="java.security.policy" value="${tests.output.dir}/test-classes/tst.policy"/> <sysproperty key="jboss.home" value="${jboss.home}"/> - <sysproperty key="jboss.server.instance" value="${jboss.server.instance}"/> <sysproperty key="jboss.bind.address" value="${node0}"/> <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> <sysproperty key="jbossws.deployer.authentication.username" value="${jbossws.deployer.authentication.username}"/>

13 years

1
0
0 / 0

JBossWS SVN: r15376 - shared-testsuite/branches.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-14 16:11:55 -0500 (Wed, 14 Dec 2011) New Revision: 15376 Added: shared-testsuite/branches/JBWS-3393/ Log: Branching for working on AS6 support removal

13 years

1
0
0 / 0

JBossWS SVN: r15375 - in stack/native/branches/JBWS-3393: modules/client and 9 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-14 12:30:51 -0500 (Wed, 14 Dec 2011) New Revision: 15375 Removed: stack/native/branches/JBWS-3393/modules/core/src/main/resources/jbossws-native-config-as6.xml stack/native/branches/JBWS-3393/modules/dist/management/ stack/native/branches/JBWS-3393/modules/resources/src/main/resources/bin/ stack/native/branches/JBWS-3393/modules/resources/src/main/resources/resources/deploy.conf stack/native/branches/JBWS-3393/modules/resources/src/main/resources/resources/server-deploy.conf Modified: stack/native/branches/JBWS-3393/build.xml stack/native/branches/JBWS-3393/modules/client/pom.xml stack/native/branches/JBWS-3393/modules/core/pom.xml stack/native/branches/JBWS-3393/modules/core/src/main/scripts/antrun-beans-config.xml stack/native/branches/JBWS-3393/modules/dist/pom.xml stack/native/branches/JBWS-3393/modules/dist/src/main/distro/Install.txt stack/native/branches/JBWS-3393/modules/dist/src/main/distro/ant.properties.example stack/native/branches/JBWS-3393/modules/dist/src/main/distro/build-deploy.xml stack/native/branches/JBWS-3393/modules/dist/src/main/distro/build-project-gen.xml stack/native/branches/JBWS-3393/modules/dist/src/main/distro/build-setup.xml stack/native/branches/JBWS-3393/modules/dist/src/main/distro/build.xml stack/native/branches/JBWS-3393/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/branches/JBWS-3393/modules/testsuite/pom.xml stack/native/branches/JBWS-3393/pom.xml Log: Initial changes Modified: stack/native/branches/JBWS-3393/build.xml =================================================================== --- stack/native/branches/JBWS-3393/build.xml 2011-12-14 15:31:36 UTC (rev 15374) +++ stack/native/branches/JBWS-3393/build.xml 2011-12-14 17:30:51 UTC (rev 15375) @@ -41,8 +41,6 @@ <import file="${dist.distro.dir}/build-deploy.xml"/> <import file="${stack.resources.dir}/resources/jbossws-deploy-macros.xml"/> - <property name="jbossws.default.deploy.conf" value="${stack.resources.dir}/resources/deploy.conf"/> - <property name="jbossws.default.server.deploy.conf" value="${stack.resources.dir}/resources/server-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/>  @@ -67,12 +65,6 @@ <arg value="help:effective-settings"/> </exec> <xmlproperty file="${dist.output.dir}/effective-settings.xml" keeproot="false"/> - <condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}"> - <isset property="profiles.profile.properties.jboss600.home"/> - </condition> - <condition property="jboss610.home" value="${profiles.profile.properties.jboss610.home}"> - <isset property="profiles.profile.properties.jboss610.home"/> - </condition> <condition property="jboss700.home" value="${profiles.profile.properties.jboss700.home}"> <isset property="profiles.profile.properties.jboss700.home"/> </condition> @@ -86,16 +78,10 @@ <isset property="profiles.profile.properties.jboss710.home"/> </condition> - <fail message="jboss home not set, use jboss600.home=value, jboss610.home=value, jboss700.home=value, jboss701.home=value, jboss702.home=value or jboss710.home=value to set"> + <fail message="jboss home not set, use jboss700.home=value, jboss701.home=value, jboss702.home=value or jboss710.home=value to set"> <condition> <and> <not> - <isset property="jboss600.home"/> - </not> - <not> - <isset property="jboss610.home"/> - </not> - <not> <isset property="jboss701.home"/> </not> <not> @@ -112,8 +98,6 @@ </fail> <echo/> - <echo message="jboss600.home=${jboss600.home}"/> - <echo message="jboss610.home=${jboss610.home}"/> <echo message="jboss700.home=${jboss700.home}"/> <echo message="jboss701.home=${jboss701.home}"/> <echo message="jboss702.home=${jboss702.home}"/> Modified: stack/native/branches/JBWS-3393/modules/client/pom.xml =================================================================== --- stack/native/branches/JBWS-3393/modules/client/pom.xml 2011-12-14 15:31:36 UTC (rev 15374) +++ stack/native/branches/JBWS-3393/modules/client/pom.xml 2011-12-14 17:30:51 UTC (rev 15375) @@ -40,19 +40,6 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestEntries> - <Class-Path>jbossws-api.jar jbossws-spi.jar jbossws-common.jar jbossws-common-tools.jar jbossws-native-core.jar jbossws-native-factories.jar jbossws-native-services.jar jaxrpc-api.jar jaxws-api.jar jsr181-api.jar saaj-api.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar jbosssx-client.jar jboss-javaee.jar jboss-xml-binding.jar jbossxb.jar netty.jar wscommons-policy.jar stax-api.jar wsdl4j.jar wstx.jar</Class-Path> - </manifestEntries> - </archive> - </configuration> - </plugin> - </plugins> - </build> + <build/> </project> Modified: stack/native/branches/JBWS-3393/modules/core/pom.xml =================================================================== --- stack/native/branches/JBWS-3393/modules/core/pom.xml 2011-12-14 15:31:36 UTC (rev 15374) +++ stack/native/branches/JBWS-3393/modules/core/pom.xml 2011-12-14 17:30:51 UTC (rev 15375) @@ -15,7 +15,6 @@ <properties> <jboss.jbosssx.version>2.0.2.SP3</jboss.jbosssx.version> - <jboss.microcontainer.version>2.0.2.GA</jboss.microcontainer.version> </properties>  @@ -204,34 +203,6 @@ </artifactItems> </configuration> </execution> - <execution> - <id>copy-dependencies</id> - <phase>prepare-package</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <artifactItems>org.jboss.ws:jbossws-jboss*:zip:resources</artifactItems> - <artifactItems> - <artifactItem> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600</artifactId> - <version>${jbossws.jboss600.version}</version> - <classifier>resources</classifier> - <type>zip</type> - <outputDirectory>${project.build.directory}/resources/jbossws-jboss600</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss610</artifactId> - <version>${jbossws.jboss610.version}</version> - <classifier>resources</classifier> - <type>zip</type> - <outputDirectory>${project.build.directory}/resources/jbossws-jboss610</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> </executions> </plugin>  Deleted: stack/native/branches/JBWS-3393/modules/core/src/main/resources/jbossws-native-config-as6.xml =================================================================== --- stack/native/branches/JBWS-3393/modules/core/src/main/resources/jbossws-native-config-as6.xml 2011-12-14 15:31:36 UTC (rev 15374) +++ stack/native/branches/JBWS-3393/modules/core/src/main/resources/jbossws-native-config-as6.xml 2011-12-14 17:30:51 UTC (rev 15375) @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - -  - <bean name="WSEndpointRegistry" class="org.jboss.ws.common.management.ManagedEndpointRegistry"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - </bean> - -  - <bean name="WSWebservicesDescriptorParser" class="org.jboss.ws.common.deployment.WebservicesDescriptorParserImpl"> - <property name="descriptorName">webservices.xml</property> - </bean> - <bean name="WSJBossWebservicesDescriptorParser" class="org.jboss.ws.common.deployment.JBossWebservicesDescriptorParserImpl"> - <property name="descriptorName">jboss-webservices.xml</property> - </bean> - -  - <bean name="WSMemoryBufferRecorder" class="org.jboss.ws.common.monitoring.MemoryBufferRecorder"> - <property name="recording">false</property> - </bean> - <bean name="WSLogRecorder" class="org.jboss.ws.common.monitoring.LogRecorder"> - <property name="recording">false</property> - </bean> - -  - <bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.ws.common.deployment.ContextPropertiesDeploymentAspect"> - <property name="provides">ContextProperties, StackDescriptor</property> - <property name="contextProperties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry> - <key>stack.transport.class</key> - <value>org.jboss.wsf.stack.jbws.EndpointServlet</value> - </entry> - </map> - </property> - </bean> - - <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel</property> - <property name="provides">InitializedMetaDataModel</property> - </bean> - - <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.ws.common.deployment.EndpointHandlerDeploymentAspect"> - <property name="requires">ContainerMetaData</property> - <property name="provides">StackEndpointHandler</property> - </bean> - - <bean name="WSNativeInstanceProviderDeploymentAspect" class="org.jboss.wsf.stack.jbws.NativeInstanceProviderDeploymentAspect"> - <property name="requires">ContainerMetaData</property> - <property name="provides">StackInstanceProvider</property> - </bean> - - <bean name="WSNativeEndpointRecordProcessorDeploymentAspect" class="org.jboss.ws.common.deployment.EndpointRecordProcessorDeploymentAspect"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - <property name="requires">RegisteredEndpoint</property> - <property name="provides">EndpointRecordProcessors</property> - <property name="processors"> - <list class="java.util.ArrayList" elementClass="org.jboss.ws.api.monitoring.RecordProcessor"> - <inject bean="WSMemoryBufferRecorder"/> - <inject bean="WSLogRecorder"/> - </list> - </property> - </bean> - - <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel, JAXBIntros</property> - <property name="provides">PublishedContract</property> - </bean> - - <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel</property> - </bean> - - <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect"> - <property name="requires">ContainerMetaData, URLPattern, EndpointAddress, VFSRoot, JAXBIntros</property> - <property name="provides">UnifiedMetaDataModel</property> - </bean> - - <bean name="WSJAXBIntroDeploymentAspect" class="org.jboss.ws.common.deployment.JAXBIntroDeploymentAspect"> - <property name="provides">JAXBIntros</property> - </bean> - -</deployment> Modified: stack/native/branches/JBWS-3393/modules/core/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/native/branches/JBWS-3393/modules/core/src/main/scripts/antrun-beans-config.xml 2011-12-14 15:31:36 UTC (rev 15374) +++ stack/native/branches/JBWS-3393/modules/core/src/main/scripts/antrun-beans-config.xml 2011-12-14 17:30:51 UTC (rev 15375) @@ -30,16 +30,6 @@ <target name="main"> <copy - file="${src.dir}/jbossws-native-config-as6.xml" - tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" - /> - - <copy - file="${src.dir}/jbossws-native-config-as6.xml" - tofile="${dest.dir}/jbossws-jboss610/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" - /> - - <copy file="${src.dir}/jbossws-native-config-as7.xml" tofile="${dest.dir}/jbossws-jboss700/jbossws.beans/META-INF/stack-specific-deployment-aspects.xml" /> Modified: stack/native/branches/JBWS-3393/modules/dist/pom.xml =================================================================== --- stack/native/branches/JBWS-3393/modules/dist/pom.xml 2011-12-14 15:31:36 UTC (rev 15374) +++ stack/native/branches/JBWS-3393/modules/dist/pom.xml 2011-12-14 17:30:51 UTC (rev 15375) @@ -17,10 +17,6 @@ <properties> </properties> - <modules> - <module>management</module> - </modules> - <dependencies> <dependency> <groupId>org.jboss.ws.native</groupId> @@ -73,6 +69,12 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + <scope>provided</scope> + </dependency> +  <dependency> <groupId>org.jboss.ws</groupId> @@ -108,38 +110,6 @@ <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss610</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss700</artifactId> <scope>provided</scope> <exclusions> @@ -239,16 +209,6 @@ <mkdir dir="${basedir}/target/exclude-file" /> <xslt style="${basedir}/src/main/distro/test-exclude.xsl" in="../testsuite/pom.xml" - out="${basedir}/target/exclude-file/test-excludes-jboss600.txt"> - <param name="targetName" expression="jboss600" /> - </xslt> - <xslt style="${basedir}/src/main/distro/test-exclude.xsl" - in="../testsuite/pom.xml" - out="${basedir}/target/exclude-file/test-excludes-jboss610.txt"> - <param name="targetName" expression="jboss610" /> - </xslt> - <xslt style="${basedir}/src/main/distro/test-exclude.xsl" - in="../testsuite/pom.xml" out="${basedir}/target/exclude-file/test-excludes-jboss700.txt"> <param name="targetName" expression="jboss700" /> </xslt> Modified: stack/native/branches/JBWS-3393/modules/dist/src/main/distro/Install.txt =================================================================== --- stack/native/branches/JBWS-3393/modules/dist/src/main/distro/Install.txt 2011-12-14 15:31:36 UTC (rev 15374) +++ stack/native/branches/JBWS-3393/modules/dist/src/main/distro/Install.txt 2011-12-14 17:30:51 UTC (rev 15375) @@ -13,20 +13,11 @@ 2.) Modify the target container location in ant.properties 3.) Execute one of the following - ant deploy-jboss600 - ant deploy-jboss610 ant deploy-jboss700 ant deploy-jboss701 ant deploy-jboss702 ant deploy-jboss710 - On AS 6 series, by default the SOAP stack will be installed to 'default' -configuration. If users want to install SOAP stack to different JBossAS -configuration then can specify -Djboss.server.instance=foo JVM property. -Supported configurations of the installer are 'default', 'all' and 'standard'. - - ant -Djboss.server.instance=standard deploy-jboss610 - 4.) Execute the samples to verify your installation 'ant tests' Modified: stack/native/branches/JBWS-3393/modules/dist/src/main/distro/ant.properties.example =================================================================== --- stack/native/branches/JBWS-3393/modules/dist/src/main/distro/ant.properties.example 2011-12-14 15:31:36 UTC (rev 15374) +++ stack/native/branches/JBWS-3393/modules/dist/src/main/distro/ant.properties.example 2011-12-14 17:30:51 UTC (rev 15375) @@ -3,25 +3,22 @@ # # Optional JBoss Home -jboss600.home=(a)jboss600.home@ -jboss610.home=(a)jboss610.home@ jboss700.home=(a)jboss700.home@ jboss701.home=(a)jboss701.home@ jboss702.home=(a)jboss702.home@ jboss710.home=(a)jboss710.home@ -# The JBoss server under test. This can be [jboss600|jboss610|jboss700|jboss701|jboss702|jboss710] +# The JBoss server under test. This can be [jboss700|jboss701|jboss702|jboss710] jbossws.integration.target=jboss700 # The JBoss settings -jboss.server.instance=default jboss.bind.address=localhost # JBoss Management console authentication (AS 7.1.x) jbossws.deployer.authentication.username=admin jbossws.deployer.authentication.password=admin -# JBoss JMX invoker authentication (AS 6 / AS 7.0.x) +# JBoss JMX invoker authentication (AS 7.0.x) #jmx.authentication.username=admin #jmx.authentication.password=admin Modified: stack/native/branches/JBWS-3393/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/native/branches/JBWS-3393/modules/dist/src/main/distro/build-deploy.xml 2011-12-14 15:31:36 UTC (rev 15374) +++ stack/native/branches/JBWS-3393/modules/dist/src/main/distro/build-deploy.xml 2011-12-14 17:30:51 UTC (rev 15375) @@ -25,88 +25,6 @@ <project>  -  -  - - <target name="deploy-structure-jboss600" depends="prepare-deploy"> - <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-native" inheritall="false"> - <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> - <param name="jbossid" value="${jbossws.integration.target}"/> - <param name="artifactsdir" value="${deploy.artifacts.dir}"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - <param name="modifyjbossintegration" value="true"/> - </antcall> - <macro-create-deploy-conf deploystructure="${deploy.structure}"/> - </target> - -  -  -  - - <target name="target-jboss600"> - <property name="jbossws.integration.target" value="jboss600"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss600" depends="undeploy-jboss600,deploy-structure-jboss600" description="Deploy jbossws to jboss600"> - <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/> - <copy todir="${jboss600.home}" overwrite="true" verbose="true"> - <fileset dir="${deploy.structure}"/> - </copy> - <chmod dir="${jboss600.home}/bin" perm="+x" includes="*.sh"/> - </target> - - <target name="undeploy-jboss600" depends="target-jboss600,init" description="Remove jbossws from jboss600"> - <fail message="Not available: ${jboss600.available.file}" unless="jboss600.available"/> - <macro-undeploy-jbossws targetdir="${jboss600.server}" - defaultconf="${jbossws.default.deploy.conf}" - defaultserverconf="${jbossws.default.server.deploy.conf}" - modifyjbossintegration="true"/> - </target> - -  -  -  - - <target name="deploy-structure-jboss610" depends="prepare-deploy"> - <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-native" inheritall="false"> - <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> - <param name="jbossid" value="${jbossws.integration.target}"/> - <param name="artifactsdir" value="${deploy.artifacts.dir}"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - <param name="modifyjbossintegration" value="true"/> - </antcall> - <macro-create-deploy-conf deploystructure="${deploy.structure}"/> - </target> - -  -  -  - - <target name="target-jboss610"> - <property name="jbossws.integration.target" value="jboss610"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss610" depends="undeploy-jboss610,deploy-structure-jboss610" description="Deploy jbossws to jboss610"> - <fail message="Not available: ${jboss610.available.file}" unless="jboss610.available"/> - <copy todir="${jboss610.home}" overwrite="true" verbose="true"> - <fileset dir="${deploy.structure}"/> - </copy> - <chmod dir="${jboss610.home}/bin" perm="+x" includes="*.sh"/> - </target> - - <target name="undeploy-jboss610" depends="target-jboss610,init" description="Remove jbossws from jboss610"> - <fail message="Not available: ${jboss610.available.file}" unless="jboss610.available"/> - <macro-undeploy-jbossws targetdir="${jboss610.server}" - defaultconf="${jbossws.default.deploy.conf}" - defaultserverconf="${jbossws.default.server.deploy.conf}" - modifyjbossintegration="true"/> - </target> - -    @@ -266,41 +184,4 @@ <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> </target> -  -  -  - - <patternset id="jbossws.deploy.conf.patternset"> - <exclude name="**/client/jbossws-native-core.jar"/> - <exclude name="**/client/netty.jar"/> - <exclude name="**/common/lib/jbossws-native-core.jar"/> - <exclude name="**/common/lib/netty.jar"/> - <exclude name="**/server/**"/> - </patternset> - - <patternset id="jbossws.server.deploy.conf.patternset"> - <exclude name="**/juddi-service.sar/**"/> - </patternset> - - <macrodef name="macro-create-deploy-conf"> - <attribute name="deploystructure"/> - <sequential> - <property name="jbossws.deployers.dir" value="@{deploystructure}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> -  - <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}"> - <patternset refid="jbossws.deploy.conf.patternset"/> - </fileset> - <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/> - <echo file="${jbossws.deployers.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/> - <replace file="${jbossws.deployers.dir}/jbossws-deploy.conf" token=";" value=" "/> -  - <fileset id="jbossws.server.deploy.fileset" dir="@{deploystructure}/server/${jboss.server.instance}"> - <patternset refid="jbossws.server.deploy.conf.patternset"/> - </fileset> - <property name="jbossws.server.deploy.fileset" refid="jbossws.server.deploy.fileset"/> - <echo file="${jbossws.deployers.dir}/jbossws-server-deploy.conf" message="${jbossws.server.deploy.fileset}"/> - <replace file="${jbossws.deployers.dir}/jbossws-server-deploy.conf" token=";" value=" "/> - </sequential> - </macrodef> - </project> Modified: stack/native/branches/JBWS-3393/modules/dist/src/main/distro/build-project-gen.xml =================================================================== --- stack/native/branches/JBWS-3393/modules/dist/src/main/distro/build-project-gen.xml 2011-12-14 15:31:36 UTC (rev 15374) +++ stack/native/branches/JBWS-3393/modules/dist/src/main/distro/build-project-gen.xml 2011-12-14 17:30:51 UTC (rev 15375) @@ -45,12 +45,6 @@ <taskdef name="eclipseProjectGenerator" classname="org.jboss.ws.tools.ant.EclipseProjectTask" classpathref="jbws-ant.path"/> <taskdef name="pathWriter" classname="org.jboss.ws.tools.ant.PathWriterTask" classpathref="jbws-ant.path"/> - <condition property="jbossws.integration.jboss7" value="true"> - <or> - <equals arg1="${jbossws.integration.jboss700}" arg2="true"/> - <equals arg1="${jbossws.integration.jboss710}" arg2="true"/> - </or> - </condition> </target> <target name="setup-new-project" depends="init-project-properties" description="Prompt for settings and setup configuration for a new user project"> @@ -84,7 +78,6 @@ <entry key="project.name" value="${project.name.new}"/> <entry key="project.type" value="${project.type.new}"/> <entry key="project.jboss.home" value="${jboss.home}"/> - <entry key="project.jboss.conf" value="${jboss.server.instance}"/> </propertyfile> <echo message=""/> @@ -121,10 +114,7 @@ </fail> </target> - <target name="configure-project" depends="configure-project-6,configure-project-7"> - </target> - - <target name="configure-project-7" if="jbossws.integration.jboss7">  + <target name="configure-project"> <mkdir dir="${project.home}/src/main/java"/> <mkdir dir="${project.home}/src/main/resources"/> <copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml"> @@ -151,33 +141,6 @@ <pathWriter pathId="project.classpath" outputFile="${project.home}/libraries.xml" variables="project.jboss.home" /> </target> - <target name="configure-project-6" if="jbossws.integration.jboss60"> - <mkdir dir="${project.home}/src/main/java"/> - <mkdir dir="${project.home}/src/main/resources"/> - <copy tofile="${project.home}/build.xml" file="${basedir}/build/user-project-build.xml"> - <filterset refid="project"/> - </copy> - <copy tofile="${project.home}/build.properties" file="${basedir}/user-project.properties"/> - <path id="project.classpath"> - <pathelement location="${jboss.client}/jaxws-api.jar"/> - <pathelement location="${jboss.client}/jsr181-api.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> - <pathelement location="${jboss.client}/jbossws-api.jar"/> - <pathelement location="${jboss.client}/jbossws-common.jar"/> - <pathelement location="${jboss.client}/jbossws-spi.jar"/> - <pathelement location="${jboss.client}/jaxrpc-api.jar"/> - <pathelement location="${jboss.client}/saaj-api.jar"/> - <pathelement location="${jboss.client}/jbossws-native-factories.jar"/> - <pathelement location="${jboss.client}/jbossws-native-core.jar"/> - <pathelement location="${jboss.client}/jbossws-native-services.jar"/> - <pathelement location="${jboss.client}/jbossws-native-client.jar"/> - <path refid="integration.target.javac.classpath" /> - </path> - <eclipseClasspathGenerator pathId="project.classpath" outputFile="${project.home}/.classpath" srcPath="src/main/java" srcOutput="bin/main" /> - <eclipseProjectGenerator projectName="${project.name}" outputFile="${project.home}/.project" /> - <pathWriter pathId="project.classpath" outputFile="${project.home}/libraries.xml" variables="project.jboss.home" /> - </target> - <target name="delete-project" depends="validate-settings" description="Delete the configured user project"> <echo message="Deleting the entire project in ${project.home}" /> <delete dir="${project.home}" /> Modified: stack/native/branches/JBWS-3393/modules/dist/src/main/distro/build-setup.xml =================================================================== --- stack/native/branches/JBWS-3393/modules/dist/src/main/distro/build-setup.xml 2011-12-14 15:31:36 UTC (rev 15374) +++ stack/native/branches/JBWS-3393/modules/dist/src/main/distro/build-setup.xml 2011-12-14 17:30:51 UTC (rev 15375) @@ -34,33 +34,15 @@ <property file="${target.properties.file}"/> <property name="jboss.server.instance" value="default"/> - <property name="jboss600.lib" value="${jboss600.home}/lib"/> - <property name="jboss600.client" value="${jboss600.home}/client"/> - <property name="jboss600.server" value="${jboss600.home}/server/${jboss.server.instance}"/> - <property name="jboss600.server.lib" value="${jboss600.home}/common/lib"/> - <property name="jboss600.server.deploy" value="${jboss600.server}/deploy"/> - <property name="jboss600.server.deployers" value="${jboss600.server}/deployers"/> - - <property name="jboss610.lib" value="${jboss610.home}/lib"/> - <property name="jboss610.client" value="${jboss610.home}/client"/> - <property name="jboss610.server" value="${jboss610.home}/server/${jboss.server.instance}"/> - <property name="jboss610.server.lib" value="${jboss610.home}/common/lib"/> - <property name="jboss610.server.deploy" value="${jboss610.server}/deploy"/> - <property name="jboss610.server.deployers" value="${jboss610.server}/deployers"/> - <property name="jboss700.modules" value="${jboss700.home}/modules"/> <property name="jboss710.modules" value="${jboss710.home}/modules"/> - <property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/> - <property name="jboss610.available.file" value="${jboss610.client}/jboss-client.jar"/> <property name="jboss700.available.file" value="${jboss700.home}/jboss-modules.jar"/> <property name="jboss701.available.file" value="${jboss701.home}/jboss-modules.jar"/> <property name="jboss702.available.file" value="${jboss702.home}/jboss-modules.jar"/> <property name="jboss710.available.file" value="${jboss710.home}/jboss-modules.jar"/> - <available property="jboss600.available" file="${jboss600.available.file}"/> - <available property="jboss610.available" file="${jboss610.available.file}"/> <available property="jboss700.available" file="${jboss700.available.file}"/> <available property="jboss701.available" file="${jboss701.available.file}"/> <available property="jboss702.available" file="${jboss702.available.file}"/> Modified: stack/native/branches/JBWS-3393/modules/dist/src/main/distro/build.xml =================================================================== --- stack/native/branches/JBWS-3393/modules/dist/src/main/distro/build.xml 2011-12-14 15:31:36 UTC (rev 15374) +++ stack/native/branches/JBWS-3393/modules/dist/src/main/distro/build.xml 2011-12-14 17:30:51 UTC (rev 15375) @@ -35,8 +35,6 @@ <property name="tests.dir" value="${basedir}/tests"/> <property name="tests.output.dir" value="${output.dir}"/> <property name="deploy.artifacts.dir" value="${basedir}/deploy"/> - <property name="jbossws.default.deploy.conf" value="${build.dir}/deploy.conf"/> - <property name="jbossws.default.server.deploy.conf" value="${build.dir}/server-deploy.conf"/> <property name="jbossws.default.modules.conf" value="${build.dir}/modules-deploy.conf"/> <property name="target.properties.file" value="${basedir}/target.properties"/> @@ -60,12 +58,6 @@ <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> <echo message="integration.target=${jbossws.integration.target}"/> - <condition property="jbossws.integration.jboss60" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss600"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss610"/> - </or> - </condition> <condition property="jbossws.integration.jboss700" value="true"> <or> <equals arg1="${jbossws.integration.target}" arg2="jboss700"/> Modified: stack/native/branches/JBWS-3393/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/branches/JBWS-3393/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-12-14 15:31:36 UTC (rev 15374) +++ stack/native/branches/JBWS-3393/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2011-12-14 17:30:51 UTC (rev 15375) @@ -7,18 +7,6 @@ </formats> <includeBaseDirectory>false</includeBaseDirectory> <fileSets> -  - <fileSet> - <directory>../resources/src/main/resources/bin</directory> - <outputDirectory>deploy-artifacts/bin</outputDirectory> - <includes> - <include>wsconsume.*</include> - <include>wsprovide.*</include> - <include>wsrunclient.*</include> - <include>wstools.*</include> - </includes> - </fileSet> -  <fileSet> <directory>../core/target/resources</directory> @@ -37,15 +25,6 @@ </includes> </fileSet> -  - <fileSet> - <directory>./management/target</directory> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <includes> - <include>jbossws-native-management.war</include> - </includes> - </fileSet> - </fileSets> <dependencySets> @@ -90,8 +69,6 @@ <include>apache-scout:scout:jar</include> <include>juddi:juddi:jar</include> <include>org.jboss.ws:jbossws-common-tools:jar</include> - <include>org.jboss.ws:jbossws-jboss600:jar</include> - <include>org.jboss.ws:jbossws-jboss610:jar</include> <include>org.jboss.ws:jbossws-jboss700:jar</include> <include>org.jboss.ws:jbossws-jboss701:jar</include> <include>org.jboss.ws:jbossws-jboss702:jar</include> Deleted: stack/native/branches/JBWS-3393/modules/resources/src/main/resources/resources/deploy.conf =================================================================== --- stack/native/branches/JBWS-3393/modules/resources/src/main/resources/resources/deploy.conf 2011-12-14 15:31:36 UTC (rev 15374) +++ stack/native/branches/JBWS-3393/modules/resources/src/main/resources/resources/deploy.conf 2011-12-14 17:30:51 UTC (rev 15375) @@ -1 +0,0 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jbossws-native-jaxws-ext.jar client/cxf-*.jar client/geronimo-*.jar client/jaxws-httpserver-httpspi.jar client/neethi.jar client/saaj-impl.jar client/spring-*.jar client/wss4j.jar client/XmlSchema.jar client/asm.jar client/jetty*.jar client/velocity.jar client/commons-collections.jar client/commons-lang.jar client/jettison.jar client/jaxb-api.jar client/FastInfoset.jar client/commons-beanutils.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/policy.jar client/jbossws-cxf-* client/jbossws-native-jaxrpc.jar client/jaxrpc-api.jar client/jbossws-native-jaxws.jar client/jbossws-native-factories.jar client/jaxws-api.jar client/jsr181-api.jar client/jbossws-native-saaj.jar client/saaj-api.jar client/jbossws-native-client.jar client/jbossws-native-services.jar client/jbossws-common.jar client! /jbossws-common-tools.jar client/jbossws-framework.jar client/jbossws-api.jar client/jbossws-spi.jar client/wscommons-policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/cxf-*.jar common/lib/jaxws-httpserver-httpspi.jar common/lib/geronimo-*.jar common/lib/neethi.jar common/lib/saaj-impl.jar common/lib/spring-*.jar common/lib/wss4j.jar common/lib/XmlSchema.jar common/lib/asm.jar common/lib/FastInfoset.jar common/lib/jboss-jaxb-intros.jar common/lib/jettison.jar common/lib/wscommons-policy.jar common/lib/wsdl4j.jar common/lib/xmlsec.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jaxrpc-api.jar common/lib/jbossws-native-jaxws.jar common/lib/jaxws-api.jar common/lib/jsr181-api.jar common/lib/jbossws-native-saaj.jar common/lib/saaj-api.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-api.jar common/lib/jbossws-spi.jar common/lib/com! mons-beanutils.jar lib/endorsed/*jbossws* lib/endorsed/*jaxb*.! jar lib/ endorsed/*jaxws*.jar Modified: stack/native/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-12-14 15:31:36 UTC (rev 15374) +++ stack/native/branches/JBWS-3393/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2011-12-14 17:30:51 UTC (rev 15375) @@ -24,194 +24,7 @@ <project> -  - <patternset id="jbossws.bin.patternset"> - <include name="**/wsconsume.bat"/> - <include name="**/wsconsume.sh"/> - <include name="**/wsprovide.bat"/> - <include name="**/wsprovide.sh"/> - <include name="**/wsrunclient.bat"/> - <include name="**/wsrunclient.sh"/> - <include name="**/wstools.bat"/> - <include name="**/wstools.sh"/> - </patternset> - - <patternset id="jbossws.client.patternset"> - <include name="**/commons-beanutils.jar"/> - <include name="**/FastInfoset.jar"/> - <include name="**/jaxws-api.jar"/> - <include name="**/jsr181-api.jar"/> - <include name="**/jaxb-api.jar"/> - <include name="**/jaxb-impl.jar"/> - <include name="**/jaxb-xjc.jar"/> - <include name="**/jaxws-tools.jar"/> - <include name="**/jaxws-rt.jar"/> - <include name="**/policy.jar"/> - <include name="**/jbossws-api.jar"/> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-common-tools.jar"/> - <include name="**/jbossws-native-client.jar"/> - <include name="**/jbossws-native-core.jar"/> - <include name="**/jbossws-native-services.jar"/> - <include name="**/jbossws-spi.jar"/> - <include name="**/jaxrpc-api.jar"/> - <include name="**/saaj-api.jar"/> - <include name="**/jettison.jar"/> - <include name="**/netty.jar"/> - <include name="**/wscommons-policy.jar"/> - <include name="**/stax-api.jar"/> - <include name="**/stax-ex.jar"/> - <include name="**/streambuffer.jar"/> - <include name="**/wsdl4j.jar"/> - <include name="**/wstx.jar"/> - </patternset> - - <patternset id="jbossws.lib.patternset"> - <include name="**/jaxb-impl.jar"/> - <include name="**/wstx.jar"/> - </patternset> - - <patternset id="jbossws.lib.endorsed.patternset"> - <include name="**/jbossws-native-factories.jar"/> - <include name="**/jaxb-api.jar"/> - <include name="**/jaxws-api.jar"/> - <include name="**/stax-api.jar"/> - </patternset> - - <patternset id="jbossws.server.lib.patternset"> - <include name="**/commons-beanutils.jar"/> - <include name="**/FastInfoset.jar"/> - <include name="**/jaxws-api.jar"/> - <include name="**/jsr181-api.jar"/> - <include name="**/jboss-jaxb-intros.jar"/> - <include name="**/jbossws-api.jar"/> - <include name="**/jbossws-common.jar"/> - <include name="**/jbossws-native-core.jar"/> - <include name="**/jaxrpc-api.jar"/> - <include name="**/netty.jar"/> - <include name="**/saaj-api.jar"/> - <include name="**/jbossws-spi.jar"/> - <include name="**/wsdl4j.jar"/> - <include name="**/jettison.jar"/> - <include name="**/netty.jar"/> - <include name="**/wscommons-policy.jar"/> - <include name="**/xmlsec.jar"/> - </patternset> - - <patternset id="jbossws.service.lib.patternset"> - <include name="**/jbossws-native-factories.jar"/> - <include name="**/jbossws-native-services.jar"/> - </patternset> -  -  -  - - <macrodef name="macro-deploy-jbossws-bin"> - <attribute name="artifactsdir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{artifactsdir}/bin"> - <patternset refid="jbossws.bin.patternset"/> - </fileset> - </copy> - </sequential> - </macrodef> - -  -  -  - - <macrodef name="macro-deploy-jbossws-lib"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.lib.patternset"/> - </fileset> - </copy> - </sequential> - </macrodef> - -  -  -  - - <macrodef name="macro-deploy-jbossws-endorsed"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.lib.endorsed.patternset"/> - </fileset> - </copy> - </sequential> - </macrodef> - -  -  -  - - <macrodef name="macro-deploy-jbossws-client"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.client.patternset"/> - </fileset> - </copy> - <condition property="patch.jboss.metadata" value="true"> - <or> - <equals arg1="${jbossid}" arg2="jboss501"/> - <equals arg1="${jbossid}" arg2="jboss510"/> - </or> - </condition> - <antcall target="modify-jboss-metadata"> - <param name="targetdir" value="@{targetdir}"/> - <param name="thirdpartydir" value="@{thirdpartydir}"/> - </antcall> - </sequential> - </macrodef> - -  -  -  - - <macrodef name="macro-deploy-jbossws-server-lib"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.server.lib.patternset"/> - <include name="**/jbossws-${jbossid}.jar"/> - </fileset> - </copy> - <condition property="patch.jboss.metadata" value="true"> - <or> - <equals arg1="${jbossid}" arg2="jboss501"/> - <equals arg1="${jbossid}" arg2="jboss510"/> - </or> - </condition> - <antcall target="modify-jboss-metadata"> - <param name="targetdir" value="@{targetdir}"/> - <param name="thirdpartydir" value="@{thirdpartydir}"/> - </antcall> - </sequential> - </macrodef> - -    @@ -235,61 +48,6 @@ </macrodef>  -  -  - - <macrodef name="macro-deploy-jbossws-deployment"> - <attribute name="thirdpartydir"/> - <attribute name="targetdir"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <unzip dest="@{targetdir}"> - <fileset dir="@{thirdpartydir}"> - <include name="**/jbossws-native-management.war"/> - </fileset> - </unzip> - </sequential> - </macrodef> - - -  -  -  - - <macrodef name="macro-deploy-jbossws-deployers"> - <attribute name="thirdpartydir"/> - <attribute name="artifactsdir"/> - <attribute name="targetdir"/> - <attribute name="jbossid"/> - <sequential> - <mkdir dir="@{targetdir}"/> - <copy todir="@{targetdir}" flatten="true" overwrite="true"> - <fileset dir="@{thirdpartydir}"> - <patternset refid="jbossws.service.lib.patternset"/> - </fileset> - </copy> - <copy todir="@{targetdir}"> - <fileset dir="@{artifactsdir}/resources/jbossws-(a){jbossid}/jbossws.beans"> - <include name="META-INF/**"/> - </fileset> - </copy> - <antcall target="modify-jboss-integration"> - <param name="targetdir" value="@{targetdir}"/> - </antcall> - </sequential> - </macrodef> - - <target name="modify-jboss-integration" depends="process-jboss-integration" if="fixintegration"> - <sequential> - <copy todir="${targetdir}/META-INF" flatten="true" overwrite="true"> - <fileset dir="${artifactsdir}/resources/jbossws-${jbossid}/jbossws-jboss.deployer"> - <include name="**/stack-agnostic-jboss-beans.xml"/> - </fileset> - </copy> - </sequential> - </target> - -    @@ -432,17 +190,6 @@ <fail message="modifyjbossintegration must be specified" unless="modifyjbossintegration"/> </target> - <target name="deploy-jbossws-native" depends="check-parameters"> - <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> - <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-deployment targetdir="${installserver}/deploy/jbossws-console.war" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-deployers targetdir="${installserver}/deployers/jbossws.deployer/" thirdpartydir="${thirdpartydir}" artifactsdir="${artifactsdir}" jbossid="${jbossid}"/> - <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> - </target> - <target name="deploy-jbossws-native-modules"> <fail message="installserver must be specified" unless="installserver"/> <fail message="thirdpartydir must be specified" unless="thirdpartydir"/> @@ -480,57 +227,6 @@ </sequential> </macrodef> - <macrodef name="macro-undeploy-jbossws"> - <attribute name="defaultconf"/> - <attribute name="defaultserverconf"/> - <attribute name="targetdir"/> - <attribute name="modifyjbossintegration"/> - <sequential> - <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/deployers/jbossws.deployer/jbossws-deploy.conf" failonerror="false"/> - <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/> - <loadfile property="jbossws.server.deploy.conf" srcfile="@{targetdir}/deployers/jbossws.deployer/jbossws-server-deploy.conf" failonerror="false"/> - <loadfile property="jbossws.server.deploy.conf" srcfile="@{defaultserverconf}" failonerror="false"/> - - <property name="jboss.server.home" value="@{targetdir}"/> - <property name="jboss.home" value="${jboss.server.home}/../.."/> - <available property="jboss.undeploy.client" file="${jboss.home}/client"/> - <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/> - - <delete includeemptydirs="true" verbose="true"> - <fileset dir="${jboss.server.home}"> - <include name="**/juddi-service.sar/**"/> - <include name="**/jbossws-console.war/**"/> - <include name="**/jbossws.sar/**"/> - </fileset> - </delete> - <antcall target="remove-jboss-integration"> - <param name="modifyjbossintegration" value="@{modifyjbossintegration}"/> - </antcall> - -  - <delete verbose="true"> - <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/> - </delete> - <delete verbose="true"> - <fileset dir="${jboss.server.home}" includes="${jbossws.server.deploy.conf}"/> - </delete> - </sequential> - </macrodef> - - <target name="remove-jboss-integration" depends="process-jboss-integration" if="fixintegration"> - <delete verbose="true"> - <fileset dir="${jboss.server.home}"> - <include name="**/jbossws-jboss*.jar"/> - </fileset> - <fileset dir="${jboss.home}/client"> - <include name="**/jbossws-jboss*.jar"/> - </fileset> - <fileset dir="${jboss.home}/common"> - <include name="**/jbossws-jboss*.jar"/> - </fileset> - </delete> - </target> - <target name="remove-jboss-integration-module" depends="process-jboss-integration" if="fixintegration"> <delete verbose="true"> <fileset dir="${jboss.modules}"> @@ -547,17 +243,4 @@ </condition> </target> - <target name="modify-jboss-metadata" if="patch.jboss.metadata"> - <sequential> - <copy - tofile="${targetdir}/jboss-metadata.jar" - failonerror="false" - overwrite="true"> - <fileset dir="${thirdpartydir}"> - <include name="**/jbossws-${jbossid}-metadata.jar"/> - </fileset> - </copy> - </sequential> - </target> - </project> Deleted: stack/native/branches/JBWS-3393/modules/resources/src/main/resources/resources/server-deploy.conf =================================================================== --- stack/native/branches/JBWS-3393/modules/resources/src/main/resources/resources/server-deploy.conf 2011-12-14 15:31:36 UTC (rev 15374) +++ stack/native/branches/JBWS-3393/modules/resources/src/main/resources/resources/server-deploy.conf 2011-12-14 17:30:51 UTC (rev 15375) @@ -1 +0,0 @@ -deployers/jbossws.deployer/jbossws-cxf-*.jar deployers/jbossws.deployer/FastInfoset.jar deployers/jbossws.deployer/jboss-jaxb-intros.jar deployers/jbossws.deployer/jbossws-common.jar deployers/jbossws.deployer/jbossws-framework.jar deployers/jbossws.deployer/jbossws-native-core.jar deployers/jbossws.deployer/jbossws-native-factories.jar deployers/jbossws.deployer/jbossws-native-services.jar deployers/jbossws.deployer/jettison.jar deployers/jbossws.deployer/netty.jar deployers/jbossws.deployer/wscommons-policy.jar deployers/jbossws.deployer/policy.jar deployers/jbossws.deployer/wsdl4j.jar deployers/jbossws.deployer/xmlsec.jar deployers/jbossws.deployer/META-INF/jboss-beans.xml deployers/jbossws.deployer/META-INF/jbossws-deployer-jboss-beans.xml deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml deployers/jbossws.deployer/META-INF/standard-*-config.xml deployers/jbossws-jaxrpc.deployer/META-INF/stack-specific-jboss-beans.xml Modified: stack/native/branches/JBWS-3393/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/JBWS-3393/modules/testsuite/pom.xml 2011-12-14 15:31:36 UTC (rev 15374) +++ stack/native/branches/JBWS-3393/modules/testsuite/pom.xml 2011-12-14 17:30:51 UTC (rev 15375) @@ -24,7 +24,6 @@ <test.classes.directory>${project.build.directory}/test-classes</test.classes.directory> <test.resources.directory>${project.build.directory}/test-resources</test.resources.directory> <wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location> - <hibernate.version>3.2.4.sp1</hibernate.version> <jboss.javaee.version>5.0.0.GA</jboss.javaee.version> <hornetq.version>2.1.0.BETA3</hornetq.version> <log4j.output.dir>${project.build.directory}</log4j.output.dir> @@ -272,10 +271,6 @@ <value>jnp://${jboss.bind.address}:1099</value> </property> <property> - <name>jboss.server.instance</name> - <value>${jboss.server.instance}</value> - </property> - <property> <name>java.protocol.handler.pkgs</name> <value>org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol</value> </property> @@ -427,312 +422,6 @@ </profile>  - <profile> - <id>jboss600</id> - <properties> - <jboss.version>6.0.0.Final</jboss.version> - <jbossws.integration.target>jboss600</jbossws.integration.target> - <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-depchain</artifactId> - <scope>test</scope> - <type>pom</type> - <version>${jboss.version}</version> - <exclusions> -  - <exclusion> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-ejb-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-webservices</artifactId> - </exclusion> -  - <exclusion> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-client</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-management</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-server</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-factories</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-resources</artifactId> - </exclusion> -  - <exclusion> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-client</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-factories</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-jaxrpc</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-saaj</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-management</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-resources</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-services</artifactId> - </exclusion> - <exclusion> - <groupId>jboss.jbossws</groupId> - <artifactId>jboss-jaxrpc</artifactId> - </exclusion> - <exclusion> - <groupId>jboss.jbossws</groupId> - <artifactId>jboss-jaxws</artifactId> - </exclusion> -  - <exclusion> - <groupId>org.jboss.slf4j</groupId> - <artifactId>slf4j-jboss-logmanager</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> -  - <exclusion> - <groupId>org.jboss.resteasy</groupId> - <artifactId>resteasy-jaxb-provider</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArgument>-Djava.endorsed.dirs=${endorsed.dirs}</compilerArgument> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${endorsed.dirs} -Dorg.jboss.wsf.spi.deployer.Deployer=org.jboss.wsf.test.DeployerJBoss6</argLine> - <excludes> -  - <exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/interop/wsa/AddressingTestCase*</exclude> - -  - <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>jboss610</id> - <properties> - <jboss.version>6.1.0.Final</jboss.version> - <jbossws.integration.target>jboss610</jbossws.integration.target> - <endorsed.dirs>${project.build.directory}/endorsed</endorsed.dirs> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-depchain</artifactId> - <scope>test</scope> - <type>pom</type> - <version>${jboss.version}</version> - <exclusions> - <exclusion> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-ejb-api</artifactId> - </exclusion> -  - <exclusion> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-webservices</artifactId> - </exclusion> -  - <exclusion> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-client</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-management</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-server</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-factories</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.cxf</groupId> - <artifactId>jbossws-cxf-resources</artifactId> - </exclusion> -  - <exclusion> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-client</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-factories</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-jaxrpc</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-saaj</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-management</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-resources</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.ws.native</groupId> - <artifactId>jbossws-native-services</artifactId> - </exclusion> - <exclusion> - <groupId>jboss.jbossws</groupId> - <artifactId>jboss-jaxrpc</artifactId> - </exclusion> - <exclusion> - <groupId>jboss.jbossws</groupId> - <artifactId>jboss-jaxws</artifactId> - </exclusion> -  - <exclusion> - <groupId>org.jboss.slf4j</groupId> - <artifactId>slf4j-jboss-logmanager</artifactId> - </exclusion> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> -  - <exclusion> - <groupId>org.jboss.resteasy</groupId> - <artifactId>resteasy-jaxb-provider</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArgument>-Djava.endorsed.dirs=${endorsed.dirs}</compilerArgument> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${endorsed.dirs} -Dorg.jboss.wsf.spi.deployer.Deployer=org.jboss.wsf.test.DeployerJBoss6</argLine> - <excludes> -  - <exclude>org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/common/soap/SOAPConnectionTestCase.*</exclude> - -  - <exclude>org/jboss/test/ws/interop/wsa/AddressingTestCase*</exclude> - -  - <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws3026/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws3367/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/jbws3276/**</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  @@ -1555,26 +1244,7 @@ </properties> </profile> -  <profile> - <id>no-jboss-server-instance</id> - <activation> - <property> - <name>!jboss.server.instance</name> - </property> - </activation> - <properties> - <jboss.server.instance>default</jboss.server.instance> - </properties> - </profile> - - <profile> <id>default-mgmt-security</id> <activation> <property> Modified: stack/native/branches/JBWS-3393/pom.xml =================================================================== --- stack/native/branches/JBWS-3393/pom.xml 2011-12-14 15:31:36 UTC (rev 15374) +++ stack/native/branches/JBWS-3393/pom.xml 2011-12-14 17:30:51 UTC (rev 15375) @@ -62,8 +62,6 @@ <jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version> <jbossws.common.tools.version>1.0.0-SNAPSHOT</jbossws.common.tools.version> <jbossws.shared.testsuite.version>4.0.0-SNAPSHOT</jbossws.shared.testsuite.version> - <jbossws.jboss600.version>4.0.0-SNAPSHOT</jbossws.jboss600.version> - <jbossws.jboss610.version>4.0.0-SNAPSHOT</jbossws.jboss610.version> <jbossws.jboss700.version>4.0.0-SNAPSHOT</jbossws.jboss700.version> <jbossws.jboss701.version>4.0.0-SNAPSHOT</jbossws.jboss701.version> <jbossws.jboss702.version>4.0.0-SNAPSHOT</jbossws.jboss702.version> @@ -122,30 +120,6 @@ </dependency> <dependency> <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600</artifactId> - <version>${jbossws.jboss600.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss600</artifactId> - <version>${jbossws.jboss600.version}</version> - <classifier>resources</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss610</artifactId> - <version>${jbossws.jboss610.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss610</artifactId> - <version>${jbossws.jboss610.version}</version> - <classifier>resources</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss700</artifactId> <version>${jbossws.jboss700.version}</version> </dependency> @@ -577,30 +551,6 @@ </profile>  - <profile> - <id>jboss600</id> - <properties> - <jbossws.integration.target>jboss600</jbossws.integration.target> - <jboss.home>${jboss600.home}</jboss.home> - </properties> - </profile> - -  - <profile> - <id>jboss610</id> - <properties> - <jbossws.integration.target>jboss610</jbossws.integration.target> - <jboss.home>${jboss610.home}</jboss.home> - </properties> - </profile> - -

13 years

1
0
0 / 0

JBossWS SVN: r15374 - stack/native/branches.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-14 10:31:36 -0500 (Wed, 14 Dec 2011) New Revision: 15374 Added: stack/native/branches/JBWS-3393/ Log: Branching for working on AS6 support removal

13 years

1
0
0 / 0

JBossWS SVN: r15373 - in stack/cxf/branches/JBWS-3393/modules: server/src/main/java/org/jboss/wsf/stack/cxf/configuration and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-14 10:21:25 -0500 (Wed, 14 Dec 2011) New Revision: 15373 Modified: stack/cxf/branches/JBWS-3393/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceObjectFactoryJAXWS.java stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/management/InstrumentationManagerExtImpl.java stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-cxf-config-as7.xml stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml Log: Further minor cleanups Modified: stack/cxf/branches/JBWS-3393/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceObjectFactoryJAXWS.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceObjectFactoryJAXWS.java 2011-12-14 15:20:43 UTC (rev 15372) +++ stack/cxf/branches/JBWS-3393/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFServiceObjectFactoryJAXWS.java 2011-12-14 15:21:25 UTC (rev 15373) @@ -32,6 +32,7 @@ import org.jboss.ws.common.serviceref.AbstractServiceObjectFactoryJAXWS; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.stack.cxf.client.Constants; import org.jboss.wsf.stack.cxf.client.configuration.JBossWSSpringBusFactory; /** @@ -96,7 +97,7 @@ URL url = null; try { - url = vfsRoot.findChild("WEB-INF/jbossws-cxf.xml").toURL(); + url = vfsRoot.findChild("WEB-INF/" + Constants.JBOSSWS_CXF_SPRING_DD).toURL(); } catch (Exception e) { @@ -106,7 +107,7 @@ { try { - url = vfsRoot.findChild("META-INF/jbossws-cxf.xml").toURL(); + url = vfsRoot.findChild("META-INF/" + Constants.JBOSSWS_CXF_SPRING_DD).toURL(); } catch (Exception e) { Modified: stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2011-12-14 15:20:43 UTC (rev 15372) +++ stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2011-12-14 15:21:25 UTC (rev 15373) @@ -30,7 +30,6 @@ import org.apache.cxf.configuration.Configurer; import org.apache.cxf.resource.ResourceManager; import org.apache.cxf.resource.ResourceResolver; -import org.apache.cxf.transport.DestinationFactory; import org.apache.cxf.transport.DestinationFactoryManager; import org.apache.cxf.ws.policy.PolicyEngine; import org.apache.cxf.ws.policy.selector.MaximalAlternativeSelector; Modified: stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/management/InstrumentationManagerExtImpl.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/management/InstrumentationManagerExtImpl.java 2011-12-14 15:20:43 UTC (rev 15372) +++ stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/management/InstrumentationManagerExtImpl.java 2011-12-14 15:21:25 UTC (rev 15373) @@ -4,7 +4,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.annotation.PostConstruct; import javax.management.JMException; import javax.management.MBeanServer; import javax.management.MBeanServerFactory; @@ -50,9 +49,9 @@ if (mbeanServer == null) { - for (Iterator i = MBeanServerFactory.findMBeanServer(null).iterator(); i.hasNext();) + for (Iterator<MBeanServer> i = MBeanServerFactory.findMBeanServer(null).iterator(); i.hasNext();) { - mbeanServer = (MBeanServer)i.next(); + mbeanServer = i.next(); if (mbeanServer.getClass().getName().startsWith("org.jboss")) { break; Modified: stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-cxf-config-as7.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-cxf-config-as7.xml 2011-12-14 15:20:43 UTC (rev 15372) +++ stack/cxf/branches/JBWS-3393/modules/server/src/main/resources/jbossws-cxf-config-as7.xml 2011-12-14 15:21:25 UTC (rev 15373) @@ -44,7 +44,6 @@ </deploymentAspect> <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect"> -   <property name="provides" class="java.lang.String">ResourceResolver</property> <property name="forJaxRpc" class="boolean">false</property> </deploymentAspect> @@ -66,7 +65,6 @@ <property name="forJaxRpc" class="boolean">false</property> </deploymentAspect> -   <deploymentAspect class="org.jboss.wsf.stack.cxf.deployment.aspect.BusDeploymentAspect"> <property name="provides" class="java.lang.String">BusHolder</property> <property name="requires" class="java.lang.String">ResourceResolver,StackDescriptor</property> Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml 2011-12-14 15:20:43 UTC (rev 15372) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml 2011-12-14 15:21:25 UTC (rev 15373) @@ -24,7 +24,6 @@ <test.classes.directory>${project.build.directory}/test-classes</test.classes.directory> <test.resources.directory>${project.build.directory}/test-resources</test.resources.directory> <wsdl.publish.location>${project.build.directory}/wsdl-publish</wsdl.publish.location> - <hibernate.version>3.2.4.sp1</hibernate.version> <jboss.javaee.version>5.0.0.GA</jboss.javaee.version> <org.littleshoot.littleproxy.version>0.4</org.littleshoot.littleproxy.version> <org.slf4j.version>1.5.6</org.slf4j.version>

13 years

1
0
0 / 0

JBossWS SVN: r15372 - in stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf: deployment/aspect and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-14 10:20:43 -0500 (Wed, 14 Dec 2011) New Revision: 15372 Removed: stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/config/CXFInitializer.java stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/SynchronizedBusDeploymentAspect.java Log: Removing CXFInitializer, which is not needed on AS7 series Deleted: stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/config/CXFInitializer.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/config/CXFInitializer.java 2011-12-14 15:19:55 UTC (rev 15371) +++ stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/config/CXFInitializer.java 2011-12-14 15:20:43 UTC (rev 15372) @@ -1,104 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.cxf.config; - -import java.util.ResourceBundle; -import java.util.concurrent.CountDownLatch; - -import org.apache.cxf.BusFactory; -import org.jboss.logging.Logger; -import org.jboss.ws.api.util.BundleUtils; - - -/** - * A bean installed during boot for initializing CXF - * - * @author alessio.soldano(a)jboss.com - * @since 06-Opt-2010 - * - */ -public class CXFInitializer -{ - private static final ResourceBundle bundle = BundleUtils.getBundle(CXFInitializer.class); - private static Logger logger = Logger.getLogger(CXFInitializer.class); - private static CountDownLatch defaultBusCDL = new CountDownLatch(1); - - public void create() throws Exception - { - Thread defaultBusInitThread = new Thread(new DefautBusInitializer(defaultBusCDL), "JBossWS-CXF-DefaultBus-Init"); - defaultBusInitThread.setDaemon(true); - defaultBusInitThread.start(); - } - - public void destroy() throws Exception - { - //NOOP - } - - public static void waitForDefaultBusAvailability() - { - boolean trace = logger.isTraceEnabled(); - if (trace) - logger.trace(Thread.currentThread() + " will wait for default bus availability..."); - try - { - defaultBusCDL.await(); - if (trace) - logger.trace("Default bus now available: " + BusFactory.getDefaultBus(false)); - } - catch (InterruptedException e) - { - logger.error(BundleUtils.getMessage(bundle, "INTERRUPTED")); - throw new RuntimeException(e); - } - } - - private class DefautBusInitializer implements Runnable - { - private CountDownLatch cdl; - - public DefautBusInitializer(CountDownLatch cdl) - { - this.cdl = cdl; - } - - @Override - public void run() - { - long start = System.currentTimeMillis(); - try - { - BusFactory.getDefaultBus(); - if (logger.isTraceEnabled()) - { - logger.info("Default bus started in " + (System.currentTimeMillis() - start) + " ms by " - + Thread.currentThread()); - } - } - finally - { - cdl.countDown(); - } - } - } - -} Deleted: stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/SynchronizedBusDeploymentAspect.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/SynchronizedBusDeploymentAspect.java 2011-12-14 15:19:55 UTC (rev 15371) +++ stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/SynchronizedBusDeploymentAspect.java 2011-12-14 15:20:43 UTC (rev 15372) @@ -1,54 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2010, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.stack.cxf.deployment.aspect; - -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.stack.cxf.config.CXFInitializer; - -/** - * A synchronized version of the bus deployment aspect that waits for the CXFInitializer - * and does single-thread deployment processing - * - * @author alessio.soldano(a)jboss.com - * @since 25-Mar-2010 - */ -public class SynchronizedBusDeploymentAspect extends BusDeploymentAspect -{ - @Override - protected void startDeploymentBus(Deployment dep) - { - //ensure the default bus has been set on the server, then proceed - CXFInitializer.waitForDefaultBusAvailability(); - //synchronize as this assumes nothing deals with the BusFactory threadlocals associated with the system daemon - //thread doing the deployments, iow multiple concurrent deployment are not supported in this deployment aspect - synchronized (this) - { - super.startDeploymentBus(dep); - } - } - - @Override - public void start(Deployment dep) - { - this.startDeploymentBus(dep); - } -} \ No newline at end of file

13 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits December 2011