[jbossws-commits] JBossWS SVN: r10918 - in framework/trunk: src/main/java/org/jboss/wsf/framework and 8 other directories.

Author: richard.opalka(a)jboss.com Date: 2009-10-15 18:57:15 -0400 (Thu, 15 Oct 2009) New Revision: 10918 Added: framework/trunk/eclipse/jboss-format.xml framework/trunk/eclipse/jboss-style.xml framework/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java framework/trunk/src/main/java/org/jboss/wsf/framework/security/ framework/trunk/src/main/java/org/jboss/wsf/framework/security/DefaultSecurityAdapterFactory.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointBean.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointInterface.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointTestCase.java Removed: framework/trunk/eclipse/JBoss500GA.userlibraries framework/trunk/eclipse/JBossWSCheckStyle.xml framework/trunk/eclipse/JBossWSCodeStyle.xml framework/trunk/src/main/java/org/jboss/wsf/framework/http/DefaultHttpServerFactory.java framework/trunk/src/main/java/org/jboss/wsf/framework/management/ServerConfigFactoryImpl.java framework/trunk/src/main/java/org/jboss/wsf/framework/security/DefaultSecurityAdapterFactory.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointBean.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointInterface.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointTestCase.java Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeploymentAspectManagerFactory.java framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java framework/trunk/src/main/java/org/jboss/wsf/framework/management/MBeanServerLocator.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/StackConfigurable.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java Log: merge from ropalka branch Deleted: framework/trunk/eclipse/JBoss500GA.userlibraries =================================================================== --- framework/trunk/eclipse/JBoss500GA.userlibraries 2009-10-15 22:54:22 UTC (rev 10917) +++ framework/trunk/eclipse/JBoss500GA.userlibraries 2009-10-15 22:57:15 UTC (rev 10918) @@ -1,678 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 1.) Checkout and build JBossAS 500 GA first - 2.) Replace $JBOSS500GA_SOURCES with correct value and import in eclipse using - Window -> Preferences -> Java -> Build path -> User Libraries -> Import ---> -<eclipse-userlibraries version="2"> - <library name="JBOSS500GA" systemlibrary="false"> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/antlr/lib/antlr.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/apache-xalan/lib/xalan.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/apache-xalan/lib/serializer.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/apache-xerces/lib/xercesImpl.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/apache-xerces/lib/resolver.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/apache-xerces/lib/xml-apis.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/stax-api/lib/stax-api.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/sun-jaxb/lib/jaxb-api.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/sun-jaxb/lib/jaxb-api-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/sun-jaxb/lib/jaxb-impl.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/sun-jaxb/lib/jaxb-impl-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/sun-jaxb/lib/jaxb-xjc.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/sun-jaxb/lib/jaxb-xjc-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/javassist/lib/javassist.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/javassist/lib/javassist-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/woodstox/lib/wstx.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/woodstox/lib/wstx-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/remoting/lib/jboss-remoting.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/remoting/lib/jboss-remoting-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/sun-jaf/lib/activation.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/sun-jaf/lib/activation-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/sun-javamail/lib/mail.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/sun-javamail/lib/mail-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/aop/lib/jboss-aop-asintegration-core.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/aop/lib/jboss-aop-asintegration-core-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/aop/lib/jboss-aop-asintegration-jmx.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/aop/lib/jboss-aop-asintegration-jmx-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/aop/lib/jboss-aop-asintegration-mc.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/aop/lib/jboss-aop-asintegration-mc-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/aop/lib/jboss-aop-aspects.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/aop/lib/jboss-aop-aspects-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/aop/lib/jboss-aop.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/aop/lib/jboss-aop-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/aop/lib/jboss-aop-client.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/aop/lib/jboss-aop-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/aop/lib/jrockit-pluggable-instrumentor.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/aop/lib/jrockit-pluggable-instrumentor-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/aop/lib/pluggable-instrumentor.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/aop/lib/pluggable-instrumentor-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/common-core/lib/jboss-common-core.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/common-core/lib/jboss-common-core-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/common-logging-jdk/lib/jboss-logging-jdk.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/common-logging-jdk/lib/jboss-logging-jdk-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/common-logging-log4j/lib/jboss-logging-log4j-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/integration/lib/jboss-classloading-spi.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/integration/lib/jboss-classloading-spi-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/integration/lib/jboss-corba-ots-spi.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/integration/lib/jboss-corba-ots-spi-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/integration/lib/jboss-deployment-spi.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/integration/lib/jboss-deployment-spi-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/integration/lib/jboss-integration.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/integration/lib/jboss-integration-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/integration/lib/jboss-transaction-spi.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/integration/lib/jboss-transaction-spi-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-cl/lib/jboss-classloader.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-cl/lib/jboss-classloader-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-cl/lib/jboss-classloading.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-cl/lib/jboss-classloading-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-cl/lib/jboss-classloading-vfs.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-cl/lib/jboss-classloading-vfs-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-client.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-client-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-client-spi.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-client-spi-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-core.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-core-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-core-spi.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-core-spi-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-impl.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-impl-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-spi.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-spi-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-structure-spi.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-structure-spi-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-vfs.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-vfs-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-vfs-spi.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-deployers/lib/jboss-deployers-vfs-spi-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/microcontainer/lib/jboss-dependency-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-jaspi-api/lib/jboss-jaspi-api.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-jaspi-api/lib/jboss-jaspi-api-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-metadata/lib/jboss-ejb3-metadata.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-metadata/lib/jboss-ejb3-metadata-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-transactions/lib/jboss-ejb3-transactions.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-transactions/lib/jboss-ejb3-transactions-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-interceptors/lib/jboss-ejb3-interceptors.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-interceptors/lib/jboss-ejb3-interceptors-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-deployers/lib/jboss-ejb3-deployers.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-deployers/lib/jboss-ejb3-deployers-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-cache/lib/jboss-ejb3-cache.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-cache/lib/jboss-ejb3-cache-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-common/lib/jboss-ejb3-common.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-common/lib/jboss-ejb3-common-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-common/lib/jboss-ejb3-common-client.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-common/lib/jboss-ejb3-common-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-core/lib/jboss-ejb3-core.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-core/lib/jboss-ejb3-core-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-core/lib/jboss-ejb3-core-client.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-core/lib/jboss-ejb3-core-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-proxy-clustered/lib/jboss-ejb3-proxy-clustered.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-proxy-clustered/lib/jboss-ejb3-proxy-clustered-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-proxy-clustered/lib/jboss-ejb3-proxy-clustered-client.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-proxy-clustered/lib/jboss-ejb3-proxy-clustered-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-security/lib/jboss-ejb3-security.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-security/lib/jboss-ejb3-security-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-security/lib/jboss-ejb3-security-client.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-security/lib/jboss-ejb3-security-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-ext-api-impl/lib/jboss-ejb3-ext-api-impl.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-ext-api-impl/lib/jboss-ejb3-ext-api-impl-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-proxy/lib/jboss-ejb3-proxy.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-proxy/lib/jboss-ejb3-proxy-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-proxy/lib/jboss-ejb3-proxy-client.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-proxy/lib/jboss-ejb3-proxy-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-ext-api/lib/jboss-ejb3-ext-api.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-ejb3-ext-api/lib/jboss-ejb3-ext-api-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-jpa-deployers/lib/jboss-jpa-deployers.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-jpa-deployers/lib/jboss-jpa-deployers-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-man/lib/jboss-managed.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-man/lib/jboss-managed-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-man/lib/jboss-metatype.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-man/lib/jboss-metatype-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-mdr/lib/jboss-mdr.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-mdr/lib/jboss-mdr-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-reflect/lib/jboss-reflect.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-reflect/lib/jboss-reflect-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-vfs/lib/jboss-vfs.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jboss-vfs/lib/jboss-vfs-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jbosssx/lib/jbosssx.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jbosssx/lib/jbosssx-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jbossxb/lib/jboss-xml-binding-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jnp-client/lib/jnp-client.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jnp-client/lib/jnp-client-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/jnpserver/lib/jnpserver.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/jnpserver/lib/jnpserver-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/lib/jboss-j2ee.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/messaging/lib/jboss-messaging.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/messaging/lib/jboss-messaging-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/messaging/lib/jboss-messaging-client.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/messaging/lib/jboss-messaging-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/metadata/lib/jboss-metadata.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/metadata/lib/jboss-metadata-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/security/lib/jboss-sunxacml.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/security/lib/jboss-sunxacml-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/security/lib/jboss-xacml.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/security/lib/jboss-xacml-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/serialization/lib/jboss-serialization.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/server/manager/lib/jboss-server-manager.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/server/manager/lib/jboss-server-manager-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/web/lib/jbossweb.jar" - source = "$JBOSSAS500_SOURCES/thirdparty/jboss/web/lib/jbossweb-sources.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/web/lib/el-api.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/web/lib/jasper-jdt.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/thirdparty/jboss/web/lib/jsp-api.jar" - /> - <archive - path = "$JBOSSAS500_SOURCES/bootstrap/output/lib/jboss-bootstrap.jar" - source = "$JBOSSAS500_SOURCES/bootstrap/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/connector/output/lib/jbosscx-client.jar" - source = "$JBOSSAS500_SOURCES/connector/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/connector/output/lib/jboss-jca.deployer/jboss-jca-deployer.jar" - source = "$JBOSSAS500_SOURCES/connector/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/connector/output/lib/jboss-common-jdbc-wrapper.jar" - source = "$JBOSSAS500_SOURCES/connector/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/connector/output/lib/mail-ra.jar" - source = "$JBOSSAS500_SOURCES/connector/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/connector/output/lib/jboss-local-jdbc.jar" - source = "$JBOSSAS500_SOURCES/connector/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/connector/output/lib/quartz-ra.jar" - source = "$JBOSSAS500_SOURCES/connector/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/connector/output/lib/jboss-xa-jdbc.jar" - source = "$JBOSSAS500_SOURCES/connector/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/connector/output/lib/jms-ra.jar" - source = "$JBOSSAS500_SOURCES/connector/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/connector/output/lib/jboss-jca-deployer.jar" - source = "$JBOSSAS500_SOURCES/connector/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/connector/output/lib/jboss-jca.jar" - source = "$JBOSSAS500_SOURCES/connector/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/console/output/lib/jboss-console.jar" - source = "$JBOSSAS500_SOURCES/console/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/console/output/lib/console-mgr-classes.jar" - source = "$JBOSSAS500_SOURCES/console/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/console/output/lib/jboss-console-client.jar" - source = "$JBOSSAS500_SOURCES/console/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/deployment/output/lib/jboss-jsr88.jar" - source = "$JBOSSAS500_SOURCES/deployment/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/deployment/output/lib/jboss-deployment.jar" - source = "$JBOSSAS500_SOURCES/deployment/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/ejb3/output/lib/jboss-ejb3-deployer.jar" - source = "$JBOSSAS500_SOURCES/ejb3/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/ejb3/output/lib/jboss-appclient.jar" - source = "$JBOSSAS500_SOURCES/ejb3/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/ejb3/output/lib/jboss-ejb3-iiop.jar" - source = "$JBOSSAS500_SOURCES/ejb3/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/hibernate-int/output/lib/jboss-hibernate.jar" - source = "$JBOSSAS500_SOURCES/hibernate-int/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/iiop/output/lib/jboss-iiop-client.jar" - source = "$JBOSSAS500_SOURCES/iiop/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/iiop/output/lib/jboss-iiop.jar" - source = "$JBOSSAS500_SOURCES/iiop/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/j2se/output/lib/jboss-j2se.jar" - source = "$JBOSSAS500_SOURCES/j2se/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/j2se/output/lib/jboss-jmx-compliance.jar" - source = "$JBOSSAS500_SOURCES/j2se/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/jbossas/remoting/output/lib/jbossas-remoting.jar" - source = "$JBOSSAS500_SOURCES/jbossas/remoting/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/jbossas/jmx-remoting/output/lib/jbossas-jmx-remoting.jar" - source = "$JBOSSAS500_SOURCES/jbossas/jmx-remoting/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/jmx/output/lib/jboss-jmx.jar" - source = "$JBOSSAS500_SOURCES/jmx/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/jmx-remoting/output/lib/jboss-jmx-remoting.jar" - source = "$JBOSSAS500_SOURCES/jmx-remoting/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/main/output/lib/log4j-boot.jar" - source = "$JBOSSAS500_SOURCES/main/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/main/output/lib/run.jar" - source = "$JBOSSAS500_SOURCES/main/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/main/output/lib/jboss-main.jar" - source = "$JBOSSAS500_SOURCES/main/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/main/output/lib/jboss-main-client.jar" - source = "$JBOSSAS500_SOURCES/main/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/management/output/lib/ejb-management.jar" - source = "$JBOSSAS500_SOURCES/management/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/management/output/lib/jboss-management.jar" - source = "$JBOSSAS500_SOURCES/management/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/management/output/lib/jboss-jsr77.jar" - source = "$JBOSSAS500_SOURCES/management/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/management/output/lib/jboss-jsr77-client.jar" - source = "$JBOSSAS500_SOURCES/management/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/mbeans/output/lib/jboss-mbeans.jar" - source = "$JBOSSAS500_SOURCES/mbeans/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/messaging/output/lib/jboss-messaging-int.jar" - source = "$JBOSSAS500_SOURCES/messaging/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/messaging/output/lib/jboss-messaging-int-client.jar" - source = "$JBOSSAS500_SOURCES/messaging/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/profileservice/output/lib/jboss-profileservice.jar" - source = "$JBOSSAS500_SOURCES/profileservice/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/security/output/lib/jbosssx-server.jar" - source = "$JBOSSAS500_SOURCES/security/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/security/output/lib/jbosssx-as-client.jar" - source = "$JBOSSAS500_SOURCES/security/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/server/output/lib/jmx-adaptor-plugin.jar" - source = "$JBOSSAS500_SOURCES/server/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/server/output/lib/jboss-minimal.jar" - source = "$JBOSSAS500_SOURCES/server/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/server/output/lib/jboss-client.jar" - source = "$JBOSSAS500_SOURCES/server/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/server/output/lib/shutdown.jar" - source = "$JBOSSAS500_SOURCES/server/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/server/output/lib/jboss.jar" - source = "$JBOSSAS500_SOURCES/server/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/server/output/lib/testsuite-support.jar" - source = "$JBOSSAS500_SOURCES/server/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/server/output/lib/verifier.jar" - source = "$JBOSSAS500_SOURCES/server/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/server/output/lib/jmx-invoker-adaptor-client.jar" - source = "$JBOSSAS500_SOURCES/server/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/spring-int/output/lib/jboss-spring.jar" - source = "$JBOSSAS500_SOURCES/spring-int/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/system/output/lib/jboss-system.jar" - source = "$JBOSSAS500_SOURCES/system/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/system/output/lib/jboss-system-client.jar" - source = "$JBOSSAS500_SOURCES/system/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/system-jmx/output/lib/jboss-system-jmx.jar" - source = "$JBOSSAS500_SOURCES/system-jmx/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/system-jmx/output/lib/jboss-system-jmx-client.jar" - source = "$JBOSSAS500_SOURCES/system-jmx/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/tomcat/output/deploy/jboss-web.deployer/jboss-web-deployer.jar" - source = "$JBOSSAS500_SOURCES/tomcat/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/tomcat/output/deploy/jbossweb.sar/jboss-web-service.jar" - source = "$JBOSSAS500_SOURCES/tomcat/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/deployers/seam.deployer/jboss-seam-int-microcontainer.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/deployers/bsh.deployer/bsh-deployer.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/lib/scheduler-plugin-example.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/lib/jboss-samlsso.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/lib/hsqldb-plugin.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/lib/statscollector.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/lib/jboss-srp-client.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/lib/process-plugin.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/lib/derby-plugin.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/lib/hsqldb.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/lib/counter-plugin.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/lib/jboss-srp.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/lib/autonumber-plugin.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/lib/properties-plugin.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/lib/jbossjmx-ant.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/lib/mail-plugin.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/lib/logging-monitor.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/lib/deployment-service.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/lib/jboss-bindingservice.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/lib/jboss-bean-deployer.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/lib/jboss-monitoring.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/lib/scheduler-plugin.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/lib/snmp-adaptor.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - <archive - path = "$JBOSSAS500_SOURCES/varia/output/lib/xmlentitymgr.jar" - source = "$JBOSSAS500_SOURCES/varia/src/main" - /> - </library> -</eclipse-userlibraries> Deleted: framework/trunk/eclipse/JBossWSCheckStyle.xml =================================================================== --- framework/trunk/eclipse/JBossWSCheckStyle.xml 2009-10-15 22:54:22 UTC (rev 10917) +++ framework/trunk/eclipse/JBossWSCheckStyle.xml 2009-10-15 22:57:15 UTC (rev 10918) @@ -1,154 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - This configuration file was written by the eclipse-cs plugin configuration editor ---> -<!-- - Checkstyle-Configuration: JBossWS Checks - Description: JBossWS Java Coding Convention Checks ---> -<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"> -<module name="Checker"> - <property name="severity" value="warning"/> - <module name="TreeWalker"> - <module name="ModifierOrder"/> - <module name="RedundantModifier"/> - <module name="AnonInnerLength"/> - <module name="ExecutableStatementCount"> - <property name="max" value="60"/> - <property name="tokens" value="INSTANCE_INIT,STATIC_INIT,METHOD_DEF,CTOR_DEF"/> - </module> - <module name="FileLength"> - <property name="max" value="1000"/> - </module> - <module name="LineLength"> - <property name="max" value="120"/> - <property name="tabWidth" value="4"/> - </module> - <module name="MethodLength"/> - <module name="ParameterNumber"/> - <module name="AvoidStarImport"/> - <module name="IllegalImport"/> - <module name="ImportOrder"/> - <module name="RedundantImport"/> - <module name="UnusedImports"/> - <module name="AbstractClassName"/> - <module name="ConstantName"/> - <module name="LocalFinalVariableName"/> - <module name="LocalVariableName"/> - <module name="MemberName"/> - <module name="MethodName"/> - <module name="PackageName"/> - <module name="ParameterName"/> - <module name="StaticVariableName"/> - <module name="TypeName"/> - <module name="CovariantEquals"/> - <module name="DefaultComesLast"/> - <module name="DeclarationOrder"/> - <module name="DoubleCheckedLocking"/> - <module name="EqualsHashCode"/> - <module name="ExplicitInitialization"/> - <module name="FallThrough"/> - <module name="FinalLocalVariable"/> - <module name="HiddenField"/> - <module name="IllegalInstantiation"/> - <module name="IllegalThrows"/> - <module name="IllegalType"> - <property name="tokens" value="METHOD_DEF,PARAMETER_DEF"/> - </module> - <module name="InnerAssignment"/> - <module name="JUnitTestCase"/> - <module name="MagicNumber"> - <property name="ignoreNumbers" value="-1, 0, 1"/> - </module> - <module name="MissingCtor"/> - <module name="MissingSwitchDefault"/> - <module name="ModifiedControlVariable"/> - <module name="MultipleStringLiterals"/> - <module name="MultipleVariableDeclarations"/> - <module name="NestedIfDepth"/> - <module name="NestedTryDepth"/> - <module name="PackageDeclaration"/> - <module name="ParameterAssignment"/> - <module name="RedundantThrows"> - <property name="logLoadErrors" value="true"/> - <property name="suppressLoadErrors" value="true"/> - </module> - <module name="RequireThis"/> - <module name="ReturnCount"> - <property name="max" value="5"/> - </module> - <module name="SimplifyBooleanExpression"/> - <module name="SimplifyBooleanReturn"/> - <module name="StringLiteralEquality"/> - <module name="SuperClone"/> - <module name="SuperFinalize"/> - <module name="ArrayTrailingComma"/> - <module name="UnnecessaryParentheses"/> - <module name="JUnitTestCase"/> - <module name="DesignForExtension"/> - <module name="FinalClass"/> - <module name="HideUtilityClassConstructor"/> - <module name="InterfaceIsType"/> - <module name="ThrowsCount"/> - <module name="VisibilityModifier"/> - <module name="MutableException"/> - <module name="EmptyBlock"/> - <module name="LeftCurly"> - <property name="option" value="nl"/> - <property name="maxLineLength" value="120"/> - </module> - <module name="RightCurly"> - <property name="option" value="alone"/> - </module> - <module name="EmptyForInitializerPad"> - <property name="option" value="space"/> - </module> - <module name="EmptyForIteratorPad"> - <property name="option" value="space"/> - </module> - <module name="NoWhitespaceAfter"/> - <module name="NoWhitespaceBefore"/> - <module name="OperatorWrap"> - <property name="option" value="eol"/> - <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_INSTANCEOF,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,SL,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN"/> - </module> - <module name="MethodParamPad"> - <property name="allowLineBreaks" value="true"/> - </module> - <module name="ParenPad"> - <property name="option" value="space"/> - </module> - <module name="TabCharacter"/> - <module name="TypecastParenPad"> - <property name="option" value="space"/> - <property name="tokens" value="RPAREN,TYPECAST"/> - </module> - <module name="WhitespaceAround"> - <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,GENERIC_START,GENERIC_END,TYPE_EXTENSION_AND,WILDCARD_TYPE"/> - </module> - <module name="NeedBraces"/> - <module name="WhitespaceAfter"/> - <module name="BooleanExpressionComplexity"/> - <module name="ClassDataAbstractionCoupling"/> - <module name="ClassFanOutComplexity"/> - <module name="CyclomaticComplexity"/> - <module name="JavaNCSS"/> - <module name="NPathComplexity"/> - <module name="UncommentedMain"/> - <module name="TodoComment"/> - <module name="TrailingComment"/> - <module name="Indentation"/> - <module name="FinalParameters"/> - <module name="ArrayTypeStyle"/> - <module name="JavadocMethod"> - <property name="allowUndeclaredRTE" value="true"/> - <property name="logLoadErrors" value="true"/> - </module> - <module name="JavadocStyle"/> - <module name="JavadocType"/> - <module name="JavadocVariable"/> - <module name="WriteTag"/> - </module> - <module name="NewlineAtEndOfFile"/> - <module name="PackageHtml"/> -</module> Deleted: framework/trunk/eclipse/JBossWSCodeStyle.xml =================================================================== --- framework/trunk/eclipse/JBossWSCodeStyle.xml 2009-10-15 22:54:22 UTC (rev 10917) +++ framework/trunk/eclipse/JBossWSCodeStyle.xml 2009-10-15 22:57:15 UTC (rev 10918) @@ -1,251 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<profiles version="10"> -<profile name="JBossWSCodeStyle" version="10"> -<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="next_line"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="next_line"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="next_line"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="next_line"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="next_line"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line"/> -<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="next_line"/> -<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_comments" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/> -<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/> -<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/> -<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="3"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/> -<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="168"/> -<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/> -<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/> -<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/> -<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/> -<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="3"/> -<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/> -</profile> -</profiles> Copied: framework/trunk/eclipse/jboss-format.xml (from rev 10879, framework/branches/ropalka/eclipse/jboss-format.xml) =================================================================== --- framework/trunk/eclipse/jboss-format.xml (rev 0) +++ framework/trunk/eclipse/jboss-format.xml 2009-10-15 22:57:15 UTC (rev 10918) @@ -0,0 +1,187 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Downloaded JBoss Eclipse Format from http://docs.jboss.org/process-guide/en/html/coding.html --> +<profiles version="6"> +<profile name="JBoss" version="6"> +<setting id="comment_clear_blank_lines" value="false"/> +<setting id="comment_format_comments" value="false"/> +<setting id="comment_format_header" value="false"/> +<setting id="comment_format_html" value="true"/> +<setting id="comment_format_source_code" value="true"/> +<setting id="comment_indent_parameter_description" value="true"/> +<setting id="comment_indent_root_tags" value="true"/> +<setting id="comment_line_length" value="80"/> +<setting id="comment_new_line_for_parameter" value="true"/> +<setting id="comment_separate_root_tags" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="52"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="48"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="64"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="64"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/> +<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="next_line"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="next_line"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="next_line"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="next_line"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line"/> +<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="next_line"/> +<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/> +<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/> +<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/> +<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/> +<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/> +<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/> +<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="false"/> +<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/> +<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="3"/> +</profile> +</profiles> Copied: framework/trunk/eclipse/jboss-style.xml (from rev 10879, framework/branches/ropalka/eclipse/jboss-style.xml) =================================================================== --- framework/trunk/eclipse/jboss-style.xml (rev 0) +++ framework/trunk/eclipse/jboss-style.xml 2009-10-15 22:57:15 UTC (rev 10918) @@ -0,0 +1,148 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + This configuration file was written by the eclipse-cs plugin configuration editor +--> +<!-- + Checkstyle-Configuration: jboss-checkstyle + Description: none +--> +<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"> +<module name="Checker"> + <property name="severity" value="warning"/> + <module name="TreeWalker"> + <module name="ModifierOrder"/> + <module name="RedundantModifier"/> + <module name="AnonInnerLength"/> + <module name="ExecutableStatementCount"> + <property name="max" value="60"/> + <property name="tokens" value="INSTANCE_INIT,STATIC_INIT,METHOD_DEF,CTOR_DEF"/> + </module> + <module name="LineLength"> + <property name="max" value="168"/> + <property name="tabWidth" value="3"/> + </module> + <module name="MethodLength"/> + <module name="ParameterNumber"/> + <module name="AvoidStarImport"/> + <module name="IllegalImport"/> + <module name="ImportOrder"/> + <module name="RedundantImport"/> + <module name="UnusedImports"/> + <module name="AbstractClassName"/> + <module name="ConstantName"/> + <module name="LocalFinalVariableName"/> + <module name="LocalVariableName"/> + <module name="MemberName"/> + <module name="MethodName"/> + <module name="PackageName"/> + <module name="ParameterName"/> + <module name="StaticVariableName"/> + <module name="TypeName"/> + <module name="CovariantEquals"/> + <module name="DefaultComesLast"/> + <module name="DeclarationOrder"/> + <module name="DoubleCheckedLocking"/> + <module name="EqualsHashCode"/> + <module name="ExplicitInitialization"/> + <module name="FallThrough"/> + <module name="FinalLocalVariable"/> + <module name="IllegalInstantiation"/> + <module name="IllegalType"> + <property name="tokens" value="METHOD_DEF,PARAMETER_DEF"/> + </module> + <module name="InnerAssignment"/> + <module name="MagicNumber"> + <property name="ignoreNumbers" value="-1, 0, 1"/> + </module> + <module name="MissingCtor"/> + <module name="MissingSwitchDefault"/> + <module name="ModifiedControlVariable"/> + <module name="MultipleStringLiterals"/> + <module name="MultipleVariableDeclarations"/> + <module name="NestedIfDepth"/> + <module name="NestedTryDepth"/> + <module name="PackageDeclaration"/> + <module name="ParameterAssignment"/> + <module name="RedundantThrows"> + <property name="logLoadErrors" value="true"/> + <property name="suppressLoadErrors" value="true"/> + </module> + <module name="RequireThis"/> + <module name="ReturnCount"> + <property name="max" value="5"/> + </module> + <module name="SimplifyBooleanExpression"/> + <module name="SimplifyBooleanReturn"/> + <module name="StringLiteralEquality"/> + <module name="SuperClone"/> + <module name="SuperFinalize"/> + <module name="ArrayTrailingComma"/> + <module name="UnnecessaryParentheses"/> + <module name="DesignForExtension"/> + <module name="FinalClass"/> + <module name="HideUtilityClassConstructor"/> + <module name="InterfaceIsType"/> + <module name="ThrowsCount"/> + <module name="VisibilityModifier"/> + <module name="MutableException"/> + <module name="EmptyBlock"/> + <module name="LeftCurly"> + <property name="option" value="nl"/> + <property name="maxLineLength" value="120"/> + </module> + <module name="RightCurly"> + <property name="option" value="alone"/> + </module> + <module name="EmptyForInitializerPad"> + <property name="option" value="space"/> + </module> + <module name="EmptyForIteratorPad"> + <property name="option" value="space"/> + </module> + <module name="NoWhitespaceAfter"/> + <module name="NoWhitespaceBefore"/> + <module name="OperatorWrap"> + <property name="option" value="eol"/> + <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_INSTANCEOF,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,SL,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN"/> + </module> + <module name="MethodParamPad"> + <property name="allowLineBreaks" value="true"/> + </module> + <module name="TabCharacter"/> + <module name="TypecastParenPad"> + <property name="tokens" value="RPAREN,TYPECAST"/> + </module> + <module name="WhitespaceAround"> + <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND"/> + </module> + <module name="NeedBraces"/> + <module name="WhitespaceAfter"> + <property name="tokens" value="COMMA,SEMI"/> + </module> + <module name="BooleanExpressionComplexity"/> + <module name="ClassDataAbstractionCoupling"/> + <module name="ClassFanOutComplexity"/> + <module name="CyclomaticComplexity"/> + <module name="JavaNCSS"/> + <module name="NPathComplexity"/> + <module name="UncommentedMain"/> + <module name="TodoComment"/> + <module name="TrailingComment"/> + <module name="Indentation"> + <property name="basicOffset" value="3"/> + <property name="caseIndent" value="3"/> + </module> + <module name="FinalParameters"/> + <module name="ArrayTypeStyle"/> + <module name="JavadocMethod"> + <property name="allowUndeclaredRTE" value="true"/> + <property name="logLoadErrors" value="true"/> + </module> + <module name="JavadocStyle"/> + <module name="JavadocType"/> + <module name="JavadocVariable"/> + <module name="WriteTag"/> + <module name="SuperFinalize"/> + </module> + <module name="NewlineAtEndOfFile"/> +</module> Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2009-10-15 22:54:22 UTC (rev 10917) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProvider.java 2009-10-15 22:57:15 UTC (rev 10918) @@ -21,15 +21,14 @@ */ package org.jboss.wsf.framework; -import org.jboss.logging.Logger; import org.jboss.wsf.framework.deployment.DefaultDeploymentAspectManagerFactory; import org.jboss.wsf.framework.deployment.DefaultDeploymentModelFactory; import org.jboss.wsf.framework.deployment.DefaultLifecycleHandlerFactory; import org.jboss.wsf.framework.http.DefaultHttpContextFactory; -import org.jboss.wsf.framework.http.DefaultHttpServerFactory; import org.jboss.wsf.framework.invocation.DefaultResourceInjectorFactory; -import org.jboss.wsf.framework.management.ServerConfigFactoryImpl; import org.jboss.wsf.framework.management.DefaultEndpointMetricsFactory; +import org.jboss.wsf.framework.management.DefaultEndpointRegistryFactory; +import org.jboss.wsf.framework.security.DefaultSecurityAdapterFactory; import org.jboss.wsf.framework.serviceref.DefaultServiceRefHandlerFactory; import org.jboss.wsf.framework.serviceref.DefaultServiceRefMetaDataParserFactory; import org.jboss.wsf.spi.SPIProvider; @@ -38,128 +37,87 @@ import org.jboss.wsf.spi.deployment.DeploymentModelFactory; import org.jboss.wsf.spi.deployment.LifecycleHandlerFactory; import org.jboss.wsf.spi.http.HttpContextFactory; -import org.jboss.wsf.spi.http.HttpServerFactory; -import org.jboss.wsf.spi.invocation.InvocationHandlerFactory; -import org.jboss.wsf.spi.invocation.RequestHandlerFactory; import org.jboss.wsf.spi.invocation.ResourceInjectorFactory; import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; -import org.jboss.wsf.spi.invocation.WebServiceContextFactory; import org.jboss.wsf.spi.management.EndpointMetricsFactory; import org.jboss.wsf.spi.management.EndpointRegistryFactory; -import org.jboss.wsf.spi.management.ServerConfigFactory; -import org.jboss.wsf.spi.management.StackConfigFactory; import org.jboss.wsf.spi.metadata.j2ee.serviceref.ServiceRefMetaDataParserFactory; -import org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory; import org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory; import org.jboss.wsf.spi.util.ServiceLoader; /** - * @author Thomas.Diesler(a)jboss.com - * @since 13-Aug-2007 + * @author <a href="mailto:tdiesler@redhat.com">Thomas Diesler</a> + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ class DefaultSPIProvider extends SPIProvider { - // provide logging - private static final Logger log = Logger.getLogger(DefaultSPIProvider.class); /** * Gets the specified SPI. */ public <T> T getSPI(Class<T> spiType) { - boolean debugEnabled = log.isDebugEnabled(); - if (debugEnabled) - log.debug("provide SPI '" + spiType + "'"); - T returnType = null; - // SPI provided by framework, default that can be overridden - + // SPIs provided by framework, defaults can be overridden if (DeploymentAspectManagerFactory.class.equals(spiType)) { - returnType = (T)loadService(spiType, DefaultDeploymentAspectManagerFactory.class.getName()); + returnType = loadService(spiType, DefaultDeploymentAspectManagerFactory.class); } if (DeploymentModelFactory.class.equals(spiType)) { - returnType = (T)loadService(spiType, DefaultDeploymentModelFactory.class.getName()); + returnType = loadService(spiType, DefaultDeploymentModelFactory.class); } else if (EndpointMetricsFactory.class.equals(spiType)) { - returnType = (T)loadService(spiType, DefaultEndpointMetricsFactory.class.getName()); + returnType = loadService(spiType, DefaultEndpointMetricsFactory.class); } else if (HttpContextFactory.class.equals(spiType)) { - returnType = (T)loadService(spiType, DefaultHttpContextFactory.class.getName()); + returnType = loadService(spiType, DefaultHttpContextFactory.class); } - else if (HttpServerFactory.class.equals(spiType)) - { - returnType = (T)loadService(spiType, DefaultHttpServerFactory.class.getName()); - } else if (LifecycleHandlerFactory.class.equals(spiType)) { - returnType = (T)loadService(spiType, DefaultLifecycleHandlerFactory.class.getName()); + returnType = loadService(spiType, DefaultLifecycleHandlerFactory.class); } else if (ResourceInjectorFactory.class.equals(spiType)) { - returnType = (T)loadService(spiType, DefaultResourceInjectorFactory.class.getName()); + returnType = loadService(spiType, DefaultResourceInjectorFactory.class); } else if (ServiceRefHandlerFactory.class.equals(spiType)) { - returnType = (T)loadService(spiType, DefaultServiceRefHandlerFactory.class.getName()); + returnType = loadService(spiType, DefaultServiceRefHandlerFactory.class); } else if (ServiceRefMetaDataParserFactory.class.equals(spiType)) { - returnType = (T)loadService(spiType, DefaultServiceRefMetaDataParserFactory.class.getName()); + returnType = loadService(spiType, DefaultServiceRefMetaDataParserFactory.class); } - - // SPI provided by either container or stack integration - - else if (StackConfigFactory.class.equals(spiType)) + else if (SecurityAdaptorFactory.class.equals(spiType)) { - returnType = (T)loadService(spiType, null); + returnType = loadService(spiType, DefaultSecurityAdapterFactory.class); } - else if (ServerConfigFactory.class.equals(spiType)) - { - returnType = (T)loadService(spiType, ServerConfigFactoryImpl.class.getName()); - } else if (EndpointRegistryFactory.class.equals(spiType)) { - returnType = (T)loadService(spiType, null); + returnType = loadService(spiType, DefaultEndpointRegistryFactory.class); } - else if (InvocationHandlerFactory.class.equals(spiType)) + else { + // SPI provided by either container or stack integration that has no default implementation returnType = (T)loadService(spiType, null); } - else if (RequestHandlerFactory.class.equals(spiType)) - { - returnType = (T)loadService(spiType, null); - } - else if (SecurityAdaptorFactory.class.equals(spiType)) - { - returnType = (T)loadService(spiType, null); - } - else if (ServiceRefBinderFactory.class.equals(spiType)) - { - returnType = (T)loadService(spiType, null); - } - else if (WebServiceContextFactory.class.equals(spiType)) - { - returnType = (T)loadService(spiType, null); - } if (returnType == null) throw new WSFException("Failed to provide SPI '" + spiType + "'"); - // help debugging - if (debugEnabled) - log.debug(spiType + " Implementation: " + returnType); - return returnType; } // Load SPI implementation through ServiceLoader - private <T> T loadService(Class<T> spiType, String defaultImpl) + @SuppressWarnings("unchecked") + private <T> T loadService(Class<T> spiType, Class<?> defaultImpl) { - return (T)ServiceLoader.loadService(spiType.getName(), defaultImpl); + final String defaultImplName = defaultImpl != null ? defaultImpl.getName() : null; + return (T)ServiceLoader.loadService(spiType.getName(), defaultImplName); } + } Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2009-10-15 22:54:22 UTC (rev 10917) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2009-10-15 22:57:15 UTC (rev 10918) @@ -25,13 +25,24 @@ import org.jboss.wsf.spi.SPIProviderResolver; /** - * @author Heiko.Braun(a)jboss.com - * Created: Jul 18, 2007 + * TODO: javadoc + * + * @author <a href="mailto:hbraun@redhat.com">Heiko Braun</a> + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> */ -public class DefaultSPIProviderResolver extends SPIProviderResolver +public final class DefaultSPIProviderResolver extends SPIProviderResolver { + + private static final SPIProvider SPI_PROVIDER = new DefaultSPIProvider(); + + public DefaultSPIProviderResolver() + { + super(); + } + public SPIProvider getProvider() { - return new DefaultSPIProvider(); + return DefaultSPIProviderResolver.SPI_PROVIDER; } + } Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeploymentAspectManagerFactory.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeploymentAspectManagerFactory.java 2009-10-15 22:54:22 UTC (rev 10917) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeploymentAspectManagerFactory.java 2009-10-15 22:57:15 UTC (rev 10918) @@ -21,8 +21,6 @@ */ package org.jboss.wsf.framework.deployment; -import org.jboss.logging.Logger; -import org.jboss.wsf.common.KernelAwareSPIFactory; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspectManager; import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory; @@ -34,31 +32,19 @@ * @see org.jboss.wsf.framework.deployment.DeploymentAspectInstaller * * @author Heiko.Braun(a)jboss.com - * Created: Jul 20, 2007 */ public class DefaultDeploymentAspectManagerFactory extends DeploymentAspectManagerFactory { - private static final Logger log = Logger.getLogger(DefaultDeploymentAspectManagerFactory.class); + // TODO: review this class methods, maybe only one method getDeploymentAspectManager() will be sufficient public DeploymentAspectManager getDeploymentAspectManager(Deployment.DeploymentType deploymentType) { - String beanName; - - if (deploymentType.toString().indexOf("EJB") != -1) - { - beanName = "WSDeploymentAspectManagerEJB"; - } - else - { - beanName = "WSDeploymentAspectManagerJSE"; - } - return getDeploymentAspectManager(beanName); + throw new UnsupportedOperationException(); } public DeploymentAspectManager getDeploymentAspectManager(String beanName) { - if (log.isDebugEnabled()) - log.debug("DeploymentAspectManager for: " + beanName); - return new KernelAwareSPIFactory().getKernelProvidedSPI(beanName, DeploymentAspectManager.class); + throw new UnsupportedOperationException(); } + } Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java 2009-10-15 22:54:22 UTC (rev 10917) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/deployment/EndpointAddressDeploymentAspect.java 2009-10-15 22:57:15 UTC (rev 10918) @@ -53,13 +53,22 @@ if (contextRoot == null) throw new IllegalStateException("Cannot obtain context root"); - SPIProvider provider = SPIProviderResolver.getInstance().getProvider(); - ServerConfigFactory spi = provider.getSPI(ServerConfigFactory.class); - ServerConfig serverConfig = spi.getServerConfig(); + // TODO: remove this hack - review API + String protocol = (String)dep.getService().getProperty("protocol"); + String host = (String)dep.getService().getProperty("host"); + Integer port = (Integer)dep.getService().getProperty("port"); + Integer securePort = null; - String host = serverConfig.getWebServiceHost(); - int port = serverConfig.getWebServicePort(); - int securePort = serverConfig.getWebServiceSecurePort(); + if (protocol == null) + { + SPIProvider provider = SPIProviderResolver.getInstance().getProvider(); + ServerConfigFactory spi = provider.getSPI(ServerConfigFactory.class); + ServerConfig serverConfig = spi.getServerConfig(); + + host = serverConfig.getWebServiceHost(); + port = serverConfig.getWebServicePort(); + securePort = serverConfig.getWebServiceSecurePort(); + } for (Endpoint ep : dep.getService().getEndpoints()) { boolean confidential = isConfidentialTransportGuarantee(dep, ep); @@ -72,7 +81,7 @@ if (urlPattern.endsWith("/*")) urlPattern = urlPattern.substring(0, urlPattern.length() - 2); - String protocol = confidential ? "https://" : "http://"; + protocol = confidential ? "https://" : "http://"; ep.setAddress(protocol + hostAndPort + contextRoot + urlPattern); } } Deleted: framework/trunk/src/main/java/org/jboss/wsf/framework/http/DefaultHttpServerFactory.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/http/DefaultHttpServerFactory.java 2009-10-15 22:54:22 UTC (rev 10917) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/http/DefaultHttpServerFactory.java 2009-10-15 22:57:15 UTC (rev 10918) @@ -1,41 +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.wsf.framework.http; - -import org.jboss.wsf.common.KernelAwareSPIFactory; -import org.jboss.wsf.spi.http.HttpServer; -import org.jboss.wsf.spi.http.HttpServerFactory; - -/** - * A factory for an abstract HTTP Context - * - * @author Thomas.Diesler(a)jboss.org - * @since 07-Jul-2006 - */ -public class DefaultHttpServerFactory extends HttpServerFactory -{ - @Override - public HttpServer getHttpServer() - { - return new KernelAwareSPIFactory().getKernelProvidedSPI(HttpServer.BEAN_NAME, HttpServer.class); - } -} Copied: framework/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java (from rev 10879, framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java) =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java (rev 0) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistryFactory.java 2009-10-15 22:57:15 UTC (rev 10918) @@ -0,0 +1,65 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, 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.framework.management; + +import org.jboss.wsf.spi.SPIProvider; +import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.ioc.IoCContainerProxy; +import org.jboss.wsf.spi.ioc.IoCContainerProxyFactory; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointRegistryFactory; + +/** + * Retrieves registry from MC kernel. + * + * @author <a href="mailto:hbraun@redhat.com">Heiko Braun</a> + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public final class DefaultEndpointRegistryFactory extends EndpointRegistryFactory +{ + + /** The bean name in the kernel registry. */ + private static final String BEAN_NAME = "WSEndpointRegistry"; + + /** + * Constructor. + */ + public DefaultEndpointRegistryFactory() + { + super(); + } + + /** + * Returns endpoint registry registered in MC kernel. + * + * @return endpoint registry + */ + public EndpointRegistry getEndpointRegistry() + { + final SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); + final IoCContainerProxyFactory iocContainerFactory = spiProvider.getSPI(IoCContainerProxyFactory.class); + final IoCContainerProxy iocContainer = iocContainerFactory.getContainer(); + + return iocContainer.getBean(DefaultEndpointRegistryFactory.BEAN_NAME, EndpointRegistry.class); + } + +} Modified: framework/trunk/src/main/java/org/jboss/wsf/framework/management/MBeanServerLocator.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/management/MBeanServerLocator.java 2009-10-15 22:54:22 UTC (rev 10917) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/MBeanServerLocator.java 2009-10-15 22:57:15 UTC (rev 10918) @@ -21,40 +21,28 @@ */ package org.jboss.wsf.framework.management; -import java.util.Iterator; - import javax.management.MBeanServer; -import javax.management.MBeanServerFactory; /** * Locate the single instance of the MBeanServer * * @author Thomas.Diesler(a)jboss.org - * @since 30-Jul-2007 */ -public class MBeanServerLocator +public final class MBeanServerLocator { - private MBeanServer mbeanServer; + + private final MBeanServer mbeanServer; - public MBeanServer getMbeanServer() + public MBeanServerLocator(final MBeanServer mbeanServer) { - // In jboss-4.2 the MBeanServer cannot be injected - if (mbeanServer == null) - { - for (Iterator i = MBeanServerFactory.findMBeanServer(null).iterator(); i.hasNext();) - { - mbeanServer = (MBeanServer)i.next(); - if (mbeanServer.getClass().getName().startsWith("org.jboss")) // JBWS-2580 - { - break; - } - } - } - return mbeanServer; + super(); + + this.mbeanServer = mbeanServer; } - public void setMbeanServer(MBeanServer mbeanServer) + public MBeanServer getMbeanServer() { - this.mbeanServer = mbeanServer; + return mbeanServer; } + } Deleted: framework/trunk/src/main/java/org/jboss/wsf/framework/management/ServerConfigFactoryImpl.java =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/management/ServerConfigFactoryImpl.java 2009-10-15 22:54:22 UTC (rev 10917) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/management/ServerConfigFactoryImpl.java 2009-10-15 22:57:15 UTC (rev 10918) @@ -1,42 +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.wsf.framework.management; - -import org.jboss.wsf.common.KernelAwareSPIFactory; -import org.jboss.wsf.spi.management.ServerConfig; -import org.jboss.wsf.spi.management.ServerConfigFactory; - -/** - * @author Heiko.Braun(a)jboss.com - * Created: Jul 23, 2007 - */ -public class ServerConfigFactoryImpl extends ServerConfigFactory -{ - public ServerConfig getServerConfig() - { - ServerConfig serverConfig = new KernelAwareSPIFactory().getKernelProvidedSPI(ServerConfig.BEAN_NAME, ServerConfig.class); - if (serverConfig == null) - throw new IllegalStateException("Cannot obtain ServerConfig for bean name: " + ServerConfig.BEAN_NAME); - - return serverConfig; - } -} Copied: framework/trunk/src/main/java/org/jboss/wsf/framework/security (from rev 10879, framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/security) Deleted: framework/trunk/src/main/java/org/jboss/wsf/framework/security/DefaultSecurityAdapterFactory.java =================================================================== --- framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/security/DefaultSecurityAdapterFactory.java 2009-10-09 13:17:05 UTC (rev 10879) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/security/DefaultSecurityAdapterFactory.java 2009-10-15 22:57:15 UTC (rev 10918) @@ -1,92 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2009, 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.framework.security; - -import java.security.Principal; - -import javax.security.auth.Subject; - -import org.jboss.wsf.spi.invocation.SecurityAdaptor; -import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; - -/** - * TODO: javadoc - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -public final class DefaultSecurityAdapterFactory extends SecurityAdaptorFactory -{ - - private static SecurityAdaptor SECURITY_ADAPTOR = new DefaultSecurityAdaptor(); - - /** - * Constructor. - */ - public DefaultSecurityAdapterFactory() - { - super(); - } - - /** - * Creates new security adapter instance. - * - * @return security adapter - */ - public SecurityAdaptor newSecurityAdapter() - { - return DefaultSecurityAdapterFactory.SECURITY_ADAPTOR; - } - - private static class DefaultSecurityAdaptor implements SecurityAdaptor - { - - private static ThreadLocal<Principal> principal = new ThreadLocal<Principal>(); - private static ThreadLocal<Object> credential = new ThreadLocal<Object>(); - - public Object getCredential() - { - return DefaultSecurityAdaptor.credential.get(); - } - - public Principal getPrincipal() - { - return DefaultSecurityAdaptor.principal.get(); - } - - public void pushSubjectContext(Subject subject, Principal principal, Object credential) - { - // does nothing - } - - public void setCredential(Object credential) - { - DefaultSecurityAdaptor.credential.set(credential); - } - - public void setPrincipal(Principal principal) - { - DefaultSecurityAdaptor.principal.set(principal); - } - - } - -} Copied: framework/trunk/src/main/java/org/jboss/wsf/framework/security/DefaultSecurityAdapterFactory.java (from rev 10879, framework/branches/ropalka/src/main/java/org/jboss/wsf/framework/security/DefaultSecurityAdapterFactory.java) =================================================================== --- framework/trunk/src/main/java/org/jboss/wsf/framework/security/DefaultSecurityAdapterFactory.java (rev 0) +++ framework/trunk/src/main/java/org/jboss/wsf/framework/security/DefaultSecurityAdapterFactory.java 2009-10-15 22:57:15 UTC (rev 10918) @@ -0,0 +1,92 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, 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.framework.security; + +import java.security.Principal; + +import javax.security.auth.Subject; + +import org.jboss.wsf.spi.invocation.SecurityAdaptor; +import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; + +/** + * TODO: javadoc + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public final class DefaultSecurityAdapterFactory extends SecurityAdaptorFactory +{ + + private static SecurityAdaptor SECURITY_ADAPTOR = new DefaultSecurityAdaptor(); + + /** + * Constructor. + */ + public DefaultSecurityAdapterFactory() + { + super(); + } + + /** + * Creates new security adapter instance. + * + * @return security adapter + */ + public SecurityAdaptor newSecurityAdapter() + { + return DefaultSecurityAdapterFactory.SECURITY_ADAPTOR; + } + + private static class DefaultSecurityAdaptor implements SecurityAdaptor + { + + private static ThreadLocal<Principal> principal = new ThreadLocal<Principal>(); + private static ThreadLocal<Object> credential = new ThreadLocal<Object>(); + + public Object getCredential() + { + return DefaultSecurityAdaptor.credential.get(); + } + + public Principal getPrincipal() + { + return DefaultSecurityAdaptor.principal.get(); + } + + public void pushSubjectContext(Subject subject, Principal principal, Object credential) + { + // does nothing + } + + public void setCredential(Object credential) + { + DefaultSecurityAdaptor.credential.set(credential); + } + + public void setPrincipal(Principal principal) + { + DefaultSecurityAdaptor.principal.set(principal); + } + + } + +} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint (from rev 10879, framework/branches/ropalka/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint) Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse (from rev 10879, framework/branches/ropalka/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse) Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointBean.java =================================================================== --- framework/branches/ropalka/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointBean.java 2009-10-09 13:17:05 UTC (rev 10879) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointBean.java 2009-10-15 22:57:15 UTC (rev 10918) @@ -1,53 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2009, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.endpoint.jse; - -import javax.jws.WebService; - -/** - * Endpoint implementation. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -@WebService -( - serviceName = "EndpointService", - endpointInterface = "org.jboss.test.ws.jaxws.endpoint.jse.EndpointInterface", - targetNamespace = "http://org.jboss.ws/jaxws/endpoint/jse/" -) -public class EndpointBean implements EndpointInterface -{ - - private int count; - - public String echo(String input) - { - count++; - return input; - } - - public int getCount() - { - return count; - } - -} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointBean.java (from rev 10879, framework/branches/ropalka/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointBean.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointBean.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointBean.java 2009-10-15 22:57:15 UTC (rev 10918) @@ -0,0 +1,53 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.endpoint.jse; + +import javax.jws.WebService; + +/** + * Endpoint implementation. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +@WebService +( + serviceName = "EndpointService", + endpointInterface = "org.jboss.test.ws.jaxws.endpoint.jse.EndpointInterface", + targetNamespace = "http://org.jboss.ws/jaxws/endpoint/jse/" +) +public class EndpointBean implements EndpointInterface +{ + + private int count; + + public String echo(String input) + { + count++; + return input; + } + + public int getCount() + { + return count; + } + +} Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointInterface.java =================================================================== --- framework/branches/ropalka/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointInterface.java 2009-10-09 13:17:05 UTC (rev 10879) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointInterface.java 2009-10-15 22:57:15 UTC (rev 10918) @@ -1,43 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2009, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.endpoint.jse; - -import java.rmi.Remote; -import java.rmi.RemoteException; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -/** - * Endpoint interface. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -@WebService(targetNamespace = "http://org.jboss.ws/jaxws/endpoint/jse/") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public interface EndpointInterface extends Remote -{ - - String echo(String input) throws RemoteException; - - public int getCount(); - -} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointInterface.java (from rev 10879, framework/branches/ropalka/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointInterface.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointInterface.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointInterface.java 2009-10-15 22:57:15 UTC (rev 10918) @@ -0,0 +1,43 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.endpoint.jse; + +import java.rmi.Remote; +import java.rmi.RemoteException; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +/** + * Endpoint interface. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +@WebService(targetNamespace = "http://org.jboss.ws/jaxws/endpoint/jse/") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public interface EndpointInterface extends Remote +{ + + String echo(String input) throws RemoteException; + + public int getCount(); + +} Deleted: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointTestCase.java =================================================================== --- framework/branches/ropalka/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointTestCase.java 2009-10-09 13:17:05 UTC (rev 10879) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointTestCase.java 2009-10-15 22:57:15 UTC (rev 10918) @@ -1,80 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2009, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.endpoint.jse; - -import java.net.URL; - -import javax.xml.namespace.QName; -import javax.xml.ws.Endpoint; -import javax.xml.ws.Service; -import javax.xml.ws.soap.SOAPBinding; - -import org.jboss.wsf.test.JBossWSTest; - -/** - * Tests JAXWS dynamic endpoint deployment in an JSE environment. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -public class EndpointTestCase extends JBossWSTest -{ - private static final int port = 8878; - - public void test() throws Exception - { - String publishURL1 = "http://" + getServerHost() + ":" + port + "/jaxws-endpoint1"; - Endpoint endpoint1 = publishEndpoint(new EndpointBean(), publishURL1); - - String publishURL2 = "http://" + getServerHost() + ":" + port + "/jaxws-endpoint2"; - Endpoint endpoint2 = publishEndpoint(new EndpointBean(), publishURL2); - - invokeEndpoint(publishURL1); - invokeEndpoint(publishURL2); - - endpoint1.stop(); - endpoint2.stop(); - } - - private Endpoint publishEndpoint(EndpointBean epImpl, String publishURL) - { - Endpoint endpoint = Endpoint.create(SOAPBinding.SOAP11HTTP_BINDING, epImpl); - endpoint.publish(publishURL); - return endpoint; - } - - private void invokeEndpoint(String publishURL) throws Exception - { - URL wsdlURL = new URL(publishURL + "?wsdl"); - QName qname = new QName("http://org.jboss.ws/jaxws/endpoint/jse/", "EndpointService"); - Service service = Service.create(wsdlURL, qname); - EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class); - - // Invoke the endpoint - String helloWorld = "Hello world!"; - assertEquals(0, port.getCount()); - Object retObj = port.echo(helloWorld); - assertEquals(helloWorld, retObj); - assertEquals(1, port.getCount()); - port.echo(helloWorld); - assertEquals(2, port.getCount()); - } -} Copied: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointTestCase.java (from rev 10879, framework/branches/ropalka/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointTestCase.java) =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointTestCase.java (rev 0) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpoint/jse/EndpointTestCase.java 2009-10-15 22:57:15 UTC (rev 10918) @@ -0,0 +1,80 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.endpoint.jse; + +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Endpoint; +import javax.xml.ws.Service; +import javax.xml.ws.soap.SOAPBinding; + +import org.jboss.wsf.test.JBossWSTest; + +/** + * Tests JAXWS dynamic endpoint deployment in an JSE environment. + * + * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> + */ +public class EndpointTestCase extends JBossWSTest +{ + private static final int port = 8878; + + public void test() throws Exception + { + String publishURL1 = "http://" + getServerHost() + ":" + port + "/jaxws-endpoint1"; + Endpoint endpoint1 = publishEndpoint(new EndpointBean(), publishURL1); + + String publishURL2 = "http://" + getServerHost() + ":" + port + "/jaxws-endpoint2"; + Endpoint endpoint2 = publishEndpoint(new EndpointBean(), publishURL2); + + invokeEndpoint(publishURL1); + invokeEndpoint(publishURL2); + + endpoint1.stop(); + endpoint2.stop(); + } + + private Endpoint publishEndpoint(EndpointBean epImpl, String publishURL) + { + Endpoint endpoint = Endpoint.create(SOAPBinding.SOAP11HTTP_BINDING, epImpl); + endpoint.publish(publishURL); + return endpoint; + } + + private void invokeEndpoint(String publishURL) throws Exception + { + URL wsdlURL = new URL(publishURL + "?wsdl"); + QName qname = new QName("http://org.jboss.ws/jaxws/endpoint/jse/", "EndpointService"); + Service service = Service.create(wsdlURL, qname); + EndpointInterface port = (EndpointInterface)service.getPort(EndpointInterface.class); + + // Invoke the endpoint + String helloWorld = "Hello world!"; + assertEquals(0, port.getCount()); + Object retObj = port.echo(helloWorld); + assertEquals(helloWorld, retObj); + assertEquals(1, port.getCount()); + port.echo(helloWorld); + assertEquals(2, port.getCount()); + } +} Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2009-10-15 22:54:22 UTC (rev 10917) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/PluginBase.java 2009-10-15 22:57:15 UTC (rev 10918) @@ -68,9 +68,9 @@ } if (list.contains(StackConfigurable.class.getName())) { - clazz.getMethod("setIntegrationNative", boolean.class).invoke(delegate, integrationNative); - clazz.getMethod("setIntegrationMetro", boolean.class).invoke(delegate, integrationMetro); - clazz.getMethod("setIntegrationCXF", boolean.class).invoke(delegate, integrationCXF); + clazz.getMethod("setIsNative", boolean.class).invoke(delegate, integrationNative); + clazz.getMethod("setIsMetro", boolean.class).invoke(delegate, integrationMetro); + clazz.getMethod("setIsCXF", boolean.class).invoke(delegate, integrationCXF); } } Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/StackConfigurable.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/StackConfigurable.java 2009-10-15 22:54:22 UTC (rev 10917) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/StackConfigurable.java 2009-10-15 22:57:15 UTC (rev 10918) @@ -23,9 +23,9 @@ public interface StackConfigurable { - public void setIntegrationNative(boolean integrationNative); + public void setIsNative(boolean integrationNative); - public void setIntegrationMetro(boolean integrationMetro); + public void setIsMetro(boolean integrationMetro); - public void setIntegrationCXF(boolean integrationCXF); + public void setIsCXF(boolean integrationCXF); } Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2009-10-15 22:54:22 UTC (rev 10917) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerPlugin.java 2009-10-15 22:57:15 UTC (rev 10918) @@ -240,7 +240,7 @@ System.out.println(messageOut); System.out.println("--- End captured output --"); - if (isIntegrationCXF()) + if (getIsCXF()) { assertTrue("Tools output not correctly redirected", messageOut.indexOf("wsdl2java -p org.jboss.test.ws.tools.testMessageStream") != -1); } @@ -281,7 +281,7 @@ //to run the wsimport tool in Native stack from a Surefire test (the jaxws classes are of course loaded from the included //jaxws source module and that causes the Sun's ParallelWorldClassLoader to throw an exception as EndpointReference //is not loaded from a jar resource) - if (!isIntegrationNative() || Boolean.getBoolean("binary.distribution")) + if (!getIsNative() || Boolean.getBoolean("binary.distribution")) { consumeWSDL(); ClassLoader loader = getArtefactClassLoader(); @@ -352,35 +352,32 @@ return loader; } - @Override - public boolean isIntegrationNative() + public boolean getIsNative() { return integrationNative; } - @Override - public boolean isIntegrationMetro() + public boolean getIsMetro() { return integrationMetro; } - @Override - public boolean isIntegrationCXF() + public boolean getIsCXF() { return integrationCXF; } - public void setIntegrationNative(boolean integrationNative) + public void setIsNative(boolean integrationNative) { this.integrationNative = integrationNative; } - public void setIntegrationMetro(boolean integrationMetro) + public void setIsMetro(boolean integrationMetro) { this.integrationMetro = integrationMetro; } - public void setIntegrationCXF(boolean integrationCXF) + public void setIsCXF(boolean integrationCXF) { this.integrationCXF = integrationCXF; }