[jboss-cvs] JBossAS SVN: r81635 - in projects/jboss-deployers/branches/Branch_2_0: deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support and 85 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 26 09:55:28 EST 2008
Author: alesj
Date: 2008-11-26 09:55:27 -0500 (Wed, 26 Nov 2008)
New Revision: 81635
Added:
projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/AbstractPathEntryMetaData.java
projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/AbstractPathMetaData.java
projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/AbstractScanningMetaData.java
projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/EnvPutList.java
projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/FilterablePathEntry.java
projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/AbstractManagedObjectUnitTest.java
projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/annotations/PathEntryMetaData.java
projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/annotations/PathMetaData.java
projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/annotations/ScanningMetaData.java
projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/DefaultManagedObjectCreator.java
projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/DeploymentMBean.java
projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/DeploymentUnitFilter.java
projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContextMBean.java
projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/ComponentDeploymentContextMBean.java
projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/DeployerTracking.java
projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/TrackingMutableAttachments.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/VFSDeploymentUnitFilter.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/Base2VFSBridgeDeploymentUnitFilter.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/VFS2BaseBridgeDeploymentUnitFilter.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/VirtualFileDeploymentUnitFilter.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScanningDeploymentUnitFilter.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScanningMetaDataDeployer.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScanningMetaDataResourceFilter.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/classloader/DeploymentHostNameCreator.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/classloader/HostNameCreator.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/AliasesParserDeployer.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaData.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaDataDeployer.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesParserDeployer.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependencyItemMetaData.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliases.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencies.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependenciesImpl.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencyDeployer.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/package-info.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContextMBean.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/AnnotationScanningTestSuite.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClass.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClassSuper.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/impl/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/impl/JarMarkOnClassExt.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/impl/JarMarkOnClassImpl.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClass.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClassSuper.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/impl/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/impl/WebMarkOnClassExt.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/impl/WebMarkOnClassImpl.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/warlib/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/warlib/SomeUIClass.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AbstractAnnotationsScanningUnitTest.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AnnotationsScanningWithMetaDataUnitTestCase.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/ScanningMetaDataTestCase.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/DependencyTestSuite.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/support/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/support/MockTM.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/test/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/DefaultXPCResolver.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/PUDeployment.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/XPCResolver.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AutowireAnnotationBeansTestCase.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/war/support/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/war/support/MockWarStructureDeployer.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/WebBeansTestSuite.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaData.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaDataDeployer.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscovery.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryDeployer.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryImpl.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/crm/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/crm/CrmWebBean.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ejb/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ejb/BusinessInterface.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ejb/MySLSBean.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ext/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ext/ExternalWebBean.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jar/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jar/PlainJavaBean.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jsf/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jsf/NotWBJsfBean.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ui/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ui/UIWebBean.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/util/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/util/SomeUtil.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/web/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/web/ServletWebBean.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/AbstractWebBeansTest.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/annotations/basic-scan/META-INF/jboss-scanning.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/annotations/basic-scan/jar/META-INF/jboss-scanning.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/annotations/basic-scan/web/WEB-INF/jboss-scanning.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/alias/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/alias/META-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/alias/META-INF/aliases.txt
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/bean/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/bean/META-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/bean/META-INF/jboss-dependency.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/module/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/module/META-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/module/META-INF/jboss-dependency.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/support/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/support/META-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/support/META-INF/support-jboss-beans.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/annotations/test/AnnotationsScanningWithMetaDataUnitTestCase.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/dependency/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/dependency/test/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/webbeans/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/webbeans/test/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/scanning/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/scanning/smoke/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/scanning/smoke/META-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/scanning/smoke/META-INF/jboss-scanning.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/META-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/META-INF/application.properties
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/crm/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/MANIFEST.MF
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/web-beans.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/MANIFEST.MF
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/ejb-jar.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/web-beans.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ext/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ext/META-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ext/META-INF/MANIFEST.MF
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ext/META-INF/web-beans.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/jar/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/jar/META-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/jar/META-INF/MANIFEST.MF
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/jar/META-INF/web-beans.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ui/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ui/META-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ui/META-INF/MANIFEST.MF
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ui/META-INF/web-beans.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/web/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/web/WEB-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/web/WEB-INF/web-beans.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/web/WEB-INF/web.xml
Removed:
projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/DefaultManagedObjectCreator.java
projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/DeploymentMBean.java
projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContextMBean.java
projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/ComponentDeploymentContextMBean.java
projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/DeployerTracking.java
projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/TrackingMutableAttachments.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/AliasesParserDeployer.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaData.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaDataDeployer.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesParserDeployer.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependencyItemMetaData.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliases.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencies.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependenciesImpl.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencyDeployer.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/package-info.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContextMBean.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClass.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClassSuper.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/impl/JarMarkOnClassExt.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/impl/JarMarkOnClassImpl.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClass.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClassSuper.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/impl/WebMarkOnClassExt.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/impl/WebMarkOnClassImpl.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/warlib/SomeUIClass.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/DependencyTestSuite.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/support/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/support/MockTM.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/test/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/war/support/MockWarStructureDeployer.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/WebBeansTestSuite.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaData.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaDataDeployer.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscovery.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryDeployer.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryImpl.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/crm/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/crm/CrmWebBean.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ejb/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ejb/BusinessInterface.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ejb/MySLSBean.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ext/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ext/ExternalWebBean.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jar/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jar/PlainJavaBean.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jsf/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jsf/NotWBJsfBean.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ui/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ui/UIWebBean.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/util/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/util/SomeUtil.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/web/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/web/ServletWebBean.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/AbstractWebBeansTest.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/alias/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/alias/META-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/alias/META-INF/aliases.txt
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/bean/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/bean/META-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/bean/META-INF/jboss-dependency.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/module/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/module/META-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/module/META-INF/jboss-dependency.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/support/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/support/META-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/support/META-INF/support-jboss-beans.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/dependency/test/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/webbeans/test/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/scanning/smoke/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/scanning/smoke/META-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/scanning/smoke/META-INF/jboss-scanning.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/META-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/META-INF/application.properties
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/crm/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/MANIFEST.MF
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/web-beans.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/MANIFEST.MF
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/ejb-jar.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/web-beans.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ext/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ext/META-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ext/META-INF/MANIFEST.MF
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ext/META-INF/web-beans.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/jar/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/jar/META-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/jar/META-INF/MANIFEST.MF
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/jar/META-INF/web-beans.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ui/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ui/META-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ui/META-INF/MANIFEST.MF
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ui/META-INF/web-beans.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/web/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/web/WEB-INF/
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/web/WEB-INF/web-beans.xml
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/web/WEB-INF/web.xml
Modified:
projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/DefaultAnnotationEnvironment.java
projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/GenericAnnotationResourceVisitor.java
projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/AllowedDsTypes.java
projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/AllowedTxSupportMetaData.java
projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/ConnMetaData.java
projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/XADataSourceMetaData.java
projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/TestAttachment.java
projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/TestFields.java
projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java
projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.java
projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/AbstractParsingDeployerWithOutput.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/AnnotationEnvironmentDeployer.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/classloader/InMemoryClassesDeployer.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/DeployersVFSTestSuite.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AnnotationsScanningUnitTestCase.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/InMemoryClasesUnitTestCase.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/BeanDeployerTestSuite.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/SimpleAliasTester.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/validate/support/MyVirtualFile.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/parsing/test/DeployersAltDDTestCase.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/file/test/FileMatcherTestCase.java
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/annotations/basic-scan/jar/META-INF/MANIFEST.MF
projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/bootstrap/bootstrap.xml
Log:
Port changes to branch.
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/AbstractPathEntryMetaData.java (from rev 81633, projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/AbstractPathEntryMetaData.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/AbstractPathEntryMetaData.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/AbstractPathEntryMetaData.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,90 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.deployers.plugins.annotations;
+
+import java.io.Serializable;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.classloader.spi.filter.ClassFilter;
+import org.jboss.classloader.spi.filter.PackageClassFilter;
+import org.jboss.deployers.spi.annotations.PathEntryMetaData;
+
+/**
+ * AbstractPathEntryMetaData
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+ at XmlType(name="pathEntryType")
+public class AbstractPathEntryMetaData implements PathEntryMetaData, FilterablePathEntry, Serializable
+{
+ private static final long serialVersionUID = 1L;
+
+ private String name;
+ private transient ClassFilter filter;
+
+ @XmlTransient
+ public ClassFilter getFilter()
+ {
+ if (filter == null)
+ filter = PackageClassFilter.createPackageClassFilter(getNameInternal());
+
+ return filter;
+ }
+
+ @XmlTransient
+ private String getNameInternal()
+ {
+ if (name == null)
+ throw new IllegalArgumentException("Null name");
+
+ return name;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ @XmlAttribute(name = "name", required = true)
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return getNameInternal().hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (obj instanceof PathEntryMetaData == false)
+ return false;
+
+ PathEntryMetaData pemd = (PathEntryMetaData)obj;
+ return getNameInternal().equals(pemd.getName());
+ }
+}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/AbstractPathMetaData.java (from rev 81633, projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/AbstractPathMetaData.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/AbstractPathMetaData.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/AbstractPathMetaData.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,81 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.deployers.plugins.annotations;
+
+import java.io.Serializable;
+import java.util.Set;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.deployers.spi.annotations.PathEntryMetaData;
+import org.jboss.deployers.spi.annotations.PathMetaData;
+
+/**
+ * AbstractPathMetaData
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+ at XmlRootElement(name="path")
+ at XmlType(name="pathType", propOrder={"includes", "excludes"})
+public class AbstractPathMetaData implements PathMetaData, Serializable
+{
+ private static final long serialVersionUID = 1L;
+
+ private String pathName;
+ private Set<PathEntryMetaData> includes;
+ private Set<PathEntryMetaData> excludes;
+
+ public String getPathName()
+ {
+ return pathName;
+ }
+
+ @XmlAttribute(name = "name", required = true)
+ public void setPathName(String pathName)
+ {
+ this.pathName = pathName;
+ }
+
+ public Set<PathEntryMetaData> getIncludes()
+ {
+ return includes;
+ }
+
+ @XmlElement(name = "include", type = AbstractPathEntryMetaData.class)
+ public void setIncludes(Set<PathEntryMetaData> includes)
+ {
+ this.includes = includes;
+ }
+
+ public Set<PathEntryMetaData> getExcludes()
+ {
+ return excludes;
+ }
+
+ @XmlElement(name = "exclude", type = AbstractPathEntryMetaData.class)
+ public void setExcludes(Set<PathEntryMetaData> excludes)
+ {
+ this.excludes = excludes;
+ }
+}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/AbstractScanningMetaData.java (from rev 81633, projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/AbstractScanningMetaData.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/AbstractScanningMetaData.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/AbstractScanningMetaData.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,59 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.deployers.plugins.annotations;
+
+import java.io.Serializable;
+import java.util.List;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.deployers.spi.annotations.PathMetaData;
+import org.jboss.deployers.spi.annotations.ScanningMetaData;
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * AbstractScanningMetaData
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+ at JBossXmlSchema(namespace="urn:jboss:scanning:1.0", elementFormDefault= XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="scanning")
+ at XmlType(name="scanningType", propOrder={"paths"})
+public class AbstractScanningMetaData implements ScanningMetaData, Serializable
+{
+ private static final long serialVersionUID = 1L;
+
+ private List<PathMetaData> paths;
+
+ public List<PathMetaData> getPaths()
+ {
+ return paths;
+ }
+
+ @XmlElement(name="path", type = AbstractPathMetaData.class)
+ public void setPaths(List<PathMetaData> paths)
+ {
+ this.paths = paths;
+ }
+}
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/DefaultAnnotationEnvironment.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/DefaultAnnotationEnvironment.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/DefaultAnnotationEnvironment.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -53,6 +53,8 @@
private static final Logger log = Logger.getLogger(DefaultAnnotationEnvironment.class);
/** The info map */
private transient Map<Class<? extends Annotation>, Map<ElementType, Set<ClassSignaturePair>>> env;
+ /** The checked class names */
+ private transient Set<String> checkedClassNames;
/** Should we keep the annotation */
private boolean keepAnnotations;
@@ -60,6 +62,7 @@
{
super(classLoader);
env = new HashMap<Class<? extends Annotation>, Map<ElementType, Set<ClassSignaturePair>>>();
+ checkedClassNames = new HashSet<String>();
}
/**
@@ -86,6 +89,17 @@
}
/**
+ * Was class name already checked.
+ *
+ * @param className the class name
+ * @return true if already checked, false otherwise
+ */
+ boolean isAlreadyChecked(String className)
+ {
+ return checkedClassNames.contains(className);
+ }
+
+ /**
* Put the annotation info.
*
* @param annotation the annotation
@@ -100,6 +114,9 @@
if (log.isTraceEnabled())
log.trace("Adding annotation @" + annClass.getSimpleName() + " for " + className + " at type " + type + ", signature: " + signature);
+ // add to checked
+ checkedClassNames.add(className);
+
Map<Class<? extends Annotation>, Map<ElementType, Set<ClassSignaturePair>>> env = getEnv();
Map<ElementType, Set<ClassSignaturePair>> elements = env.get(annClass);
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/EnvPutList.java (from rev 81633, projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/EnvPutList.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/EnvPutList.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/EnvPutList.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,57 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.deployers.plugins.annotations;
+
+import java.util.AbstractList;
+
+/**
+ * Put elements directly into env
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+class EnvPutList extends AbstractList<CommitElement>
+{
+ private DefaultAnnotationEnvironment env;
+
+ EnvPutList(DefaultAnnotationEnvironment env)
+ {
+ if (env == null)
+ throw new IllegalArgumentException("Null env.");
+ this.env = env;
+ }
+
+ public boolean add(CommitElement ce)
+ {
+ env.putAnnotation(ce.getAnnotation(), ce.getType(), ce.getClassName(), ce.getSignature());
+ return true;
+ }
+
+ public CommitElement get(int index)
+ {
+ throw new UnsupportedOperationException("Should not be invoked.");
+ }
+
+ public int size()
+ {
+ return 0;
+ }
+}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/FilterablePathEntry.java (from rev 81633, projects/jboss-deployers/trunk/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/FilterablePathEntry.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/FilterablePathEntry.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/FilterablePathEntry.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,39 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.deployers.plugins.annotations;
+
+import org.jboss.classloader.spi.filter.ClassFilter;
+
+/**
+ * FilterablePathEntry
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public interface FilterablePathEntry
+{
+ /**
+ * Get class filter.
+ *
+ * @return the filter
+ */
+ ClassFilter getFilter();
+}
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/GenericAnnotationResourceVisitor.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/GenericAnnotationResourceVisitor.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/main/java/org/jboss/deployers/plugins/annotations/GenericAnnotationResourceVisitor.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -58,7 +58,8 @@
private ResourceFilter resourceFilter = ClassFilter.INSTANCE;
private ClassPool pool;
private boolean forceAnnotations;
- private boolean checkInterfaces;
+ private boolean checkSuper;
+ private boolean checkInterfaces = true;
private DefaultAnnotationEnvironment env;
private CtClass objectCtClass;
@@ -77,7 +78,6 @@
this.pool = pool;
this.env = new DefaultAnnotationEnvironment(classLoader);
this.objectCtClass = pool.makeClass(Object.class.getName());
- this.checkInterfaces = true;
}
public ResourceFilter getFilter()
@@ -98,11 +98,14 @@
CtClass ctClass = pool.makeClass(stream);
try
{
- List<CommitElement> commit = new ArrayList<CommitElement>();
+ List<CommitElement> commit = createCommitList();
handleCtClass(ctClass, commit);
- for (CommitElement ce : commit)
+ if (commit.isEmpty() == false)
{
- env.putAnnotation(ce.getAnnotation(), ce.getType(), ce.getClassName(), ce.getSignature());
+ for (CommitElement ce : commit)
+ {
+ env.putAnnotation(ce.getAnnotation(), ce.getType(), ce.getClassName(), ce.getSignature());
+ }
}
}
finally
@@ -135,6 +138,16 @@
}
/**
+ * Create commit list.
+ *
+ * @return the commit list
+ */
+ protected List<CommitElement> createCommitList()
+ {
+ return forceAnnotations ? new EnvPutList(env) : new ArrayList<CommitElement>();
+ }
+
+ /**
* Log throwable.
*
* @param resource the resource we're visiting
@@ -159,14 +172,21 @@
if (ctClass == null || objectCtClass.equals(ctClass))
return;
+ String className = ctClass.getName();
+ if (env.isAlreadyChecked(className))
+ {
+ if (log.isTraceEnabled())
+ log.trace("Skipping already checked class name: " + className);
+ return;
+ }
+
if (checkInterfaces == false && ctClass.isInterface())
{
if (log.isTraceEnabled())
- log.trace("Skipping interface: " + ctClass.getName());
+ log.trace("Skipping interface: " + className);
return;
}
- String className = ctClass.getName();
if (log.isTraceEnabled())
log.trace("Scanning class " + className + " for annotations");
@@ -177,19 +197,21 @@
handleCtMembers(ElementType.METHOD, ctClass.getDeclaredMethods(), className, commit);
handleCtMembers(ElementType.FIELD, ctClass.getDeclaredFields(), className, commit);
- if (checkInterfaces)
+ if (checkSuper)
{
- // interfaces
- CtClass[] interfaces = ctClass.getInterfaces();
- if (interfaces != null && interfaces.length > 0)
+ if (checkInterfaces)
{
- for (CtClass intf : interfaces)
- handleCtClass(intf, commit);
+ // interfaces
+ CtClass[] interfaces = ctClass.getInterfaces();
+ if (interfaces != null && interfaces.length > 0)
+ {
+ for (CtClass intf : interfaces)
+ handleCtClass(intf, commit);
+ }
}
+ // super class
+ handleCtClass(ctClass.getSuperclass(), commit);
}
-
- // super class
- handleCtClass(ctClass.getSuperclass(), commit);
}
/**
@@ -316,6 +338,16 @@
}
/**
+ * Should we check super class for annotations as well.
+ *
+ * @param checkSuper the check super flag
+ */
+ public void setCheckSuper(boolean checkSuper)
+ {
+ this.checkSuper = checkSuper;
+ }
+
+ /**
* Should we check interfaces for annotations as well.
*
* @param checkInterfaces the check interfaces flag
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/AllowedDsTypes.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/AllowedDsTypes.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/AllowedDsTypes.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -35,9 +35,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
-public class AllowedDsTypes
- implements ManagedPropertyConstraintsPopulatorFactory,
- ManagedPropertyConstraintsPopulator
+public class AllowedDsTypes implements ManagedPropertyConstraintsPopulatorFactory, ManagedPropertyConstraintsPopulator
{
public static HashSet<MetaValue> values = new HashSet<MetaValue>();
static
@@ -60,4 +58,13 @@
return this;
}
+ public ManagedPropertyConstraintsPopulator newInstance(String min, String max, String[] legalValues)
+ {
+ return this;
+ }
+
+ public ManagedPropertyConstraintsPopulator newInstance(String min, String max, String[] legalValues, String... strings)
+ {
+ return this;
+ }
}
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/AllowedTxSupportMetaData.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/AllowedTxSupportMetaData.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/AllowedTxSupportMetaData.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -36,9 +36,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
-public class AllowedTxSupportMetaData implements
- ManagedPropertyConstraintsPopulator,
- ManagedPropertyConstraintsPopulatorFactory
+public class AllowedTxSupportMetaData implements ManagedPropertyConstraintsPopulator, ManagedPropertyConstraintsPopulatorFactory
{
private static EnumMetaType TYPE = new EnumMetaType(TxSupportMetaData.values());
private static HashSet<MetaValue> values = new HashSet<MetaValue>();
@@ -60,4 +58,13 @@
return this;
}
+ public ManagedPropertyConstraintsPopulator newInstance(String min, String max, String[] legalValues)
+ {
+ return this;
+ }
+
+ public ManagedPropertyConstraintsPopulator newInstance(String min, String max, String[] legalValues, String... strings)
+ {
+ return this;
+ }
}
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/ConnMetaData.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/ConnMetaData.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/ConnMetaData.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -24,9 +24,11 @@
import java.io.Serializable;
import java.util.Properties;
+import org.jboss.managed.api.annotation.ConstraintsPopulatorFactory;
import org.jboss.managed.api.annotation.ManagementObject;
import org.jboss.managed.api.annotation.ManagementObjectID;
import org.jboss.managed.api.annotation.ManagementProperty;
+import org.jboss.managed.api.annotation.ManagementPropertyFactory;
import org.jboss.managed.plugins.WritethroughManagedPropertyImpl;
/**
@@ -50,8 +52,9 @@
private Properties connProperties;
private SecMetaData securityMetaData;
- @ManagementProperty(name="datasource-type", constraintsFactory=AllowedDsTypes.class,
- propertyFactory=WritethroughManagedPropertyImpl.class)
+ @ManagementProperty(name="datasource-type")
+ @ConstraintsPopulatorFactory(AllowedDsTypes.class)
+ @ManagementPropertyFactory(WritethroughManagedPropertyImpl.class)
public String getConnType()
{
return connType;
@@ -61,8 +64,9 @@
this.connType = connType;
}
- @ManagementProperty(name="jndi-name", propertyFactory=WritethroughManagedPropertyImpl.class)
+ @ManagementProperty(name="jndi-name")
@ManagementObjectID(type="DataSource")
+ @ManagementPropertyFactory(WritethroughManagedPropertyImpl.class)
public String getJndiName()
{
return jndiName;
@@ -71,7 +75,8 @@
{
this.jndiName = jndiName;
}
- @ManagementProperty(name="max-size", propertyFactory=WritethroughManagedPropertyImpl.class)
+ @ManagementProperty(name="max-size")
+ @ManagementPropertyFactory(WritethroughManagedPropertyImpl.class)
public int getMaxSize()
{
return maxSize;
@@ -80,7 +85,8 @@
{
this.maxSize = maxSize;
}
- @ManagementProperty(name="min-size", propertyFactory=WritethroughManagedPropertyImpl.class)
+ @ManagementProperty(name="min-size")
+ @ManagementPropertyFactory(WritethroughManagedPropertyImpl.class)
public int getMinSize()
{
return minSize;
@@ -89,7 +95,8 @@
{
this.minSize = minSize;
}
- @ManagementProperty(propertyFactory=WritethroughManagedPropertyImpl.class)
+ @ManagementProperty
+ @ManagementPropertyFactory(WritethroughManagedPropertyImpl.class)
public char[] getPassword()
{
return password;
@@ -98,7 +105,8 @@
{
this.password = password;
}
- @ManagementProperty(propertyFactory=WritethroughManagedPropertyImpl.class)
+ @ManagementProperty
+ @ManagementPropertyFactory(WritethroughManagedPropertyImpl.class)
public String getUsername()
{
return username;
@@ -107,7 +115,8 @@
{
this.username = username;
}
- @ManagementProperty(name="connection-properties", propertyFactory=WritethroughManagedPropertyImpl.class)
+ @ManagementProperty(name="connection-properties")
+ @ManagementPropertyFactory(WritethroughManagedPropertyImpl.class)
public Properties getConnProperties()
{
return connProperties;
@@ -128,8 +137,8 @@
this.localTransactions = localTransactions;
}
- @ManagementProperty(name="tx-metadata",
- constraintsFactory=AllowedTxSupportMetaData.class)
+ @ManagementProperty(name="tx-metadata")
+ @ConstraintsPopulatorFactory(AllowedTxSupportMetaData.class)
public TxSupportMetaData getTransactionSupportMetaData()
{
return txSupportMetaData;
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/XADataSourceMetaData.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/XADataSourceMetaData.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/deployer/support/XADataSourceMetaData.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -24,6 +24,7 @@
import org.jboss.managed.api.annotation.ManagementComponent;
import org.jboss.managed.api.annotation.ManagementObject;
import org.jboss.managed.api.annotation.ManagementProperty;
+import org.jboss.managed.api.annotation.ManagementPropertyFactory;
import org.jboss.managed.plugins.WritethroughManagedPropertyImpl;
/**
@@ -43,7 +44,8 @@
{
}
- @ManagementProperty(propertyFactory=WritethroughManagedPropertyImpl.class)
+ @ManagementProperty
+ @ManagementPropertyFactory(WritethroughManagedPropertyImpl.class)
public String getXaDataSourceClass()
{
return xaDataSourceClass;
@@ -54,7 +56,8 @@
this.xaDataSourceClass = xaDataSourceClass;
}
- @ManagementProperty(propertyFactory=WritethroughManagedPropertyImpl.class)
+ @ManagementProperty
+ @ManagementPropertyFactory(WritethroughManagedPropertyImpl.class)
public int getXaResourceTimeout()
{
return xaResourceTimeout;
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/TestAttachment.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/TestAttachment.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/TestAttachment.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -25,6 +25,10 @@
import java.util.HashMap;
import java.util.Map;
+import org.jboss.metatype.api.values.SimpleValueSupport;
+import org.jboss.metatype.api.values.MetaValue;
+import org.jboss.metatype.api.values.MetaValueFactory;
+
/**
* TestAttachment.
*
@@ -36,16 +40,24 @@
/** The serialVersionUID */
private static final long serialVersionUID = 1L;
- private Map<String, Serializable> fields = new HashMap<String, Serializable>();
+ private Map<String, Object> fields = new HashMap<String, Object>();
- public Serializable getProperty(String name)
+ public Object getProperty(String name)
{
return fields.get(name);
}
- public void setProperty(String name, Serializable value)
+ public void setProperty(String name, Object value)
{
- fields.put(name, value);
+ MetaValue mv;
+ if (value instanceof MetaValue)
+ mv = (MetaValue)value;
+ else if (value instanceof Serializable)
+ mv = SimpleValueSupport.wrap((Serializable)value);
+ else
+ mv = MetaValueFactory.getInstance().create(value);
+
+ fields.put(name, mv);
}
public TestAttachment clone()
@@ -53,7 +65,7 @@
try
{
TestAttachment clone = (TestAttachment) super.clone();
- clone.fields = new HashMap<String, Serializable>(clone.fields);
+ clone.fields = new HashMap<String, Object>(clone.fields);
return clone;
}
catch (CloneNotSupportedException e)
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/TestFields.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/TestFields.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/managed/support/TestFields.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -21,8 +21,6 @@
*/
package org.jboss.test.deployers.managed.support;
-import java.io.Serializable;
-
import org.jboss.managed.api.Fields;
/**
@@ -46,7 +44,7 @@
this.property = property;
}
- public Serializable getField(String name)
+ public Object getField(String name)
{
if (name == Fields.NAME)
return property;
@@ -55,7 +53,7 @@
return null;
}
- public void setField(String name, Serializable value)
+ public void setField(String name, Object value)
{
if (name == Fields.VALUE)
{
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/AbstractManagedObjectUnitTest.java (from rev 81633, projects/jboss-deployers/trunk/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/AbstractManagedObjectUnitTest.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/AbstractManagedObjectUnitTest.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/AbstractManagedObjectUnitTest.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,54 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.test.deployers.managed.test;
+
+import org.jboss.metatype.api.values.MetaValue;
+import org.jboss.metatype.api.values.MetaValueFactory;
+import org.jboss.test.deployers.AbstractDeployerTest;
+
+/**
+ * AbstractManagedObjectUnitTest.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public abstract class AbstractManagedObjectUnitTest extends AbstractDeployerTest
+{
+ protected AbstractManagedObjectUnitTest(String name)
+ {
+ super(name);
+ }
+
+ protected MetaValueFactory getMetaValueFactory()
+ {
+ return MetaValueFactory.getInstance();
+ }
+
+ protected void assertEquals(Object object, MetaValue metaValue)
+ {
+ assertEquals(null, object, metaValue);
+ }
+
+ protected void assertEquals(String msg, Object object, MetaValue metaValue)
+ {
+ assertEquals(msg, object, getMetaValueFactory().unwrap(metaValue));
+ }
+}
\ No newline at end of file
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/DeployerManagedDeploymentUnitTestCase.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -41,12 +41,14 @@
import org.jboss.managed.api.factory.ManagedObjectFactory;
import org.jboss.metatype.api.types.SimpleMetaType;
import org.jboss.metatype.api.values.GenericValue;
-import org.jboss.test.deployers.AbstractDeployerTest;
+import org.jboss.metatype.api.values.MetaValue;
import org.jboss.test.deployers.deployer.support.ConnMetaData;
+import org.jboss.test.deployers.deployer.support.CustomName;
import org.jboss.test.deployers.deployer.support.DSMetaData;
import org.jboss.test.deployers.deployer.support.DSService;
import org.jboss.test.deployers.deployer.support.LocalDataSourceMetaData;
import org.jboss.test.deployers.deployer.support.MCFDeployer;
+import org.jboss.test.deployers.deployer.support.RuntimeComponentMetaData;
import org.jboss.test.deployers.deployer.support.SecMetaData;
import org.jboss.test.deployers.deployer.support.SecurityDeployment;
import org.jboss.test.deployers.deployer.support.SimpleMetaData;
@@ -54,8 +56,6 @@
import org.jboss.test.deployers.deployer.support.TestServiceMetaData;
import org.jboss.test.deployers.deployer.support.TestServiceMetaDataICF;
import org.jboss.test.deployers.deployer.support.XADataSourceMetaData;
-import org.jboss.test.deployers.deployer.support.RuntimeComponentMetaData;
-import org.jboss.test.deployers.deployer.support.CustomName;
import org.jboss.test.deployers.managed.support.MockProfileService;
/**
@@ -65,7 +65,7 @@
* @author Ales.Justin at jboss.org
* @version $Revision$
*/
-public class DeployerManagedDeploymentUnitTestCase extends AbstractDeployerTest
+public class DeployerManagedDeploymentUnitTestCase extends AbstractManagedObjectUnitTest
{
private MCFDeployer deployer = new MCFDeployer();
@@ -163,12 +163,13 @@
ManagedProperty prop = mc.getProperty("security-criteria");
assertNotNull(prop);
assertEquals(typeAttribute.getValue(), SimpleMetaData.SecurityDeploymentType.NONE);
- prop.setValue(SimpleMetaData.SecurityDeploymentType.APPLICATION);
+ SimpleMetaData.SecurityDeploymentType value = SimpleMetaData.SecurityDeploymentType.APPLICATION;
+ prop.setValue(getMetaValueFactory().create(value));
assertEquals(typeAttribute.getValue(), SimpleMetaData.SecurityDeploymentType.APPLICATION);
ManagedProperty targetProp = mc.getProperty("jndi-name");
assertNotNull(targetProp);
- targetProp.setValue("java:DefaultDS2");
+ targetProp.setValue(getMetaValueFactory().create("java:DefaultDS2"));
// test target runtime component invocation (if intendet here)
}
@@ -377,8 +378,8 @@
assertEquals("param description", "The int to multiple", constrainedIntx10Params[0].getDescription());
assertEquals("param type", SimpleMetaType.INTEGER, constrainedIntx10Params[0].getMetaType());
Object min = constrainedIntx10Params[0].getMinimumValue();
- assertEquals("param min is 0", new Integer(0), min);
- assertEquals("param min is 100", new Integer(100), constrainedIntx10Params[0].getMaximumValue());
+ assertEquals("param min is 0", 0, (MetaValue)min);
+ assertEquals("param min is 100", 100, (MetaValue)constrainedIntx10Params[0].getMaximumValue());
// Validate that the localDataMO includes the runtime properties
ManagedProperty rtp1 = localDataProps.get("runtimeProp1");
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-impl/src/test/java/org/jboss/test/deployers/managed/test/DeployerManagedObjectUnitTestCase.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -41,7 +41,6 @@
import org.jboss.metatype.api.values.CollectionValue;
import org.jboss.metatype.api.values.GenericValue;
import org.jboss.metatype.api.values.MetaValue;
-import org.jboss.test.deployers.AbstractDeployerTest;
import org.jboss.test.deployers.deployer.support.AllowedDsTypes;
import org.jboss.test.deployers.deployer.support.ConnMetaData;
import org.jboss.test.deployers.deployer.support.DSMetaData;
@@ -57,7 +56,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
-public class DeployerManagedObjectUnitTestCase extends AbstractDeployerTest
+public class DeployerManagedObjectUnitTestCase extends AbstractManagedObjectUnitTest
{
private TestManagedObjectDeployer deployer = new TestManagedObjectDeployer();
@@ -82,8 +81,8 @@
// Check the default settings
assertNotNull(deployer.lastAttachment);
- assertEquals("initialString1", deployer.lastAttachment.getProperty("string1"));
- assertEquals("initialString2", deployer.lastAttachment.getProperty("string2"));
+ assertEquals("initialString1", (MetaValue)deployer.lastAttachment.getProperty("string1"));
+ assertEquals("initialString2", (MetaValue)deployer.lastAttachment.getProperty("string2"));
// Get the managed object
Map<String, ManagedObject> mos = main.getManagedObjects(context.getName());
@@ -107,7 +106,7 @@
assertEquals("initialString2", mo.getProperty("string2").getValue());
// Change a value
- mo.getProperty("string1").setValue("changedString1");
+ mo.getProperty("string1").setValue(getMetaValueFactory().create("changedString1"));
// Get the changed attachment
TestAttachment attachment = (TestAttachment) mo.getAttachment();
@@ -120,8 +119,8 @@
// Check the changed settings as seen by the deployer
assertNotNull(deployer.lastAttachment);
- assertEquals("changedString1", deployer.lastAttachment.getProperty("string1"));
- assertEquals("initialString2", deployer.lastAttachment.getProperty("string2"));
+ assertEquals("changedString1", (MetaValue)deployer.lastAttachment.getProperty("string1"));
+ assertEquals("initialString2", (MetaValue)deployer.lastAttachment.getProperty("string2"));
// TODO JBMICROCONT-181 shouldn't have to reget the managed object handles across redeploys?
mos = main.getManagedObjects(context.getName());
@@ -268,12 +267,12 @@
assertNotNull(minSize);
// Validate setting the properties
- displayName.setValue("testDSMetaDataManagedObjectFactoryInit");
- jndiName.setValue("java:TestDS");
- password.setValue("password".toCharArray());
- username.setValue("username");
- minSize.setValue(new Integer(10));
- maxSize.setValue(new Integer(100));
+ displayName.setValue(getMetaValueFactory().create("testDSMetaDataManagedObjectFactoryInit"));
+ jndiName.setValue(getMetaValueFactory().create("java:TestDS"));
+ password.setValue(getMetaValueFactory().create("password".toCharArray()));
+ username.setValue(getMetaValueFactory().create("username"));
+ minSize.setValue(getMetaValueFactory().create(10));
+ maxSize.setValue(getMetaValueFactory().create(100));
Object attachment = xaConnMO.getAttachment();
assertTrue("attachment is a XADataSourceMetaData("+attachment+")", attachment instanceof XADataSourceMetaData);
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/annotations/PathEntryMetaData.java (from rev 81633, projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/annotations/PathEntryMetaData.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/annotations/PathEntryMetaData.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/annotations/PathEntryMetaData.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,37 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.deployers.spi.annotations;
+
+/**
+ * Path entry meta data.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public interface PathEntryMetaData
+{
+ /**
+ * Get name.
+ *
+ * @return the name
+ */
+ String getName();
+}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/annotations/PathMetaData.java (from rev 81633, projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/annotations/PathMetaData.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/annotations/PathMetaData.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/annotations/PathMetaData.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,53 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.deployers.spi.annotations;
+
+import java.util.Set;
+
+/**
+ * Path meta data.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public interface PathMetaData
+{
+ /**
+ * Get path name.
+ *
+ * @return the path name
+ */
+ String getPathName();
+
+ /**
+ * Get includes.
+ *
+ * @return the includes
+ */
+ Set<PathEntryMetaData> getIncludes();
+
+ /**
+ * Get excludes.
+ *
+ * @return the excludes
+ */
+ Set<PathEntryMetaData> getExcludes();
+}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/annotations/ScanningMetaData.java (from rev 81633, projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/annotations/ScanningMetaData.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/annotations/ScanningMetaData.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/annotations/ScanningMetaData.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,39 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.deployers.spi.annotations;
+
+import java.util.List;
+
+/**
+ * Scanning meta data.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public interface ScanningMetaData
+{
+ /**
+ * Get the paths.
+ *
+ * @return the paths
+ */
+ List<PathMetaData> getPaths();
+}
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/AbstractParsingDeployerWithOutput.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/AbstractParsingDeployerWithOutput.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/AbstractParsingDeployerWithOutput.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -390,6 +390,4 @@
* @throws Exception for any error
*/
protected abstract T parse(DeploymentUnit unit, Set<String> names, String suffix, T root) throws Exception;
-
-
}
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/DefaultManagedObjectCreator.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/DefaultManagedObjectCreator.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/DefaultManagedObjectCreator.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,89 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2007, 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.deployers.spi.deployer.helpers;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.managed.ManagedObjectCreator;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.logging.Logger;
-import org.jboss.managed.api.ManagedObject;
-import org.jboss.managed.api.factory.ManagedObjectFactory;
-import org.jboss.managed.plugins.factory.ManagedObjectFactoryBuilder;
-import org.jboss.metadata.spi.MetaData;
-
-/**
- * A default ManagedObjectCreator that loops through the deployment attachment
- * names and for those which have a non-null value, calls the ManagedObjectFactory
- * to build the attachment ManagedObject.
- *
- * @author Scott.Stark at jboss.org
- * @version $Revision$
- */
-public class DefaultManagedObjectCreator
- implements ManagedObjectCreator
-{
- private static Logger log = Logger.getLogger(DefaultManagedObjectCreator.class);
- private ManagedObjectFactory mof;
-
-
- public ManagedObjectFactory getMof()
- {
- return mof;
- }
-
- public void setMof(ManagedObjectFactory mof)
- {
- this.mof = mof;
- }
-
-
- /**
- * Build managed object.
- *
- * @param unit the deployment unit
- * @param managedObjects map of managed objects
- * @throws DeploymentException for any deployment exception
- */
- public void build(DeploymentUnit unit, Set<String> attachments,
- Map<String, ManagedObject> managedObjects)
- throws DeploymentException
- {
- MetaData metaData = unit.getMetaData();
- ManagedObjectFactory factory = mof;
- if(factory == null )
- factory = ManagedObjectFactoryBuilder.create();
-
- for(String name : attachments)
- {
- Object instance = unit.getAttachment(name);
- if (instance != null)
- {
- ManagedObject mo = factory.initManagedObject(instance, null, metaData, name, null);
- if (mo != null)
- managedObjects.put(mo.getName(), mo);
- }
- }
- }
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/DefaultManagedObjectCreator.java (from rev 81633, projects/jboss-deployers/trunk/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/DefaultManagedObjectCreator.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/DefaultManagedObjectCreator.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-spi/src/main/java/org/jboss/deployers/spi/deployer/helpers/DefaultManagedObjectCreator.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,89 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, 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.deployers.spi.deployer.helpers;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.managed.ManagedObjectCreator;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.logging.Logger;
+import org.jboss.managed.api.ManagedObject;
+import org.jboss.managed.api.factory.ManagedObjectFactory;
+import org.jboss.managed.plugins.factory.ManagedObjectFactoryBuilder;
+import org.jboss.metadata.spi.MetaData;
+
+/**
+ * A default ManagedObjectCreator that loops through the deployment attachment
+ * names and for those which have a non-null value, calls the ManagedObjectFactory
+ * to build the attachment ManagedObject.
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class DefaultManagedObjectCreator
+ implements ManagedObjectCreator
+{
+ private static Logger log = Logger.getLogger(DefaultManagedObjectCreator.class);
+ private ManagedObjectFactory mof;
+
+
+ public ManagedObjectFactory getMof()
+ {
+ return mof;
+ }
+
+ public void setMof(ManagedObjectFactory mof)
+ {
+ this.mof = mof;
+ }
+
+
+ /**
+ * Build managed object.
+ *
+ * @param unit the deployment unit
+ * @param managedObjects map of managed objects
+ * @throws DeploymentException for any deployment exception
+ */
+ public void build(DeploymentUnit unit, Set<String> attachments,
+ Map<String, ManagedObject> managedObjects)
+ throws DeploymentException
+ {
+ MetaData metaData = unit.getMetaData();
+ ManagedObjectFactory factory = mof;
+ if(factory == null )
+ factory = ManagedObjectFactoryBuilder.create();
+
+ for(String name : attachments)
+ {
+ Object instance = unit.getAttachment(name);
+ if (instance != null)
+ {
+ ManagedObject mo = factory.initManagedObject(instance, null, metaData, name, null);
+ if (mo != null)
+ managedObjects.put(mo.getName(), mo);
+ }
+ }
+ }
+}
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/DeploymentMBean.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/DeploymentMBean.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/DeploymentMBean.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,193 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, 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.deployers.structure.spi;
-
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
-
-import javax.management.ObjectName;
-
-import org.jboss.dependency.spi.DependencyInfo;
-import org.jboss.deployers.spi.DeploymentState;
-import org.jboss.metadata.spi.scope.ScopeKey;
-
-/**
- * DeploymentMBean.
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
-public interface DeploymentMBean
-{
- /**
- * Get the deployment name
- *
- * @return the name
- */
- String getName();
-
- /**
- * Get the object name
- *
- * @return the object name
- */
- ObjectName getObjectName();
-
- /**
- * Get the controller context names.
- *
- * @return the names
- */
- Set<Object> getControllerContextNames();
-
- /**
- * Get the simple vfs name of the deployment unit. This is the simple
- * name of the virtual file .
- *
- * vfs path ------------------- relative path
- * deploy/some.ear "some.ear"
- * deploy/some.ear/x.ejb "x.ejb"
- * deploy/some.ear/y.sar "y.sar"
- * deploy/some.ear/y.sar/z.rar "z.rar"
- * @return the deployment unit simple path
- */
- String getSimpleName();
-
- /**
- * Get the path of this deployment relative to the top of the deployment
- *
- * vfs path ------------------- relative path
- * deploy/some.ear ""
- * deploy/some.ear/x.ejb "/x.ejb"
- * deploy/some.ear/y.sar "/y.sar"
- * deploy/some.ear/y.sar/z.rar "/y.sar/z.rar"
- *
- * @return the top-level deployment relative path
- */
- String getRelativePath();
-
- /**
- * Get the relative order
- *
- * @return the relative order
- */
- int getRelativeOrder();
-
- /**
- * Get the comparator.
- *
- * @return the comparator.
- */
- Comparator<DeploymentContext> getComparator();
-
- /**
- * Get the scope
- *
- * @return the scope
- */
- ScopeKey getScope();
-
- /**
- * Get the mutable scope
- *
- * @return the mutable scope
- */
- ScopeKey getMutableScope();
-
- /**
- * Get the deployment state
- *
- * @return the state
- */
- DeploymentState getState();
-
- /**
- * Gets the classloader for this deployment unit
- *
- * @return the classloader
- */
- ObjectName getClassLoaderName();
-
- /**
- * Whether this is a top level deployment
- *
- * @return true when top level
- */
- boolean isTopLevel();
-
- /**
- * Get the top level deployment
- *
- * @return the top level deployment
- */
- ObjectName getTopLevelName();
-
- /**
- * The parent
- *
- * @return the parent
- */
- ObjectName getParentName();
-
- /**
- * The children
- *
- * @return the children
- */
- List<ObjectName> getChildNames();
-
- /**
- * Whether this is a component
- *
- * @return true when a component
- */
- boolean isComponent();
-
- /**
- * The components
- *
- * @return the components
- */
- List<ObjectName> getComponentNames();
-
- /**
- * Get the dependency info
- *
- * @return the dependency
- */
- DependencyInfo getDependencyInfo();
-
- /**
- * Whether the deployment was processed
- *
- * @return true when processed
- */
- boolean isDeployed();
-
- /**
- * Get the problem for this context
- *
- * @return the problem
- */
- Throwable getProblem();
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/DeploymentMBean.java (from rev 81633, projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/DeploymentMBean.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/DeploymentMBean.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/DeploymentMBean.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,193 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, 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.deployers.structure.spi;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
+
+import javax.management.ObjectName;
+
+import org.jboss.dependency.spi.DependencyInfo;
+import org.jboss.deployers.spi.DeploymentState;
+import org.jboss.metadata.spi.scope.ScopeKey;
+
+/**
+ * DeploymentMBean.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public interface DeploymentMBean
+{
+ /**
+ * Get the deployment name
+ *
+ * @return the name
+ */
+ String getName();
+
+ /**
+ * Get the object name
+ *
+ * @return the object name
+ */
+ ObjectName getObjectName();
+
+ /**
+ * Get the controller context names.
+ *
+ * @return the names
+ */
+ Set<Object> getControllerContextNames();
+
+ /**
+ * Get the simple vfs name of the deployment unit. This is the simple
+ * name of the virtual file .
+ *
+ * vfs path ------------------- relative path
+ * deploy/some.ear "some.ear"
+ * deploy/some.ear/x.ejb "x.ejb"
+ * deploy/some.ear/y.sar "y.sar"
+ * deploy/some.ear/y.sar/z.rar "z.rar"
+ * @return the deployment unit simple path
+ */
+ String getSimpleName();
+
+ /**
+ * Get the path of this deployment relative to the top of the deployment
+ *
+ * vfs path ------------------- relative path
+ * deploy/some.ear ""
+ * deploy/some.ear/x.ejb "/x.ejb"
+ * deploy/some.ear/y.sar "/y.sar"
+ * deploy/some.ear/y.sar/z.rar "/y.sar/z.rar"
+ *
+ * @return the top-level deployment relative path
+ */
+ String getRelativePath();
+
+ /**
+ * Get the relative order
+ *
+ * @return the relative order
+ */
+ int getRelativeOrder();
+
+ /**
+ * Get the comparator.
+ *
+ * @return the comparator.
+ */
+ Comparator<DeploymentContext> getComparator();
+
+ /**
+ * Get the scope
+ *
+ * @return the scope
+ */
+ ScopeKey getScope();
+
+ /**
+ * Get the mutable scope
+ *
+ * @return the mutable scope
+ */
+ ScopeKey getMutableScope();
+
+ /**
+ * Get the deployment state
+ *
+ * @return the state
+ */
+ DeploymentState getState();
+
+ /**
+ * Gets the classloader for this deployment unit
+ *
+ * @return the classloader
+ */
+ ObjectName getClassLoaderName();
+
+ /**
+ * Whether this is a top level deployment
+ *
+ * @return true when top level
+ */
+ boolean isTopLevel();
+
+ /**
+ * Get the top level deployment
+ *
+ * @return the top level deployment
+ */
+ ObjectName getTopLevelName();
+
+ /**
+ * The parent
+ *
+ * @return the parent
+ */
+ ObjectName getParentName();
+
+ /**
+ * The children
+ *
+ * @return the children
+ */
+ List<ObjectName> getChildNames();
+
+ /**
+ * Whether this is a component
+ *
+ * @return true when a component
+ */
+ boolean isComponent();
+
+ /**
+ * The components
+ *
+ * @return the components
+ */
+ List<ObjectName> getComponentNames();
+
+ /**
+ * Get the dependency info
+ *
+ * @return the dependency
+ */
+ DependencyInfo getDependencyInfo();
+
+ /**
+ * Whether the deployment was processed
+ *
+ * @return true when processed
+ */
+ boolean isDeployed();
+
+ /**
+ * Get the problem for this context
+ *
+ * @return the problem
+ */
+ Throwable getProblem();
+}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/DeploymentUnitFilter.java (from rev 81633, projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/DeploymentUnitFilter.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/DeploymentUnitFilter.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/DeploymentUnitFilter.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,38 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.deployers.structure.spi;
+
+/**
+ * DeploymentUnitFilter.<p>
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public interface DeploymentUnitFilter
+{
+ /**
+ * Match the deployment unit
+ *
+ * @param unit the deployment unit
+ * @return true when it matches
+ */
+ boolean accepts(DeploymentUnit unit);
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContextMBean.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContextMBean.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContextMBean.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,41 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, 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.deployers.structure.spi.helpers;
-
-import org.jboss.deployers.structure.spi.DeploymentMBean;
-
-/**
- * AbstractDeploymentContextMBean.
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
-public interface AbstractDeploymentContextMBean extends DeploymentMBean
-{
- /**
- * List the attachments as an html table
- *
- * @param detail whether to show the attachment
- * @return the html formatted string
- */
- String listAttachments(boolean detail);
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContextMBean.java (from rev 81633, projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContextMBean.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContextMBean.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/AbstractDeploymentContextMBean.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,41 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, 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.deployers.structure.spi.helpers;
+
+import org.jboss.deployers.structure.spi.DeploymentMBean;
+
+/**
+ * AbstractDeploymentContextMBean.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public interface AbstractDeploymentContextMBean extends DeploymentMBean
+{
+ /**
+ * List the attachments as an html table
+ *
+ * @param detail whether to show the attachment
+ * @return the html formatted string
+ */
+ String listAttachments(boolean detail);
+}
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/ComponentDeploymentContextMBean.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/ComponentDeploymentContextMBean.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/ComponentDeploymentContextMBean.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,41 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, 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.deployers.structure.spi.helpers;
-
-import org.jboss.deployers.structure.spi.DeploymentMBean;
-
-/**
- * ComponentDeploymentContextMBean.
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
-public interface ComponentDeploymentContextMBean extends DeploymentMBean
-{
- /**
- * List the attachments as an html table
- *
- * @param detail whether to show the attachment
- * @return the html formatted string
- */
- String listAttachments(boolean detail);
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/ComponentDeploymentContextMBean.java (from rev 81633, projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/ComponentDeploymentContextMBean.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/ComponentDeploymentContextMBean.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/ComponentDeploymentContextMBean.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,41 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, 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.deployers.structure.spi.helpers;
+
+import org.jboss.deployers.structure.spi.DeploymentMBean;
+
+/**
+ * ComponentDeploymentContextMBean.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public interface ComponentDeploymentContextMBean extends DeploymentMBean
+{
+ /**
+ * List the attachments as an html table
+ *
+ * @param detail whether to show the attachment
+ * @return the html formatted string
+ */
+ String listAttachments(boolean detail);
+}
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/DeployerTracking.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/DeployerTracking.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/DeployerTracking.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,80 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, 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.deployers.structure.spi.helpers;
-
-import java.util.Stack;
-
-/**
- * DeployerTracking.
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
-public class DeployerTracking
-{
- /** The thread local stack containg the current deployer */
- private static ThreadLocal<Stack<String>> currentDeployer = new ThreadLocal<Stack<String>>()
- {
- protected Stack<String> initialValue()
- {
- return new Stack<String>();
- }
- };
-
- /**
- * Get the stack.
- *
- * @return the stack
- */
- private static Stack<String> getStack()
- {
- return currentDeployer.get();
- }
-
- /**
- * Get the current deployer
- *
- * @return the name of the current deployer
- */
- public static String getCurrentDeployer()
- {
- return (getStack().isEmpty()) ? "UNKNOWN" : getStack().peek();
- }
-
- /**
- * Push onto stack.
- *
- * @param deployer the current deployer
- */
- public static void push(String deployer)
- {
- getStack().push(deployer);
- }
-
- /**
- * Pop from the stack.
- */
- public static void pop()
- {
- getStack().pop();
- }
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/DeployerTracking.java (from rev 81633, projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/DeployerTracking.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/DeployerTracking.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/DeployerTracking.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,80 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, 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.deployers.structure.spi.helpers;
+
+import java.util.Stack;
+
+/**
+ * DeployerTracking.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class DeployerTracking
+{
+ /** The thread local stack containg the current deployer */
+ private static ThreadLocal<Stack<String>> currentDeployer = new ThreadLocal<Stack<String>>()
+ {
+ protected Stack<String> initialValue()
+ {
+ return new Stack<String>();
+ }
+ };
+
+ /**
+ * Get the stack.
+ *
+ * @return the stack
+ */
+ private static Stack<String> getStack()
+ {
+ return currentDeployer.get();
+ }
+
+ /**
+ * Get the current deployer
+ *
+ * @return the name of the current deployer
+ */
+ public static String getCurrentDeployer()
+ {
+ return (getStack().isEmpty()) ? "UNKNOWN" : getStack().peek();
+ }
+
+ /**
+ * Push onto stack.
+ *
+ * @param deployer the current deployer
+ */
+ public static void push(String deployer)
+ {
+ getStack().push(deployer);
+ }
+
+ /**
+ * Pop from the stack.
+ */
+ public static void pop()
+ {
+ getStack().pop();
+ }
+}
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/TrackingMutableAttachments.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/TrackingMutableAttachments.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/TrackingMutableAttachments.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,254 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, 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.deployers.structure.spi.helpers;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArraySet;
-
-import org.jboss.deployers.spi.attachments.MutableAttachments;
-
-/**
- * TrackingMutableAttachments.
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
-public class TrackingMutableAttachments implements MutableAttachments
-{
- /** The serialVersionUID */
- private static final long serialVersionUID = 1L;
-
- /** The delegate */
- private MutableAttachments delegate;
-
- /** The attachment creator */
- private Map<String, String> createdDeployer = new ConcurrentHashMap<String, String>();
-
- /** The attachment referencer */
- private Map<String, Set<String>> referencedDeployer = new ConcurrentHashMap<String, Set<String>>();
-
- /**
- * Create a new TrackingMutableAttachments.
- *
- * @param delegate the delegate
- */
- public TrackingMutableAttachments(MutableAttachments delegate)
- {
- if (delegate == null)
- throw new IllegalArgumentException("Null delegate");
- this.delegate = delegate;
- }
-
- /**
- * Get the deployer that created an attachment
- *
- * @param name the attachment name
- * @return the name or null if was predetermined
- */
- public String getCreated(String name)
- {
- if (name == null)
- throw new IllegalArgumentException("Null name");
- return createdDeployer.get(name);
- }
-
- /**
- * Get the deployers that referenced an attachment
- *
- * @param name the attachment name
- * @return the name or null if nothing referenced it
- */
- public Set<String> getReferenced(String name)
- {
- if (name == null)
- throw new IllegalArgumentException("Null name");
- Set<String> result = referencedDeployer.get(name);
- if (result == null)
- return null;
- return Collections.unmodifiableSet(result);
- }
-
- /**
- * An attachment is being created
- *
- * @param name the name
- */
- void created(String name)
- {
- createdDeployer.put(name, DeployerTracking.getCurrentDeployer());
- }
-
- /**
- * An attachment is being referenced
- *
- * @param name the name
- */
- void referenced(String name)
- {
- Set<String> deployers = referencedDeployer.get(name);
- if (deployers == null)
- {
- deployers = new CopyOnWriteArraySet<String>();
- referencedDeployer.put(name, deployers);
- }
- deployers.add(DeployerTracking.getCurrentDeployer());
- }
-
- public <T> T addAttachment(Class<T> type, T attachment)
- {
- T result = delegate.addAttachment(type, attachment);
- if (result == null)
- created(type.getName());
- else
- referenced(type.getName());
- return result;
- }
-
- public Object addAttachment(String name, Object attachment)
- {
- Object result = delegate.addAttachment(name, attachment);
- if (result == null)
- created(name);
- else
- referenced(name);
- return result;
- }
-
- public <T> T addAttachment(String name, T attachment, Class<T> expectedType)
- {
- T result = delegate.addAttachment(name, attachment, expectedType);
- if (result == null)
- created(name);
- else
- referenced(name);
- return result;
- }
-
- public void clear()
- {
- createdDeployer.clear();
- referencedDeployer.clear();
- delegate.clear();
- }
-
- public void clearChangeCount()
- {
- delegate.clearChangeCount();
- }
-
- public <T> T getAttachment(Class<T> type)
- {
- T result = delegate.getAttachment(type);
- if (result != null)
- referenced(type.getName());
- return result;
- }
-
- public <T> T getAttachment(String name, Class<T> expectedType)
- {
- T result = delegate.getAttachment(name, expectedType);
- if (result != null)
- referenced(name);
- return result;
- }
-
- public Object getAttachment(String name)
- {
- Object result = delegate.getAttachment(name);
- if (result != null)
- referenced(name);
- return result;
- }
-
- public Map<String, Object> getAttachments()
- {
- return delegate.getAttachments();
- }
-
- public int getChangeCount()
- {
- return delegate.getChangeCount();
- }
-
- public boolean hasAttachments()
- {
- return delegate.hasAttachments();
- }
-
- public boolean isAttachmentPresent(Class<?> type)
- {
- boolean result = delegate.isAttachmentPresent(type);
- if (result)
- referenced(type.getName());
- return result;
- }
-
- public boolean isAttachmentPresent(String name, Class<?> expectedType)
- {
- boolean result = delegate.isAttachmentPresent(name, expectedType);
- if (result)
- referenced(name);
- return result;
- }
-
- public boolean isAttachmentPresent(String name)
- {
- boolean result = delegate.isAttachmentPresent(name);
- if (result)
- referenced(name);
- return result;
- }
-
- public <T> T removeAttachment(Class<T> type)
- {
- T result = delegate.removeAttachment(type);
- if (result != null)
- referenced(type.getName());
- return result;
- }
-
- public <T> T removeAttachment(String name, Class<T> expectedType)
- {
- T result = delegate.removeAttachment(name, expectedType);
- if (result != null)
- referenced(name);
- return result;
- }
-
- public Object removeAttachment(String name)
- {
- Object result = delegate.removeAttachment(name);
- if (result != null)
- referenced(name);
- return result;
- }
-
- public void setAttachments(Map<String, Object> map)
- {
- delegate.setAttachments(map);
- createdDeployer.clear();
- referencedDeployer.clear();
- }
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/TrackingMutableAttachments.java (from rev 81633, projects/jboss-deployers/trunk/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/TrackingMutableAttachments.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/TrackingMutableAttachments.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-structure-spi/src/main/java/org/jboss/deployers/structure/spi/helpers/TrackingMutableAttachments.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,254 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, 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.deployers.structure.spi.helpers;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+import org.jboss.deployers.spi.attachments.MutableAttachments;
+
+/**
+ * TrackingMutableAttachments.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public class TrackingMutableAttachments implements MutableAttachments
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+ /** The delegate */
+ private MutableAttachments delegate;
+
+ /** The attachment creator */
+ private Map<String, String> createdDeployer = new ConcurrentHashMap<String, String>();
+
+ /** The attachment referencer */
+ private Map<String, Set<String>> referencedDeployer = new ConcurrentHashMap<String, Set<String>>();
+
+ /**
+ * Create a new TrackingMutableAttachments.
+ *
+ * @param delegate the delegate
+ */
+ public TrackingMutableAttachments(MutableAttachments delegate)
+ {
+ if (delegate == null)
+ throw new IllegalArgumentException("Null delegate");
+ this.delegate = delegate;
+ }
+
+ /**
+ * Get the deployer that created an attachment
+ *
+ * @param name the attachment name
+ * @return the name or null if was predetermined
+ */
+ public String getCreated(String name)
+ {
+ if (name == null)
+ throw new IllegalArgumentException("Null name");
+ return createdDeployer.get(name);
+ }
+
+ /**
+ * Get the deployers that referenced an attachment
+ *
+ * @param name the attachment name
+ * @return the name or null if nothing referenced it
+ */
+ public Set<String> getReferenced(String name)
+ {
+ if (name == null)
+ throw new IllegalArgumentException("Null name");
+ Set<String> result = referencedDeployer.get(name);
+ if (result == null)
+ return null;
+ return Collections.unmodifiableSet(result);
+ }
+
+ /**
+ * An attachment is being created
+ *
+ * @param name the name
+ */
+ void created(String name)
+ {
+ createdDeployer.put(name, DeployerTracking.getCurrentDeployer());
+ }
+
+ /**
+ * An attachment is being referenced
+ *
+ * @param name the name
+ */
+ void referenced(String name)
+ {
+ Set<String> deployers = referencedDeployer.get(name);
+ if (deployers == null)
+ {
+ deployers = new CopyOnWriteArraySet<String>();
+ referencedDeployer.put(name, deployers);
+ }
+ deployers.add(DeployerTracking.getCurrentDeployer());
+ }
+
+ public <T> T addAttachment(Class<T> type, T attachment)
+ {
+ T result = delegate.addAttachment(type, attachment);
+ if (result == null)
+ created(type.getName());
+ else
+ referenced(type.getName());
+ return result;
+ }
+
+ public Object addAttachment(String name, Object attachment)
+ {
+ Object result = delegate.addAttachment(name, attachment);
+ if (result == null)
+ created(name);
+ else
+ referenced(name);
+ return result;
+ }
+
+ public <T> T addAttachment(String name, T attachment, Class<T> expectedType)
+ {
+ T result = delegate.addAttachment(name, attachment, expectedType);
+ if (result == null)
+ created(name);
+ else
+ referenced(name);
+ return result;
+ }
+
+ public void clear()
+ {
+ createdDeployer.clear();
+ referencedDeployer.clear();
+ delegate.clear();
+ }
+
+ public void clearChangeCount()
+ {
+ delegate.clearChangeCount();
+ }
+
+ public <T> T getAttachment(Class<T> type)
+ {
+ T result = delegate.getAttachment(type);
+ if (result != null)
+ referenced(type.getName());
+ return result;
+ }
+
+ public <T> T getAttachment(String name, Class<T> expectedType)
+ {
+ T result = delegate.getAttachment(name, expectedType);
+ if (result != null)
+ referenced(name);
+ return result;
+ }
+
+ public Object getAttachment(String name)
+ {
+ Object result = delegate.getAttachment(name);
+ if (result != null)
+ referenced(name);
+ return result;
+ }
+
+ public Map<String, Object> getAttachments()
+ {
+ return delegate.getAttachments();
+ }
+
+ public int getChangeCount()
+ {
+ return delegate.getChangeCount();
+ }
+
+ public boolean hasAttachments()
+ {
+ return delegate.hasAttachments();
+ }
+
+ public boolean isAttachmentPresent(Class<?> type)
+ {
+ boolean result = delegate.isAttachmentPresent(type);
+ if (result)
+ referenced(type.getName());
+ return result;
+ }
+
+ public boolean isAttachmentPresent(String name, Class<?> expectedType)
+ {
+ boolean result = delegate.isAttachmentPresent(name, expectedType);
+ if (result)
+ referenced(name);
+ return result;
+ }
+
+ public boolean isAttachmentPresent(String name)
+ {
+ boolean result = delegate.isAttachmentPresent(name);
+ if (result)
+ referenced(name);
+ return result;
+ }
+
+ public <T> T removeAttachment(Class<T> type)
+ {
+ T result = delegate.removeAttachment(type);
+ if (result != null)
+ referenced(type.getName());
+ return result;
+ }
+
+ public <T> T removeAttachment(String name, Class<T> expectedType)
+ {
+ T result = delegate.removeAttachment(name, expectedType);
+ if (result != null)
+ referenced(name);
+ return result;
+ }
+
+ public Object removeAttachment(String name)
+ {
+ Object result = delegate.removeAttachment(name);
+ if (result != null)
+ referenced(name);
+ return result;
+ }
+
+ public void setAttachments(Map<String, Object> map)
+ {
+ delegate.setAttachments(map);
+ createdDeployer.clear();
+ referencedDeployer.clear();
+ }
+}
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/deployer/kernel/BeanMetaDataDeployer.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -41,10 +41,10 @@
/**
* BeanMetaDataDeployer.<p>
- *
+ *
* This deployer is responsible for deploying all metadata of
* type {@link org.jboss.beans.metadata.spi.BeanMetaData}.
- *
+ *
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
@@ -52,10 +52,10 @@
{
/** The controller */
private Controller controller;
-
+
/**
* Create a new BeanDeployer.
- *
+ *
* @param kernel the kernel
* @throws IllegalArgumentException for a null kernel
* @deprecated use other constructor
@@ -151,13 +151,13 @@
public void undeploy(DeploymentUnit unit, BeanMetaData deployment)
{
controller.uninstall(deployment.getName());
-
+
// Remove any classloader metadata we added (not necessary if we clone above)
ClassLoaderMetaData classLoader = deployment.getClassLoader();
if (classLoader instanceof DeploymentClassLoaderMetaData)
deployment.setClassLoader(null);
}
-
+
/**
* DeploymentClassLoaderMetaData.
*/
@@ -165,13 +165,13 @@
{
/** The serialVersionUID */
private static final long serialVersionUID = 1L;
-
+
/** The deployment unit */
private DeploymentUnit unit;
/**
* Create a new DeploymentClassLoaderMetaData.
- *
+ *
* @param unit the deployment unit
*/
public DeploymentClassLoaderMetaData(DeploymentUnit unit)
@@ -180,7 +180,7 @@
throw new IllegalArgumentException("Null unit");
this.unit = unit;
}
-
+
@Override
public ValueMetaData getClassLoader()
{
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/AnnotationEnvironmentDeployer.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/AnnotationEnvironmentDeployer.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/AnnotationEnvironmentDeployer.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -32,10 +32,12 @@
import org.jboss.deployers.plugins.annotations.GenericAnnotationResourceVisitor;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.spi.annotations.AnnotationEnvironment;
+import org.jboss.deployers.spi.annotations.ScanningMetaData;
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.deployer.AbstractOptionalVFSRealDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnitFilter;
import org.jboss.virtual.VirtualFile;
/**
@@ -49,10 +51,13 @@
private boolean keepAnnotations;
private boolean checkInterfaces;
+ private VFSDeploymentUnitFilter filter;
+
public AnnotationEnvironmentDeployer()
{
super(Module.class);
setStage(DeploymentStages.POST_CLASSLOADER);
+ addInput(ScanningMetaData.class);
setOutput(AnnotationEnvironment.class);
checkInterfaces = true;
}
@@ -88,6 +93,16 @@
}
/**
+ * Set vfs deployment filter.
+ *
+ * @param filter the vfs deployment filter.
+ */
+ public void setFilter(VFSDeploymentUnitFilter filter)
+ {
+ this.filter = filter;
+ }
+
+ /**
* Create GenericAnnotationResourceVisitor.
*
* Can be used change existing GARV's filter.
@@ -198,6 +213,10 @@
public void deploy(VFSDeploymentUnit unit, Module module) throws DeploymentException
{
+ // running this deployer is costly, check if it should be run
+ if (filter != null && filter.accepts(unit) == false)
+ return;
+
if (module == null)
{
VFSDeploymentUnit parent = unit.getParent();
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScanningDeploymentUnitFilter.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScanningDeploymentUnitFilter.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScanningDeploymentUnitFilter.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScanningDeploymentUnitFilter.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,125 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.deployers.vfs.plugins.annotations;
+
+import java.net.URL;
+import java.util.List;
+
+import org.jboss.classloading.spi.visitor.ResourceContext;
+import org.jboss.classloading.spi.visitor.ResourceFilter;
+import org.jboss.deployers.spi.annotations.PathMetaData;
+import org.jboss.deployers.spi.annotations.ScanningMetaData;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnitFilter;
+import org.jboss.logging.Logger;
+
+/**
+ * ScanningDeploymentUnitFilter
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class ScanningDeploymentUnitFilter implements VFSDeploymentUnitFilter
+{
+ private Logger log = Logger.getLogger(getClass());
+
+ public boolean accepts(VFSDeploymentUnit unit)
+ {
+ ScanningMetaData smd = unit.getAttachment(ScanningMetaData.class);
+ if (smd != null)
+ {
+ // recurse
+ ResourceFilter recurse = createRecurseFilter(smd);
+ if (recurse != null)
+ {
+ ResourceFilter previousRecurse = unit.addAttachment(ResourceFilter.class.getName() + ".recurse", recurse, ResourceFilter.class);
+ if (previousRecurse != null)
+ log.debug("Overridding previous recurse filter: " + previousRecurse);
+ }
+
+ // resource
+ ResourceFilter filter = createResourceFilter(smd);
+ if (filter != null)
+ {
+ ResourceFilter previousFilter = unit.addAttachment(ResourceFilter.class.getName() + ".resource", filter, ResourceFilter.class);
+ if (previousFilter != null)
+ log.debug("Overridding previous resource filter: " + previousFilter);
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Create recurse filter.
+ *
+ * @param smd the scanning metadata
+ * @return recurse filter
+ */
+ protected ResourceFilter createRecurseFilter(ScanningMetaData smd)
+ {
+ return new ScanningMetaDataRecurseFilter(smd);
+ }
+
+ /**
+ * Create resource filter.
+ *
+ * @param smd the scanning metadata
+ * @return resource filter
+ */
+ protected ResourceFilter createResourceFilter(ScanningMetaData smd)
+ {
+ return new ScanningMetaDataResourceFilter(smd);
+ }
+
+ /**
+ * Simple recurse filter.
+ * It searches for path substring in url string.
+ */
+ private class ScanningMetaDataRecurseFilter implements ResourceFilter
+ {
+ private ScanningMetaData smd;
+
+ private ScanningMetaDataRecurseFilter(ScanningMetaData smd)
+ {
+ this.smd = smd;
+ }
+
+ public boolean accepts(ResourceContext resource)
+ {
+ URL url = resource.getUrl();
+ String urlString = url.toExternalForm();
+ List<PathMetaData> paths = smd.getPaths();
+ if (paths != null && paths.isEmpty() == false)
+ {
+ for (PathMetaData pmd : paths)
+ {
+ String name = pmd.getPathName();
+ // url contains path
+ if (urlString.contains(name))
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+ }
+}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScanningMetaDataDeployer.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScanningMetaDataDeployer.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScanningMetaDataDeployer.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScanningMetaDataDeployer.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,50 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.deployers.vfs.plugins.annotations;
+
+import org.jboss.deployers.plugins.annotations.AbstractScanningMetaData;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.annotations.ScanningMetaData;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer;
+
+/**
+ * ScanningMetaDataDeployer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class ScanningMetaDataDeployer extends SchemaResolverDeployer<AbstractScanningMetaData>
+{
+ public ScanningMetaDataDeployer()
+ {
+ super(AbstractScanningMetaData.class);
+ setName("jboss-scanning.xml");
+ setRegisterWithJBossXB(true);
+ addOutput(ScanningMetaData.class);
+ }
+
+ @Override
+ protected void createMetaData(DeploymentUnit unit, String name, String suffix) throws DeploymentException
+ {
+ createMetaData(unit, name, suffix, ScanningMetaData.class.getName());
+ }
+}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScanningMetaDataResourceFilter.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScanningMetaDataResourceFilter.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScanningMetaDataResourceFilter.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/annotations/ScanningMetaDataResourceFilter.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,113 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.deployers.vfs.plugins.annotations;
+
+import java.net.URL;
+import java.util.List;
+import java.util.Set;
+
+import org.jboss.classloader.spi.filter.ClassFilter;
+import org.jboss.classloader.spi.filter.PackageClassFilter;
+import org.jboss.classloading.spi.visitor.ResourceContext;
+import org.jboss.classloading.spi.visitor.ResourceFilter;
+import org.jboss.deployers.spi.annotations.PathEntryMetaData;
+import org.jboss.deployers.spi.annotations.PathMetaData;
+import org.jboss.deployers.spi.annotations.ScanningMetaData;
+import org.jboss.deployers.plugins.annotations.FilterablePathEntry;
+
+/**
+ * ScanningMetaDataResourceFilter
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class ScanningMetaDataResourceFilter implements ResourceFilter
+{
+ private ScanningMetaData smd;
+
+ public ScanningMetaDataResourceFilter(ScanningMetaData smd)
+ {
+ this.smd = smd;
+ }
+
+ public boolean accepts(ResourceContext resource)
+ {
+ if (resource.isClass() == false)
+ return false;
+
+ URL url = resource.getUrl();
+ String urlString = url.toExternalForm();
+ List<PathMetaData> paths = smd.getPaths();
+ if (paths != null && paths.isEmpty() == false)
+ {
+ for (PathMetaData pmda : paths)
+ {
+ String name = pmda.getPathName();
+ // url contains path + we need some include or exclude
+ if (urlString.contains(name))
+ {
+ String resourceName = resource.getResourceName();
+ boolean explicitInclude = false; // do we have an explicit include
+
+ Set<PathEntryMetaData> includes = pmda.getIncludes();
+ if (includes != null && includes.isEmpty() == false)
+ {
+ explicitInclude = true;
+ for (PathEntryMetaData pemda : includes)
+ {
+ ClassFilter filter = getClassFilter(pemda);
+ if (filter.matchesResourcePath(resourceName))
+ return true;
+ }
+ }
+
+ Set<PathEntryMetaData> excludes = pmda.getExcludes();
+ if (excludes != null && excludes.isEmpty() == false)
+ {
+ for (PathEntryMetaData pemda : excludes)
+ {
+ ClassFilter filter = getClassFilter(pemda);
+ if (filter.matchesResourcePath(resourceName))
+ return false;
+ }
+ }
+
+ return (explicitInclude == false);
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Get class filter from path entry meta data.
+ *
+ * @param pemd the path entry meta data
+ * @return class filter
+ */
+ protected ClassFilter getClassFilter(PathEntryMetaData pemd)
+ {
+ if (pemd instanceof FilterablePathEntry)
+ return ((FilterablePathEntry) pemd).getFilter();
+ else
+ return PackageClassFilter.createPackageClassFilter(pemd.getName());
+ }
+}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/classloader/DeploymentHostNameCreator.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/classloader/DeploymentHostNameCreator.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/classloader/DeploymentHostNameCreator.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/classloader/DeploymentHostNameCreator.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,57 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, JBoss 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.deployers.vfs.plugins.classloader;
+
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+
+/**
+ * Join all deployment names.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public class DeploymentHostNameCreator implements HostNameCreator
+{
+ /**The prefix */
+ private String prefix = "in-memory";
+
+ public String createHostName(VFSDeploymentUnit unit)
+ {
+ StringBuilder builder = new StringBuilder(prefix);
+ VFSDeploymentUnit vdu = unit;
+ while (vdu != null)
+ {
+ builder.append("-").append(vdu.getSimpleName());
+ vdu = vdu.getParent();
+ }
+ return builder.toString();
+ }
+
+ /**
+ * Set prefix.
+ *
+ * @param prefix the prefix
+ */
+ public void setPrefix(String prefix)
+ {
+ this.prefix = prefix;
+ }
+}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/classloader/HostNameCreator.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/classloader/HostNameCreator.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/classloader/HostNameCreator.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/classloader/HostNameCreator.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,43 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, JBoss 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.deployers.vfs.plugins.classloader;
+
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+
+/**
+ * Create host name for in-memory url.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public interface HostNameCreator
+{
+ /**
+ * Create host name.
+ *
+ * It should not contain any '/' due to VFS Memory context limitations.
+ * See JBDEPLOY-75.
+ *
+ * @param unit the vfs deployment unit
+ * @return host name
+ */
+ String createHostName(VFSDeploymentUnit unit);
+}
\ No newline at end of file
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/classloader/InMemoryClassesDeployer.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/classloader/InMemoryClassesDeployer.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/classloader/InMemoryClassesDeployer.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -37,6 +37,7 @@
* TempURLDeployer.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
* @version $Revision: 1.1 $
*/
public class InMemoryClassesDeployer extends AbstractVFSRealDeployer
@@ -47,6 +48,9 @@
/** The name of the dynamic class root */
public static final String DYNAMIC_CLASS_KEY = "DYNAMIC_CLASS_KEY";
+ /** The host name creator */
+ private HostNameCreator hostNameCreator;
+
/**
* Create a new TempURLDeployer.
*/
@@ -57,13 +61,24 @@
setOutput(ClassLoadingMetaData.class);
setTopLevelOnly(true);
}
-
+
+ /**
+ * Create host name.
+ *
+ * @param unit the deployment unit
+ * @return the host name
+ */
+ protected String createHost(VFSDeploymentUnit unit)
+ {
+ return (hostNameCreator != null) ? hostNameCreator.createHostName(unit) : GUID.asString();
+ }
+
@Override
public void deploy(VFSDeploymentUnit unit) throws DeploymentException
{
try
{
- URL dynamicClassRoot = new URL("vfsmemory", GUID.asString(), "");
+ URL dynamicClassRoot = new URL("vfsmemory", createHost(unit), "");
VirtualFile classes = MemoryFileFactory.createRoot(dynamicClassRoot).getRoot();
unit.addAttachment(DYNAMIC_CLASS_URL_KEY, dynamicClassRoot);
unit.addAttachment(DYNAMIC_CLASS_KEY, classes);
@@ -107,4 +122,14 @@
}
}
}
+
+ /**
+ * Set host name creator.
+ *
+ * @param hostNameCreator the host name creator
+ */
+ public void setHostNameCreator(HostNameCreator hostNameCreator)
+ {
+ this.hostNameCreator = hostNameCreator;
+ }
}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/AliasesParserDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/AliasesParserDeployer.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/AliasesParserDeployer.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,88 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.plugins.dependency;
-
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.virtual.VirtualFile;
-
-/**
- * AliasesParserDeployer.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class AliasesParserDeployer extends AbstractVFSParsingDeployer<DeploymentAliases>
-{
- public AliasesParserDeployer()
- {
- super(DeploymentAliases.class);
- setName("aliases.txt");
- }
-
- protected DeploymentAliases parse(VFSDeploymentUnit unit, VirtualFile file, DeploymentAliases root) throws Exception
- {
- Set<Object> alises = new HashSet<Object>();
- InputStream is = file.openStream();
- try
- {
- BufferedReader br = new BufferedReader(new InputStreamReader(is));
- String line;
- while ((line = br.readLine()) != null)
- {
- alises.add(line);
- }
- }
- finally
- {
- try
- {
- is.close();
- }
- catch (IOException ignored)
- {
- }
- }
- return new DepoymentAliasesImpl(alises);
- }
-
- private class DepoymentAliasesImpl implements DeploymentAliases
- {
- private Set<Object> aliases;
-
- private DepoymentAliasesImpl(Set<Object> aliases)
- {
- this.aliases = aliases;
- }
-
- public Set<Object> getAliases()
- {
- return aliases;
- }
- }
-}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/AliasesParserDeployer.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/AliasesParserDeployer.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/AliasesParserDeployer.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/AliasesParserDeployer.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,88 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.plugins.dependency;
+
+import java.io.InputStream;
+import java.io.IOException;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * AliasesParserDeployer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class AliasesParserDeployer extends AbstractVFSParsingDeployer<DeploymentAliases>
+{
+ public AliasesParserDeployer()
+ {
+ super(DeploymentAliases.class);
+ setName("aliases.txt");
+ }
+
+ protected DeploymentAliases parse(VFSDeploymentUnit unit, VirtualFile file, DeploymentAliases root) throws Exception
+ {
+ Set<Object> alises = new HashSet<Object>();
+ InputStream is = file.openStream();
+ try
+ {
+ BufferedReader br = new BufferedReader(new InputStreamReader(is));
+ String line;
+ while ((line = br.readLine()) != null)
+ {
+ alises.add(line);
+ }
+ }
+ finally
+ {
+ try
+ {
+ is.close();
+ }
+ catch (IOException ignored)
+ {
+ }
+ }
+ return new DepoymentAliasesImpl(alises);
+ }
+
+ private class DepoymentAliasesImpl implements DeploymentAliases
+ {
+ private Set<Object> aliases;
+
+ private DepoymentAliasesImpl(Set<Object> aliases)
+ {
+ this.aliases = aliases;
+ }
+
+ public Set<Object> getAliases()
+ {
+ return aliases;
+ }
+ }
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaData.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaData.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaData.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,67 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.plugins.dependency;
-
-import java.io.Serializable;
-import java.util.List;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.jboss.xb.annotations.JBossXmlSchema;
-
-/**
- * DependenciesMetaData.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
- at JBossXmlSchema(namespace="urn:jboss:dependency:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
- at XmlRootElement(name="dependency")
- at XmlType(name="dependencyType", propOrder={"items"})
-public class DependenciesMetaData implements Serializable
-{
- private static final long serialVersionUID = 1;
- /** The dependency items metadata */
- private List<DependencyItemMetaData> items;
-
- /**
- * Get dependency metadata items.
- *
- * @return the dependency metadata items
- */
- public List<DependencyItemMetaData> getItems()
- {
- return items;
- }
-
- /**
- * Set dependency metadata items.
- *
- * @param items the dependency metadata items
- */
- @XmlElement(name = "item", type = DependencyItemMetaData.class)
- public void setItems(List<DependencyItemMetaData> items)
- {
- this.items = items;
- }
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaData.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaData.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaData.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaData.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.plugins.dependency;
+
+import java.io.Serializable;
+import java.util.List;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlNsForm;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jboss.xb.annotations.JBossXmlSchema;
+
+/**
+ * DependenciesMetaData.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+ at JBossXmlSchema(namespace="urn:jboss:dependency:1.0", elementFormDefault=XmlNsForm.QUALIFIED)
+ at XmlRootElement(name="dependency")
+ at XmlType(name="dependencyType", propOrder={"items"})
+public class DependenciesMetaData implements Serializable
+{
+ private static final long serialVersionUID = 1;
+ /** The dependency items metadata */
+ private List<DependencyItemMetaData> items;
+
+ /**
+ * Get dependency metadata items.
+ *
+ * @return the dependency metadata items
+ */
+ public List<DependencyItemMetaData> getItems()
+ {
+ return items;
+ }
+
+ /**
+ * Set dependency metadata items.
+ *
+ * @param items the dependency metadata items
+ */
+ @XmlElement(name = "item", type = DependencyItemMetaData.class)
+ public void setItems(List<DependencyItemMetaData> items)
+ {
+ this.items = items;
+ }
+}
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaDataDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaDataDeployer.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaDataDeployer.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.plugins.dependency;
-
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.deployer.DeploymentStages;
-import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-
-/**
- * DependenciesMetaDataDeployer.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class DependenciesMetaDataDeployer extends AbstractSimpleRealDeployer<DependenciesMetaData>
-{
- public DependenciesMetaDataDeployer()
- {
- super(DependenciesMetaData.class);
- addOutput(DeploymentDependencies.class);
- setStage(DeploymentStages.POST_PARSE);
- }
-
- public void deploy(DeploymentUnit unit, DependenciesMetaData deployment) throws DeploymentException
- {
- ControllerContext context = unit.getAttachment(ControllerContext.class);
- if (context == null)
- throw new DeploymentException("Missing deployment controller context: " + unit.getName());
-
- Object contextName = context.getName();
- unit.addAttachment(DeploymentDependencies.class, new DeploymentDependenciesImpl(contextName, deployment));
- }
-}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaDataDeployer.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaDataDeployer.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaDataDeployer.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesMetaDataDeployer.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.plugins.dependency;
+
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.DeploymentStages;
+import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+
+/**
+ * DependenciesMetaDataDeployer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class DependenciesMetaDataDeployer extends AbstractSimpleRealDeployer<DependenciesMetaData>
+{
+ public DependenciesMetaDataDeployer()
+ {
+ super(DependenciesMetaData.class);
+ addOutput(DeploymentDependencies.class);
+ setStage(DeploymentStages.POST_PARSE);
+ }
+
+ public void deploy(DeploymentUnit unit, DependenciesMetaData deployment) throws DeploymentException
+ {
+ ControllerContext context = unit.getAttachment(ControllerContext.class);
+ if (context == null)
+ throw new DeploymentException("Missing deployment controller context: " + unit.getName());
+
+ Object contextName = context.getName();
+ unit.addAttachment(DeploymentDependencies.class, new DeploymentDependenciesImpl(contextName, deployment));
+ }
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesParserDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesParserDeployer.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesParserDeployer.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.plugins.dependency;
-
-import org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer;
-
-/**
- * DependenciesParserDeployer.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class DependenciesParserDeployer extends SchemaResolverDeployer<DependenciesMetaData>
-{
- public DependenciesParserDeployer()
- {
- super(DependenciesMetaData.class);
- setName("jboss-dependency.xml");
- setRegisterWithJBossXB(true);
- }
-}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesParserDeployer.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesParserDeployer.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesParserDeployer.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependenciesParserDeployer.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.plugins.dependency;
+
+import org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer;
+
+/**
+ * DependenciesParserDeployer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class DependenciesParserDeployer extends SchemaResolverDeployer<DependenciesMetaData>
+{
+ public DependenciesParserDeployer()
+ {
+ super(DependenciesMetaData.class);
+ setName("jboss-dependency.xml");
+ setRegisterWithJBossXB(true);
+ }
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependencyItemMetaData.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependencyItemMetaData.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependencyItemMetaData.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,109 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.plugins.dependency;
-
-import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-
-import org.jboss.dependency.spi.ControllerState;
-
-/**
- * DependencyItemMetaData.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
- at XmlRootElement(name="item")
- at XmlType(name="itemType")
-public class DependencyItemMetaData implements Serializable
-{
- private static final long serialVersionUID = 1;
-
- private Object value;
- private ControllerState whenRequired = ControllerState.DESCRIBED;
- private ControllerState dependentState;
-
- /**
- * Get the value.
- *
- * @return the value
- */
- public Object getValue()
- {
- return value;
- }
-
- /**
- * Set the value.
- *
- * @param value the value
- */
- @XmlValue
- public void setValue(Object value)
- {
- this.value = value;
- }
-
- /**
- * Get when required state.
- *
- * @return the when required state
- */
- public ControllerState getWhenRequired()
- {
- return whenRequired;
- }
-
- /**
- * Set when required state.
- *
- * @param whenRequired the when required state
- */
- @XmlAttribute(name = "whenRequired")
- public void setWhenRequired(ControllerState whenRequired)
- {
- this.whenRequired = whenRequired;
- }
-
- /**
- * Get dependent state.
- *
- * @return the dependent state
- */
- public ControllerState getDependentState()
- {
- return dependentState;
- }
-
- /**
- * Set dependent state.
- *
- * @param dependentState the dependent state
- */
- @XmlAttribute(name = "dependentState")
- public void setDependentState(ControllerState dependentState)
- {
- this.dependentState = dependentState;
- }
-}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependencyItemMetaData.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependencyItemMetaData.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependencyItemMetaData.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DependencyItemMetaData.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,109 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.plugins.dependency;
+
+import java.io.Serializable;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+
+import org.jboss.dependency.spi.ControllerState;
+
+/**
+ * DependencyItemMetaData.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+ at XmlRootElement(name="item")
+ at XmlType(name="itemType")
+public class DependencyItemMetaData implements Serializable
+{
+ private static final long serialVersionUID = 1;
+
+ private Object value;
+ private ControllerState whenRequired = ControllerState.DESCRIBED;
+ private ControllerState dependentState;
+
+ /**
+ * Get the value.
+ *
+ * @return the value
+ */
+ public Object getValue()
+ {
+ return value;
+ }
+
+ /**
+ * Set the value.
+ *
+ * @param value the value
+ */
+ @XmlValue
+ public void setValue(Object value)
+ {
+ this.value = value;
+ }
+
+ /**
+ * Get when required state.
+ *
+ * @return the when required state
+ */
+ public ControllerState getWhenRequired()
+ {
+ return whenRequired;
+ }
+
+ /**
+ * Set when required state.
+ *
+ * @param whenRequired the when required state
+ */
+ @XmlAttribute(name = "whenRequired")
+ public void setWhenRequired(ControllerState whenRequired)
+ {
+ this.whenRequired = whenRequired;
+ }
+
+ /**
+ * Get dependent state.
+ *
+ * @return the dependent state
+ */
+ public ControllerState getDependentState()
+ {
+ return dependentState;
+ }
+
+ /**
+ * Set dependent state.
+ *
+ * @param dependentState the dependent state
+ */
+ @XmlAttribute(name = "dependentState")
+ public void setDependentState(ControllerState dependentState)
+ {
+ this.dependentState = dependentState;
+ }
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliases.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliases.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliases.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.plugins.dependency;
-
-import java.util.Set;
-
-/**
- * DeploymentAliases.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public interface DeploymentAliases
-{
- /**
- * Get a set of dependencies.
- *
- * @return the dependencies
- */
- Set<Object> getAliases();
-}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliases.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliases.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliases.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliases.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.plugins.dependency;
+
+import java.util.Set;
+
+/**
+ * DeploymentAliases.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public interface DeploymentAliases
+{
+ /**
+ * Get a set of dependencies.
+ *
+ * @return the dependencies
+ */
+ Set<Object> getAliases();
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,99 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.plugins.dependency;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.dependency.spi.Controller;
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.deployers.spi.deployer.DeploymentStages;
-import org.jboss.deployers.spi.deployer.helpers.AbstractDeploymentVisitor;
-import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployerWithInput;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-
-/**
- * DeploymentAliasesDeployer.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class DeploymentAliasesDeployer extends AbstractRealDeployerWithInput<DeploymentAliases>
-{
- private Controller controller;
-
- public DeploymentAliasesDeployer(Controller controller)
- {
- if (controller == null)
- throw new IllegalArgumentException("Null controller");
- this.controller = controller;
- setStage(DeploymentStages.POST_PARSE);
- setDeploymentVisitor(new DeploymentAliasDeploymentVisitor());
- }
-
- private class DeploymentAliasDeploymentVisitor extends AbstractDeploymentVisitor<Object, DeploymentAliases>
- {
- @Override
- protected DeploymentUnit addComponent(DeploymentUnit unit, Object attachment)
- {
- ControllerContext context = unit.getAttachment(ControllerContext.class);
- if (context == null)
- throw new IllegalArgumentException("Missing deployment controller context: " + unit.getName());
-
- Object contextName = context.getName();
- try
- {
- controller.addAlias(attachment, contextName);
- return null;
- }
- catch (Throwable t)
- {
- throw new RuntimeException(t);
- }
- }
-
- @Override
- protected void removeComponent(DeploymentUnit unit, Object attachment)
- {
- controller.removeAlias(attachment);
- }
-
- protected List<Object> getComponents(DeploymentAliases deployment)
- {
- return new ArrayList<Object>(deployment.getAliases());
- }
-
- protected Class<Object> getComponentType()
- {
- return Object.class;
- }
-
- protected String getComponentName(Object attachment)
- {
- throw new UnsupportedOperationException("No component name.");
- }
-
- public Class<DeploymentAliases> getVisitorType()
- {
- return DeploymentAliases.class;
- }
- }
-}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentAliasesDeployer.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,99 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.plugins.dependency;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.dependency.spi.Controller;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.deployers.spi.deployer.DeploymentStages;
+import org.jboss.deployers.spi.deployer.helpers.AbstractDeploymentVisitor;
+import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployerWithInput;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+
+/**
+ * DeploymentAliasesDeployer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class DeploymentAliasesDeployer extends AbstractRealDeployerWithInput<DeploymentAliases>
+{
+ private Controller controller;
+
+ public DeploymentAliasesDeployer(Controller controller)
+ {
+ if (controller == null)
+ throw new IllegalArgumentException("Null controller");
+ this.controller = controller;
+ setStage(DeploymentStages.POST_PARSE);
+ setDeploymentVisitor(new DeploymentAliasDeploymentVisitor());
+ }
+
+ private class DeploymentAliasDeploymentVisitor extends AbstractDeploymentVisitor<Object, DeploymentAliases>
+ {
+ @Override
+ protected DeploymentUnit addComponent(DeploymentUnit unit, Object attachment)
+ {
+ ControllerContext context = unit.getAttachment(ControllerContext.class);
+ if (context == null)
+ throw new IllegalArgumentException("Missing deployment controller context: " + unit.getName());
+
+ Object contextName = context.getName();
+ try
+ {
+ controller.addAlias(attachment, contextName);
+ return null;
+ }
+ catch (Throwable t)
+ {
+ throw new RuntimeException(t);
+ }
+ }
+
+ @Override
+ protected void removeComponent(DeploymentUnit unit, Object attachment)
+ {
+ controller.removeAlias(attachment);
+ }
+
+ protected List<Object> getComponents(DeploymentAliases deployment)
+ {
+ return new ArrayList<Object>(deployment.getAliases());
+ }
+
+ protected Class<Object> getComponentType()
+ {
+ return Object.class;
+ }
+
+ protected String getComponentName(Object attachment)
+ {
+ throw new UnsupportedOperationException("No component name.");
+ }
+
+ public Class<DeploymentAliases> getVisitorType()
+ {
+ return DeploymentAliases.class;
+ }
+ }
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencies.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencies.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencies.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.plugins.dependency;
-
-import java.util.Set;
-
-import org.jboss.dependency.spi.DependencyItem;
-
-/**
- * DeploymentDependencies.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public interface DeploymentDependencies
-{
- /**
- * Get a set of dependencies.
- *
- * @return the dependencies
- */
- Set<DependencyItem> getDependencies();
-}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencies.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencies.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencies.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencies.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.plugins.dependency;
+
+import java.util.Set;
+
+import org.jboss.dependency.spi.DependencyItem;
+
+/**
+ * DeploymentDependencies.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public interface DeploymentDependencies
+{
+ /**
+ * Get a set of dependencies.
+ *
+ * @return the dependencies
+ */
+ Set<DependencyItem> getDependencies();
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependenciesImpl.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependenciesImpl.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependenciesImpl.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,83 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.plugins.dependency;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-import java.util.HashSet;
-
-import org.jboss.dependency.plugins.AbstractDependencyItem;
-import org.jboss.dependency.spi.DependencyItem;
-
-/**
- * DeploymentDependenciesimpl.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class DeploymentDependenciesImpl implements DeploymentDependencies
-{
- private Object name;
- private DependenciesMetaData dmd;
- private Set<DependencyItem> dependencies;
-
- public DeploymentDependenciesImpl(Object name, DependenciesMetaData dmd)
- {
- if (name == null)
- throw new IllegalArgumentException("Null name");
- if (dmd == null)
- throw new IllegalArgumentException("Null dmd");
-
- this.name = name;
- this.dmd = dmd;
- }
-
- /**
- * Create dependency item.
- *
- * @param dimd the dependency metadata item
- * @return new dependency item
- */
- protected DependencyItem createDependencyItem(DependencyItemMetaData dimd)
- {
- return new AbstractDependencyItem(name, dimd.getValue(), dimd.getWhenRequired(), dimd.getDependentState());
- }
-
- public Set<DependencyItem> getDependencies()
- {
- if (dependencies == null)
- {
- List<DependencyItemMetaData> dimds = dmd.getItems();
- if (dimds != null && dimds.isEmpty() == false)
- {
- dependencies = new HashSet<DependencyItem>();
- for (DependencyItemMetaData dimd : dimds)
- dependencies.add(createDependencyItem(dimd));
- }
- else
- {
- dependencies = Collections.emptySet();
- }
- }
- return dependencies;
- }
-}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependenciesImpl.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependenciesImpl.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependenciesImpl.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependenciesImpl.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,83 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.plugins.dependency;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.HashSet;
+
+import org.jboss.dependency.plugins.AbstractDependencyItem;
+import org.jboss.dependency.spi.DependencyItem;
+
+/**
+ * DeploymentDependenciesimpl.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class DeploymentDependenciesImpl implements DeploymentDependencies
+{
+ private Object name;
+ private DependenciesMetaData dmd;
+ private Set<DependencyItem> dependencies;
+
+ public DeploymentDependenciesImpl(Object name, DependenciesMetaData dmd)
+ {
+ if (name == null)
+ throw new IllegalArgumentException("Null name");
+ if (dmd == null)
+ throw new IllegalArgumentException("Null dmd");
+
+ this.name = name;
+ this.dmd = dmd;
+ }
+
+ /**
+ * Create dependency item.
+ *
+ * @param dimd the dependency metadata item
+ * @return new dependency item
+ */
+ protected DependencyItem createDependencyItem(DependencyItemMetaData dimd)
+ {
+ return new AbstractDependencyItem(name, dimd.getValue(), dimd.getWhenRequired(), dimd.getDependentState());
+ }
+
+ public Set<DependencyItem> getDependencies()
+ {
+ if (dependencies == null)
+ {
+ List<DependencyItemMetaData> dimds = dmd.getItems();
+ if (dimds != null && dimds.isEmpty() == false)
+ {
+ dependencies = new HashSet<DependencyItem>();
+ for (DependencyItemMetaData dimd : dimds)
+ dependencies.add(createDependencyItem(dimd));
+ }
+ else
+ {
+ dependencies = Collections.emptySet();
+ }
+ }
+ return dependencies;
+ }
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencyDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencyDeployer.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencyDeployer.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,81 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.plugins.dependency;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.dependency.spi.DependencyItem;
-import org.jboss.deployers.spi.deployer.DeploymentStages;
-import org.jboss.deployers.spi.deployer.helpers.AbstractDeploymentVisitor;
-import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployerWithInput;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-
-/**
- * DeploymentDependencyDeployer.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class DeploymentDependencyDeployer extends AbstractRealDeployerWithInput<DeploymentDependencies>
-{
- public DeploymentDependencyDeployer()
- {
- setStage(DeploymentStages.POST_PARSE);
- setDeploymentVisitor(new DependencyItemComponentVisitor());
- }
-
- private class DependencyItemComponentVisitor extends AbstractDeploymentVisitor<DependencyItem, DeploymentDependencies>
- {
- @Override
- protected DeploymentUnit addComponent(DeploymentUnit unit, DependencyItem attachment)
- {
- unit.addIDependOn(attachment);
- return null;
- }
-
- @Override
- protected void removeComponent(DeploymentUnit unit, DependencyItem attachment)
- {
- unit.removeIDependOn(attachment);
- }
-
- protected List<? extends DependencyItem> getComponents(DeploymentDependencies deployment)
- {
- return new ArrayList<DependencyItem>(deployment.getDependencies());
- }
-
- protected Class<DependencyItem> getComponentType()
- {
- return DependencyItem.class;
- }
-
- protected String getComponentName(DependencyItem attachment)
- {
- throw new UnsupportedOperationException("No component name.");
- }
-
- public Class<DeploymentDependencies> getVisitorType()
- {
- return DeploymentDependencies.class;
- }
- }
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencyDeployer.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencyDeployer.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencyDeployer.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/DeploymentDependencyDeployer.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.plugins.dependency;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.dependency.spi.DependencyItem;
+import org.jboss.deployers.spi.deployer.DeploymentStages;
+import org.jboss.deployers.spi.deployer.helpers.AbstractDeploymentVisitor;
+import org.jboss.deployers.spi.deployer.helpers.AbstractRealDeployerWithInput;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+
+/**
+ * DeploymentDependencyDeployer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class DeploymentDependencyDeployer extends AbstractRealDeployerWithInput<DeploymentDependencies>
+{
+ public DeploymentDependencyDeployer()
+ {
+ setStage(DeploymentStages.POST_PARSE);
+ setDeploymentVisitor(new DependencyItemComponentVisitor());
+ }
+
+ private class DependencyItemComponentVisitor extends AbstractDeploymentVisitor<DependencyItem, DeploymentDependencies>
+ {
+ @Override
+ protected DeploymentUnit addComponent(DeploymentUnit unit, DependencyItem attachment)
+ {
+ unit.addIDependOn(attachment);
+ return null;
+ }
+
+ @Override
+ protected void removeComponent(DeploymentUnit unit, DependencyItem attachment)
+ {
+ unit.removeIDependOn(attachment);
+ }
+
+ protected List<? extends DependencyItem> getComponents(DeploymentDependencies deployment)
+ {
+ return new ArrayList<DependencyItem>(deployment.getDependencies());
+ }
+
+ protected Class<DependencyItem> getComponentType()
+ {
+ return DependencyItem.class;
+ }
+
+ protected String getComponentName(DependencyItem attachment)
+ {
+ throw new UnsupportedOperationException("No component name.");
+ }
+
+ public Class<DeploymentDependencies> getVisitorType()
+ {
+ return DeploymentDependencies.class;
+ }
+ }
+}
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/package-info.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/package-info.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/package-info.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,32 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss 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.
-*/
- at JBossXmlAdaptedTypes
-({
- @JBossXmlAdaptedType(type=ControllerState.class, valueAdapter=ControllerStateValueAdapter.class)
-})
-package org.jboss.deployers.vfs.plugins.dependency;
-
-import org.jboss.beans.metadata.plugins.ControllerStateValueAdapter;
-import org.jboss.dependency.spi.ControllerState;
-import org.jboss.xb.annotations.JBossXmlAdaptedType;
-import org.jboss.xb.annotations.JBossXmlAdaptedTypes;
-
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/package-info.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/package-info.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/package-info.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/dependency/package-info.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,32 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.
+*/
+ at JBossXmlAdaptedTypes
+({
+ @JBossXmlAdaptedType(type=ControllerState.class, valueAdapter=ControllerStateValueAdapter.class)
+})
+package org.jboss.deployers.vfs.plugins.dependency;
+
+import org.jboss.beans.metadata.plugins.ControllerStateValueAdapter;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.xb.annotations.JBossXmlAdaptedType;
+import org.jboss.xb.annotations.JBossXmlAdaptedTypes;
+
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContextMBean.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContextMBean.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContextMBean.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,57 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, 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.deployers.vfs.plugins.structure;
-
-import java.util.List;
-
-import org.jboss.deployers.structure.spi.helpers.AbstractDeploymentContextMBean;
-import org.jboss.virtual.VirtualFile;
-
-/**
- * AbstractVFSDeploymentContextMBean.
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @version $Revision: 1.1 $
- */
-public interface AbstractVFSDeploymentContextMBean extends AbstractDeploymentContextMBean
-{
- /**
- * Get the root file
- *
- * @return the root
- */
- VirtualFile getRoot();
-
- /**
- * Get the meta data locations
- *
- * @return the meta data locations
- */
- List<VirtualFile> getMetaDataLocations();
-
- /**
- * Get the class path
- *
- * @return the class path
- */
- List<VirtualFile> getClassPath();
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContextMBean.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContextMBean.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContextMBean.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/main/java/org/jboss/deployers/vfs/plugins/structure/AbstractVFSDeploymentContextMBean.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,57 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, 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.deployers.vfs.plugins.structure;
+
+import java.util.List;
+
+import org.jboss.deployers.structure.spi.helpers.AbstractDeploymentContextMBean;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * AbstractVFSDeploymentContextMBean.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 1.1 $
+ */
+public interface AbstractVFSDeploymentContextMBean extends AbstractDeploymentContextMBean
+{
+ /**
+ * Get the root file
+ *
+ * @return the root
+ */
+ VirtualFile getRoot();
+
+ /**
+ * Get the meta data locations
+ *
+ * @return the meta data locations
+ */
+ List<VirtualFile> getMetaDataLocations();
+
+ /**
+ * Get the class path
+ *
+ * @return the class path
+ */
+ List<VirtualFile> getClassPath();
+}
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/DeployersVFSTestSuite.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/DeployersVFSTestSuite.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/DeployersVFSTestSuite.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -24,7 +24,9 @@
import junit.framework.Test;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
+import org.jboss.test.deployers.vfs.annotations.AnnotationScanningTestSuite;
import org.jboss.test.deployers.vfs.classloader.ClassLoaderTestSuite;
+import org.jboss.test.deployers.vfs.dependency.DependencyTestSuite;
import org.jboss.test.deployers.vfs.deployer.bean.BeanDeployerTestSuite;
import org.jboss.test.deployers.vfs.deployer.facelets.FaceletsTestSuite;
import org.jboss.test.deployers.vfs.deployer.jaxp.JAXPDeployerTestSuite;
@@ -44,6 +46,7 @@
* Deployers VFS Test Suite.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
* @version $Revision: 37459 $
*/
public class DeployersVFSTestSuite extends TestSuite
@@ -72,6 +75,8 @@
suite.addTest(MergeDeployerTestSuite.suite());
suite.addTest(FaceletsTestSuite.suite());
suite.addTest(ValidateDeployerTestSuite.suite());
+ suite.addTest(AnnotationScanningTestSuite.suite());
+ suite.addTest(DependencyTestSuite.suite());
return suite;
}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/AnnotationScanningTestSuite.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/AnnotationScanningTestSuite.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/AnnotationScanningTestSuite.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/AnnotationScanningTestSuite.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,51 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.test.deployers.vfs.annotations;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+import org.jboss.test.deployers.vfs.annotations.test.AnnotationsScanningUnitTestCase;
+import org.jboss.test.deployers.vfs.annotations.test.AnnotationsScanningWithMetaDataUnitTestCase;
+
+/**
+ * AnnotationScanningTestSuite.
+ *
+ * @author <a href="ales.justin at jboss.org">Ales Justin</a>
+ */
+public class AnnotationScanningTestSuite extends TestSuite
+{
+ public static void main(String[] args)
+ {
+ TestRunner.run(suite());
+ }
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite("VFS Annotation Scanning Tests");
+
+ suite.addTest(AnnotationsScanningUnitTestCase.suite());
+ suite.addTest(AnnotationsScanningWithMetaDataUnitTestCase.suite());
+
+ return suite;
+ }
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClass.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClass.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClass.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,32 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss 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.test.deployers.vfs.annotations.support.jar;
-
-import org.jboss.test.deployers.vfs.annotations.support.Marked;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
- at Marked
-public class JarMarkOnClass extends JarMarkOnClassSuper
-{
-}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClass.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClass.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClass.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClass.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,32 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.test.deployers.vfs.annotations.support.jar;
+
+import org.jboss.test.deployers.vfs.annotations.support.Marked;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+ at Marked
+public class JarMarkOnClass extends JarMarkOnClassSuper
+{
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClassSuper.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClassSuper.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClassSuper.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,29 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss 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.test.deployers.vfs.annotations.support.jar;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class JarMarkOnClassSuper extends JarMarkOnClassSuperAnnotated
-{
-}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClassSuper.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClassSuper.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClassSuper.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/JarMarkOnClassSuper.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,31 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.test.deployers.vfs.annotations.support.jar;
+
+import org.jboss.test.deployers.vfs.annotations.support.jar.JarMarkOnClassSuperAnnotated;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class JarMarkOnClassSuper extends JarMarkOnClassSuperAnnotated
+{
+}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/impl (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/impl)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/impl/JarMarkOnClassExt.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/impl/JarMarkOnClassExt.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/impl/JarMarkOnClassExt.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,33 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss 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.test.deployers.vfs.annotations.support.jar.impl;
-
-import org.jboss.test.deployers.vfs.annotations.support.Marked;
-import org.jboss.test.deployers.vfs.annotations.support.jar.JarMarkOnClassSuper;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
- at Marked
-public class JarMarkOnClassExt extends JarMarkOnClassSuper
-{
-}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/impl/JarMarkOnClassExt.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/impl/JarMarkOnClassExt.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/impl/JarMarkOnClassExt.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/impl/JarMarkOnClassExt.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,33 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.test.deployers.vfs.annotations.support.jar.impl;
+
+import org.jboss.test.deployers.vfs.annotations.support.Marked;
+import org.jboss.test.deployers.vfs.annotations.support.jar.JarMarkOnClassSuper;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+ at Marked
+public class JarMarkOnClassExt extends JarMarkOnClassSuper
+{
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/impl/JarMarkOnClassImpl.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/impl/JarMarkOnClassImpl.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/impl/JarMarkOnClassImpl.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,32 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss 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.test.deployers.vfs.annotations.support.jar.impl;
-
-import org.jboss.test.deployers.vfs.annotations.support.Marked;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
- at Marked
-public class JarMarkOnClassImpl
-{
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/impl/JarMarkOnClassImpl.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/impl/JarMarkOnClassImpl.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/impl/JarMarkOnClassImpl.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/jar/impl/JarMarkOnClassImpl.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,32 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.test.deployers.vfs.annotations.support.jar.impl;
+
+import org.jboss.test.deployers.vfs.annotations.support.Marked;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+ at Marked
+public class JarMarkOnClassImpl
+{
+}
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClass.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClass.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClass.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,32 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss 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.test.deployers.vfs.annotations.support.war;
-
-import org.jboss.test.deployers.vfs.annotations.support.Marked;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
- at Marked
-public class WebMarkOnClass extends WebMarkOnClassSuper
-{
-}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClass.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClass.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClass.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClass.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,32 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.test.deployers.vfs.annotations.support.war;
+
+import org.jboss.test.deployers.vfs.annotations.support.Marked;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+ at Marked
+public class WebMarkOnClass extends WebMarkOnClassSuper
+{
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClassSuper.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClassSuper.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClassSuper.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,29 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss 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.test.deployers.vfs.annotations.support.war;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
-public class WebMarkOnClassSuper extends WebMarkOnClassSuperAnnotated
-{
-}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClassSuper.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClassSuper.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClassSuper.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/WebMarkOnClassSuper.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,31 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.test.deployers.vfs.annotations.support.war;
+
+import org.jboss.test.deployers.vfs.annotations.support.war.WebMarkOnClassSuperAnnotated;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class WebMarkOnClassSuper extends WebMarkOnClassSuperAnnotated
+{
+}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/impl (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/impl)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/impl/WebMarkOnClassExt.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/impl/WebMarkOnClassExt.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/impl/WebMarkOnClassExt.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,33 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss 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.test.deployers.vfs.annotations.support.war.impl;
-
-import org.jboss.test.deployers.vfs.annotations.support.Marked;
-import org.jboss.test.deployers.vfs.annotations.support.war.WebMarkOnClassSuper;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
- at Marked
-public class WebMarkOnClassExt extends WebMarkOnClassSuper
-{
-}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/impl/WebMarkOnClassExt.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/impl/WebMarkOnClassExt.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/impl/WebMarkOnClassExt.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/impl/WebMarkOnClassExt.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,33 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.test.deployers.vfs.annotations.support.war.impl;
+
+import org.jboss.test.deployers.vfs.annotations.support.Marked;
+import org.jboss.test.deployers.vfs.annotations.support.war.WebMarkOnClassSuper;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+ at Marked
+public class WebMarkOnClassExt extends WebMarkOnClassSuper
+{
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/impl/WebMarkOnClassImpl.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/impl/WebMarkOnClassImpl.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/impl/WebMarkOnClassImpl.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,32 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss 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.test.deployers.vfs.annotations.support.war.impl;
-
-import org.jboss.test.deployers.vfs.annotations.support.Marked;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
- at Marked
-public class WebMarkOnClassImpl
-{
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/impl/WebMarkOnClassImpl.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/impl/WebMarkOnClassImpl.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/impl/WebMarkOnClassImpl.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/war/impl/WebMarkOnClassImpl.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,32 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.test.deployers.vfs.annotations.support.war.impl;
+
+import org.jboss.test.deployers.vfs.annotations.support.Marked;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+ at Marked
+public class WebMarkOnClassImpl
+{
+}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/warlib (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/warlib)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/warlib/SomeUIClass.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/warlib/SomeUIClass.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/warlib/SomeUIClass.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,32 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss 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.test.deployers.vfs.annotations.support.warlib;
-
-import org.jboss.test.deployers.vfs.annotations.support.Marked;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
- */
- at Marked
-public class SomeUIClass
-{
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/warlib/SomeUIClass.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/warlib/SomeUIClass.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/warlib/SomeUIClass.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/support/warlib/SomeUIClass.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,32 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.test.deployers.vfs.annotations.support.warlib;
+
+import org.jboss.test.deployers.vfs.annotations.support.Marked;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+ at Marked
+public class SomeUIClass
+{
+}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AbstractAnnotationsScanningUnitTest.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AbstractAnnotationsScanningUnitTest.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AbstractAnnotationsScanningUnitTest.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AbstractAnnotationsScanningUnitTest.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,118 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.test.deployers.vfs.annotations.test;
+
+import java.util.Set;
+
+import org.jboss.deployers.spi.annotations.AnnotationEnvironment;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.test.deployers.BootstrapDeployersTest;
+import org.jboss.test.deployers.vfs.annotations.support.ext.External;
+import org.jboss.test.deployers.vfs.annotations.support.jar.JarMarkOnClass;
+import org.jboss.test.deployers.vfs.annotations.support.jar.impl.JarMarkOnClassImpl;
+import org.jboss.test.deployers.vfs.annotations.support.util.Util;
+import org.jboss.test.deployers.vfs.annotations.support.war.WebMarkOnClass;
+import org.jboss.test.deployers.vfs.annotations.support.war.impl.WebMarkOnClassImpl;
+import org.jboss.test.deployers.vfs.annotations.support.warlib.SomeUIClass;
+import org.jboss.virtual.AssembledDirectory;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public abstract class AbstractAnnotationsScanningUnitTest extends BootstrapDeployersTest
+{
+ protected AbstractAnnotationsScanningUnitTest(String name)
+ {
+ super(name);
+ }
+
+ public void testBasicScanning() throws Throwable
+ {
+ AssembledDirectory ear = createTopLevelWithUtil();
+
+ AssembledDirectory jar = ear.mkdir("simple.jar");
+ addPackage(jar, JarMarkOnClassImpl.class);
+ addPackage(jar, JarMarkOnClass.class);
+ addPath(jar, "/annotations/basic-scan/jar", "META-INF");
+
+ AssembledDirectory war = ear.mkdir("simple.war");
+ AssembledDirectory webinf = war.mkdir("WEB-INF");
+ AssembledDirectory classes = webinf.mkdir("classes");
+ addPackage(classes, WebMarkOnClassImpl.class);
+ addPackage(classes, WebMarkOnClass.class);
+ AssembledDirectory lib = webinf.mkdir("lib");
+ AssembledDirectory uijar = lib.mkdir("ui.jar");
+ addPackage(uijar, SomeUIClass.class);
+ addPath(war, "/annotations/basic-scan/web", "WEB-INF");
+
+ enableTrace("org.jboss.deployers");
+
+ DeploymentUnit unit = assertDeploy(ear);
+ assertEar(unit);
+ try
+ {
+ DeploymentUnit jarUnit = assertChild(unit, "simple.jar");
+ assertJar(jarUnit);
+ DeploymentUnit webUnit = assertChild(unit, "simple.war");
+ assertWar(webUnit);
+ }
+ finally
+ {
+ undeploy(unit);
+ }
+ }
+
+ protected abstract void assertEar(DeploymentUnit ear);
+ protected abstract void assertJar(DeploymentUnit jar);
+ protected abstract void assertWar(DeploymentUnit war);
+
+ @SuppressWarnings("unchecked")
+ protected void assertAnnotations(DeploymentUnit unit, int onClass, int onMethod, int onFiled)
+ {
+ AnnotationEnvironment env = unit.getAttachment(AnnotationEnvironment.class);
+ assertNotNull(env);
+
+ Set classes = env.classIsAnnotatedWith("org.jboss.test.deployers.vfs.annotations.support.Marked");
+ assertNotNull(classes);
+ assertEquals(onClass, classes.size());
+
+ Set methods = env.classHasMethodAnnotatedWith("org.jboss.test.deployers.vfs.annotations.support.Marked");
+ assertNotNull(methods);
+ assertEquals(onMethod, methods.size());
+
+ Set fields = env.classHasFieldAnnotatedWith("org.jboss.test.deployers.vfs.annotations.support.Marked");
+ assertNotNull(fields);
+ assertEquals(onFiled, fields.size());
+ }
+
+ protected AssembledDirectory createTopLevelWithUtil() throws Exception
+ {
+ AssembledDirectory topLevel = createAssembledDirectory("top-level.ear", "top-level.ear");
+ addPath(topLevel, "/annotations/basic-scan", "META-INF");
+ AssembledDirectory earLib = topLevel.mkdir("lib");
+ AssembledDirectory util = earLib.mkdir("util.jar");
+ addPackage(util, Util.class);
+ AssembledDirectory ext = earLib.mkdir("ext.jar");
+ addPackage(ext, External.class);
+ return topLevel;
+ }
+}
\ No newline at end of file
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AnnotationsScanningUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AnnotationsScanningUnitTestCase.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AnnotationsScanningUnitTestCase.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -21,23 +21,13 @@
*/
package org.jboss.test.deployers.vfs.annotations.test;
-import java.util.Set;
-
import junit.framework.Test;
-import org.jboss.deployers.spi.annotations.AnnotationEnvironment;
import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.test.deployers.BootstrapDeployersTest;
-import org.jboss.test.deployers.vfs.annotations.support.jar.JarMarkOnClass;
-import org.jboss.test.deployers.vfs.annotations.support.util.Util;
-import org.jboss.test.deployers.vfs.annotations.support.war.WebMarkOnClass;
-import org.jboss.test.deployers.vfs.annotations.support.ext.External;
-import org.jboss.virtual.AssembledDirectory;
/**
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
-public class AnnotationsScanningUnitTestCase extends BootstrapDeployersTest
+public class AnnotationsScanningUnitTestCase extends AbstractAnnotationsScanningUnitTest
{
public AnnotationsScanningUnitTestCase(String name)
{
@@ -49,65 +39,18 @@
return suite(AnnotationsScanningUnitTestCase.class);
}
- public void testBasicScanning() throws Throwable
+ protected void assertEar(DeploymentUnit ear)
{
- AssembledDirectory ear = createTopLevelWithUtil();
-
- AssembledDirectory jar = ear.mkdir("simple.jar");
- addPackage(jar, JarMarkOnClass.class);
- addPath(jar, "/annotations/basic-scan/jar", "META-INF");
-
- AssembledDirectory war = ear.mkdir("simple.war");
- AssembledDirectory webinf = war.mkdir("WEB-INF");
- AssembledDirectory classes = webinf.mkdir("classes");
- addPackage(classes, WebMarkOnClass.class);
- addPath(war, "/annotations/basic-scan/web", "WEB-INF");
-
- enableTrace("org.jboss.deployers");
-
- VFSDeploymentUnit unit = assertDeploy(ear);
- assertAnnotations(unit, 1, 1, 1);
- try
- {
- DeploymentUnit jarUnit = assertChild(unit, "simple.jar");
- assertAnnotations(jarUnit, 2, 1, 1);
- DeploymentUnit webUnit = assertChild(unit, "simple.war");
- assertAnnotations(webUnit, 2, 1, 1);
- }
- finally
- {
- undeploy(unit);
- }
+ assertAnnotations(ear, 1, 1, 1);
}
- @SuppressWarnings("unchecked")
- protected void assertAnnotations(DeploymentUnit unit, int onClass, int onMethod, int onFiled)
+ protected void assertJar(DeploymentUnit jar)
{
- AnnotationEnvironment env = unit.getAttachment(AnnotationEnvironment.class);
- assertNotNull(env);
-
- Set classes = env.classIsAnnotatedWith("org.jboss.test.deployers.vfs.annotations.support.Marked");
- assertNotNull(classes);
- assertEquals(onClass, classes.size());
-
- Set methods = env.classHasMethodAnnotatedWith("org.jboss.test.deployers.vfs.annotations.support.Marked");
- assertNotNull(methods);
- assertEquals(onMethod, methods.size());
-
- Set fields = env.classHasFieldAnnotatedWith("org.jboss.test.deployers.vfs.annotations.support.Marked");
- assertNotNull(fields);
- assertEquals(onFiled, fields.size());
+ assertAnnotations(jar, 4, 1, 1);
}
- protected AssembledDirectory createTopLevelWithUtil() throws Exception
+ protected void assertWar(DeploymentUnit war)
{
- AssembledDirectory topLevel = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(topLevel, "/annotations/basic-scan", "META-INF");
- AssembledDirectory earLib = topLevel.mkdir("lib");
- AssembledDirectory util = earLib.mkdir("util.jar");
- addPackage(util, Util.class);
- AssembledDirectory ext = earLib.mkdir("ext.jar");
- addPackage(ext, External.class);
- return topLevel;
+ assertAnnotations(war, 5, 1, 1);
}
}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AnnotationsScanningWithMetaDataUnitTestCase.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AnnotationsScanningWithMetaDataUnitTestCase.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AnnotationsScanningWithMetaDataUnitTestCase.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/AnnotationsScanningWithMetaDataUnitTestCase.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,56 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.test.deployers.vfs.annotations.test;
+
+import junit.framework.Test;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class AnnotationsScanningWithMetaDataUnitTestCase extends AbstractAnnotationsScanningUnitTest
+{
+ public AnnotationsScanningWithMetaDataUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(AnnotationsScanningWithMetaDataUnitTestCase.class);
+ }
+
+ protected void assertEar(DeploymentUnit ear)
+ {
+ assertAnnotations(ear, 1, 1, 1);
+ }
+
+ protected void assertJar(DeploymentUnit jar)
+ {
+ assertAnnotations(jar, 2, 0, 0);
+ }
+
+ protected void assertWar(DeploymentUnit war)
+ {
+ assertAnnotations(war, 2, 0, 0);
+ }
+}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/ScanningMetaDataTestCase.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/ScanningMetaDataTestCase.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/ScanningMetaDataTestCase.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/annotations/test/ScanningMetaDataTestCase.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,113 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.test.deployers.vfs.annotations.test;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import junit.framework.Test;
+import org.jboss.deployers.plugins.annotations.AbstractScanningMetaData;
+import org.jboss.deployers.spi.annotations.PathMetaData;
+import org.jboss.deployers.spi.annotations.ScanningMetaData;
+import org.jboss.deployers.spi.annotations.PathEntryMetaData;
+import org.jboss.deployers.vfs.plugins.annotations.ScanningMetaDataDeployer;
+import org.jboss.deployers.vfs.plugins.structure.AbstractVFSDeploymentContext;
+import org.jboss.deployers.vfs.plugins.structure.AbstractVFSDeploymentUnit;
+import org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentContext;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.test.deployers.BaseDeployersVFSTest;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class ScanningMetaDataTestCase extends BaseDeployersVFSTest
+{
+ public ScanningMetaDataTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(ScanningMetaDataTestCase.class);
+ }
+
+ public void testSMDRead() throws Exception
+ {
+ SchemaResolverDeployer<AbstractScanningMetaData> deployer = new ScanningMetaDataDeployer();
+ deployer.create();
+ try
+ {
+ VirtualFile file = getVirtualFile("/scanning", "smoke");
+ VFSDeploymentContext deployment = new AbstractVFSDeploymentContext(file, "");
+ deployment.setMetaDataPath(Collections.singletonList("META-INF"));
+ VFSDeploymentUnit unit = new AbstractVFSDeploymentUnit(deployment);
+ deployer.deploy(unit);
+ try
+ {
+ ScanningMetaData metaData = unit.getAttachment(ScanningMetaData.class);
+ assertNotNull(metaData);
+ List<PathMetaData> paths = metaData.getPaths();
+ assertNotNull(paths);
+ assertEquals(2, paths.size());
+
+ PathMetaData pmd = paths.get(0);
+ assertNotNull(pmd);
+ assertEquals("myejbs.jar", pmd.getPathName());
+ Set<PathEntryMetaData> includes = pmd.getIncludes();
+ assertNotNull(includes);
+ assertEquals(1, includes.size());
+ PathEntryMetaData pemd = includes.iterator().next();
+ assertNotNull(pemd);
+ assertEquals("com.acme.foo", pemd.getName());
+ Set<PathEntryMetaData> excludes = pmd.getExcludes();
+ assertNotNull(excludes);
+ pemd = excludes.iterator().next();
+ assertNotNull(pemd);
+ assertEquals("com.acme.foo.bar", pemd.getName());
+ assertEquals(1, excludes.size());
+
+ pmd = paths.get(1);
+ assertNotNull(pmd);
+ assertEquals("my.war/WEB-INF/classes", pmd.getPathName());
+ includes = pmd.getIncludes();
+ assertNotNull(includes);
+ assertEquals(1, includes.size());
+ pemd = includes.iterator().next();
+ assertNotNull(pemd);
+ assertEquals("com.acme.foo", pemd.getName());
+ assertNull(pmd.getExcludes());
+ }
+ finally
+ {
+ deployer.undeploy(unit);
+ }
+ }
+ finally
+ {
+ deployer.destroy();
+ }
+ }
+}
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/InMemoryClasesUnitTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/InMemoryClasesUnitTestCase.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/InMemoryClasesUnitTestCase.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -38,6 +38,7 @@
import org.jboss.deployers.vfs.plugins.classloader.InMemoryClassesDeployer;
import org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer;
import org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer;
+import org.jboss.deployers.vfs.plugins.classloader.DeploymentHostNameCreator;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.test.deployers.vfs.classloader.support.TestLevelClassLoaderSystemDeployer;
import org.jboss.test.deployers.vfs.classloader.support.a.A;
@@ -48,10 +49,13 @@
* InMemoryClasesUnitTestCase.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
* @version $Revision: 1.1 $
*/
public class InMemoryClasesUnitTestCase extends VFSClassLoaderDependenciesTest
{
+ private InMemoryClassesDeployer inMemoryClassesDeployer = new InMemoryClassesDeployer();
+
public InMemoryClasesUnitTestCase(String name)
{
super(name);
@@ -101,6 +105,32 @@
assertFalse("dynamic classes should NOT be in the classpath", unit.getClassPath().contains(file));
}
+ public void testHostNameCreator() throws Exception
+ {
+ DeployerClient mainDeployer = getMainDeployer();
+ MainDeployerStructure main = (MainDeployerStructure) mainDeployer;
+
+ Deployment ad = createDeployment("A");
+ Version v1 = Version.parseVersion("1");
+ ClassLoadingMetaData clmd = addClassLoadingMetaData(ad, v1, true, A.class);
+ clmd.setBlackListable(false);
+
+ inMemoryClassesDeployer.setHostNameCreator(new DeploymentHostNameCreator());
+ try
+ {
+ assertDeploy(mainDeployer, ad);
+
+ VFSDeploymentUnit unit = (VFSDeploymentUnit) main.getDeploymentUnit("A");
+ URL root = unit.getAttachment(InMemoryClassesDeployer.DYNAMIC_CLASS_URL_KEY, URL.class);
+ assertNotNull(root);
+ assertEquals("vfsmemory://in-memory-test-classes", root.toExternalForm());
+ }
+ finally
+ {
+ inMemoryClassesDeployer.setHostNameCreator(null);
+ }
+ }
+
protected DeployerClient getMainDeployer()
{
AbstractJDKChecker.getExcluded().add(VFSClassLoaderDependenciesTest.class);
@@ -116,10 +146,8 @@
deployer2.setClassLoading(classLoading);
deployer2.setSystem(system);
- Deployer deployer3 = new InMemoryClassesDeployer();
-
Deployer deployer4 = new VFSClassLoaderClassPathDeployer();
- return createMainDeployer(deployer1, deployer2, deployer3, deployer4);
+ return createMainDeployer(deployer1, deployer2, inMemoryClassesDeployer, deployer4);
}
}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/DependencyTestSuite.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/DependencyTestSuite.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/DependencyTestSuite.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.dependency;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-import org.jboss.test.deployers.vfs.dependency.test.DependenciesTestCase;
-
-/**
- * DependencyTestSuite.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class DependencyTestSuite extends TestSuite
-{
- public static void main(String[] args)
- {
- TestRunner.run(suite());
- }
-
- public static Test suite()
- {
- TestSuite suite = new TestSuite("VFS Dependency Scanning Tests");
-
- suite.addTest(DependenciesTestCase.suite());
-
- return suite;
- }
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/DependencyTestSuite.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/DependencyTestSuite.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/DependencyTestSuite.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/DependencyTestSuite.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.dependency;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+import org.jboss.test.deployers.vfs.dependency.test.DependenciesTestCase;
+
+/**
+ * DependencyTestSuite.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class DependencyTestSuite extends TestSuite
+{
+ public static void main(String[] args)
+ {
+ TestRunner.run(suite());
+ }
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite("VFS Dependency Scanning Tests");
+
+ suite.addTest(DependenciesTestCase.suite());
+
+ return suite;
+ }
+}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/support (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/support)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/support/MockTM.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/support/MockTM.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/support/MockTM.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.dependency.support;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class MockTM
-{
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/support/MockTM.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/support/MockTM.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/support/MockTM.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/support/MockTM.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.dependency.support;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class MockTM
+{
+}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/test (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/test)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,98 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.dependency.test;
-
-import junit.framework.Test;
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.dependency.spi.ControllerState;
-import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.test.deployers.BootstrapDeployersTest;
-
-/**
- * DependenciesTestCase.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class DependenciesTestCase extends BootstrapDeployersTest
-{
- public DependenciesTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return suite(DependenciesTestCase.class);
- }
-
- protected void assertDeployment(DeploymentUnit unit, ControllerState state)
- {
- ControllerContext context = unit.getAttachment(ControllerContext.class);
- assertNotNull(context);
- assertEquals(state, context.getState());
- }
-
- public void testBeanDependency() throws Throwable
- {
- DeploymentUnit du = addDeployment("/dependency", "bean");
- try
- {
- assertDeployment(du, new ControllerState("PreReal"));
- DeploymentUnit tmDU = assertDeploy("/dependency", "support");
- try
- {
- assertDeployment(du, ControllerState.INSTALLED);
- }
- finally
- {
- undeploy(tmDU);
- }
- }
- finally
- {
- undeploy(du);
- }
- }
-
- public void testModuleAndAliasDependency() throws Throwable
- {
- DeploymentUnit du = addDeployment("/dependency", "module");
- try
- {
- assertDeployment(du, ControllerState.PRE_INSTALL);
- DeploymentUnit aliasDU = assertDeploy("/dependency", "alias");
- try
- {
- assertDeployment(aliasDU, ControllerState.INSTALLED);
- assertDeployment(du, ControllerState.INSTALLED);
- }
- finally
- {
- undeploy(aliasDU);
- }
- }
- finally
- {
- undeploy(du);
- }
- }
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,98 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.dependency.test;
+
+import junit.framework.Test;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.test.deployers.BootstrapDeployersTest;
+
+/**
+ * DependenciesTestCase.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class DependenciesTestCase extends BootstrapDeployersTest
+{
+ public DependenciesTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(DependenciesTestCase.class);
+ }
+
+ protected void assertDeployment(DeploymentUnit unit, ControllerState state)
+ {
+ ControllerContext context = unit.getAttachment(ControllerContext.class);
+ assertNotNull(context);
+ assertEquals(state, context.getState());
+ }
+
+ public void testBeanDependency() throws Throwable
+ {
+ DeploymentUnit du = addDeployment("/dependency", "bean");
+ try
+ {
+ assertDeployment(du, new ControllerState("PreReal"));
+ DeploymentUnit tmDU = assertDeploy("/dependency", "support");
+ try
+ {
+ assertDeployment(du, ControllerState.INSTALLED);
+ }
+ finally
+ {
+ undeploy(tmDU);
+ }
+ }
+ finally
+ {
+ undeploy(du);
+ }
+ }
+
+ public void testModuleAndAliasDependency() throws Throwable
+ {
+ DeploymentUnit du = addDeployment("/dependency", "module");
+ try
+ {
+ assertDeployment(du, ControllerState.PRE_INSTALL);
+ DeploymentUnit aliasDU = assertDeploy("/dependency", "alias");
+ try
+ {
+ assertDeployment(aliasDU, ControllerState.INSTALLED);
+ assertDeployment(du, ControllerState.INSTALLED);
+ }
+ finally
+ {
+ undeploy(aliasDU);
+ }
+ }
+ finally
+ {
+ undeploy(du);
+ }
+ }
+}
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/BeanDeployerTestSuite.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/BeanDeployerTestSuite.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/BeanDeployerTestSuite.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -34,6 +34,7 @@
import org.jboss.test.deployers.vfs.deployer.bean.test.BuilderBeansUnitTestCase;
import org.jboss.test.deployers.vfs.deployer.bean.test.KernelDeployerUnitTestCase;
import org.jboss.test.deployers.vfs.deployer.bean.test.KernelScopeUnitTestCase;
+import org.jboss.test.deployers.vfs.deployer.bean.test.AutowireAnnotationBeansTestCase;
/**
* BeanDeployerTestSuite.
@@ -63,6 +64,7 @@
suite.addTest(KernelScopeUnitTestCase.suite());
suite.addTest(AnnotatedBeansUnitTestCase.suite());
suite.addTest(BuilderBeansUnitTestCase.suite());
+ suite.addTest(AutowireAnnotationBeansTestCase.suite());
return suite;
}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/DefaultXPCResolver.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/DefaultXPCResolver.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/DefaultXPCResolver.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/DefaultXPCResolver.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,33 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.test.deployers.vfs.deployer.bean.support;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class DefaultXPCResolver implements XPCResolver
+{
+ public String getName()
+ {
+ return "Default";
+ }
+}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/PUDeployment.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/PUDeployment.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/PUDeployment.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/PUDeployment.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,43 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.test.deployers.vfs.deployer.bean.support;
+
+import org.jboss.beans.metadata.api.annotations.Inject;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class PUDeployment
+{
+ private XPCResolver resolver;
+
+ public XPCResolver getResolver()
+ {
+ return resolver;
+ }
+
+ @Inject
+ public void setResolver(XPCResolver resolver)
+ {
+ this.resolver = resolver;
+ }
+}
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/SimpleAliasTester.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/SimpleAliasTester.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/SimpleAliasTester.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -30,9 +30,9 @@
*/
public class SimpleAliasTester extends SimpleAnnotated
{
- public static SimpleAnnotatedAlias factory()
+ public static SimpleAliasTester factory()
{
- return new SimpleAnnotatedAlias();
+ return new SimpleAliasTester();
}
public void setController(Controller controller)
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/XPCResolver.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/XPCResolver.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/XPCResolver.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/support/XPCResolver.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,30 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.test.deployers.vfs.deployer.bean.support;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public interface XPCResolver
+{
+ String getName();
+}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AutowireAnnotationBeansTestCase.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AutowireAnnotationBeansTestCase.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AutowireAnnotationBeansTestCase.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/bean/test/AutowireAnnotationBeansTestCase.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,188 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.test.deployers.vfs.deployer.bean.test;
+
+import java.util.Arrays;
+
+import junit.framework.Test;
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.deployers.client.spi.Deployment;
+import org.jboss.deployers.spi.attachments.MutableAttachments;
+import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer;
+import org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
+import org.jboss.test.deployers.support.TCCLClassLoaderDeployer;
+import org.jboss.test.deployers.vfs.deployer.AbstractDeployerUnitTest;
+import org.jboss.test.deployers.vfs.deployer.bean.support.DefaultXPCResolver;
+import org.jboss.test.deployers.vfs.deployer.bean.support.PUDeployment;
+
+/**
+ * AutowireAnnotationBeansTestCase.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public class AutowireAnnotationBeansTestCase extends AbstractDeployerUnitTest
+{
+ public AutowireAnnotationBeansTestCase(String name) throws Throwable
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(AutowireAnnotationBeansTestCase.class);
+ }
+
+ protected void addDeployers(Kernel kernel)
+ {
+ TCCLClassLoaderDeployer tcclDeployer = new TCCLClassLoaderDeployer();
+ KernelDeploymentDeployer kernelDeploymentDeployer = new KernelDeploymentDeployer();
+ BeanMetaDataDeployer beanMetaDataDeployer = new BeanMetaDataDeployer(kernel.getController());
+ addDeployer(main, tcclDeployer);
+ addDeployer(main, kernelDeploymentDeployer);
+ addDeployer(main, beanMetaDataDeployer);
+ }
+
+ public void testAutowiredBeans() throws Exception
+ {
+ Deployment context = createSimpleDeployment("KernelDeployerTest1");
+
+ AbstractKernelDeployment deployment = new AbstractKernelDeployment();
+ deployment.setName("KernelDeployerTest1");
+ BeanMetaDataFactory md1 = new AbstractBeanMetaData("PUD", PUDeployment.class.getName());
+ BeanMetaDataFactory md2 = new AbstractBeanMetaData("XPC", DefaultXPCResolver.class.getName());
+ deployment.setBeanFactories(Arrays.asList(md1, md2));
+ MutableAttachments attachments = (MutableAttachments) context.getPredeterminedManagedObjects();
+ attachments.addAttachment("KernelDeployerTest1", deployment);
+
+ assertDeploy(context);
+ try
+ {
+ ControllerContext pud = controller.getInstalledContext("PUD");
+ assertNotNull(pud);
+ }
+ finally
+ {
+ assertUndeploy(context);
+ }
+
+ assertNull(controller.getContext("PUD", null));
+ assertNull(controller.getContext("XPC", null));
+ }
+
+ public void testMissingAutowireDependency() throws Exception
+ {
+ Deployment context = createSimpleDeployment("KernelDeployerTest2");
+
+ AbstractKernelDeployment deployment = new AbstractKernelDeployment();
+ deployment.setName("KernelDeployerTest2");
+ BeanMetaDataFactory md1 = new AbstractBeanMetaData("PUD", PUDeployment.class.getName());
+ deployment.setBeanFactories(Arrays.asList(md1));
+ MutableAttachments attachments = (MutableAttachments) context.getPredeterminedManagedObjects();
+ attachments.addAttachment("KernelDeployerTest2", deployment);
+
+ assertDeploy(context);
+ try
+ {
+ ControllerContext pud = controller.getContext("PUD", null);
+ assertNotNull(pud);
+ assertEquals(ControllerState.INSTANTIATED, pud.getState());
+ }
+ finally
+ {
+ assertUndeploy(context);
+ }
+
+ assertNull(controller.getContext("PUD", null));
+ }
+
+ public void testDependencyOnExistingTarget() throws Exception
+ {
+ Deployment context = createSimpleDeployment("KernelDeployerTest3");
+
+ AbstractKernelDeployment deployment = new AbstractKernelDeployment();
+ deployment.setName("KernelDeployerTest3");
+ PUDeployment bean = new PUDeployment();
+ AbstractBeanMetaData md1 = new AbstractBeanMetaData("PUD", PUDeployment.class.getName());
+ AbstractConstructorMetaData acmd = new AbstractConstructorMetaData();
+ acmd.setValueObject(bean);
+ md1.setConstructor(acmd);
+ BeanMetaDataFactory md2 = new AbstractBeanMetaData("XPC", DefaultXPCResolver.class.getName());
+ deployment.setBeanFactories(Arrays.asList(md1, md2));
+ MutableAttachments attachments = (MutableAttachments) context.getPredeterminedManagedObjects();
+ attachments.addAttachment("KernelDeployerTest3", deployment);
+
+ assertDeploy(context);
+ try
+ {
+ ControllerContext pud = controller.getInstalledContext("PUD");
+ assertNotNull(pud);
+ ControllerContext xpc = controller.getInstalledContext("XPC");
+ assertNotNull(xpc);
+ assertSame(bean.getResolver(), xpc.getTarget());
+ }
+ finally
+ {
+ assertUndeploy(context);
+ }
+
+ assertNull(controller.getContext("PUD", null));
+ assertNull(controller.getContext("XPC", null));
+ }
+
+ public void testExistingTargetWithMissingDependency() throws Exception
+ {
+ Deployment context = createSimpleDeployment("KernelDeployerTest4");
+
+ AbstractKernelDeployment deployment = new AbstractKernelDeployment();
+ deployment.setName("KernelDeployerTest4");
+ PUDeployment bean = new PUDeployment();
+ AbstractBeanMetaData md1 = new AbstractBeanMetaData("PUD", PUDeployment.class.getName());
+ AbstractConstructorMetaData acmd = new AbstractConstructorMetaData();
+ acmd.setValueObject(bean);
+ md1.setConstructor(acmd);
+ deployment.setBeanFactories(Arrays.asList((BeanMetaDataFactory)md1));
+ MutableAttachments attachments = (MutableAttachments) context.getPredeterminedManagedObjects();
+ attachments.addAttachment("KernelDeployerTest4", deployment);
+
+ assertDeploy(context);
+ try
+ {
+ ControllerContext pud = controller.getContext("PUD", null);
+ assertNotNull(pud);
+ assertSame(bean, pud.getTarget());
+ assertNull(bean.getResolver());
+ assertEquals(ControllerState.INSTANTIATED, pud.getState());
+ }
+ finally
+ {
+ assertUndeploy(context);
+ }
+
+ assertNull(controller.getContext("PUD", null));
+ }
+}
\ No newline at end of file
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/validate/support/MyVirtualFile.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/validate/support/MyVirtualFile.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/deployer/validate/support/MyVirtualFile.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -181,6 +181,11 @@
{
return false;
}
+
+ public URL getRealURL() throws IOException, URISyntaxException
+ {
+ return null;
+ }
};
}
}
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/parsing/test/DeployersAltDDTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/parsing/test/DeployersAltDDTestCase.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/parsing/test/DeployersAltDDTestCase.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -28,16 +28,12 @@
import java.net.URISyntaxException;
import java.net.URL;
import java.util.List;
-import java.util.Map;
import junit.framework.Test;
-
-import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.plugins.structure.AbstractVFSDeploymentContext;
import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.managed.api.ManagedObject;
import org.jboss.test.BaseTestCase;
import org.jboss.virtual.VirtualFile;
import org.jboss.virtual.spi.VFSContext;
@@ -204,6 +200,11 @@
{
return false;
}
+
+ public URL getRealURL() throws IOException, URISyntaxException
+ {
+ return null;
+ }
});
return altDD;
}
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/file/test/FileMatcherTestCase.java
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/file/test/FileMatcherTestCase.java 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/file/test/FileMatcherTestCase.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -230,6 +230,11 @@
{
return false;
}
+
+ public URL getRealURL() throws IOException, URISyntaxException
+ {
+ return null;
+ }
};
}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/war/support (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/war/support)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/war/support/MockWarStructureDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/war/support/MockWarStructureDeployer.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/war/support/MockWarStructureDeployer.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,228 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.structure.war.support;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.spi.structure.ContextInfo;
-import org.jboss.deployers.vfs.plugins.structure.AbstractVFSStructureDeployer;
-import org.jboss.deployers.vfs.spi.structure.StructureContext;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VirtualFileFilter;
-import org.jboss.virtual.VisitorAttributes;
-import org.jboss.virtual.plugins.vfs.helpers.SuffixMatchFilter;
-
-/**
- * MockWarStructure.
- *
- * @author <a href="adrian at jboss.com">Adrian Brock</a>
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class MockWarStructureDeployer extends AbstractVFSStructureDeployer
-{
- /** The default filter which allows jars/jar directories */
- public static final VirtualFileFilter DEFAULT_WEB_INF_LIB_FILTER = new SuffixMatchFilter(".jar", VisitorAttributes.DEFAULT);
-
- /** The web-inf/lib filter */
- private VirtualFileFilter webInfLibFilter = DEFAULT_WEB_INF_LIB_FILTER;
-
- /** The web-inf/lib/[some-archive]/META-INF filter */
- private VirtualFileFilter webInfLibMetaDataFilter;
-
- /**
- * Sets the default relative order 1000.
- *
- */
- public MockWarStructureDeployer()
- {
- setRelativeOrder(1000);
- }
-
- /**
- * Get the webInfLibFilter.
- *
- * @return the webInfLibFilter.
- */
- public VirtualFileFilter getWebInfLibFilter()
- {
- return webInfLibFilter;
- }
-
- /**
- * Set the webInfLibFilter.
- *
- * @param webInfLibFilter the webInfLibFilter.
- * @throws IllegalArgumentException for a null filter
- */
- public void setWebInfLibFilter(VirtualFileFilter webInfLibFilter)
- {
- if (webInfLibFilter == null)
- throw new IllegalArgumentException("Null filter");
- this.webInfLibFilter = webInfLibFilter;
- }
-
- /**
- * Get webInfLibMetaDataFilter
- *
- * @return the webInfLibMetaDataFilter
- */
- public VirtualFileFilter getWebInfLibMetaDataFilter()
- {
- return webInfLibMetaDataFilter;
- }
-
- /**
- * Set the webInfLibMetaDataFilter.
- *
- * @param webInfLibMetaDataFilter the webInfLibFilter.
- */
- public void setWebInfLibMetaDataFilter(VirtualFileFilter webInfLibMetaDataFilter)
- {
- this.webInfLibMetaDataFilter = webInfLibMetaDataFilter;
- }
-
- public boolean determineStructure(StructureContext structureContext) throws DeploymentException
- {
- ContextInfo context = null;
- VirtualFile file = structureContext.getFile();
- try
- {
- boolean trace = log.isTraceEnabled();
-
- if (isLeaf(file) == false)
- {
- // We require either a WEB-INF or the name ends in .war
- if (file.getName().endsWith(".war") == false)
- {
- try
- {
- VirtualFile child = file.getChild("WEB-INF");
- if (child != null)
- {
- if (trace)
- log.trace("... ok - directory has a WEB-INF subdirectory");
- }
- else
- {
- if (trace)
- log.trace("... no - doesn't look like a war and no WEB-INF subdirectory.");
- return false;
- }
- }
- catch (IOException e)
- {
- log.warn("Exception while checking if file is a war: " + e);
- return false;
- }
- }
- else if (trace)
- {
- log.trace("... ok - name ends in .war.");
- }
-
- List<String> metaDataLocations = new ArrayList<String>();
- metaDataLocations.add("WEB-INF");
-
- // Check for WEB-INF/classes
- VirtualFile classes = null;
- try
- {
- // The classpath contains WEB-INF/classes
- classes = file.getChild("WEB-INF/classes");
-
- // Check for a META-INF for metadata
- if (classes != null)
- metaDataLocations.add("WEB-INF/classes/META-INF");
- }
- catch(IOException e)
- {
- log.warn("Exception while looking for classes, " + file.getPathName() + ", " + e);
- }
-
- // Check for jars in WEB-INF/lib
- List<VirtualFile> archives = null;
- try
- {
- VirtualFile webinfLib = file.getChild("WEB-INF/lib");
- if (webinfLib != null)
- {
- archives = webinfLib.getChildren(webInfLibFilter);
- // Add the jars' META-INF for metadata
- for (VirtualFile jar : archives)
- {
- // either same as plain lib filter, null or accepts the jar
- if (webInfLibMetaDataFilter == null || webInfLibMetaDataFilter == webInfLibFilter || webInfLibMetaDataFilter.accepts(jar))
- metaDataLocations.add("WEB-INF/lib/" + jar.getName() + "/META-INF");
- }
- }
- }
- catch (IOException e)
- {
- log.warn("Exception looking for WEB-INF/lib, " + file.getPathName() + ", " + e);
- }
-
- // Create a context for this war file and all its metadata locations
- context = createContext(structureContext, metaDataLocations.toArray(new String[metaDataLocations.size()]));
-
- // Add the war manifest classpath entries
- addClassPath(structureContext, file, false, true, context);
-
- // Add WEB-INF/classes if present
- if (classes != null)
- addClassPath(structureContext, classes, true, false, context);
- else if (trace)
- log.trace("No WEB-INF/classes for: " + file.getPathName());
-
- // and the top level jars in WEB-INF/lib
- if (archives != null)
- {
- for (VirtualFile jar : archives)
- addClassPath(structureContext, jar, true, true, context);
- }
- else if (trace)
- {
- log.trace("No WEB-INF/lib for: " + file.getPathName());
- }
-
- // There are no subdeployments for wars
- return true;
- }
- else
- {
- if (trace)
- log.trace("... no - not a directory or an archive.");
- return false;
- }
- }
- catch (Exception e)
- {
- // Remove the invalid context
- if (context != null)
- structureContext.removeChild(context);
-
- throw DeploymentException.rethrowAsDeploymentException("Error determining structure: " + file.getName(), e);
- }
- }
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/war/support/MockWarStructureDeployer.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/war/support/MockWarStructureDeployer.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/war/support/MockWarStructureDeployer.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/structure/war/support/MockWarStructureDeployer.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,228 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.structure.war.support;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.structure.ContextInfo;
+import org.jboss.deployers.vfs.plugins.structure.AbstractVFSStructureDeployer;
+import org.jboss.deployers.vfs.spi.structure.StructureContext;
+import org.jboss.virtual.VirtualFile;
+import org.jboss.virtual.VirtualFileFilter;
+import org.jboss.virtual.VisitorAttributes;
+import org.jboss.virtual.plugins.vfs.helpers.SuffixMatchFilter;
+
+/**
+ * MockWarStructure.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class MockWarStructureDeployer extends AbstractVFSStructureDeployer
+{
+ /** The default filter which allows jars/jar directories */
+ public static final VirtualFileFilter DEFAULT_WEB_INF_LIB_FILTER = new SuffixMatchFilter(".jar", VisitorAttributes.DEFAULT);
+
+ /** The web-inf/lib filter */
+ private VirtualFileFilter webInfLibFilter = DEFAULT_WEB_INF_LIB_FILTER;
+
+ /** The web-inf/lib/[some-archive]/META-INF filter */
+ private VirtualFileFilter webInfLibMetaDataFilter;
+
+ /**
+ * Sets the default relative order 1000.
+ *
+ */
+ public MockWarStructureDeployer()
+ {
+ setRelativeOrder(1000);
+ }
+
+ /**
+ * Get the webInfLibFilter.
+ *
+ * @return the webInfLibFilter.
+ */
+ public VirtualFileFilter getWebInfLibFilter()
+ {
+ return webInfLibFilter;
+ }
+
+ /**
+ * Set the webInfLibFilter.
+ *
+ * @param webInfLibFilter the webInfLibFilter.
+ * @throws IllegalArgumentException for a null filter
+ */
+ public void setWebInfLibFilter(VirtualFileFilter webInfLibFilter)
+ {
+ if (webInfLibFilter == null)
+ throw new IllegalArgumentException("Null filter");
+ this.webInfLibFilter = webInfLibFilter;
+ }
+
+ /**
+ * Get webInfLibMetaDataFilter
+ *
+ * @return the webInfLibMetaDataFilter
+ */
+ public VirtualFileFilter getWebInfLibMetaDataFilter()
+ {
+ return webInfLibMetaDataFilter;
+ }
+
+ /**
+ * Set the webInfLibMetaDataFilter.
+ *
+ * @param webInfLibMetaDataFilter the webInfLibFilter.
+ */
+ public void setWebInfLibMetaDataFilter(VirtualFileFilter webInfLibMetaDataFilter)
+ {
+ this.webInfLibMetaDataFilter = webInfLibMetaDataFilter;
+ }
+
+ public boolean determineStructure(StructureContext structureContext) throws DeploymentException
+ {
+ ContextInfo context = null;
+ VirtualFile file = structureContext.getFile();
+ try
+ {
+ boolean trace = log.isTraceEnabled();
+
+ if (isLeaf(file) == false)
+ {
+ // We require either a WEB-INF or the name ends in .war
+ if (file.getName().endsWith(".war") == false)
+ {
+ try
+ {
+ VirtualFile child = file.getChild("WEB-INF");
+ if (child != null)
+ {
+ if (trace)
+ log.trace("... ok - directory has a WEB-INF subdirectory");
+ }
+ else
+ {
+ if (trace)
+ log.trace("... no - doesn't look like a war and no WEB-INF subdirectory.");
+ return false;
+ }
+ }
+ catch (IOException e)
+ {
+ log.warn("Exception while checking if file is a war: " + e);
+ return false;
+ }
+ }
+ else if (trace)
+ {
+ log.trace("... ok - name ends in .war.");
+ }
+
+ List<String> metaDataLocations = new ArrayList<String>();
+ metaDataLocations.add("WEB-INF");
+
+ // Check for WEB-INF/classes
+ VirtualFile classes = null;
+ try
+ {
+ // The classpath contains WEB-INF/classes
+ classes = file.getChild("WEB-INF/classes");
+
+ // Check for a META-INF for metadata
+ if (classes != null)
+ metaDataLocations.add("WEB-INF/classes/META-INF");
+ }
+ catch(IOException e)
+ {
+ log.warn("Exception while looking for classes, " + file.getPathName() + ", " + e);
+ }
+
+ // Check for jars in WEB-INF/lib
+ List<VirtualFile> archives = null;
+ try
+ {
+ VirtualFile webinfLib = file.getChild("WEB-INF/lib");
+ if (webinfLib != null)
+ {
+ archives = webinfLib.getChildren(webInfLibFilter);
+ // Add the jars' META-INF for metadata
+ for (VirtualFile jar : archives)
+ {
+ // either same as plain lib filter, null or accepts the jar
+ if (webInfLibMetaDataFilter == null || webInfLibMetaDataFilter == webInfLibFilter || webInfLibMetaDataFilter.accepts(jar))
+ metaDataLocations.add("WEB-INF/lib/" + jar.getName() + "/META-INF");
+ }
+ }
+ }
+ catch (IOException e)
+ {
+ log.warn("Exception looking for WEB-INF/lib, " + file.getPathName() + ", " + e);
+ }
+
+ // Create a context for this war file and all its metadata locations
+ context = createContext(structureContext, metaDataLocations.toArray(new String[metaDataLocations.size()]));
+
+ // Add the war manifest classpath entries
+ addClassPath(structureContext, file, false, true, context);
+
+ // Add WEB-INF/classes if present
+ if (classes != null)
+ addClassPath(structureContext, classes, true, false, context);
+ else if (trace)
+ log.trace("No WEB-INF/classes for: " + file.getPathName());
+
+ // and the top level jars in WEB-INF/lib
+ if (archives != null)
+ {
+ for (VirtualFile jar : archives)
+ addClassPath(structureContext, jar, true, true, context);
+ }
+ else if (trace)
+ {
+ log.trace("No WEB-INF/lib for: " + file.getPathName());
+ }
+
+ // There are no subdeployments for wars
+ return true;
+ }
+ else
+ {
+ if (trace)
+ log.trace("... no - not a directory or an archive.");
+ return false;
+ }
+ }
+ catch (Exception e)
+ {
+ // Remove the invalid context
+ if (context != null)
+ structureContext.removeChild(context);
+
+ throw DeploymentException.rethrowAsDeploymentException("Error determining structure: " + file.getName(), e);
+ }
+ }
+}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/WebBeansTestSuite.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/WebBeansTestSuite.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/WebBeansTestSuite.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.webbeans;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-import org.jboss.test.deployers.vfs.webbeans.test.WebBeanDiscoveryTestCase;
-
-/**
- * WebBeans features test suite.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class WebBeansTestSuite extends TestSuite
-{
- public static void main(String[] args)
- {
- TestRunner.run(suite());
- }
-
- public static Test suite()
- {
- TestSuite suite = new TestSuite("VFS WebBeans Tests");
-
- suite.addTest(WebBeanDiscoveryTestCase.suite());
-
- return suite;
- }
-}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/WebBeansTestSuite.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/WebBeansTestSuite.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/WebBeansTestSuite.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/WebBeansTestSuite.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.webbeans;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+import org.jboss.test.deployers.vfs.webbeans.test.WebBeanDiscoveryTestCase;
+
+/**
+ * WebBeans features test suite.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class WebBeansTestSuite extends TestSuite
+{
+ public static void main(String[] args)
+ {
+ TestRunner.run(suite());
+ }
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite("VFS WebBeans Tests");
+
+ suite.addTest(WebBeanDiscoveryTestCase.suite());
+
+ return suite;
+ }
+}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaData.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaData.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaData.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.webbeans.support;
-
-import java.io.Serializable;
-import java.net.URL;
-
-import org.jboss.virtual.VirtualFile;
-
-/**
- * JBoss WebBeans custom meta data
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class JBossWebBeansMetaData implements Serializable
-{
- private static final long serialVersionUID = 1l;
-
- private VirtualFile file;
-
- public JBossWebBeansMetaData(VirtualFile file)
- {
- if (file == null)
- throw new IllegalArgumentException("Null file");
- this.file = file;
- }
-
- public URL getURL() throws Exception
- {
- return file.toURL();
- }
-}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaData.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaData.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaData.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaData.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.webbeans.support;
+
+import java.io.Serializable;
+import java.net.URL;
+
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * JBoss WebBeans custom meta data
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class JBossWebBeansMetaData implements Serializable
+{
+ private static final long serialVersionUID = 1l;
+
+ private VirtualFile file;
+
+ public JBossWebBeansMetaData(VirtualFile file)
+ {
+ if (file == null)
+ throw new IllegalArgumentException("Null file");
+ this.file = file;
+ }
+
+ public URL getURL() throws Exception
+ {
+ return file.toURL();
+ }
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaDataDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaDataDeployer.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaDataDeployer.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,45 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.webbeans.support;
-
-import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.virtual.VirtualFile;
-
-/**
- * JBoss WBD deployer.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class JBossWebBeansMetaDataDeployer extends AbstractVFSParsingDeployer<JBossWebBeansMetaData>
-{
- public JBossWebBeansMetaDataDeployer()
- {
- super(JBossWebBeansMetaData.class);
- setName("jboss-web-beans.xml");
- }
-
- protected JBossWebBeansMetaData parse(VFSDeploymentUnit unit, VirtualFile file, JBossWebBeansMetaData root) throws Exception
- {
- return new JBossWebBeansMetaData(file);
- }
-}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaDataDeployer.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaDataDeployer.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaDataDeployer.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/JBossWebBeansMetaDataDeployer.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,45 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.webbeans.support;
+
+import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * JBoss WBD deployer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class JBossWebBeansMetaDataDeployer extends AbstractVFSParsingDeployer<JBossWebBeansMetaData>
+{
+ public JBossWebBeansMetaDataDeployer()
+ {
+ super(JBossWebBeansMetaData.class);
+ setName("jboss-web-beans.xml");
+ }
+
+ protected JBossWebBeansMetaData parse(VFSDeploymentUnit unit, VirtualFile file, JBossWebBeansMetaData root) throws Exception
+ {
+ return new JBossWebBeansMetaData(file);
+ }
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscovery.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscovery.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscovery.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.webbeans.support;
-
-import java.net.URL;
-
-/**
- * A container should implement this interface to allow the Web Beans RI to
- * discover the Web Beans to deploy
- *
- * @author Pete Muir
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public interface WebBeanDiscovery
-{
- /**
- * @return A list of all classes in classpath archives with web-beans.xml files
- */
- public Iterable<Class<?>> discoverWebBeanClasses();
-
- /**
- * @return A list of all web-beans.xml files in the app classpath
- */
- public Iterable<URL> discoverWebBeansXml();
-}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscovery.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscovery.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscovery.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscovery.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.webbeans.support;
+
+import java.net.URL;
+
+/**
+ * A container should implement this interface to allow the Web Beans RI to
+ * discover the Web Beans to deploy
+ *
+ * @author Pete Muir
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public interface WebBeanDiscovery
+{
+ /**
+ * @return A list of all classes in classpath archives with web-beans.xml files
+ */
+ public Iterable<Class<?>> discoverWebBeanClasses();
+
+ /**
+ * @return A list of all web-beans.xml files in the app classpath
+ */
+ public Iterable<URL> discoverWebBeansXml();
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryDeployer.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryDeployer.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,167 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.webbeans.support;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.jboss.classloading.spi.dependency.Module;
-import org.jboss.classloading.spi.visitor.ClassFilter;
-import org.jboss.classloading.spi.visitor.ResourceContext;
-import org.jboss.classloading.spi.visitor.ResourceFilter;
-import org.jboss.classloading.spi.visitor.ResourceVisitor;
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.deployers.vfs.spi.deployer.AbstractOptionalVFSRealDeployer;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.virtual.VirtualFile;
-
-/**
- * WBD deployer.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class WebBeanDiscoveryDeployer extends AbstractOptionalVFSRealDeployer<JBossWebBeansMetaData>
-{
- public WebBeanDiscoveryDeployer()
- {
- super(JBossWebBeansMetaData.class);
- addOutput(WebBeanDiscovery.class);
- }
-
- public void deploy(VFSDeploymentUnit unit, JBossWebBeansMetaData deployment) throws DeploymentException
- {
- VFSDeploymentUnit topUnit = unit.getTopLevel();
- WebBeanDiscoveryImpl wbdi = topUnit.getAttachment(WebBeanDiscovery.class.getName(), WebBeanDiscoveryImpl.class);
- if (wbdi == null)
- {
- wbdi = new WebBeanDiscoveryImpl();
- topUnit.addAttachment(WebBeanDiscovery.class.getName(), wbdi);
- }
-
- List<URL> urls = new ArrayList<URL>();
-
- try
- {
- if (deployment != null)
- {
- // do some custom stuff
- }
-
- Iterable<VirtualFile> classpaths = getClassPaths(unit);
- for (VirtualFile cp : classpaths)
- {
- VirtualFile wbXml = cp.getChild("META-INF/web-beans.xml");
- if (wbXml != null)
- {
- // add url
- wbdi.addWebBeansXmlURL(wbXml.toURL());
- // add classes
- urls.add(cp.toURL());
- }
- }
-
- // handle war slightly different
- VirtualFile warWbXml = unit.getFile("WEB-INF/web-beans.xml");
- if (warWbXml != null)
- {
- wbdi.addWebBeansXmlURL(warWbXml.toURL());
-
- VirtualFile classes = unit.getFile("WEB-INF/classes");
- if (classes != null)
- urls.add(classes.toURL());
- }
- }
- catch (Exception e)
- {
- throw DeploymentException.rethrowAsDeploymentException("Cannot deploy WBD.", e);
- }
-
- if (urls.isEmpty() == false)
- {
- Module module = unit.getAttachment(Module.class);
- if (module == null)
- {
- VFSDeploymentUnit parent = unit.getParent();
- while (parent != null && module == null)
- {
- module = parent.getAttachment(Module.class);
- parent = parent.getParent();
- }
- if (module == null)
- throw new DeploymentException("No module in deployment unit's hierarchy: " + unit.getName());
- }
-
- WBDiscoveryVisitor visitor = new WBDiscoveryVisitor(wbdi);
- module.visit(visitor, ClassFilter.INSTANCE, null, urls.toArray(new URL[urls.size()]));
- }
- }
-
- /**
- * Get the matching class paths that belong to this deployment unit.
- *
- * @param unit the deployment unit
- * @return matching class paths
- * @throws Exception for any error
- */
- protected Iterable<VirtualFile> getClassPaths(VFSDeploymentUnit unit) throws Exception
- {
- List<VirtualFile> classpath = unit.getClassPath();
- if (classpath != null && classpath.isEmpty() == false)
- {
- List<VirtualFile> matching = new ArrayList<VirtualFile>();
- VirtualFile root = unit.getRoot();
- for (VirtualFile cp : classpath)
- {
- VirtualFile check = cp;
- while (check != null && check.equals(root) == false)
- check = check.getParent();
-
- if (check != null)
- matching.add(cp);
- }
- return matching;
- }
- return Collections.emptySet();
- }
-
- private class WBDiscoveryVisitor implements ResourceVisitor
- {
- private WebBeanDiscoveryImpl wbdi;
-
- private WBDiscoveryVisitor(WebBeanDiscoveryImpl wbdi)
- {
- this.wbdi = wbdi;
- }
-
- public ResourceFilter getFilter()
- {
- return ClassFilter.INSTANCE;
- }
-
- public void visit(ResourceContext resource)
- {
- wbdi.addWebBeanClass(resource.loadClass());
- }
- }
-}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryDeployer.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryDeployer.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryDeployer.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryDeployer.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,167 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.webbeans.support;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.jboss.classloading.spi.dependency.Module;
+import org.jboss.classloading.spi.visitor.ClassFilter;
+import org.jboss.classloading.spi.visitor.ResourceContext;
+import org.jboss.classloading.spi.visitor.ResourceFilter;
+import org.jboss.classloading.spi.visitor.ResourceVisitor;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.vfs.spi.deployer.AbstractOptionalVFSRealDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * WBD deployer.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class WebBeanDiscoveryDeployer extends AbstractOptionalVFSRealDeployer<JBossWebBeansMetaData>
+{
+ public WebBeanDiscoveryDeployer()
+ {
+ super(JBossWebBeansMetaData.class);
+ addOutput(WebBeanDiscovery.class);
+ }
+
+ public void deploy(VFSDeploymentUnit unit, JBossWebBeansMetaData deployment) throws DeploymentException
+ {
+ VFSDeploymentUnit topUnit = unit.getTopLevel();
+ WebBeanDiscoveryImpl wbdi = topUnit.getAttachment(WebBeanDiscovery.class.getName(), WebBeanDiscoveryImpl.class);
+ if (wbdi == null)
+ {
+ wbdi = new WebBeanDiscoveryImpl();
+ topUnit.addAttachment(WebBeanDiscovery.class.getName(), wbdi);
+ }
+
+ List<URL> urls = new ArrayList<URL>();
+
+ try
+ {
+ if (deployment != null)
+ {
+ // do some custom stuff
+ }
+
+ Iterable<VirtualFile> classpaths = getClassPaths(unit);
+ for (VirtualFile cp : classpaths)
+ {
+ VirtualFile wbXml = cp.getChild("META-INF/web-beans.xml");
+ if (wbXml != null)
+ {
+ // add url
+ wbdi.addWebBeansXmlURL(wbXml.toURL());
+ // add classes
+ urls.add(cp.toURL());
+ }
+ }
+
+ // handle war slightly different
+ VirtualFile warWbXml = unit.getFile("WEB-INF/web-beans.xml");
+ if (warWbXml != null)
+ {
+ wbdi.addWebBeansXmlURL(warWbXml.toURL());
+
+ VirtualFile classes = unit.getFile("WEB-INF/classes");
+ if (classes != null)
+ urls.add(classes.toURL());
+ }
+ }
+ catch (Exception e)
+ {
+ throw DeploymentException.rethrowAsDeploymentException("Cannot deploy WBD.", e);
+ }
+
+ if (urls.isEmpty() == false)
+ {
+ Module module = unit.getAttachment(Module.class);
+ if (module == null)
+ {
+ VFSDeploymentUnit parent = unit.getParent();
+ while (parent != null && module == null)
+ {
+ module = parent.getAttachment(Module.class);
+ parent = parent.getParent();
+ }
+ if (module == null)
+ throw new DeploymentException("No module in deployment unit's hierarchy: " + unit.getName());
+ }
+
+ WBDiscoveryVisitor visitor = new WBDiscoveryVisitor(wbdi);
+ module.visit(visitor, ClassFilter.INSTANCE, null, urls.toArray(new URL[urls.size()]));
+ }
+ }
+
+ /**
+ * Get the matching class paths that belong to this deployment unit.
+ *
+ * @param unit the deployment unit
+ * @return matching class paths
+ * @throws Exception for any error
+ */
+ protected Iterable<VirtualFile> getClassPaths(VFSDeploymentUnit unit) throws Exception
+ {
+ List<VirtualFile> classpath = unit.getClassPath();
+ if (classpath != null && classpath.isEmpty() == false)
+ {
+ List<VirtualFile> matching = new ArrayList<VirtualFile>();
+ VirtualFile root = unit.getRoot();
+ for (VirtualFile cp : classpath)
+ {
+ VirtualFile check = cp;
+ while (check != null && check.equals(root) == false)
+ check = check.getParent();
+
+ if (check != null)
+ matching.add(cp);
+ }
+ return matching;
+ }
+ return Collections.emptySet();
+ }
+
+ private class WBDiscoveryVisitor implements ResourceVisitor
+ {
+ private WebBeanDiscoveryImpl wbdi;
+
+ private WBDiscoveryVisitor(WebBeanDiscoveryImpl wbdi)
+ {
+ this.wbdi = wbdi;
+ }
+
+ public ResourceFilter getFilter()
+ {
+ return ClassFilter.INSTANCE;
+ }
+
+ public void visit(ResourceContext resource)
+ {
+ wbdi.addWebBeanClass(resource.loadClass());
+ }
+ }
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryImpl.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryImpl.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryImpl.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,57 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.webbeans.support;
-
-import java.net.URL;
-import java.util.Set;
-import java.util.HashSet;
-
-/**
- * WBD impl.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class WebBeanDiscoveryImpl implements WebBeanDiscovery
-{
- private Set<Class<?>> classes = new HashSet<Class<?>>();
- private Set<URL> urls = new HashSet<URL>();
-
- public void addWebBeanClass(Class<?> clazz)
- {
- classes.add(clazz);
- }
-
- public void addWebBeansXmlURL(URL url)
- {
- urls.add(url);
- }
-
- public Iterable<Class<?>> discoverWebBeanClasses()
- {
- return classes;
- }
-
- public Iterable<URL> discoverWebBeansXml()
- {
- return urls;
- }
-}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryImpl.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryImpl.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryImpl.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/WebBeanDiscoveryImpl.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.webbeans.support;
+
+import java.net.URL;
+import java.util.Set;
+import java.util.HashSet;
+
+/**
+ * WBD impl.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class WebBeanDiscoveryImpl implements WebBeanDiscovery
+{
+ private Set<Class<?>> classes = new HashSet<Class<?>>();
+ private Set<URL> urls = new HashSet<URL>();
+
+ public void addWebBeanClass(Class<?> clazz)
+ {
+ classes.add(clazz);
+ }
+
+ public void addWebBeansXmlURL(URL url)
+ {
+ urls.add(url);
+ }
+
+ public Iterable<Class<?>> discoverWebBeanClasses()
+ {
+ return classes;
+ }
+
+ public Iterable<URL> discoverWebBeansXml()
+ {
+ return urls;
+ }
+}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/crm (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/crm)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/crm/CrmWebBean.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/crm/CrmWebBean.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/crm/CrmWebBean.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.webbeans.support.crm;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class CrmWebBean
-{
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/crm/CrmWebBean.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/crm/CrmWebBean.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/crm/CrmWebBean.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/crm/CrmWebBean.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.webbeans.support.crm;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class CrmWebBean
+{
+}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ejb (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ejb)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ejb/BusinessInterface.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ejb/BusinessInterface.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ejb/BusinessInterface.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,30 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.webbeans.support.ejb;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public interface BusinessInterface
-{
- int add(int x, int y);
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ejb/BusinessInterface.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ejb/BusinessInterface.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ejb/BusinessInterface.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ejb/BusinessInterface.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,30 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.webbeans.support.ejb;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public interface BusinessInterface
+{
+ int add(int x, int y);
+}
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ejb/MySLSBean.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ejb/MySLSBean.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ejb/MySLSBean.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.webbeans.support.ejb;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class MySLSBean implements BusinessInterface
-{
- public int add(int x, int y)
- {
- return x + y;
- }
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ejb/MySLSBean.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ejb/MySLSBean.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ejb/MySLSBean.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ejb/MySLSBean.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.webbeans.support.ejb;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class MySLSBean implements BusinessInterface
+{
+ public int add(int x, int y)
+ {
+ return x + y;
+ }
+}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ext (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ext)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ext/ExternalWebBean.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ext/ExternalWebBean.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ext/ExternalWebBean.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.webbeans.support.ext;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class ExternalWebBean
-{
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ext/ExternalWebBean.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ext/ExternalWebBean.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ext/ExternalWebBean.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ext/ExternalWebBean.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.webbeans.support.ext;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class ExternalWebBean
+{
+}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jar (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jar)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jar/PlainJavaBean.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jar/PlainJavaBean.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jar/PlainJavaBean.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.webbeans.support.jar;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class PlainJavaBean
-{
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jar/PlainJavaBean.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jar/PlainJavaBean.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jar/PlainJavaBean.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jar/PlainJavaBean.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.webbeans.support.jar;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class PlainJavaBean
+{
+}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jsf (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jsf)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jsf/NotWBJsfBean.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jsf/NotWBJsfBean.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jsf/NotWBJsfBean.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.webbeans.support.jsf;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class NotWBJsfBean
-{
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jsf/NotWBJsfBean.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jsf/NotWBJsfBean.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jsf/NotWBJsfBean.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/jsf/NotWBJsfBean.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.webbeans.support.jsf;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class NotWBJsfBean
+{
+}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ui (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ui)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ui/UIWebBean.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ui/UIWebBean.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ui/UIWebBean.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.webbeans.support.ui;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class UIWebBean
-{
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ui/UIWebBean.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ui/UIWebBean.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ui/UIWebBean.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/ui/UIWebBean.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.webbeans.support.ui;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class UIWebBean
+{
+}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/util (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/util)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/util/SomeUtil.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/util/SomeUtil.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/util/SomeUtil.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.webbeans.support.util;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class SomeUtil
-{
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/util/SomeUtil.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/util/SomeUtil.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/util/SomeUtil.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/util/SomeUtil.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.webbeans.support.util;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class SomeUtil
+{
+}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/web (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/web)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/web/ServletWebBean.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/web/ServletWebBean.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/web/ServletWebBean.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.webbeans.support.web;
-
-/**
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class ServletWebBean
-{
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/web/ServletWebBean.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/web/ServletWebBean.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/web/ServletWebBean.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/support/web/ServletWebBean.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.webbeans.support.web;
+
+/**
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class ServletWebBean
+{
+}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/AbstractWebBeansTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/AbstractWebBeansTest.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/AbstractWebBeansTest.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,127 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.webbeans.test;
-
-import org.jboss.deployers.vfs.deployer.kernel.BeanDeployer;
-import org.jboss.test.deployers.BootstrapDeployersTest;
-import org.jboss.test.deployers.vfs.webbeans.support.ejb.MySLSBean;
-import org.jboss.test.deployers.vfs.webbeans.support.ext.ExternalWebBean;
-import org.jboss.test.deployers.vfs.webbeans.support.jar.PlainJavaBean;
-import org.jboss.test.deployers.vfs.webbeans.support.jsf.NotWBJsfBean;
-import org.jboss.test.deployers.vfs.webbeans.support.ui.UIWebBean;
-import org.jboss.test.deployers.vfs.webbeans.support.util.SomeUtil;
-import org.jboss.test.deployers.vfs.webbeans.support.web.ServletWebBean;
-import org.jboss.test.deployers.vfs.webbeans.support.crm.CrmWebBean;
-import org.jboss.virtual.AssembledDirectory;
-
-/**
- * AbstractWebBeansTest.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public abstract class AbstractWebBeansTest extends BootstrapDeployersTest
-{
- protected AbstractWebBeansTest(String name)
- {
- super(name);
- }
-
- @Override
- protected void setUp() throws Exception
- {
- super.setUp();
-
- // fix bean deployer to take more restictive suffix
- // else it's gonna pick up our web-beans.xml
- BeanDeployer deployer = assertBean("BeanDeployer", BeanDeployer.class);
- deployer.setSuffix("-jboss-beans.xml");
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- // put the old suffix back
- BeanDeployer deployer = assertBean("BeanDeployer", BeanDeployer.class);
- deployer.setSuffix("-beans.xml");
-
- super.tearDown();
- }
-
- protected AssembledDirectory createBasicEar() throws Exception
- {
- AssembledDirectory ear = createTopLevelWithUtil();
-
- AssembledDirectory jar = ear.mkdir("simple.jar");
- addPackage(jar, PlainJavaBean.class);
- addPath(jar, "/webbeans/simple/jar", "META-INF");
-
- AssembledDirectory ejbs = ear.mkdir("ejbs.jar");
- addPackage(ejbs, MySLSBean.class);
- addPath(ejbs, "/webbeans/simple/ejb", "META-INF");
-
- AssembledDirectory war = ear.mkdir("simple.war");
- AssembledDirectory webinf = war.mkdir("WEB-INF");
- AssembledDirectory classes = webinf.mkdir("classes");
- addPackage(classes, ServletWebBean.class);
- addPath(war, "/webbeans/simple/web", "WEB-INF");
-
- AssembledDirectory lib = webinf.mkdir("lib");
-
- AssembledDirectory uijar = lib.mkdir("ui.jar");
- addPackage(uijar, UIWebBean.class);
- addPath(uijar, "/webbeans/simple/ui", "META-INF");
-
- // war w/o web-beans.xml
-
- war = ear.mkdir("crm.war");
- webinf = war.mkdir("WEB-INF");
- classes = webinf.mkdir("classes");
- addPackage(classes, NotWBJsfBean.class);
-
- lib = webinf.mkdir("lib");
-
- uijar = lib.mkdir("crm.jar");
- addPackage(uijar, CrmWebBean.class);
- addPath(uijar, "/webbeans/simple/crm", "META-INF");
-
- enableTrace("org.jboss.deployers");
-
- return ear;
- }
-
- protected AssembledDirectory createTopLevelWithUtil() throws Exception
- {
- AssembledDirectory topLevel = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(topLevel, "/webbeans/simple", "META-INF");
-
- AssembledDirectory earLib = topLevel.mkdir("lib");
-
- AssembledDirectory util = earLib.mkdir("util.jar");
- addPackage(util, SomeUtil.class);
-
- AssembledDirectory ext = earLib.mkdir("ext.jar");
- addPackage(ext, ExternalWebBean.class);
- addPath(ext, "/webbeans/simple/ext", "META-INF");
-
- return topLevel;
- }
-}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/AbstractWebBeansTest.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/AbstractWebBeansTest.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/AbstractWebBeansTest.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/AbstractWebBeansTest.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,127 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.webbeans.test;
+
+import org.jboss.deployers.vfs.deployer.kernel.BeanDeployer;
+import org.jboss.test.deployers.BootstrapDeployersTest;
+import org.jboss.test.deployers.vfs.webbeans.support.ejb.MySLSBean;
+import org.jboss.test.deployers.vfs.webbeans.support.ext.ExternalWebBean;
+import org.jboss.test.deployers.vfs.webbeans.support.jar.PlainJavaBean;
+import org.jboss.test.deployers.vfs.webbeans.support.jsf.NotWBJsfBean;
+import org.jboss.test.deployers.vfs.webbeans.support.ui.UIWebBean;
+import org.jboss.test.deployers.vfs.webbeans.support.util.SomeUtil;
+import org.jboss.test.deployers.vfs.webbeans.support.web.ServletWebBean;
+import org.jboss.test.deployers.vfs.webbeans.support.crm.CrmWebBean;
+import org.jboss.virtual.AssembledDirectory;
+
+/**
+ * AbstractWebBeansTest.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public abstract class AbstractWebBeansTest extends BootstrapDeployersTest
+{
+ protected AbstractWebBeansTest(String name)
+ {
+ super(name);
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ // fix bean deployer to take more restictive suffix
+ // else it's gonna pick up our web-beans.xml
+ BeanDeployer deployer = assertBean("BeanDeployer", BeanDeployer.class);
+ deployer.setSuffix("-jboss-beans.xml");
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ // put the old suffix back
+ BeanDeployer deployer = assertBean("BeanDeployer", BeanDeployer.class);
+ deployer.setSuffix("-beans.xml");
+
+ super.tearDown();
+ }
+
+ protected AssembledDirectory createBasicEar() throws Exception
+ {
+ AssembledDirectory ear = createTopLevelWithUtil();
+
+ AssembledDirectory jar = ear.mkdir("simple.jar");
+ addPackage(jar, PlainJavaBean.class);
+ addPath(jar, "/webbeans/simple/jar", "META-INF");
+
+ AssembledDirectory ejbs = ear.mkdir("ejbs.jar");
+ addPackage(ejbs, MySLSBean.class);
+ addPath(ejbs, "/webbeans/simple/ejb", "META-INF");
+
+ AssembledDirectory war = ear.mkdir("simple.war");
+ AssembledDirectory webinf = war.mkdir("WEB-INF");
+ AssembledDirectory classes = webinf.mkdir("classes");
+ addPackage(classes, ServletWebBean.class);
+ addPath(war, "/webbeans/simple/web", "WEB-INF");
+
+ AssembledDirectory lib = webinf.mkdir("lib");
+
+ AssembledDirectory uijar = lib.mkdir("ui.jar");
+ addPackage(uijar, UIWebBean.class);
+ addPath(uijar, "/webbeans/simple/ui", "META-INF");
+
+ // war w/o web-beans.xml
+
+ war = ear.mkdir("crm.war");
+ webinf = war.mkdir("WEB-INF");
+ classes = webinf.mkdir("classes");
+ addPackage(classes, NotWBJsfBean.class);
+
+ lib = webinf.mkdir("lib");
+
+ uijar = lib.mkdir("crm.jar");
+ addPackage(uijar, CrmWebBean.class);
+ addPath(uijar, "/webbeans/simple/crm", "META-INF");
+
+ enableTrace("org.jboss.deployers");
+
+ return ear;
+ }
+
+ protected AssembledDirectory createTopLevelWithUtil() throws Exception
+ {
+ AssembledDirectory topLevel = createAssembledDirectory("top-level.ear", "top-level.ear");
+ addPath(topLevel, "/webbeans/simple", "META-INF");
+
+ AssembledDirectory earLib = topLevel.mkdir("lib");
+
+ AssembledDirectory util = earLib.mkdir("util.jar");
+ addPackage(util, SomeUtil.class);
+
+ AssembledDirectory ext = earLib.mkdir("ext.jar");
+ addPackage(ext, ExternalWebBean.class);
+ addPath(ext, "/webbeans/simple/ext", "META-INF");
+
+ return topLevel;
+ }
+}
\ No newline at end of file
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.java 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,127 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.deployers.vfs.webbeans.test;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Iterator;
-import java.net.URL;
-
-import junit.framework.Test;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.test.deployers.vfs.webbeans.support.WebBeanDiscovery;
-import org.jboss.test.deployers.vfs.webbeans.support.crm.CrmWebBean;
-import org.jboss.test.deployers.vfs.webbeans.support.ejb.BusinessInterface;
-import org.jboss.test.deployers.vfs.webbeans.support.ejb.MySLSBean;
-import org.jboss.test.deployers.vfs.webbeans.support.ext.ExternalWebBean;
-import org.jboss.test.deployers.vfs.webbeans.support.jar.PlainJavaBean;
-import org.jboss.test.deployers.vfs.webbeans.support.ui.UIWebBean;
-import org.jboss.test.deployers.vfs.webbeans.support.web.ServletWebBean;
-import org.jboss.virtual.VirtualFile;
-
-/**
- * WebBeanDiscoveryTestCase.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class WebBeanDiscoveryTestCase extends AbstractWebBeansTest
-{
- public WebBeanDiscoveryTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return suite(WebBeanDiscoveryTestCase.class);
- }
-
- public void testSimpleUsage() throws Exception
- {
- VirtualFile ear = createBasicEar();
- VFSDeploymentUnit topUnit = assertDeploy(ear);
- try
- {
- WebBeanDiscovery wbDiscovery = topUnit.getAttachment(WebBeanDiscovery.class);
- assertNotNull(wbDiscovery);
-
- Set<String> expected = new HashSet<String>();
- addExpectedClass(expected, "ejbs.jar");
- addExpectedClass(expected, "ext.jar");
- addExpectedClass(expected, "simple.jar");
- addExpectedClass(expected, "ui.jar");
- addExpectedClass(expected, "crm.jar");
- addExpectedClass(expected, "simple.war", "/WEB-INF/web-beans.xml");
-
- for (URL url : wbDiscovery.discoverWebBeansXml())
- {
- boolean found = false;
- Iterator<String> iter = expected.iterator();
- while (iter.hasNext())
- {
- String expectedURL = iter.next();
- if (url.toExternalForm().contains(expectedURL))
- {
- iter.remove();
- found = true;
- break;
- }
- }
- assertTrue("Unexpected wb url: " + url, found);
- }
-
- assertEmpty("Should be emtpy, missing " + expected, expected);
-
- addExpectedClass(expected, BusinessInterface.class);
- addExpectedClass(expected, MySLSBean.class);
- addExpectedClass(expected, ExternalWebBean.class);
- addExpectedClass(expected, PlainJavaBean.class);
- addExpectedClass(expected, UIWebBean.class);
- addExpectedClass(expected, ServletWebBean.class);
- addExpectedClass(expected, CrmWebBean.class);
-
- for (Class<?> clazz : wbDiscovery.discoverWebBeanClasses())
- assertTrue(expected.remove(clazz.getName()));
-
- assertEmpty("Should be emtpy, missing " + expected, expected);
- }
- finally
- {
- undeploy(topUnit);
- }
- }
-
- private static void addExpectedClass(Set<String> expected, String unit)
- {
- addExpectedClass(expected, unit, "/META-INF/web-beans.xml");
- }
-
- private static void addExpectedClass(Set<String> expected, String unit, String suffix)
- {
- expected.add(unit + suffix);
- }
-
- private static void addExpectedClass(Set<String> expected, Class<?> clazz)
- {
- expected.add(clazz.getName());
- }
-}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,127 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.deployers.vfs.webbeans.test;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.Iterator;
+import java.net.URL;
+
+import junit.framework.Test;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.test.deployers.vfs.webbeans.support.WebBeanDiscovery;
+import org.jboss.test.deployers.vfs.webbeans.support.crm.CrmWebBean;
+import org.jboss.test.deployers.vfs.webbeans.support.ejb.BusinessInterface;
+import org.jboss.test.deployers.vfs.webbeans.support.ejb.MySLSBean;
+import org.jboss.test.deployers.vfs.webbeans.support.ext.ExternalWebBean;
+import org.jboss.test.deployers.vfs.webbeans.support.jar.PlainJavaBean;
+import org.jboss.test.deployers.vfs.webbeans.support.ui.UIWebBean;
+import org.jboss.test.deployers.vfs.webbeans.support.web.ServletWebBean;
+import org.jboss.virtual.VirtualFile;
+
+/**
+ * WebBeanDiscoveryTestCase.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class WebBeanDiscoveryTestCase extends AbstractWebBeansTest
+{
+ public WebBeanDiscoveryTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(WebBeanDiscoveryTestCase.class);
+ }
+
+ public void testSimpleUsage() throws Exception
+ {
+ VirtualFile ear = createBasicEar();
+ VFSDeploymentUnit topUnit = assertDeploy(ear);
+ try
+ {
+ WebBeanDiscovery wbDiscovery = topUnit.getAttachment(WebBeanDiscovery.class);
+ assertNotNull(wbDiscovery);
+
+ Set<String> expected = new HashSet<String>();
+ addExpectedClass(expected, "ejbs.jar");
+ addExpectedClass(expected, "ext.jar");
+ addExpectedClass(expected, "simple.jar");
+ addExpectedClass(expected, "ui.jar");
+ addExpectedClass(expected, "crm.jar");
+ addExpectedClass(expected, "simple.war", "/WEB-INF/web-beans.xml");
+
+ for (URL url : wbDiscovery.discoverWebBeansXml())
+ {
+ boolean found = false;
+ Iterator<String> iter = expected.iterator();
+ while (iter.hasNext())
+ {
+ String expectedURL = iter.next();
+ if (url.toExternalForm().contains(expectedURL))
+ {
+ iter.remove();
+ found = true;
+ break;
+ }
+ }
+ assertTrue("Unexpected wb url: " + url, found);
+ }
+
+ assertEmpty("Should be emtpy, missing " + expected, expected);
+
+ addExpectedClass(expected, BusinessInterface.class);
+ addExpectedClass(expected, MySLSBean.class);
+ addExpectedClass(expected, ExternalWebBean.class);
+ addExpectedClass(expected, PlainJavaBean.class);
+ addExpectedClass(expected, UIWebBean.class);
+ addExpectedClass(expected, ServletWebBean.class);
+ addExpectedClass(expected, CrmWebBean.class);
+
+ for (Class<?> clazz : wbDiscovery.discoverWebBeanClasses())
+ assertTrue(expected.remove(clazz.getName()));
+
+ assertEmpty("Should be emtpy, missing " + expected, expected);
+ }
+ finally
+ {
+ undeploy(topUnit);
+ }
+ }
+
+ private static void addExpectedClass(Set<String> expected, String unit)
+ {
+ addExpectedClass(expected, unit, "/META-INF/web-beans.xml");
+ }
+
+ private static void addExpectedClass(Set<String> expected, String unit, String suffix)
+ {
+ expected.add(unit + suffix);
+ }
+
+ private static void addExpectedClass(Set<String> expected, Class<?> clazz)
+ {
+ expected.add(clazz.getName());
+ }
+}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/annotations/basic-scan/META-INF/jboss-scanning.xml (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/annotations/basic-scan/META-INF/jboss-scanning.xml)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/annotations/basic-scan/META-INF/jboss-scanning.xml (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/annotations/basic-scan/META-INF/jboss-scanning.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,5 @@
+<scanning xmlns="urn:jboss:scanning:1.0">
+ <path name="lib/util.jar">
+ <include name="org.jboss.test.deployers.vfs.annotations.support.util"/>
+ </path>
+</scanning>
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/annotations/basic-scan/jar/META-INF/MANIFEST.MF
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/annotations/basic-scan/jar/META-INF/MANIFEST.MF 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/annotations/basic-scan/jar/META-INF/MANIFEST.MF 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,3 +1,3 @@
Manifest-Version: 1.0
Created-By: hand
-Class-Path: lib/util.jar
+Class-Path: lib/util.jar, lib/ext.jar
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/annotations/basic-scan/jar/META-INF/jboss-scanning.xml (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/annotations/basic-scan/jar/META-INF/jboss-scanning.xml)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/annotations/basic-scan/jar/META-INF/jboss-scanning.xml (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/annotations/basic-scan/jar/META-INF/jboss-scanning.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,5 @@
+<scanning xmlns="urn:jboss:scanning:1.0">
+ <path name="simple.jar">
+ <include name="org.jboss.test.deployers.vfs.annotations.support.jar.impl"/>
+ </path>
+</scanning>
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/annotations/basic-scan/web/WEB-INF/jboss-scanning.xml (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/annotations/basic-scan/web/WEB-INF/jboss-scanning.xml)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/annotations/basic-scan/web/WEB-INF/jboss-scanning.xml (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/annotations/basic-scan/web/WEB-INF/jboss-scanning.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,6 @@
+<scanning xmlns="urn:jboss:scanning:1.0">
+ <path name="simple.war">
+ <exclude name="org.jboss.test.deployers.vfs.annotations.support.war"/>
+ <exclude name="org.jboss.test.deployers.vfs.annotations.support.warlib"/>
+ </path>
+</scanning>
Modified: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/bootstrap/bootstrap.xml
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/bootstrap/bootstrap.xml 2008-11-26 14:48:13 UTC (rev 81634)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/bootstrap/bootstrap.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -7,7 +7,7 @@
<incallback method="addInstanceClassFactory"/>
<uncallback method="removeInstanceClassFactory"/>
</bean>
-
+
<!-- The MainDeployer -->
<bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
<property name="structuralDeployers"><inject bean="StructuralDeployers"/></property>
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency)
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/alias (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/alias)
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/alias/META-INF (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/alias/META-INF)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/alias/META-INF/aliases.txt
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/alias/META-INF/aliases.txt 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/alias/META-INF/aliases.txt 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1 +0,0 @@
-my-simple-du-name
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/alias/META-INF/aliases.txt (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/alias/META-INF/aliases.txt)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/alias/META-INF/aliases.txt (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/alias/META-INF/aliases.txt 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1 @@
+my-simple-du-name
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/bean (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/bean)
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/bean/META-INF (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/bean/META-INF)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/bean/META-INF/jboss-dependency.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/bean/META-INF/jboss-dependency.xml 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/bean/META-INF/jboss-dependency.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,4 +0,0 @@
-<dependency xmlns="urn:jboss:dependency:1.0">
- <item whenRequired="Real" dependentState="Create">TM</item>
- <item>Barrier</item>
-</dependency>
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/bean/META-INF/jboss-dependency.xml (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/bean/META-INF/jboss-dependency.xml)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/bean/META-INF/jboss-dependency.xml (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/bean/META-INF/jboss-dependency.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,4 @@
+<dependency xmlns="urn:jboss:dependency:1.0">
+ <item whenRequired="Real" dependentState="Create">TM</item>
+ <item>Barrier</item>
+</dependency>
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/module (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/module)
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/module/META-INF (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/module/META-INF)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/module/META-INF/jboss-dependency.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/module/META-INF/jboss-dependency.xml 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/module/META-INF/jboss-dependency.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,3 +0,0 @@
-<dependency xmlns="urn:jboss:dependency:1.0">
- <item>my-simple-du-name</item>
-</dependency>
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/module/META-INF/jboss-dependency.xml (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/module/META-INF/jboss-dependency.xml)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/module/META-INF/jboss-dependency.xml (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/module/META-INF/jboss-dependency.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,3 @@
+<dependency xmlns="urn:jboss:dependency:1.0">
+ <item>my-simple-du-name</item>
+</dependency>
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/support (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/support)
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/support/META-INF (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/support/META-INF)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/support/META-INF/support-jboss-beans.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/support/META-INF/support-jboss-beans.xml 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/support/META-INF/support-jboss-beans.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="TM" class="org.jboss.test.deployers.vfs.dependency.support.MockTM"/>
- <bean name="Barrier" class="org.jboss.test.deployers.vfs.dependency.support.MockTM"/>
-</deployment>
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/support/META-INF/support-jboss-beans.xml (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/dependency/support/META-INF/support-jboss-beans.xml)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/support/META-INF/support-jboss-beans.xml (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/dependency/support/META-INF/support-jboss-beans.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="TM" class="org.jboss.test.deployers.vfs.dependency.support.MockTM"/>
+ <bean name="Barrier" class="org.jboss.test.deployers.vfs.dependency.support.MockTM"/>
+</deployment>
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/annotations/test/AnnotationsScanningWithMetaDataUnitTestCase.xml (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/annotations/test/AnnotationsScanningWithMetaDataUnitTestCase.xml)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/annotations/test/AnnotationsScanningWithMetaDataUnitTestCase.xml (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/annotations/test/AnnotationsScanningWithMetaDataUnitTestCase.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,14 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="EarStructure" class="org.jboss.test.deployers.vfs.structure.ear.support.MockEarStructureDeployer"/>
+ <bean name="WarStructure" class="org.jboss.deployers.vfs.plugins.structure.war.WARStructure"/>
+
+ <bean name="ScanningMDDeployer" class="org.jboss.deployers.vfs.plugins.annotations.ScanningMetaDataDeployer"/>
+
+ <bean name="AnnEnvDeployer" class="org.jboss.deployers.vfs.plugins.annotations.FilteredAnnotationEnvironmentDeployer">
+ <property name="filter">
+ <bean class="org.jboss.deployers.vfs.plugins.annotations.ScanningDeploymentUnitFilter"/>
+ </property>
+ </bean>
+
+</deployment>
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/dependency (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/dependency)
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/dependency/test (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/dependency/test)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.xml 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,13 +0,0 @@
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="DeploymentAliasesParserDeployer" class="org.jboss.deployers.vfs.plugins.dependency.AliasesParserDeployer"/>
- <bean name="DependenciesParserDeployer" class="org.jboss.deployers.vfs.plugins.dependency.DependenciesParserDeployer"/>
- <bean name="DependenciesMDDeployer" class="org.jboss.deployers.vfs.plugins.dependency.DependenciesMetaDataDeployer"/>
- <bean name="DeploymentAliasesDeployer" class="org.jboss.deployers.vfs.plugins.dependency.DeploymentAliasesDeployer">
- <constructor>
- <parameter><inject bean="jboss.kernel:service=KernelController"/></parameter>
- </constructor>
- </bean>
- <bean name="DeploymentDependenciesDeployer" class="org.jboss.deployers.vfs.plugins.dependency.DeploymentDependencyDeployer"/>
-
-</deployment>
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.xml (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.xml)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.xml (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/dependency/test/DependenciesTestCase.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,13 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="DeploymentAliasesParserDeployer" class="org.jboss.deployers.vfs.plugins.dependency.AliasesParserDeployer"/>
+ <bean name="DependenciesParserDeployer" class="org.jboss.deployers.vfs.plugins.dependency.DependenciesParserDeployer"/>
+ <bean name="DependenciesMDDeployer" class="org.jboss.deployers.vfs.plugins.dependency.DependenciesMetaDataDeployer"/>
+ <bean name="DeploymentAliasesDeployer" class="org.jboss.deployers.vfs.plugins.dependency.DeploymentAliasesDeployer">
+ <constructor>
+ <parameter><inject bean="jboss.kernel:service=KernelController"/></parameter>
+ </constructor>
+ </bean>
+ <bean name="DeploymentDependenciesDeployer" class="org.jboss.deployers.vfs.plugins.dependency.DeploymentDependencyDeployer"/>
+
+</deployment>
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/webbeans (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/webbeans)
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/webbeans/test (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/webbeans/test)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.xml 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,9 +0,0 @@
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="EarStructure" class="org.jboss.test.deployers.vfs.structure.ear.support.MockEarStructureDeployer"/>
- <bean name="WarStructure" class="org.jboss.test.deployers.vfs.structure.war.support.MockWarStructureDeployer"/>
-
- <bean name="JWBMDDeployer" class="org.jboss.test.deployers.vfs.webbeans.support.JBossWebBeansMetaDataDeployer"/>
- <bean name="WBDiscoveryDeployer" class="org.jboss.test.deployers.vfs.webbeans.support.WebBeanDiscoveryDeployer"/>
-
-</deployment>
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.xml (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.xml)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.xml (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/org/jboss/test/deployers/vfs/webbeans/test/WebBeanDiscoveryTestCase.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,9 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="EarStructure" class="org.jboss.test.deployers.vfs.structure.ear.support.MockEarStructureDeployer"/>
+ <bean name="WarStructure" class="org.jboss.test.deployers.vfs.structure.war.support.MockWarStructureDeployer"/>
+
+ <bean name="JWBMDDeployer" class="org.jboss.test.deployers.vfs.webbeans.support.JBossWebBeansMetaDataDeployer"/>
+ <bean name="WBDiscoveryDeployer" class="org.jboss.test.deployers.vfs.webbeans.support.WebBeanDiscoveryDeployer"/>
+
+</deployment>
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/scanning (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/scanning)
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/scanning/smoke (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/scanning/smoke)
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/scanning/smoke/META-INF (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/scanning/smoke/META-INF)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/scanning/smoke/META-INF/jboss-scanning.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/scanning/smoke/META-INF/jboss-scanning.xml 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/scanning/smoke/META-INF/jboss-scanning.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,9 +0,0 @@
-<scanning xmlns="urn:jboss:scanning:1.0">
- <path name="myejbs.jar">
- <include name="com.acme.foo"/>
- <exclude name="com.acme.foo.bar"/>
- </path>
- <path name="my.war/WEB-INF/classes">
- <include name="com.acme.foo"/>
- </path>
-</scanning>
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/scanning/smoke/META-INF/jboss-scanning.xml (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/scanning/smoke/META-INF/jboss-scanning.xml)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/scanning/smoke/META-INF/jboss-scanning.xml (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/scanning/smoke/META-INF/jboss-scanning.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,9 @@
+<scanning xmlns="urn:jboss:scanning:1.0">
+ <path name="myejbs.jar">
+ <include name="com.acme.foo"/>
+ <exclude name="com.acme.foo.bar"/>
+ </path>
+ <path name="my.war/WEB-INF/classes">
+ <include name="com.acme.foo"/>
+ </path>
+</scanning>
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans)
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple)
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/META-INF (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/META-INF)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/META-INF/application.properties
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/META-INF/application.properties 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/META-INF/application.properties 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,4 +0,0 @@
-jar-module=simple.jar
-ejb-module=ejbs.jar
-web-module=simple.war
-crm-module=crm.war
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/META-INF/application.properties (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/META-INF/application.properties)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/META-INF/application.properties (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/META-INF/application.properties 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,4 @@
+jar-module=simple.jar
+ejb-module=ejbs.jar
+web-module=simple.war
+crm-module=crm.war
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/crm (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/crm)
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/MANIFEST.MF
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/MANIFEST.MF 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/MANIFEST.MF 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Created-By: hand
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/MANIFEST.MF (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/MANIFEST.MF)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/MANIFEST.MF (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/MANIFEST.MF 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Created-By: hand
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/web-beans.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/web-beans.xml 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/web-beans.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,2 +0,0 @@
-<web-beans>
-</web-beans>
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/web-beans.xml (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/web-beans.xml)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/web-beans.xml (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/crm/META-INF/web-beans.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,2 @@
+<web-beans>
+</web-beans>
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/ejb)
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/MANIFEST.MF
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/MANIFEST.MF 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/MANIFEST.MF 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Created-By: hand
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/MANIFEST.MF (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/MANIFEST.MF)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/MANIFEST.MF (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/MANIFEST.MF 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Created-By: hand
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/ejb-jar.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/ejb-jar.xml 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/ejb-jar.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,2 +0,0 @@
-<ejb-jar>
-</ejb-jar>
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/ejb-jar.xml (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/ejb-jar.xml)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/ejb-jar.xml (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/ejb-jar.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,2 @@
+<ejb-jar>
+</ejb-jar>
\ No newline at end of file
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/web-beans.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/web-beans.xml 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/web-beans.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,2 +0,0 @@
-<web-beans>
-</web-beans>
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/web-beans.xml (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/web-beans.xml)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/web-beans.xml (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ejb/META-INF/web-beans.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,2 @@
+<web-beans>
+</web-beans>
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ext (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/ext)
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ext/META-INF (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/ext/META-INF)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ext/META-INF/MANIFEST.MF
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/ext/META-INF/MANIFEST.MF 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ext/META-INF/MANIFEST.MF 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Created-By: hand
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ext/META-INF/MANIFEST.MF (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/ext/META-INF/MANIFEST.MF)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ext/META-INF/MANIFEST.MF (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ext/META-INF/MANIFEST.MF 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Created-By: hand
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ext/META-INF/web-beans.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/ext/META-INF/web-beans.xml 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ext/META-INF/web-beans.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,2 +0,0 @@
-<web-beans>
-</web-beans>
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ext/META-INF/web-beans.xml (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/ext/META-INF/web-beans.xml)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ext/META-INF/web-beans.xml (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ext/META-INF/web-beans.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,2 @@
+<web-beans>
+</web-beans>
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/jar (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/jar)
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/jar/META-INF (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/jar/META-INF)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/jar/META-INF/MANIFEST.MF
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/jar/META-INF/MANIFEST.MF 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/jar/META-INF/MANIFEST.MF 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Created-By: hand
-Class-Path: lib/util.jar, lib/ext.jar
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/jar/META-INF/MANIFEST.MF (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/jar/META-INF/MANIFEST.MF)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/jar/META-INF/MANIFEST.MF (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/jar/META-INF/MANIFEST.MF 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Created-By: hand
+Class-Path: lib/util.jar, lib/ext.jar
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/jar/META-INF/web-beans.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/jar/META-INF/web-beans.xml 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/jar/META-INF/web-beans.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,2 +0,0 @@
-<web-beans>
-</web-beans>
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/jar/META-INF/web-beans.xml (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/jar/META-INF/web-beans.xml)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/jar/META-INF/web-beans.xml (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/jar/META-INF/web-beans.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,2 @@
+<web-beans>
+</web-beans>
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ui (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/ui)
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ui/META-INF (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/ui/META-INF)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ui/META-INF/MANIFEST.MF
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/ui/META-INF/MANIFEST.MF 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ui/META-INF/MANIFEST.MF 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Created-By: hand
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ui/META-INF/MANIFEST.MF (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/ui/META-INF/MANIFEST.MF)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ui/META-INF/MANIFEST.MF (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ui/META-INF/MANIFEST.MF 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Created-By: hand
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ui/META-INF/web-beans.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/ui/META-INF/web-beans.xml 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ui/META-INF/web-beans.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,2 +0,0 @@
-<web-beans>
-</web-beans>
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ui/META-INF/web-beans.xml (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/ui/META-INF/web-beans.xml)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ui/META-INF/web-beans.xml (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/ui/META-INF/web-beans.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,2 @@
+<web-beans>
+</web-beans>
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/web (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/web)
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/web/WEB-INF (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/web/WEB-INF)
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/web/WEB-INF/web-beans.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/web/WEB-INF/web-beans.xml 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/web/WEB-INF/web-beans.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,2 +0,0 @@
-<web-beans>
-</web-beans>
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/web/WEB-INF/web-beans.xml (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/web/WEB-INF/web-beans.xml)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/web/WEB-INF/web-beans.xml (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/web/WEB-INF/web-beans.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,2 @@
+<web-beans>
+</web-beans>
\ No newline at end of file
Deleted: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/web/WEB-INF/web.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/web/WEB-INF/web.xml 2008-11-26 14:33:17 UTC (rev 81633)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/web/WEB-INF/web.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -1,2 +0,0 @@
-<web>
-</web>
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/web/WEB-INF/web.xml (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/webbeans/simple/web/WEB-INF/web.xml)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/web/WEB-INF/web.xml (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs/src/test/resources/webbeans/simple/web/WEB-INF/web.xml 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,2 @@
+<web>
+</web>
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/VFSDeploymentUnitFilter.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/VFSDeploymentUnitFilter.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/VFSDeploymentUnitFilter.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/VFSDeploymentUnitFilter.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, 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.deployers.vfs.spi.structure;
+
+/**
+ * VFSDeploymentUnitFilter.<p>
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public interface VFSDeploymentUnitFilter
+{
+ /**
+ * Match the deployment unit
+ *
+ * @param unit the vfs deployment unit
+ * @return true when it matches
+ */
+ boolean accepts(VFSDeploymentUnit unit);
+}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/Base2VFSBridgeDeploymentUnitFilter.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/Base2VFSBridgeDeploymentUnitFilter.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/Base2VFSBridgeDeploymentUnitFilter.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/Base2VFSBridgeDeploymentUnitFilter.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,43 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.deployers.vfs.spi.structure.helpers;
+
+import org.jboss.deployers.structure.spi.DeploymentUnitFilter;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnitFilter;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+
+/**
+ * Bridge deployment unit filter.
+ *
+ * It implements both, plain deployment unit and vfs deployment unit filters.
+ * It delegates work to vfs du filter if du is vfs instance.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public abstract class Base2VFSBridgeDeploymentUnitFilter implements DeploymentUnitFilter, VFSDeploymentUnitFilter
+{
+ public boolean accepts(DeploymentUnit unit)
+ {
+ return (unit instanceof VFSDeploymentUnit) && accepts((VFSDeploymentUnit)unit);
+ }
+}
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/VFS2BaseBridgeDeploymentUnitFilter.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/VFS2BaseBridgeDeploymentUnitFilter.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/VFS2BaseBridgeDeploymentUnitFilter.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/VFS2BaseBridgeDeploymentUnitFilter.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,56 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.deployers.vfs.spi.structure.helpers;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnitFilter;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnitFilter;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+
+/**
+ * Bridge deployment unit filter.
+ *
+ * It implements both, plain deployment unit and vfs deployment unit filters.
+ * It delegates work to base du accepts method for both accepts.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public abstract class VFS2BaseBridgeDeploymentUnitFilter implements DeploymentUnitFilter, VFSDeploymentUnitFilter
+{
+ /**
+ * Do we accept this unit.
+ *
+ * @param unit the deployment unit
+ * @return true if accepted, false otherwise
+ */
+ protected abstract boolean doAccepts(DeploymentUnit unit);
+
+ public boolean accepts(VFSDeploymentUnit unit)
+ {
+ return doAccepts(unit);
+ }
+
+ public boolean accepts(DeploymentUnit unit)
+ {
+ return doAccepts(unit);
+ }
+}
\ No newline at end of file
Copied: projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/VirtualFileDeploymentUnitFilter.java (from rev 81633, projects/jboss-deployers/trunk/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/VirtualFileDeploymentUnitFilter.java)
===================================================================
--- projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/VirtualFileDeploymentUnitFilter.java (rev 0)
+++ projects/jboss-deployers/branches/Branch_2_0/deployers-vfs-spi/src/main/java/org/jboss/deployers/vfs/spi/structure/helpers/VirtualFileDeploymentUnitFilter.java 2008-11-26 14:55:27 UTC (rev 81635)
@@ -0,0 +1,51 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss 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.deployers.vfs.spi.structure.helpers;
+
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.virtual.VirtualFile;
+import org.jboss.virtual.VirtualFileFilter;
+
+/**
+ * VirtualFileDeploymentUnitFilter.
+ *
+ * It delegates the filtering to VirtualFileFilter.
+ *
+ * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ */
+public class VirtualFileDeploymentUnitFilter extends Base2VFSBridgeDeploymentUnitFilter
+{
+ private VirtualFileFilter filter;
+
+ public VirtualFileDeploymentUnitFilter(VirtualFileFilter filter)
+ {
+ if (filter == null)
+ throw new IllegalArgumentException("Null filter");
+ this.filter = filter;
+ }
+
+ public boolean accepts(VFSDeploymentUnit unit)
+ {
+ VirtualFile root = unit.getRoot();
+ return filter.accepts(root);
+ }
+}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list