[jboss-cvs] JBossAS SVN: r107576 - in branches/infinispan-int: resteasy-int/test/cdi-test-2 and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 12 20:18:13 EDT 2010
Author: pferraro
Date: 2010-08-12 20:18:13 -0400 (Thu, 12 Aug 2010)
New Revision: 107576
Modified:
branches/infinispan-int/build/build.xml
branches/infinispan-int/resteasy-int/test/cdi-test-2/pom.xml
branches/infinispan-int/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource.java
branches/infinispan-int/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResourceLocal.java
branches/infinispan-int/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResource.java
branches/infinispan-int/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResourceLocal.java
branches/infinispan-int/server/src/etc/deployers/metadata-deployer-jboss-beans.xml
branches/infinispan-int/testsuite/src/main/org/jboss/test/profileservice/test/ConnectionFactoryUnitTestCase.java
Log:
Merging trunk revisions 107514-107557
Modified: branches/infinispan-int/build/build.xml
===================================================================
--- branches/infinispan-int/build/build.xml 2010-08-12 20:41:28 UTC (rev 107575)
+++ branches/infinispan-int/build/build.xml 2010-08-13 00:18:13 UTC (rev 107576)
@@ -2391,6 +2391,9 @@
<fileset refid="org.jboss.metadata:jboss-metadata-rar:jar"/>
<fileset refid="org.jboss.metadata:jboss-metadata-war:jar"/>
<fileset refid="org.jboss:jboss-mdr:jar"/>
+ <fileset refid="org.jboss.man:jboss-managed:jar"/>
+ <fileset refid="org.jboss.man:jboss-metatype:jar"/>
+ <fileset refid="org.jboss.profileservice:jboss-profileservice-spi:jar"/>
<fileset refid="org.jboss.deployers:jboss-deployers-client:jar"/>
<fileset refid="org.jboss.deployers:jboss-deployers-client-spi:jar"/>
<fileset refid="org.jboss.deployers:jboss-deployers-core:jar"/>
Modified: branches/infinispan-int/resteasy-int/test/cdi-test-2/pom.xml
===================================================================
--- branches/infinispan-int/resteasy-int/test/cdi-test-2/pom.xml 2010-08-12 20:41:28 UTC (rev 107575)
+++ branches/infinispan-int/resteasy-int/test/cdi-test-2/pom.xml 2010-08-13 00:18:13 UTC (rev 107576)
@@ -3,9 +3,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs-all</artifactId>
- <version>2.0-beta-3</version>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-parent</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
</parent>
<artifactId>resteasy-cdi-test</artifactId>
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>jaxrs-api</artifactId>
- <version>${project.version}</version>
+ <version>${version.org.jboss.resteasy}</version>
<scope>provided</scope>
</dependency>
@@ -47,6 +47,12 @@
<version>1.0</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.interceptor</groupId>
+ <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
<!-- Test libraries -->
<dependency>
Modified: branches/infinispan-int/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource.java
===================================================================
--- branches/infinispan-int/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource.java 2010-08-12 20:41:28 UTC (rev 107575)
+++ branches/infinispan-int/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource.java 2010-08-13 00:18:13 UTC (rev 107576)
@@ -53,7 +53,7 @@
return cat != null;
}
- public boolean ejbFieldInjection()
+ public boolean testEjbFieldInjection()
{
return statelessEjb.foo();
}
Modified: branches/infinispan-int/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResourceLocal.java
===================================================================
--- branches/infinispan-int/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResourceLocal.java 2010-08-12 20:41:28 UTC (rev 107575)
+++ branches/infinispan-int/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResourceLocal.java 2010-08-13 00:18:13 UTC (rev 107576)
@@ -21,7 +21,7 @@
@GET
@Path("/ejbFieldInjection")
- public boolean ejbFieldInjection();
+ public boolean testEjbFieldInjection();
@GET
@Path("/jaxrsFieldInjection")
Modified: branches/infinispan-int/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResource.java
===================================================================
--- branches/infinispan-int/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResource.java 2010-08-12 20:41:28 UTC (rev 107575)
+++ branches/infinispan-int/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResource.java 2010-08-13 00:18:13 UTC (rev 107576)
@@ -52,7 +52,7 @@
return cat != null;
}
- public boolean ejbFieldInjection()
+ public boolean testEjbFieldInjection()
{
return statelessEjb.foo();
}
Modified: branches/infinispan-int/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResourceLocal.java
===================================================================
--- branches/infinispan-int/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResourceLocal.java 2010-08-12 20:41:28 UTC (rev 107575)
+++ branches/infinispan-int/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResourceLocal.java 2010-08-13 00:18:13 UTC (rev 107576)
@@ -21,7 +21,7 @@
@GET
@Path("/ejbFieldInjection")
- public boolean ejbFieldInjection();
+ public boolean testEjbFieldInjection();
@GET
@Path("/jaxrsFieldInjection")
Modified: branches/infinispan-int/server/src/etc/deployers/metadata-deployer-jboss-beans.xml
===================================================================
--- branches/infinispan-int/server/src/etc/deployers/metadata-deployer-jboss-beans.xml 2010-08-12 20:41:28 UTC (rev 107575)
+++ branches/infinispan-int/server/src/etc/deployers/metadata-deployer-jboss-beans.xml 2010-08-13 00:18:13 UTC (rev 107576)
@@ -71,10 +71,6 @@
<key>jboss-app_5_0.dtd</key>
<value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
</entry>
- <entry>
- <key>jboss-app_5_0.xsd</key>
- <value>org.jboss.metadata.ear.jboss.JBoss50AppMetaData</value>
- </entry>
<!-- ApplicationClientMetaData -->
<entry>
@@ -108,10 +104,6 @@
<value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
</entry>
<entry>
- <key>jboss-client_3_0.dtd</key>
- <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
- </entry>
- <entry>
<key>jboss-client_3_2.dtd</key>
<value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
</entry>
@@ -275,10 +267,6 @@
<key>jboss-web_5_0.dtd</key>
<value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
</entry>
- <entry>
- <key>jboss-web_5_0.xsd</key>
- <value>org.jboss.metadata.web.jboss.JBoss50WebMetaData</value>
- </entry>
<!-- PersistenceMetaData -->
<entry>
<key>persistence_1_0.xsd</key>
Modified: branches/infinispan-int/testsuite/src/main/org/jboss/test/profileservice/test/ConnectionFactoryUnitTestCase.java
===================================================================
--- branches/infinispan-int/testsuite/src/main/org/jboss/test/profileservice/test/ConnectionFactoryUnitTestCase.java 2010-08-12 20:41:28 UTC (rev 107575)
+++ branches/infinispan-int/testsuite/src/main/org/jboss/test/profileservice/test/ConnectionFactoryUnitTestCase.java 2010-08-13 00:18:13 UTC (rev 107576)
@@ -397,7 +397,7 @@
propValues.put("query-timeout", SimpleValueSupport.wrap(new Integer(100)));
propValues.put("url-delimiter", SimpleValueSupport.wrap("+"));
propValues.put("url-selector-strategy-class-name", SimpleValueSupport.wrap("org.jboss.test.jca.support.MyURLSelector"));
- propValues.put("use-try-lock", SimpleValueSupport.wrap(new Long(5000)));
+ propValues.put("use-try-lock", SimpleValueSupport.wrap(new Integer(5000)));
}
private void addCommonCfProperties(Map<String, MetaValue> propValues,
More information about the jboss-cvs-commits
mailing list