[jboss-cvs] JBossAS SVN: r108908 - in branches/infinispan-int: depchain and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 25 14:54:26 EDT 2010
Author: pferraro
Date: 2010-10-25 14:54:26 -0400 (Mon, 25 Oct 2010)
New Revision: 108908
Modified:
branches/infinispan-int/component-matrix/pom.xml
branches/infinispan-int/depchain/pom.xml
branches/infinispan-int/server/pom.xml
branches/infinispan-int/testsuite/build.xml
Log:
merge --depth=infinity -r108845:108846 from trunk
Modified: branches/infinispan-int/component-matrix/pom.xml
===================================================================
--- branches/infinispan-int/component-matrix/pom.xml 2010-10-25 18:04:43 UTC (rev 108907)
+++ branches/infinispan-int/component-matrix/pom.xml 2010-10-25 18:54:26 UTC (rev 108908)
@@ -92,7 +92,7 @@
<version.org.jboss.injection>0.1.0-alpha-2</version.org.jboss.injection>
<version.org.jboss.interceptor>1.0.0-CR11</version.org.jboss.interceptor>
<version.org.jboss.integration>6.0.0.CR1</version.org.jboss.integration>
- <version.org.jboss.javaee.specs.bom>1.0.0.Beta6</version.org.jboss.javaee.specs.bom>
+ <version.org.jboss.javaee.specs.bom>1.0.0.Beta7</version.org.jboss.javaee.specs.bom>
<version.org.jboss.jbossxb>2.0.2.Beta9</version.org.jboss.jbossxb>
<version.org.jboss.jopr>1.4.0.CR2</version.org.jboss.jopr>
<version.org.jboss.jpa.deployers>1.0.2-alpha-1</version.org.jboss.jpa.deployers>
Modified: branches/infinispan-int/depchain/pom.xml
===================================================================
--- branches/infinispan-int/depchain/pom.xml 2010-10-25 18:04:43 UTC (rev 108907)
+++ branches/infinispan-int/depchain/pom.xml 2010-10-25 18:54:26 UTC (rev 108908)
@@ -919,6 +919,10 @@
<artifactId>jboss-saaj-api_1.3_spec</artifactId>
</dependency>
<dependency>
+ <groupId>org.jboss.spec.javax.xml.rpc</groupId>
+ <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.spec.javax.xml.ws</groupId>
<artifactId>jboss-jaxws-api_2.2_spec</artifactId>
</dependency>
@@ -1094,10 +1098,6 @@
<artifactId>jbossws-native-services</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxrpc-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.xnio</groupId>
<artifactId>xnio-api</artifactId>
</dependency>
Modified: branches/infinispan-int/server/pom.xml
===================================================================
--- branches/infinispan-int/server/pom.xml 2010-10-25 18:04:43 UTC (rev 108907)
+++ branches/infinispan-int/server/pom.xml 2010-10-25 18:54:26 UTC (rev 108908)
@@ -472,8 +472,8 @@
</dependency>
<dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxrpc-api</artifactId>
+ <groupId>org.jboss.spec.javax.xml.rpc</groupId>
+ <artifactId>jboss-jaxrpc-api_1.1_spec</artifactId>
</dependency>
<dependency>
Modified: branches/infinispan-int/testsuite/build.xml
===================================================================
--- branches/infinispan-int/testsuite/build.xml 2010-10-25 18:04:43 UTC (rev 108907)
+++ branches/infinispan-int/testsuite/build.xml 2010-10-25 18:54:26 UTC (rev 108908)
@@ -234,8 +234,6 @@
<fileset refid="jacorb:idl_g:jar"/>
<fileset refid="jacorb:jacorb:jar"/>
<fileset refid="jacorb:jacorb_g:jar"/>
- <fileset refid="javax.enterprise:cdi-api:jar"/>
- <fileset refid="javax.inject:javax.inject:jar"/>
<!--
<fileset refid="org.jboss.cache:jbosscache-core:jar"/>
<fileset refid="org.jboss.cache:jbosscache-pojo:jar"/>
@@ -251,18 +249,10 @@
<fileset refid="opensaml:opensaml:jar"/>
<fileset refid="oswego-concurrent:concurrent:jar"/>
<fileset refid="sleepycat:je:jar"/>
- <fileset refid="javax.activation:activation:jar"/>
- <fileset refid="javax.mail:mail:jar"/>
- <fileset refid="sun-jaxb:jaxb-api:jar"/>
<fileset refid="com.sun.xml.bind:jaxb-impl:jar"/>
<fileset refid="com.sun.xml.bind:jaxb-xjc:jar"/>
- <fileset refid="javax.faces:jsf-api:jar"/>
- <fileset refid="javax.validation:validation-api:jar"/>
<fileset refid="org.jboss.web:jasper-jdt:jar"/>
<fileset refid="org.jboss.web:jbossweb:jar"/>
- <fileset refid="org.jboss.spec.javax.el:jboss-el-api_2.2_spec:jar"/>
- <fileset refid="org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:jar"/>
- <fileset refid="org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.2_spec:jar"/>
<fileset refid="trove:trove:jar"/>
<fileset refid="wutka-dtdparser:dtdparser:jar"/>
<fileset refid="org.codehaus.woodstox:wstx-lgpl:jar"/>
@@ -286,20 +276,16 @@
<fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-impl:jar:client"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-spi:jar:client"/>
<fileset refid="org.jboss.ejb3.vfs:jboss-ejb3-vfs-spi:jar"/>
- <fileset refid="org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar"/>
<fileset refid="org.hibernate:hibernate-core:jar"/>
<fileset refid="org.hibernate:hibernate-entitymanager:jar"/>
<fileset refid="org.hibernate:hibernate-infinispan:jar"/>
<fileset refid="org.hibernate:hibernate-testing:jar"/>
- <fileset refid="org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec: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.cxf:jbossws-cxf-client:jar"/>
<fileset refid="org.jboss.ws.cxf:jbossws-cxf-factories:jar"/>
<fileset refid="org.jboss.ws.native:jbossws-native-core:jar"/>
- <fileset refid="javax.xml:jaxrpc-api:jar"/>
- <fileset refid="javax.xml.soap:saaj-api:jar"/>
<fileset refid="org.jboss:jbossxb:jar"/>
<fileset refid="org.jboss.metadata:jboss-metadata-common:jar"/>
<fileset refid="org.jboss.metadata:jboss-metadata-client:jar"/>
@@ -317,7 +303,6 @@
<fileset refid="org.jboss.service.binding:jboss-service-binding-core:jar"/>
<fileset refid="org.jboss.service.binding:jboss-service-binding-mgmt:jar"/>
<fileset refid="org.jboss.stdio:jboss-stdio:jar"/>
- <fileset refid="stax:stax-api:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-hornetq-int:jar"/>
<fileset refid="org.hornetq:hornetq-core-client:jar"/>
<fileset refid="org.hornetq:hornetq-jms-client:jar"/>
@@ -376,6 +361,8 @@
<fileset refid="org.jboss.jbossts:jbossjts:jar"/>
<fileset refid="org.jboss.jbossts:jbossjts-integration:jar"/>
+ <!-- Java EE APIs -->
+ <path refid="jboss.javaee.api.classpath"/>
</path>
<!-- ======= -->
@@ -391,6 +378,35 @@
<pathelement path="${jboss.dist}/lib/jboss-system.jar"/>
</path>
+ <!-- JBoss Java EE APIs classpath -->
+ <path id="jboss.javaee.api.classpath">
+ <fileset refid="org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.el:jboss-el-api_2.2_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.enterprise.deploy:jboss-jad-api_1.2_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.resource:jboss-connector-api_1.5_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.security.auth.message:jboss-jaspi-api_1.0_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.2_spec:jar"/>
+ <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.rpc:jboss-jaxrpc-api_1.1_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.xml.soap:jboss-saaj-api_1.3_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar"/>
+ <fileset refid="org.jboss.spec.javax.xml.registry:jboss-jaxr-api_1.0_spec:jar"/>
+ <fileset refid="org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar"/>
+ <fileset refid="javax.enterprise:cdi-api:jar"/>
+ <fileset refid="javax.inject:javax.inject:jar"/>
+ <fileset refid="javax.activation:activation:jar"/>
+ <fileset refid="javax.mail:mail:jar"/>
+ <fileset refid="stax:stax-api:jar"/>
+ <fileset refid="javax.faces:jsf-api:jar"/>
+ <fileset refid="javax.validation:validation-api:jar"/>
+ </path>
+
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
<path refid="org.jboss.aop.classpath"/>
@@ -409,19 +425,6 @@
<fileset refid="org.jboss.mx:jboss-jmx-annotations:jar"/>
<fileset refid="org.jboss.mx:jboss-mbeans:jar"/>
<fileset refid="org.jboss.mx:jboss-mbeanserver:jar"/>
- <fileset refid="org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec:jar"/>
- <fileset refid="org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec:jar"/>
- <fileset refid="org.jboss.spec.javax.el:jboss-el-api_2.2_spec:jar"/>
- <fileset refid="org.jboss.spec.javax.enterprise.deploy:jboss-jad-api_1.2_spec:jar"/>
- <fileset refid="org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:jar"/>
- <fileset refid="org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:jar"/>
- <fileset refid="org.jboss.spec.javax.resource:jboss-connector-api_1.5_spec:jar"/>
- <fileset refid="org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:jar"/>
- <fileset refid="org.jboss.spec.javax.security.auth.message:jboss-jaspi-api_1.0_spec:jar"/>
- <fileset refid="org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:jar"/>
- <fileset refid="org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.2_spec:jar"/>
- <fileset refid="org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar"/>
- <fileset refid="org.jboss.spec.javax.xml.registry:jboss-jaxr-api_1.0_spec:jar"/>
<fileset refid="org.jboss:jboss-vfs:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-connector:jar:jboss-jca"/>
<fileset refid="org.jboss.jbossas:jboss-as-connector:jar:jboss-jca-deployer"/>
@@ -489,6 +492,8 @@
<include name="**/*.jar"/>
<exclude name="jaxws-rt.jar"/>
<exclude name="jaxws-tools.jar"/>
+ <exclude name="cxf-rt*.jar"/>
+ <exclude name="cxf-tools*.jar"/>
</fileset>
<pathelement path="${classpath}"/>
<pathelement path="${local.classpath}"/>
@@ -1233,28 +1238,26 @@
<antcall target="tomcat-webctx-tests" inheritRefs="true"/>
<antcall target="tomcat-federation-tests" inheritRefs="true"/>
<antcall target="tests-binding-manager" inheritRefs="true"/>
- <!-- <antcall target="tests-security-manager" inheritRefs="true"/> -->
- <!-- <antcall target="tests-security-jaspi-unit"/> -->
<antcall target="tests-hornetq" inheritRefs="true"/>
- <!-- JBAS-7154 <antcall target="tests-compatibility" inheritRefs="true"/> -->
<antcall target="tests-aop-scoped" inheritRefs="true"/>
<antcall target="tests-clustered-profileservice" inheritRefs="true"/>
- <!-- JBAS-7680 the current 'web' profile is not an EE6 web profile and doesn't include JPA, so these WebJPA tests are disabled
- <antcall target="tests-web-profile" inheritRefs="true"/>
- -->
<antcall target="tests-web-ondemand-disabled" inheritRefs="true"/>
<antcall target="tests-jts" inheritRefs="true"/>
- <antcall target="tests-jacc-security" inheritRefs="true"/>
+ <antcall target="tests-jacc-security" inheritRefs="true"/>
<antcall target="tests-jacc-security-allstarrole" inheritRefs="true"/>
<antcall target="tests-jacc-securitymgr" inheritRefs="true"/>
<antcall target="tests-mod_cluster" inheritRefs="true"/>
<antcall target="tests-ha-mod_cluster" inheritRefs="true"/>
- <!-- JBAS-7247 classloader leak tests have been moved out of this
- target; see target tests-all-classloader-leak -->
+ <!-- <antcall target="tests-security-manager" inheritRefs="true"/> -->
+ <!-- <antcall target="tests-security-jaspi-unit"/> -->
+ <!-- JBAS-7247 classloader leak tests have been moved out of this target; see target tests-all-classloader-leak -->
+ <!-- JBAS-7154 <antcall target="tests-compatibility" inheritRefs="true"/> -->
+ <!-- JBAS-7680 the current 'web' profile is not an EE6 web profile and doesn't include JPA, so these WebJPA tests are disabled
+ <antcall target="tests-web-profile" inheritRefs="true"/> -->
<antcall target="tests-report" inheritRefs="true"/>
<!-- JBAS-5918 https://issues.apache.org/bugzilla/show_bug.cgi?id=41368
- <record name="${basedir}/output/tests.log" action="stop"/>
- -->
+ <record name="${basedir}/output/tests.log" action="stop"/> -->
+
<condition property="servers.shutdown.failed">
<and>
<not><isset property="servers.shutdown.nocheck"/></not>
@@ -1370,19 +1373,6 @@
<include name="deployers/**"/>
<include name="deploy/**"/>
<include name="lib/**"/>
- <!-- Previous broken and fragile detailed listing of deploy content
- <include name="conf/**"/>
- <include name="deployers/**"/>
- <include name="deploy/jbossweb.sar/**"/>
- <include name="deploy/ROOT.war/**"/>
- <include name="deploy/security/**"/>
- <include name="deploy/jca*"/>
- <include name="deploy/legacy*"/>
- <include name="lib/**"/>
- <include name="deploy/jmx-invoker-service.xml"/>
- <include name="deploy/transaction-jboss-beans.xml"/>
- <include name="deploy/thread-pool-jboss-beans.xml"/>
- -->
</patternset>
</create-config>
@@ -1479,17 +1469,6 @@
<include name="deployers/**"/>
<include name="deploy/**"/>
<include name="lib/**"/>
- <!-- Previous broken and fragile detailed listing of deploy content
- <include name="deploy/jbossweb.sar/**"/>
- <include name="deploy/ROOT.war/**"/>
- <include name="deploy/jmx-console.war/**"/>
- <include name="deploy/jmx-invoker-service.xml"/>
- <include name="deploy/hsqldb-ds.xml"/>
- <include name="deploy/jca-jboss-beans.xml"/>
- <include name="deploy/jboss-local-jdbc.rar"/>
- <include name="deploy/jboss-jdbc-metadata.sar"/>
- <include name="deploy/security*"/>
- -->
</patternset>
</create-config>
<copy file="${source.resources}/web/federation/authext/war-deployers-jboss-beans.xml" overwrite="true" todir="${jboss.dist}/server/tomcat-federation/deployers/jbossweb.deployer/META-INF" />
@@ -1546,16 +1525,6 @@
<include name="deployers/**"/>
<include name="deploy/**"/>
<include name="lib/**"/>
- <!-- Previous broken and fragile detailed listing of deploy content
- <include name="deploy/jbossweb.sar/**"/>
- <include name="deploy/ROOT.war/**"/>
- <include name="deploy/jmx-console.war/**"/>
- <include name="deploy/messaging/**"/>
- <include name="deploy/jca-jboss-beans.xml"/>
- <include name="deploy/jboss-local-jdbc.rar"/>
- <include name="deploy/jmx-invoker-service.xml"/>
- <include name="deploy/hsqldb-ds.xml"/>
- -->
</patternset>
</create-config>
<!-- overlay the deployment-service stuff -->
@@ -1996,24 +1965,6 @@
<include name="deployers/**"/>
<include name="deploy/**"/>
<include name="lib/**"/>
- <!-- Previous broken and fragile detailed listing of deploy content
- <include name="deploy/jbossweb.sar/**"/>
- <include name="deploy/ROOT.war/**"/>
- <include name="deploy/ejb2-timer-service.xml"/>
- <include name="deploy/hsqldb-ds.xml"/>
- <include name="deploy/jbossws-console.war/**"/>
- <include name="deploy/client-deployer-service.xml"/>
- <include name="deploy/jms-ds.xml"/>
- <include name="deploy/jms-ra.rar"/>
- <include name="deploy/jmx-invoker-service.xml"/>
- <include name="deploy/jmx-console.war/**"/>
- <include name="deploy/jca-jboss-beans.xml"/>
- <include name="deploy/jboss-local-jdbc.rar"/>
- <include name="deploy/mail-service.xml"/>
- <include name="deploy/messaging/**"/>
- <include name="deploy/ejb3-interceptors-aop.xml"/>
- <include name="deploy/security-beans.xml"/>
- -->
</patternset>
</create-config>
<!-- Copy the test-destinations-service.xml to the all config.
@@ -2056,20 +2007,6 @@
<include name="deployers/**"/>
<include name="deploy/**"/>
<include name="lib/**"/>
- <!-- Previous broken and fragile detailed listing of deploy content
- <include name="deploy/jbossweb.sar/**"/>
- <include name="deploy/ROOT.war/**"/>
- <include name="deploy/hsqldb-ds.xml"/>
- <include name="deploy/jbossws-console.war/**"/>
- <include name="deploy/client-deployer-service.xml"/>
- <include name="deploy/jmx-invoker-service.xml"/>
- <include name="deploy/jmx-console.war/**"/>
- <include name="deploy/jca-jboss-beans.xml"/>
- <include name="deploy/jboss-local-jdbc.rar"/>
- <include name="deploy/mail-service.xml"/>
- <include name="deploy/messaging/**"/>
- <include name="deploy/ejb3-interceptors-aop.xml"/>
- -->
</patternset>
</create-config>
<server:start name="jacc-securitymgr"/>
@@ -2151,19 +2088,6 @@
<include name="deployers/**"/>
<include name="deploy/**"/>
<include name="lib/**"/>
- <!-- Previous broken and fragile detailed listing of deploy content
- <include name="deploy/jbossweb.sar/**"/>
- <include name="deploy/ROOT.war/**"/>
- <include name="deploy/hsqldb-ds.xml"/>
- <include name="deploy/client-deployer-service.xml"/>
- <include name="deploy/jmx-invoker-service.xml"/>
- <include name="deploy/jmx-console.war/**"/>
- <include name="deploy/jca-jboss-beans.xml"/>
- <include name="deploy/jboss-local-jdbc.rar"/>
- <include name="deploy/mail-service.xml"/>
- <include name="deploy/messaging/**"/>
- <include name="deploy/ejb3-interceptors-aop.xml"/>
- -->
</patternset>
</create-config>
<server:start name="jaspi"/>
@@ -2198,18 +2122,6 @@
<include name="deployers/**"/>
<include name="deploy/**"/>
<include name="lib/**"/>
- <!-- Previous broken and fragile detailed listing of deploy content
- <include name="deploy/jbossweb.sar/**"/>
- <include name="deploy/ROOT.war/**"/>
- <include name="deploy/hsqldb-ds.xml"/>
- <include name="deploy/client-deployer-service.xml"/>
- <include name="deploy/jmx-invoker-service.xml"/>
- <include name="deploy/jmx-console.war/**"/>
- <include name="deploy/jca-jboss-beans.xml"/>
- <include name="deploy/jboss-local-jdbc.rar"/>
- <include name="deploy/ejb3-interceptors-aop.xml"/>
- <include name="deploy/properties**"/>
- -->
</patternset>
</create-config>
More information about the jboss-cvs-commits
mailing list