[jboss-cvs] JBossAS SVN: r105771 - in projects/weld-int/branches/kabir_mc_weld: assembly/src/main/assembly/resources/META-INF and 11 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jun 7 12:44:22 EDT 2010
Author: kabir.khan at jboss.com
Date: 2010-06-07 12:44:20 -0400 (Mon, 07 Jun 2010)
New Revision: 105771
Added:
projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaCompJndiBinder.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinder.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinderDeployer.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEModuleJndiBinder.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/SimpleCompJndiBinder.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/WebJndiBinderDeployer.java
Modified:
projects/weld-int/branches/kabir_mc_weld/
projects/weld-int/branches/kabir_mc_weld/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml
projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/AbstractWeldTest.java
projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationNoBootstrapBeanTestCase.java
projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationTestCase.java
projects/weld-int/branches/kabir_mc_weld/deployer/pom.xml
projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/env/DynamicDependencyCreator.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldDiscoveryDeployer.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldDiscoveryEnvironment.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/ext/JBossWeldMetaData.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/ext/JBossWeldMetaDataDeployer.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostFacesConfigDeployer.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostJBossAppMetadataDeployer.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostWebMetadataDeployer.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldAwareMetadataDeployer.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldClassloadingDeployer.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldEjbInterceptorMetadataDeployer.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldFilesDeployer.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/util/VFSManifestFinder.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockEjbJarDeployer.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossAppDeployer.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossDeployer.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossWebDeployer.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockWebDeployer.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/AbstractDeploymentTest.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/AbstractWeldTest.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/CLIsolationTestCase.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/PostDeployersTestCase.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/SmokeTestCase.java
projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/WeldDiscoveryEnvTestCase.java
projects/weld-int/branches/kabir_mc_weld/ejb/src/main/java/org/jboss/weld/integration/ejb/SessionBeanInterceptor.java
projects/weld-int/branches/kabir_mc_weld/ejb/src/main/java/org/jboss/weld/integration/ejb/interceptor/Jsr299BindingsInterceptor.java
projects/weld-int/branches/kabir_mc_weld/pom.xml
Log:
Merge from trunk
Property changes on: projects/weld-int/branches/kabir_mc_weld
___________________________________________________________________
Name: svnmerge-integrated
- /projects/weld-int/trunk:1-102077
+ /projects/weld-int/trunk:1-105770
Modified: projects/weld-int/branches/kabir_mc_weld/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml 2010-06-07 16:44:20 UTC (rev 105771)
@@ -53,17 +53,29 @@
<bean name="PostWebMetadataDeployer" class="org.jboss.weld.integration.deployer.metadata.PostWebMetadataDeployer"/>
<!-- Responsible for adding the Weld Manager object factory to JNDI -->
- <bean name="WeldJndiBinder" class="org.jboss.weld.integration.deployer.env.WeldJndiBinder">
- <start method="startService">
- <parameter>java:app/BeanManager</parameter>
- <parameter>org.jboss.weld.resources.ManagerObjectFactory</parameter>
- </start>
- <stop method="stopService"/>
- </bean>
+ <!--<bean name="WeldJndiBinder" class="org.jboss.weld.integration.deployer.env.WeldJndiBinder">-->
+ <!--<start method="startService">-->
+ <!--<parameter>java:app/BeanManager</parameter>-->
+ <!--<parameter>org.jboss.weld.resources.ManagerObjectFactory</parameter>-->
+ <!--</start>-->
+ <!--<stop method="stopService"/>-->
+ <!--</bean>-->
<!-- Responsible for binding bean managers -->
- <!--<bean name="JndiBinderDeployer" class="org.jboss.weld.integration.deployer.jndi.JndiBinderDeployer"/>-->
+ <!--<bean name="JndiBinderDeployer" class="org.jboss.weld.integration.deployer.jndi.JndiBinderDeployer">-->
+ <!--<depends>NameSpaces</depends>-->
+ <!--</bean>-->
+ <bean name="JavaEEComponentJndiBinderDeployer" class="org.jboss.weld.integration.deployer.jndi.JavaEEComponentJndiBinderDeployer">
+ <constructor><parameter><inject bean="NamingJavaEEComponentInformer"/></parameter></constructor>
+ <depends>NameSpaces</depends>
+ </bean>
+
+ <bean name="WebJndiBinderDeployer" class="org.jboss.weld.integration.deployer.jndi.WebJndiBinderDeployer">
+ <constructor><parameter><inject bean="NamingJavaEEModuleInformer"/></parameter></constructor>
+ <depends>NameSpaces</depends>
+ </bean>
+
<!-- Adds plugin to BeanMetaDataDeployer that installs WeldKernelControllerContexts -->
<!-- bean name="WeldBeanMetaDataDeployerPlugin" class="org.jboss.weld.integration.deployer.mc.WeldBeanMetaDataDeployerPlugin"/ -->
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/pom.xml
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/pom.xml 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/pom.xml 2010-06-07 16:44:20 UTC (rev 105771)
@@ -37,6 +37,7 @@
<goals>
<goal>test-jar</goal>
</goals>
+ <phase>test</phase>
</execution>
</executions>
</plugin>
@@ -170,6 +171,27 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ <optional>true</optional>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<!-- Test dependencies -->
<dependency>
@@ -200,6 +222,12 @@
</dependency>
<dependency>
+ <groupId>org.jboss.reloaded</groupId>
+ <artifactId>jboss-reloaded-naming-deployers</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.test</groupId>
<artifactId>jboss-test</artifactId>
<scope>test</scope>
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/env/DynamicDependencyCreator.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/env/DynamicDependencyCreator.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/env/DynamicDependencyCreator.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -70,7 +70,7 @@
if (whenRequiredState == null)
whenRequired = ControllerState.INSTALLED;
else
- whenRequired = new ControllerState(whenRequiredState);
+ whenRequired = ControllerState.getInstance(whenRequiredState);
ControllerState currentTargetState = targetControllerContext.getState();
if (controller.getStates().isBeforeState(currentTargetState, whenRequired) == false)
@@ -78,7 +78,7 @@
ControllerState dependent = null;
if (dependentState != null)
- dependent = new ControllerState(dependentState);
+ dependent = ControllerState.getInstance(dependentState);
DependencyInfo di = targetControllerContext.getDependencyInfo();
for (Object dependency : dependencies)
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldDiscoveryDeployer.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldDiscoveryDeployer.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldDiscoveryDeployer.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -33,7 +33,7 @@
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.vfs.spi.deployer.AbstractOptionalVFSRealDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.DeployersUtils;
import org.jboss.weld.integration.deployer.ext.JBossWeldMetaData;
@@ -115,7 +115,7 @@
}
}
- private class WBDiscoveryVisitor implements ResourceVisitor
+ private static class WBDiscoveryVisitor implements ResourceVisitor
{
private WeldDiscoveryEnvironment wbdi;
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldDiscoveryEnvironment.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldDiscoveryEnvironment.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldDiscoveryEnvironment.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -23,6 +23,7 @@
import java.net.URL;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -41,7 +42,7 @@
*
* @param clazz the weld class
*/
- void addWeldClass(Class<?> clazz)
+ public void addWeldClass(Class<?> clazz)
{
classes.add(clazz);
}
@@ -51,7 +52,7 @@
*
* @param url the weld xml url
*/
- void addWeldXmlURL(URL url)
+ public void addWeldXmlURL(URL url)
{
urls.add(url);
}
@@ -63,7 +64,7 @@
*/
public Collection<Class<?>> getWeldClasses()
{
- return classes;
+ return Collections.unmodifiableCollection(classes);
}
/**
@@ -73,6 +74,6 @@
*/
public Collection<URL> getWeldXml()
{
- return urls;
+ return Collections.unmodifiableCollection(urls);
}
}
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/ext/JBossWeldMetaData.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/ext/JBossWeldMetaData.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/ext/JBossWeldMetaData.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -24,7 +24,7 @@
import java.io.Serializable;
import java.net.URL;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* JBoss Weld custom meta data
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/ext/JBossWeldMetaDataDeployer.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/ext/JBossWeldMetaDataDeployer.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/ext/JBossWeldMetaDataDeployer.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -23,7 +23,7 @@
import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* JBoss WBD deployer.
Copied: projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaCompJndiBinder.java (from rev 104621, projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaCompJndiBinder.java)
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaCompJndiBinder.java (rev 0)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaCompJndiBinder.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.weld.integration.deployer.jndi;
+
+import javax.enterprise.inject.spi.BeanManager;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.Reference;
+
+import org.jboss.logging.Logger;
+
+/**
+ * @author Marius Bogoevici
+ */
+public abstract class JavaCompJndiBinder
+{
+ protected Logger log = Logger.getLogger(getClass());
+ private String deploymentUnitName;
+
+ public JavaCompJndiBinder(String deploymentUnitName)
+ {
+ this.deploymentUnitName = deploymentUnitName;
+ }
+
+ public void bindToJavaComp()
+ {
+ try
+ {
+ getJavaCompContext().bind("BeanManager",new Reference(BeanManager.class.getName(), "org.jboss.weld.resources.ManagerObjectFactory", null));
+ }
+ catch (NamingException e)
+ {
+ log.error("Could not bound BeanManager on " + getJavaContextDescription());
+ }
+ }
+
+ protected abstract Context getJavaCompContext() throws NamingException;
+
+ protected abstract String getJavaContextDescription();
+
+ public void unbind()
+ {
+ try
+ {
+ getJavaCompContext().unbind("BeanManager");
+ }
+ catch (NamingException e)
+ {
+ log.error("Cound not unbind java:comp/BeanManager for " + deploymentUnitName);
+ }
+ }
+}
Copied: projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinder.java (from rev 104621, projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinder.java)
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinder.java (rev 0)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinder.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.weld.integration.deployer.jndi;
+
+import javax.enterprise.inject.spi.BeanManager;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.naming.Reference;
+
+import org.jboss.logging.Logger;
+import org.jboss.reloaded.naming.spi.JavaEEComponent;
+import org.jboss.weld.integration.deployer.env.helpers.BootstrapBean;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class JavaEEComponentJndiBinder extends JavaCompJndiBinder
+{
+
+ private JavaEEComponent javaEEComponent;
+
+ public JavaEEComponentJndiBinder(JavaEEComponent javaEEComponent, String deploymentUnitName)
+ {
+ super(deploymentUnitName);
+ this.javaEEComponent = javaEEComponent;
+ }
+
+ @Override
+ protected Context getJavaCompContext()
+ {
+ return javaEEComponent.getContext();
+ }
+
+ @Override
+ protected String getJavaContextDescription()
+ {
+ return javaEEComponent.getName();
+ }
+}
\ No newline at end of file
Copied: projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinderDeployer.java (from rev 104621, projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinderDeployer.java)
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinderDeployer.java (rev 0)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEComponentJndiBinderDeployer.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -0,0 +1,94 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.weld.integration.deployer.jndi;
+
+import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.reloaded.naming.deployers.javaee.JavaEEComponentInformer;
+import org.jboss.reloaded.naming.spi.JavaEEComponent;
+import org.jboss.weld.integration.deployer.DeployersUtils;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class JavaEEComponentJndiBinderDeployer extends AbstractSimpleRealDeployer<JBossEnterpriseBeanMetaData>
+{
+
+ private JavaEEComponentInformer informer;
+
+ public JavaEEComponentJndiBinderDeployer(JavaEEComponentInformer javaEEComponentInformer)
+ {
+ super(JBossEnterpriseBeanMetaData.class);
+ informer = javaEEComponentInformer;
+ setComponentsOnly(true);
+ setOutput(BeanMetaData.class);
+ }
+
+ @Override
+ public void deploy(DeploymentUnit deploymentUnit, JBossEnterpriseBeanMetaData jBossEnterpriseBeanMetaData) throws DeploymentException
+ {
+ BeanMetaData bbBMD = getBootstrapBeanAttachment(deploymentUnit.getTopLevel());
+ if (bbBMD == null)
+ {
+ return;
+ }
+
+ if (informer.getModuleType(deploymentUnit).equals(org.jboss.reloaded.naming.deployers.javaee.JavaEEModuleInformer.ModuleType.EJB)
+ && !deploymentUnit.getParent().isAttachmentPresent(JBossWebMetaData.class))
+ {
+ BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(deploymentUnit.getName() + "_CompJndiBinder", JavaEEComponentJndiBinder.class.getName());
+ AbstractInjectionValueMetaData javaComponent = new AbstractInjectionValueMetaData(getComponentBeanName(deploymentUnit));
+ builder.addConstructorParameter(JavaEEComponent.class.getName(), javaComponent);
+ builder.addConstructorParameter(String.class.getName(), deploymentUnit.getName());
+ builder.addInstall("bindToJavaComp");
+ deploymentUnit.getParent().addAttachment(deploymentUnit.getName() + "_JavaCompBinder", builder.getBeanMetaData());
+ }
+ }
+
+ private BeanMetaData getBootstrapBeanAttachment(DeploymentUnit deploymentUnit)
+ {
+ String bootstrapName = DeployersUtils.getBootstrapBeanName(deploymentUnit.getTopLevel());
+ String bbAttachmentName = bootstrapName + "_" + BeanMetaData.class.getSimpleName();
+
+ BeanMetaData bbBMD = deploymentUnit.getTopLevel().getAttachment(bbAttachmentName, BeanMetaData.class);
+ return bbBMD;
+ }
+
+ private String getComponentBeanName(DeploymentUnit deploymentUnit)
+ {
+ String appName = informer.getApplicationName(deploymentUnit);
+ String moduleName = informer.getModulePath(deploymentUnit);
+ String componentName = informer.getComponentName(deploymentUnit);
+ String name = "jboss.naming:";
+ if(appName != null)
+ name += "application=" + appName + ",";
+ name += "module=" + moduleName + ",component=" + componentName;
+ return name;
+ }
+
+}
Copied: projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEModuleJndiBinder.java (from rev 104621, projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEModuleJndiBinder.java)
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEModuleJndiBinder.java (rev 0)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/JavaEEModuleJndiBinder.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.weld.integration.deployer.jndi;
+
+import javax.naming.Context;
+
+import org.jboss.reloaded.naming.spi.JavaEEComponent;
+import org.jboss.reloaded.naming.spi.JavaEEModule;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class JavaEEModuleJndiBinder extends JavaCompJndiBinder
+{
+
+ private JavaEEModule javaEEModule;
+
+ public JavaEEModuleJndiBinder(JavaEEModule javaEEModule, String deploymentUnitName)
+ {
+ super(deploymentUnitName);
+ this.javaEEModule = javaEEModule;
+ }
+
+ @Override
+ protected Context getJavaCompContext()
+ {
+ return javaEEModule.getContext();
+ }
+
+ @Override
+ protected String getJavaContextDescription()
+ {
+ return javaEEModule.getName();
+ }
+}
\ No newline at end of file
Copied: projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/SimpleCompJndiBinder.java (from rev 104621, projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/SimpleCompJndiBinder.java)
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/SimpleCompJndiBinder.java (rev 0)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/SimpleCompJndiBinder.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.weld.integration.deployer.jndi;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class SimpleCompJndiBinder extends JavaCompJndiBinder
+{
+ private DeploymentUnit deploymentUnit;
+
+ public SimpleCompJndiBinder(DeploymentUnit deploymentUnit)
+ {
+ super(deploymentUnit.getName());
+ this.deploymentUnit = deploymentUnit;
+ }
+
+ @Override
+ protected Context getJavaCompContext() throws NamingException
+ {
+ ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
+ try
+ {
+ Thread.currentThread().setContextClassLoader(deploymentUnit.getClassLoader());
+ return ((Context) new InitialContext().lookup("java:comp"));
+ }
+ finally
+ {
+ Thread.currentThread().setContextClassLoader(originalClassLoader);
+ this.deploymentUnit = null;
+ }
+ }
+
+
+ @Override
+ protected String getJavaContextDescription()
+ {
+ return "JNDI java:comp";
+ }
+}
Copied: projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/WebJndiBinderDeployer.java (from rev 104621, projects/weld-int/trunk/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/WebJndiBinderDeployer.java)
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/WebJndiBinderDeployer.java (rev 0)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/jndi/WebJndiBinderDeployer.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -0,0 +1,96 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.weld.integration.deployer.jndi;
+
+import org.jboss.beans.metadata.plugins.AbstractInjectionValueMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.reloaded.naming.deployers.javaee.JavaEEModuleInformer;
+import org.jboss.reloaded.naming.spi.JavaEEModule;
+import org.jboss.weld.integration.deployer.DeployersUtils;
+
+/**
+ * @author Marius Bogoevici
+ */
+public class WebJndiBinderDeployer extends AbstractSimpleRealDeployer<JBossWebMetaData>
+{
+
+ private JavaEEModuleInformer informer;
+
+ public WebJndiBinderDeployer(JavaEEModuleInformer javaEEModuleInformer)
+ {
+ super(JBossWebMetaData.class);
+ informer = javaEEModuleInformer;
+ setOutput(BeanMetaData.class);
+ }
+
+ @Override
+ public void deploy(DeploymentUnit deploymentUnit, JBossWebMetaData jBossWebMetaData) throws DeploymentException
+ {
+ BeanMetaData bbBMD = getBootstrapBeanAttachment(deploymentUnit.getTopLevel());
+ if (bbBMD != null && deploymentUnit.isAttachmentPresent(JBossWebMetaData.class))
+ {
+ BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(deploymentUnit.getName() + "_WebCompJndiBinder", SimpleCompJndiBinder.class.getName());
+ builder.addConstructorParameter(DeploymentUnit.class.getName(), deploymentUnit);
+ builder.addInstall("bindToJavaComp");
+ // no uninstall method for SimpleCompJndiBinder (context will be destroyed by Tomcat)
+ //builder.addUninstall("unbind");
+ deploymentUnit.getTopLevel().addAttachment(deploymentUnit.getName() + "_WebCompJndiBinder", builder.getBeanMetaData());
+
+ BeanMetaDataBuilder moduleBinderBuilder = BeanMetaDataBuilder.createBuilder(deploymentUnit.getName() + "_JavaModuleJndiBinder", JavaEEModuleJndiBinder.class.getName());
+ AbstractInjectionValueMetaData javaModule = new AbstractInjectionValueMetaData(getModuleBeanName(deploymentUnit));
+ moduleBinderBuilder.addConstructorParameter(JavaEEModule.class.getName(), javaModule);
+ moduleBinderBuilder.addConstructorParameter(String.class.getName(), deploymentUnit.getName());
+ moduleBinderBuilder.addInstall("bindToJavaComp");
+ moduleBinderBuilder.addUninstall("unbind");
+ deploymentUnit.getTopLevel().addAttachment(deploymentUnit.getName() + "_JavaModuleJndiBinder", moduleBinderBuilder.getBeanMetaData());
+ }
+ }
+
+ private BeanMetaData getBootstrapBeanAttachment(DeploymentUnit deploymentUnit)
+ {
+ String bootstrapName = DeployersUtils.getBootstrapBeanName(deploymentUnit.getTopLevel());
+ String bbAttachmentName = bootstrapName + "_" + BeanMetaData.class.getSimpleName();
+
+ BeanMetaData bbBMD = deploymentUnit.getTopLevel().getAttachment(bbAttachmentName, BeanMetaData.class);
+ return bbBMD;
+ }
+
+ private String getModuleBeanName(DeploymentUnit deploymentUnit)
+ {
+ String appName = informer.getApplicationName(deploymentUnit);
+ String moduleName = informer.getModulePath(deploymentUnit);
+ String name = "jboss.naming:";
+ if (appName != null)
+ {
+ name += "application=" + appName + ",";
+ }
+ name += "module=" + moduleName;
+ return name;
+ }
+
+
+}
\ No newline at end of file
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostFacesConfigDeployer.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostFacesConfigDeployer.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostFacesConfigDeployer.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -26,7 +26,7 @@
import org.jboss.deployers.vfs.spi.deployer.AbstractSimpleVFSRealDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Post faces-config.xml deployer.
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostJBossAppMetadataDeployer.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostJBossAppMetadataDeployer.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostJBossAppMetadataDeployer.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -24,7 +24,7 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.ear.jboss.JBossAppMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.DeployersUtils;
/**
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostWebMetadataDeployer.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostWebMetadataDeployer.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/PostWebMetadataDeployer.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -33,7 +33,7 @@
import org.jboss.metadata.web.spec.FilterMetaData;
import org.jboss.metadata.web.spec.FiltersMetaData;
import org.jboss.metadata.web.spec.ListenerMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.DeployersUtils;
/**
@@ -78,8 +78,8 @@
listeners = new ArrayList<ListenerMetaData>();
deployment.setListeners(listeners);
}
- listeners.add(WBL);
- listeners.add(JIL);
+ listeners.add(0, WBL);
+ listeners.add(1, JIL);
FiltersMetaData filters = deployment.getFilters();
if (filters == null)
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldAwareMetadataDeployer.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldAwareMetadataDeployer.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldAwareMetadataDeployer.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -25,7 +25,7 @@
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.vfs.spi.deployer.AbstractSimpleVFSRealDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Weld aware metadata deployer.
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldClassloadingDeployer.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldClassloadingDeployer.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldClassloadingDeployer.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -27,7 +27,7 @@
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Handle classloading metadata creation.
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldEjbInterceptorMetadataDeployer.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldEjbInterceptorMetadataDeployer.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldEjbInterceptorMetadataDeployer.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -37,7 +37,7 @@
import org.jboss.metadata.ejb.spec.InterceptorClassesMetaData;
import org.jboss.metadata.ejb.spec.InterceptorMetaData;
import org.jboss.metadata.ejb.spec.InterceptorsMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.DeployersUtils;
/**
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldFilesDeployer.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldFilesDeployer.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/deployer/metadata/WeldFilesDeployer.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -30,7 +30,7 @@
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.vfs.spi.deployer.AbstractOptionalVFSRealDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.DeployersUtils;
import org.jboss.weld.integration.deployer.ext.JBossWeldMetaData;
@@ -66,7 +66,7 @@
for (VirtualFile cp : classpaths)
{
VirtualFile wbXml = cp.getChild("META-INF/beans.xml");
- if (wbXml != null)
+ if (wbXml.exists())
{
// add url
wbFiles.add(wbXml);
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/util/VFSManifestFinder.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/util/VFSManifestFinder.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/main/java/org/jboss/weld/integration/util/VFSManifestFinder.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -24,9 +24,9 @@
import java.net.URL;
import java.util.jar.Manifest;
-import org.jboss.virtual.VFS;
-import org.jboss.virtual.VirtualFile;
-import org.jboss.virtual.VFSUtils;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.VFSUtils;
/**
* Find manifest info from class - JBoss VFS.
@@ -42,7 +42,7 @@
protected Manifest findManifest(URL url) throws Exception
{
- VirtualFile root = VFS.getRoot(url);
+ VirtualFile root = VFS.getChild(url);
return VFSUtils.getManifest(root);
}
}
\ No newline at end of file
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockEjbJarDeployer.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockEjbJarDeployer.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockEjbJarDeployer.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -25,7 +25,7 @@
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.ejb.spec.EjbJar30MetaData;
import org.jboss.metadata.ejb.spec.EjbJarMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Mock ejb-jar.xml parser.
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossAppDeployer.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossAppDeployer.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossAppDeployer.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -25,7 +25,7 @@
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.ear.jboss.JBoss50AppMetaData;
import org.jboss.metadata.ear.jboss.JBossAppMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Mock application.properties parser.
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossDeployer.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossDeployer.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossDeployer.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -24,7 +24,7 @@
import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Mock jboss.xml parser.
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossWebDeployer.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossWebDeployer.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockJBossWebDeployer.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -24,7 +24,7 @@
import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Mock jboss-web.xml parser.
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockWebDeployer.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockWebDeployer.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/support/deployer/MockWebDeployer.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -24,7 +24,7 @@
import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* Mock web.xml parser.
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/AbstractDeploymentTest.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/AbstractDeploymentTest.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/AbstractDeploymentTest.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -38,7 +38,7 @@
import org.jboss.test.deployers.support.jar.PlainJavaBean;
import org.jboss.test.deployers.support.ui.UIWebBean;
import org.jboss.test.deployers.support.web.ServletWebBean;
-import org.jboss.virtual.AssembledDirectory;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
import org.jboss.weld.bootstrap.spi.Deployment;
import org.jboss.weld.integration.deployer.DeployersUtils;
@@ -68,7 +68,7 @@
public void testSimpleUsage() throws Exception
{
- AssembledDirectory ear = createBasicEar(MockEmptyEjbServices.class);
+ VirtualFile ear = createBasicEar(MockEmptyEjbServices.class);
VFSDeploymentUnit topUnit = assertDeploy(ear);
try
{
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/AbstractWeldTest.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/AbstractWeldTest.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/AbstractWeldTest.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -35,7 +35,8 @@
import org.jboss.test.deployers.support.ui.UIWebBean;
import org.jboss.test.deployers.support.util.SomeUtil;
import org.jboss.test.deployers.support.web.ServletWebBean;
-import org.jboss.virtual.AssembledDirectory;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
/**
* AbstractWeldTest.
@@ -71,126 +72,106 @@
return (Boolean)m.invoke(target);
}
- protected AssembledDirectory createBasicEar() throws Exception
+ protected VirtualFile createBasicEar() throws Exception
{
return createBasicEar(SomeUtil.class);
}
- protected AssembledDirectory createBasicEar(Class<?> utilClass) throws Exception
+ protected VirtualFile createBasicEar(Class<?> utilClass) throws Exception
{
- AssembledDirectory ear = createTopLevelWithUtil(utilClass);
+ VirtualFile ear = createTopLevelWithUtil(utilClass);
- AssembledDirectory jar = ear.mkdir("simple.jar");
- addPackage(jar, PlainJavaBean.class);
- addPath(jar, "/weld/simple/jar", "META-INF");
+ VirtualFile jar = ear.getChild("simple.jar");
+ createAssembledDirectory(jar)
+ .addPackage(PlainJavaBean.class)
+ .addPath("/weld/simple/jar");
- AssembledDirectory ejbs = ear.mkdir("ejbs.jar");
- addPackage(ejbs, MySLSBean.class);
- addPath(ejbs, "/weld/simple/ejb", "META-INF");
+ VirtualFile ejbs = ear.getChild("ejbs.jar");
+ createAssembledDirectory(ejbs)
+ .addPackage(MySLSBean.class)
+ .addPath("/weld/simple/ejb");
- AssembledDirectory war = ear.mkdir("simple.war");
- AssembledDirectory webinf = war.mkdir("WEB-INF");
- AssembledDirectory classes = webinf.mkdir("classes");
- addPackage(classes, ServletWebBean.class);
- addPath(war, "/weld/simple/web", "WEB-INF");
+ VirtualFile war = ear.getChild("simple.war");
+ createAssembledDirectory(war)
+ .addPackage("WEB-INF/classes", ServletWebBean.class)
+ .addPath("/weld/simple/web")
+ .addPackage("WEB-INF/lib/ui.jar", UIWebBean.class)
+ .addPath("WEB-INF/lib/ui.jar", "/weld/simple/ui");
- AssembledDirectory lib = webinf.mkdir("lib");
-
- AssembledDirectory uijar = lib.mkdir("ui.jar");
- addPackage(uijar, UIWebBean.class);
- addPath(uijar, "/weld/simple/ui", "META-INF");
-
// war w/o 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, "/weld/simple/crm", "META-INF");
-
+ war = ear.getChild("crm.war");
+ createAssembledDirectory(war)
+ .addPackage("WEB-INF/classes", NotWBJsfBean.class)
+ .addPackage("WEB-INF/lib/crm.jar", CrmWebBean.class)
+ .addPath("WEB-INF/lib/crm.jar", "/weld/simple/crm");
+
enableTrace("org.jboss.deployers");
return ear;
}
- protected AssembledDirectory createTopLevelWithUtil() throws Exception
+ protected VirtualFile createTopLevelWithUtil() throws Exception
{
return createTopLevelWithUtil("/weld/simple");
}
- protected AssembledDirectory createTopLevelWithUtil(Class<?> utilClass) throws Exception
+ protected VirtualFile createTopLevelWithUtil(Class<?> utilClass) throws Exception
{
return createTopLevelWithUtil("/weld/simple", utilClass);
}
- protected AssembledDirectory createTopLevelWithUtil(String path) throws Exception
+ protected VirtualFile createTopLevelWithUtil(String path) throws Exception
{
return createTopLevelWithUtil(path, SomeUtil.class);
}
- protected AssembledDirectory createTopLevelWithUtil(String path, Class<?> utilClass) throws Exception
+ protected VirtualFile createTopLevelWithUtil(String path, Class<?> utilClass) throws Exception
{
- AssembledDirectory topLevel = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(topLevel, path, "META-INF");
-
- AssembledDirectory earLib = topLevel.mkdir("lib");
-
- AssembledDirectory util = earLib.mkdir("util.jar");
- addPackage(util, utilClass);
-
- AssembledDirectory ext = earLib.mkdir("ext.jar");
- addPackage(ext, ExternalWebBean.class);
- addPath(ext, "/weld/simple/ext", "META-INF");
-
- return topLevel;
+ VirtualFile earFile = VFS.getChild("top-level.ear");
+ createAssembledDirectory(earFile)
+ .addPath(path)
+ .addPackage("lib/util.jar", utilClass)
+ .addPackage("lib/ext.jar", ExternalWebBean.class)
+ .addPath("lib/ext.jar", "/weld/simple/ext");
+ return earFile;
}
- protected AssembledDirectory createWarInEar() throws Exception
+ protected VirtualFile createWarInEar() throws Exception
{
- AssembledDirectory ear = createAssembledDirectory("war-in-ear.ear", "war-in-ear.ear");
- addPath(ear, "/weld/warinear", "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, "/weld/simple/web", "WEB-INF");
-
- return ear;
+ VirtualFile earFile = VFS.getChild("war-in-ear.ear");
+ createAssembledDirectory(earFile)
+ .addPath("/weld/warinear")
+ .addPackage("simple.war/WEB-INF/classes", ServletWebBean.class)
+ .addPath("simple.war", "/weld/simple/web");
+ return earFile;
}
- protected AssembledDirectory createJarInEar() throws Exception
+ protected VirtualFile createJarInEar() throws Exception
{
- AssembledDirectory ear = createAssembledDirectory("jar-in-ear.ear", "jar-in-ear.ear");
- addPath(ear, "/weld/jarinear", "META-INF");
-
- AssembledDirectory jar = ear.mkdir("simple.jar");
- addPackage(jar, PlainJavaBean.class);
- addPath(jar, "/weld/simple/jar", "META-INF");
-
- return ear;
+ VirtualFile earFile = VFS.getChild("jar-in-ear.ear");
+ createAssembledDirectory(earFile)
+ .addPath("/weld/jarinear")
+ .addPackage("simple.jar", PlainJavaBean.class)
+ .addPath("simple.jar", "/weld/simple/jar");
+ return earFile;
}
- protected AssembledDirectory createWar(String warName, Class<?> reference) throws Exception
+ protected VirtualFile createWar(String warName, Class<?> reference) throws Exception
{
- AssembledDirectory war = createAssembledDirectory(warName, warName);
- AssembledDirectory webinf = war.mkdir("WEB-INF");
- AssembledDirectory classes = webinf.mkdir("classes");
- addPackage(classes, reference);
- addPath(war, "/weld/simple/web", "WEB-INF");
- return war;
+ VirtualFile warFile = VFS.getChild(warName);
+ createAssembledDirectory(warFile)
+ .addPackage("WEB-INF/classes", reference)
+ .addPath("/weld/simple/web");
+ return warFile;
}
- protected AssembledDirectory createEjbJar(String jarName, Class<?> reference) throws Exception
+ protected VirtualFile createEjbJar(String jarName, Class<?> reference) throws Exception
{
- AssembledDirectory jar = createAssembledDirectory(jarName, jarName);
- addPackage(jar, reference);
- addPath(jar, "/weld/simple/ejb", "META-INF");
- return jar;
+ VirtualFile jarFile = VFS.getChild(jarName);
+ createAssembledDirectory(jarFile)
+ .addPackage(reference)
+ .addPath("/weld/simple/ejb");
+ return jarFile;
}
}
\ No newline at end of file
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/BootDeployerTestCase.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -23,18 +23,27 @@
import javax.naming.Context;
-import junit.framework.Test;
+import java.lang.reflect.Field;
+import java.util.Map;
+import org.jboss.beans.metadata.api.annotations.Inject;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.dependency.plugins.AbstractController;
+import org.jboss.dependency.plugins.tracker.AbstractContextRegistry;
+import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.deployers.client.spi.DeployerClient;
import org.jboss.deployers.client.spi.Deployment;
import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.kernel.plugins.bootstrap.basic.KernelConstants;
+import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.test.deployers.support.deployer.CheckableJndiBinderDeployer;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.DeployersUtils;
+import junit.framework.Test;
+
/**
* Test boot deployer.
*
@@ -42,9 +51,12 @@
*/
public class BootDeployerTestCase extends AbstractWeldTest
{
+ private KernelController controller;
+
public BootDeployerTestCase(String name)
{
super(name);
+ setAutowireCandidate(true);
}
public static Test suite()
@@ -52,6 +64,12 @@
return suite(BootDeployerTestCase.class);
}
+ @Inject(bean = KernelConstants.KERNEL_CONTROLLER_NAME)
+ public void setController(KernelController controller)
+ {
+ this.controller = controller;
+ }
+
protected void testBootstrap(VirtualFile ear) throws Exception
{
// should already be on the deployer
@@ -67,6 +85,7 @@
DeployerClient mainDeployer = getDeployerClient();
mainDeployer.addDeployment(deployment);
mainDeployer.process();
+ ControllerContext wbContext = null;
try
{
DeploymentUnit earDU = getMainDeployerStructure().getDeploymentUnit(deployment.getName());
@@ -91,6 +110,11 @@
duSimpleName = earDU.getSimpleName();
Context context = assertInstanceOf(bmContext.lookup(duSimpleName), Context.class, false);
assertSame(bootstrap, context.lookup("bootstrap"));
+
+ Class<?> wbClass = earDU.getClassLoader().loadClass("org.jboss.test.deployers.support.CheckableBootstrap");
+ wbContext = controller.getContextByClass(wbClass);
+ assertNotNull(wbContext);
+ assertSame(bootstrap, wbContext.getTarget());
}
finally
{
@@ -104,6 +128,29 @@
// clear binding
assertNull(bmContext.lookup(duSimpleName));
+
+ // clear context 2 class mapping
+ if (wbContext != null)
+ assertNull(wbContext.getTarget());
+
+ Field registryField = AbstractController.class.getDeclaredField("registry");
+ registryField.setAccessible(true);
+ Object registry = registryField.get(controller);
+ Field mapField = AbstractContextRegistry.class.getDeclaredField("contextsByClass");
+ mapField.setAccessible(true);
+ @SuppressWarnings({"unchecked"})
+ Map<Class<?>, ?> map = (Map) mapField.get(registry);
+ for (Class<?> clazz : map.keySet())
+ {
+ String className = clazz.getName();
+ // should be the only one -- no other service/bean should use it -- except if we leak
+ if ("org.jboss.test.deployers.support.CheckableBootstrap".equals(className))
+ {
+
+ Object value = map.get(clazz);
+ fail("" + value);
+ }
+ }
}
assertTrue(invoke(bootstrap, "Shutdown"));
}
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/CLIsolationTestCase.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/CLIsolationTestCase.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/CLIsolationTestCase.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -29,7 +29,7 @@
import org.jboss.test.deployers.support.jar.PlainJavaBean;
import org.jboss.test.deployers.support.jsf.NotWBJsfBean;
import org.jboss.test.deployers.support.web.ServletWebBean;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
/**
* CL isolation tests.
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/PostDeployersTestCase.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/PostDeployersTestCase.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/PostDeployersTestCase.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -35,8 +35,8 @@
import org.jboss.metadata.ejb.spec.InterceptorsMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.ListenerMetaData;
-import org.jboss.virtual.AssembledDirectory;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.metadata.WeldEjbInterceptorMetadataDeployer;
/**
@@ -98,15 +98,12 @@
public void testWarWithNoWBFile() throws Exception
{
- AssembledDirectory ear = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(ear, "/weld/warwowb", "META-INF");
+ VirtualFile ear = VFS.getChild("top-level.ear");
+ createAssembledDirectory(ear)
+ .addPath("/weld/warwowb")
+ .addPath("simple.war", "/weld/warwowb/web")
+ .addPath("ejbs.jar", "/weld/warwowb/ejb");
- AssembledDirectory war = ear.mkdir("simple.war");
- addPath(war, "/weld/warwowb/web", "WEB-INF");
-
- AssembledDirectory ejbs = ear.mkdir("ejbs.jar");
- addPath(ejbs, "/weld/warwowb/ejb", "META-INF");
-
DeploymentUnit topDU = assertDeploy(ear);
try
{
@@ -124,8 +121,9 @@
protected void testJar(String type, boolean testCL) throws Exception
{
- AssembledDirectory topLevel = createAssembledDirectory("ejbs.jar", "ejbs.jar");
- addPath(topLevel, "/weld/" + type + "/ejb", "META-INF");
+ VirtualFile topLevel = VFS.getChild("ejbs.jar");
+ createAssembledDirectory(topLevel)
+ .addPath("/weld/" + type + "/ejb");
DeploymentUnit topDU = assertDeploy(topLevel);
try
@@ -141,8 +139,9 @@
protected void testWar(String type, boolean testCL, boolean testListner) throws Exception
{
- AssembledDirectory topLevel = createAssembledDirectory("web.war", "web.war");
- addPath(topLevel, "/weld/" + type + "/web", "WEB-INF");
+ VirtualFile topLevel = VFS.getChild("web.war");
+ createAssembledDirectory(topLevel)
+ .addPath("/weld/" + type + "/web");
DeploymentUnit topDU = assertDeploy(topLevel);
try
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/SmokeTestCase.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/SmokeTestCase.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/SmokeTestCase.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -29,8 +29,8 @@
import org.jboss.deployers.client.spi.Deployment;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.test.deployers.support.jar.PlainJavaBean;
-import org.jboss.virtual.AssembledDirectory;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.DeployersUtils;
/**
@@ -77,36 +77,30 @@
public void testEar() throws Exception
{
- AssembledDirectory ear = createAssembledDirectory("jar-in-ear.ear", "jar-in-ear.ear");
- addPath(ear, "/weld/jarwarinear", "META-INF");
+ VirtualFile ear = VFS.getChild("jar-in-ear.ear");
+ createAssembledDirectory(ear)
+ .addPath("/weld/jarwarinear")
+ .addPackage("simple.jar", PlainJavaBean.class)
+ .addPackage("simple.war/WEB-INF/classes", PlainJavaBean.class)
+ .addPath("simple.war", "/weld/warwowb/web");
- AssembledDirectory jar = ear.mkdir("simple.jar");
- addPackage(jar, PlainJavaBean.class);
-
- AssembledDirectory war = ear.mkdir("simple.war");
- AssembledDirectory webinf = war.mkdir("WEB-INF");
- AssembledDirectory classes = webinf.mkdir("classes");
- addPackage(classes, PlainJavaBean.class);
- addPath(war, "/weld/warwowb/web", "WEB-INF");
-
testDeployment(ear);
}
public void testWar() throws Exception
{
- AssembledDirectory war = createAssembledDirectory("w1.war", "w1.war");
- AssembledDirectory webinf = war.mkdir("WEB-INF");
- AssembledDirectory classes = webinf.mkdir("classes");
- addPackage(classes, PlainJavaBean.class);
- addPath(war, "/weld/warwowb/web", "WEB-INF");
-
+ VirtualFile war = VFS.getChild("w1.war");
+ createAssembledDirectory(war)
+ .addPackage("WEB-INF/classes", PlainJavaBean.class)
+ .addPath("/weld/warwowb/web");
testDeployment(war);
}
public void testJar() throws Exception
{
- AssembledDirectory jar = createAssembledDirectory("j1.jar", "j1.jar");
- addPackage(jar, PlainJavaBean.class);
+ VirtualFile jar = VFS.getChild("j1.jar");
+ createAssembledDirectory(jar)
+ .addPackage(PlainJavaBean.class);
testDeployment(jar);
}
Modified: projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/WeldDiscoveryEnvTestCase.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/WeldDiscoveryEnvTestCase.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer/src/test/java/org/jboss/test/deployers/test/WeldDiscoveryEnvTestCase.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -36,7 +36,7 @@
import org.jboss.test.deployers.support.jar.PlainJavaBean;
import org.jboss.test.deployers.support.ui.UIWebBean;
import org.jboss.test.deployers.support.web.ServletWebBean;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.env.WeldDiscoveryEnvironment;
/**
Modified: projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/AbstractWeldTest.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/AbstractWeldTest.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/AbstractWeldTest.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -34,7 +34,7 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataFactoryVisitor;
import org.jboss.test.deployers.BootstrapDeployersTest;
-import org.jboss.virtual.AssembledDirectory;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.bootstrap.api.Bootstrap;
import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
import org.jboss.weld.integration.deployer.DeployersUtils;
@@ -74,18 +74,20 @@
return (Boolean)m.invoke(target);
}
- protected void createMcLib(AssembledDirectory dir, String metaInfParent, Class<?> clazz) throws Exception
+ protected void createMcLib(VirtualFile dir, String metaInfParent, Class<?> clazz) throws Exception
{
- AssembledDirectory mcDir = dir.mkdir("mc.jar");
- addPackage(mcDir, clazz);
- addPath(mcDir, metaInfParent, "META-INF");
+ VirtualFile mcDir = dir.getChild("mc.jar");
+ createAssembledDirectory(mcDir)
+ .addPackage(clazz)
+ .addPath(metaInfParent);
}
- protected void createWeldLib(AssembledDirectory dir, String metaInfParent, Class<?> clazz) throws Exception
+ protected void createWeldLib(VirtualFile dir, String metaInfParent, Class<?> clazz) throws Exception
{
- AssembledDirectory weldDir = dir.mkdir("weld.jar");
- addPackage(weldDir, clazz);
- addPath(weldDir, metaInfParent, "META-INF");
+ VirtualFile weldDir = dir.getChild("weld.jar");
+ createAssembledDirectory(weldDir)
+ .addPackage(clazz)
+ .addPath(metaInfParent);
}
protected Class<?> findClass(DeploymentUnit unit, String name, boolean mustFind)
Modified: projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationNoBootstrapBeanTestCase.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationNoBootstrapBeanTestCase.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationNoBootstrapBeanTestCase.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -29,7 +29,8 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.test.deployers.support.mcandweld.mc.simple.SimpleBean;
import org.jboss.test.deployers.support.mcandweld.weld.simple.SimpleWebBean;
-import org.jboss.virtual.AssembledDirectory;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.DeployersUtils;
import org.jboss.weld.integration.deployer.env.FlatDeployment;
@@ -53,8 +54,9 @@
public void testUninstallOfIntermediateBeanIfBeanManagerWasNotInstalled() throws Throwable
{
DeployerClient mainDeployer = getDeployerClient();
- AssembledDirectory ear = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(ear, "/weld/mcandweld/ear/weldandmc", "META-INF");
+ VirtualFile ear = VFS.getChild("top-level.ear");
+ createAssembledDirectory(ear)
+ .addPath("/weld/mcandweld/ear/weldandmc");
createMcLib(ear, "/weld/mcandweld/mc/simple", SimpleBean.class);
createWeldLib(ear, "/weld/mcandweld/weld", SimpleWebBean.class);
Modified: projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationTestCase.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationTestCase.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationTestCase.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -39,8 +39,8 @@
import org.jboss.test.deployers.support.mcandweld.mc.simple.SimpleBean;
import org.jboss.test.deployers.support.mcandweld.weld.frommc.WeldBeanWithInjectedMcBean;
import org.jboss.test.deployers.support.mcandweld.weld.simple.SimpleWebBean;
-import org.jboss.virtual.AssembledDirectory;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.DeployersUtils;
import org.jboss.weld.integration.deployer.env.FlatDeployment;
@@ -63,8 +63,9 @@
public void testMcDeployment() throws Exception
{
- AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(top, "/weld/mcandweld/ear/mconly", "META-INF");
+ VirtualFile top = VFS.getChild("top-level.ear");
+ createAssembledDirectory(top)
+ .addPath("/weld/mcandweld/ear/mconly");
createMcLib(top, "/weld/mcandweld/mc/simple", SimpleBean.class);
Deployment deployment = createVFSDeployment(top);
@@ -85,8 +86,9 @@
public void testWeldDeployment() throws Exception
{
- AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(top, "/weld/mcandweld/ear/weldonly", "META-INF");
+ VirtualFile top = VFS.getChild("top-level.ear");
+ createAssembledDirectory(top)
+ .addPath("/weld/mcandweld/ear/weldonly");
createWeldLib(top, "/weld/mcandweld/weld", SimpleWebBean.class);
testBootstrap(top, new RunSpecificTest()
@@ -100,8 +102,9 @@
public void testWeldAndMcDeployment() throws Exception
{
- AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(top, "/weld/mcandweld/ear/weldandmc", "META-INF");
+ VirtualFile top = VFS.getChild("top-level.ear");
+ createAssembledDirectory(top)
+ .addPath("/weld/mcandweld/ear/weldandmc");
createMcLib(top, "/weld/mcandweld/mc/simple", SimpleBean.class);
createWeldLib(top, "/weld/mcandweld/weld", SimpleWebBean.class);
@@ -121,8 +124,9 @@
public void testMcInjectedByWeld() throws Exception
{
- AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(top, "/weld/mcandweld/ear/weldandmc", "META-INF");
+ VirtualFile top = VFS.getChild("top-level.ear");
+ createAssembledDirectory(top)
+ .addPath("/weld/mcandweld/ear/weldandmc");
createMcLib(top, "/weld/mcandweld/mc/fromweld", McBeanWithInjectedWeldBean.class);
createWeldLib(top, "/weld/mcandweld/weld", SimpleWebBean.class);
@@ -145,8 +149,9 @@
public void testWeldInjectedByMc() throws Exception
{
- AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(top, "/weld/mcandweld/ear/weldandmc", "META-INF");
+ VirtualFile top = VFS.getChild("top-level.ear");
+ createAssembledDirectory(top)
+ .addPath("/weld/mcandweld/ear/weldandmc");
createMcLib(top, "/weld/mcandweld/mc/simple", SimpleBean.class);
createWeldLib(top, "/weld/mcandweld/weld", WeldBeanWithInjectedMcBean.class);
@@ -169,8 +174,9 @@
public void testMcInjectedIntoWeldInjectedIntoMc() throws Exception
{
- AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(top, "/weld/mcandweld/bidirectional", "META-INF");
+ VirtualFile top = VFS.getChild("top-level.ear");
+ createAssembledDirectory(top)
+ .addPath("/weld/mcandweld/bidirectional");
createMcLib(top, "/weld/mcandweld/bidirectional/mc/end", org.jboss.test.deployers.support.mcandweld.bidirectional.mcend.end.First.class);
createWeldLib(top, "/weld/mcandweld/weld", org.jboss.test.deployers.support.mcandweld.bidirectional.mcend.middle.Middle.class);
@@ -200,8 +206,9 @@
public void testWeldInjectedIntoMcInjectedIntoWeld() throws Exception
{
- AssembledDirectory top = createAssembledDirectory("top-level.ear", "top-level.ear");
- addPath(top, "/weld/mcandweld/bidirectional", "META-INF");
+ VirtualFile top = VFS.getChild("top-level.ear");
+ createAssembledDirectory(top)
+ .addPath("/weld/mcandweld/bidirectional");
createMcLib(top, "/weld/mcandweld/bidirectional/mc/middle", org.jboss.test.deployers.support.mcandweld.bidirectional.mcmiddle.middle.Middle.class);
createWeldLib(top, "/weld/mcandweld/weld", org.jboss.test.deployers.support.mcandweld.bidirectional.mcmiddle.end.First.class);
@@ -230,15 +237,17 @@
public void testExternalMcBeanInjectedIntoWeld() throws Exception
{
- AssembledDirectory mcEar = createAssembledDirectory("mc.ear", "mc.ear");
- addPath(mcEar, "/weld/mcandweld/ear/mconly", "META-INF");
+ VirtualFile mcEar = VFS.getChild("mc.ear");
+ createAssembledDirectory(mcEar)
+ .addPath("/weld/mcandweld/ear/mconly");
createMcLib(mcEar, "/weld/mcandweld/mc/simple", SimpleBean.class);
Deployment mc = deploy(mcEar);
try
{
- AssembledDirectory weldEar = createAssembledDirectory("weld.ear", "weld.ear");
- addPath(weldEar, "/weld/mcandweld/ear/weldonly", "META-INF");
+ VirtualFile weldEar = VFS.getChild("weld.ear");
+ createAssembledDirectory(weldEar)
+ .addPath("/weld/mcandweld/ear/weldonly");
createWeldLib(weldEar, "/weld/mcandweld/weld", WeldBeanWithInjectedMcBean.class);
testBootstrap(weldEar, new RunSpecificTest()
@@ -265,15 +274,17 @@
public void testExternalMcBeanInjectedIntoWeld2() throws Exception
{
- AssembledDirectory mcEar = createAssembledDirectory("mc.ear", "mc.ear");
- addPath(mcEar, "/weld/mcandweld/ear/mconly", "META-INF");
+ VirtualFile mcEar = VFS.getChild("mc.ear");
+ createAssembledDirectory(mcEar)
+ .addPath("/weld/mcandweld/ear/mconly");
createMcLib(mcEar, "/weld/mcandweld/mc/simple", SimpleBean.class);
Deployment mc = deploy(mcEar);
undeploy(mc);
- AssembledDirectory weldEar = createAssembledDirectory("weld.ear", "weld.ear");
- addPath(weldEar, "/weld/mcandweld/ear/weldonly", "META-INF");
+ VirtualFile weldEar = VFS.getChild("weld.ear");
+ createAssembledDirectory(weldEar)
+ .addPath("/weld/mcandweld/ear/weldonly");
createWeldLib(weldEar, "/weld/mcandweld/weld", WeldBeanWithInjectedMcBean.class);
try
Modified: projects/weld-int/branches/kabir_mc_weld/ejb/src/main/java/org/jboss/weld/integration/ejb/SessionBeanInterceptor.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/ejb/src/main/java/org/jboss/weld/integration/ejb/SessionBeanInterceptor.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/ejb/src/main/java/org/jboss/weld/integration/ejb/SessionBeanInterceptor.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -71,7 +71,7 @@
@Resource
private EJBContext ejbContext;
- @Resource(mappedName="java:app/BeanManager")
+ @Resource(mappedName="java:comp/BeanManager")
private WeldManager beanManager;
private CreationalContext<Object> creationalContext;
@@ -158,4 +158,4 @@
}
-
\ No newline at end of file
+
Modified: projects/weld-int/branches/kabir_mc_weld/ejb/src/main/java/org/jboss/weld/integration/ejb/interceptor/Jsr299BindingsInterceptor.java
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/ejb/src/main/java/org/jboss/weld/integration/ejb/interceptor/Jsr299BindingsInterceptor.java 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/ejb/src/main/java/org/jboss/weld/integration/ejb/interceptor/Jsr299BindingsInterceptor.java 2010-06-07 16:44:20 UTC (rev 105771)
@@ -55,7 +55,7 @@
private static final long serialVersionUID = -1999613731498564948L;
- @Resource(mappedName="java:app/BeanManager")
+ @Resource(mappedName="java:comp/BeanManager")
private WeldManager beanManager;
private InterceptorBindings interceptorBindings;
Modified: projects/weld-int/branches/kabir_mc_weld/pom.xml
===================================================================
--- projects/weld-int/branches/kabir_mc_weld/pom.xml 2010-06-07 16:26:34 UTC (rev 105770)
+++ projects/weld-int/branches/kabir_mc_weld/pom.xml 2010-06-07 16:44:20 UTC (rev 105771)
@@ -27,23 +27,25 @@
<properties>
<version.weld>1.0.1-Final</version.weld>
<version.jboss.interceptor>1.0.0-CR11</version.jboss.interceptor>
- <version.jboss.vfs>2.2.0.Alpha2</version.jboss.vfs>
+ <version.jboss.vfs>3.0.0.CR1</version.jboss.vfs>
<version.jboss.man>2.1.1.SP1</version.jboss.man>
- <version.jboss.microcontainer>2.2.0-SNAPSHOT</version.jboss.microcontainer>
- <version.jboss.cl>2.2.0.Alpha1</version.jboss.cl>
- <version.jboss.deployers>2.2.0.Alpha1</version.jboss.deployers>
+ <version.jboss.mdr>2.2.0.Alpha2</version.jboss.mdr>
+ <version.jboss.microcontainer>2.2.0.Alpha9</version.jboss.microcontainer>
+ <version.jboss.cl>2.2.0.Alpha3</version.jboss.cl>
+ <version.jboss.deployers>2.2.0.Alpha2</version.jboss.deployers>
<version.jboss.common.core>2.2.17.GA</version.jboss.common.core>
<version.jboss.logging.spi>2.2.0.CR1</version.jboss.logging.spi>
<version.jboss.classloading.spi>6.0.0-Alpha8</version.jboss.classloading.spi>
<version.jboss.transaction.spi>6.0.0-Alpha8</version.jboss.transaction.spi>
<version.jboss.metadata>2.0.0-alpha-5</version.jboss.metadata>
<version.jbossxb>2.0.2.Beta4</version.jbossxb>
- <version.jboss.ejb3>1.0.0</version.jboss.ejb3>
+ <version.jboss.ejb3>1.0.2</version.jboss.ejb3>
<version.jboss.ejb3.core>1.1.5</version.jboss.ejb3.core>
<version.jboss.ejb3.endpoint>0.1.3</version.jboss.ejb3.endpoint>
<version.jboss.ejb.api>3.0.0.GA_SP1</version.jboss.ejb.api>
<version.jboss.jpa>1.0.0-CR1</version.jboss.jpa>
<version.jboss.web>2.1.4.GA</version.jboss.web>
+ <version.jboss.naming.deployers>0.1.0</version.jboss.naming.deployers>
<version.servlet.api>2.5</version.servlet.api>
<version.jsp.api>2.1</version.jsp.api>
<version.org.jboss.test>1.1.1.GA</version.org.jboss.test>
@@ -301,6 +303,12 @@
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ <version>${version.jboss.mdr}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.kernel</groupId>
<artifactId>jboss-dependency</artifactId>
<version>${version.jboss.microcontainer}</version>
@@ -310,6 +318,12 @@
<groupId>org.jboss.kernel</groupId>
<artifactId>jboss-kernel</artifactId>
<version>${version.jboss.microcontainer}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -372,7 +386,13 @@
<version>${version.jboss.metadata}</version>
</dependency>
- <dependency>
+ <dependency>
+ <groupId>org.jboss.reloaded</groupId>
+ <artifactId>jboss-reloaded-naming-deployers</artifactId>
+ <version>${version.jboss.naming.deployers}</version>
+ </dependency>
+
+ <dependency>
<groupId>jboss.jbossts</groupId>
<artifactId>jbossjts-integration</artifactId>
<version>${version.jbossts}</version>
More information about the jboss-cvs-commits
mailing list