[jboss-cvs] JBossAS SVN: r109879 - in branches/JBoss-AS-6.0.x-ipv6: build and 48 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 13 12:26:03 EST 2010
Author: rachmatowicz at jboss.com
Date: 2010-12-13 12:25:55 -0500 (Mon, 13 Dec 2010)
New Revision: 109879
Added:
branches/JBoss-AS-6.0.x-ipv6/connector/src/main/java/org/jboss/resource/deployers/DataSourceDeployerHelper.java
branches/JBoss-AS-6.0.x-ipv6/profileservice-client/
branches/JBoss-AS-6.0.x-ipv6/profileservice-client/pom.xml
branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/deployers/ExcludeArchiveMatcher.java
branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/bootstrap/BootstrapDomainMetaData.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/StatusBean.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/StatusCommonBusiness.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockConnection.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockDataSource.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockDriver.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJB.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJBLocal.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJBRemote.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestServlet.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/support/JCATestSupport.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/test/DataSourceDeployerTestCase.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/jca/dsdeployer/ear/
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/jca/dsdeployer/ear/application.xml
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/jca/dsdeployer/war/
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/jca/dsdeployer/war/web.xml
branches/JBoss-AS-6.0.x-ipv6/weld-int/deployer/src/main/java/org/jboss/weld/integration/injection/Jsr299InterceptorInjector.java
branches/JBoss-AS-6.0.x-ipv6/weld-int/deployer/src/main/java/org/jboss/weld/integration/injection/Jsr299SimpleNonContextualInjector.java
Removed:
branches/JBoss-AS-6.0.x-ipv6/profileservice-client/pom.xml
branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/profile/plugins/
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockConnection.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockDataSource.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockDriver.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJB.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJBLocal.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJBRemote.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestServlet.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/jca/dsdeployer/ear/application.xml
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/jca/dsdeployer/war/web.xml
branches/JBoss-AS-6.0.x-ipv6/weld-int/deployer/src/main/java/org/jboss/weld/integration/injection/Jsr299Injector.java
Modified:
branches/JBoss-AS-6.0.x-ipv6/build/build.xml
branches/JBoss-AS-6.0.x-ipv6/cluster/src/resources/infinispan/cache-container-registry-jboss-beans.xml
branches/JBoss-AS-6.0.x-ipv6/component-matrix/pom.xml
branches/JBoss-AS-6.0.x-ipv6/connector/src/main/java/org/jboss/resource/adapter/jdbc/local/LocalManagedConnectionFactory.java
branches/JBoss-AS-6.0.x-ipv6/connector/src/main/java/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java
branches/JBoss-AS-6.0.x-ipv6/connector/src/main/java/org/jboss/resource/deployers/DataSourceDeployer.java
branches/JBoss-AS-6.0.x-ipv6/connector/src/main/java/org/jboss/resource/metadata/mcf/NonXADataSourceDeploymentMetaData.java
branches/JBoss-AS-6.0.x-ipv6/connector/src/resources/local-rar/META-INF/ra.xml
branches/JBoss-AS-6.0.x-ipv6/console/src/bin/twiddle.sh
branches/JBoss-AS-6.0.x-ipv6/ejb3/pom.xml
branches/JBoss-AS-6.0.x-ipv6/ejb3/src/main/java/org/jboss/as/ejb3/switchboard/resource/provider/EJBContextResource.java
branches/JBoss-AS-6.0.x-ipv6/ejb3/src/main/java/org/jboss/as/ejb3/switchboard/resource/provider/TimerServiceResource.java
branches/JBoss-AS-6.0.x-ipv6/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
branches/JBoss-AS-6.0.x-ipv6/embedded/
branches/JBoss-AS-6.0.x-ipv6/iiop/src/bin/runX.sh
branches/JBoss-AS-6.0.x-ipv6/main/src/bin/classpath.sh
branches/JBoss-AS-6.0.x-ipv6/main/src/bin/probe.sh
branches/JBoss-AS-6.0.x-ipv6/main/src/bin/run.sh
branches/JBoss-AS-6.0.x-ipv6/pom.xml
branches/JBoss-AS-6.0.x-ipv6/security/src/etc/bin/password_tool.sh
branches/JBoss-AS-6.0.x-ipv6/security/src/main/java/org/jboss/security/plugins/JaasSecurityDomain.java
branches/JBoss-AS-6.0.x-ipv6/security/src/main/java/org/jboss/security/plugins/JaasSecurityDomainMBean.java
branches/JBoss-AS-6.0.x-ipv6/security/src/main/java/org/jboss/security/ssl/DomainServerSocketFactory.java
branches/JBoss-AS-6.0.x-ipv6/server/src/bin/jboss_init_solaris.sh
branches/JBoss-AS-6.0.x-ipv6/server/src/bin/shutdown.sh
branches/JBoss-AS-6.0.x-ipv6/server/src/etc/conf/all/bootstrap/deployers.xml
branches/JBoss-AS-6.0.x-ipv6/server/src/etc/deployers/switchboard-jboss-beans.xml
branches/JBoss-AS-6.0.x-ipv6/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBRefResourceProvider.java
branches/JBoss-AS-6.0.x-ipv6/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java
branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/bootstrap/BasicProfileServiceBootstrap.java
branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/bootstrap/StaticBootstrapProfileFactory.java
branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/deployers/MainDeployerPlugin.java
branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/deployers/StructureMetaDataBuilder.java
branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/deployers/VDFDeploymentBuilder.java
branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/repository/LegacyProfileDeploymentFactory.java
branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/tools/LegacyDeploymentScannerAdapter.java
branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/tools/ProfileServiceToolsFacade.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/sections/jca.xml
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/CleanShutdownTestCase.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/AsyncBean.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/AsyncCommonBusiness.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/AsyncTesterBean.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/AsyncTesterCommonBusiness.java
branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/test/AsyncSessionBeanUnitTestCase.java
branches/JBoss-AS-6.0.x-ipv6/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
branches/JBoss-AS-6.0.x-ipv6/varia/src/assembly/deployment-service-sar.xml
branches/JBoss-AS-6.0.x-ipv6/varia/src/assembly/snmp-adaptor-sar.xml
branches/JBoss-AS-6.0.x-ipv6/webservices/pom.xml
branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java
branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilder.java
branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java
branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java
branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java
branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java
branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java
branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java
branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java
branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java
branches/JBoss-AS-6.0.x-ipv6/weld-int/deployer/pom.xml
branches/JBoss-AS-6.0.x-ipv6/weld-int/deployer/src/main/java/org/jboss/weld/integration/injection/Jsr299InjectorDeployer.java
Log:
Merge trunk interval (109714-109877) into ipv6 revision 109877
Modified: branches/JBoss-AS-6.0.x-ipv6/build/build.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/build/build.xml 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/build/build.xml 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1223,7 +1223,7 @@
<unjar src="${varia.module.output}/jboss-as-varia-persistent-service.sar" dest="${install.examples}/jmx/persistent-service.sar"/>
<mkdir dir="${install.examples.varia}/deployment-service"/>
- <copy file="${varia.module.output}/jboss-as-varia-deployment-service.sar"
+ <copy file="${varia.module.output}/jboss-as-varia-deployment-service-sar.sar"
tofile="${install.examples.varia}/deployment-service/deployment-service.sar"/>
<copy todir="${install.examples.varia}/deployment-service">
<fileset dir="${varia.module.output}/resources/services/deployment">
@@ -1263,7 +1263,7 @@
<!-- copy snmp-adaptor.sar unpacked to deploy -->
<mkdir dir="${install.server}/all/deploy/snmp-adaptor.sar"/>
- <unjar src="${varia.module.output}/jboss-as-varia-snmp-adaptor.sar"
+ <unjar src="${varia.module.output}/jboss-as-varia-snmp-adaptor-sar.sar"
dest="${install.server}/all/deploy/snmp-adaptor.sar">
<mapper type="glob" from="jboss-as-varia-*.jar" to="*.jar"/>
</unjar>
@@ -2043,6 +2043,7 @@
<fileset refid="org.jboss.ejb3.context:jboss-ejb3-context-base:jar"/>
<fileset refid="org.jboss.ejb3.context:jboss-ejb3-context-naming:jar"/>
<fileset refid="org.jboss.ejb3.context:jboss-ejb3-context-spi:jar"/>
+ <fileset refid="org.jboss.ejb3.effigy:jboss-ejb3-effigy-aop-int:jar"/>
<fileset refid="org.jboss.ejb3.effigy:jboss-ejb3-effigy-api:jar"/>
<fileset refid="org.jboss.ejb3.effigy:jboss-ejb3-effigy-common:jar"/>
<fileset refid="org.jboss.ejb3.effigy:jboss-ejb3-effigy-int2:jar"/>
@@ -2074,6 +2075,7 @@
<fileset refid="org.jboss.ejb3.singleton:jboss-ejb3-singleton-impl:jar"/>
<fileset refid="org.jboss.ejb3.singleton:jboss-ejb3-singleton-proxy-impl:jar"/>
<fileset refid="org.jboss.ejb3.singleton:jboss-ejb3-singleton-spi:jar"/>
+ <fileset refid="org.jboss.ejb3.sis:jboss-ejb3-sis:jar"/>
<fileset refid="org.jboss.ejb3.statefulcache:jboss-ejb3-statefulcache-ispn:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-impl:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-spi:jar"/>
Modified: branches/JBoss-AS-6.0.x-ipv6/cluster/src/resources/infinispan/cache-container-registry-jboss-beans.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/cluster/src/resources/infinispan/cache-container-registry-jboss-beans.xml 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/cluster/src/resources/infinispan/cache-container-registry-jboss-beans.xml 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="CacheContainerFactory" class="org.jboss.ha.ispn.DefaultCacheContainerFactory">
+ <constructor>
+ <parameter><inject bean="JChannelFactory"/></parameter>
+ <parameter><inject bean="JMXKernel" property="mbeanServer"/></parameter>
+ </constructor>
+ </bean>
+
<bean name="CacheContainerRegistry" class="org.jboss.ha.ispn.DefaultCacheContainerRegistry">
<constructor>
+ <parameter><inject bean="CacheContainerFactory"/></parameter>
<parameter>
- <bean name="CacheContainerFactory" class="org.jboss.ha.ispn.DefaultCacheContainerFactory">
+ <bean class="org.jboss.ha.ispn.config.xml.XMLCacheContainerRegistryConfigurationSource">
<constructor>
- <parameter><inject bean="JChannelFactory"/></parameter>
- <parameter><inject bean="JMXKernel" property="mbeanServer"/></parameter>
- </constructor>
- </bean>
- </parameter>
- <parameter>
- <bean name="CacheContainerRegistryConfigurationSource" class="org.jboss.ha.ispn.config.xml.XMLCacheContainerRegistryConfigurationSource">
- <constructor>
<!-- Location of infinispan configuration file -->
<parameter class="java.lang.String">infinispan-configs.xml</parameter>
</constructor>
Modified: branches/JBoss-AS-6.0.x-ipv6/component-matrix/pom.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/component-matrix/pom.xml 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/component-matrix/pom.xml 2010-12-13 17:25:55 UTC (rev 109879)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss</groupId>
<artifactId>jboss-parent</artifactId>
- <version>5</version>
+ <version>6-beta-1</version>
<relativePath />
</parent>
@@ -31,7 +31,8 @@
<!-- Properties -->
<properties>
- <version.apache.cxf>2.3.0</version.apache.cxf>
+ <version.apache.cxf>2.3.1</version.apache.cxf>
+ <version.apache.cxf.xjcplugins>2.3.0</version.apache.cxf.xjcplugins>
<version.apache.neethi>2.0.4</version.apache.neethi>
<version.apache.felix.log>1.0.0</version.apache.felix.log>
<version.apache.velocity>1.6.2</version.apache.velocity>
@@ -53,13 +54,13 @@
<version.jboss.jaxr>2.0.2</version.jboss.jaxr>
<version.jboss.jbossts>4.13.1.Final</version.jboss.jbossts>
<version.jboss.jbossws-native>3.4.0.CR3</version.jboss.jbossws-native>
- <version.jboss.jbossws-cxf>3.4.0.CR3</version.jboss.jbossws-cxf>
- <version.jboss.jbossws-common>1.4.1.CR3</version.jboss.jbossws-common>
+ <version.jboss.jbossws-cxf>3.4.1.CR1</version.jboss.jbossws-cxf>
+ <version.jboss.jbossws-common>1.4.1.CR4</version.jboss.jbossws-common>
<version.jboss.jbossws-framework>3.4.1.CR1</version.jboss.jbossws-framework>
<version.jboss.jbossws-spi>1.4.1.CR4</version.jboss.jbossws-spi>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
<version.jboss.jsf-deployer>1.0.3</version.jboss.jsf-deployer>
- <version.jboss.web>3.0.0-beta-7</version.jboss.web>
+ <version.jboss.web>3.0.0-CR1</version.jboss.web>
<version.jsr181.api>1.0-MR1</version.jsr181.api>
<version.junit>4.6</version.junit>
<version.ops4j.pax.web>0.7.2</version.ops4j.pax.web>
@@ -69,7 +70,7 @@
<version.org.hibernate.javax.persistence>1.0.0.Final</version.org.hibernate.javax.persistence>
<version.org.hibernate.legacy>4.0.2.GA</version.org.hibernate.legacy>
<version.org.hibernate.validator>4.1.0.Final</version.org.hibernate.validator>
- <version.org.infinispan>4.2.0.CR2</version.org.infinispan>
+ <version.org.infinispan>4.2.0.CR3</version.org.infinispan>
<version.org.jboss.aop>2.2.1.Alpha3</version.org.jboss.aop>
<version.org.jboss.aspects.currentinvocation>1.0.1</version.org.jboss.aspects.currentinvocation>
<version.org.jboss.aspects.remoting>1.0.1.GA</version.org.jboss.aspects.remoting>
@@ -86,7 +87,7 @@
<version.org.jboss.cluster.cache.ispn>1.0.0.CR8</version.org.jboss.cluster.cache.ispn>
<version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
<version.org.jboss.deployers>2.2.0.Alpha8</version.org.jboss.deployers>
- <version.org.jboss.ejb3.depchain>1.0.0-alpha-29</version.org.jboss.ejb3.depchain>
+ <version.org.jboss.ejb3.depchain>1.0.0-alpha-35</version.org.jboss.ejb3.depchain>
<!-- This to move into the EJB3 BOM -->
<version.org.jboss.ejb3.embedded>1.0.0-alpha-1</version.org.jboss.ejb3.embedded>
<version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
@@ -95,9 +96,9 @@
<version.org.jboss.interceptor>2.0.0.Alpha3</version.org.jboss.interceptor>
<version.org.jboss.integration>6.0.0.CR1</version.org.jboss.integration>
<version.org.jboss.javaee.specs.bom>1.0.0.CR1</version.org.jboss.javaee.specs.bom>
- <version.org.jboss.jbossxb>2.0.2.Beta9</version.org.jboss.jbossxb>
+ <version.org.jboss.jbossxb>2.0.2.GA</version.org.jboss.jbossxb>
<version.org.jboss.jopr>1.4.0.GA</version.org.jboss.jopr>
- <version.org.jboss.jpa.deployers>1.0.2-alpha-2</version.org.jboss.jpa.deployers>
+ <version.org.jboss.jpa.deployers>1.0.2-alpha-3</version.org.jboss.jpa.deployers>
<version.org.jboss.jpa.vfs3>1.0.2-alpha-2</version.org.jboss.jpa.vfs3>
<version.org.jboss.jpa.impl>2.0.0</version.org.jboss.jpa.impl>
<version.org.jboss.jpa.mcint>1.0.0-alpha-2</version.org.jboss.jpa.mcint>
@@ -107,20 +108,20 @@
<version.org.jboss.logging-service-metadata>1.0.0.CR9</version.org.jboss.logging-service-metadata>
<version.org.jboss.logmanager>1.2.0.CR8</version.org.jboss.logmanager>
<version.org.jboss.man>2.1.1.SP2</version.org.jboss.man>
- <version.managed.beans.depchain>1.0.0-alpha-3</version.managed.beans.depchain>
+ <version.managed.beans.depchain>1.0.0-alpha-5</version.managed.beans.depchain>
<version.org.jboss.marshalling>1.3.0.CR3</version.org.jboss.marshalling>
<version.org.jboss.mc-int>2.2.0.Alpha3</version.org.jboss.mc-int>
<version.org.jboss.mdr>2.2.0.Alpha3</version.org.jboss.mdr>
<version.org.jboss.metadata.client>2.0.0.Alpha2</version.org.jboss.metadata.client>
- <version.org.jboss.metadata.common>2.0.0.Alpha22</version.org.jboss.metadata.common>
+ <version.org.jboss.metadata.common>2.0.0.Alpha23</version.org.jboss.metadata.common>
<version.org.jboss.metadata.ear>2.0.0.Alpha4</version.org.jboss.metadata.ear>
- <version.org.jboss.metadata.ejb>2.0.0-alpha-25</version.org.jboss.metadata.ejb>
+ <version.org.jboss.metadata.ejb>2.0.0-alpha-26</version.org.jboss.metadata.ejb>
<version.org.jboss.metadata.rar>2.0.0.Alpha</version.org.jboss.metadata.rar>
<version.org.jboss.metadata.war>2.0.0.Alpha15</version.org.jboss.metadata.war>
<version.org.jboss.mod_cluster>1.1.0.Final</version.org.jboss.mod_cluster>
<version.org.jboss.mx>6.0.0.Beta5</version.org.jboss.mx>
<version.org.jboss.naming>5.0.5.Final</version.org.jboss.naming>
- <version.org.jboss.profileservice>0.1.0.Alpha1</version.org.jboss.profileservice>
+ <version.org.jboss.profileservice>0.2.1</version.org.jboss.profileservice>
<version.org.jboss.reflect>2.2.0.Alpha9</version.org.jboss.reflect>
<version.org.jboss.reloaded.naming>0.3.0</version.org.jboss.reloaded.naming>
<version.org.jboss.resteasy>2.1-beta-1</version.org.jboss.resteasy>
@@ -134,7 +135,7 @@
<version.org.jboss.shrinkwrap>1.0.0-alpha-11</version.org.jboss.shrinkwrap>
<version.org.jboss.slf4j>1.0.2.GA</version.org.jboss.slf4j>
<version.org.jboss.stdio>1.0.0.CR3</version.org.jboss.stdio>
- <version.org.jboss.switchboard.depchain>1.0.0-alpha-13</version.org.jboss.switchboard.depchain>
+ <version.org.jboss.switchboard.depchain>1.0.0-alpha-14</version.org.jboss.switchboard.depchain>
<version.org.jboss.threads>2.0.0.CR7</version.org.jboss.threads>
<version.org.jboss.threads-metadata>2.0.0.CR4</version.org.jboss.threads-metadata>
<version.org.jboss.vfs>3.0.0.CR5</version.org.jboss.vfs>
@@ -624,22 +625,22 @@
<dependency>
<groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-boolean</artifactId>
- <version>${version.apache.cxf}</version>
+ <version>${version.apache.cxf.xjcplugins}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-bug671</artifactId>
- <version>${version.apache.cxf}</version>
+ <version>${version.apache.cxf.xjcplugins}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-dv</artifactId>
- <version>${version.apache.cxf}</version>
+ <version>${version.apache.cxf.xjcplugins}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-ts</artifactId>
- <version>${version.apache.cxf}</version>
+ <version>${version.apache.cxf.xjcplugins}</version>
</dependency>
<dependency>
@@ -3213,6 +3214,24 @@
<groupId>org.jboss.man</groupId>
<artifactId>jboss-managed</artifactId>
<version>${version.org.jboss.man}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jbossman</groupId>
+ <artifactId>jboss-metatype</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -3225,6 +3244,14 @@
<artifactId>jboss-logging-spi</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-log4j</artifactId>
</exclusion>
Modified: branches/JBoss-AS-6.0.x-ipv6/connector/src/main/java/org/jboss/resource/adapter/jdbc/local/LocalManagedConnectionFactory.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/connector/src/main/java/org/jboss/resource/adapter/jdbc/local/LocalManagedConnectionFactory.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/connector/src/main/java/org/jboss/resource/adapter/jdbc/local/LocalManagedConnectionFactory.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -21,18 +21,21 @@
*/
package org.jboss.resource.adapter.jdbc.local;
-import org.jboss.resource.adapter.jdbc.URLSelectorStrategy;
+import java.beans.PropertyEditor;
+import java.beans.PropertyEditorManager;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import java.sql.Connection;
import java.sql.Driver;
import java.sql.DriverManager;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
+import java.util.List;
import java.util.Properties;
-import java.util.List;
import java.util.Set;
import javax.resource.ResourceException;
@@ -40,9 +43,11 @@
import javax.resource.spi.ConnectionRequestInfo;
import javax.resource.spi.ManagedConnection;
import javax.security.auth.Subject;
+import javax.sql.DataSource;
import org.jboss.resource.JBossResourceException;
import org.jboss.resource.adapter.jdbc.BaseWrapperManagedConnectionFactory;
+import org.jboss.resource.adapter.jdbc.URLSelectorStrategy;
import org.jboss.util.NestedRuntimeException;
/**
@@ -59,13 +64,17 @@
private String driverClass;
private transient Driver driver;
-
+
+ private transient DataSource dataSource;
+
private String connectionURL;
private URLSelectorStrategy urlSelector;
protected String connectionProperties;
-
+
+ private boolean useDataSource;
+
public LocalManagedConnectionFactory()
{
@@ -77,7 +86,7 @@
// check some invariants before they come back to haunt us
if(driverClass == null)
throw new JBossResourceException("driverClass is null");
- if(connectionURL == null)
+ if(connectionURL == null && !getUseDataSource())
throw new JBossResourceException("connectionURL is null");
return super.createConnectionFactory(cm);
@@ -165,6 +174,17 @@
}
}
+
+ public boolean getUseDataSource()
+ {
+ return useDataSource;
+ }
+
+ public void setUseDataSource(boolean useDataSource)
+ {
+ this.useDataSource = useDataSource;
+ }
+
public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo cri)
throws javax.resource.ResourceException
{
@@ -202,12 +222,28 @@
Connection con = null;
try
{
- String url = getConnectionURL();
- Driver d = getDriver(url);
- con = d.connect(url, copy);
- if (con == null)
- throw new JBossResourceException("Wrong driver class for this connection URL");
+ if(!useDataSource)
+ {
+ String url = getConnectionURL();
+ Driver d = getDriver(url);
+ con = d.connect(url, copy);
+ if (con == null)
+ throw new JBossResourceException("Wrong driver class for this connection URL");
+ }
+ else
+ {
+ final String user = props.getProperty("user");
+ final String password = props.getProperty("password");
+
+ con = (user != null)
+ ? getDataSource().getConnection(user, password)
+ : getDataSource().getConnection();
+ if (con == null)
+ throw new JBossResourceException("Could not create connection from data source " + getDriverClass());
+
+ }
+
return new LocalManagedConnection(this, con, props, transactionIsolation, preparedStatementCacheSize);
}
catch (Throwable e)
@@ -416,6 +452,7 @@
public int hashCode()
{
int result = 17;
+
result = result * 37 + ((connectionURL == null) ? 0 : connectionURL.hashCode());
result = result * 37 + ((driverClass == null) ? 0 : driverClass.hashCode());
result = result * 37 + ((userName == null) ? 0 : userName.hashCode());
@@ -431,11 +468,23 @@
if (getClass() != other.getClass())
return false;
LocalManagedConnectionFactory otherMcf = (LocalManagedConnectionFactory) other;
- return this.connectionURL.equals(otherMcf.connectionURL) && this.driverClass.equals(otherMcf.driverClass)
- && ((this.userName == null) ? otherMcf.userName == null : this.userName.equals(otherMcf.userName))
- && ((this.password == null) ? otherMcf.password == null : this.password.equals(otherMcf.password))
- && this.transactionIsolation == otherMcf.transactionIsolation;
-
+
+ if(!useDataSource)
+ {
+ return this.connectionURL.equals(otherMcf.connectionURL) && this.driverClass.equals(otherMcf.driverClass)
+ && ((this.userName == null) ? otherMcf.userName == null : this.userName.equals(otherMcf.userName))
+ && ((this.password == null) ? otherMcf.password == null : this.password.equals(otherMcf.password))
+ && this.transactionIsolation == otherMcf.transactionIsolation;
+
+ }
+ else
+ {
+ return this.driverClass.equals(otherMcf.driverClass) && this.connectionProps.equals(otherMcf.connectionProps)
+ && ((this.userName == null) ? otherMcf.userName == null : this.userName.equals(otherMcf.userName))
+ && ((this.password == null) ? otherMcf.password == null : this.password.equals(otherMcf.password))
+ && this.transactionIsolation == otherMcf.transactionIsolation;
+
+ }
}
/**
@@ -516,4 +565,91 @@
{
return connectionURL;
}
+
+ private synchronized DataSource getDataSource() throws ResourceException {
+
+ if (dataSource == null)
+ {
+ if (driverClass == null)
+ throw new JBossResourceException("No DataSourceClass supplied!");
+
+ try
+ {
+ Class<?> clazz = Thread.currentThread().getContextClassLoader().loadClass(driverClass);
+ dataSource = (DataSource) clazz.newInstance();
+ Class<?>[] NOCLASSES = new Class[] {};
+
+ for (Iterator i = this.connectionProps.keySet().iterator(); i.hasNext();)
+ {
+ String name = (String) i.next();
+ String value = this.connectionProps.getProperty(name);
+ char firstCharName = Character.toUpperCase(name.charAt(0));
+ if (name.length() > 1)
+ name = firstCharName+name.substring(1);
+ else
+ name = ""+firstCharName;
+ //This is a bad solution. On the other hand the only known example
+ // of a setter with no getter is for Oracle with password.
+ //Anyway, each xadatasource implementation should get its
+ //own subclass of this that explicitly sets the
+ //properties individually.
+ Class type = null;
+ try
+ {
+ Method getter = clazz.getMethod("get" + name, NOCLASSES);
+ type = getter.getReturnType();
+ }
+ catch (NoSuchMethodException e)
+ {
+ try
+ {
+ Method isMethod = clazz.getMethod("is" + name, NOCLASSES);
+ type = isMethod.getReturnType();
+ }
+ catch(NoSuchMethodException nsme)
+ {
+ type = String.class;
+ }
+ }
+
+ Method setter = clazz.getMethod("set" + name, new Class[] { type });
+ PropertyEditor editor = PropertyEditorManager.findEditor(type);
+ if (editor == null)
+ throw new JBossResourceException("No property editor found for type: " + type);
+ editor.setAsText(value);
+ setter.invoke(dataSource, new Object[] { editor.getValue() });
+ }
+ }
+ catch (ClassNotFoundException cnfe)
+ {
+ throw new JBossResourceException("Class not found for DataSource " + getDriverClass(), cnfe);
+ }
+ catch (InstantiationException ie)
+ {
+ throw new JBossResourceException("Could not create an DataSource: ", ie);
+ }
+ catch (IllegalAccessException iae)
+ {
+ throw new JBossResourceException("Could not set a property: ", iae);
+ }
+ catch (IllegalArgumentException iae)
+ {
+ throw new JBossResourceException("Could not set a property: ", iae);
+ }
+ catch (InvocationTargetException ite)
+ {
+ throw new JBossResourceException("Could not invoke setter on DataSource: ", ite);
+ }
+ catch (NoSuchMethodException nsme)
+ {
+ throw new JBossResourceException("Could not find accessor on DataSource: ", nsme);
+ }
+ }
+ return dataSource;
+
+ }
+
+
+
+
}
Modified: branches/JBoss-AS-6.0.x-ipv6/connector/src/main/java/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/connector/src/main/java/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/connector/src/main/java/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -378,7 +378,7 @@
ResourceAdapter resourceAdapter = null;
ConnectionDefinitionMetaData cdmd = cmd.getConnectionDefinition(dmd.getConnectionDefinition());
-
+ rarName = dmd.getRarName();
try
{
resourceAdapter = (ResourceAdapter) getServer().getAttribute(oldRarDeployment, "ResourceAdapter");
Modified: branches/JBoss-AS-6.0.x-ipv6/connector/src/main/java/org/jboss/resource/deployers/DataSourceDeployer.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/connector/src/main/java/org/jboss/resource/deployers/DataSourceDeployer.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/connector/src/main/java/org/jboss/resource/deployers/DataSourceDeployer.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1,8 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.resource.deployers;
-import java.util.ArrayList;
-import java.util.List;
-
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.spi.deployer.helpers.AbstractDeployer;
@@ -13,20 +31,16 @@
import org.jboss.metadata.ear.spec.Ear60MetaData;
import org.jboss.metadata.ear.spec.EarMetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.ejb.spec.EnterpriseBeansMetaData;
import org.jboss.metadata.javaee.spec.DataSourceMetaData;
import org.jboss.metadata.javaee.spec.DataSourcesMetaData;
-import org.jboss.metadata.javaee.spec.Environment;
-import org.jboss.metadata.javaee.spec.PropertyMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.Web30MetaData;
import org.jboss.metadata.web.spec.WebMetaData;
import org.jboss.resource.metadata.mcf.ConnectionPoolMetaData;
-import org.jboss.resource.metadata.mcf.DataSourceConnectionPropertyMetaData;
-import org.jboss.resource.metadata.mcf.LocalDataSourceDeploymentMetaData;
+import org.jboss.resource.metadata.mcf.DataSourceDeploymentMetaData;
import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentGroup;
-import org.jboss.resource.metadata.mcf.NoTxDataSourceDeploymentMetaData;
-import org.jboss.resource.metadata.mcf.NonXADataSourceDeploymentMetaData;
-import org.jboss.resource.metadata.repository.DefaultJCAMetaDataRepository;
/**
* The DataSourceDeployer is designed to satisfy the EE6 specification
@@ -50,10 +64,9 @@
private boolean isCARSupported = true;
public DataSourceDeployer() {
- setStage(DeploymentStages.POST_CLASSLOADER);
+ setStage(DeploymentStages.PRE_REAL);
addInput(EarMetaData.class);
addInput(WebMetaData.class);
- addInput("annotated."+ WebMetaData.class.getName() + ":classes");
addInput(ApplicationClient6MetaData.class);
addInput(JBossMetaData.class);
}
@@ -101,24 +114,22 @@
private ManagedConnectionFactoryDeploymentGroup getMCFMetaData(DataSourcesMetaData dataSources)
{
ManagedConnectionFactoryDeploymentGroup group = new ManagedConnectionFactoryDeploymentGroup();
- NonXADataSourceDeploymentMetaData depMd = null;
+ DataSourceDeploymentMetaData depMd = null;
for(String key: dataSources.keySet())
{
DataSourceMetaData dsmd = dataSources.get(key);
-
+
if(dsmd.isTransactional())
{
- depMd = new LocalDataSourceDeploymentMetaData();
+ depMd = DataSourceDeployerHelper.createTxnDeployment(dsmd);
}
else
{
- depMd = new NoTxDataSourceDeploymentMetaData();
+ depMd = DataSourceDeployerHelper.createNonTxnDeployment(dsmd);
}
-
+
depMd.setJndiName(normalizeJndiName(dsmd.getName()));
- depMd.setDriverClass(dsmd.getClassName());
- depMd.setConnectionUrl(dsmd.getUrl());
depMd.setUserName(dsmd.getUser());
depMd.setPassWord(dsmd.getPassword());
@@ -126,26 +137,18 @@
{
depMd.setTransactionIsolation(dsmd.getIsolationLevel().toString());
}
+
+ ConnectionPoolMetaData cpmd = (ConnectionPoolMetaData)depMd;
- List<DataSourceConnectionPropertyMetaData> connProps = new ArrayList<DataSourceConnectionPropertyMetaData>();
- depMd.setDataSourceConnectionProperties(connProps);
-
- if(dsmd.getProperties() != null && dsmd.getProperties().keySet().size() > 0)
+ if(dsmd.getMinPoolSize() < 0)
{
- for(String propKey: dsmd.getProperties().keySet())
- {
- PropertyMetaData prop = dsmd.getProperties().get(propKey);
- DataSourceConnectionPropertyMetaData dsProp = new DataSourceConnectionPropertyMetaData();
- dsProp.setName(propKey);
- dsProp.setValue(prop.getName());
- }
-
+ cpmd.setMinSize(0);
}
+ else
+ {
+ cpmd.setMinSize(dsmd.getMinPoolSize());
+ }
- //TODO max statements should be handled
-
- ConnectionPoolMetaData cpmd = (ConnectionPoolMetaData)depMd;
- cpmd.setMinSize(dsmd.getMinPoolSize());
cpmd.setMaxSize(dsmd.getMaxPoolSize());
cpmd.setIdleTimeoutMinutes(dsmd.getMaxIdleTime() / 60);
cpmd.setBlockingTimeoutMilliSeconds(dsmd.getLoginTimeout() * 1000);
@@ -165,27 +168,18 @@
WebMetaData wmd = du.getAttachment(WebMetaData.class);
- if(isWARSupported() && wmd != null)
+ if(isWARSupported() && wmd != null && wmd.is30())
{
- temp = ((Environment)wmd).getDataSources();
-
- if(temp != null && !temp.isEmpty())
+ if(wmd.getJndiEnvironmentRefsGroup() != null)
{
- candidates.addAll(temp);
+ temp = wmd.getJndiEnvironmentRefsGroup().getDataSources();
+
+ if(temp != null && !temp.isEmpty())
+ {
+ candidates.addAll(temp);
+ }
}
}
-
- wmd = du.getAttachment("annotated."+ WebMetaData.class.getName() + ":classes", WebMetaData.class);
-
- if(isWARSupported() && wmd != null)
- {
- temp = ((Environment)wmd).getDataSources();
-
- if(temp != null && !temp.isEmpty())
- {
- candidates.addAll(temp);
- }
- }
EarMetaData emd = du.getAttachment(EarMetaData.class);
@@ -205,16 +199,22 @@
JBossMetaData ebmd = du.getAttachment(JBossMetaData.class);
- if(isEJBSupported() && (ebmd != null && ebmd.isEJB3x()))
+ if(isEJBSupported() && (ebmd != null && ebmd.isEJB31()))
{
-
- JBossEnterpriseBeansMetaData je = ebmd.getEnterpriseBeans();
- temp = ((Environment)ebmd).getDataSources();
-
- if(temp != null && !temp.isEmpty())
+ if(ebmd.getEnterpriseBeans() != null)
{
- candidates.addAll(temp);
+ for(JBossEnterpriseBeanMetaData md: ebmd.getEnterpriseBeans())
+ {
+ temp = md.getDataSources();
+
+ if(temp != null && !temp.isEmpty())
+ {
+ candidates.addAll(temp);
+ }
+ }
+
}
+
}
ApplicationClientMetaData acmd = du.getAttachment(ApplicationClientMetaData.class);
Copied: branches/JBoss-AS-6.0.x-ipv6/connector/src/main/java/org/jboss/resource/deployers/DataSourceDeployerHelper.java (from rev 109877, trunk/connector/src/main/java/org/jboss/resource/deployers/DataSourceDeployerHelper.java)
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/connector/src/main/java/org/jboss/resource/deployers/DataSourceDeployerHelper.java (rev 0)
+++ branches/JBoss-AS-6.0.x-ipv6/connector/src/main/java/org/jboss/resource/deployers/DataSourceDeployerHelper.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -0,0 +1,180 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt 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.resource.deployers;
+
+import java.util.List;
+
+import org.jboss.metadata.javaee.spec.DataSourceMetaData;
+import org.jboss.metadata.javaee.spec.PropertyMetaData;
+import org.jboss.resource.metadata.mcf.DataSourceConnectionPropertyMetaData;
+import org.jboss.resource.metadata.mcf.DataSourceDeploymentMetaData;
+import org.jboss.resource.metadata.mcf.NoTxDataSourceDeploymentMetaData;
+import org.jboss.resource.metadata.mcf.XAConnectionPropertyMetaData;
+import org.jboss.resource.metadata.mcf.XADataSourceDeploymentMetaData;
+
+/**
+ * Simple helper class for generating DataSourceDeploymentMetaData from a DataSourceDefinition as provided by EE5.17
+ * @author Weston M. Price
+ *
+ */
+public class DataSourceDeployerHelper {
+
+
+ public static DataSourceDeploymentMetaData createTxnDeployment(final DataSourceMetaData dsmd)
+ {
+ XADataSourceDeploymentMetaData depMd = new XADataSourceDeploymentMetaData();
+ depMd.setXaDataSourceClass(dsmd.getClassName());
+ List<XAConnectionPropertyMetaData> xaProps = depMd.getXADataSourceProperties();
+
+ boolean useUrl = true;
+
+ String serverName = dsmd.getServerName();
+ String dataBaseName = dsmd.getDatabaseName();
+ int portNumber = dsmd.getPortNumber();
+ String url = dsmd.getUrl();
+
+ XAConnectionPropertyMetaData xaProp = null;
+
+ if(serverName != null && !serverName.isEmpty())
+ {
+ useUrl = false;
+ xaProp = new XAConnectionPropertyMetaData();
+ xaProp.setName("serverName");
+ xaProp.setValue(serverName);
+ xaProps.add(xaProp);
+ }
+
+ if(dataBaseName != null && !dataBaseName.isEmpty())
+ {
+ useUrl = false;
+ xaProp = new XAConnectionPropertyMetaData();
+ xaProp.setName("databaseName");
+ xaProp.setValue(dataBaseName);
+ xaProps.add(xaProp);
+ }
+
+ if(portNumber > -1)
+ {
+ useUrl = false;
+ xaProp = new XAConnectionPropertyMetaData();
+ xaProp.setName("portNumber");
+ xaProp.setValue(String.valueOf(portNumber));
+ xaProps.add(xaProp);
+
+ }
+
+ if(useUrl)
+ {
+ depMd.setURLProperty(url);
+ }
+
+ if(dsmd.getProperties() != null && dsmd.getProperties().keySet().size() > 0)
+ {
+ for(String key: dsmd.getProperties().keySet())
+ {
+ PropertyMetaData pmd = dsmd.getProperties().get(key);
+ xaProp = new XAConnectionPropertyMetaData();
+ xaProp.setName(pmd.getName());
+ xaProp.setValue(pmd.getValue());
+ xaProps.add(xaProp);
+ }
+
+ }
+
+ return depMd;
+ }
+
+
+ public static DataSourceDeploymentMetaData createNonTxnDeployment(final DataSourceMetaData dsmd)
+ {
+ NoTxDataSourceDeploymentMetaData depMd = new NoTxDataSourceDeploymentMetaData();
+ depMd.setDriverClass(dsmd.getClassName());
+ List<DataSourceConnectionPropertyMetaData> xaProps = depMd.getDataSourceConnectionProperties();
+
+ boolean useUrl = true;
+
+ String serverName = dsmd.getServerName();
+ String dataBaseName = dsmd.getDatabaseName();
+ int portNumber = dsmd.getPortNumber();
+ String url = dsmd.getUrl();
+
+ DataSourceConnectionPropertyMetaData xaProp = null;
+
+ if(serverName != null && !serverName.isEmpty())
+ {
+ useUrl = false;
+ xaProp = new DataSourceConnectionPropertyMetaData();
+ xaProp.setName("serverName");
+ xaProp.setValue(serverName);
+ xaProps.add(xaProp);
+ }
+
+ if(dataBaseName != null && !dataBaseName.isEmpty())
+ {
+ useUrl = false;
+ xaProp = new DataSourceConnectionPropertyMetaData();
+ xaProp.setName("databaseName");
+ xaProp.setValue(dataBaseName);
+ xaProps.add(xaProp);
+ }
+
+ if(portNumber > -1)
+ {
+ useUrl = false;
+ xaProp = new DataSourceConnectionPropertyMetaData();
+ xaProp.setName("portNumber");
+ xaProp.setValue(String.valueOf(portNumber));
+ xaProps.add(xaProp);
+
+ }
+
+
+ if(useUrl)
+ {
+ depMd.setConnectionUrl(url);
+ }
+ else
+ {
+ //Hack for EE5.17 we are going to use the new DataSource rar to manage data sources that do not specify a Url, or specify properties
+ //within the deployment ie serverName, dataBaseName etc. This is largely to reduce the number of changes required to support
+ //this particular section in the spec.
+ depMd.setUseDataSource(true);
+ //depMd.setRarName("jboss-datasource-jdbc.rar");
+ }
+
+ if(dsmd.getProperties() != null && dsmd.getProperties().keySet().size() > 0)
+ {
+ for(String key: dsmd.getProperties().keySet())
+ {
+ PropertyMetaData pmd = dsmd.getProperties().get(key);
+ xaProp = new DataSourceConnectionPropertyMetaData();
+ xaProp.setName(pmd.getName());
+ xaProp.setValue(pmd.getValue());
+ xaProps.add(xaProp);
+ }
+
+ }
+
+ return depMd;
+ }
+
+}
Modified: branches/JBoss-AS-6.0.x-ipv6/connector/src/main/java/org/jboss/resource/metadata/mcf/NonXADataSourceDeploymentMetaData.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/connector/src/main/java/org/jboss/resource/metadata/mcf/NonXADataSourceDeploymentMetaData.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/connector/src/main/java/org/jboss/resource/metadata/mcf/NonXADataSourceDeploymentMetaData.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -27,6 +27,7 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -55,9 +56,12 @@
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
private String connectionUrl;
+ @XmlTransient
+ private boolean useDataSource;
+
@XmlElement(name="connection-property")
private List<DataSourceConnectionPropertyMetaData> connectionProperties = new ArrayList<DataSourceConnectionPropertyMetaData>();
-
+
@ManagementProperty(name="connection-url",
description="The DataSource connection URL",
mandatory=true, includeInTemplate=true)
@@ -98,7 +102,18 @@
this.connectionProperties = connectionProperties;
}
- @Override
+ @ManagementProperty(name="use-data-source", includeInTemplate=true)
+ public boolean isUseDataSource()
+ {
+ return useDataSource;
+ }
+
+ public void setUseDataSource(boolean useDataSource)
+ {
+ this.useDataSource = useDataSource;
+ }
+
+ at Override
@ManagementProperty(name="config-property",
description="The connection factory property info",
managed=true, readOnly = true)
@@ -126,6 +141,12 @@
properties.add(property);
}
+ property = new ManagedConnectionFactoryPropertyMetaData();
+ property.setName("UseDataSource");
+ property.setType("boolean");
+ property.setValue(String.valueOf(isUseDataSource()));
+ properties.add(property);
+
StringBuffer propBuff = new StringBuffer();
List<DataSourceConnectionPropertyMetaData> dsProps = getDataSourceConnectionProperties();
Modified: branches/JBoss-AS-6.0.x-ipv6/connector/src/resources/local-rar/META-INF/ra.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/connector/src/resources/local-rar/META-INF/ra.xml 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/connector/src/resources/local-rar/META-INF/ra.xml 2010-12-13 17:25:55 UTC (rev 109879)
@@ -146,6 +146,11 @@
<config-property-name>UseTryLock</config-property-name>
<config-property-type>java.lang.Integer</config-property-type>
</config-property>
+ <config-property>
+ <description>Whether or not to use a javax.sql.DataSource to create connections</description>
+ <config-property-name>UseDataSource</config-property-name>
+ <config-property-type>java.lang.Boolean</config-property-type>
+ </config-property>
<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
<connectionfactory-impl-class>org.jboss.resource.adapter.jdbc.WrapperDataSource</connectionfactory-impl-class>
<connection-interface>java.sql.Connection</connection-interface>
Modified: branches/JBoss-AS-6.0.x-ipv6/console/src/bin/twiddle.sh
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/console/src/bin/twiddle.sh 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/console/src/bin/twiddle.sh 2010-12-13 17:25:55 UTC (rev 109879)
@@ -7,8 +7,21 @@
### $Id$ ###
-DIRNAME=`dirname $0`
-PROGNAME=`basename $0`
+# Extract the directory and the program name
+# takes care of symlinks
+PRG="$0"
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+done
+DIRNAME=`dirname "$PRG"`
+PROGNAME=`basename "$PRG"`
+
GREP="grep"
#
Modified: branches/JBoss-AS-6.0.x-ipv6/ejb3/pom.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/ejb3/pom.xml 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/ejb3/pom.xml 2010-12-13 17:25:55 UTC (rev 109879)
@@ -212,6 +212,17 @@
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3.sis</groupId>
+ <artifactId>jboss-ejb3-sis</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.jboss</groupId>
Modified: branches/JBoss-AS-6.0.x-ipv6/ejb3/src/main/java/org/jboss/as/ejb3/switchboard/resource/provider/EJBContextResource.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/ejb3/src/main/java/org/jboss/as/ejb3/switchboard/resource/provider/EJBContextResource.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/ejb3/src/main/java/org/jboss/as/ejb3/switchboard/resource/provider/EJBContextResource.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -21,6 +21,8 @@
*/
package org.jboss.as.ejb3.switchboard.resource.provider;
+import java.util.Collection;
+
import javax.ejb.EJBContext;
import javax.naming.LinkRef;
@@ -58,4 +60,10 @@
{
return new LinkRef("java:internal/EJBContext");
}
+
+ @Override
+ public Collection<?> getInvocationDependencies()
+ {
+ return null;
+ }
}
Modified: branches/JBoss-AS-6.0.x-ipv6/ejb3/src/main/java/org/jboss/as/ejb3/switchboard/resource/provider/TimerServiceResource.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/ejb3/src/main/java/org/jboss/as/ejb3/switchboard/resource/provider/TimerServiceResource.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/ejb3/src/main/java/org/jboss/as/ejb3/switchboard/resource/provider/TimerServiceResource.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -21,6 +21,8 @@
*/
package org.jboss.as.ejb3.switchboard.resource.provider;
+import java.util.Collection;
+
import javax.ejb.TimerService;
import javax.naming.LinkRef;
@@ -58,4 +60,9 @@
return new LinkRef("java:internal/TimerService");
}
+ @Override
+ public Collection<?> getInvocationDependencies()
+ {
+ return null;
+ }
}
Modified: branches/JBoss-AS-6.0.x-ipv6/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -28,10 +28,11 @@
import javax.management.ObjectName;
import javax.security.jacc.PolicyConfiguration;
-import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
+import org.jboss.beans.metadata.plugins.AbstractDemandMetaData;
import org.jboss.beans.metadata.plugins.AbstractSupplyMetaData;
import org.jboss.beans.metadata.plugins.builder.BeanMetaDataBuilderFactory;
import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.DemandMetaData;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.deployment.MappedReferenceMetaDataResolverDeployer;
@@ -157,8 +158,9 @@
throw new RuntimeException("No SwitchBoard Barrier found for bean: " + container.getEjbName() + " in unit: "
+ this.jbossUnit + " (or its component deployment unit)");
}
- // Add dependency on switchboard
- dependsPolicy.addDependency(switchBoard.getId());
+ // add dependency on START (and not INSTALLED) state of Switchboard, since the container only requires a fully populated ENC context,
+ // but doesn't require a invokable context. An invokable context is only needed by Injector.
+ dependsPolicy.addDependency(this.createSwitchBoardDependency(switchBoard));
log.debug("Added dependency on Switchboard " + switchBoard.getId() + " for EJB container " + ejbContainer.getName());
@@ -358,8 +360,8 @@
BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(injectorMCBeanName, injector.getClass().getName());
builder.setConstructorValue(injector);
- // add dependency on INSTALLED state of SwitchBoard Barrier
- builder.addDependency(barrier.getId());
+ // add dependency on SwitchBoard Barrier
+ builder.addDemand(barrier.getId(), ControllerState.CREATE, ControllerState.START, null);
// return the Injector BMD
return builder.getBeanMetaData();
@@ -394,4 +396,16 @@
}
return false;
}
+
+ private DemandMetaData createSwitchBoardDependency(Barrier switchBoard)
+ {
+ AbstractDemandMetaData switchboardDependency = new AbstractDemandMetaData();
+ switchboardDependency.setDemand(switchBoard.getId());
+ switchboardDependency.setWhenRequired(ControllerState.CREATE);
+ // container requires only a populated ENC (== START state of switchboard)
+ switchboardDependency.setTargetState(ControllerState.START);
+
+ return switchboardDependency;
+ }
+
}
Property changes on: branches/JBoss-AS-6.0.x-ipv6/embedded
___________________________________________________________________
Name: svn:ignore
- .git
.metadata
target
bin
*.ipr
*.iws
*.iml
.idea
*.patch
.settings
.classpath
.project
build.log
local.properties
+ .git
.metadata
target
bin
*.ipr
*.iws
*.iml
.idea
*.patch
.settings
.classpath
.project
build.log
local.properties
PutObjectStoreDirHere
ObjectStore
Modified: branches/JBoss-AS-6.0.x-ipv6/iiop/src/bin/runX.sh
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/iiop/src/bin/runX.sh 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/iiop/src/bin/runX.sh 2010-12-13 17:25:55 UTC (rev 109879)
@@ -7,8 +7,20 @@
### $Id$ ###
-DIRNAME=`dirname $0`
-PROGNAME=`basename $0`
+# Extract the directory and the program name
+# takes care of symlinks
+PRG="$0"
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+done
+DIRNAME=`dirname "$PRG"`
+PROGNAME=`basename "$PRG"`
GREP="grep"
#
Modified: branches/JBoss-AS-6.0.x-ipv6/main/src/bin/classpath.sh
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/main/src/bin/classpath.sh 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/main/src/bin/classpath.sh 2010-12-13 17:25:55 UTC (rev 109879)
@@ -7,8 +7,21 @@
### $Id$ ###
-DIRNAME=`dirname $0`
-PROGNAME=`basename $0`
+# Extract the directory and the program name
+# takes care of symlinks
+PRG="$0"
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+done
+DIRNAME=`dirname "$PRG"`
+PROGNAME=`basename "$PRG"`
+
CAT="cat"
#
Modified: branches/JBoss-AS-6.0.x-ipv6/main/src/bin/probe.sh
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/main/src/bin/probe.sh 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/main/src/bin/probe.sh 2010-12-13 17:25:55 UTC (rev 109879)
@@ -8,8 +8,24 @@
# Discovers all UDP-based members running on a certain mcast address (use -help for help)
# Probe [-help] [-addr <addr>] [-port <port>] [-ttl <ttl>] [-timeout <timeout>]
-CLASSPATH=.:../lib/commons-logging.jar:../server/all/lib/jgroups.jar:$CLASSPATH
+# Extract the directory and the program name
+# takes care of symlinks
+PRG="$0"
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+done
+DIRNAME=`dirname "$PRG"`
+PROGNAME=`basename "$PRG"`
+
+CLASSPATH=.:$DIRNAME/../lib/commons-logging.jar:$DIRNAME/../server/all/lib/jgroups.jar:$CLASSPATH
+
# OS specific support (must be 'true' or 'false').
cygwin=false;
case "`uname`" in
Modified: branches/JBoss-AS-6.0.x-ipv6/main/src/bin/run.sh
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/main/src/bin/run.sh 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/main/src/bin/run.sh 2010-12-13 17:25:55 UTC (rev 109879)
@@ -7,8 +7,21 @@
### $Id$ ###
-DIRNAME=`dirname $0`
-PROGNAME=`basename $0`
+# Extract the directory and the program name
+# takes care of symlinks
+PRG="$0"
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+done
+DIRNAME=`dirname "$PRG"`
+PROGNAME=`basename "$PRG"`
+
GREP="grep"
# Use the maximum available, or set MAX_FD != -1 to use that
Modified: branches/JBoss-AS-6.0.x-ipv6/pom.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/pom.xml 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/pom.xml 2010-12-13 17:25:55 UTC (rev 109879)
@@ -542,6 +542,7 @@
<module>main</module>
<module>management</module>
<module>profileservice</module>
+ <module>profileservice-client</module>
<module>resteasy-int</module>
<module>security</module>
<module>server</module>
Copied: branches/JBoss-AS-6.0.x-ipv6/profileservice-client (from rev 109877, trunk/profileservice-client)
Deleted: branches/JBoss-AS-6.0.x-ipv6/profileservice-client/pom.xml
===================================================================
--- trunk/profileservice-client/pom.xml 2010-12-13 15:41:52 UTC (rev 109877)
+++ branches/JBoss-AS-6.0.x-ipv6/profileservice-client/pom.xml 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1,501 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
- >
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-parent</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-profileservice-client</artifactId>
- <packaging>pom</packaging>
-
- <name>JBoss Application Server Profile Service Client</name>
- <url>http://www.jboss.org/jbossas</url>
- <description>JBoss Application Server ProfileService client module</description>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.profileservice</groupId>
- <artifactId>jboss-profileservice-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-managed</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.man</groupId>
- <artifactId>jboss-metatype</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-reflect</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnp-client</artifactId>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.classpool</groupId>
- <artifactId>jboss-classpool</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.classpool</groupId>
- <artifactId>jboss-classpool-scoped</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.classpool</groupId>
- <artifactId>jboss-classpool-scoped</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>oswego-concurrent</groupId>
- <artifactId>concurrent</artifactId>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-serialization</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.remoting</groupId>
- <artifactId>jboss-remoting</artifactId>
- </dependency>
- <dependency>
- <groupId>trove</groupId>
- <artifactId>trove</artifactId>
- </dependency>
- <dependency>
- <groupId>org.picketbox</groupId>
- <artifactId>jboss-security-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.picketbox</groupId>
- <artifactId>jbosssx-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.classpool</groupId>
- <artifactId>jboss-classpool</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.classpool</groupId>
- <artifactId>jboss-classpool-scoped</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>qdox</groupId>
- <artifactId>qdox</artifactId>
- </exclusion>
- <exclusion>
- <groupId>trove</groupId>
- <artifactId>trove</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.aspects</groupId>
- <artifactId>jboss-remoting-aspects</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-aspects</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.remoting</groupId>
- <artifactId>jboss-remoting</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-serialization</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.aspects</groupId>
- <artifactId>jboss-transaction-aspects</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.aspects</groupId>
- <artifactId>jboss-security-aspects</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jacc-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jaspi-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss.web</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>jboss-security-spi</artifactId>
- <groupId>org.jboss.security</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jbosssx</artifactId>
- <groupId>org.jboss.security</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.aspects</groupId>
- <artifactId>jboss-security-aspects</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jacc-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jaspi-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss.web</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <artifactId>jboss-security-spi</artifactId>
- <groupId>org.jboss.security</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jbosssx</artifactId>
- <groupId>org.jboss.security</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-profileservice</artifactId>
- <classifier>client</classifier>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.profileservice</groupId>
- <artifactId>jboss-profileservice-plugins</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-aspects</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.transaction</groupId>
- <artifactId>jboss-transaction-api_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-deployment</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.bootstrap</groupId>
- <artifactId>jboss-bootstrap-spi-as</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ejb3.ejbref.resolver</groupId>
- <artifactId>ejbref-resolver-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.integration</groupId>
- <artifactId>jboss-deployment-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jpa</groupId>
- <artifactId>jboss-jpa-deployers</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jpa</groupId>
- <artifactId>jboss-jpa-vfs3</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.reloaded.naming</groupId>
- <artifactId>jboss-reloaded-naming-deployers</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.reloaded.naming</groupId>
- <artifactId>jboss-reloaded-naming-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.injection</groupId>
- <artifactId>jboss-injection</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.injection</groupId>
- <artifactId>jboss-resolver-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.injection</groupId>
- <artifactId>jboss-resolver-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.injection</groupId>
- <artifactId>jboss-injection-switchboard-deployer</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.injection</groupId>
- <artifactId>jboss-switchboard-metadata</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.injection</groupId>
- <artifactId>jboss-injection-mc-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.picketbox</groupId>
- <artifactId>jbosssx</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata-common</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata-ear</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata-ejb</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata-rar</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata-war</artifactId>
- </exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-security</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.switchboard</groupId>
- <artifactId>jboss-switchboard-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.switchboard</groupId>
- <artifactId>jboss-switchboard-mc-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.switchboard</groupId>
- <artifactId>jboss-switchboard-javaee</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.switchboard</groupId>
- <artifactId>jboss-switchboard-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.mx</groupId>
- <artifactId>jboss-j2se</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.integration</groupId>
- <artifactId>jboss-transaction-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.ejb</groupId>
- <artifactId>jboss-ejb-api_3.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.interceptor</groupId>
- <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.annotation</groupId>
- <artifactId>jboss-annotations-api_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.security.jacc</groupId>
- <artifactId>jboss-jacc-api_1.4_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.jms</groupId>
- <artifactId>jboss-jms-api_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.xml.soap</groupId>
- <artifactId>jboss-saaj-api_1.3_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.xml.bind</groupId>
- <artifactId>jboss-jaxb-api_2.2_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.xml.ws</groupId>
- <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.xml.rpc</groupId>
- <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.spec.javax.resource</groupId>
- <artifactId>jboss-connector-api_1.5_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.picketbox</groupId>
- <artifactId>jbosssx-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>bcel</groupId>
- <artifactId>bcel</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnpserver</artifactId>
- </exclusion>
- <exclusion>
- <groupId>gnu-getopt</groupId>
- <artifactId>getopt</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.service.binding</groupId>
- <artifactId>jboss-service-binding-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.service.binding</groupId>
- <artifactId>jboss-service-binding-mgmt</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.scanning</groupId>
- <artifactId>scanning-plugins</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.scanning</groupId>
- <artifactId>scanning-deployers</artifactId>
- </exclusion>
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-
-</project>
Copied: branches/JBoss-AS-6.0.x-ipv6/profileservice-client/pom.xml (from rev 109877, trunk/profileservice-client/pom.xml)
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/profileservice-client/pom.xml (rev 0)
+++ branches/JBoss-AS-6.0.x-ipv6/profileservice-client/pom.xml 2010-12-13 17:25:55 UTC (rev 109879)
@@ -0,0 +1,501 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ >
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-parent</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-profileservice-client</artifactId>
+ <packaging>pom</packaging>
+
+ <name>JBoss Application Server Profile Service Client</name>
+ <url>http://www.jboss.org/jbossas</url>
+ <description>JBoss Application Server ProfileService client module</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.profileservice</groupId>
+ <artifactId>jboss-profileservice-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-managed</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.man</groupId>
+ <artifactId>jboss-metatype</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnp-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.classpool</groupId>
+ <artifactId>jboss-classpool</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.classpool</groupId>
+ <artifactId>jboss-classpool-scoped</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.classpool</groupId>
+ <artifactId>jboss-classpool-scoped</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>oswego-concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-serialization</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.remoting</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.picketbox</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.picketbox</groupId>
+ <artifactId>jbosssx-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.classpool</groupId>
+ <artifactId>jboss-classpool</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.classpool</groupId>
+ <artifactId>jboss-classpool-scoped</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>qdox</groupId>
+ <artifactId>qdox</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>trove</groupId>
+ <artifactId>trove</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aspects</groupId>
+ <artifactId>jboss-remoting-aspects</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.remoting</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-serialization</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.aspects</groupId>
+ <artifactId>jboss-transaction-aspects</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.aspects</groupId>
+ <artifactId>jboss-security-aspects</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jaspi-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.web</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-security-spi</artifactId>
+ <groupId>org.jboss.security</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jbosssx</artifactId>
+ <groupId>org.jboss.security</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aspects</groupId>
+ <artifactId>jboss-security-aspects</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jaspi-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.web</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-security-spi</artifactId>
+ <groupId>org.jboss.security</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jbosssx</artifactId>
+ <groupId>org.jboss.security</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-profileservice</artifactId>
+ <classifier>client</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.profileservice</groupId>
+ <artifactId>jboss-profileservice-plugins</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-aspects</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-deployment</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap-spi-as</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ejb3.ejbref.resolver</groupId>
+ <artifactId>ejbref-resolver-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-deployment-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jpa</groupId>
+ <artifactId>jboss-jpa-deployers</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jpa</groupId>
+ <artifactId>jboss-jpa-vfs3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.reloaded.naming</groupId>
+ <artifactId>jboss-reloaded-naming-deployers</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.reloaded.naming</groupId>
+ <artifactId>jboss-reloaded-naming-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.injection</groupId>
+ <artifactId>jboss-injection</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.injection</groupId>
+ <artifactId>jboss-resolver-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.injection</groupId>
+ <artifactId>jboss-resolver-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.injection</groupId>
+ <artifactId>jboss-injection-switchboard-deployer</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.injection</groupId>
+ <artifactId>jboss-switchboard-metadata</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.injection</groupId>
+ <artifactId>jboss-injection-mc-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.picketbox</groupId>
+ <artifactId>jbosssx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-ear</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-ejb</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-rar</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata-war</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-security</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.switchboard</groupId>
+ <artifactId>jboss-switchboard-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.switchboard</groupId>
+ <artifactId>jboss-switchboard-mc-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.switchboard</groupId>
+ <artifactId>jboss-switchboard-javaee</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.switchboard</groupId>
+ <artifactId>jboss-switchboard-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.mx</groupId>
+ <artifactId>jboss-j2se</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-transaction-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.interceptor</groupId>
+ <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.annotation</groupId>
+ <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.security.jacc</groupId>
+ <artifactId>jboss-jacc-api_1.4_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.jms</groupId>
+ <artifactId>jboss-jms-api_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.xml.soap</groupId>
+ <artifactId>jboss-saaj-api_1.3_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.xml.bind</groupId>
+ <artifactId>jboss-jaxb-api_2.2_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.xml.ws</groupId>
+ <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.xml.rpc</groupId>
+ <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.spec.javax.resource</groupId>
+ <artifactId>jboss-connector-api_1.5_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.picketbox</groupId>
+ <artifactId>jbosssx-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>bcel</groupId>
+ <artifactId>bcel</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnpserver</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>gnu-getopt</groupId>
+ <artifactId>getopt</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.service.binding</groupId>
+ <artifactId>jboss-service-binding-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.service.binding</groupId>
+ <artifactId>jboss-service-binding-mgmt</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-plugins</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-deployers</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: branches/JBoss-AS-6.0.x-ipv6/security/src/etc/bin/password_tool.sh
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/security/src/etc/bin/password_tool.sh 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/security/src/etc/bin/password_tool.sh 2010-12-13 17:25:55 UTC (rev 109879)
@@ -4,8 +4,20 @@
#
################################
-DIRNAME=`dirname $0`
-PROGNAME=`basename $0`
+# Extract the directory and the program name
+# takes care of symlinks
+PRG="$0"
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+done
+DIRNAME=`dirname "$PRG"`
+PROGNAME=`basename "$PRG"`
# OS specific support (must be 'true' or 'false').
cygwin=false;
Modified: branches/JBoss-AS-6.0.x-ipv6/security/src/main/java/org/jboss/security/plugins/JaasSecurityDomain.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/security/src/main/java/org/jboss/security/plugins/JaasSecurityDomain.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/security/src/main/java/org/jboss/security/plugins/JaasSecurityDomain.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -27,9 +27,13 @@
import java.lang.reflect.Constructor;
import java.net.MalformedURLException;
import java.net.URL;
+import java.security.Key;
import java.security.KeyStore;
import java.security.Provider;
+import java.security.PublicKey;
+import java.security.cert.Certificate;
import java.util.Arrays;
+import java.util.Properties;
import javax.crypto.Cipher;
import javax.crypto.SecretKey;
@@ -105,6 +109,8 @@
*
* @author Scott.Stark at jboss.org
* @author <a href="mailto:jasone at greenrivercomputing.com">Jason Essington</a>
+ * @author <a href="mailto:ovidiu at novaordis.com">Ovidiu Feodorov</a>
+ * @author <a href="mailto:mmoyses at redhat.com">Marcus Moyses</a>
*
* @version $Revision$
*/
@@ -178,9 +184,15 @@
private String trustStoreProviderArgument;
private String clientAlias;
+
+ private Properties additionalOptions;
+
+ private boolean clientAuth;
/** Specify the SecurityManagement instance */
private ISecurityManagement securityManagement = SecurityConstantsBridge.getSecurityManagement();
+
+ private char[] serviceAuthToken;
/**
* Creates a default JaasSecurityDomain for with a securityDomain name of 'other'.
@@ -278,6 +290,17 @@
/*
* (non-Javadoc)
+ *
+ * @see org.jboss.security.plugins.JaasSecurityDomainMBean#setServiceAuthToken(java.lang.String)
+ */
+ @ManagementProperty(use = {ViewUse.CONFIGURATION}, description = "The service authentication token", mandatory = false)
+ public void setServiceAuthToken(String serviceAuthToken) throws Exception
+ {
+ this.serviceAuthToken = Util.loadPassword(serviceAuthToken);
+ }
+
+ /*
+ * (non-Javadoc)
*
* @see org.jboss.security.plugins.JaasSecurityDomainMBean#getKeyStoreAlias()
*/
@@ -766,7 +789,7 @@
{
return clientAlias;
}
-
+
/*
* (non-Javadoc)
*
@@ -786,7 +809,7 @@
{
return keyStoreAlias;
}
-
+
/*
* (non-Javadoc)
*
@@ -796,6 +819,48 @@
{
this.keyStoreAlias = serverAlias;
}
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.jboss.security.plugins.JaasSecurityDomainMBean#getAdditionalOptions
+ */
+ @ManagementProperty(use = {ViewUse.CONFIGURATION}, description = "A map for additional options required by external components")
+ public Properties getAdditionalOptions()
+ {
+ return additionalOptions;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.jboss.security.plugins.JaasSecurityDomainMBean#setAdditionalOptions(java.lang.String)
+ */
+ public void setAdditionalOptions(Properties additionalOptions)
+ {
+ this.additionalOptions = additionalOptions;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.jboss.security.plugins.JaasSecurityDomainMBean#isClientAuth
+ */
+ @ManagementProperty(use = {ViewUse.CONFIGURATION}, description = "Flag for client authentication")
+ public boolean isClientAuth()
+ {
+ return clientAuth;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.jboss.security.plugins.JaasSecurityDomainMBean#setClientAuth(boolean)
+ */
+ public void setClientAuth(boolean clientAuth)
+ {
+ this.clientAuth = clientAuth;
+ }
/*
* (non-Javadoc)
@@ -807,6 +872,60 @@
{
loadKeyAndTrustStore();
}
+
+ /**
+ * Returns the key with the given alias from the key store this security domain delegates to.
+ * All keys except public keys require a service authentication token. In case of a public key
+ * the authentication token will be ignored, and it can be safely null.
+ *
+ * @param alias - the alias corresponding to the key to be retrieved.
+ * @param serviceAuthToken - the authentication token that establishes whether the calling
+ * service has the permission to retrieve the key. If no authentication token provided,
+ * or invalid authentication token is provided, the method will throw SecurityException
+ *
+ * @return the requested key, or null if the given alias does not exist or does not identify
+ * a key-related entry.
+ *
+ * @throws SecurityException for missing or invalid serviceAuthToken.
+ *
+ * @throws IllegalStateException if sensitive information is requested, but no service
+ * authorization token is configured on security domain.
+ *
+ * @see KeyStore#getKey(String, char[])
+ */
+ public Key getKey(String alias, String serviceAuthToken) throws Exception
+ {
+ log.debug(this + " got request for key with alias '" + alias + "'");
+
+ Key key = keyStore.getKey(alias, keyStorePassword);
+
+ if (key == null || key instanceof PublicKey)
+ {
+ return key;
+ }
+
+ verifyServiceAuthToken(serviceAuthToken);
+
+ return key;
+ }
+
+ /**
+ * Returns the certificate with the given alias or null if no such certificate exists, from the
+ * trust store this security domain delegates to.
+ *
+ * @param alias - the alias corresponding to the certificate to be retrieved.
+ *
+ * @return the requested certificate, or null if the given alias does not exist or does not
+ * identify a certificate-related entry.
+ *
+ * @see KeyStore#getKey(String, char[])
+ */
+ public Certificate getCertificate(String alias) throws Exception
+ {
+ log.debug(this + " got request for certifcate with alias '" + alias + "'");
+
+ return trustStore.getCertificate(alias);
+ }
/*
* (non-Javadoc)
@@ -857,6 +976,13 @@
Arrays.fill(keyStorePassword, '\0');
keyStorePassword = null;
}
+
+ if (serviceAuthToken != null)
+ {
+ Arrays.fill(serviceAuthToken, '\0');
+ serviceAuthToken = null;
+ }
+
cipherKey = null;
// Deregister yourself with the security management
@@ -1018,4 +1144,36 @@
}
return url;
}
+
+ private void verifyServiceAuthToken(String serviceAuthToken) throws SecurityException
+ {
+ if (this.serviceAuthToken == null)
+ {
+ throw new IllegalStateException(
+ getName() + " has been requested to provide sensitive security information, but no service authentication token has been configured on it. Use setServiceAuthToken().");
+ }
+
+ boolean verificationSuccessful = true;
+ char[] ca = serviceAuthToken.toCharArray();
+
+ if (this.serviceAuthToken.length == ca.length)
+ {
+ for(int i = 0; i < this.serviceAuthToken.length; i ++)
+ {
+ if (this.serviceAuthToken[i] != ca[i])
+ {
+ verificationSuccessful = false;
+ break;
+ }
+ }
+
+ if (verificationSuccessful)
+ {
+ log.debug("valid service authentication token");
+ return;
+ }
+ }
+
+ throw new SecurityException("service authentication token verification failed");
+ }
}
Modified: branches/JBoss-AS-6.0.x-ipv6/security/src/main/java/org/jboss/security/plugins/JaasSecurityDomainMBean.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/security/src/main/java/org/jboss/security/plugins/JaasSecurityDomainMBean.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/security/src/main/java/org/jboss/security/plugins/JaasSecurityDomainMBean.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -22,6 +22,7 @@
package org.jboss.security.plugins;
import java.io.IOException;
+import java.util.Properties;
import javax.management.ObjectName;
@@ -32,6 +33,8 @@
@author Scott.Stark at jboss.org
@author <a href="mailto:jasone at greenrivercomputing.com">Jason Essington</a>
+ @author <a href="mailto:ovidiu at novaordis.com">Ovidiu Feodorov</a>
+ @author <a href="mailto:mmoyses at redhat.com">Marcus Moyses</a>
@version $Revision$
*/
public interface JaasSecurityDomainMBean extends ServiceMBean
@@ -54,6 +57,11 @@
/** Set the credential string for the KeyStore.
*/
public void setKeyStorePass(String password) throws Exception;
+ /** Set the service authorization token for this security domain. Services requesting sensitive
+ * information from this domain (PrivateKeys, for example) must present this authorization token
+ * otherwise the call will fail with SecurityException.
+ */
+ public void setServiceAuthToken(String serviceAuthToken) throws Exception;
/** Get the alias of the KeyStore.
*/
public String getKeyStoreAlias();
@@ -253,4 +261,32 @@
* @param clientAlias client alias name
*/
public void setServerAlias(String serverAlias);
+
+ /**
+ * Gets the additionalOptions map
+ *
+ * @return the map
+ */
+ public Properties getAdditionalOptions();
+
+ /**
+ * Sets the additionalOptions map
+ *
+ * @param additionalOptions the map
+ */
+ public void setAdditionalOptions(Properties additionalOptions);
+
+ /**
+ * Gets the clientAuth flag
+ *
+ * @return flag
+ */
+ public boolean isClientAuth();
+
+ /**
+ * Sets the clientAuth flag
+ *
+ * @param clientAuth the flag
+ */
+ public void setClientAuth(boolean clientAuth);
}
Modified: branches/JBoss-AS-6.0.x-ipv6/security/src/main/java/org/jboss/security/ssl/DomainServerSocketFactory.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/security/src/main/java/org/jboss/security/ssl/DomainServerSocketFactory.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/security/src/main/java/org/jboss/security/ssl/DomainServerSocketFactory.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -37,6 +37,8 @@
import org.jboss.logging.Logger;
import org.jboss.security.SecurityDomain;
+import org.jboss.security.plugins.JaasSecurityDomain;
+
import javassist.util.proxy.ProxyFactory;
/**
@@ -161,7 +163,19 @@
public boolean isNeedsClientAuth()
{
- return needsClientAuth;
+ boolean b;
+
+ if (securityDomain != null && securityDomain instanceof JaasSecurityDomain)
+ {
+ b = ((JaasSecurityDomain) securityDomain).isClientAuth();
+ }
+ else
+ {
+ b = needsClientAuth;
+ }
+
+ log.debug("server socket factory " + (b ? "wants" : "does NOT want") + " client authentication");
+ return b;
}
public void setNeedsClientAuth(boolean needsClientAuth)
@@ -258,10 +272,11 @@
String[] supportedCipherSuites = socket.getSupportedCipherSuites();
log.debug("Supported CipherSuites: " + Arrays.asList(supportedCipherSuites));
}
- socket.setNeedClientAuth(needsClientAuth);
- // JBAS-5815: only set the wantClientAuth property if needClientAuth hasn't been already set.
- if (!needsClientAuth)
- socket.setWantClientAuth(wantsClientAuth);
+ socket.setNeedClientAuth(isNeedsClientAuth());
+ if (!isNeedsClientAuth())
+ {
+ socket.setWantClientAuth(wantsClientAuth);
+ }
if (protocols != null)
socket.setEnabledProtocols(protocols);
@@ -303,9 +318,11 @@
String[] supportedCipherSuites = socket.getSupportedCipherSuites();
log.debug("Supported CipherSuites: " + Arrays.asList(supportedCipherSuites));
}
- socket.setNeedClientAuth(needsClientAuth);
- if (!needsClientAuth)
- socket.setWantClientAuth(wantsClientAuth);
+ socket.setNeedClientAuth(isNeedsClientAuth());
+ if (!isNeedsClientAuth())
+ {
+ socket.setWantClientAuth(wantsClientAuth);
+ }
if( protocols != null )
socket.setEnabledProtocols(protocols);
if( cipherSuites != null )
Modified: branches/JBoss-AS-6.0.x-ipv6/server/src/bin/jboss_init_solaris.sh
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/server/src/bin/jboss_init_solaris.sh 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/server/src/bin/jboss_init_solaris.sh 2010-12-13 17:25:55 UTC (rev 109879)
@@ -100,25 +100,31 @@
# sets global isJBossRunningPid with 1st process id if it is running
isJBossRunning()
{
- JBossHome=$2 JBossUserId=$1 instance=$3
- # pipeline reads 1st jboss pid if it is running for user, jboss home, and instance
- ps -u $JBossUserId -o pid -o args |
- grep "${JBossHome}" | grep -v "grep" > /tmp/$$.jboss
- read isJBossRunningPid junk < /tmp/$$.jboss
- rm -f /tmp/$$.jboss
+ JBossUserId=$1
+ JBossHome=$2
+ JBossInstance=$3
+ # Note that we don't check $instance, as it will be truncated in
+ # the -o args output below
+
+ # Find correct run.sh process (we might find more than 1 candidate)
+ isJBossRunningPid=`ps -u ${JBossUserId} -o pid -o args | \
+ awk '{if (index($0, "'${JBossHome}'") && $2 ~ /sh$/) print $1}'`
if [ "x${isJBossRunningPid}" = "x" ]; then
return 1
fi
- ps -u $JBossUserId -o pid -o args -o ppid |
- grep "Dprogram.name=run.sh" | grep -v "grep" | grep ${isJBossRunningPid} > /tmp/$$.jboss
- read isJBossRunningPid junk < /tmp/$$.jboss
- rm -f /tmp/$$.jboss
- if [ "x${isJBossRunningPid}" = "x" ]; then
- return 1
- else
- return 0
- fi
+ # Find java process with one of the above processes as parent
+ for JBossPid in ${isJBossRunningPid}; do
+ isPidRunning=`ps -u ${JBossUserId} -o pid -o args -o ppid | \
+ awk '{if ($2 ~ /java$/ && $NF ~ /^'${JBossPid}'$/) print $1}'`
+ if [ "x${isPidRunning}" != "x" ]; then
+ args=`pargs -l ${JBossPid}`
+ test "x${args}" = "x" && return 0
+ inst=`echo ${args} | grep "\-c ${JBossInstance}" 2>/dev/null`
+ test "x${inst}" = "x" && return 0
+ fi
+ done
+ return 1
}
#USAGE: isUserOK
Property changes on: branches/JBoss-AS-6.0.x-ipv6/server/src/bin/jboss_init_solaris.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: branches/JBoss-AS-6.0.x-ipv6/server/src/bin/shutdown.sh
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/server/src/bin/shutdown.sh 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/server/src/bin/shutdown.sh 2010-12-13 17:25:55 UTC (rev 109879)
@@ -7,8 +7,21 @@
### $Id$ ###
-DIRNAME=`dirname $0`
-PROGNAME=`basename $0`
+# Extract the directory and the program name
+# takes care of symlinks
+PRG="$0"
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG="`dirname "$PRG"`/$link"
+ fi
+done
+DIRNAME=`dirname "$PRG"`
+PROGNAME=`basename "$PRG"`
+
GREP="grep"
#
Modified: branches/JBoss-AS-6.0.x-ipv6/server/src/etc/conf/all/bootstrap/deployers.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/server/src/etc/conf/all/bootstrap/deployers.xml 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/server/src/etc/conf/all/bootstrap/deployers.xml 2010-12-13 17:25:55 UTC (rev 109879)
@@ -162,6 +162,19 @@
</constructor>
</bean>
+ <bean name="ExcludeArchiveMatcher" class="org.jboss.system.deployers.ExcludeArchiveMatcher">
+ <property name="suffixes">
+ <set>
+ <value>.</value>
+ </set>
+ </property>
+ <property name="prefixes">
+ <set>
+ <value>.bak</value>
+ </set>
+ </property>
+ </bean>
+
<!-- Ignore config files via jboss-ignore.txt -->
<bean name="IgnoreFilesDeployer" class="org.jboss.deployers.vfs.spi.deployer.AbstractIgnoreFilesDeployer"/>
@@ -276,7 +289,9 @@
<classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY" import-all="true"/>
</property>
</bean>
- <bean name="ClassLoaderClassPathDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer"/>
+ <bean name="ClassLoaderClassPathDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer">
+ <property name="archiveMatcher"><inject bean="ExcludeArchiveMatcher"/></property>
+ </bean>
<bean name="ClassLoaderDescribeDeployer" class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer">
<property name="classLoading"><inject bean="ClassLoading"/></property>
</bean>
Modified: branches/JBoss-AS-6.0.x-ipv6/server/src/etc/deployers/switchboard-jboss-beans.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/server/src/etc/deployers/switchboard-jboss-beans.xml 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/server/src/etc/deployers/switchboard-jboss-beans.xml 2010-12-13 17:25:55 UTC (rev 109879)
@@ -77,6 +77,12 @@
</entry>
</map>
</property>
+ <property name="fallbackResourceEnvRefResourceProviders">
+ <list>
+ <inject bean="org.jboss.switchboard.ManagedBeanResourceEnvRefResourceProvider"/>
+ </list>
+ </property>
+
</bean>
<!-- processes resource-ref resources (EE.5.7 of Java EE6 spec) -->
@@ -140,11 +146,11 @@
<inject bean="org.jboss.switchboard.MessageDestinationRefResourceProvider"/>
<inject bean="org.jboss.switchboard.WebServiceRefResourceProvider"/>
<inject bean="org.jboss.switchboard.PersistenceUnitResourceProvider"/>
- <!-- Disabled till we resolve the transient failures with EJB jndi dependencies
+ <!-- Disabled till we resolve the transient failures with EJB jndi dependencies -->
<inject bean="org.jboss.switchboard.EJBLocalRefResourceProvider"/>
<inject bean="org.jboss.switchboard.EJBRefResourceProvider"/>
<inject bean="org.jboss.switchboard.AnnotatedEJBRefResourceProvider"/>
- -->
+
<inject bean="org.jboss.switchboard.BeanManagerResourceProvider"/>
<inject bean="org.jboss.switchboard.ORBRefResourceProvider"/>
<inject bean="org.jboss.switchboard.UserTransactionRefResourceProvider"/>
Modified: branches/JBoss-AS-6.0.x-ipv6/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBRefResourceProvider.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBRefResourceProvider.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/server/src/main/java/org/jboss/as/switchboard/resource/provider/ORBRefResourceProvider.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -43,7 +43,7 @@
// As per JavaEE 6 spec, section EE.9.6, java:comp/ORB is optional.
// So let's create a LinkRefResource with ignoreDependency = true, so
// that the deployment doesn't fail in the absence of ORB
- return new LinkRefResource(this.corbaJndiName, true);
+ return new LinkRefResource(this.corbaJndiName, null, true);
}
}
Modified: branches/JBoss-AS-6.0.x-ipv6/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/server/src/main/java/org/jboss/web/deployers/AbstractWarDeployer.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -51,8 +51,6 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.structure.spi.main.MainDeployerInternals;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.ejb3.ejbref.resolver.spi.EjbReference;
-import org.jboss.ejb3.ejbref.resolver.spi.EjbReferenceResolver;
import org.jboss.injection.injector.EEInjector;
import org.jboss.injection.injector.metadata.EnvironmentEntryType;
import org.jboss.injection.injector.metadata.InjectionTargetType;
@@ -73,8 +71,6 @@
import org.jboss.metadata.ear.jboss.JBossAppMetaData;
import org.jboss.metadata.ear.spec.ModuleMetaData;
import org.jboss.metadata.ear.spec.WebModuleMetaData;
-import org.jboss.metadata.javaee.spec.AnnotatedEJBReferenceMetaData;
-import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
import org.jboss.metadata.javaee.spec.Environment;
import org.jboss.metadata.javaee.spec.PersistenceContextReferenceMetaData;
import org.jboss.metadata.javaee.spec.PersistenceContextReferencesMetaData;
@@ -131,8 +127,6 @@
public static final String WEB_MODULE = "org.jboss.web.AbstractWebContainer.webModule";
public static final String ERROR = "org.jboss.web.AbstractWebContainer.error";
- private static final String JNDI_DEPENDENCY_PREFIX = "jndi:";
-
/** A mapping of deployed warUrl strings to the WebApplication object */
protected HashMap deploymentMap = new HashMap();
/** The parent class loader first model flag */
@@ -156,9 +150,6 @@
private PersistenceUnitDependencyResolver persistenceUnitDependencyResolver;
- /** EJB reference resolver */
- private EjbReferenceResolver ejbRefResolver;
-
private JavaEEComponentInformer componentInformer;
/**
@@ -292,12 +283,6 @@
}
@Inject
- public void setEjbReferenceResolver(EjbReferenceResolver resolver)
- {
- this.ejbRefResolver = resolver;
- }
-
- @Inject
public void setJavaEEComponentInformer(JavaEEComponentInformer informer)
{
this.componentInformer = informer;
@@ -755,8 +740,7 @@
if (switchBoard != null)
{
// Setup switchboard dependency on the deployment
- ServiceDependencyMetaData switchBoardDependency = new ServiceDependencyMetaData();
- switchBoardDependency.setIDependOn(switchBoard.getId());
+ ServiceDependencyMetaData switchBoardDependency = new AnyStateServiceDependencyMetaData(switchBoard.getId(), ControllerState.START, ControllerState.INSTALLED);
dependencies.add(switchBoardDependency);
log.debug("Added switchboard dependency: " + switchBoard.getId() + " for web module: " + name);
}
@@ -813,31 +797,6 @@
}
}
- // JBAS-8406 Add dependency on @EJB(s). This is a bit of duplicacy, since the TomcatInjectionContainer
- // through various handler would also do the same. But since the TomcatInjectionContainer comes too late
- // in the picture and since we already have similar duplicacy for @PersistenceContext and @PersistenceUnit (see few lines
- // above) and more importantly, since this works, let's just have it here.
- if (metaData.getJndiEnvironmentRefsGroup() != null)
- {
- AnnotatedEJBReferencesMetaData annotatedEjbRefs = metaData.getJndiEnvironmentRefsGroup().getAnnotatedEjbReferences();
- if (annotatedEjbRefs != null && !annotatedEjbRefs.isEmpty())
- {
- for (AnnotatedEJBReferenceMetaData annotatedEjbRef : annotatedEjbRefs)
- {
- // Note: @EJB(beanName="") is set as "link" in AnnotatedEJBReferenceMetadata.
- // Hence, we use the getLink() method to get hold of the beanName during resolution.
- String beanName = annotatedEjbRef.getLink();
- EjbReference ejbReference = new EjbReference(beanName, annotatedEjbRef.getBeanInterface().getName(), annotatedEjbRef.getMappedName());
- String jndiName = this.ejbRefResolver.resolveEjb(unit, ejbReference);
- if (jndiName != null)
- {
- ServiceDependencyMetaData sdmd = this.createJNDIDependency(jndiName);
- dependencies.add(sdmd);
- }
- }
- }
- }
-
webModule.setDependencies(dependencies);
// Here's where a bit of magic happens. By attaching the ServiceMetaData
@@ -911,29 +870,24 @@
}
/**
- * Creates and returns a {@link ServiceDependencyMetaData} corresponding to the
- * passed jndi name
*
- * @param jndiName The jndi name
- * @return
- */
- private ServiceDependencyMetaData createJNDIDependency(String jndiName)
- {
- String dependency = JNDI_DEPENDENCY_PREFIX + jndiName;
- ServiceDependencyMetaData sdmd = new InstalledServiceDependencyMetaData();
- sdmd.setIDependOn(dependency);
- return sdmd;
- }
-
- /**
+ * Similar to {@link ServiceDependencyMetaData} except that this allows to specify the "whenRequired" and
+ * "dependentState" {@link ControllerState ControllerState}
*
- * Similar to {@link ServiceDependencyMetaData} except that this expects the
- * dependency to be in {@link ControllerState#INSTALLED}, unlike {@link ServiceDependencyMetaData}
- * which expects it to be either in {@link ControllerState#START} or {@link ControllerState#CREATE}
- *
*/
- private class InstalledServiceDependencyMetaData extends ServiceDependencyMetaData
+ private class AnyStateServiceDependencyMetaData extends ServiceDependencyMetaData
{
+
+ private ControllerState whenRequired;
+
+ private ControllerState dependentState;
+
+ public AnyStateServiceDependencyMetaData(String iDependOn, ControllerState whenRequired, ControllerState dependentState)
+ {
+ this.setIDependOn(iDependOn);
+ this.whenRequired = whenRequired;
+ this.dependentState = dependentState;
+ }
/**
* @see ServiceDependencyMetaData#visit(ServiceMetaDataVisitor)
*
@@ -951,9 +905,7 @@
catch (MalformedObjectNameException ignored)
{
}
- // add a dependency on INSTALLED state of the dependency item
- visitor.addDependency(new AbstractDependencyItem(name, dependency, ControllerState.CREATE, ControllerState.INSTALLED));
- visitor.addDependency(new AbstractDependencyItem(name, dependency, ControllerState.START, ControllerState.INSTALLED));
+ visitor.addDependency(new AbstractDependencyItem(name, dependency, this.whenRequired, this.dependentState));
visitor.visit(this);
}
}
@@ -972,9 +924,9 @@
BeanMetaDataBuilder builder = BeanMetaDataBuilderFactory.createBuilder(injectorMCBeanName, injector.getClass().getName());
builder.setConstructorValue(injector);
- // add dependency on INSTALLED state of SwitchBoard Barrier
- builder.addDependency(barrier.getId());
-
+ // add dependency on SwitchBoard Barrier
+ builder.addDemand(barrier.getId(), ControllerState.CREATE, ControllerState.START, null);
+
// return the Injector BMD
return builder.getBeanMetaData();
}
@@ -1028,4 +980,6 @@
}
return false;
}
+
+
}
Copied: branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/deployers/ExcludeArchiveMatcher.java (from rev 109877, trunk/system/src/main/java/org/jboss/system/deployers/ExcludeArchiveMatcher.java)
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/deployers/ExcludeArchiveMatcher.java (rev 0)
+++ branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/deployers/ExcludeArchiveMatcher.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -0,0 +1,75 @@
+/*
+* 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.system.deployers;
+
+import java.util.Set;
+
+import org.jboss.deployers.vfs.spi.deployer.ArchiveMatcher;
+import org.jboss.vfs.VirtualFile;
+
+/**
+ * Exclude non-archives based on suffix or prefix.
+ *
+ * @author ales.justin at jboss.org
+ */
+public class ExcludeArchiveMatcher implements ArchiveMatcher
+{
+ private Set<String> suffixes;
+ private Set<String> prefixes;
+
+ public boolean isArchive(VirtualFile file)
+ {
+ return hasArchiveSuffix(file);
+ }
+
+ public boolean hasArchiveSuffix(VirtualFile file)
+ {
+ return hasArchiveSuffix(file.getName());
+ }
+
+ public boolean hasArchiveSuffix(String fileName)
+ {
+ if (suffixes != null)
+ {
+ for (String suffix : suffixes)
+ if (fileName.startsWith(suffix))
+ return false;
+ }
+ if (prefixes != null)
+ {
+ for (String prefix : prefixes)
+ if (fileName.endsWith(prefix))
+ return false;
+ }
+ return true;
+ }
+
+ public void setSuffixes(Set<String> suffixes)
+ {
+ this.suffixes = suffixes;
+ }
+
+ public void setPrefixes(Set<String> prefixes)
+ {
+ this.prefixes = prefixes;
+ }
+}
\ No newline at end of file
Modified: branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/bootstrap/BasicProfileServiceBootstrap.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/bootstrap/BasicProfileServiceBootstrap.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/bootstrap/BasicProfileServiceBootstrap.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -23,7 +23,6 @@
import java.net.URL;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -32,13 +31,14 @@
import org.jboss.bootstrap.spi.as.server.MCJBossASBasedServerProvider;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.deployment.KernelDeployment;
+import org.jboss.logging.Logger;
+import org.jboss.profileservice.Hack;
import org.jboss.profileservice.bootstrap.AbstractProfileServiceBootstrap;
import org.jboss.profileservice.config.ProfileServiceConfig;
import org.jboss.profileservice.deployment.hotdeploy.HDScannerFactory;
import org.jboss.profileservice.domain.AbstractDomainMetaData;
-import org.jboss.profileservice.domain.ManagementDomainMetaData;
-import org.jboss.profileservice.domain.ServerMetaData;
-import org.jboss.profileservice.domain.spi.DomainMetaDataFragment;
+import org.jboss.profileservice.domain.spi.DomainMetaData;
+import org.jboss.profileservice.domain.spi.DomainMetaDataRepository;
import org.jboss.profileservice.metadata.ProfilesMetaDataFactory;
import org.jboss.profileservice.profile.metadata.CommonProfileNameSpaces;
import org.jboss.profileservice.profile.metadata.FeatureCapability;
@@ -49,72 +49,74 @@
/**
* The basic profile service bootstrap.
- *
+ *
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class BasicProfileServiceBootstrap<K extends MCJBossASBasedServerProvider<K, T>, T extends JBossASBasedServerConfig<T>>
- extends AbstractProfileServiceBootstrap implements JBossASBootstrap<K,T>
+public class BasicProfileServiceBootstrap<K extends MCJBossASBasedServerProvider<K, T>, T extends JBossASBasedServerConfig<T>>
+ extends AbstractProfileServiceBootstrap implements JBossASBootstrap<K,T>
{
+ private static final Logger log = Logger.getLogger("ProfileServiceBootstrap");
+
/** Default domain name, since we don't have a domain right now. */
private static final String DOMAIN_NAME = ProfileKey.DEFAULT;
-
- private URL profilesLocation;
-
+
+ private URL profilesLocation;
+
/** The domain meta data. */
private AbstractDomainMetaData domainMetaData;
- /** The profile meta data factory. */
- private DomainMetaDataFragment profileFactory;
-
+ /** The domain meta data repository. */
+ private DomainMetaDataRepository profileFactory;
+
/** The hd scanner factory. */
private HDScannerFactory hdScannerFactory;
-
+
/** The bootstrap deployments. */
// TODO this should be removed
private Map<String, KernelDeployment> bootstrapDeployments;
-
+
public BasicProfileServiceBootstrap(Kernel kernel, ProfileServiceConfig config)
{
super(kernel, config);
}
-
- public DomainMetaDataFragment getProfileFactory()
+
+ public DomainMetaDataRepository getProfileFactory()
{
return profileFactory;
}
-
- public void setProfileFactory(DomainMetaDataFragment profileFactory)
+
+ public void setProfileFactory(DomainMetaDataRepository profileFactory)
{
this.profileFactory = profileFactory;
}
-
+
public HDScannerFactory getHdScannerFactory()
{
return hdScannerFactory;
}
-
+
public void setHdScannerFactory(HDScannerFactory hdScannerFactory)
{
this.hdScannerFactory = hdScannerFactory;
}
-
+
public URL getProfilesLocation()
{
return profilesLocation;
}
-
+
public void setProfilesLocation(URL profilesLocation)
{
this.profilesLocation = profilesLocation;
}
-
+
public Map<String, KernelDeployment> getBootstrapDeployments()
{
return bootstrapDeployments;
}
-
+
public void start(K server) throws Exception
{
// Create the domain meta data
@@ -143,15 +145,15 @@
log.error("failed to start server", t);
}
}
-
+
public void prepareShutdown(K server)
{
super.prepareShutdown();
hdScannerFactory.disabledScanning();
getConfig().getDeployerRegistry().prepareShutdown();
}
-
- public void shutdown(K server)
+
+ public void shutdown(K server)
{
try
{
@@ -162,41 +164,41 @@
getConfig().getDeployerRegistry().shutdown();
}
}
-
+
protected void createWorkaroundProfile()
{
// FIXME
EmptyProfileMetaData metaData = new EmptyProfileMetaData("workaround");
List<ProfileMetaDataVisitorNode> nodes = new ArrayList<ProfileMetaDataVisitorNode>();
- nodes.add(new FeatureCapability(CommonProfileNameSpaces.BOOTSTRAP_PROFILE_NAMESPACE));
+ nodes.add(new FeatureCapability(CommonProfileNameSpaces.PROFILE_NAMESPACE));
+ nodes.add(new FeatureCapability(CommonProfileNameSpaces.IMMUTABLE_PROFILE_NAMESPACE));
nodes.add(new FeatureCapability(CommonProfileNameSpaces.FARMING_PROFILE_NAMESPACE));
nodes.add(new FeatureCapability(CommonProfileNameSpaces.HOTDEPLOY_PROFILE_NAMESPACE));
metaData.setFeatures(nodes);
- getMetaDataRegistry().registerProfileMetaData(metaData);
+ profileRepository.getDomainRepository().registerMetaData(metaData);
}
-
+
protected AbstractDomainMetaData createDomainMetaData(String serverName)
{
- AbstractDomainMetaData domain = new AbstractDomainMetaData();
- domain.setDomain(new ManagementDomainMetaData(DOMAIN_NAME));
- domain.setServer(new ServerMetaData(serverName));
- domain.setFragments(Collections.singletonList(profileFactory));
- return domain;
+ // The delegate
+ DomainMetaData delegate = getProfileFactory().getDomainMetaData();
+ // Temp bootstrap domain meta data
+ return new BootstrapDomainMetaData(DOMAIN_NAME, serverName, delegate);
}
-
+
protected void populateProfileRepository() throws Exception
{
if(getProfilesLocation() != null)
{
ProfilesMetaDataFactory metadataFactory = new ProfilesMetaDataFactory();
metadataFactory.parse(getProfilesLocation());
- Map<String, ProfileMetaData> profiles = metadataFactory.getProfiles();
+ Map<String, ProfileMetaData> profiles = metadataFactory.getProfiles();
for(ProfileMetaData metaData : profiles.values())
{
- getMetaDataRegistry().registerProfileMetaData(metaData);
+ profileRepository.getProfileRepository().registerMetaData(metaData);
}
}
}
-
+
}
Copied: branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/bootstrap/BootstrapDomainMetaData.java (from rev 109877, trunk/system/src/main/java/org/jboss/system/server/profileservice/bootstrap/BootstrapDomainMetaData.java)
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/bootstrap/BootstrapDomainMetaData.java (rev 0)
+++ branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/bootstrap/BootstrapDomainMetaData.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -0,0 +1,53 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2010, Red Hat Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt 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.system.server.profileservice.bootstrap;
+
+import org.jboss.profileservice.domain.AbstractDomainMetaData;
+import org.jboss.profileservice.domain.ManagementDomainMetaData;
+import org.jboss.profileservice.domain.ServerMetaData;
+import org.jboss.profileservice.domain.spi.DomainMetaData;
+import org.jboss.profileservice.domain.spi.DomainMetaDataFragmentVisitor;
+
+/**
+ * @author Emanuel Muckenhuber
+ */
+public class BootstrapDomainMetaData extends AbstractDomainMetaData
+{
+
+ private DomainMetaData delegate;
+
+ public BootstrapDomainMetaData(String domainName, String serverName, DomainMetaData delegate)
+ {
+ super();
+ setDomain(new ManagementDomainMetaData(domainName));
+ setServer(new ServerMetaData(serverName));
+ this.delegate = delegate;
+ }
+
+ public void visit(DomainMetaDataFragmentVisitor visitor)
+ {
+ super.visit(visitor);
+ this.delegate.visit(visitor);
+ }
+
+}
+
Modified: branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/bootstrap/StaticBootstrapProfileFactory.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/bootstrap/StaticBootstrapProfileFactory.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/bootstrap/StaticBootstrapProfileFactory.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -28,12 +28,14 @@
import java.util.Collections;
import java.util.List;
+import org.jboss.profileservice.domain.AbstractDomainMetaData;
+import org.jboss.profileservice.domain.spi.DomainMetaData;
import org.jboss.profileservice.domain.spi.DomainMetaDataFragment;
import org.jboss.profileservice.domain.spi.DomainMetaDataFragmentVisitor;
+import org.jboss.profileservice.domain.spi.DomainMetaDataRepository;
import org.jboss.profileservice.profile.metadata.BasicSubProfileMetaData;
import org.jboss.profileservice.profile.metadata.helpers.AbstractProfileMetaData;
import org.jboss.profileservice.profile.metadata.helpers.ProfileMetaDataFactory;
-import org.jboss.profileservice.profile.metadata.plugin.PropertyProfileMetaData;
import org.jboss.profileservice.profile.metadata.plugin.ScanPeriod;
import org.jboss.profileservice.spi.metadata.ProfileMetaData;
import org.jboss.profileservice.spi.metadata.ProfileMetaDataVisitorNode;
@@ -46,7 +48,7 @@
* @author <a href="mailto:emuckenh at redhat.com">Emanuel Muckenhuber</a>
* @version $Revision$
*/
-public class StaticBootstrapProfileFactory implements DomainMetaDataFragment
+public class StaticBootstrapProfileFactory implements DomainMetaDataFragment, DomainMetaDataRepository
{
/** The bindings profile name. */
@@ -184,6 +186,18 @@
this.attachmentStoreRoot = attachmentStoreRoot;
}
+ protected DomainMetaDataFragment getFragment()
+ {
+ return this;
+ }
+
+ public DomainMetaData getDomainMetaData()
+ {
+ AbstractDomainMetaData domain = new AbstractDomainMetaData();
+ domain.setFragments(Collections.singletonList(getFragment()));
+ return domain;
+ }
+
public String getNameSpace()
{
return "";
@@ -191,8 +205,7 @@
public void visit(DomainMetaDataFragmentVisitor visitor)
{
- for(ProfileMetaData profile : createProfiles())
- {
+ for(ProfileMetaData profile : createProfiles()) {
visitor.addProfileMetaData(profile);
}
}
@@ -234,12 +247,10 @@
protected void createApplicationProfiles(List<ProfileMetaData> profiles, List<String> dependencies)
{
// the hot deployment profiles
- if(getApplicationURIs().isEmpty() == false)
- {
- for(int i = 0; i < getApplicationURIs().size(); i++)
- {
- URI uri = getApplicationURIs().get(i);
- String profileName = i == 0 ? applicationsName : applicationsName + i;
+ if(getApplicationURIs().isEmpty() == false) {
+ for(int i = 0; i < getApplicationURIs().size(); i++) {
+ final URI uri = getApplicationURIs().get(i);
+ final String profileName = i == 0 ? applicationsName : applicationsName + i;
profiles.add(createScanningProfile(profileName, uri, dependencies, true));
dependencies.add(profileName);
}
@@ -270,13 +281,10 @@
*/
protected ProfileMetaData createScanningProfile(String name, URI root, Collection<String> dependencies, boolean hotDeployment)
{
- PropertyProfileMetaData profile;
- if(hotDeployment)
- {
+ AbstractProfileMetaData profile;
+ if(hotDeployment) {
profile = ProfileMetaDataFactory.createHotDeploymentScanningProfile(name, root, getScanPeriod());
- }
- else
- {
+ } else {
profile = ProfileMetaDataFactory.createImmutableScanningProfile(name, root);
}
// Dependencies
@@ -292,8 +300,7 @@
protected AbstractProfileMetaData processDependencies(AbstractProfileMetaData metaData, Collection<String> names)
{
List<ProfileMetaDataVisitorNode> nodes = new ArrayList<ProfileMetaDataVisitorNode>();
- for(String name : names)
- {
+ for(String name : names) {
nodes.add(new BasicSubProfileMetaData(name));
}
metaData.setFeatures(nodes);
Modified: branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/deployers/MainDeployerPlugin.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/deployers/MainDeployerPlugin.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/deployers/MainDeployerPlugin.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -73,7 +73,7 @@
{
throw new IllegalArgumentException("null profile deployment");
}
- Deployment d = createDeployment(deployment);
+ Deployment d = createDeployment(key, deployment);
deployer.addDeployment(d);
}
@@ -125,9 +125,9 @@
this.deployer.shutdown();
}
- Deployment createDeployment(ProfileDeployment deployment)
+ Deployment createDeployment(ProfileKey key, ProfileDeployment deployment) throws Exception
{
- return deploymentBuilder.createDeployment(deployment);
+ return deploymentBuilder.createDeployment(key, deployment);
}
}
Modified: branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/deployers/StructureMetaDataBuilder.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/deployers/StructureMetaDataBuilder.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/deployers/StructureMetaDataBuilder.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -22,7 +22,6 @@
package org.jboss.system.server.profileservice.deployers;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import org.jboss.deployers.client.spi.Deployment;
@@ -73,7 +72,7 @@
protected ContextInfo createStructureMetaData(Deployment deployment, String path, BasicVirtualAssemblyContext ctx)
{
- List<String> metaDataLocations = Collections.singletonList(BasicVirtualAssemblyContext.META_INF);
+ List<String> metaDataLocations = ctx.getMetaDataLocations();
List<ClassPathEntry> classPathEntries = getClassPathEntries(ctx);
ContextInfo info = deploymentFactory.addContext(deployment, path, metaDataLocations, classPathEntries);
@@ -91,13 +90,15 @@
protected List<ClassPathEntry> getClassPathEntries(BasicVirtualAssemblyContext ctx)
{
List<ClassPathEntry> entries = new ArrayList<ClassPathEntry>();
- if(ctx.getRoots() != null && ctx.getRoots().isEmpty() == false)
+ if(ctx.getClassPathLocations() != null && ctx.getClassPathLocations().isEmpty() == false)
{
- for(String s : ctx.getRoots())
+ for(String s : ctx.getClassPathLocations())
{
- entries.add(VFSDeploymentFactory.createClassPathEntry(s));
+ entries.add(DeploymentFactory.createClassPathEntry(s));
}
}
+ // Add the root
+ entries.add(DeploymentFactory.createClassPathEntry(""));
return entries;
}
Modified: branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/deployers/VDFDeploymentBuilder.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/deployers/VDFDeploymentBuilder.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/deployers/VDFDeploymentBuilder.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -29,6 +29,7 @@
import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
import org.jboss.profileservice.deployment.DeploymentBuilder;
import org.jboss.profileservice.spi.ProfileDeployment;
+import org.jboss.profileservice.spi.ProfileKey;
import org.jboss.system.server.profileservice.repository.LegacyProfileDeploymentFactory.WorkaroundProfileDeployment;
import org.jboss.vfs.VFS;
import org.jboss.vfs.VirtualFile;
@@ -60,7 +61,7 @@
private VDFDeploymentBuilder() { }
- public Deployment createDeployment(ProfileDeployment profileDeployment)
+ public Deployment createDeployment(ProfileKey key, ProfileDeployment profileDeployment) throws Exception
{
Deployment d = null;
if(profileDeployment.getRoot() == null)
Modified: branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/repository/LegacyProfileDeploymentFactory.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/repository/LegacyProfileDeploymentFactory.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/server/profileservice/repository/LegacyProfileDeploymentFactory.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -26,7 +26,7 @@
import java.net.URISyntaxException;
import org.jboss.profileservice.deployment.AbstractProfileDeployment;
-import org.jboss.profileservice.repository.ProfileDeploymentFactory;
+import org.jboss.profileservice.deployment.ProfileDeploymentFactory;
import org.jboss.profileservice.spi.ProfileDeployment;
import org.jboss.vfs.VirtualFile;
Modified: branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/tools/LegacyDeploymentScannerAdapter.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/tools/LegacyDeploymentScannerAdapter.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/tools/LegacyDeploymentScannerAdapter.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -66,7 +66,10 @@
final Scanner scanner = scanners.next();
try
{
- scanner.start();
+ synchronized(scanner)
+ {
+ scanner.start();
+ }
}
catch(Exception e)
{
@@ -90,16 +93,19 @@
// TODO only scan the profiles registered here ?
for(final Scanner scanner : hdFactory.getRegisteredScanners())
{
- if(scanner.isScheduled())
+ synchronized(scanner)
{
- try
+ if(scanner.isScheduled())
{
- scanner.scan();
- }
- catch(Exception e)
- {
- // log
- }
+ try
+ {
+ scanner.scan();
+ }
+ catch(Exception e)
+ {
+ // log
+ }
+ }
}
}
}
@@ -114,11 +120,14 @@
{
for(final Scanner scanner : hdFactory.getRegisteredScanners())
{
- if(scanner.isScheduled())
+ synchronized(scanner)
{
- scanner.stop();
- stoppedScanners.add(scanner);
- }
+ if(scanner.isScheduled())
+ {
+ scanner.stop();
+ stoppedScanners.add(scanner);
+ }
+ }
}
}
}
Modified: branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/tools/ProfileServiceToolsFacade.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/tools/ProfileServiceToolsFacade.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/system/src/main/java/org/jboss/system/tools/ProfileServiceToolsFacade.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -42,8 +42,8 @@
import org.jboss.profileservice.spi.action.ActionController;
import org.jboss.profileservice.spi.managed.ManagedProfile;
import org.jboss.profileservice.spi.metadata.ProfileMetaData;
-import org.jboss.profileservice.spi.repository.ArtifactId;
-import org.jboss.profileservice.spi.repository.ArtifactRepository;
+import org.jboss.profileservice.spi.repository.artifact.ArtifactId;
+import org.jboss.profileservice.spi.repository.artifact.ArtifactRepository;
import org.jboss.vfs.util.PathTokenizer;
/**
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/sections/jca.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/sections/jca.xml 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/sections/jca.xml 2010-12-13 17:25:55 UTC (rev 109879)
@@ -412,8 +412,38 @@
<include name="jcaprimitive-ds.xml"/>
</fileset>
</copy>
+
+ <!-- Artifacts for new DataSourceDeployer -->
+
+ <jar destfile="${build.lib}/jca-mockdriver.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jca/dsdeployer/Mock*.class"/>
+ </fileset>
+ </jar>
+ <jar destfile="${build.lib}/jca-dsdeployer-ejbtest.jar">
+
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/jca/dsdeployer/TestEJB*.class"/>
+ </fileset>
+ </jar>
+
+ <war destfile="${build.lib}/jca-dsdeployer-test.war" webxml="${build.resources}/jca/dsdeployer/war/web.xml">
+ <classes dir="${build.classes}">
+ <include name="org/jboss/test/jca/dsdeployer/TestServlet.class"/>
+ </classes>
+ </war>
+
+ <ear destfile="${build.lib}/jca-dsdeployer-test.ear" appxml="${build.resources}/jca/dsdeployer/ear/application.xml">
+ <fileset dir="${build.lib}">
+ <include name="jca-dsdeployer-test.war"/>
+ </fileset>
+
+ </ear>
+
</target>
+
+
</project>
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/CleanShutdownTestCase.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/CleanShutdownTestCase.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/CleanShutdownTestCase.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -174,12 +174,28 @@
System.out.println(c.getDomain() + "\t" + c.getName() + "\t" + c.getPath() + "\t" + c.getValue());
}
+ String server0 = this.getServers()[0];
+ String server1 = this.getServers()[1];
+
// Copy cookies from server[0] to server[1]
for (Cookie c: this.client.getState().getCookies())
{
- if (c.getDomain().equals(this.getServers()[0]) && c.getName().equals("JSESSIONID"))
+ String domain = c.getDomain();
+ if (InetAddress.getByName(domain).equals(InetAddress.getByName(server0)) && c.getName().equals("JSESSIONID"))
{
- this.client.getState().addCookie(new Cookie(this.getServers()[1], c.getName(), c.getValue(), c.getPath(), c.getExpiryDate(), c.getSecure()));
+ // TODO Replace this with JBossTestUtil.fixHostnameForURL(), when ready
+ boolean wrap = domain.startsWith("[") && !server1.startsWith("[");
+ StringBuilder builder = new StringBuilder();
+ if (wrap)
+ {
+ builder.append('[');
+ }
+ builder.append(server1);
+ if (wrap)
+ {
+ builder.append(']');
+ }
+ this.client.getState().addCookie(new Cookie(builder.toString(), c.getName(), c.getValue(), c.getPath(), c.getExpiryDate(), c.getSecure()));
}
}
@@ -229,6 +245,7 @@
this.sleep = sleep;
}
+ @Override
public Integer call() throws Exception
{
GetMethod method = new GetMethod(String.format(URL, CleanShutdownTestCase.this.getHttpURLs()[this.server], this.sleep));
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/AsyncBean.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/AsyncBean.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/AsyncBean.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1,5 +1,8 @@
package org.jboss.test.ejb3.async;
+import org.jboss.logging.Logger;
+
+import javax.annotation.Resource;
import javax.ejb.*;
import java.util.concurrent.Future;
@@ -11,8 +14,18 @@
@Stateless
@Local(AsyncLocalBusiness.class)
@Remote(AsyncRemoteBusiness.class)
+ at LocalBean
public class AsyncBean implements AsyncCommonBusiness
{
+
+ private static final Logger log = Logger.getLogger(AsyncBean.class);
+
+ @Resource
+ private SessionContext context;
+
+ @EJB
+ private StatusCommonBusiness status;
+
@Asynchronous
public Future<String> getExecutingThreadNameAsync() {
return this.getExecutingThreadName();
@@ -22,6 +35,44 @@
return this.getExecutingThreadName();
}
+ @Asynchronous
+ public Future<Void> waitTenSeconds(){
+
+ log.info("Entered request to wait one minute");
+ // Reset the singleton status flag
+ status.reset();
+
+ final long start = System.currentTimeMillis();
+ // End in 10 seconds
+ final long end = start+(10*1000);
+
+ // Loop
+ log.info("START LOOP");
+ while(System.currentTimeMillis()<end){
+
+ // If we've been cancelled, update the singleton status bit
+ if(context.wasCancelCalled())
+ {
+ status.set(true);
+ log.info("Set status to true");
+ // Break out of the loop
+ break;
+ }
+
+ // Wait a bit and check again
+ try {
+ log.info("Waiting...");
+ Thread.sleep(50);
+ } catch (final InterruptedException e) {
+ Thread.interrupted(); // Clear the flag
+ throw new RuntimeException("Should not have been interrupted");
+ }
+
+ }
+ // Return a dummy value
+ return new AsyncResult<Void>(null);
+ }
+
private Future<String> getExecutingThreadName(){
return new AsyncResult<String>(Thread.currentThread().getName());
}
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/AsyncCommonBusiness.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/AsyncCommonBusiness.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/AsyncCommonBusiness.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -47,4 +47,11 @@
* @return
*/
Future<String> getExecutingThreadNameBlocking();
+
+
+ /**
+ * Waits for a full minute before returning
+ * @return
+ */
+ Future<Void> waitTenSeconds();
}
\ No newline at end of file
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/AsyncTesterBean.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/AsyncTesterBean.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/AsyncTesterBean.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -21,12 +21,10 @@
*/
package org.jboss.test.ejb3.async;
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.ejb3.proxy.impl.handler.session.SessionProxyInvocationHandlerBase;
-
-import javax.ejb.*;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Proxy;
+import javax.ejb.EJB;
+import javax.ejb.Remote;
+import javax.ejb.Stateless;
+import java.util.concurrent.*;
import java.util.logging.Logger;
/**
@@ -59,6 +57,12 @@
@EJB
private AsyncRemoteBusiness remote;
+ @EJB
+ private AsyncBean nointerface;
+
+ @EJB
+ private StatusCommonBusiness status;
+
// --------------------------------------------------------------------------------||
// Required Implementations -------------------------------------------------------||
// --------------------------------------------------------------------------------||
@@ -68,16 +72,8 @@
* @return
*/
public boolean isLocalAsyncInvocationExecutedInNewThread() {
- final String current = Thread.currentThread().getName();
- final String used;
- try{
- used = local.getExecutingThreadNameAsync().get();
- }
- catch(final Exception e){
- throw new RuntimeException(e);
- }
- log.info("Local @Asynchronous Invocation - Current:" + current + ", Used: " + used);
- return !current.equals(used);
+ log.info("Local @Asynchronous Invocation");
+ return isAsyncInvocationExecutedInNewThread(local);
}
/**
@@ -85,15 +81,30 @@
* @return
*/
public boolean isRemoteAsyncInvocationExecutedInNewThread() {
- final String current = Thread.currentThread().getName();
+ log.info("Remote @Asynchronous Invocation");
+ return isAsyncInvocationExecutedInNewThread(remote);
+ }
+
+ /**
+ *
+ * @return
+ */
+ public boolean isNointerfaceAsyncInvocationExecutedInNewThread() {
+ log.info("No-interface @Asynchronous Invocation");
+ return isAsyncInvocationExecutedInNewThread(nointerface);
+ }
+
+ private boolean isAsyncInvocationExecutedInNewThread(final AsyncCommonBusiness bean)
+ {
+ final String current = Thread.currentThread().getName();
final String used;
try{
- used = remote.getExecutingThreadNameAsync().get();
+ used = bean.getExecutingThreadNameAsync().get();
}
catch(final Exception e){
throw new RuntimeException(e);
}
- log.info("Remote @Asynchronous Invocation - Current:" + current + ", Used: " + used);
+ log.info("@Asynchronous Invocation - Current:" + current + ", Used: " + used);
return !current.equals(used);
}
@@ -109,4 +120,67 @@
log.info("Local non- at Asynchronous Invocation - Current:" + current + ", Used: " + used);
return current.equals(used);
}
+
+
+ public boolean cancelInterruptIfRunningWorksLocal() {
+ return this.cancelInterruptIfRunningWorks(local);
+ }
+
+ public boolean cancelInterruptIfRunningWorksRemote() {
+ return this.cancelInterruptIfRunningWorks(remote);
+ }
+
+ private boolean cancelInterruptIfRunningWorks(final AsyncCommonBusiness bean)
+ { final Future<Void> future = bean.waitTenSeconds();
+
+ // At least let the request get sent along
+ try
+ {
+ Thread.sleep(300);
+ }
+ catch(final InterruptedException ie)
+ {
+ Thread.interrupted();
+ throw new RuntimeException("Should not be interrupted");
+ }
+
+ final ExecutorService es =Executors.newSingleThreadExecutor();
+ es.submit(new Callable<Void>() {
+
+ public Void call() throws Exception {
+ Thread.sleep(1000);
+ future.cancel(true);
+ return null;
+ }
+ });
+ es.shutdown();
+
+ log.info("Submitted cancel request");
+ try {
+ // Block
+ log.info("Blocking on result now");
+ future.get(20, TimeUnit.SECONDS);
+ log.info("Done? " +future.isDone());
+ log.info("Got result");
+ } catch (InterruptedException e) {
+ Thread.interrupted();
+ log.info(e.getMessage());
+ throw new RuntimeException("Should not be interrupted");
+ } catch (ExecutionException e) {
+ log.info(e.getMessage());
+ throw new RuntimeException("Should not receive execution exception");
+ }
+ catch(final TimeoutException te)
+ {
+ log.info("TIMEOUT");
+ throw new RuntimeException("Should not have timed out",te);
+ }
+ catch(final RuntimeException re){
+ log.info("RuntimeException: " + re);
+ }
+ log.info("Returning");
+
+ return status.wasCancelled();
+ }
+
}
\ No newline at end of file
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/AsyncTesterCommonBusiness.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/AsyncTesterCommonBusiness.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/AsyncTesterCommonBusiness.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -44,10 +44,27 @@
*/
boolean isRemoteAsyncInvocationExecutedInNewThread();
+ /**
+ * Returns whether or not a remote invocation is executed in a new Thread
+ */
+ boolean isNointerfaceAsyncInvocationExecutedInNewThread();
+
/**
* Returns whether a Future return type on a non-Asynchronous
* method is executed within the same Thread
* @return
*/
boolean isLocalBlockingInvocationExecutedInSameThread();
+
+ /**
+ *
+ * @return
+ */
+ boolean cancelInterruptIfRunningWorksLocal();
+
+ /**
+ *
+ * @return
+ */
+ boolean cancelInterruptIfRunningWorksRemote();
}
\ No newline at end of file
Copied: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/StatusBean.java (from rev 109877, trunk/testsuite/src/main/org/jboss/test/ejb3/async/StatusBean.java)
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/StatusBean.java (rev 0)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/StatusBean.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -0,0 +1,35 @@
+package org.jboss.test.ejb3.async;
+
+import org.jboss.logging.Logger;
+
+import javax.annotation.PostConstruct;
+import javax.ejb.Local;
+import javax.ejb.Singleton;
+
+/**
+ * Implementation of an EJB to track the status
+ * of @Asynchronous cancel methods
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ */
+ at Singleton
+ at Local(StatusCommonBusiness.class)
+public class StatusBean implements StatusCommonBusiness {
+
+ private static final Logger log = Logger.getLogger(StatusBean.class);
+ private boolean cancelled;
+
+ @PostConstruct
+ public void reset() {
+ this.set(false);
+ }
+
+ public void set(final boolean cancelled) {
+ log.info("Setting Cancelled Status: " + cancelled);
+ this.cancelled = cancelled;
+ }
+
+ public boolean wasCancelled() {
+ return cancelled;
+ }
+}
\ No newline at end of file
Copied: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/StatusCommonBusiness.java (from rev 109877, trunk/testsuite/src/main/org/jboss/test/ejb3/async/StatusCommonBusiness.java)
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/StatusCommonBusiness.java (rev 0)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/StatusCommonBusiness.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ejb3.async;
+
+/**
+ * Business view of a bean with to keep track of
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @Asynchronous cancel events
+ */
+public interface StatusCommonBusiness {
+ // --------------------------------------------------------------------------------||
+ // Contracts ----------------------------------------------------------------------||
+ // --------------------------------------------------------------------------------||
+
+ /**
+ * Returns whether or not the last async call was cancelled
+ *
+ * @return
+ */
+ boolean wasCancelled();
+
+ /**
+ * Resets the cancelled flag
+ */
+ void reset();
+
+ /**
+ * Sets the status bit
+ *
+ * @param cancelled
+ */
+ void set(final boolean cancelled);
+
+}
\ No newline at end of file
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/test/AsyncSessionBeanUnitTestCase.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/test/AsyncSessionBeanUnitTestCase.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/ejb3/async/test/AsyncSessionBeanUnitTestCase.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -65,11 +65,28 @@
Assert.assertTrue("Local invocation not executed in new Thread",bean.isLocalAsyncInvocationExecutedInNewThread());
}
+ public void testNointerfaceAsyncInvocation()
+ throws Exception
+ {
+ final AsyncTesterCommonBusiness bean = this.getTesterBean();
+ Assert.assertTrue("Nointerface invocation not executed in new Thread",bean.isNointerfaceAsyncInvocationExecutedInNewThread());
+ }
+
public void testLocalBlockingInvocation() throws Exception{
final AsyncTesterCommonBusiness bean = this.getTesterBean();
Assert.assertTrue("Local non-async invocation not executed in same Thread",bean.isLocalBlockingInvocationExecutedInSameThread());
}
+ public void testLocalCancel() throws Exception{
+ final AsyncTesterCommonBusiness bean = this.getTesterBean();
+ Assert.assertTrue("Local async call should be able to be cancelled",bean.cancelInterruptIfRunningWorksLocal());
+ }
+
+ public void testLocalRemote() throws Exception{
+ final AsyncTesterCommonBusiness bean = this.getTesterBean();
+ Assert.assertTrue("Remote async call should be able to be cancelled",bean.cancelInterruptIfRunningWorksRemote());
+ }
+
private AsyncTesterCommonBusiness getTesterBean() throws Exception {
final InitialContext ctx = getInitialContext();
final String jndiName = "AsyncTesterBean/remote";
Copied: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer (from rev 109877, trunk/testsuite/src/main/org/jboss/test/jca/dsdeployer)
Deleted: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockConnection.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockConnection.java 2010-12-13 15:41:52 UTC (rev 109877)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockConnection.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1,326 +0,0 @@
-package org.jboss.test.jca.dsdeployer;
-
-import java.sql.Array;
-import java.sql.Blob;
-import java.sql.CallableStatement;
-import java.sql.Clob;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.NClob;
-import java.sql.PreparedStatement;
-import java.sql.SQLClientInfoException;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
-import java.sql.SQLXML;
-import java.sql.Savepoint;
-import java.sql.Statement;
-import java.sql.Struct;
-import java.util.Map;
-import java.util.Properties;
-
-public class MockConnection implements Connection {
-
- @Override
- public boolean isWrapperFor(Class<?> iface) throws SQLException {
- // TODO Auto-generated method stub
- return false;
- }
-
- @Override
- public <T> T unwrap(Class<T> iface) throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public void clearWarnings() throws SQLException {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void close() throws SQLException {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void commit() throws SQLException {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public Array createArrayOf(String arg0, Object[] arg1) throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public Blob createBlob() throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public Clob createClob() throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public NClob createNClob() throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public SQLXML createSQLXML() throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public Statement createStatement() throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public Statement createStatement(int arg0, int arg1) throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public Statement createStatement(int arg0, int arg1, int arg2)
- throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public Struct createStruct(String arg0, Object[] arg1) throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public boolean getAutoCommit() throws SQLException {
- // TODO Auto-generated method stub
- return false;
- }
-
- @Override
- public String getCatalog() throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public Properties getClientInfo() throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public String getClientInfo(String arg0) throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public int getHoldability() throws SQLException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- @Override
- public DatabaseMetaData getMetaData() throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public int getTransactionIsolation() throws SQLException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- @Override
- public Map<String, Class<?>> getTypeMap() throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public SQLWarning getWarnings() throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public boolean isClosed() throws SQLException {
- // TODO Auto-generated method stub
- return false;
- }
-
- @Override
- public boolean isReadOnly() throws SQLException {
- // TODO Auto-generated method stub
- return false;
- }
-
- @Override
- public boolean isValid(int arg0) throws SQLException {
- // TODO Auto-generated method stub
- return false;
- }
-
- @Override
- public String nativeSQL(String arg0) throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public CallableStatement prepareCall(String arg0) throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public CallableStatement prepareCall(String arg0, int arg1, int arg2)
- throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public CallableStatement prepareCall(String arg0, int arg1, int arg2,
- int arg3) throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public PreparedStatement prepareStatement(String arg0) throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public PreparedStatement prepareStatement(String arg0, int arg1)
- throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public PreparedStatement prepareStatement(String arg0, int[] arg1)
- throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public PreparedStatement prepareStatement(String arg0, String[] arg1)
- throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public PreparedStatement prepareStatement(String arg0, int arg1, int arg2)
- throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public PreparedStatement prepareStatement(String arg0, int arg1, int arg2,
- int arg3) throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public void releaseSavepoint(Savepoint arg0) throws SQLException {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void rollback() throws SQLException {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void rollback(Savepoint arg0) throws SQLException {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void setAutoCommit(boolean arg0) throws SQLException {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void setCatalog(String arg0) throws SQLException {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void setClientInfo(Properties arg0) throws SQLClientInfoException {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void setClientInfo(String arg0, String arg1)
- throws SQLClientInfoException {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void setHoldability(int arg0) throws SQLException {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void setReadOnly(boolean arg0) throws SQLException {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public Savepoint setSavepoint() throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public Savepoint setSavepoint(String arg0) throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public void setTransactionIsolation(int arg0) throws SQLException {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void setTypeMap(Map<String, Class<?>> arg0) throws SQLException {
- // TODO Auto-generated method stub
-
- }
-
-}
Copied: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockConnection.java (from rev 109877, trunk/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockConnection.java)
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockConnection.java (rev 0)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockConnection.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -0,0 +1,326 @@
+package org.jboss.test.jca.dsdeployer;
+
+import java.sql.Array;
+import java.sql.Blob;
+import java.sql.CallableStatement;
+import java.sql.Clob;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.NClob;
+import java.sql.PreparedStatement;
+import java.sql.SQLClientInfoException;
+import java.sql.SQLException;
+import java.sql.SQLWarning;
+import java.sql.SQLXML;
+import java.sql.Savepoint;
+import java.sql.Statement;
+import java.sql.Struct;
+import java.util.Map;
+import java.util.Properties;
+
+public class MockConnection implements Connection {
+
+ @Override
+ public boolean isWrapperFor(Class<?> iface) throws SQLException {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public <T> T unwrap(Class<T> iface) throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public void clearWarnings() throws SQLException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void close() throws SQLException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void commit() throws SQLException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public Array createArrayOf(String arg0, Object[] arg1) throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Blob createBlob() throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Clob createClob() throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public NClob createNClob() throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public SQLXML createSQLXML() throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Statement createStatement() throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Statement createStatement(int arg0, int arg1) throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Statement createStatement(int arg0, int arg1, int arg2)
+ throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Struct createStruct(String arg0, Object[] arg1) throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public boolean getAutoCommit() throws SQLException {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public String getCatalog() throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Properties getClientInfo() throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public String getClientInfo(String arg0) throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public int getHoldability() throws SQLException {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public DatabaseMetaData getMetaData() throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public int getTransactionIsolation() throws SQLException {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public Map<String, Class<?>> getTypeMap() throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public SQLWarning getWarnings() throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public boolean isClosed() throws SQLException {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public boolean isReadOnly() throws SQLException {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public boolean isValid(int arg0) throws SQLException {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public String nativeSQL(String arg0) throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public CallableStatement prepareCall(String arg0) throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public CallableStatement prepareCall(String arg0, int arg1, int arg2)
+ throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public CallableStatement prepareCall(String arg0, int arg1, int arg2,
+ int arg3) throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public PreparedStatement prepareStatement(String arg0) throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public PreparedStatement prepareStatement(String arg0, int arg1)
+ throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public PreparedStatement prepareStatement(String arg0, int[] arg1)
+ throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public PreparedStatement prepareStatement(String arg0, String[] arg1)
+ throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public PreparedStatement prepareStatement(String arg0, int arg1, int arg2)
+ throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public PreparedStatement prepareStatement(String arg0, int arg1, int arg2,
+ int arg3) throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public void releaseSavepoint(Savepoint arg0) throws SQLException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void rollback() throws SQLException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void rollback(Savepoint arg0) throws SQLException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setAutoCommit(boolean arg0) throws SQLException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setCatalog(String arg0) throws SQLException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setClientInfo(Properties arg0) throws SQLClientInfoException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setClientInfo(String arg0, String arg1)
+ throws SQLClientInfoException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setHoldability(int arg0) throws SQLException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setReadOnly(boolean arg0) throws SQLException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public Savepoint setSavepoint() throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public Savepoint setSavepoint(String arg0) throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public void setTransactionIsolation(int arg0) throws SQLException {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void setTypeMap(Map<String, Class<?>> arg0) throws SQLException {
+ // TODO Auto-generated method stub
+
+ }
+
+}
Deleted: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockDataSource.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockDataSource.java 2010-12-13 15:41:52 UTC (rev 109877)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockDataSource.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1,99 +0,0 @@
-package org.jboss.test.jca.dsdeployer;
-
-import java.io.PrintWriter;
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.sql.DataSource;
-import javax.sql.XAConnection;
-import javax.sql.XADataSource;
-
-public class MockDataSource implements DataSource, XADataSource {
-
- private String serverName;
- private String databaseName;
- private int portNumber;
-
- @Override
- public PrintWriter getLogWriter() throws SQLException {
- return null;
- }
-
- @Override
- public int getLoginTimeout() throws SQLException {
- return 0;
- }
-
- @Override
- public void setLogWriter(PrintWriter arg0) throws SQLException {
-
- }
-
- @Override
- public void setLoginTimeout(int arg0) throws SQLException {
-
- }
-
- @Override
- public boolean isWrapperFor(Class<?> arg0) throws SQLException {
- return false;
- }
-
- @Override
- public <T> T unwrap(Class<T> arg0) throws SQLException {
- return null;
- }
-
- @Override
- public Connection getConnection() throws SQLException {
- return new MockConnection();
- }
-
- @Override
- public Connection getConnection(String arg0, String arg1)
- throws SQLException {
- return new MockConnection();
- }
-
- public String getServerName() {
- return serverName;
- }
-
- public void setServerName(String serverName) {
- this.serverName = serverName;
- }
-
- public String getDatabaseName() {
- return databaseName;
- }
-
- public void setDatabaseName(String databaseName) {
- this.databaseName = databaseName;
- }
-
- public int getPortNumber() {
- return portNumber;
- }
-
- public void setPortNumber(int portNumber) {
- this.portNumber = portNumber;
- }
-
- @Override
- public XAConnection getXAConnection() throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public XAConnection getXAConnection(String arg0, String arg1)
- throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
-
-
-
-
-}
Copied: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockDataSource.java (from rev 109877, trunk/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockDataSource.java)
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockDataSource.java (rev 0)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockDataSource.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -0,0 +1,99 @@
+package org.jboss.test.jca.dsdeployer;
+
+import java.io.PrintWriter;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import javax.sql.DataSource;
+import javax.sql.XAConnection;
+import javax.sql.XADataSource;
+
+public class MockDataSource implements DataSource, XADataSource {
+
+ private String serverName;
+ private String databaseName;
+ private int portNumber;
+
+ @Override
+ public PrintWriter getLogWriter() throws SQLException {
+ return null;
+ }
+
+ @Override
+ public int getLoginTimeout() throws SQLException {
+ return 0;
+ }
+
+ @Override
+ public void setLogWriter(PrintWriter arg0) throws SQLException {
+
+ }
+
+ @Override
+ public void setLoginTimeout(int arg0) throws SQLException {
+
+ }
+
+ @Override
+ public boolean isWrapperFor(Class<?> arg0) throws SQLException {
+ return false;
+ }
+
+ @Override
+ public <T> T unwrap(Class<T> arg0) throws SQLException {
+ return null;
+ }
+
+ @Override
+ public Connection getConnection() throws SQLException {
+ return new MockConnection();
+ }
+
+ @Override
+ public Connection getConnection(String arg0, String arg1)
+ throws SQLException {
+ return new MockConnection();
+ }
+
+ public String getServerName() {
+ return serverName;
+ }
+
+ public void setServerName(String serverName) {
+ this.serverName = serverName;
+ }
+
+ public String getDatabaseName() {
+ return databaseName;
+ }
+
+ public void setDatabaseName(String databaseName) {
+ this.databaseName = databaseName;
+ }
+
+ public int getPortNumber() {
+ return portNumber;
+ }
+
+ public void setPortNumber(int portNumber) {
+ this.portNumber = portNumber;
+ }
+
+ @Override
+ public XAConnection getXAConnection() throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public XAConnection getXAConnection(String arg0, String arg1)
+ throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
+
+
+
+}
Deleted: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockDriver.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockDriver.java 2010-12-13 15:41:52 UTC (rev 109877)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockDriver.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1,48 +0,0 @@
-package org.jboss.test.jca.dsdeployer;
-
-import java.sql.Connection;
-import java.sql.Driver;
-import java.sql.DriverPropertyInfo;
-import java.sql.SQLException;
-import java.util.Properties;
-
-public class MockDriver implements Driver {
-
- @Override
- public boolean acceptsURL(String arg0) throws SQLException {
- // TODO Auto-generated method stub
- return false;
- }
-
- @Override
- public Connection connect(String arg0, Properties arg1) throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public int getMajorVersion() {
- // TODO Auto-generated method stub
- return 0;
- }
-
- @Override
- public int getMinorVersion() {
- // TODO Auto-generated method stub
- return 0;
- }
-
- @Override
- public DriverPropertyInfo[] getPropertyInfo(String arg0, Properties arg1)
- throws SQLException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public boolean jdbcCompliant() {
- // TODO Auto-generated method stub
- return false;
- }
-
-}
Copied: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockDriver.java (from rev 109877, trunk/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockDriver.java)
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockDriver.java (rev 0)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/MockDriver.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -0,0 +1,48 @@
+package org.jboss.test.jca.dsdeployer;
+
+import java.sql.Connection;
+import java.sql.Driver;
+import java.sql.DriverPropertyInfo;
+import java.sql.SQLException;
+import java.util.Properties;
+
+public class MockDriver implements Driver {
+
+ @Override
+ public boolean acceptsURL(String arg0) throws SQLException {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public Connection connect(String arg0, Properties arg1) throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public int getMajorVersion() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public int getMinorVersion() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public DriverPropertyInfo[] getPropertyInfo(String arg0, Properties arg1)
+ throws SQLException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public boolean jdbcCompliant() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+}
Deleted: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJB.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJB.java 2010-12-13 15:41:52 UTC (rev 109877)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJB.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1,61 +0,0 @@
-package org.jboss.test.jca.dsdeployer;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import javax.annotation.sql.DataSourceDefinition;
-import javax.ejb.Local;
-import javax.ejb.Stateless;
-import javax.sql.DataSource;
-
- at DataSourceDefinition(name="java:EJBAnnotDS", className="org.hsqldb.jdbcDriver", url="jdbc:hsqldb:mem:JCADataSourceDeployerDB")
- at Stateless
- at Local(TestEJBLocal.class)
-public class TestEJB implements TestEJBLocal, TestEJBRemote
-{
-
-// @Resource(mappedName="java:EJBAnnotDS")
- private DataSource dataSource;
-
- @Override
- public void testDataSource() throws Exception
- {
- Connection c = null;
- Statement s = null;
- ResultSet rs = null;
-
- try
- {
- //c = dataSource.getConnection();
- s = c.createStatement();
- rs = s.executeQuery("select * from iqserver");
-
- }
- catch(Exception e)
- {
- e.printStackTrace();
- throw e;
- }
- finally
- {
- try {
- if(rs != null)
- {
- rs.close();
- }
- if(s != null)
- {
- s.close();
- }
- if(c != null)
- {
- c.close();
- }
- } catch (SQLException ignore)
- {
- }
- }
- }
-}
Copied: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJB.java (from rev 109877, trunk/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJB.java)
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJB.java (rev 0)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJB.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -0,0 +1,61 @@
+package org.jboss.test.jca.dsdeployer;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import javax.annotation.sql.DataSourceDefinition;
+import javax.ejb.Local;
+import javax.ejb.Stateless;
+import javax.sql.DataSource;
+
+ at DataSourceDefinition(name="java:EJBAnnotDS", className="org.hsqldb.jdbcDriver", url="jdbc:hsqldb:mem:JCADataSourceDeployerDB")
+ at Stateless
+ at Local(TestEJBLocal.class)
+public class TestEJB implements TestEJBLocal, TestEJBRemote
+{
+
+// @Resource(mappedName="java:EJBAnnotDS")
+ private DataSource dataSource;
+
+ @Override
+ public void testDataSource() throws Exception
+ {
+ Connection c = null;
+ Statement s = null;
+ ResultSet rs = null;
+
+ try
+ {
+ //c = dataSource.getConnection();
+ s = c.createStatement();
+ rs = s.executeQuery("select * from iqserver");
+
+ }
+ catch(Exception e)
+ {
+ e.printStackTrace();
+ throw e;
+ }
+ finally
+ {
+ try {
+ if(rs != null)
+ {
+ rs.close();
+ }
+ if(s != null)
+ {
+ s.close();
+ }
+ if(c != null)
+ {
+ c.close();
+ }
+ } catch (SQLException ignore)
+ {
+ }
+ }
+ }
+}
Deleted: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJBLocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJBLocal.java 2010-12-13 15:41:52 UTC (rev 109877)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJBLocal.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1,8 +0,0 @@
-package org.jboss.test.jca.dsdeployer;
-
-import javax.ejb.Local;
-
-public interface TestEJBLocal
-{
- public void testDataSource() throws Exception;
-}
Copied: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJBLocal.java (from rev 109877, trunk/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJBLocal.java)
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJBLocal.java (rev 0)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJBLocal.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -0,0 +1,8 @@
+package org.jboss.test.jca.dsdeployer;
+
+import javax.ejb.Local;
+
+public interface TestEJBLocal
+{
+ public void testDataSource() throws Exception;
+}
Deleted: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJBRemote.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJBRemote.java 2010-12-13 15:41:52 UTC (rev 109877)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJBRemote.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1,9 +0,0 @@
-package org.jboss.test.jca.dsdeployer;
-
-import javax.ejb.Remote;
-
- at Remote
-public interface TestEJBRemote
-{
-
-}
Copied: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJBRemote.java (from rev 109877, trunk/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJBRemote.java)
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJBRemote.java (rev 0)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestEJBRemote.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -0,0 +1,9 @@
+package org.jboss.test.jca.dsdeployer;
+
+import javax.ejb.Remote;
+
+ at Remote
+public interface TestEJBRemote
+{
+
+}
Deleted: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestServlet.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestServlet.java 2010-12-13 15:41:52 UTC (rev 109877)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestServlet.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1,82 +0,0 @@
-package org.jboss.test.jca.dsdeployer;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import javax.annotation.Resource;
-import javax.annotation.sql.DataSourceDefinition;
-import javax.annotation.sql.DataSourceDefinitions;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.sql.DataSource;
-
- at DataSourceDefinitions({
- @DataSourceDefinition(name="WebAnnotDS", className="org.hsqldb.jdbcDriver", url="jdbc:hsqldb:mem:JCADataSourceDeployerDB", user="sa"),
- @DataSourceDefinition(name="WebOverrideDS", className="org.hsqldb.jdbcDriver", url="jdbc:hsqldb:mem:JCADataSourceDeployerDB", user="sa", transactional=false)
-}
-)
-
- at WebServlet(value="/test", name="TestServlet")
-public class TestServlet extends HttpServlet
-{
-
- @Resource(mappedName="java:WebAnnotDS")
- private DataSource webAnnotDS;
-
- @Resource(mappedName="java:DSWebXML")
- private DataSource webXMLDS;
-
- @Resource(mappedName="java:DSEARXML")
- private DataSource earXMLDS;
-
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
- doPost(req, resp);
- }
-
- @Override
- protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
- {
- Connection c = null;
- Statement s = null;
- ResultSet rs = null;
-
- try
- {
- s = c.createStatement();
- }
- catch(Exception e)
- {
- throw new ServletException(e.getMessage(), e);
- }
- finally
- {
- try {
- if(rs != null)
- {
- rs.close();
- }
- if(s != null)
- {
- s.close();
- }
- if(c != null)
- {
- c.close();
- }
- } catch (SQLException ignore)
- {
- }
- }
- }
-
-
-
-}
Copied: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestServlet.java (from rev 109877, trunk/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestServlet.java)
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestServlet.java (rev 0)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/dsdeployer/TestServlet.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -0,0 +1,82 @@
+package org.jboss.test.jca.dsdeployer;
+
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import javax.annotation.Resource;
+import javax.annotation.sql.DataSourceDefinition;
+import javax.annotation.sql.DataSourceDefinitions;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.sql.DataSource;
+
+ at DataSourceDefinitions({
+ @DataSourceDefinition(name="WebAnnotDS", className="org.hsqldb.jdbcDriver", url="jdbc:hsqldb:mem:JCADataSourceDeployerDB", user="sa"),
+ @DataSourceDefinition(name="WebOverrideDS", className="org.hsqldb.jdbcDriver", url="jdbc:hsqldb:mem:JCADataSourceDeployerDB", user="sa", transactional=false)
+}
+)
+
+ at WebServlet(value="/test", name="TestServlet")
+public class TestServlet extends HttpServlet
+{
+
+ @Resource(mappedName="java:WebAnnotDS")
+ private DataSource webAnnotDS;
+
+ @Resource(mappedName="java:DSWebXML")
+ private DataSource webXMLDS;
+
+ @Resource(mappedName="java:DSEARXML")
+ private DataSource earXMLDS;
+
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws ServletException, IOException {
+ doPost(req, resp);
+ }
+
+ @Override
+ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
+ {
+ Connection c = null;
+ Statement s = null;
+ ResultSet rs = null;
+
+ try
+ {
+ s = c.createStatement();
+ }
+ catch(Exception e)
+ {
+ throw new ServletException(e.getMessage(), e);
+ }
+ finally
+ {
+ try {
+ if(rs != null)
+ {
+ rs.close();
+ }
+ if(s != null)
+ {
+ s.close();
+ }
+ if(c != null)
+ {
+ c.close();
+ }
+ } catch (SQLException ignore)
+ {
+ }
+ }
+ }
+
+
+
+}
Copied: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/support/JCATestSupport.java (from rev 109877, trunk/testsuite/src/main/org/jboss/test/jca/support/JCATestSupport.java)
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/support/JCATestSupport.java (rev 0)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/support/JCATestSupport.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -0,0 +1,30 @@
+package org.jboss.test.jca.support;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+
+public class JCATestSupport
+{
+ private static MBeanServerConnection server;
+
+ private JCATestSupport(MBeanServerConnection server)
+ {
+ this.server = server;
+ }
+
+ public static JCATestSupport getInstance(MBeanServerConnection server)
+ {
+ return new JCATestSupport(server);
+ }
+ public static ObjectName getMCFForDeployment(final String name) throws Exception
+ {
+ return new ObjectName("jboss.jca:name=" + name + ",service=ManagedConnectionFactory");
+ }
+
+ public static ObjectName getPoolForDeployment(final String name) throws Exception
+ {
+ return new ObjectName("jboss.jca:name=" + name + ",service=ManagedConnectionPool");
+
+ }
+
+}
Copied: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/test/DataSourceDeployerTestCase.java (from rev 109877, trunk/testsuite/src/main/org/jboss/test/jca/test/DataSourceDeployerTestCase.java)
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/test/DataSourceDeployerTestCase.java (rev 0)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/jca/test/DataSourceDeployerTestCase.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -0,0 +1,129 @@
+package org.jboss.test.jca.test;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.Properties;
+
+import junit.framework.Test;
+
+import org.jboss.test.JBossTestCase;
+import org.jboss.test.jca.support.JCATestSupport;
+
+public class DataSourceDeployerTestCase extends JBossTestCase
+{
+ private static final String EARXMLDS = "DSEARXML";
+ private static final String DRIVEREARXML = "DriverEARXML";
+ private static final String XADSEARXML = "XADSEARXML";
+
+ private static final String WEBANNOTDS = "WebAnnotDS";
+ private static final String WEBXMLDS = "DSWebXML";
+ private static final String WEBOVRDS = "WebOverrideDS";
+
+
+ public DataSourceDeployerTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testBasicDeployment() throws Exception
+ {
+ try
+ {
+ deploy("jca-mockdriver.jar");
+ Properties props = getConnectionProperties(EARXMLDS);
+ assertTrue(props.containsKey("serverName") && props.containsKey("databaseName") && props.containsKey("portNumber"));
+ assertTrue(deploymentUsesDataSource(EARXMLDS));
+
+ props.clear();
+
+ props = getConnectionProperties(DRIVEREARXML);
+ assertTrue(props.size() == 0);
+ assertFalse(deploymentUsesDataSource(DRIVEREARXML));
+
+ props.clear();
+ props = getConnectionProperties(XADSEARXML, true);
+ assertTrue("XADataSourceProperties should have been set", props.size() > 0);
+
+ props.clear();
+ props = getConnectionProperties(WEBOVRDS, true);
+ assertTrue("XADataSourceProperties should have been set on overriden datasource", props.size() > 0);
+
+
+
+
+
+ }
+ catch(Exception e)
+ {
+ throw e;
+ }
+ finally
+ {
+ undeploy("jca-mockdriver.jar");
+
+ }
+ }
+
+
+ public static Test suite() throws Exception
+ {
+ //getDeploySetup(DataSourceDeployerTestCase.class, "jca-mockdriver.jar");
+ Test t1 = getDeploySetup(DataSourceDeployerTestCase.class, "jca-dsdeployer-test.ear");
+ return t1;
+
+ }
+
+ private Object getMCFAttribute(String name, String attribute, Class<?> type) throws Exception
+ {
+ return invoke(JCATestSupport.getMCFForDeployment(name), "getManagedConnectionFactoryAttribute", new Object[]{attribute}, new String[]{type.getName()});
+ }
+
+ private Properties getXAConnectionProperties(String name) throws Exception
+ {
+ return getConnectionProperties(name, true);
+ }
+ private Properties getConnectionProperties(String name) throws Exception
+ {
+ return getConnectionProperties(name, false);
+ }
+
+ private Properties getConnectionProperties(String name, boolean xa) throws Exception
+ {
+ String strResults = null;
+
+ if(xa)
+ {
+ strResults = (String)getMCFAttribute(name, "XADataSourceProperties", String.class);
+
+ }
+ else
+ {
+ strResults = (String)getMCFAttribute(name, "ConnectionProperties", String.class);
+
+ }
+
+ log.debug("Received properties results from server fomr name " + name + " " + strResults);
+
+ Properties props = new Properties();
+ System.out.println(strResults);
+
+ if(strResults != null)
+ {
+ strResults = strResults.replaceAll("\\\\", "\\\\\\\\");
+ System.out.println(strResults);
+ InputStream is = new ByteArrayInputStream(strResults.getBytes());
+ props.load(is);
+
+ }
+
+ return props;
+ }
+
+ private boolean deploymentUsesDataSource(String name) throws Exception
+ {
+ Boolean results = (Boolean)getMCFAttribute(name, "UseDataSource", String.class);
+ String url = (String)getMCFAttribute(name, "ConnectionURL", String.class);
+ return (results != null && results && url == null) ? Boolean.TRUE : Boolean.FALSE;
+ }
+
+}
Copied: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/jca/dsdeployer/ear (from rev 109877, trunk/testsuite/src/resources/jca/dsdeployer/ear)
Deleted: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/jca/dsdeployer/ear/application.xml
===================================================================
--- trunk/testsuite/src/resources/jca/dsdeployer/ear/application.xml 2010-12-13 15:41:52 UTC (rev 109877)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/jca/dsdeployer/ear/application.xml 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/application_6.xsd"
- version="6" id="jca-dsdeployer-test">
-
- <application-name>JCA DataSourceDeployer Test</application-name>
- <initialize-in-order>true</initialize-in-order>
-
- <!--
- <module>
- <ejb>test-ejb.jar</ejb>
- </module>
- -->
-
- <module>
- <web>
- <web-uri>jca-dsdeployer-test.war</web-uri>
- <context-root>/testweb</context-root>
- </web>
- </module>
- <data-source>
- <name>DSEARXML</name>
- <class-name>org.jboss.test.jca.dsdeployer.MockDataSource</class-name>
- <server-name>dataSource2ServerName</server-name>
- <port-number>2</port-number>
- <database-name>dataSource2DatabaseName</database-name>
- <url>jdbc:hsqldb:mem:JCADataSourceDeployerDB</url>
- <user>sa</user>
- <password></password>
- <login-timeout>2</login-timeout>
- <transactional>false</transactional>
- <isolation-level>TRANSACTION_READ_COMMITTED</isolation-level>
- <initial-pool-size>2</initial-pool-size>
- <max-pool-size>2</max-pool-size>
- <min-pool-size>2</min-pool-size>
- <max-idle-time>2</max-idle-time>
- <max-statements>2</max-statements>
- </data-source>
- <data-source>
- <name>DriverEARXML</name>
- <class-name>org.jboss.test.jca.dsdeployer.MockDriver</class-name>
- <server-name></server-name>
- <port-number>-1</port-number>
- <database-name></database-name>
- <url>jdbc:hsqldb:mem:JCADataSourceDeployerDB</url>
- <user>sa</user>
- <password></password>
- <login-timeout>2</login-timeout>
- <transactional>false</transactional>
- <isolation-level>TRANSACTION_READ_COMMITTED</isolation-level>
- <initial-pool-size>2</initial-pool-size>
- <max-pool-size>2</max-pool-size>
- <min-pool-size>2</min-pool-size>
- <max-idle-time>2</max-idle-time>
- <max-statements>2</max-statements>
- </data-source>
- <data-source>
- <name>XADSEARXML</name>
- <class-name>org.jboss.test.jca.dsdeployer.MockDriver</class-name>
- <server-name>testServer</server-name>
- <port-number>2</port-number>
- <database-name>testDB</database-name>
- <url>jdbc:hsqldb:mem:JCADataSourceDeployerDB</url>
- <user>sa</user>
- <password></password>
- <login-timeout>2</login-timeout>
- <transactional>true</transactional>
- <isolation-level>TRANSACTION_READ_COMMITTED</isolation-level>
- <initial-pool-size>2</initial-pool-size>
- <max-pool-size>2</max-pool-size>
- <min-pool-size>2</min-pool-size>
- <max-idle-time>2</max-idle-time>
- <max-statements>2</max-statements>
- </data-source>
-
-</application>
Copied: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/jca/dsdeployer/ear/application.xml (from rev 109877, trunk/testsuite/src/resources/jca/dsdeployer/ear/application.xml)
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/jca/dsdeployer/ear/application.xml (rev 0)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/jca/dsdeployer/ear/application.xml 2010-12-13 17:25:55 UTC (rev 109879)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/application_6.xsd"
+ version="6" id="jca-dsdeployer-test">
+
+ <application-name>JCA DataSourceDeployer Test</application-name>
+ <initialize-in-order>true</initialize-in-order>
+
+ <!--
+ <module>
+ <ejb>test-ejb.jar</ejb>
+ </module>
+ -->
+
+ <module>
+ <web>
+ <web-uri>jca-dsdeployer-test.war</web-uri>
+ <context-root>/testweb</context-root>
+ </web>
+ </module>
+ <data-source>
+ <name>DSEARXML</name>
+ <class-name>org.jboss.test.jca.dsdeployer.MockDataSource</class-name>
+ <server-name>dataSource2ServerName</server-name>
+ <port-number>2</port-number>
+ <database-name>dataSource2DatabaseName</database-name>
+ <url>jdbc:hsqldb:mem:JCADataSourceDeployerDB</url>
+ <user>sa</user>
+ <password></password>
+ <login-timeout>2</login-timeout>
+ <transactional>false</transactional>
+ <isolation-level>TRANSACTION_READ_COMMITTED</isolation-level>
+ <initial-pool-size>2</initial-pool-size>
+ <max-pool-size>2</max-pool-size>
+ <min-pool-size>2</min-pool-size>
+ <max-idle-time>2</max-idle-time>
+ <max-statements>2</max-statements>
+ </data-source>
+ <data-source>
+ <name>DriverEARXML</name>
+ <class-name>org.jboss.test.jca.dsdeployer.MockDriver</class-name>
+ <server-name></server-name>
+ <port-number>-1</port-number>
+ <database-name></database-name>
+ <url>jdbc:hsqldb:mem:JCADataSourceDeployerDB</url>
+ <user>sa</user>
+ <password></password>
+ <login-timeout>2</login-timeout>
+ <transactional>false</transactional>
+ <isolation-level>TRANSACTION_READ_COMMITTED</isolation-level>
+ <initial-pool-size>2</initial-pool-size>
+ <max-pool-size>2</max-pool-size>
+ <min-pool-size>2</min-pool-size>
+ <max-idle-time>2</max-idle-time>
+ <max-statements>2</max-statements>
+ </data-source>
+ <data-source>
+ <name>XADSEARXML</name>
+ <class-name>org.jboss.test.jca.dsdeployer.MockDriver</class-name>
+ <server-name>testServer</server-name>
+ <port-number>2</port-number>
+ <database-name>testDB</database-name>
+ <url>jdbc:hsqldb:mem:JCADataSourceDeployerDB</url>
+ <user>sa</user>
+ <password></password>
+ <login-timeout>2</login-timeout>
+ <transactional>true</transactional>
+ <isolation-level>TRANSACTION_READ_COMMITTED</isolation-level>
+ <initial-pool-size>2</initial-pool-size>
+ <max-pool-size>2</max-pool-size>
+ <min-pool-size>2</min-pool-size>
+ <max-idle-time>2</max-idle-time>
+ <max-statements>2</max-statements>
+ </data-source>
+
+</application>
Copied: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/jca/dsdeployer/war (from rev 109877, trunk/testsuite/src/resources/jca/dsdeployer/war)
Deleted: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/jca/dsdeployer/war/web.xml
===================================================================
--- trunk/testsuite/src/resources/jca/dsdeployer/war/web.xml 2010-12-13 15:41:52 UTC (rev 109877)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/jca/dsdeployer/war/web.xml 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1,44 +0,0 @@
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-
- <data-source>
- <description>en-dataSource2-desc</description>
- <name>DSWebXML</name>
- <class-name>org.jboss.test.jca.dsdeployer.MockDataSource</class-name>
- <server-name>localhost</server-name>
- <port-number>2</port-number>
- <database-name>localdb</database-name>
- <url>jdbc:hsqldb:mem:JCADataSourceDeployerDB</url>
- <user>sa</user>
- <password></password>
- <login-timeout>2</login-timeout>
- <transactional>false</transactional>
- <isolation-level>TRANSACTION_READ_COMMITTED</isolation-level>
- <initial-pool-size>2</initial-pool-size>
- <max-pool-size>2</max-pool-size>
- <min-pool-size>2</min-pool-size>
- <max-idle-time>2</max-idle-time>
- <max-statements>2</max-statements>
- </data-source>
- <data-source>
- <description>en-dataSource2-desc</description>
- <name>WebOverrideDS</name>
- <class-name>org.jboss.test.jca.dsdeployer.MockDataSource</class-name>
- <server-name>localhost</server-name>
- <port-number>2</port-number>
- <database-name>localdb</database-name>
- <url>jdbc:hsqldb:mem:JCADataSourceDeployerDB</url>
- <user>sa</user>
- <password></password>
- <login-timeout>2</login-timeout>
- <transactional>true</transactional>
- <isolation-level>TRANSACTION_READ_COMMITTED</isolation-level>
- <initial-pool-size>2</initial-pool-size>
- <max-pool-size>2</max-pool-size>
- <min-pool-size>2</min-pool-size>
- <max-idle-time>2</max-idle-time>
- <max-statements>2</max-statements>
- </data-source>
-
-</web-app>
Copied: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/jca/dsdeployer/war/web.xml (from rev 109877, trunk/testsuite/src/resources/jca/dsdeployer/war/web.xml)
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/jca/dsdeployer/war/web.xml (rev 0)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/resources/jca/dsdeployer/war/web.xml 2010-12-13 17:25:55 UTC (rev 109879)
@@ -0,0 +1,44 @@
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+
+ <data-source>
+ <description>en-dataSource2-desc</description>
+ <name>DSWebXML</name>
+ <class-name>org.jboss.test.jca.dsdeployer.MockDataSource</class-name>
+ <server-name>localhost</server-name>
+ <port-number>2</port-number>
+ <database-name>localdb</database-name>
+ <url>jdbc:hsqldb:mem:JCADataSourceDeployerDB</url>
+ <user>sa</user>
+ <password></password>
+ <login-timeout>2</login-timeout>
+ <transactional>false</transactional>
+ <isolation-level>TRANSACTION_READ_COMMITTED</isolation-level>
+ <initial-pool-size>2</initial-pool-size>
+ <max-pool-size>2</max-pool-size>
+ <min-pool-size>2</min-pool-size>
+ <max-idle-time>2</max-idle-time>
+ <max-statements>2</max-statements>
+ </data-source>
+ <data-source>
+ <description>en-dataSource2-desc</description>
+ <name>WebOverrideDS</name>
+ <class-name>org.jboss.test.jca.dsdeployer.MockDataSource</class-name>
+ <server-name>localhost</server-name>
+ <port-number>2</port-number>
+ <database-name>localdb</database-name>
+ <url>jdbc:hsqldb:mem:JCADataSourceDeployerDB</url>
+ <user>sa</user>
+ <password></password>
+ <login-timeout>2</login-timeout>
+ <transactional>true</transactional>
+ <isolation-level>TRANSACTION_READ_COMMITTED</isolation-level>
+ <initial-pool-size>2</initial-pool-size>
+ <max-pool-size>2</max-pool-size>
+ <min-pool-size>2</min-pool-size>
+ <max-idle-time>2</max-idle-time>
+ <max-statements>2</max-statements>
+ </data-source>
+
+</web-app>
Modified: branches/JBoss-AS-6.0.x-ipv6/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/tomcat/src/main/java/org/jboss/web/tomcat/service/TomcatInjectionContainer.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -567,15 +567,15 @@
{
// TODO injection handlers should be pluggable from XML
handlers = new ArrayList<InjectionHandler<Environment>>();
- try
- {
- InjectionHandler<Environment> webEjbHandler = new WebEJBHandler<Environment>(webDD, deploymentEndpointResolver, endpointMap, unit.getRelativePath());
- handlers.add(webEjbHandler);
- }
- catch (NoClassDefFoundError e)
- {
- log.debug("EJB injection disabled", e);
- }
+// try
+// {
+// InjectionHandler<Environment> webEjbHandler = new WebEJBHandler<Environment>(webDD, deploymentEndpointResolver, endpointMap, unit.getRelativePath());
+// handlers.add(webEjbHandler);
+// }
+// catch (NoClassDefFoundError e)
+// {
+// log.debug("EJB injection disabled", e);
+// }
handlers.add(new DependsHandler<Environment>());
try
Modified: branches/JBoss-AS-6.0.x-ipv6/varia/src/assembly/deployment-service-sar.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/varia/src/assembly/deployment-service-sar.xml 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/varia/src/assembly/deployment-service-sar.xml 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1,5 +1,5 @@
<assembly>
- <id>deployment-service</id>
+ <id>deployment-service-sar</id>
<formats>
<format>sar</format>
</formats>
Modified: branches/JBoss-AS-6.0.x-ipv6/varia/src/assembly/snmp-adaptor-sar.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/varia/src/assembly/snmp-adaptor-sar.xml 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/varia/src/assembly/snmp-adaptor-sar.xml 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1,5 +1,5 @@
<assembly>
- <id>snmp-adaptor</id>
+ <id>snmp-adaptor-sar</id>
<formats>
<format>sar</format>
</formats>
Modified: branches/JBoss-AS-6.0.x-ipv6/webservices/pom.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/webservices/pom.xml 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/webservices/pom.xml 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1,12 +1,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+
<parent>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-parent</artifactId>
<version>6.0.0-SNAPSHOT</version>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-webservices</artifactId>
@@ -14,7 +14,7 @@
<name>JBoss Application Server Webservices</name>
<url>http://www.jboss.org/jbossas</url>
<description>JBoss Application Server (webservices module)</description>
-
+
<build>
<finalName>${project.artifactId}</finalName>
<resources>
@@ -83,14 +83,12 @@
<phase>package</phase>
<configuration>
<tasks>
-
<mkdir dir="target/resources"/>
<copy todir="target/resources" filtering="yes">
<fileset dir="src/resources">
<include name="**"/>
</fileset>
</copy>
-
</tasks>
</configuration>
</execution>
@@ -98,7 +96,7 @@
</plugin>
</plugins>
</build>
-
+
<!-- Dependencies -->
<dependencies>
<!-- jbossws dependencies -->
@@ -118,7 +116,7 @@
<dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>weld-int-deployer</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -323,8 +321,8 @@
<artifactId>jboss-aop-mc-int</artifactId>
</exclusion>
<exclusion>
- <artifactId>jbosssx</artifactId>
- <groupId>org.jboss.security</groupId>
+ <artifactId>jbosssx</artifactId>
+ <groupId>org.jboss.security</groupId>
</exclusion>
</exclusions>
<type>pom</type>
@@ -367,8 +365,8 @@
<artifactId>xml-apis</artifactId>
</exclusion>
<exclusion>
- <artifactId>jboss-security-spi</artifactId>
- <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-security-spi</artifactId>
+ <groupId>org.jboss.security</groupId>
</exclusion>
</exclusions>
</dependency>
@@ -431,6 +429,10 @@
<groupId>org.picketbox</groupId>
<artifactId>jboss-security-spi</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.weld</groupId>
+ <artifactId>weld-spi</artifactId>
+ </dependency>
</dependencies>
-
+
</project>
Modified: branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1,6 +1,26 @@
+/*
+ * 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.webservices.integration.deployers.deployment;
-import java.io.IOException;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
@@ -9,8 +29,8 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.logging.Logger;
-import org.jboss.metadata.serviceref.VirtualFileAdaptor;
import org.jboss.vfs.VirtualFile;
+import org.jboss.webservices.integration.injection.VirtualFileAdaptor;
import org.jboss.webservices.integration.util.ASHelper;
import org.jboss.wsf.common.ResourceLoaderAdapter;
import org.jboss.wsf.spi.SPIProvider;
@@ -21,7 +41,6 @@
import org.jboss.wsf.spi.deployment.DeploymentModelFactory;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
-import org.jboss.wsf.spi.deployment.WSFDeploymentException;
/**
* Base class for all deployment model builders.
@@ -147,7 +166,7 @@
for (VirtualFile vf : virtualFiles)
{
// Adding the roots of the virtual files.
- uVirtualFiles.add(new VirtualFileAdaptor(vf)); // TODO: Figure out why this was using the VFS2 VFS root instead of the meta-data file itself.
+ uVirtualFiles.add(new VirtualFileAdaptor(vf));
}
dep.setMetadataFiles(new LinkedList<UnifiedVirtualFile>(uVirtualFiles));
}
Modified: branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilder.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilder.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilder.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1,3 +1,24 @@
+/*
+ * 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.webservices.integration.deployers.deployment;
import org.jboss.deployers.structure.spi.DeploymentUnit;
Modified: branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1,3 +1,24 @@
+/*
+ * 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.webservices.integration.deployers.deployment;
import org.jboss.deployers.structure.spi.DeploymentUnit;
Modified: branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_JSE.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1,3 +1,24 @@
+/*
+ * 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.webservices.integration.deployers.deployment;
import org.jboss.deployers.structure.spi.DeploymentUnit;
Modified: branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1,3 +1,24 @@
+/*
+ * 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.webservices.integration.deployers.deployment;
import org.jboss.deployers.structure.spi.DeploymentUnit;
Modified: branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_JSE.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1,3 +1,24 @@
+/*
+ * 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.webservices.integration.deployers.deployment;
import java.util.List;
Modified: branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/injection/ServiceRefResourceProvider.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -27,7 +27,6 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
-import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
@@ -41,7 +40,6 @@
import javax.xml.ws.WebServiceRefs;
import javax.xml.ws.soap.MTOM;
-import org.jboss.classloader.spi.base.BaseClassLoader;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.logging.Logger;
@@ -55,8 +53,6 @@
import org.jboss.switchboard.javaee.jboss.environment.JBossServiceRefType;
import org.jboss.switchboard.mc.spi.MCBasedResourceProvider;
import org.jboss.switchboard.spi.Resource;
-import org.jboss.vfs.VFS;
-import org.jboss.vfs.VirtualFile;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.deployment.UnifiedVirtualFile;
@@ -69,8 +65,8 @@
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData;
import org.jboss.wsf.spi.serviceref.ServiceRefHandler;
+import org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory;
import org.jboss.wsf.spi.serviceref.ServiceRefHandler.Type;
-import org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory;
/**
* Service reference resource provider.
@@ -476,6 +472,12 @@
{
return this.target;
}
+
+ @Override
+ public Collection<?> getInvocationDependencies()
+ {
+ return null;
+ }
}
private void processAnnotatedElement(final AnnotatedElement anElement, final UnifiedServiceRefMetaData serviceRefUMDM)
Modified: branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/injection/WebServiceContextResourceProvider.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -21,6 +21,8 @@
*/
package org.jboss.webservices.integration.injection;
+import java.util.Collection;
+
import javax.xml.ws.WebServiceContext;
import org.jboss.deployers.structure.spi.DeploymentUnit;
@@ -72,5 +74,11 @@
{
return this.target;
}
+
+ @Override
+ public Collection<?> getInvocationDependencies()
+ {
+ return null;
+ }
}
}
Modified: branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/weld/WeldDeploymentAspect.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -56,7 +56,7 @@
{
for (final Endpoint endpoint : dep.getService().getEndpoints())
{
- endpoint.setInvocationHandler(new WeldInvocationHandler(deploymentUnit, endpoint.getInvocationHandler()));
+ endpoint.setInvocationHandler(new WeldInvocationHandler(endpoint.getInvocationHandler()));
}
}
}
Modified: branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/webservices/src/main/java/org/jboss/webservices/integration/weld/WeldInvocationHandler.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -21,7 +21,11 @@
*/
package org.jboss.webservices.integration.weld;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.weld.integration.injection.NonContextualObjectInjectionHelper;
+import org.jboss.weld.manager.api.WeldManager;
import org.jboss.wsf.common.invocation.AbstractInvocationHandlerJSE;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.Invocation;
@@ -31,17 +35,17 @@
* Weld invocation handler.
*
* @author <a href="maito:ropalka at redhat.com">Richard Opalka</a>
+ * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
*/
public final class WeldInvocationHandler extends AbstractInvocationHandlerJSE
{
- private final DeploymentUnit deploymentUnit;
+ private static final String BEAN_MANAGER_JNDI_NAME = "java:comp/BeanManager";
private final InvocationHandler delegate;
- public WeldInvocationHandler(final DeploymentUnit unit, final InvocationHandler delegate)
+ public WeldInvocationHandler(final InvocationHandler delegate)
{
- this.deploymentUnit = unit;
this.delegate = delegate;
}
@@ -50,7 +54,7 @@
{
// handle Weld injections first
this.handleWeldInjection(invocation.getInvocationContext().getTargetBean());
- // handle JBossWS injections last and call @PostConstruct & @PreDestroy annotated lifecycle methods
+ // handle JBossWS injections last and call @PostConstruct annotated methods
this.delegate.onEndpointInstantiated(endpoint, invocation);
}
@@ -73,8 +77,12 @@
*/
private void handleWeldInjection(final Object instance)
{
- // TODO: implement Marius ;)
- // Just FYI calling 'new InitialContext()' in this method will return proper JNDI ctx because this method is executed in servlet environment.
+ try {
+ WeldManager beanManager = (WeldManager) new InitialContext().lookup(BEAN_MANAGER_JNDI_NAME);
+ NonContextualObjectInjectionHelper.injectNonContextualInstance(instance, beanManager);
+ } catch (NamingException e) {
+ throw new IllegalStateException("Unable to locate BeanManager");
+ }
}
}
Modified: branches/JBoss-AS-6.0.x-ipv6/weld-int/deployer/pom.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/weld-int/deployer/pom.xml 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/weld-int/deployer/pom.xml 2010-12-13 17:25:55 UTC (rev 109879)
@@ -193,6 +193,10 @@
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-jms-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -515,26 +519,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata-ejb</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.jboss.spec.javax.annotation</groupId>
<artifactId>jboss-annotations-api_1.1_spec</artifactId>
</dependency>
Deleted: branches/JBoss-AS-6.0.x-ipv6/weld-int/deployer/src/main/java/org/jboss/weld/integration/injection/Jsr299Injector.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/weld-int/deployer/src/main/java/org/jboss/weld/integration/injection/Jsr299Injector.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/weld-int/deployer/src/main/java/org/jboss/weld/integration/injection/Jsr299Injector.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -1,105 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.weld.integration.injection;
-
-import org.jboss.injection.manager.spi.InjectionContext;
-import org.jboss.injection.manager.spi.InjectionException;
-import org.jboss.injection.manager.spi.Injector;
-import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
-import org.jboss.weld.integration.deployer.env.helpers.BootstrapBean;
-import org.jboss.weld.manager.api.WeldManager;
-
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.InjectionTarget;
-import java.util.concurrent.atomic.AtomicReference;
-
-/**
- * @author Marius Bogoevici
- */
-public class Jsr299Injector implements Injector
-{
-
- private BootstrapBean bootstrapBean;
- private String bdaId;
- private AtomicReference<WeldManager> weldManagerRef;
-
- public Jsr299Injector(String bdaId)
- {
- this.bdaId = bdaId;
- this.weldManagerRef = new AtomicReference<WeldManager>();
- }
-
- public void setBootstrapBean(BootstrapBean bootstrapBean)
- {
- this.bootstrapBean = bootstrapBean;
- }
-
- public <T> void inject(InjectionContext<T> injectionContext) throws InjectionException
- {
- WeldManager weldManager = initWeldManagerIfNecessary();
- Object instance = injectionContext.getInjectionTarget();
-
- if (weldManager == null)
- throw new IllegalArgumentException("Null bean manager.");
-
- CreationalContext<Object> creationalContext = weldManager.createCreationalContext(null);
- InjectionTarget<Object> injectionTarget = (InjectionTarget<Object>) weldManager.fireProcessInjectionTarget(weldManager.createAnnotatedType(instance.getClass()));
- injectionTarget.inject(instance, creationalContext);
- injectionContext.proceed();
- }
-
- private WeldManager initWeldManagerIfNecessary()
- {
- WeldManager weldManager = weldManagerRef.get();
- if (weldManager == null)
- {
- weldManager = locateWeldManager();
- }
- weldManagerRef.compareAndSet(null, weldManager);
- return weldManager;
- }
-
- private WeldManager locateWeldManager()
- {
- BeanDeploymentArchive foundBeanDeploymentArchive = null;
- for (BeanDeploymentArchive beanDeploymentArchive: bootstrapBean.getDeployment().getBeanDeploymentArchives())
- {
- if (beanDeploymentArchive.getId().equals(bdaId))
- {
- foundBeanDeploymentArchive = beanDeploymentArchive;
- }
- }
- if (foundBeanDeploymentArchive == null)
- {
- throw new IllegalStateException("Cannot find BeanManager for BeanDeploymentArchive with id=" + bdaId);
- }
-
- return bootstrapBean.getBootstrap().getManager(foundBeanDeploymentArchive);
- }
-
- public void release()
- {
- bootstrapBean = null;
- weldManagerRef.set(null);
- }
-}
Modified: branches/JBoss-AS-6.0.x-ipv6/weld-int/deployer/src/main/java/org/jboss/weld/integration/injection/Jsr299InjectorDeployer.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/weld-int/deployer/src/main/java/org/jboss/weld/integration/injection/Jsr299InjectorDeployer.java 2010-12-13 17:15:13 UTC (rev 109878)
+++ branches/JBoss-AS-6.0.x-ipv6/weld-int/deployer/src/main/java/org/jboss/weld/integration/injection/Jsr299InjectorDeployer.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -29,8 +29,10 @@
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.injection.manager.spi.Injector;
import org.jboss.injection.manager.spi.InjectionManager;
import org.jboss.kernel.spi.dependency.KernelController;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.weld.integration.deployer.DeployersUtils;
import org.jboss.weld.integration.util.IdFactory;
@@ -47,10 +49,11 @@
{
super(InjectionManager.class);
setStage(DeploymentStages.REAL);
+ setWantComponents(true);
setOutput(InjectionManager.class);
}
- public void setKernelController(KernelController kernelController)
+ public void setKernelController(KernelController kernelController)
{
this.kernelController = kernelController;
}
@@ -60,15 +63,36 @@
{
if (isCDIDeployment(unit))
{
+ String bdaId = IdFactory.getIdFromClassLoader(unit.getClassLoader());
try
{
- Jsr299Injector injector = new Jsr299Injector(IdFactory.getIdFromClassLoader(unit.getClassLoader()));
- BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(getJsr299InjectorMcBeanName(unit), Jsr299Injector.class.getName());
- AbstractInjectionValueMetaData injectionValueMetaData = new AbstractInjectionValueMetaData(DeployersUtils.getBootstrapBeanName(unit));
- builder.addPropertyMetaData("bootstrapBean", injectionValueMetaData);
- builder.addUninstall("release");
- kernelController.install(builder.getBeanMetaData(), injector);
- deployment.addInjector(injector);
+
+ Injector injector = null;
+ BeanMetaDataBuilder builder = null;
+ if (!unit.isComponent())
+ {
+
+ injector = new Jsr299SimpleNonContextualInjector(bdaId);
+ builder = BeanMetaDataBuilder.createBuilder(getJsr299InjectorMcBeanName(unit), Jsr299SimpleNonContextualInjector.class.getName());
+ }
+ else
+ {
+ JBossEnterpriseBeanMetaData enterpriseBeanMetaData = unit.getAttachment(JBossEnterpriseBeanMetaData.class);
+ if (enterpriseBeanMetaData != null && enterpriseBeanMetaData.getJBossMetaData().isEJB3x())
+ {
+ injector = new Jsr299InterceptorInjector(bdaId, enterpriseBeanMetaData);
+ builder = BeanMetaDataBuilder.createBuilder(getJsr299InjectorMcBeanName(unit), Jsr299InterceptorInjector.class.getName());
+ }
+ }
+ if (injector != null)
+ {
+ AbstractInjectionValueMetaData injectionValueMetaData = new AbstractInjectionValueMetaData(DeployersUtils.getBootstrapBeanName(unit));
+ injectionValueMetaData.setInjectionOption(InjectOption.CALLBACK);
+ builder.addPropertyMetaData("bootstrapBean", injectionValueMetaData);
+ builder.addUninstall("release");
+ kernelController.install(builder.getBeanMetaData(), injector);
+ deployment.addInjector(injector);
+ }
}
catch (Throwable throwable)
{
Copied: branches/JBoss-AS-6.0.x-ipv6/weld-int/deployer/src/main/java/org/jboss/weld/integration/injection/Jsr299InterceptorInjector.java (from rev 109877, trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/injection/Jsr299InterceptorInjector.java)
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/weld-int/deployer/src/main/java/org/jboss/weld/integration/injection/Jsr299InterceptorInjector.java (rev 0)
+++ branches/JBoss-AS-6.0.x-ipv6/weld-int/deployer/src/main/java/org/jboss/weld/integration/injection/Jsr299InterceptorInjector.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -0,0 +1,115 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.weld.integration.injection;
+
+import org.jboss.injection.manager.spi.InjectionContext;
+import org.jboss.injection.manager.spi.InjectionException;
+import org.jboss.injection.manager.spi.Injector;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.weld.integration.deployer.env.helpers.BootstrapBean;
+import org.jboss.weld.manager.api.WeldManager;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.InjectionTarget;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class Jsr299InterceptorInjector implements Injector
+{
+
+ private BootstrapBean bootstrapBean;
+ private String bdaId;
+ private AtomicReference<WeldManager> weldManagerRef;
+ private JBossEnterpriseBeanMetaData enterpriseBeanMetaData;
+
+ public Jsr299InterceptorInjector(String bdaId, JBossEnterpriseBeanMetaData enterpriseBeanMetaData)
+ {
+ this.bdaId = bdaId;
+ this.enterpriseBeanMetaData = enterpriseBeanMetaData;
+ this.weldManagerRef = new AtomicReference<WeldManager>();
+ }
+
+ public void setBootstrapBean(BootstrapBean bootstrapBean)
+ {
+ this.bootstrapBean = bootstrapBean;
+ }
+
+ public <T> void inject(InjectionContext<T> injectionContext) throws InjectionException
+ {
+ if (isInterceptor(injectionContext.getInjectionTarget())) {
+ WeldManager weldManager = initWeldManagerIfNecessary();
+ Object instance = injectionContext.getInjectionTarget();
+
+ if (weldManager == null)
+ throw new IllegalArgumentException("Null bean manager.");
+
+ CreationalContext<Object> creationalContext = weldManager.createCreationalContext(null);
+ InjectionTarget<Object> injectionTarget = (InjectionTarget<Object>) weldManager.fireProcessInjectionTarget(weldManager.createAnnotatedType(instance.getClass()));
+ injectionTarget.inject(instance, creationalContext);
+ }
+ injectionContext.proceed();
+ }
+
+ private WeldManager initWeldManagerIfNecessary()
+ {
+ WeldManager weldManager = weldManagerRef.get();
+ if (weldManager == null)
+ {
+ weldManager = locateWeldManager();
+ }
+ weldManagerRef.compareAndSet(null, weldManager);
+ return weldManager;
+ }
+
+ private WeldManager locateWeldManager()
+ {
+ BeanDeploymentArchive foundBeanDeploymentArchive = null;
+ for (BeanDeploymentArchive beanDeploymentArchive: bootstrapBean.getDeployment().getBeanDeploymentArchives())
+ {
+ if (beanDeploymentArchive.getId().equals(bdaId))
+ {
+ foundBeanDeploymentArchive = beanDeploymentArchive;
+ }
+ }
+ if (foundBeanDeploymentArchive == null)
+ {
+ throw new IllegalStateException("Cannot find BeanManager for BeanDeploymentArchive with id=" + bdaId);
+ }
+
+ return bootstrapBean.getBootstrap().getManager(foundBeanDeploymentArchive);
+ }
+
+ private boolean isInterceptor(Object instance)
+ {
+ return !instance.getClass().getName().equals(enterpriseBeanMetaData.getEjbClass());
+ }
+
+ public void release()
+ {
+ bootstrapBean = null;
+ weldManagerRef.set(null);
+ }
+}
Copied: branches/JBoss-AS-6.0.x-ipv6/weld-int/deployer/src/main/java/org/jboss/weld/integration/injection/Jsr299SimpleNonContextualInjector.java (from rev 109877, trunk/weld-int/deployer/src/main/java/org/jboss/weld/integration/injection/Jsr299SimpleNonContextualInjector.java)
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/weld-int/deployer/src/main/java/org/jboss/weld/integration/injection/Jsr299SimpleNonContextualInjector.java (rev 0)
+++ branches/JBoss-AS-6.0.x-ipv6/weld-int/deployer/src/main/java/org/jboss/weld/integration/injection/Jsr299SimpleNonContextualInjector.java 2010-12-13 17:25:55 UTC (rev 109879)
@@ -0,0 +1,105 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.weld.integration.injection;
+
+import org.jboss.injection.manager.spi.InjectionContext;
+import org.jboss.injection.manager.spi.InjectionException;
+import org.jboss.injection.manager.spi.Injector;
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+import org.jboss.weld.integration.deployer.env.helpers.BootstrapBean;
+import org.jboss.weld.manager.api.WeldManager;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.InjectionTarget;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class Jsr299SimpleNonContextualInjector implements Injector
+{
+
+ private BootstrapBean bootstrapBean;
+ private String bdaId;
+ private AtomicReference<WeldManager> weldManagerRef;
+
+ public Jsr299SimpleNonContextualInjector(String bdaId)
+ {
+ this.bdaId = bdaId;
+ this.weldManagerRef = new AtomicReference<WeldManager>();
+ }
+
+ public void setBootstrapBean(BootstrapBean bootstrapBean)
+ {
+ this.bootstrapBean = bootstrapBean;
+ }
+
+ public <T> void inject(InjectionContext<T> injectionContext) throws InjectionException
+ {
+ WeldManager weldManager = initWeldManagerIfNecessary();
+ Object instance = injectionContext.getInjectionTarget();
+
+ if (weldManager == null)
+ throw new IllegalArgumentException("Null bean manager.");
+
+ CreationalContext<Object> creationalContext = weldManager.createCreationalContext(null);
+ InjectionTarget<Object> injectionTarget = (InjectionTarget<Object>) weldManager.fireProcessInjectionTarget(weldManager.createAnnotatedType(instance.getClass()));
+ injectionTarget.inject(instance, creationalContext);
+ injectionContext.proceed();
+ }
+
+ private WeldManager initWeldManagerIfNecessary()
+ {
+ WeldManager weldManager = weldManagerRef.get();
+ if (weldManager == null)
+ {
+ weldManager = locateWeldManager();
+ }
+ weldManagerRef.compareAndSet(null, weldManager);
+ return weldManager;
+ }
+
+ private WeldManager locateWeldManager()
+ {
+ BeanDeploymentArchive foundBeanDeploymentArchive = null;
+ for (BeanDeploymentArchive beanDeploymentArchive: bootstrapBean.getDeployment().getBeanDeploymentArchives())
+ {
+ if (beanDeploymentArchive.getId().equals(bdaId))
+ {
+ foundBeanDeploymentArchive = beanDeploymentArchive;
+ }
+ }
+ if (foundBeanDeploymentArchive == null)
+ {
+ throw new IllegalStateException("Cannot find BeanManager for BeanDeploymentArchive with id=" + bdaId);
+ }
+
+ return bootstrapBean.getBootstrap().getManager(foundBeanDeploymentArchive);
+ }
+
+ public void release()
+ {
+ bootstrapBean = null;
+ weldManagerRef.set(null);
+ }
+}
More information about the jboss-cvs-commits
mailing list