[jboss-cvs] JBossAS SVN: r108637 - in branches/infinispan-int: component-matrix and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 18 13:52:03 EDT 2010
Author: pferraro
Date: 2010-10-18 13:52:03 -0400 (Mon, 18 Oct 2010)
New Revision: 108637
Added:
branches/infinispan-int/ejb3/src/main/java/org/jboss/ejb3/client/injection/ClientWebServiceRefHandler.java
Modified:
branches/infinispan-int/build/build.xml
branches/infinispan-int/component-matrix/pom.xml
branches/infinispan-int/ejb3/src/main/java/org/jboss/ejb3/client/ClientContainer.java
branches/infinispan-int/server/src/main/java/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
branches/infinispan-int/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java
branches/infinispan-int/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/bda/DeploymentImpl.java
branches/infinispan-int/weld-int/deployer/src/test/java/org/jboss/test/deployers/test/LoadBeanDeploymentArchiveTestCase.java
Log:
merge --depth=infinity -r108541:108626 from trunk
Modified: branches/infinispan-int/build/build.xml
===================================================================
--- branches/infinispan-int/build/build.xml 2010-10-18 16:57:37 UTC (rev 108636)
+++ branches/infinispan-int/build/build.xml 2010-10-18 17:52:03 UTC (rev 108637)
@@ -1687,6 +1687,7 @@
<fileset refid="org.jboss.ws.cxf:jbossws-cxf-server:jar"/>
<fileset refid="org.jboss.ws.cxf:jbossws-cxf-client:jar"/>
<fileset refid="org.jboss.ws.cxf:jbossws-cxf-factories:jar"/>
+ <fileset refid="org.jboss.ws.cxf:jbossws-cxf-transports-httpserver:jar"/>
<mapper refid="remove-versions" />
</copy>
<unzip src="${org.jboss.ws.cxf:jbossws-cxf-resources:jar}"
@@ -1941,7 +1942,6 @@
<fileset refid="org.apache.cxf:cxf-rt-frontend-simple:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-management:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-transports-http:jar"/>
- <fileset refid="org.apache.cxf:cxf-rt-transports-http-jetty:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-transports-jms:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-transports-local:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-ws-addr:jar"/>
@@ -1954,8 +1954,8 @@
<fileset refid="org.apache.cxf:cxf-tools-wsdlto-core:jar"/>
<fileset refid="org.apache.cxf:cxf-tools-wsdlto-databinding-jaxb:jar"/>
<fileset refid="org.apache.cxf:cxf-tools-wsdlto-frontend-jaxws:jar"/>
- <fileset refid="org.apache.cxf:cxf-xjc-dv:jar"/>
- <fileset refid="org.apache.cxf:cxf-xjc-ts:jar"/>
+ <fileset refid="org.apache.cxf.xjcplugins:cxf-xjc-dv:jar"/>
+ <fileset refid="org.apache.cxf.xjcplugins:cxf-xjc-ts:jar"/>
<fileset refid="org.apache.cxf.xjcplugins:cxf-xjc-boolean:jar"/>
<fileset refid="org.apache.cxf.xjcplugins:cxf-xjc-bug671:jar"/>
<fileset refid="org.apache.neethi:neethi:jar"/>
@@ -1964,11 +1964,11 @@
<fileset refid="org.jboss.threads:jboss-threads:jar"/>
<fileset refid="org.jboss.xnio:xnio-api:jar"/>
<fileset refid="javax.jws:jsr181-api:jar"/>
- <fileset refid="javax.xml:jaxrpc-api:jar"/>
<fileset refid="org.jboss.ws:jbossws-common:jar"/>
<fileset refid="org.jboss.ws:jbossws-framework:jar"/>
<fileset refid="org.jboss.ws:jbossws-spi:jar"/>
<fileset refid="org.jboss.ws.native:jbossws-native-core:jar"/>
+ <fileset refid="org.jboss.ws.projects:jaxws-httpserver-httpspi:jar"/>
<fileset refid="org.jboss.netty:netty:jar"/>
<fileset refid="commons-beanutils:commons-beanutils:jar"/>
<fileset refid="antlr:antlr:jar"/>
@@ -2008,6 +2008,7 @@
<fileset refid="org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar"/>
<fileset refid="org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar"/>
<fileset refid="org.jboss.spec.javax.xml.registry:jboss-jaxr-api_1.0_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:jar"/>
<fileset refid="org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar"/>
<fileset refid="org.jboss.naming:jnpserver:jar"/>
<fileset refid="org.jboss.jbossts:jbossjts:jar"/>
@@ -2257,7 +2258,6 @@
<fileset refid="org.apache.cxf:cxf-rt-frontend-simple:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-management:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-transports-http:jar"/>
- <fileset refid="org.apache.cxf:cxf-rt-transports-http-jetty:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-transports-jms:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-transports-local:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-ws-addr:jar"/>
@@ -2270,8 +2270,8 @@
<fileset refid="org.apache.cxf:cxf-tools-wsdlto-core:jar"/>
<fileset refid="org.apache.cxf:cxf-tools-wsdlto-databinding-jaxb:jar"/>
<fileset refid="org.apache.cxf:cxf-tools-wsdlto-frontend-jaxws:jar"/>
- <fileset refid="org.apache.cxf:cxf-xjc-dv:jar"/>
- <fileset refid="org.apache.cxf:cxf-xjc-ts:jar"/>
+ <fileset refid="org.apache.cxf.xjcplugins:cxf-xjc-dv:jar"/>
+ <fileset refid="org.apache.cxf.xjcplugins:cxf-xjc-ts:jar"/>
<fileset refid="org.apache.cxf.xjcplugins:cxf-xjc-boolean:jar"/>
<fileset refid="org.apache.cxf.xjcplugins:cxf-xjc-bug671:jar"/>
<fileset refid="org.apache.neethi:neethi:jar"/>
@@ -2310,6 +2310,7 @@
<fileset refid="org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar"/>
<fileset refid="org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar"/>
<fileset refid="org.jboss.spec.javax.xml.registry:jboss-jaxr-api_1.0_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:jar"/>
<fileset refid="org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar"/>
<fileset refid="org.jboss.mx:jboss-j2se:jar"/>
<fileset refid="org.jboss.mx:jboss-jmx-annotations:jar"/>
@@ -2334,12 +2335,13 @@
<fileset refid="org.jboss.marshalling:jboss-marshalling:jar"/>
<fileset refid="org.jboss.marshalling:jboss-marshalling-river:jar"/>
<fileset refid="javax.jws:jsr181-api:jar"/>
- <fileset refid="javax.xml:jaxrpc-api:jar"/>
<fileset refid="org.jboss.ws.cxf:jbossws-cxf-client:jar"/>
+ <fileset refid="org.jboss.ws.cxf:jbossws-cxf-transports-httpserver:jar"/>
<fileset refid="org.jboss.ws:jbossws-common:jar"/>
<fileset refid="org.jboss.ws:jbossws-framework:jar"/>
<fileset refid="org.jboss.ws:jbossws-spi:jar"/>
<fileset refid="org.jboss.ws.native:jbossws-native-core:jar"/>
+ <fileset refid="org.jboss.ws.projects:jaxws-httpserver-httpspi:jar"/>
<fileset refid="jboss:jboss-serialization:jar"/>
<fileset refid="org.jboss.cluster:jboss-ha-client:jar"/>
<fileset refid="javax.activation:activation:jar"/>
Modified: branches/infinispan-int/component-matrix/pom.xml
===================================================================
--- branches/infinispan-int/component-matrix/pom.xml 2010-10-18 16:57:37 UTC (rev 108636)
+++ branches/infinispan-int/component-matrix/pom.xml 2010-10-18 17:52:03 UTC (rev 108637)
@@ -31,7 +31,7 @@
<!-- Properties -->
<properties>
- <version.apache.cxf>2.2.10</version.apache.cxf>
+ <version.apache.cxf>2.3.0</version.apache.cxf>
<version.apache.neethi>2.0.4</version.apache.neethi>
<version.apache.felix.log>1.0.0</version.apache.felix.log>
<version.apache.velocity>1.6.2</version.apache.velocity>
@@ -48,21 +48,21 @@
<version.javassist>3.12.1.GA</version.javassist>
<version.javax.faces>2.0.2-FCS</version.javax.faces>
<version.javax.validation>1.0.0.GA</version.javax.validation>
- <version.jaxrpc.api>1.1</version.jaxrpc.api>
+ <version.jaxws-httpserver-httpspi>1.0.0.GA</version.jaxws-httpserver-httpspi>
<version.jboss.jaxr>2.0.1</version.jboss.jaxr>
<version.jboss.jbossts>4.11.0.Final</version.jboss.jbossts>
- <version.jboss.jbossws-native>3.3.0.GA</version.jboss.jbossws-native>
- <version.jboss.jbossws-cxf>3.4.0.Beta2</version.jboss.jbossws-cxf>
- <version.jboss.jbossws-common>1.4.0.Beta2</version.jboss.jbossws-common>
- <version.jboss.jbossws-framework>3.4.0.Beta2</version.jboss.jbossws-framework>
- <version.jboss.jbossws-spi>1.4.0.Beta3</version.jboss.jbossws-spi>
+ <version.jboss.jbossws-native>3.4.0.CR1</version.jboss.jbossws-native>
+ <version.jboss.jbossws-cxf>3.4.0.CR1</version.jboss.jbossws-cxf>
+ <version.jboss.jbossws-common>1.4.0.CR1</version.jboss.jbossws-common>
+ <version.jboss.jbossws-framework>3.4.0.CR1</version.jboss.jbossws-framework>
+ <version.jboss.jbossws-spi>1.4.0.CR1</version.jboss.jbossws-spi>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
<version.jboss.jsf-deployer>1.0.2</version.jboss.jsf-deployer>
<version.jboss.web>3.0.0-beta-7</version.jboss.web>
<version.jsr181.api>1.0-MR1</version.jsr181.api>
<version.junit>4.6</version.junit>
<version.ops4j.pax.web>0.7.2</version.ops4j.pax.web>
- <version.org.hibernate>3.6.0.CR2</version.org.hibernate>
+ <version.org.hibernate>3.6.0.Final</version.org.hibernate>
<version.org.hibernate.commons.annotations>3.2.0.Final</version.org.hibernate.commons.annotations>
<version.org.hibernate.entity.manager>${version.org.hibernate}</version.org.hibernate.entity.manager>
<version.org.hibernate.javax.persistence>1.0.0.Final</version.org.hibernate.javax.persistence>
@@ -84,7 +84,7 @@
<version.org.jboss.cluster.server.ispn>1.0.0.Alpha14</version.org.jboss.cluster.server.ispn>
<version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
<version.org.jboss.deployers>2.2.0.Alpha7</version.org.jboss.deployers>
- <version.org.jboss.ejb3.depchain>1.0.0-alpha-11-SNAPSHOT</version.org.jboss.ejb3.depchain>
+ <version.org.jboss.ejb3.depchain>1.0.0-alpha-14-SNAPSHOT</version.org.jboss.ejb3.depchain>
<!-- This to move into the EJB3 BOM -->
<version.org.jboss.ejb3.embedded>1.0.0-alpha-1</version.org.jboss.ejb3.embedded>
<version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
@@ -111,7 +111,7 @@
<version.org.jboss.metadata.client>2.0.0.Alpha2</version.org.jboss.metadata.client>
<version.org.jboss.metadata.common>2.0.0.Alpha17</version.org.jboss.metadata.common>
<version.org.jboss.metadata.ear>2.0.0.Alpha4</version.org.jboss.metadata.ear>
- <version.org.jboss.metadata.ejb>2.0.0-alpha-19</version.org.jboss.metadata.ejb>
+ <version.org.jboss.metadata.ejb>2.0.0-alpha-20</version.org.jboss.metadata.ejb>
<version.org.jboss.metadata.rar>2.0.0.Alpha</version.org.jboss.metadata.rar>
<version.org.jboss.metadata.war>2.0.0.Alpha15</version.org.jboss.metadata.war>
<version.org.jboss.mod_cluster>1.1.0.CR3</version.org.jboss.mod_cluster>
@@ -621,12 +621,12 @@
<version>${version.apache.cxf}</version>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
+ <groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-dv</artifactId>
<version>${version.apache.cxf}</version>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
+ <groupId>org.apache.cxf.xjcplugins</groupId>
<artifactId>cxf-xjc-ts</artifactId>
<version>${version.apache.cxf}</version>
</dependency>
@@ -1470,6 +1470,12 @@
</dependency>
<dependency>
+ <groupId>org.jboss.ws.cxf</groupId>
+ <artifactId>jbossws-cxf-transports-httpserver</artifactId>
+ <version>${version.jboss.jbossws-cxf}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-common</artifactId>
<version>${version.jboss.jbossws-common}</version>
@@ -1488,6 +1494,12 @@
</dependency>
<dependency>
+ <groupId>org.jboss.ws.projects</groupId>
+ <artifactId>jaxws-httpserver-httpspi</artifactId>
+ <version>${version.jaxws-httpserver-httpspi}</version>
+ </dependency>
+
+ <dependency>
<groupId>jboss.jms-integration-tests</groupId>
<artifactId>integration-mdb20</artifactId>
<version>${version.jboss.jms-integration-tests}</version>
Modified: branches/infinispan-int/ejb3/src/main/java/org/jboss/ejb3/client/ClientContainer.java
===================================================================
--- branches/infinispan-int/ejb3/src/main/java/org/jboss/ejb3/client/ClientContainer.java 2010-10-18 16:57:37 UTC (rev 108636)
+++ branches/infinispan-int/ejb3/src/main/java/org/jboss/ejb3/client/ClientContainer.java 2010-10-18 17:52:03 UTC (rev 108637)
@@ -48,13 +48,13 @@
import org.jboss.ejb3.DependencyPolicy;
import org.jboss.ejb3.InitialContextFactory;
import org.jboss.ejb3.client.injection.ClientPersistenceUnitHandler;
+import org.jboss.ejb3.client.injection.ClientWebServiceRefHandler;
import org.jboss.ejb3.vfs.spi.VirtualFile;
import org.jboss.injection.DependsHandler;
import org.jboss.injection.EncInjector;
import org.jboss.injection.InjectionContainer;
import org.jboss.injection.InjectionHandler;
import org.jboss.injection.Injector;
-import org.jboss.injection.WebServiceRefHandler;
import org.jboss.logging.Logger;
import org.jboss.metadata.client.jboss.JBossClientMetaData;
import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
@@ -333,7 +333,7 @@
//handlers.add(new JndiInjectHandler<RemoteEnvironment>());
handlers.add(new ClientPersistenceUnitHandler<RemoteEnvironment>());
handlers.add(new ClientResourceHandler<RemoteEnvironment>(this.mainClass));
- handlers.add(new WebServiceRefHandler<RemoteEnvironment>());
+ handlers.add(new ClientWebServiceRefHandler<RemoteEnvironment>());
// TODO: we're going to use a jar class loader
// ClassLoader old = Thread.currentThread().getContextClassLoader();
Copied: branches/infinispan-int/ejb3/src/main/java/org/jboss/ejb3/client/injection/ClientWebServiceRefHandler.java (from rev 108626, trunk/ejb3/src/main/java/org/jboss/ejb3/client/injection/ClientWebServiceRefHandler.java)
===================================================================
--- branches/infinispan-int/ejb3/src/main/java/org/jboss/ejb3/client/injection/ClientWebServiceRefHandler.java (rev 0)
+++ branches/infinispan-int/ejb3/src/main/java/org/jboss/ejb3/client/injection/ClientWebServiceRefHandler.java 2010-10-18 17:52:03 UTC (rev 108637)
@@ -0,0 +1,179 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ejb3.client.injection;
+
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+
+
+
+import org.jboss.ejb3.client.JndiPropertyInjector;
+import org.jboss.injection.EncInjector;
+import org.jboss.injection.InjectionContainer;
+import org.jboss.injection.InjectionHandler;
+import org.jboss.injection.InjectionUtil;
+import org.jboss.injection.Injector;
+import org.jboss.injection.WebServiceRefHandler;
+import org.jboss.injection.lang.reflect.BeanProperty;
+import org.jboss.injection.lang.reflect.BeanPropertyFactory;
+import org.jboss.logging.Logger;
+import org.jboss.metadata.javaee.spec.RemoteEnvironment;
+import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
+import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
+
+/**
+ * Handles service-ref and {@link WebServiceRef} on classes processed
+ * by the application client container.
+ *
+ * Unlike the {@link WebServiceRefHandler}, this class does not create
+ * {@link EncInjector}s for the service-ref(s), since the ENC injection
+ * should happen on the server. This class just creates the field/method
+ * {@link Injector}s for the service-ref(s)
+ *
+ * @author Jaikiran Pai
+ * @version $Revision: $
+ */
+public class ClientWebServiceRefHandler<X extends RemoteEnvironment> implements InjectionHandler<X>
+{
+
+ /**
+ * Logger
+ */
+ private static Logger logger = Logger.getLogger(ClientWebServiceRefHandler.class);
+
+ /**
+ * Service references
+ */
+ private Map<String, ServiceReferenceMetaData> srefMap = new HashMap<String, ServiceReferenceMetaData>();
+
+ @Override
+ public void handleClassAnnotations(Class<?> clazz, InjectionContainer container)
+ {
+ throw new IllegalStateException("Annotations are not handled in the client");
+
+ }
+
+ @Override
+ public void handleFieldAnnotations(Field field, InjectionContainer container,
+ Map<AccessibleObject, Injector> injectors)
+ {
+ throw new IllegalStateException("Annotations are not handled in the client");
+
+ }
+
+ @Override
+ public void handleMethodAnnotations(Method method, InjectionContainer container,
+ Map<AccessibleObject, Injector> injectors)
+ {
+ throw new IllegalStateException("Annotations are not handled in the client");
+
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * Note that this method does not create {@link EncInjector}s since the ENC injectors
+ * should be created on server side. This method just creates field/method {@link Injector}s for
+ * the service-ref(s)
+ */
+ @Override
+ public void loadXml(X xml, InjectionContainer container)
+ {
+ if (xml == null)
+ {
+ return;
+ }
+ ServiceReferencesMetaData serviceRefs = xml.getServiceReferences();
+ if (serviceRefs == null)
+ return;
+ for (ServiceReferenceMetaData sref : serviceRefs)
+ {
+ if (this.srefMap.get(sref.getServiceRefName()) != null)
+ {
+ throw new IllegalStateException("Duplicate <service-ref-name> in " + sref);
+ }
+
+ srefMap.put(sref.getServiceRefName(), sref);
+
+ String encName = "env/" + sref.getServiceRefName();
+ AnnotatedElement annotatedElement = sref.getAnnotatedElement();
+ if (annotatedElement == null)
+ {
+ if (sref.getInjectionTargets() != null && sref.getInjectionTargets().size() > 0)
+ {
+ for (ResourceInjectionTargetMetaData trg : sref.getInjectionTargets())
+ {
+ annotatedElement = InjectionUtil.findInjectionTarget(container.getClassloader(), trg);
+ addInjector(container, encName, annotatedElement);
+ }
+ }
+ else
+ {
+ logger.warn("No injection target for service-ref: " + sref.getServiceRefName());
+ }
+ }
+ // annotated classes do not specify injection target
+ else if (!(annotatedElement instanceof java.lang.reflect.Type))
+ {
+ addInjector(container, encName, annotatedElement);
+ }
+ }
+
+ }
+
+ /**
+ * Create and add a {@link Injector} into the <code>container</code>, for the passed <code>encName</code>
+ * and <code>annotatedElement</code>
+ *
+ * @param container The container to which the injector will be added
+ * @param encName The ENC name
+ * @param annotatedElement The annotated field/method
+ */
+ private void addInjector(InjectionContainer container, String encName, AnnotatedElement annotatedElement)
+ {
+
+ Injector jndiInjector;
+ if(annotatedElement instanceof Method)
+ {
+ BeanProperty prop = BeanPropertyFactory.create((Method) annotatedElement);
+ jndiInjector = new JndiPropertyInjector(prop, encName, container.getEnc());
+ }
+ else if(annotatedElement instanceof Field)
+ {
+ BeanProperty prop = BeanPropertyFactory.create((Field) annotatedElement);
+ jndiInjector = new JndiPropertyInjector(prop, encName, container.getEnc());
+ }
+ else
+ {
+ throw new IllegalStateException("Annotated element for '" + encName + "' is niether Method nor Field: " + annotatedElement);
+ }
+ // add the injector
+ container.getInjectors().add(jndiInjector);
+ }
+
+
+}
Modified: branches/infinispan-int/server/src/main/java/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java
===================================================================
--- branches/infinispan-int/server/src/main/java/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java 2010-10-18 16:57:37 UTC (rev 108636)
+++ branches/infinispan-int/server/src/main/java/org/jboss/deployment/MappedReferenceMetaDataResolverDeployer.java 2010-10-18 17:52:03 UTC (rev 108637)
@@ -49,7 +49,6 @@
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
import org.jboss.metadata.ejb.jboss.jndi.resolver.impl.JNDIPolicyBasedJNDINameResolverFactory;
import org.jboss.metadata.ejb.jboss.jndi.resolver.spi.EntityBeanJNDINameResolver;
-import org.jboss.metadata.ejb.jboss.jndi.resolver.spi.SessionBean31JNDINameResolver;
import org.jboss.metadata.ejb.jboss.jndi.resolver.spi.SessionBeanJNDINameResolver;
import org.jboss.metadata.ejb.jboss.jndipolicy.plugins.DefaultJNDIBindingPolicyFactory;
import org.jboss.metadata.ejb.jboss.jndipolicy.spi.DefaultJndiBindingPolicy;
@@ -592,10 +591,6 @@
JBossSessionBean31MetaData sessionBean31 = (JBossSessionBean31MetaData) sbean;
if (sessionBean31.isNoInterfaceBean())
{
- SessionBean31JNDINameResolver sessionBean31JNDINameResolver = (SessionBean31JNDINameResolver) sessionbeanJNDINameResolver;
- String noInterfaceJNDIName = sessionBean31JNDINameResolver.resolveNoInterfaceJNDIName(sessionBean31);
- // add it to container metadata
- cdmd.addJndiName(noInterfaceJNDIName);
// TODO: The rest of the stuff is way too ugly, but that's what is being
// done for maintaining per business interface endpoint mappings. So let's
// for the time being, do the same for no-interface view endpoint mappings.
Modified: branches/infinispan-int/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java
===================================================================
--- branches/infinispan-int/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java 2010-10-18 16:57:37 UTC (rev 108636)
+++ branches/infinispan-int/server/src/main/java/org/jboss/web/deployers/MergedJBossWebMetaDataDeployer.java 2010-10-18 17:52:03 UTC (rev 108637)
@@ -342,7 +342,11 @@
// - Merge the fragment metadata into merged fragment meta data
WebCommonMetaData mergedFragmentMetaData = new WebCommonMetaData();
if (specMetaData == null)
- specMetaData = new WebMetaData();
+ {
+ // If there is no web.xml, it has to be considered to be the latest version
+ specMetaData = new Web30MetaData();
+ specMetaData.setVersion("3.0");
+ }
String key = AnnotationMetaDataDeployer.WEB_ANNOTATED_ATTACHMENT_NAME + ":classes";
// Augment with meta data from annotations in /WEB-INF/classes
WebMetaData classesAnnotatedMetaData = unit.getAttachment(key, WebMetaData.class);
Modified: branches/infinispan-int/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/bda/DeploymentImpl.java
===================================================================
--- branches/infinispan-int/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/bda/DeploymentImpl.java 2010-10-18 16:57:37 UTC (rev 108636)
+++ branches/infinispan-int/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/bda/DeploymentImpl.java 2010-10-18 17:52:03 UTC (rev 108637)
@@ -117,7 +117,6 @@
{
Archive archive = archiveLoader.load(beanClass, this);
loadedArchives.add(archive);
- archive.addClass(beanClass);
BeanDeploymentArchive bda = archive.getBeanDeploymentArchive();
if (archive.getBeanDeploymentArchive() == null)
{
Modified: branches/infinispan-int/weld-int/deployer/src/test/java/org/jboss/test/deployers/test/LoadBeanDeploymentArchiveTestCase.java
===================================================================
--- branches/infinispan-int/weld-int/deployer/src/test/java/org/jboss/test/deployers/test/LoadBeanDeploymentArchiveTestCase.java 2010-10-18 16:57:37 UTC (rev 108636)
+++ branches/infinispan-int/weld-int/deployer/src/test/java/org/jboss/test/deployers/test/LoadBeanDeploymentArchiveTestCase.java 2010-10-18 17:52:03 UTC (rev 108637)
@@ -56,12 +56,14 @@
import org.jboss.weld.bootstrap.spi.Deployment;
import org.jboss.weld.integration.deployer.DeployersUtils;
import org.jboss.weld.integration.deployer.env.bda.DeploymentImpl;
+import org.junit.Ignore;
/**
* Deployment.loadBeanDeploymentArchive test case.
*
* @author <a href="mailto:flavia.rainone at jboss.com">Flavia Rainone</a>
*/
+ at Ignore
public class LoadBeanDeploymentArchiveTestCase extends AbstractEnvironmentTest<BeanDeploymentArchive>
{
private Bootstrap bootstrap = new MockWeldBootstrap();
More information about the jboss-cvs-commits
mailing list