December 2011 - jbossws-commits - Jboss List Archives

JBossWS SVN: r15391 - in shared-testsuite/trunk: testsuite/src/test/ant-import and 17 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-15 04:35:07 -0500 (Thu, 15 Dec 2011) New Revision: 15391 Removed: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/console/ Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java Log: [JBWS-3393] Remove support for AS 6 target container Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -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/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -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 { @@ -106,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(); @@ -176,19 +190,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 +219,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 +228,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/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -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/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-12-15 09:35:07 UTC (rev 15391) @@ -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/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-samples-jaxws.xml 2011-12-15 09:35:07 UTC (rev 15391) @@ -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/trunk/testsuite/src/test/ant-import/build-testsuite.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-12-15 09:35:07 UTC (rev 15391) @@ -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}"/> Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -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/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -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/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -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/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -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/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2241/JBWS2241TestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -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/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -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/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307TestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -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/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -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/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3223/EndpointTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -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/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -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/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -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/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextJSETestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -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/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -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/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -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/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -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/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -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/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/smoke/tools/ScriptTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -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/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/CustomRecordProcessorTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -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/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/management/recording/MemoryBufferRecorderTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -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/trunk/testsuite/src/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java =================================================================== --- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java 2011-12-15 09:33:48 UTC (rev 15390) +++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java 2011-12-15 09:35:07 UTC (rev 15391) @@ -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());

12 years, 11 months

1
0
0 / 0

JBossWS SVN: r15390 - in common/trunk/src/main/java/org/jboss/ws/common: deployment and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-15 04:33:48 -0500 (Thu, 15 Dec 2011) New Revision: 15390 Removed: common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAPIDeploymentAspect.java common/trunk/src/main/java/org/jboss/ws/common/integration/JMSDeploymentAspect.java common/trunk/src/main/java/org/jboss/ws/common/management/ContextServlet.java Modified: common/trunk/src/main/java/org/jboss/ws/common/Constants.java common/trunk/src/main/java/org/jboss/ws/common/deployment/ArchiveDeploymentImpl.java Log: [JBWS-3393] Remove support for AS 6 target container Modified: common/trunk/src/main/java/org/jboss/ws/common/Constants.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/Constants.java 2011-12-15 09:31:10 UTC (rev 15389) +++ common/trunk/src/main/java/org/jboss/ws/common/Constants.java 2011-12-15 09:33:48 UTC (rev 15390) @@ -22,7 +22,6 @@ package org.jboss.ws.common; import javax.xml.namespace.QName; -import javax.xml.soap.Name; import javax.xml.soap.SOAPConstants; import javax.xml.ws.http.HTTPBinding; import javax.xml.ws.soap.SOAPBinding; Modified: common/trunk/src/main/java/org/jboss/ws/common/deployment/ArchiveDeploymentImpl.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/deployment/ArchiveDeploymentImpl.java 2011-12-15 09:31:10 UTC (rev 15389) +++ common/trunk/src/main/java/org/jboss/ws/common/deployment/ArchiveDeploymentImpl.java 2011-12-15 09:33:48 UTC (rev 15390) @@ -25,7 +25,6 @@ import java.net.URL; import java.util.List; -import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.ResourceResolver; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; @@ -43,8 +42,6 @@ // The root file for this deployment private UnifiedVirtualFile rootFile; - private static Logger log = Logger.getLogger(ArchiveDeploymentImpl.class); - private List<UnifiedVirtualFile> metadataFiles; ArchiveDeploymentImpl(String simpleName, ClassLoader classLoader) Deleted: common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAPIDeploymentAspect.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAPIDeploymentAspect.java 2011-12-15 09:31:10 UTC (rev 15389) +++ common/trunk/src/main/java/org/jboss/ws/common/deployment/EndpointAPIDeploymentAspect.java 2011-12-15 09:33:48 UTC (rev 15390) @@ -1,83 +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.ws.common.deployment; - -import java.util.ResourceBundle; - -import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.common.ResourceLoaderAdapter; -import org.jboss.ws.common.integration.AbstractDeploymentAspect; -import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.HttpEndpoint; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; - -/** - * A deployment aspect for JAXWS Endpoint API endpoints. - * - * @author Thomas.Diesler(a)jboss.org - * @since 31-Jul-2007 - */ -// TODO: [JBWS-2674] review this deployment aspect once AS IL is rewritten -public class EndpointAPIDeploymentAspect extends AbstractDeploymentAspect -{ - private static final ResourceBundle bundle = BundleUtils.getBundle(EndpointAPIDeploymentAspect.class); - @Override - public void start(Deployment dep) - { - - if (dep instanceof ArchiveDeployment) - { - ArchiveDeployment arc = (ArchiveDeployment)dep; - UnifiedVirtualFile rootFile = arc.getRootFile(); - if (rootFile == null) - { - rootFile = new ResourceLoaderAdapter(dep.getInitialClassLoader()); - arc.setRootFile(rootFile); - } - } - - ClassLoader rtcl = dep.getRuntimeClassLoader(); - if (rtcl == null) - { - // TODO: What's this? Look's quiet hacky... - log.warn(BundleUtils.getMessage(bundle, "USING_INITAL_CLASS_LAODER_AS_RUNTIME_LAODER"), new IllegalArgumentException()); - dep.setRuntimeClassLoader(dep.getInitialClassLoader()); - } - - for (Endpoint ep : dep.getService().getEndpoints()) - { - if (ep.getShortName() == null) - { - String name = ep.getTargetBeanName(); - String shortName = name.substring(name.lastIndexOf('.') + 1); - ep.setShortName(shortName); - } - - if (((HttpEndpoint)ep).getURLPattern() == null) - { - ((HttpEndpoint)ep).setURLPattern("/*"); - } - } - } -} Deleted: common/trunk/src/main/java/org/jboss/ws/common/integration/JMSDeploymentAspect.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/integration/JMSDeploymentAspect.java 2011-12-15 09:31:10 UTC (rev 15389) +++ common/trunk/src/main/java/org/jboss/ws/common/integration/JMSDeploymentAspect.java 2011-12-15 09:33:48 UTC (rev 15390) @@ -1,39 +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.ws.common.integration; - -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData; - -/** - * JMS deployment aspect. - * - * @author <a href="mailto:ema@redhat.com">Jim Ma</a> - */ -public class JMSDeploymentAspect extends AbstractDeploymentAspect -{ - @Override - public boolean canHandle(final Deployment dep) - { - return this.isForJaxWs() && dep.getAttachment(JMSEndpointsMetaData.class) != null; - } -} Deleted: common/trunk/src/main/java/org/jboss/ws/common/management/ContextServlet.java =================================================================== --- common/trunk/src/main/java/org/jboss/ws/common/management/ContextServlet.java 2011-12-15 09:31:10 UTC (rev 15389) +++ common/trunk/src/main/java/org/jboss/ws/common/management/ContextServlet.java 2011-12-15 09:33:48 UTC (rev 15390) @@ -1,226 +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.ws.common.management; - -import java.io.IOException; -import java.io.PrintWriter; -import java.net.URI; -import java.net.URL; -import java.util.Set; - -import javax.management.ObjectName; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.management.EndpointMetrics; -import org.jboss.wsf.spi.management.EndpointRegistry; -import org.jboss.wsf.spi.management.EndpointRegistryFactory; -import org.jboss.wsf.spi.management.ServerConfig; -import org.jboss.wsf.spi.management.ServerConfigFactory; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; - -/** - * The servlet that that is associated with context /jbossws - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-Mar-2005 - */ -public class ContextServlet extends HttpServlet -{ - // provide logging - protected final Logger log = Logger.getLogger(ContextServlet.class); - - protected EndpointRegistry epRegistry; - - public void init(ServletConfig config) throws ServletException - { - super.init(config); - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); - } - - /** Process GET requests. - */ - public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException - { - PrintWriter writer = res.getWriter(); - res.setContentType("text/html"); - - writer.print("<html>"); - setupHTMLResponseHeader(writer); - - URL requestURL = new URL(req.getRequestURL().toString()); - - writer.print("<body>"); - - writer.print("<div class='pageHeader'>JBossWS/Services</div>"); - writer.print("<div class='pageSection'>"); - writer.print("<fieldset>"); - writer.print("<legend><b>Registered Service Endpoints</b></legend>"); - writer.print("<table>"); - - // begin iteration - Set<ObjectName> epNames = epRegistry.getEndpoints(); - - if (epNames.isEmpty()) - { - writer.print("<tr>"); - writer.print(" <td><h3>There are currently no endpoints deployed</h3></td>"); - writer.print("</tr>"); - } - - for (ObjectName oname : epNames) - { - Endpoint ep = epRegistry.getEndpoint(oname); - - writer.print("<tr>"); - writer.print(" <td>Endpoint Name</td>"); - writer.print(" <td>" + ep.getName() + "</td>"); - writer.print("</tr>"); - writer.print("<tr>"); - writer.print(" <td>Endpoint Address</td>"); - writer.print(" <td>" + getAddressHtmlTag(requestURL, ep) + "</td>"); - writer.print("</tr>"); - writer.print("<tr>"); - writer.print(" <td colspan=2>"); - writer.print(" "); - writer.print(""); - - EndpointMetrics metrics = ep.getEndpointMetrics(); - if (metrics != null) - { - writer.print("<table class='metrics'>"); - writer.print("<tr>"); - writer.print(" <td>StartTime</td>"); - writer.print(" <td>StopTime</td>"); - writer.print(" <td></td>"); - writer.print("</tr>"); - writer.print("<tr>"); - writer.print(" <td>" + metrics.getStartTime() + "</td>"); - - String stopTime = metrics.getStopTime() != null ? metrics.getStopTime().toString() : ""; - writer.print(" <td>" + stopTime + "</td>"); - writer.print(" <td></td>"); - writer.print("</tr>"); - writer.print("<tr>"); - - writer.print(" <td>RequestCount</td>"); - writer.print(" <td>ResponseCount</td>"); - writer.print(" <td>FaultCount</td>"); - writer.print("</tr>"); - writer.print("<tr>"); - writer.print(" <td>" + metrics.getRequestCount() + "</td>"); - writer.print(" <td>" + metrics.getResponseCount() + "</td>"); - writer.print(" <td>" + metrics.getFaultCount() + "</td>"); - writer.print("</tr>"); - writer.print("<tr>"); - writer.print(" <td>MinProcessingTime</td>"); - writer.print(" <td>MaxProcessingTime</td>"); - writer.print(" <td>AvgProcessingTime</td>"); - writer.print("</tr>"); - writer.print("<tr>"); - writer.print(" <td>" + metrics.getMinProcessingTime() + "</td>"); - writer.print(" <td>" + metrics.getMaxProcessingTime() + "</td>"); - writer.print(" <td>" + metrics.getAverageProcessingTime() + "</td>"); - writer.print("</tr>"); - writer.print(""); - writer.print(""); - writer.print("</table>"); - writer.print(""); - } - - writer.print(" </td>"); - writer.print("</tr>"); - - writer.print("<tr><td colspan='3'> </td></tr>"); - } - // end iteration - writer.print("</table>"); - writer.print(""); - writer.print("</fieldset>"); - writer.print("</div>"); - - writer.print("</body>"); - writer.print("</html>"); - writer.close(); - } - - private void setupHTMLResponseHeader(PrintWriter writer) - { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig(); - writer.println("<head>"); - writer.println("<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'>"); - writer.println("<title>JBossWS / " + serverConfig.getImplementationVersion() + "</title>"); - writer.println("<link rel='stylesheet' href='./styles.css'>"); - writer.println("</head>"); - } - - private String getAddressHtmlTag(final URL requestURL, final Endpoint ep) throws IOException - { - String address = createAddress(requestURL, ep.getAddress()); - - if (address.startsWith("jms")) - { - return ep.getAddress(); - } - - StringBuilder sb = new StringBuilder("<a href='"); - sb.append(address); - sb.append("?wsdl'>"); - sb.append(address); - sb.append("</a>"); - return sb.toString(); - } - - private String createAddress(final URL requestURL, final String endpointAddress) throws IOException - { - String address = endpointAddress; - if (address.contains(ServerConfig.UNDEFINED_HOSTNAME)) - { - URL internalAddress = new URL(address); - - String protocol = requestURL.getProtocol(); - String host = requestURL.getHost(); - int port = requestURL.getPort(); - String path = internalAddress.getPath(); - - if (port > -1) - { - address = new URL(protocol, host, port, path).toString(); - } - else - { - address = new URL(protocol, host, path).toString(); - } - } - - return address; - } - -}

12 years, 11 months

1
0
0 / 0

JBossWS SVN: r15389 - hudson/tags/jbossws-hudson-4.0.0.CR1.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-15 04:31:10 -0500 (Thu, 15 Dec 2011) New Revision: 15389 Modified: hudson/tags/jbossws-hudson-4.0.0.CR1/pom.xml Log: Updating pom.xml Modified: hudson/tags/jbossws-hudson-4.0.0.CR1/pom.xml =================================================================== --- hudson/tags/jbossws-hudson-4.0.0.CR1/pom.xml 2011-12-15 09:19:07 UTC (rev 15388) +++ hudson/tags/jbossws-hudson-4.0.0.CR1/pom.xml 2011-12-15 09:31:10 UTC (rev 15389) @@ -20,19 +20,19 @@ <artifactId>jbossws-hudson</artifactId> <packaging>pom</packaging> <description>JBossWS Hudson Integration</description> - <version>4.0.0-SNAPSHOT</version> + <version>4.0.0.CR1</version>  <parent> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-parent</artifactId> - <version>1.0.10-SNAPSHOT</version> + <version>1.0.10.GA</version> </parent> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/hudson/trunk</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/hudson/trunk</developerConnection> - <url>http://fisheye.jboss.com/viewrep/JBossWS/hudson/trunk</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossws/hudson/tags/jbossws-hudson...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossws/hudson/tags/jbossws-hudson-4....</developerConnection> + <url>http://fisheye.jboss.com/viewrep/JBossWS/hudson/tags/jbossws-hudson-4.0.0...</url> </scm> </project>

12 years, 11 months

1
0
0 / 0

JBossWS SVN: r15388 - hudson/tags.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-15 04:19:07 -0500 (Thu, 15 Dec 2011) New Revision: 15388 Added: hudson/tags/jbossws-hudson-4.0.0.CR1/ Log: Tagging jbossws-hudson-4.0.0.CR1

12 years, 11 months

1
0
0 / 0

JBossWS SVN: r15387 - stack/cxf/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-14 20:31:49 -0500 (Wed, 14 Dec 2011) New Revision: 15387 Modified: stack/cxf/trunk/modules/testsuite/pom.xml Log: [AS7-2961] Excluding test on AS 7.0.x Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-12-15 01:27:25 UTC (rev 15386) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-12-15 01:31:49 UTC (rev 15387) @@ -1113,6 +1113,9 @@  <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxws/as2961/AS2961TestCase*</exclude> + </excludes> </configuration> </plugin> @@ -1298,6 +1301,9 @@  <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxws/as2961/AS2961TestCase*</exclude> + </excludes> </configuration> </plugin> @@ -1483,6 +1489,9 @@  <exclude>org/jboss/test/ws/publish/EndpointPublishTestCase*</exclude> +  + <exclude>org/jboss/test/ws/jaxws/as2961/AS2961TestCase*</exclude> + </excludes> </configuration> </plugin>

12 years, 11 months

1
0
0 / 0

JBossWS SVN: r15386 - container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/deployers/deployment.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-14 20:27:25 -0500 (Wed, 14 Dec 2011) New Revision: 15386 Modified: container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java Log: [JBWS-3398] Propagate WebservicesMetaData to jbws jaxws deployments too on AS 701 Modified: container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java =================================================================== --- container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java 2011-12-15 01:22:51 UTC (rev 15385) +++ container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java 2011-12-15 01:27:25 UTC (rev 15386) @@ -36,6 +36,7 @@ import org.jboss.as.server.deployment.module.ResourceRoot; import org.jboss.as.webservices.util.ASHelper; import org.jboss.as.webservices.util.VirtualFileAdaptor; +import org.jboss.as.webservices.util.WSAttachmentKeys; import org.jboss.logging.Logger; import org.jboss.modules.Module; import org.jboss.vfs.VirtualFile; @@ -48,6 +49,7 @@ import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.EndpointType; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; /** * Base class for all deployment model builders. @@ -105,6 +107,10 @@ dep.addAttachment(DeploymentUnit.class, unit); unit.putAttachment(DEPLOYMENT_KEY, dep); } + final WebservicesMetaData wsMetaData = ASHelper.getOptionalAttachment(unit, WSAttachmentKeys.WEBSERVICES_METADATA_KEY); + if (wsMetaData != null) { + dep.addAttachment(WebservicesMetaData.class, wsMetaData); + } this.build(dep, unit); } Modified: container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java =================================================================== --- container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2011-12-15 01:22:51 UTC (rev 15385) +++ container/jboss70/branches/jbossws-jboss701/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2011-12-15 01:27:25 UTC (rev 15386) @@ -26,7 +26,6 @@ import org.jboss.as.server.deployment.DeploymentUnit; import org.jboss.as.webservices.util.ASHelper; -import org.jboss.as.webservices.util.WSAttachmentKeys; import org.jboss.metadata.web.jboss.JBossWebMetaData; import org.jboss.metadata.web.spec.ServletMetaData; import org.jboss.wsf.spi.deployment.Deployment; @@ -59,10 +58,7 @@ if (webMetaData != null) { dep.addAttachment(JBossWebMetaData.class, webMetaData); } - final WebservicesMetaData wsMetaData = ASHelper.getOptionalAttachment(unit, WSAttachmentKeys.WEBSERVICES_METADATA_KEY); - if (wsMetaData != null) { - dep.addAttachment(WebservicesMetaData.class, wsMetaData); - } + final WebservicesMetaData wsMetaData = dep.getAttachment(WebservicesMetaData.class); this.log.debug("Creating JAXRPC JSE endpoints meta data model"); for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) {

12 years, 11 months

1
0
0 / 0

JBossWS SVN: r15385 - container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/deployers/deployment.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-14 20:22:51 -0500 (Wed, 14 Dec 2011) New Revision: 15385 Modified: container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java Log: [JBWS-3398] Propagate WebservicesMetaData to jbws jaxws deployments too on AS 702 Modified: container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java =================================================================== --- container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java 2011-12-15 00:13:46 UTC (rev 15384) +++ container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java 2011-12-15 01:22:51 UTC (rev 15385) @@ -36,6 +36,7 @@ import org.jboss.as.server.deployment.module.ResourceRoot; import org.jboss.as.webservices.util.ASHelper; import org.jboss.as.webservices.util.VirtualFileAdaptor; +import org.jboss.as.webservices.util.WSAttachmentKeys; import org.jboss.logging.Logger; import org.jboss.modules.Module; import org.jboss.vfs.VirtualFile; @@ -48,6 +49,7 @@ import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.EndpointType; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; +import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; /** * Base class for all deployment model builders. @@ -105,6 +107,10 @@ dep.addAttachment(DeploymentUnit.class, unit); unit.putAttachment(DEPLOYMENT_KEY, dep); } + final WebservicesMetaData wsMetaData = ASHelper.getOptionalAttachment(unit, WSAttachmentKeys.WEBSERVICES_METADATA_KEY); + if (wsMetaData != null) { + dep.addAttachment(WebservicesMetaData.class, wsMetaData); + } this.build(dep, unit); } Modified: container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java =================================================================== --- container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2011-12-15 00:13:46 UTC (rev 15384) +++ container/jboss70/branches/jbossws-jboss702/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2011-12-15 01:22:51 UTC (rev 15385) @@ -59,10 +59,7 @@ if (webMetaData != null) { dep.addAttachment(JBossWebMetaData.class, webMetaData); } - final WebservicesMetaData wsMetaData = ASHelper.getOptionalAttachment(unit, WSAttachmentKeys.WEBSERVICES_METADATA_KEY); - if (wsMetaData != null) { - dep.addAttachment(WebservicesMetaData.class, wsMetaData); - } + final WebservicesMetaData wsMetaData = dep.getAttachment(WebservicesMetaData.class); this.log.debug("Creating JAXRPC JSE endpoints meta data model"); for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) {

12 years, 11 months

1
0
0 / 0

JBossWS SVN: r15384 - stack/cxf/branches/JBWS-3393/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-14 19:13:46 -0500 (Wed, 14 Dec 2011) New Revision: 15384 Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml Log: Completely excluding jaxr tests for now, while waiting for JAXR subsystem to be finalized on AS 7.1 Modified: stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml 2011-12-15 00:12:47 UTC (rev 15383) +++ stack/cxf/branches/JBWS-3393/modules/testsuite/pom.xml 2011-12-15 00:13:46 UTC (rev 15384) @@ -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> - <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> <log4j.output.dir>${project.build.directory}</log4j.output.dir> @@ -99,12 +98,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-javaee</artifactId> - <version>${jboss.javaee.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.14</version> @@ -622,6 +615,7 @@ <phase>test-compile</phase> <configuration> <testExcludes> + <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>  <exclude>org/jboss/test/ws/jaxrpc/**</exclude>  @@ -809,6 +803,7 @@ <phase>test-compile</phase> <configuration> <testExcludes> + <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>  <exclude>org/jboss/test/ws/jaxrpc/**</exclude>  @@ -994,6 +989,7 @@ <phase>test-compile</phase> <configuration> <testExcludes> + <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>  <exclude>org/jboss/test/ws/jaxrpc/**</exclude>  @@ -1256,6 +1252,7 @@ <phase>test-compile</phase> <configuration> <testExcludes> + <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>  <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude> <exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>

12 years, 11 months

1
0
0 / 0

JBossWS SVN: r15383 - stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-14 19:12:47 -0500 (Wed, 14 Dec 2011) New Revision: 15383 Removed: stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspectDelegate.java Log: Removing classes not used anymore Deleted: stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java 2011-12-14 23:25:54 UTC (rev 15382) +++ stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspect.java 2011-12-15 00:12:47 UTC (rev 15383) @@ -1,64 +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.ws.common.integration.JMSDeploymentAspect; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.stack.cxf.client.util.SpringUtils; - -/** - * The DeploymentAspect to register the jms endpoints - * - * @author <a href="ema(a)redhat.com">Jim Ma</a> - */ -public class JMSEndpointRegistryDeploymentAspect extends JMSDeploymentAspect -{ - private JMSEndpointRegistryDeploymentAspectDelegate aspect; - - public JMSEndpointRegistryDeploymentAspect() - { - if (SpringUtils.SPRING_AVAILABLE) - { - aspect = new JMSEndpointRegistryDeploymentAspectDelegate(); - } - } - - - @Override - public void start(Deployment dep) - { - if (aspect != null) - { - aspect.start(dep); - } - } - - public void stop(Deployment dep) - { - if (aspect != null) - { - aspect.stop(dep); - } - } - - -} Deleted: stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspectDelegate.java =================================================================== --- stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspectDelegate.java 2011-12-14 23:25:54 UTC (rev 15382) +++ stack/cxf/branches/JBWS-3393/modules/server/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JMSEndpointRegistryDeploymentAspectDelegate.java 2011-12-15 00:12:47 UTC (rev 15383) @@ -1,118 +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 java.lang.reflect.Method; -import java.util.Map; - -import org.apache.cxf.Bus; -import org.apache.cxf.endpoint.Server; -import org.apache.cxf.endpoint.ServerRegistry; -import org.apache.cxf.frontend.MethodDispatcher; -import org.apache.cxf.frontend.SimpleMethodDispatcher; -import org.apache.cxf.transport.Destination; -import org.apache.cxf.transport.jms.JMSConfiguration; -import org.apache.cxf.transport.jms.JMSDestination; -import org.jboss.ws.common.integration.JMSDeploymentAspect; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.JMSEndpoint; -import org.jboss.wsf.spi.management.EndpointRegistry; -import org.jboss.wsf.spi.management.EndpointRegistryFactory; - -/** - * The DeploymentAspect to register the jms endpoints - * - * @author <a href="ema(a)redhat.com">Jim Ma</a> - */ -class JMSEndpointRegistryDeploymentAspectDelegate extends JMSDeploymentAspect -{ - private EndpointRegistry registry = null; - @Override - public void start(Deployment dep) - { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - if (registry == null) - registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); - Bus bus = dep.getAttachment(Bus.class); - Map<String, JMSConfiguration> jmsConfigMap = createEndpointJmsConfigMap(bus); - for (Endpoint endpoint : dep.getService().getEndpoints()) - { - JMSEndpoint jmsEndpoint = (JMSEndpoint)endpoint; - String endpointImplClass = jmsEndpoint.getTargetBeanName(); - JMSConfiguration jmsConfig = jmsConfigMap.get(endpointImplClass); - if (jmsConfig != null) - { - jmsEndpoint.setTargetDestination(jmsConfig.getTargetDestination()); - jmsEndpoint.setReplyDestination(jmsConfig.getReplyDestination()); - } - - registry.register(jmsEndpoint); - } - } - - public void stop(Deployment dep) - { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - if (registry == null) - registry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); - for (Endpoint ep : dep.getService().getEndpoints()) - { - registry.unregister(ep); - } - } - - private Map<String, JMSConfiguration> createEndpointJmsConfigMap(Bus bus) - { - Map<String, JMSConfiguration> endpointJmsConfigMap = new java.util.HashMap<String, JMSConfiguration>(); - ServerRegistry serverRegsitry = bus.getExtension(ServerRegistry.class); - for (Server server : serverRegsitry.getServers()) - { - Destination destination = server.getDestination(); - if (destination instanceof JMSDestination) - { - JMSConfiguration jmsConfiguration = ((JMSDestination)destination).getJmsConfig(); - String implClassName = getEndpointClassName(server); - if (implClassName != null) - { - endpointJmsConfigMap.put(implClassName, jmsConfiguration); - } - } - } - return endpointJmsConfigMap; - } - - private String getEndpointClassName(Server server) - { - MethodDispatcher methodDispatcher = (SimpleMethodDispatcher) server.getEndpoint().getService().get( - MethodDispatcher.class.getName()); - if (methodDispatcher != null && methodDispatcher instanceof SimpleMethodDispatcher) - { - Method method = ((SimpleMethodDispatcher)methodDispatcher).getPrimaryMethod(server.getEndpoint().getEndpointInfo().getInterface() - .getOperations().iterator().next()); - return method != null ? method.getDeclaringClass().getName() : null; - } - return null; - } -}

12 years, 11 months

1
0
0 / 0

JBossWS SVN: r15382 - in common/branches/JBWS-3393/src/main/java/org/jboss/ws/common: deployment and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-12-14 18:25:54 -0500 (Wed, 14 Dec 2011) New Revision: 15382 Removed: common/branches/JBWS-3393/src/main/java/org/jboss/ws/common/deployment/EndpointAPIDeploymentAspect.java common/branches/JBWS-3393/src/main/java/org/jboss/ws/common/integration/JMSDeploymentAspect.java common/branches/JBWS-3393/src/main/java/org/jboss/ws/common/management/ContextServlet.java Modified: common/branches/JBWS-3393/src/main/java/org/jboss/ws/common/Constants.java common/branches/JBWS-3393/src/main/java/org/jboss/ws/common/deployment/ArchiveDeploymentImpl.java Log: Removing classes not required anymore Modified: common/branches/JBWS-3393/src/main/java/org/jboss/ws/common/Constants.java =================================================================== --- common/branches/JBWS-3393/src/main/java/org/jboss/ws/common/Constants.java 2011-12-14 23:23:44 UTC (rev 15381) +++ common/branches/JBWS-3393/src/main/java/org/jboss/ws/common/Constants.java 2011-12-14 23:25:54 UTC (rev 15382) @@ -22,7 +22,6 @@ package org.jboss.ws.common; import javax.xml.namespace.QName; -import javax.xml.soap.Name; import javax.xml.soap.SOAPConstants; import javax.xml.ws.http.HTTPBinding; import javax.xml.ws.soap.SOAPBinding; Modified: common/branches/JBWS-3393/src/main/java/org/jboss/ws/common/deployment/ArchiveDeploymentImpl.java =================================================================== --- common/branches/JBWS-3393/src/main/java/org/jboss/ws/common/deployment/ArchiveDeploymentImpl.java 2011-12-14 23:23:44 UTC (rev 15381) +++ common/branches/JBWS-3393/src/main/java/org/jboss/ws/common/deployment/ArchiveDeploymentImpl.java 2011-12-14 23:25:54 UTC (rev 15382) @@ -25,7 +25,6 @@ import java.net.URL; import java.util.List; -import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.ResourceResolver; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; @@ -43,8 +42,6 @@ // The root file for this deployment private UnifiedVirtualFile rootFile; - private static Logger log = Logger.getLogger(ArchiveDeploymentImpl.class); - private List<UnifiedVirtualFile> metadataFiles; ArchiveDeploymentImpl(String simpleName, ClassLoader classLoader) Deleted: common/branches/JBWS-3393/src/main/java/org/jboss/ws/common/deployment/EndpointAPIDeploymentAspect.java =================================================================== --- common/branches/JBWS-3393/src/main/java/org/jboss/ws/common/deployment/EndpointAPIDeploymentAspect.java 2011-12-14 23:23:44 UTC (rev 15381) +++ common/branches/JBWS-3393/src/main/java/org/jboss/ws/common/deployment/EndpointAPIDeploymentAspect.java 2011-12-14 23:25:54 UTC (rev 15382) @@ -1,83 +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.ws.common.deployment; - -import java.util.ResourceBundle; - -import org.jboss.ws.api.util.BundleUtils; -import org.jboss.ws.common.ResourceLoaderAdapter; -import org.jboss.ws.common.integration.AbstractDeploymentAspect; -import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.HttpEndpoint; -import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; - -/** - * A deployment aspect for JAXWS Endpoint API endpoints. - * - * @author Thomas.Diesler(a)jboss.org - * @since 31-Jul-2007 - */ -// TODO: [JBWS-2674] review this deployment aspect once AS IL is rewritten -public class EndpointAPIDeploymentAspect extends AbstractDeploymentAspect -{ - private static final ResourceBundle bundle = BundleUtils.getBundle(EndpointAPIDeploymentAspect.class); - @Override - public void start(Deployment dep) - { - - if (dep instanceof ArchiveDeployment) - { - ArchiveDeployment arc = (ArchiveDeployment)dep; - UnifiedVirtualFile rootFile = arc.getRootFile(); - if (rootFile == null) - { - rootFile = new ResourceLoaderAdapter(dep.getInitialClassLoader()); - arc.setRootFile(rootFile); - } - } - - ClassLoader rtcl = dep.getRuntimeClassLoader(); - if (rtcl == null) - { - // TODO: What's this? Look's quiet hacky... - log.warn(BundleUtils.getMessage(bundle, "USING_INITAL_CLASS_LAODER_AS_RUNTIME_LAODER"), new IllegalArgumentException()); - dep.setRuntimeClassLoader(dep.getInitialClassLoader()); - } - - for (Endpoint ep : dep.getService().getEndpoints()) - { - if (ep.getShortName() == null) - { - String name = ep.getTargetBeanName(); - String shortName = name.substring(name.lastIndexOf('.') + 1); - ep.setShortName(shortName); - } - - if (((HttpEndpoint)ep).getURLPattern() == null) - { - ((HttpEndpoint)ep).setURLPattern("/*"); - } - } - } -} Deleted: common/branches/JBWS-3393/src/main/java/org/jboss/ws/common/integration/JMSDeploymentAspect.java =================================================================== --- common/branches/JBWS-3393/src/main/java/org/jboss/ws/common/integration/JMSDeploymentAspect.java 2011-12-14 23:23:44 UTC (rev 15381) +++ common/branches/JBWS-3393/src/main/java/org/jboss/ws/common/integration/JMSDeploymentAspect.java 2011-12-14 23:25:54 UTC (rev 15382) @@ -1,39 +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.ws.common.integration; - -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.jms.JMSEndpointsMetaData; - -/** - * JMS deployment aspect. - * - * @author <a href="mailto:ema@redhat.com">Jim Ma</a> - */ -public class JMSDeploymentAspect extends AbstractDeploymentAspect -{ - @Override - public boolean canHandle(final Deployment dep) - { - return this.isForJaxWs() && dep.getAttachment(JMSEndpointsMetaData.class) != null; - } -} Deleted: common/branches/JBWS-3393/src/main/java/org/jboss/ws/common/management/ContextServlet.java =================================================================== --- common/branches/JBWS-3393/src/main/java/org/jboss/ws/common/management/ContextServlet.java 2011-12-14 23:23:44 UTC (rev 15381) +++ common/branches/JBWS-3393/src/main/java/org/jboss/ws/common/management/ContextServlet.java 2011-12-14 23:25:54 UTC (rev 15382) @@ -1,226 +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.ws.common.management; - -import java.io.IOException; -import java.io.PrintWriter; -import java.net.URI; -import java.net.URL; -import java.util.Set; - -import javax.management.ObjectName; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.management.EndpointMetrics; -import org.jboss.wsf.spi.management.EndpointRegistry; -import org.jboss.wsf.spi.management.EndpointRegistryFactory; -import org.jboss.wsf.spi.management.ServerConfig; -import org.jboss.wsf.spi.management.ServerConfigFactory; -import org.jboss.wsf.spi.SPIProvider; -import org.jboss.wsf.spi.SPIProviderResolver; - -/** - * The servlet that that is associated with context /jbossws - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-Mar-2005 - */ -public class ContextServlet extends HttpServlet -{ - // provide logging - protected final Logger log = Logger.getLogger(ContextServlet.class); - - protected EndpointRegistry epRegistry; - - public void init(ServletConfig config) throws ServletException - { - super.init(config); - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - epRegistry = spiProvider.getSPI(EndpointRegistryFactory.class).getEndpointRegistry(); - } - - /** Process GET requests. - */ - public void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException - { - PrintWriter writer = res.getWriter(); - res.setContentType("text/html"); - - writer.print("<html>"); - setupHTMLResponseHeader(writer); - - URL requestURL = new URL(req.getRequestURL().toString()); - - writer.print("<body>"); - - writer.print("<div class='pageHeader'>JBossWS/Services</div>"); - writer.print("<div class='pageSection'>"); - writer.print("<fieldset>"); - writer.print("<legend><b>Registered Service Endpoints</b></legend>"); - writer.print("<table>"); - - // begin iteration - Set<ObjectName> epNames = epRegistry.getEndpoints(); - - if (epNames.isEmpty()) - { - writer.print("<tr>"); - writer.print(" <td><h3>There are currently no endpoints deployed</h3></td>"); - writer.print("</tr>"); - } - - for (ObjectName oname : epNames) - { - Endpoint ep = epRegistry.getEndpoint(oname); - - writer.print("<tr>"); - writer.print(" <td>Endpoint Name</td>"); - writer.print(" <td>" + ep.getName() + "</td>"); - writer.print("</tr>"); - writer.print("<tr>"); - writer.print(" <td>Endpoint Address</td>"); - writer.print(" <td>" + getAddressHtmlTag(requestURL, ep) + "</td>"); - writer.print("</tr>"); - writer.print("<tr>"); - writer.print(" <td colspan=2>"); - writer.print(" "); - writer.print(""); - - EndpointMetrics metrics = ep.getEndpointMetrics(); - if (metrics != null) - { - writer.print("<table class='metrics'>"); - writer.print("<tr>"); - writer.print(" <td>StartTime</td>"); - writer.print(" <td>StopTime</td>"); - writer.print(" <td></td>"); - writer.print("</tr>"); - writer.print("<tr>"); - writer.print(" <td>" + metrics.getStartTime() + "</td>"); - - String stopTime = metrics.getStopTime() != null ? metrics.getStopTime().toString() : ""; - writer.print(" <td>" + stopTime + "</td>"); - writer.print(" <td></td>"); - writer.print("</tr>"); - writer.print("<tr>"); - - writer.print(" <td>RequestCount</td>"); - writer.print(" <td>ResponseCount</td>"); - writer.print(" <td>FaultCount</td>"); - writer.print("</tr>"); - writer.print("<tr>"); - writer.print(" <td>" + metrics.getRequestCount() + "</td>"); - writer.print(" <td>" + metrics.getResponseCount() + "</td>"); - writer.print(" <td>" + metrics.getFaultCount() + "</td>"); - writer.print("</tr>"); - writer.print("<tr>"); - writer.print(" <td>MinProcessingTime</td>"); - writer.print(" <td>MaxProcessingTime</td>"); - writer.print(" <td>AvgProcessingTime</td>"); - writer.print("</tr>"); - writer.print("<tr>"); - writer.print(" <td>" + metrics.getMinProcessingTime() + "</td>"); - writer.print(" <td>" + metrics.getMaxProcessingTime() + "</td>"); - writer.print(" <td>" + metrics.getAverageProcessingTime() + "</td>"); - writer.print("</tr>"); - writer.print(""); - writer.print(""); - writer.print("</table>"); - writer.print(""); - } - - writer.print(" </td>"); - writer.print("</tr>"); - - writer.print("<tr><td colspan='3'> </td></tr>"); - } - // end iteration - writer.print("</table>"); - writer.print(""); - writer.print("</fieldset>"); - writer.print("</div>"); - - writer.print("</body>"); - writer.print("</html>"); - writer.close(); - } - - private void setupHTMLResponseHeader(PrintWriter writer) - { - SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - ServerConfig serverConfig = spiProvider.getSPI(ServerConfigFactory.class).getServerConfig(); - writer.println("<head>"); - writer.println("<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'>"); - writer.println("<title>JBossWS / " + serverConfig.getImplementationVersion() + "</title>"); - writer.println("<link rel='stylesheet' href='./styles.css'>"); - writer.println("</head>"); - } - - private String getAddressHtmlTag(final URL requestURL, final Endpoint ep) throws IOException - { - String address = createAddress(requestURL, ep.getAddress()); - - if (address.startsWith("jms")) - { - return ep.getAddress(); - } - - StringBuilder sb = new StringBuilder("<a href='"); - sb.append(address); - sb.append("?wsdl'>"); - sb.append(address); - sb.append("</a>"); - return sb.toString(); - } - - private String createAddress(final URL requestURL, final String endpointAddress) throws IOException - { - String address = endpointAddress; - if (address.contains(ServerConfig.UNDEFINED_HOSTNAME)) - { - URL internalAddress = new URL(address); - - String protocol = requestURL.getProtocol(); - String host = requestURL.getHost(); - int port = requestURL.getPort(); - String path = internalAddress.getPath(); - - if (port > -1) - { - address = new URL(protocol, host, port, path).toString(); - } - else - { - address = new URL(protocol, host, path).toString(); - } - } - - return address; - } - -}

12 years, 11 months

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