[jboss-cvs] JBossAS SVN: r106681 - in branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION: component-matrix and 122 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 14 00:20:35 EDT 2010
Author: ALRubinger
Date: 2010-07-14 00:19:55 -0400 (Wed, 14 Jul 2010)
New Revision: 106681
Added:
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/pom.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/smoke/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/smoke/AppConfig.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/smoke/MyApplicationConfig.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/resources/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/webapp/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/webapp/WEB-INF/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/webapp/WEB-INF/web.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/webapp/index.jsp
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/org/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/org/jboss/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/org/jboss/resteasy/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/org/jboss/resteasy/test/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/org/jboss/resteasy/test/jboss/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/org/jboss/resteasy/test/jboss/AppConfigTest.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/resources/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/resources/jndi.properties
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/resources/log4j.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/async-http-servlet-3.0-test.iml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/pom.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/smoke/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/smoke/Customer.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/smoke/SimpleResource.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/resources/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/resources/roles.properties
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/resources/users.properties
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/WEB-INF/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/WEB-INF/jboss-web.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/WEB-INF/web.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/index.jsp
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss/resteasy/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss/resteasy/test/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss/resteasy/test/jboss/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss/resteasy/test/jboss/SmokeTest.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/resources/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/resources/jndi.properties
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/resources/log4j.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/Subresource.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResourceLocal.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/SubresourceTest.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/pom.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyException.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyExceptionMapper.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyResource.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyResourceBean.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/WEB-INF/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/WEB-INF/web.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/index.jsp
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/test/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/pom.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/java/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/WEB-INF/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/WEB-INF/web.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/index.jsp
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss/resteasy/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss/resteasy/test/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss/resteasy/test/jboss/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss/resteasy/test/jboss/EjbTest.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/resources/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/resources/jndi.properties
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/resources/log4j.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/pom.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-war/src/main/java/org/jboss/resteasy/test/MyException.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-war/src/main/java/org/jboss/resteasy/test/MyExceptionMapper.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/scanned-war/src/main/java/org/jboss/resteasy/test/MyIntf.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/scanned-war/src/main/java/org/jboss/resteasy/test/MyIntfResource.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/etc/bin/password_tool.bat
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/ssl/JBossProvider.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/ssl/JBossSSLConfiguration.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/ssl/KeyManagerFactoryImpl.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/ssl/TrustManagerFactoryImpl.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/server/src/etc/conf/all/bootstrap/security.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/entity/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/entity/ABean.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/entity/ALocal.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSession.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSessionBean.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSessionHome.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/test/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/test/PassivationClUnitTestCase.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/ear/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/ear/META-INF/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/ear/META-INF/application.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/ear/META-INF/jboss-app.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/stateful/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/stateful/META-INF/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/stateful/META-INF/ejb-jar.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/stateful/META-INF/jboss.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/AbstractWeldInAsTest.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/McWeldInjectionApplicationServerTestCase.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/SanityApplicationServerTestCase.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/mc/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/mc/SimpleBeanWithSimpleWebBean.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/weld/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/weld/SimpleWebBean.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithConstructorAnnotation.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithInstallAnnotation.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithNoWeldAnnotations.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithPropertyAnnotation.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/WeldBeanMetaDataBuilderPluginUnitTestCase.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap/META-INF/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap/META-INF/MANIFEST.MF
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap/META-INF/simple-beans.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/test/java/org/jboss/test/deployers/test/AbstractDeploymentTest.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/test/java/org/jboss/test/deployers/test/FlatDeploymentTestCase.java
Removed:
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/pom.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/smoke/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/smoke/AppConfig.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/smoke/MyApplicationConfig.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/resources/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/webapp/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/webapp/WEB-INF/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/webapp/WEB-INF/web.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/webapp/index.jsp
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/org/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/org/jboss/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/org/jboss/resteasy/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/org/jboss/resteasy/test/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/org/jboss/resteasy/test/jboss/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/org/jboss/resteasy/test/jboss/AppConfigTest.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/resources/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/resources/jndi.properties
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/resources/log4j.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/async-http-servlet-3.0-test.iml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/pom.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/smoke/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/smoke/Customer.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/smoke/SimpleResource.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/resources/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/resources/roles.properties
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/resources/users.properties
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/WEB-INF/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/WEB-INF/jboss-web.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/WEB-INF/web.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/index.jsp
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss/resteasy/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss/resteasy/test/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss/resteasy/test/jboss/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss/resteasy/test/jboss/SmokeTest.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/resources/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/resources/jndi.properties
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/resources/log4j.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/SubResource.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource1.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource1Local.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource2.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource2Local.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatefulSessionBeanWithAnnotationsOnBeanClassTest.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/pom.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyException.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyExceptionMapper.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyResource.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyResourceBean.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/WEB-INF/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/WEB-INF/web.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/index.jsp
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/test/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/pom.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/java/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/WEB-INF/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/WEB-INF/web.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/index.jsp
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss/resteasy/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss/resteasy/test/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss/resteasy/test/jboss/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss/resteasy/test/jboss/EjbTest.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/resources/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/resources/jndi.properties
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/resources/log4j.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/pom.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/entity/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/entity/ABean.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/entity/ALocal.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSession.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSessionBean.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSessionHome.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/test/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/test/PassivationClUnitTestCase.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/ear/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/ear/META-INF/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/ear/META-INF/application.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/ear/META-INF/jboss-app.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/stateful/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/stateful/META-INF/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/stateful/META-INF/ejb-jar.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/stateful/META-INF/jboss.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/Kickstart.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/KickstartEjb.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/Kickstart.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/KickstartEjb.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/ApplicationServerTestCase.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/mc/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/mc/SimpleBeanWithSimpleWebBean.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/weld/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/weld/SimpleWebBean.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithConstructorAnnotation.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithInstallAnnotation.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithNoWeldAnnotations.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithPropertyAnnotation.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap/META-INF/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap/META-INF/MANIFEST.MF
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap/META-INF/simple-beans.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/test/java/org/jboss/test/deployers/AbstractDeploymentTest.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/test/java/org/jboss/test/deployers/FlatDeploymentTestCase.java
Modified:
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/build/build.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/component-matrix/pom.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/ejb3/src/main/java/org/jboss/ejb3/client/ClientLauncher.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/jar/pom.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyDeploymentScanningData.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyEjbDeployer.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyIntegrationDeployer.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyScannerDeployer.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/ApplicationScopedTestResource.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/TestResource.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResource.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResourceLocal.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/interceptor/TestResource.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractResourceTest.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/InterceptorTest.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatefulSessionBeanWithAnnotationsOnLocalInterfaceTest.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-war/src/main/java/org/jboss/resteasy/test/MyResource.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-war/src/main/java/org/jboss/resteasy/test/MyResourceBean.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-war/src/test/java/org/jboss/resteasy/test/jboss/EjbTest.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/pom.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/zip/assembly.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/zip/pom.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/etc/bin/password_tool.sh
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/etc/deploy/security-jboss-beans.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/auth/AuthenticationTimedCachePolicy.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/integration/JNDIBasedSecurityManagement.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/integration/SecurityConstantsBridge.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/integration/SecurityDomainObjectFactory.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/integration/password/PasswordLifecycleCallback.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/plugins/JaasSecurityDomain.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/plugins/JaasSecurityManagerService.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/plugins/SecurityKeyManager.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/server/src/etc/conf/all/bootstrap.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/server/src/etc/conf/minimal/bootstrap.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/server/src/main/java/org/jboss/ejb/plugins/AbstractInstanceCache.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/build.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/imports/sections/ejb.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/imports/test-jars.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/pom.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/main/java/org/jboss/weld/integration/deployer/mc/WeldBeanMetaDataDeployerPlugin.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/mc/simple/SimpleBean.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationNoBootstrapBeanTestCase.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationTestCase.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/test/McIntegrationTestCase.xml
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldBootstrapDeployer.java
branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/test/java/org/jboss/test/deployers/VFSTestSuite.java
Log:
[JBAS-8146] Backport AS trunk changes from r106393 to 106625
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/build/build.xml
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/build/build.xml 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/build/build.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -271,6 +271,7 @@
<include name="bootstrap/jmx.xml"/>
<include name="bootstrap/deployers.xml"/>
<include name="bootstrap/profile.xml"/>
+ <include name="bootstrap/security.xml"/>
<include name="xmdesc/NamingBean-xmbean.xml"/>
<include name="xmdesc/NamingService-xmbean.xml"/>
<include name="xmdesc/NamingProviderURLWriter-xmbean.xml"/>
@@ -1096,9 +1097,9 @@
<property name="security.module.output" value="${project.root}/${security.module.name}/target"/>
<!-- Copy the generated libraries -->
- <mkdir dir="${install.common.lib}"/>
+ <mkdir dir="${install.lib}"/>
<copy file="${security.module.output}/jboss-as-security.jar"
- tofile="${install.common.lib}/jbosssx-server.jar" filtering="no"/>
+ tofile="${install.lib}/jbosssx-server.jar" filtering="no"/>
<copy file="${security.module.output}/jboss-as-security-client.jar"
tofile="${install.client}/jbosssx-as-client.jar" filtering="no"/>
@@ -1991,7 +1992,6 @@
<fileset refid="org.apache.cxf:cxf-common-schemas:jar"/>
<fileset refid="org.apache.cxf:cxf-common-utilities:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-bindings-coloc:jar"/>
- <fileset refid="org.apache.cxf:cxf-rt-bindings-corba:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-bindings-http:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-bindings-object:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-bindings-soap:jar"/>
@@ -2001,7 +2001,6 @@
<fileset refid="org.apache.cxf:cxf-rt-databinding-jaxb:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-frontend-jaxws:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-frontend-simple:jar"/>
- <fileset refid="org.apache.cxf:cxf-rt-javascript: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"/>
@@ -2037,8 +2036,6 @@
<fileset refid="antlr:antlr:jar"/>
<fileset refid="commons-collections:commons-collections:jar"/>
<fileset refid="org.jboss.security:jboss-negotiation:jar"/>
- <fileset refid="org.jboss.security:jboss-security-spi:jar"/>
- <fileset refid="org.jboss.security:jbosssx:jar"/>
<fileset refid="org.jboss.security:jbossxacml:jar"/>
<fileset refid="org.picketbox:picketbox-bare:jar"/>
<fileset refid="org.jboss.slf4j:slf4j-jboss-logmanager:jar"/>
@@ -2185,14 +2182,6 @@
<fileset refid="org.hornetq:hornetq-logging:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-hornetq-int:jar"/>
<fileset refid="org.hornetq:hornetq-jms:jar"/>
- <fileset refid="org.springframework:spring-aop:jar"/>
- <fileset refid="org.springframework:spring-asm:jar"/>
- <fileset refid="org.springframework:spring-beans:jar"/>
- <fileset refid="org.springframework:spring-context:jar"/>
- <fileset refid="org.springframework:spring-core:jar"/>
- <fileset refid="org.springframework:spring-expression:jar"/>
- <fileset refid="org.springframework:spring-jms:jar"/>
- <fileset refid="org.springframework:spring-tx:jar"/>
<mapper refid="remove-versions" />
</copy>
<!-- Install jboss-remoting 3.x as jboss-remoting-3.jar -->
@@ -2294,6 +2283,8 @@
<fileset refid="xml-resolver:xml-resolver:jar"/>
<fileset refid="org.jboss:jbossxb:jar"/>
<fileset refid="org.jboss.osgi.framework:jboss-osgi-framework-metadata:jar"/>
+ <fileset refid="org.jboss.security:jboss-security-spi:jar"/>
+ <fileset refid="org.jboss.security:jbosssx:jar"/>
<mapper refid="remove-versions" />
</copy>
@@ -2309,7 +2300,6 @@
<fileset refid="org.apache.cxf:cxf-common-schemas:jar"/>
<fileset refid="org.apache.cxf:cxf-common-utilities:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-bindings-coloc:jar"/>
- <fileset refid="org.apache.cxf:cxf-rt-bindings-corba:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-bindings-http:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-bindings-object:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-bindings-soap:jar"/>
@@ -2319,7 +2309,6 @@
<fileset refid="org.apache.cxf:cxf-rt-databinding-jaxb:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-frontend-jaxws:jar"/>
<fileset refid="org.apache.cxf:cxf-rt-frontend-simple:jar"/>
- <fileset refid="org.apache.cxf:cxf-rt-javascript: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"/>
@@ -2449,14 +2438,6 @@
<fileset refid="org.hornetq:hornetq-core-client:jar"/>
<fileset refid="org.hornetq:hornetq-jms-client:jar"/>
<fileset refid="org.jboss:jbossxb:jar"/>
- <fileset refid="org.springframework:spring-aop:jar"/>
- <fileset refid="org.springframework:spring-asm:jar"/>
- <fileset refid="org.springframework:spring-beans:jar"/>
- <fileset refid="org.springframework:spring-context:jar"/>
- <fileset refid="org.springframework:spring-core:jar"/>
- <fileset refid="org.springframework:spring-expression:jar"/>
- <fileset refid="org.springframework:spring-jms:jar"/>
- <fileset refid="org.springframework:spring-tx:jar"/>
<mapper refid="remove-versions" />
</copy>
<!-- Install jboss-remoting 3.x as jboss-remoting-3.jar -->
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/component-matrix/pom.xml
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/component-matrix/pom.xml 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/component-matrix/pom.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -32,7 +32,7 @@
<properties>
<version.apache.aries.jmx>0.1-incubating-20100329</version.apache.aries.jmx>
<version.apache.aries.util>0.1-incubating-20100329</version.apache.aries.util>
- <version.apache.cxf>2.2.9</version.apache.cxf>
+ <version.apache.cxf>2.2.9-patch-01</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>
@@ -52,12 +52,12 @@
<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.3.1.SP1</version.jboss.jbossws-cxf>
- <version.jboss.jbossws-common>1.3.0.GA</version.jboss.jbossws-common>
- <version.jboss.jbossws-framework>3.3.0.GA</version.jboss.jbossws-framework>
+ <version.jboss.jbossws-cxf>3.4.0.Beta1</version.jboss.jbossws-cxf>
+ <version.jboss.jbossws-common>1.4.0.Beta1</version.jboss.jbossws-common>
+ <version.jboss.jbossws-framework>3.4.0.Beta1</version.jboss.jbossws-framework>
<version.jboss.jbossws-spi>1.4.0.Beta1</version.jboss.jbossws-spi>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
- <version.jboss.jsf-deployer>1.0.0-20100630.195548-13</version.jboss.jsf-deployer>
+ <version.jboss.jsf-deployer>1.0.1</version.jboss.jsf-deployer>
<version.jboss.osgi.apache.xerces>2.9.1.SP4</version.jboss.osgi.apache.xerces>
<version.jboss.osgi.blueprint>1.0.0.Beta2</version.jboss.osgi.blueprint>
<version.jboss.osgi.common>1.0.4</version.jboss.osgi.common>
@@ -112,7 +112,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.Beta1</version.org.jboss.javaee.specs.bom>
+ <version.org.jboss.javaee.specs.bom>1.0.0.Beta3</version.org.jboss.javaee.specs.bom>
<version.org.jboss.jbossxb>2.0.2.Beta7</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>
@@ -129,23 +129,23 @@
<version.org.jboss.mc-int>2.2.0.Alpha2</version.org.jboss.mc-int>
<version.org.jboss.mdr>2.2.0.Alpha3</version.org.jboss.mdr>
<version.org.jboss.metadata.client>2.0.0.Alpha2</version.org.jboss.metadata.client>
- <version.org.jboss.metadata.common>2.0.0.Alpha14</version.org.jboss.metadata.common>
+ <version.org.jboss.metadata.common>2.0.0.Alpha16</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-16</version.org.jboss.metadata.ejb>
+ <version.org.jboss.metadata.ejb>2.0.0-alpha-17</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.Alpha14</version.org.jboss.metadata.war>
<version.org.jboss.mod_cluster>1.1.0.CR3</version.org.jboss.mod_cluster>
<version.org.jboss.mx>6.0.0.Beta5</version.org.jboss.mx>
<version.org.jboss.naming>5.0.5.Final</version.org.jboss.naming>
<version.org.jboss.profileservice>0.1.0.Alpha1</version.org.jboss.profileservice>
- <version.org.jboss.reflect>2.2.0.Alpha7</version.org.jboss.reflect>
+ <version.org.jboss.reflect>2.2.0.Alpha9</version.org.jboss.reflect>
<version.org.jboss.reloaded.naming>0.1.0</version.org.jboss.reloaded.naming>
<version.org.jboss.reloaded.naming.deployers>0.1.0</version.org.jboss.reloaded.naming.deployers>
- <version.org.jboss.resteasy>2.0-beta-3</version.org.jboss.resteasy>
+ <version.org.jboss.resteasy>2.0-RC1</version.org.jboss.resteasy>
<version.org.jboss.remoting>2.5.2.SP2</version.org.jboss.remoting>
<version.org.jboss.remoting3>3.1.0.Beta2</version.org.jboss.remoting3>
<version.org.jboss.remoting3.metadata>1.0.0.Beta2</version.org.jboss.remoting3.metadata>
- <version.org.jboss.scanning>1.0.0.Alpha4</version.org.jboss.scanning>
+ <version.org.jboss.scanning>1.0.0.Alpha5</version.org.jboss.scanning>
<version.org.jboss.security>3.0.0.Beta4</version.org.jboss.security>
<version.org.jboss.security.negotiation>2.0.3.SP1</version.org.jboss.security.negotiation>
<version.org.jboss.service.binding>1.1.0.CR1</version.org.jboss.service.binding>
@@ -467,33 +467,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-bindings-corba</artifactId>
- <version>${version.apache.cxf}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${version.apache.cxf}</version>
<exclusions>
@@ -523,6 +496,12 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${version.apache.cxf}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -530,6 +509,10 @@
<version>${version.apache.cxf}</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</exclusion>
@@ -562,8 +545,16 @@
<exclusions>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxws_2.1_spec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -595,6 +586,10 @@
<artifactId>saaj-api</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-javascript</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaxws_2.1_spec</artifactId>
</exclusion>
@@ -1421,6 +1416,10 @@
<artifactId>wstx-lgpl</artifactId>
</exclusion>
<exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
@@ -1666,7 +1665,7 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.0-RC2</version>
+ <version>1.2</version>
</dependency>
<dependency>
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/ejb3/src/main/java/org/jboss/ejb3/client/ClientLauncher.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/ejb3/src/main/java/org/jboss/ejb3/client/ClientLauncher.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/ejb3/src/main/java/org/jboss/ejb3/client/ClientLauncher.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -24,6 +24,8 @@
import java.io.IOException;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.rmi.server.RMIClassLoader;
import java.rmi.server.RMIClassLoaderSpi;
import java.util.ArrayList;
@@ -63,6 +65,11 @@
import org.jboss.logging.Logger;
import org.jboss.metadata.client.jboss.JBossClientMetaData;
import org.jboss.remoting.Remoting;
+import org.jboss.vfs.VFS;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.util.PathTokenizer;
+import org.jboss.vfs.util.automount.Automounter;
+import org.jboss.vfs.util.automount.MountOption;
import org.jboss.xb.binding.JBossXBException;
/**
@@ -233,11 +240,13 @@
for(String path : classPath)
{
log.info(path);
+ mount(path);
roots.add(path);
}
for(String path : extraClassPath)
{
log.info(path);
+ mount(path);
roots.add(path);
}
log.info("End classpath");
@@ -490,17 +499,38 @@
public static void main(String[] args)
{
- String[] roots = {
- "vfszip:/home/svn/JBossHead/jboss-head/build/output/jboss-5.0.0.CR2/server/cts/tmp/jsr88/assembly_classpath_appclient.ear/assembly_classpath_appclient_client.jar",
- "vfszip:/Users/svn/JBossHead/jboss-head/build/output/jboss-5.0.0.CR2/server/cts/tmp/jsr88/assembly_classpath_appclient.ear/libs/direct_classpath_util.jar",
- "vfszip:/Users/svn/JBossHead/jboss-head/build/output/jboss-5.0.0.CR2/server/cts/tmp/jsr88/assembly_classpath_appclient.ear/libs/indirect_classpath_util.jar"
- };
- VFSClassLoaderFactory10 factory = new VFSClassLoaderFactory10();
- factory.setRoots(Arrays.asList(roots));
- VFSClassLoaderPolicyModule module = new VFSClassLoaderPolicyModule(factory, "AppClientLoaderModule");
-
+ try
+ {
+ String path = "vfs:///home/carlo/work/jboss-head/build/target/jboss-6.0.0-SNAPSHOT/server/cts/tmp/jsr88/ejb3_timer_basic_mdb.ear/ejb3_timer_basic_mdb_client.jar";
+ mount(path);
+ }
+ catch(Exception e)
+ {
+ e.printStackTrace();
+ }
}
+ private static void mount(String path) throws IOException, URISyntaxException
+ {
+ URI root = new URI(path);
+ VirtualFile file = VFS.getChild(root);
+
+ mount(file);
+ }
+
+ private static void mount(VirtualFile target) throws IOException
+ {
+ if(target.exists())
+ {
+ Automounter.mount(target);
+ return;
+ }
+
+ mount(target.getParent());
+
+ Automounter.mount(target);
+ }
+
/**
* RMIClassLoaderSpi that uses the thread context class loader
*
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3ClientDeployer.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -128,19 +128,27 @@
VFSDeploymentUnit earUnit = unit.getParent();
if(earUnit != null)
{
- List<VirtualFile> earClassPath = earUnit.getClassPath();
JBossAppMetaData earMD = earUnit.getAttachment(JBossAppMetaData.class);
if(earMD != null)
{
+ // find the lib dir of the ear
String libDir = earMD.getLibraryDirectory();
- if(libDir == null)
+ // if not explicitly specified, then set the default as "lib" folder in .ear
+ if (libDir == null || libDir.length() == 0)
+ {
libDir = "lib";
- String libDirPrefix = libDir + "/";
- for(VirtualFile vf : earClassPath)
+ }
+ // get the root of the ear
+ VirtualFile earRoot = earUnit.getRoot();
+ // get the VirtualFile corresponding to .ear/libdirectory (if any)
+ VirtualFile earLib = earRoot.getChild(libDir);
+ // ear library dir was found, so add all it's children to the classpath
+ if (earLib != null)
{
- if(vf.getPathName().startsWith(libDirPrefix))
+ List<VirtualFile> earLibContents = earLib.getChildren();
+ for (VirtualFile fileInEarLib : earLibContents)
{
- String uri = vf.toURI().toString();
+ String uri = fileInEarLib.toURI().toString();
cpURIs.add(uri);
}
}
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/jar/pom.xml
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/jar/pom.xml 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/jar/pom.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -62,6 +62,21 @@
</dependency>
<dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>async-http-servlet-3.0</artifactId>
+ <version>${version.org.jboss.resteasy}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-server</artifactId>
<scope>provided</scope>
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyDeploymentScanningData.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyDeploymentScanningData.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyDeploymentScanningData.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,5 +1,6 @@
package org.jboss.resteasy.integration.deployers;
+import javax.ws.rs.core.Application;
import java.util.LinkedHashSet;
import java.util.Set;
@@ -15,8 +16,19 @@
private boolean createDispatcher;
private Set<String> resources = new LinkedHashSet<String>();
private Set<String> providers = new LinkedHashSet<String>();
+ private Class<? extends Application> applicationClass;
private boolean bootClasses;
+ public Class<? extends Application> getApplicationClass()
+ {
+ return applicationClass;
+ }
+
+ public void setApplicationClass(Class<? extends Application> applicationClass)
+ {
+ this.applicationClass = applicationClass;
+ }
+
public boolean hasBootClasses()
{
return bootClasses;
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyEjbDeployer.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyEjbDeployer.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyEjbDeployer.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -10,18 +10,14 @@
import org.jboss.logging.Logger;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.metadata.javaee.spec.ParamValueMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.resteasy.plugins.server.servlet.ResteasyContextParameters;
import org.jboss.resteasy.util.GetRestful;
-import javax.ejb.EJBException;
import javax.ejb.Local;
import javax.ejb.LocalHome;
import javax.ejb.Remote;
-import java.util.ArrayList;
import java.util.HashSet;
-import java.util.List;
import java.util.Set;
/**
@@ -61,7 +57,7 @@
// right now I only support resources
if (!resteasy.isScanResources()) return;
- if (((VFSDeploymentUnit)du).getMetaDataFile("beans.xml") != null) return;
+ if (((VFSDeploymentUnit) du).getMetaDataFile("beans.xml") != null) return;
JBossWebMetaData webdata = du.getAttachment(JBossWebMetaData.class);
JBossMetaData ejbs = (JBossMetaData) du
@@ -99,20 +95,8 @@
{
resteasy.createDispatcher();
String paramValue = buf.toString();
- ParamValueMetaData param = new ParamValueMetaData();
- param.setParamName(ResteasyContextParameters.RESTEASY_JNDI_COMPONENT_RESOURCES);
- param.setParamValue(paramValue);
- List<ParamValueMetaData> params = webdata.getContextParams();
- if (params == null)
- {
- params = new ArrayList<ParamValueMetaData>();
- webdata.setContextParams(params);
- }
- params.add(param);
- param = new ParamValueMetaData();
- param.setParamName(ResteasyContextParameters.RESTEASY_UNWRAPPED_EXCEPTIONS);
- param.setParamValue(EJBException.class.getName());
- params.add(param);
+ log.info("*** Adding RESTEasy JNDi Component Resources: " + paramValue);
+ ResteasyIntegrationDeployer.setContextParameter(webdata, ResteasyContextParameters.RESTEASY_JNDI_COMPONENT_RESOURCES, paramValue);
}
}
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyIntegrationDeployer.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyIntegrationDeployer.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyIntegrationDeployer.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -11,9 +11,10 @@
import org.jboss.metadata.web.spec.FilterMappingMetaData;
import org.jboss.metadata.web.spec.FilterMetaData;
import org.jboss.metadata.web.spec.FiltersMetaData;
-import org.jboss.resteasy.plugins.server.servlet.FilterDispatcher;
+import org.jboss.resteasy.plugins.server.servlet.Filter30Dispatcher;
import org.jboss.resteasy.plugins.server.servlet.ResteasyContextParameters;
+import javax.ws.rs.ApplicationPath;
import java.util.ArrayList;
import java.util.List;
@@ -56,6 +57,21 @@
}
+ public static ParamValueMetaData findContextParam(JBossWebMetaData webdata, String name)
+ {
+ List<ParamValueMetaData> params = webdata.getContextParams();
+ if (params == null) return null;
+ for (ParamValueMetaData param : params)
+ {
+ if (param.getParamName().equals(name))
+ {
+ return param;
+ }
+ }
+ return null;
+ }
+
+
public static void setContextParameter(JBossWebMetaData webdata, String name, String value)
{
ParamValueMetaData param = new ParamValueMetaData();
@@ -75,7 +91,6 @@
{
JBossWebMetaData webdata = du.getAttachment(JBossWebMetaData.class);
ResteasyDeploymentScanningData resteasy = du.getAttachment(ResteasyDeploymentScanningData.class);
- if (!resteasy.shouldCreateDispatcher()) return;
if (!resteasy.getResources().isEmpty())
{
@@ -93,6 +108,7 @@
}
}
String resources = buf.toString();
+ log.info("*** Adding JAX-RS resource classes: " + resources);
setContextParameter(webdata, ResteasyContextParameters.RESTEASY_RESOURCES, resources);
}
if (!resteasy.getProviders().isEmpty())
@@ -110,15 +126,29 @@
buf.append(",").append(provider);
}
}
- setContextParameter(webdata, ResteasyContextParameters.RESTEASY_PROVIDERS, buf.toString());
+ String providers = buf.toString();
+ log.info("*** Adding JAX-RS provider classes: " + providers);
+ setContextParameter(webdata, ResteasyContextParameters.RESTEASY_PROVIDERS, providers);
}
+ boolean useScannedApplicationClass = false;
+
+ if (resteasy.getApplicationClass() != null)
+ {
+ if (findContextParam(webdata, "javax.ws.rs.Application") == null)
+ {
+ useScannedApplicationClass = true;
+ setContextParameter(webdata, "javax.ws.rs.Application", resteasy.getApplicationClass().getName());
+ }
+ }
+
try
{
Thread.currentThread().getContextClassLoader().loadClass(CDI_INJECTOR_FACTORY_CLASS);
// don't set this param if CDI is not in classpath
- if (((VFSDeploymentUnit)du).getMetaDataFile("beans.xml") != null)
+ if (((VFSDeploymentUnit) du).getMetaDataFile("beans.xml") != null)
{
+ log.info("***** Found CDI, adding injector factory class");
setContextParameter(webdata, "resteasy.injector.factory", CDI_INJECTOR_FACTORY_CLASS);
}
}
@@ -126,16 +156,29 @@
{
}
+ ResteasyIntegrationDeployer.setContextParameter(webdata, ResteasyContextParameters.RESTEASY_UNWRAPPED_EXCEPTIONS, "javax.ejb.EJBException");
+
if (resteasy.hasBootClasses()) return;
FilterMetaData filter = new FilterMetaData();
- filter.setFilterClass(FilterDispatcher.class.getName());
+ filter.setFilterClass(Filter30Dispatcher.class.getName());
filter.setName("Resteasy");
+ filter.setAsyncSupported(true);
FilterMappingMetaData mapping = new FilterMappingMetaData();
mapping.setFilterName("Resteasy");
List<String> patterns = new ArrayList<String>();
- patterns.add("/*");
+ if (useScannedApplicationClass && resteasy.getApplicationClass().isAnnotationPresent(ApplicationPath.class))
+ {
+ ApplicationPath path = resteasy.getApplicationClass().getAnnotation(ApplicationPath.class);
+ String pathValue = path.value();
+ patterns.add(pathValue + "/*");
+ setContextParameter(webdata, "resteasy.servlet.mapping.prefix", pathValue);
+ }
+ else
+ {
+ patterns.add("/*");
+ }
mapping.setUrlPatterns(patterns);
if (webdata.getFilters() == null)
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyScannerDeployer.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyScannerDeployer.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/jar/src/main/java/org/jboss/resteasy/integration/deployers/ResteasyScannerDeployer.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -10,7 +10,7 @@
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.FilterMetaData;
import org.jboss.metadata.web.spec.ServletMetaData;
-import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher;
+import org.jboss.resteasy.plugins.server.servlet.HttpServlet30Dispatcher;
import org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrapClasses;
import org.jboss.resteasy.plugins.server.servlet.ResteasyContextParameters;
import org.jboss.scanning.annotations.spi.AnnotationIndex;
@@ -118,7 +118,8 @@
}
if (Application.class.isAssignableFrom(clazz))
{
- servlet.setServletClass(HttpServletDispatcher.class.getName());
+ servlet.setServletClass(HttpServlet30Dispatcher.class.getName());
+ servlet.setAsyncSupported(true);
ParamValueMetaData param = new ParamValueMetaData();
param.setParamName("javax.ws.rs.Application");
param.setParamValue(servletClass);
@@ -129,11 +130,12 @@
servlet.setInitParam(params);
}
params.add(param);
+ ResteasyIntegrationDeployer.setContextParameter(webdata, ResteasyContextParameters.RESTEASY_UNWRAPPED_EXCEPTIONS, "javax.ejb.EJBException");
try
{
Thread.currentThread().getContextClassLoader().loadClass(ResteasyIntegrationDeployer.CDI_INJECTOR_FACTORY_CLASS);
// don't set this param if it is not in classpath
- if (((VFSDeploymentUnit)du).getMetaDataFile("beans.xml") != null)
+ if (((VFSDeploymentUnit) du).getMetaDataFile("beans.xml") != null)
{
ResteasyIntegrationDeployer.setContextParameter(webdata, "resteasy.injector.factory", ResteasyIntegrationDeployer.CDI_INJECTOR_FACTORY_CLASS);
}
@@ -148,12 +150,17 @@
}
+ protected void addApplicationClass(Class<? extends Application> applicationClass, DeploymentUnit du, JBossWebMetaData webdata)
+ {
+
+ }
+
protected void scan(DeploymentUnit du, JBossWebMetaData webdata)
throws DeploymentException
{
ResteasyDeploymentScanningData scanningData = new ResteasyDeploymentScanningData();
- // If there is a resteasy boot class in web.xml, then the default should not be to scan
+ // If there is a resteasy boot class in web.xml, then the default should be to not scan
boolean hasBoot = hasBootClasses(du, webdata);
scanningData.setBootClasses(hasBoot);
@@ -227,9 +234,45 @@
}
return;
}
+ else
+ {
+ }
du.addAttachment(ResteasyDeploymentScanningData.class, scanningData);
+ // look for Application class, return if there is one
+
+ HierarchyIndex hier = du.getAttachment(HierarchyIndex.class);
+ if (hier != null)
+ {
+ Set<Class<? extends Application>> applicationClass = hier.getSubClassesOf(null, Application.class);
+ if (applicationClass != null)
+ {
+ if (applicationClass.size() > 1)
+ {
+ StringBuilder builder = new StringBuilder("Only one JAX-RS Application Class allowed.");
+ for (Class c : applicationClass)
+ {
+ builder.append(" ").append(c.getName());
+ }
+ throw new DeploymentException(builder.toString());
+ }
+ else if (applicationClass.size() == 1)
+ {
+ Class<? extends Application> aClass = applicationClass.iterator().next();
+ scanningData.setApplicationClass(aClass);
+
+ // don't scan for anything else
+ return;
+ }
+ }
+ }
+ else
+ {
+ LOGGER.debug("Expecting HierarchyIndex class for scanning WAR for JAX-RS Application class");
+ }
+
+ // Looked for annotated resources and providers
AnnotationIndex env = du.getAttachment(AnnotationIndex.class);
if (env == null)
{
@@ -237,6 +280,7 @@
return;
}
+
Set<Element<Path, Class<?>>> resources = null;
Set<Element<Provider, Class<?>>> providers = null;
if (scanningData.isScanResources())
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war (from rev 106665, trunk/resteasy-int/test/application-scanned-war)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/pom.xml
===================================================================
--- trunk/resteasy-int/test/application-scanned-war/pom.xml 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/pom.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,90 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-parent</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.jbossas.resteasy.test</groupId>
- <artifactId>application-scan-test</artifactId>
- <packaging>war</packaging>
- <name>Basic Integration Test</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>${version.org.jboss.resteasy}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <finalName>application-scan-test</finalName>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-maven-plugin</artifactId>
- <version>1.3.1</version>
- <configuration>
- <jbossHome>${jboss.home}</jbossHome>
- </configuration>
- <executions>
- <execution>
- <id>jboss-deploy</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy</goal>
- </goals>
- <configuration>
- <fileName>${basedir}/target/application-scan-test.war</fileName>
- </configuration>
- </execution>
- <execution>
- <id>jboss-undeploy</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy</goal>
- </goals>
- <configuration>
- <fileName>${basedir}/target/application-scan-test.war</fileName>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- <executions>
- <execution>
- <id>surefire-it</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/pom.xml (from rev 106665, trunk/resteasy-int/test/application-scanned-war/pom.xml)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/pom.xml (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/pom.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,90 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-parent</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.jbossas.resteasy.test</groupId>
+ <artifactId>application-scan-test</artifactId>
+ <packaging>war</packaging>
+ <name>Basic Integration Test</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxrs</artifactId>
+ <version>${version.org.jboss.resteasy}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <finalName>application-scan-test</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-maven-plugin</artifactId>
+ <version>1.3.1</version>
+ <configuration>
+ <jbossHome>${jboss.home}</jbossHome>
+ </configuration>
+ <executions>
+ <execution>
+ <id>jboss-deploy</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy</goal>
+ </goals>
+ <configuration>
+ <fileName>${basedir}/target/application-scan-test.war</fileName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>jboss-undeploy</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy</goal>
+ </goals>
+ <configuration>
+ <fileName>${basedir}/target/application-scan-test.war</fileName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/main)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/main/java)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/main/java/org)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/main/java/org/jboss)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/smoke (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/smoke)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/smoke/AppConfig.java
===================================================================
--- trunk/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/smoke/AppConfig.java 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/smoke/AppConfig.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,109 +0,0 @@
-package org.jboss.resteasy.test.smoke;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.Provider;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-
-/**
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class AppConfig
-{
- @Path("/my")
- public static class MyResource
- {
- public static int instantiationCount = 0;
-
- public MyResource()
- {
- instantiationCount++;
- }
-
- @GET
- @Produces("text/quoted")
- public String get()
- {
- if (MyApplicationConfig.created == false || instantiationCount > 1)
- {
- throw new WebApplicationException(500);
- }
- return "hello";
- }
-
- @GET
- @Path("exception")
- public String getException()
- {
- throw new FooException();
- }
-
- @GET
- @Path("exception/count")
- @Produces("text/plain")
- public String getCount()
- {
- return Integer.toString(FooExceptionMapper.num_instantiations);
- }
- }
-
- public static class FooException extends RuntimeException
- {
- }
-
- @Provider
- public static class FooExceptionMapper implements ExceptionMapper<FooException>
- {
- public static int num_instantiations = 0;
-
- public FooExceptionMapper()
- {
- num_instantiations++;
- }
-
- public Response toResponse(FooException exception)
- {
- return Response.status(412).build();
- }
- }
-
- @Provider
- @Produces("text/quoted")
- public static class QuotedTextWriter implements MessageBodyWriter<String>
- {
- public static int num_instantiations = 0;
-
- public QuotedTextWriter()
- {
- num_instantiations++;
- }
-
- public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType)
- {
- return type.equals(String.class);
- }
-
- public long getSize(String s, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType)
- {
- return -1;
- }
-
- public void writeTo(String s, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException
- {
- s = "\"" + s + "\"";
- entityStream.write(s.getBytes());
- }
- }
-
-}
\ No newline at end of file
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/smoke/AppConfig.java (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/smoke/AppConfig.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/smoke/AppConfig.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/smoke/AppConfig.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,109 @@
+package org.jboss.resteasy.test.smoke;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+/**
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public class AppConfig
+{
+ @Path("/my")
+ public static class MyResource
+ {
+ public static int instantiationCount = 0;
+
+ public MyResource()
+ {
+ instantiationCount++;
+ }
+
+ @GET
+ @Produces("text/quoted")
+ public String get()
+ {
+ if (MyApplicationConfig.created == false || instantiationCount > 1)
+ {
+ throw new WebApplicationException(500);
+ }
+ return "hello";
+ }
+
+ @GET
+ @Path("exception")
+ public String getException()
+ {
+ throw new FooException();
+ }
+
+ @GET
+ @Path("exception/count")
+ @Produces("text/plain")
+ public String getCount()
+ {
+ return Integer.toString(FooExceptionMapper.num_instantiations);
+ }
+ }
+
+ public static class FooException extends RuntimeException
+ {
+ }
+
+ @Provider
+ public static class FooExceptionMapper implements ExceptionMapper<FooException>
+ {
+ public static int num_instantiations = 0;
+
+ public FooExceptionMapper()
+ {
+ num_instantiations++;
+ }
+
+ public Response toResponse(FooException exception)
+ {
+ return Response.status(412).build();
+ }
+ }
+
+ @Provider
+ @Produces("text/quoted")
+ public static class QuotedTextWriter implements MessageBodyWriter<String>
+ {
+ public static int num_instantiations = 0;
+
+ public QuotedTextWriter()
+ {
+ num_instantiations++;
+ }
+
+ public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType)
+ {
+ return type.equals(String.class);
+ }
+
+ public long getSize(String s, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType)
+ {
+ return -1;
+ }
+
+ public void writeTo(String s, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException
+ {
+ s = "\"" + s + "\"";
+ entityStream.write(s.getBytes());
+ }
+ }
+
+}
\ No newline at end of file
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/smoke/MyApplicationConfig.java
===================================================================
--- trunk/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/smoke/MyApplicationConfig.java 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/smoke/MyApplicationConfig.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,39 +0,0 @@
-package org.jboss.resteasy.test.smoke;
-
-import javax.ws.rs.ApplicationPath;
-import javax.ws.rs.core.Application;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
- at ApplicationPath("/app-path")
-public class MyApplicationConfig extends Application
-{
- private Set<Class<?>> classes = new HashSet<Class<?>>();
- private Set<Object> singletons = new HashSet<Object>();
-
- public static boolean created = false;
-
- public MyApplicationConfig()
- {
- created = true;
- singletons.add(new AppConfig.MyResource());
- singletons.add(new AppConfig.QuotedTextWriter());
- singletons.add(new AppConfig.FooExceptionMapper());
- }
-
- public Set<Class<?>> getClasses()
- {
- return classes;
- }
-
- @Override
- public Set<Object> getSingletons()
- {
- return singletons;
- }
-
-}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/smoke/MyApplicationConfig.java (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/smoke/MyApplicationConfig.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/smoke/MyApplicationConfig.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/java/org/jboss/resteasy/test/smoke/MyApplicationConfig.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,39 @@
+package org.jboss.resteasy.test.smoke;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+ at ApplicationPath("/app-path")
+public class MyApplicationConfig extends Application
+{
+ private Set<Class<?>> classes = new HashSet<Class<?>>();
+ private Set<Object> singletons = new HashSet<Object>();
+
+ public static boolean created = false;
+
+ public MyApplicationConfig()
+ {
+ created = true;
+ singletons.add(new AppConfig.MyResource());
+ singletons.add(new AppConfig.QuotedTextWriter());
+ singletons.add(new AppConfig.FooExceptionMapper());
+ }
+
+ public Set<Class<?>> getClasses()
+ {
+ return classes;
+ }
+
+ @Override
+ public Set<Object> getSingletons()
+ {
+ return singletons;
+ }
+
+}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/resources (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/main/resources)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/webapp (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/main/webapp)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/webapp/WEB-INF (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/main/webapp/WEB-INF)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/resteasy-int/test/application-scanned-war/src/main/webapp/WEB-INF/web.xml 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/webapp/WEB-INF/web.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,6 +0,0 @@
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
- <display-name>Archetype Created Web Application</display-name>
-
-</web-app>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/webapp/WEB-INF/web.xml (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/main/webapp/WEB-INF/web.xml)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/webapp/WEB-INF/web.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,6 @@
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+ <display-name>Archetype Created Web Application</display-name>
+
+</web-app>
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/webapp/index.jsp
===================================================================
--- trunk/resteasy-int/test/application-scanned-war/src/main/webapp/index.jsp 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/webapp/index.jsp 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,5 +0,0 @@
-<html>
-<body>
-<h2>Hello World!</h2>
-</body>
-</html>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/webapp/index.jsp (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/main/webapp/index.jsp)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/webapp/index.jsp (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/main/webapp/index.jsp 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h2>Hello World!</h2>
+</body>
+</html>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/test)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/test/java)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/org (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/test/java/org)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/org/jboss (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/test/java/org/jboss)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/org/jboss/resteasy (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/test/java/org/jboss/resteasy)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/org/jboss/resteasy/test (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/test/java/org/jboss/resteasy/test)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/org/jboss/resteasy/test/jboss (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/test/java/org/jboss/resteasy/test/jboss)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/org/jboss/resteasy/test/jboss/AppConfigTest.java
===================================================================
--- trunk/resteasy-int/test/application-scanned-war/src/test/java/org/jboss/resteasy/test/jboss/AppConfigTest.java 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/org/jboss/resteasy/test/jboss/AppConfigTest.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,67 +0,0 @@
-package org.jboss.resteasy.test.jboss;
-
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.jboss.resteasy.client.ClientRequest;
-import org.jboss.resteasy.client.ClientResponse;
-import org.jboss.resteasy.util.HttpResponseCodes;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.io.IOException;
-
-/**
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class AppConfigTest
-{
- private void _test(HttpClient client, String uri, String body)
- {
- {
- GetMethod method = new GetMethod(uri);
- try
- {
- method.addRequestHeader("Accept", "text/quoted");
- int status = client.executeMethod(method);
- Assert.assertEquals(status, HttpResponseCodes.SC_OK);
- Assert.assertEquals(body, method.getResponseBodyAsString());
- }
- catch (IOException e)
- {
- throw new RuntimeException(e);
- }
- }
-
- }
-
-
- @Test
- public void testIt()
- {
- HttpClient client = new HttpClient();
- _test(client, "http://localhost:8080/application-scan-test/app-path/my", "\"hello\"");
- _test(client, "http://localhost:8080/application-scan-test/app-path/my", "\"hello\"");
- _test(client, "http://localhost:8080/application-scan-test/app-path/my", "\"hello\"");
- }
-
- @Test
- public void testSingletons() throws Exception
- {
- ClientRequest request = new ClientRequest("http://localhost:8080/application-scan-test/app-path/my/exception");
- ClientResponse response = request.get();
- Assert.assertEquals(412, response.getStatus());
-
- ClientRequest countRequest = new ClientRequest("http://localhost:8080/application-scan-test/app-path/my/exception/count");
- String res = countRequest.getTarget(String.class);
- Assert.assertEquals("1", res);
-
- request.clear();
- response = request.get();
- Assert.assertEquals(412, response.getStatus());
-
- countRequest.clear();
- res = countRequest.getTarget(String.class);
- Assert.assertEquals("1", res);
- }
-}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/org/jboss/resteasy/test/jboss/AppConfigTest.java (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/test/java/org/jboss/resteasy/test/jboss/AppConfigTest.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/org/jboss/resteasy/test/jboss/AppConfigTest.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/java/org/jboss/resteasy/test/jboss/AppConfigTest.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,67 @@
+package org.jboss.resteasy.test.jboss;
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.jboss.resteasy.client.ClientRequest;
+import org.jboss.resteasy.client.ClientResponse;
+import org.jboss.resteasy.util.HttpResponseCodes;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.IOException;
+
+/**
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public class AppConfigTest
+{
+ private void _test(HttpClient client, String uri, String body)
+ {
+ {
+ GetMethod method = new GetMethod(uri);
+ try
+ {
+ method.addRequestHeader("Accept", "text/quoted");
+ int status = client.executeMethod(method);
+ Assert.assertEquals(status, HttpResponseCodes.SC_OK);
+ Assert.assertEquals(body, method.getResponseBodyAsString());
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ }
+
+
+ @Test
+ public void testIt()
+ {
+ HttpClient client = new HttpClient();
+ _test(client, "http://localhost:8080/application-scan-test/app-path/my", "\"hello\"");
+ _test(client, "http://localhost:8080/application-scan-test/app-path/my", "\"hello\"");
+ _test(client, "http://localhost:8080/application-scan-test/app-path/my", "\"hello\"");
+ }
+
+ @Test
+ public void testSingletons() throws Exception
+ {
+ ClientRequest request = new ClientRequest("http://localhost:8080/application-scan-test/app-path/my/exception");
+ ClientResponse response = request.get();
+ Assert.assertEquals(412, response.getStatus());
+
+ ClientRequest countRequest = new ClientRequest("http://localhost:8080/application-scan-test/app-path/my/exception/count");
+ String res = countRequest.getTarget(String.class);
+ Assert.assertEquals("1", res);
+
+ request.clear();
+ response = request.get();
+ Assert.assertEquals(412, response.getStatus());
+
+ countRequest.clear();
+ res = countRequest.getTarget(String.class);
+ Assert.assertEquals("1", res);
+ }
+}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/resources (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/test/resources)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/resources/jndi.properties
===================================================================
--- trunk/resteasy-int/test/application-scanned-war/src/test/resources/jndi.properties 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/resources/jndi.properties 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=jnp://localhost:1099
\ No newline at end of file
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/resources/jndi.properties (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/test/resources/jndi.properties)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/resources/jndi.properties (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/resources/jndi.properties 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=jnp://localhost:1099
\ No newline at end of file
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/resources/log4j.xml
===================================================================
--- trunk/resteasy-int/test/application-scanned-war/src/test/resources/log4j.xml 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/resources/log4j.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id: log4j.xml 64736 2007-08-21 15:49:48Z anil.saldhana at jboss.com $ -->
-
-<!--
- | For more configuration infromation and examples see the Jakarta Log4j
- | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ================================= -->
- <!-- Preserve messages in a local file -->
- <!-- ================================= -->
-
- <!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
- <param name="File" value="${build.testlog}/test.log"/>
- <param name="Append" value="true"/>
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <!-- Rollover at the top of each hour
- <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
- -->
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-
- <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
- <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- -->
- </layout>
- </appender>
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Threshold" value="DEBUG"/>
- <param name="Target" value="System.out"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- </layout>
- </appender>
-
-
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
- <appender-ref ref="CONSOLE"/>
- </root>
-
-</log4j:configuration>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/resources/log4j.xml (from rev 106665, trunk/resteasy-int/test/application-scanned-war/src/test/resources/log4j.xml)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/resources/log4j.xml (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/application-scanned-war/src/test/resources/log4j.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml 64736 2007-08-21 15:49:48Z anil.saldhana at jboss.com $ -->
+
+<!--
+ | For more configuration infromation and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <param name="File" value="${build.testlog}/test.log"/>
+ <param name="Append" value="true"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <!-- Rollover at the top of each hour
+ <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+ -->
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+
+ <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+ -->
+ </layout>
+ </appender>
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Threshold" value="DEBUG"/>
+ <param name="Target" value="System.out"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ </root>
+
+</log4j:configuration>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/async-http-servlet-3.0-test.iml
===================================================================
--- trunk/resteasy-int/test/async-http-servlet-3.0-test/async-http-servlet-3.0-test.iml 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/async-http-servlet-3.0-test.iml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.resteasy:resteasy-jaxrs:2.0-rc1-SNAPSHOT" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.resteasy:jaxrs-api:2.0-rc1-SNAPSHOT" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.5.8" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-simple:1.5.8" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:jcl-over-slf4j:1.5.8" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: org.scannotation:scannotation:1.0.2" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: javassist:javassist:3.8.0.GA" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: javax.activation:activation:1.1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: commons-codec:commons-codec:1.2" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.0" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpcore:4.0.1" level="project" />
- <orderEntry type="library" scope="PROVIDED" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
- <orderEntry type="library" exported="" name="Maven: junit:junit:4.1" level="project" />
- </component>
-</module>
-
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/async-http-servlet-3.0-test.iml (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/async-http-servlet-3.0-test.iml)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/async-http-servlet-3.0-test.iml (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/async-http-servlet-3.0-test.iml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.resteasy:resteasy-jaxrs:2.0-rc1-SNAPSHOT" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.resteasy:jaxrs-api:2.0-rc1-SNAPSHOT" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-api:1.5.8" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-simple:1.5.8" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:jcl-over-slf4j:1.5.8" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: org.scannotation:scannotation:1.0.2" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: javassist:javassist:3.8.0.GA" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: javax.activation:activation:1.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: commons-codec:commons-codec:1.2" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.0" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpcore:4.0.1" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
+ <orderEntry type="library" exported="" name="Maven: junit:junit:4.1" level="project" />
+ </component>
+</module>
+
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/pom.xml
===================================================================
--- trunk/resteasy-int/test/async-http-servlet-3.0-test/pom.xml 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/pom.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,91 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs-all</artifactId>
- <version>2.0-rc1-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>async-http-servlet-3.0-test</artifactId>
- <packaging>war</packaging>
- <name>Async Http Servlet 3.0 Test</name>
- <dependencies>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <finalName>async-test</finalName>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-maven-plugin</artifactId>
- <version>1.3.1</version>
- <configuration>
- <jbossHome>${jboss.home}</jbossHome>
- </configuration>
- <executions>
- <execution>
- <id>jboss-deploy</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy</goal>
- </goals>
- <configuration>
- <fileName>${basedir}/target/async-test.war</fileName>
- </configuration>
- </execution>
- <execution>
- <id>jboss-undeploy</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy</goal>
- </goals>
- <configuration>
- <fileName>${basedir}/target/async-test.war</fileName>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- <executions>
- <execution>
- <id>surefire-it</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/pom.xml (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/pom.xml)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/pom.xml (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/pom.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,91 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxrs-all</artifactId>
+ <version>2.0-rc1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>async-http-servlet-3.0-test</artifactId>
+ <packaging>war</packaging>
+ <name>Async Http Servlet 3.0 Test</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxrs</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <finalName>async-test</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-maven-plugin</artifactId>
+ <version>1.3.1</version>
+ <configuration>
+ <jbossHome>${jboss.home}</jbossHome>
+ </configuration>
+ <executions>
+ <execution>
+ <id>jboss-deploy</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy</goal>
+ </goals>
+ <configuration>
+ <fileName>${basedir}/target/async-test.war</fileName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>jboss-undeploy</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy</goal>
+ </goals>
+ <configuration>
+ <fileName>${basedir}/target/async-test.war</fileName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main/java)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/smoke (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/smoke)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/smoke/Customer.java
===================================================================
--- trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/smoke/Customer.java 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/smoke/Customer.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,34 +0,0 @@
-package org.jboss.resteasy.test.smoke;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
- at XmlRootElement
-public class Customer
-{
- private String name;
-
- public Customer()
- {
- }
-
- public Customer(String name)
- {
- this.name = name;
- }
-
- @XmlElement
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/smoke/Customer.java (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/smoke/Customer.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/smoke/Customer.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/smoke/Customer.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,34 @@
+package org.jboss.resteasy.test.smoke;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+ at XmlRootElement
+public class Customer
+{
+ private String name;
+
+ public Customer()
+ {
+ }
+
+ public Customer(String name)
+ {
+ this.name = name;
+ }
+
+ @XmlElement
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+}
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/smoke/SimpleResource.java
===================================================================
--- trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/smoke/SimpleResource.java 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/smoke/SimpleResource.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,85 +0,0 @@
-package org.jboss.resteasy.test.smoke;
-
-import org.jboss.resteasy.annotations.Suspend;
-import org.jboss.resteasy.spi.AsynchronousResponse;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-
-/**
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
- at Path("/")
-public class SimpleResource
-{
-
- @GET
- @Path("basic")
- @Produces("text/plain")
- public void getBasic(final @Suspend(100000) AsynchronousResponse response) throws Exception
- {
- Thread t = new Thread()
- {
- @Override
- public void run()
- {
- try
- {
- System.out.println("STARTED!!!!");
- Thread.sleep(5000);
- Response jaxrs = Response.ok("basic").type(MediaType.TEXT_PLAIN).build();
- response.setResponse(jaxrs);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
- };
- t.start();
-
- }
-
- @GET
- @Path("gzip")
- @Produces("text/plain")
- public void getGzip(final @Suspend(100000) AsynchronousResponse response) throws Exception
- {
- Thread t = new Thread()
- {
- @Override
- public void run()
- {
- try
- {
- System.out.println("STARTED Gzip !!!!");
- Thread.sleep(5000);
- Response jaxrs = Response.ok("HELLO WORLD").type(MediaType.TEXT_PLAIN).header("Content-Encoding", "gzip").build();
- response.setResponse(jaxrs);
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
- };
- t.start();
-
- }
-
-
- @GET
- @Path("xml")
- @Produces("application/xml")
- public Customer getCustomer()
- {
- return new Customer("Bill Burke");
- }
-
-
-}
\ No newline at end of file
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/smoke/SimpleResource.java (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/smoke/SimpleResource.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/smoke/SimpleResource.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/java/org/jboss/resteasy/test/smoke/SimpleResource.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,85 @@
+package org.jboss.resteasy.test.smoke;
+
+import org.jboss.resteasy.annotations.Suspend;
+import org.jboss.resteasy.spi.AsynchronousResponse;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+
+/**
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+ at Path("/")
+public class SimpleResource
+{
+
+ @GET
+ @Path("basic")
+ @Produces("text/plain")
+ public void getBasic(final @Suspend(100000) AsynchronousResponse response) throws Exception
+ {
+ Thread t = new Thread()
+ {
+ @Override
+ public void run()
+ {
+ try
+ {
+ System.out.println("STARTED!!!!");
+ Thread.sleep(5000);
+ Response jaxrs = Response.ok("basic").type(MediaType.TEXT_PLAIN).build();
+ response.setResponse(jaxrs);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+ };
+ t.start();
+
+ }
+
+ @GET
+ @Path("gzip")
+ @Produces("text/plain")
+ public void getGzip(final @Suspend(100000) AsynchronousResponse response) throws Exception
+ {
+ Thread t = new Thread()
+ {
+ @Override
+ public void run()
+ {
+ try
+ {
+ System.out.println("STARTED Gzip !!!!");
+ Thread.sleep(5000);
+ Response jaxrs = Response.ok("HELLO WORLD").type(MediaType.TEXT_PLAIN).header("Content-Encoding", "gzip").build();
+ response.setResponse(jaxrs);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+ };
+ t.start();
+
+ }
+
+
+ @GET
+ @Path("xml")
+ @Produces("application/xml")
+ public Customer getCustomer()
+ {
+ return new Customer("Bill Burke");
+ }
+
+
+}
\ No newline at end of file
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/resources (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main/resources)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/resources/roles.properties
===================================================================
--- trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main/resources/roles.properties 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/resources/roles.properties 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1 +0,0 @@
-bill=admin
\ No newline at end of file
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/resources/roles.properties (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main/resources/roles.properties)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/resources/roles.properties (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/resources/roles.properties 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1 @@
+bill=admin
\ No newline at end of file
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/resources/users.properties
===================================================================
--- trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main/resources/users.properties 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/resources/users.properties 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1 +0,0 @@
-bill=password
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/resources/users.properties (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main/resources/users.properties)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/resources/users.properties (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/resources/users.properties 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1 @@
+bill=password
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/WEB-INF (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/WEB-INF)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/WEB-INF/jboss-web.xml 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/WEB-INF/jboss-web.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,5 +0,0 @@
-<jboss-web>
- <security-domain>java:/jaas/other</security-domain>
- <context-root>resteasy</context-root>
-
-</jboss-web>
\ No newline at end of file
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/WEB-INF/jboss-web.xml (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/WEB-INF/jboss-web.xml)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/WEB-INF/jboss-web.xml (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/WEB-INF/jboss-web.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,5 @@
+<jboss-web>
+ <security-domain>java:/jaas/other</security-domain>
+ <context-root>resteasy</context-root>
+
+</jboss-web>
\ No newline at end of file
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/WEB-INF/web.xml 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/WEB-INF/web.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,5 +0,0 @@
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-</web-app>
-
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/WEB-INF/web.xml (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/WEB-INF/web.xml)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/WEB-INF/web.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,5 @@
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+</web-app>
+
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/index.jsp
===================================================================
--- trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/index.jsp 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/index.jsp 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,5 +0,0 @@
-<html>
-<body>
-<h2>Hello World!</h2>
-</body>
-</html>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/index.jsp (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/index.jsp)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/index.jsp (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/main/webapp/index.jsp 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h2>Hello World!</h2>
+</body>
+</html>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/test)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/test/java)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss/resteasy (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss/resteasy)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss/resteasy/test (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss/resteasy/test)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss/resteasy/test/jboss (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss/resteasy/test/jboss)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss/resteasy/test/jboss/SmokeTest.java
===================================================================
--- trunk/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss/resteasy/test/jboss/SmokeTest.java 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss/resteasy/test/jboss/SmokeTest.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,91 +0,0 @@
-package org.jboss.resteasy.test.jboss;
-
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.jboss.resteasy.test.smoke.Customer;
-import org.jboss.resteasy.util.HttpResponseCodes;
-import org.junit.Assert;
-import org.junit.Test;
-
-import javax.xml.bind.JAXBContext;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringReader;
-import java.util.zip.GZIPInputStream;
-
-
-/**
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class SmokeTest
-{
- @Test
- public void testNoDefaultsResource() throws Exception
- {
- HttpClient client = new HttpClient();
-
- {
- GetMethod method = new GetMethod("http://localhost:8080/resteasy/basic");
- int status = client.executeMethod(method);
- Assert.assertEquals(HttpResponseCodes.SC_OK, status);
- Assert.assertEquals("basic", method.getResponseBodyAsString());
- method.releaseConnection();
- }
- {
- // I'm testing unknown content-length here
- GetMethod method = new GetMethod("http://localhost:8080/resteasy/xml");
- int status = client.executeMethod(method);
- Assert.assertEquals(HttpResponseCodes.SC_OK, status);
- String result = method.getResponseBodyAsString();
- JAXBContext ctx = JAXBContext.newInstance(Customer.class);
- Customer cust = (Customer) ctx.createUnmarshaller().unmarshal(new StringReader(result));
- Assert.assertEquals("Bill Burke", cust.getName());
- method.releaseConnection();
- }
-
- }
-
- public String readString(InputStream in) throws IOException
- {
- char[] buffer = new char[1024];
- StringBuilder builder = new StringBuilder();
- BufferedReader reader = new BufferedReader(new InputStreamReader(in));
- int wasRead = 0;
- do
- {
- wasRead = reader.read(buffer, 0, 1024);
- if (wasRead > 0)
- {
- builder.append(buffer, 0, wasRead);
- }
- }
- while (wasRead > -1);
-
- return builder.toString();
- }
-
-
- @Test
- public void testGzip() throws Exception
- {
- HttpClient client = new HttpClient();
- {
- GetMethod get = new GetMethod("http://localhost:8080/resteasy/gzip");
- get.addRequestHeader("Accept-Encoding", "gzip, deflate");
- int status = client.executeMethod(get);
- Assert.assertEquals(200, status);
- Assert.assertEquals("gzip", get.getResponseHeader("Content-Encoding").getValue());
- GZIPInputStream gzip = new GZIPInputStream(get.getResponseBodyAsStream());
- String response = readString(gzip);
-
-
- // test that it is actually zipped
- Assert.assertEquals(response, "HELLO WORLD");
- }
-
- }
-
-}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss/resteasy/test/jboss/SmokeTest.java (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss/resteasy/test/jboss/SmokeTest.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss/resteasy/test/jboss/SmokeTest.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/java/org/jboss/resteasy/test/jboss/SmokeTest.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,91 @@
+package org.jboss.resteasy.test.jboss;
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.jboss.resteasy.test.smoke.Customer;
+import org.jboss.resteasy.util.HttpResponseCodes;
+import org.junit.Assert;
+import org.junit.Test;
+
+import javax.xml.bind.JAXBContext;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.util.zip.GZIPInputStream;
+
+
+/**
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public class SmokeTest
+{
+ @Test
+ public void testNoDefaultsResource() throws Exception
+ {
+ HttpClient client = new HttpClient();
+
+ {
+ GetMethod method = new GetMethod("http://localhost:8080/resteasy/basic");
+ int status = client.executeMethod(method);
+ Assert.assertEquals(HttpResponseCodes.SC_OK, status);
+ Assert.assertEquals("basic", method.getResponseBodyAsString());
+ method.releaseConnection();
+ }
+ {
+ // I'm testing unknown content-length here
+ GetMethod method = new GetMethod("http://localhost:8080/resteasy/xml");
+ int status = client.executeMethod(method);
+ Assert.assertEquals(HttpResponseCodes.SC_OK, status);
+ String result = method.getResponseBodyAsString();
+ JAXBContext ctx = JAXBContext.newInstance(Customer.class);
+ Customer cust = (Customer) ctx.createUnmarshaller().unmarshal(new StringReader(result));
+ Assert.assertEquals("Bill Burke", cust.getName());
+ method.releaseConnection();
+ }
+
+ }
+
+ public String readString(InputStream in) throws IOException
+ {
+ char[] buffer = new char[1024];
+ StringBuilder builder = new StringBuilder();
+ BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+ int wasRead = 0;
+ do
+ {
+ wasRead = reader.read(buffer, 0, 1024);
+ if (wasRead > 0)
+ {
+ builder.append(buffer, 0, wasRead);
+ }
+ }
+ while (wasRead > -1);
+
+ return builder.toString();
+ }
+
+
+ @Test
+ public void testGzip() throws Exception
+ {
+ HttpClient client = new HttpClient();
+ {
+ GetMethod get = new GetMethod("http://localhost:8080/resteasy/gzip");
+ get.addRequestHeader("Accept-Encoding", "gzip, deflate");
+ int status = client.executeMethod(get);
+ Assert.assertEquals(200, status);
+ Assert.assertEquals("gzip", get.getResponseHeader("Content-Encoding").getValue());
+ GZIPInputStream gzip = new GZIPInputStream(get.getResponseBodyAsStream());
+ String response = readString(gzip);
+
+
+ // test that it is actually zipped
+ Assert.assertEquals(response, "HELLO WORLD");
+ }
+
+ }
+
+}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/resources (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/test/resources)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/resources/jndi.properties
===================================================================
--- trunk/resteasy-int/test/async-http-servlet-3.0-test/src/test/resources/jndi.properties 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/resources/jndi.properties 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=jnp://localhost:1099
\ No newline at end of file
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/resources/jndi.properties (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/test/resources/jndi.properties)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/resources/jndi.properties (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/resources/jndi.properties 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=jnp://localhost:1099
\ No newline at end of file
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/resources/log4j.xml
===================================================================
--- trunk/resteasy-int/test/async-http-servlet-3.0-test/src/test/resources/log4j.xml 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/resources/log4j.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id: log4j.xml 64736 2007-08-21 15:49:48Z anil.saldhana at jboss.com $ -->
-
-<!--
- | For more configuration infromation and examples see the Jakarta Log4j
- | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ================================= -->
- <!-- Preserve messages in a local file -->
- <!-- ================================= -->
-
- <!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
- <param name="File" value="${build.testlog}/test.log"/>
- <param name="Append" value="true"/>
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <!-- Rollover at the top of each hour
- <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
- -->
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-
- <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
- <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- -->
- </layout>
- </appender>
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Threshold" value="DEBUG"/>
- <param name="Target" value="System.out"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- </layout>
- </appender>
-
-
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
- <appender-ref ref="CONSOLE"/>
- </root>
-
-</log4j:configuration>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/resources/log4j.xml (from rev 106665, trunk/resteasy-int/test/async-http-servlet-3.0-test/src/test/resources/log4j.xml)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/resources/log4j.xml (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/async-http-servlet-3.0-test/src/test/resources/log4j.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml 64736 2007-08-21 15:49:48Z anil.saldhana at jboss.com $ -->
+
+<!--
+ | For more configuration infromation and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <param name="File" value="${build.testlog}/test.log"/>
+ <param name="Append" value="true"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <!-- Rollover at the top of each hour
+ <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+ -->
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+
+ <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+ -->
+ </layout>
+ </appender>
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Threshold" value="DEBUG"/>
+ <param name="Target" value="System.out"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ </root>
+
+</log4j:configuration>
Property changes on: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2
___________________________________________________________________
Name: svn:ignore
+ target
.classpath
.project
.settings
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/SubResource.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/SubResource.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/SubResource.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,18 +0,0 @@
-package org.jboss.resteasy.cdi.test;
-
-import java.io.Serializable;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
-
- at Produces("text/plain")
-public class SubResource implements Serializable
-{
- private static final long serialVersionUID = 8722971164845596111L;
-
- @GET
- public String foo()
- {
- return "bar";
- }
-}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/Subresource.java (from rev 106665, trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/Subresource.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/Subresource.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/Subresource.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,129 @@
+package org.jboss.resteasy.cdi.test;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+ at Produces("text/plain")
+ at RequestScoped
+public class Subresource implements Serializable
+{
+ private static final long serialVersionUID = 8722971164845596111L;
+
+ @Inject
+ private Cat cat;
+ private Cat constructorCat;
+ private Cat initializerCat;
+ @Context
+ private UriInfo uriInfo;
+ @QueryParam("foo")
+ private String fieldQuery;
+ private UriInfo setterUriInfo;
+ @Inject
+ private Subresource subresource;
+
+ public Subresource()
+ {
+ }
+
+ @Inject
+ public Subresource(Cat cat)
+ {
+ constructorCat = cat;
+ }
+
+ @Inject
+ public void init(Cat cat)
+ {
+ initializerCat = cat;
+ }
+
+ @GET
+ @Path("/fieldInjection")
+ public boolean fieldInjection()
+ {
+ return cat != null;
+ }
+
+ @GET
+ @Path("/jaxrsFieldInjection")
+ public boolean jaxrsFieldInjection()
+ {
+ return uriInfo != null;
+ }
+
+ @GET
+ @Path("/jaxrsFieldInjection2")
+ public String jaxrsFieldInjection2()
+ {
+ return fieldQuery;
+ }
+
+ @GET
+ @Path("/jaxrsSetterInjection")
+ public boolean jaxrsSetterInjection()
+ {
+ return setterUriInfo != null;
+ }
+
+ @GET
+ @Path("/constructorInjection")
+ public boolean constructorInjection()
+ {
+ return constructorCat != null;
+ }
+
+ @GET
+ @Path("/initializerInjection")
+ public boolean initializerInjection()
+ {
+ return initializerCat != null;
+ }
+
+ @GET
+ @Path("/jaxrsMethodInjection")
+ public String jaxrsMethodInjection(@QueryParam("foo") String query)
+ {
+ return query;
+ }
+
+ @GET
+ @Path("/toString")
+ @Override
+ public String toString()
+ {
+ return super.toString();
+ }
+
+ @GET
+ @Path("/providers")
+ public Dog testProviders()
+ {
+ return new Dog();
+ }
+
+ @Context
+ public void setSetterUriInfo(UriInfo setterUriInfo)
+ {
+ this.setterUriInfo = setterUriInfo;
+ }
+
+ @Path("/subresource")
+ public Subresource subresource()
+ {
+ return subresource;
+ }
+
+ @GET
+ public String getBar()
+ {
+ return "bar";
+ }
+}
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/ApplicationScopedTestResource.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/ApplicationScopedTestResource.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/ApplicationScopedTestResource.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -11,7 +11,7 @@
import org.jboss.resteasy.cdi.test.Cat;
import org.jboss.resteasy.cdi.test.Dog;
-import org.jboss.resteasy.cdi.test.SubResource;
+import org.jboss.resteasy.cdi.test.Subresource;
@Path("applicationResource")
@Produces("text/plain")
@@ -26,7 +26,7 @@
private UriInfo uriInfo;
private UriInfo setterUriInfo;
@Inject
- private SubResource subResource;
+ private Subresource subresource;
public ApplicationScopedTestResource()
{
@@ -105,9 +105,9 @@
this.setterUriInfo = setterUriInfo;
}
- @Path("/subResource")
- public SubResource subResource()
+ @Path("/subresource")
+ public Subresource subresource()
{
- return subResource;
+ return subresource;
}
}
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/TestResource.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/TestResource.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/basic/TestResource.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -10,7 +10,7 @@
import org.jboss.resteasy.cdi.test.Cat;
import org.jboss.resteasy.cdi.test.Dog;
-import org.jboss.resteasy.cdi.test.SubResource;
+import org.jboss.resteasy.cdi.test.Subresource;
@Path("/resource")
@@ -27,7 +27,7 @@
private String fieldQuery;
private UriInfo setterUriInfo;
@Inject
- private SubResource subResource;
+ private Subresource subresource;
public TestResource()
{
@@ -115,9 +115,9 @@
this.setterUriInfo = setterUriInfo;
}
- @Path("/subResource")
- public SubResource subResource()
+ @Path("/subresource")
+ public Subresource subresource()
{
- return subResource;
+ return subresource;
}
}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource.java (from rev 106665, trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,116 @@
+package org.jboss.resteasy.cdi.test.ejb;
+
+import javax.ejb.EJB;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+import javax.inject.Inject;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+import org.jboss.resteasy.cdi.test.Cat;
+import org.jboss.resteasy.cdi.test.Dog;
+import org.jboss.resteasy.cdi.test.Subresource;
+
+ at Stateful
+public class StatefulSessionBeanResource implements StatefulSessionBeanResourceLocal
+{
+ private static int uniqueId = 0;
+ private int id = uniqueId++;
+
+ @Inject
+ private Cat cat;
+ @EJB
+ private InjectedStatelessEjbLocal statelessEjb;
+ private Cat constructorCat;
+ private Cat initializerCat;
+ @Context
+ private UriInfo uriInfo;
+ @QueryParam("foo")
+ String fieldQuery;
+ private UriInfo setterUriInfo;
+ @Inject
+ private Subresource subresource;
+
+ public StatefulSessionBeanResource()
+ {
+ }
+
+ @Inject
+ public StatefulSessionBeanResource(Cat cat)
+ {
+ constructorCat = cat;
+ }
+
+ @Inject
+ public void init(Cat cat)
+ {
+ initializerCat = cat;
+ }
+
+ public boolean fieldInjection()
+ {
+ return cat != null;
+ }
+
+ public boolean ejbFieldInjection()
+ {
+ return statelessEjb.foo();
+ }
+
+ public boolean jaxrsFieldInjection()
+ {
+ return uriInfo != null;
+ }
+
+ public String jaxrsFieldInjection2()
+ {
+ return fieldQuery;
+ }
+
+ public boolean jaxrsSetterInjection()
+ {
+ return setterUriInfo != null;
+ }
+
+ public boolean constructorInjection()
+ {
+ return constructorCat != null;
+ }
+
+ public boolean initializerInjection()
+ {
+ return initializerCat != null;
+ }
+
+ public String jaxrsMethodInjection(String query)
+ {
+ return query;
+ }
+
+ public int getId()
+ {
+ return id;
+ }
+
+ public Dog testProviders()
+ {
+ return new Dog();
+ }
+
+ @Context
+ public void setSetterUriInfo(UriInfo setterUriInfo)
+ {
+ this.setterUriInfo = setterUriInfo;
+ }
+
+ public Subresource subresource()
+ {
+ return subresource;
+ }
+
+ @Remove
+ public void remove()
+ {
+ }
+}
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource1.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource1.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource1.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,116 +0,0 @@
-package org.jboss.resteasy.cdi.test.ejb;
-
-import javax.ejb.EJB;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.inject.Inject;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.UriInfo;
-
-import org.jboss.resteasy.cdi.test.Cat;
-import org.jboss.resteasy.cdi.test.Dog;
-import org.jboss.resteasy.cdi.test.SubResource;
-
- at Stateful
-public class StatefulSessionBeanResource1 implements StatefulSessionBeanResource1Local
-{
- private static int uniqueId = 0;
- private int id = uniqueId++;
-
- @Inject
- private Cat cat;
- @EJB
- private InjectedStatelessEjbLocal statelessEjb;
- private Cat constructorCat;
- private Cat initializerCat;
- @Context
- private UriInfo uriInfo;
- @QueryParam("foo")
- String fieldQuery;
- private UriInfo setterUriInfo;
- @Inject
- private SubResource subResource;
-
- public StatefulSessionBeanResource1()
- {
- }
-
- @Inject
- public StatefulSessionBeanResource1(Cat cat)
- {
- constructorCat = cat;
- }
-
- @Inject
- public void init(Cat cat)
- {
- initializerCat = cat;
- }
-
- public boolean fieldInjection()
- {
- return cat != null;
- }
-
- public boolean ejbFieldInjection()
- {
- return statelessEjb.foo();
- }
-
- public boolean jaxrsFieldInjection()
- {
- return uriInfo != null;
- }
-
- public String jaxrsFieldInjection2()
- {
- return fieldQuery;
- }
-
- public boolean jaxrsSetterInjection()
- {
- return setterUriInfo != null;
- }
-
- public boolean constructorInjection()
- {
- return constructorCat != null;
- }
-
- public boolean initializerInjection()
- {
- return initializerCat != null;
- }
-
- public String jaxrsMethodInjection(String query)
- {
- return query;
- }
-
- public int getId()
- {
- return id;
- }
-
- public Dog testProviders()
- {
- return new Dog();
- }
-
- @Context
- public void setSetterUriInfo(UriInfo setterUriInfo)
- {
- this.setterUriInfo = setterUriInfo;
- }
-
- public SubResource subResource()
- {
- return subResource;
- }
-
- @Remove
- public void remove()
- {
- }
-}
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource1Local.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource1Local.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource1Local.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,64 +0,0 @@
-package org.jboss.resteasy.cdi.test.ejb;
-
-import javax.ejb.Local;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.UriInfo;
-
-import org.jboss.resteasy.cdi.test.Dog;
-import org.jboss.resteasy.cdi.test.SubResource;
-
- at Local
- at Path("/statefulEjbResourceWithAnnotationsOnLocalInterface")
- at Produces("text/plain")
-public interface StatefulSessionBeanResource1Local
-{
- @GET
- @Path("/fieldInjection")
- public boolean fieldInjection();
-
- @GET
- @Path("/ejbFieldInjection")
- public boolean ejbFieldInjection();
-
- @GET
- @Path("/jaxrsFieldInjection")
- public boolean jaxrsFieldInjection();
-
- @GET
- @Path("/jaxrsFieldInjection2")
- public String jaxrsFieldInjection2();
-
- @GET
- @Path("/jaxrsSetterInjection")
- public boolean jaxrsSetterInjection();
-
- @GET
- @Path("/constructorInjection")
- public boolean constructorInjection();
-
- @GET
- @Path("/initializerInjection")
- public boolean initializerInjection();
-
- @GET
- @Path("/jaxrsMethodInjection")
- public String jaxrsMethodInjection(@QueryParam("foo") String query);
-
- @GET
- @Path("/toString")
- public int getId();
-
- @GET
- @Path("/providers")
- public Dog testProviders();
-
- public void setSetterUriInfo(UriInfo setterUriInfo);
-
- @Path("/subResource")
- public SubResource subResource();
-
- public void remove();
-}
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource2.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource2.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource2.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,142 +0,0 @@
-package org.jboss.resteasy.cdi.test.ejb;
-
-import javax.ejb.EJB;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.UriInfo;
-
-import org.jboss.resteasy.cdi.test.Cat;
-import org.jboss.resteasy.cdi.test.Dog;
-import org.jboss.resteasy.cdi.test.SubResource;
-
- at Stateful
- at Path("/statefulEjbResourceWithAnnotationsOnBeanClass")
- at Produces("text/plain")
-public class StatefulSessionBeanResource2 implements StatefulSessionBeanResource2Local
-{
- private static int uniqueId = 0;
- private int id = uniqueId++;
-
- @Inject
- private Cat cat;
- @EJB
- private InjectedStatelessEjbLocal statelessEjb;
- private Cat constructorCat;
- private Cat initializerCat;
- @Context
- private UriInfo uriInfo;
- @QueryParam("foo")
- String fieldQuery;
- private UriInfo setterUriInfo;
- @Inject
- private SubResource subResource;
-
- public StatefulSessionBeanResource2()
- {
- }
-
- @Inject
- public StatefulSessionBeanResource2(Cat cat)
- {
- constructorCat = cat;
- }
-
- @Inject
- public void init(Cat cat)
- {
- initializerCat = cat;
- }
-
- @GET
- @Path("/fieldInjection")
- public boolean fieldInjection()
- {
- return cat != null;
- }
-
- @GET
- @Path("/ejbFieldInjection")
- public boolean ejbFieldInjection()
- {
- return statelessEjb.foo();
- }
-
- @GET
- @Path("/jaxrsFieldInjection")
- public boolean jaxrsFieldInjection()
- {
- return uriInfo != null;
- }
-
- @GET
- @Path("/jaxrsFieldInjection2")
- public String jaxrsFieldInjection2()
- {
- return fieldQuery;
- }
-
- @GET
- @Path("/jaxrsSetterInjection")
- public boolean jaxrsSetterInjection()
- {
- return setterUriInfo != null;
- }
-
- @GET
- @Path("/constructorInjection")
- public boolean constructorInjection()
- {
- return constructorCat != null;
- }
-
- @GET
- @Path("/initializerInjection")
- public boolean initializerInjection()
- {
- return initializerCat != null;
- }
-
- @GET
- @Path("/jaxrsMethodInjection")
- public String jaxrsMethodInjection(@QueryParam("foo") String query)
- {
- return query;
- }
-
- @GET
- @Path("/toString")
- public int getId()
- {
- return id;
- }
-
- @GET
- @Path("/providers")
- public Dog testProviders()
- {
- return new Dog();
- }
-
- @Context
- public void setSetterUriInfo(UriInfo setterUriInfo)
- {
- this.setterUriInfo = setterUriInfo;
- }
-
- @Path("/subResource")
- public SubResource subResource()
- {
- return subResource;
- }
-
- @Remove
- public void remove()
- {
- }
-}
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource2Local.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource2Local.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResource2Local.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,27 +0,0 @@
-package org.jboss.resteasy.cdi.test.ejb;
-
-import javax.ejb.Local;
-import javax.ws.rs.core.UriInfo;
-
-import org.jboss.resteasy.cdi.test.Cat;
-import org.jboss.resteasy.cdi.test.Dog;
-import org.jboss.resteasy.cdi.test.SubResource;
-
- at Local
-public interface StatefulSessionBeanResource2Local
-{
- void init(Cat cat);
- boolean fieldInjection();
- boolean ejbFieldInjection();
- boolean jaxrsFieldInjection();
- String jaxrsFieldInjection2();
- boolean jaxrsSetterInjection();
- boolean constructorInjection();
- boolean initializerInjection();
- String jaxrsMethodInjection(String query);
- int getId();
- Dog testProviders();
- void setSetterUriInfo(UriInfo setterUriInfo);
- SubResource subResource();
- void remove();
-}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResourceLocal.java (from rev 106665, trunk/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResourceLocal.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResourceLocal.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatefulSessionBeanResourceLocal.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,64 @@
+package org.jboss.resteasy.cdi.test.ejb;
+
+import javax.ejb.Local;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.UriInfo;
+
+import org.jboss.resteasy.cdi.test.Dog;
+import org.jboss.resteasy.cdi.test.Subresource;
+
+ at Local
+ at Path("/statefulSessionBeanResource")
+ at Produces("text/plain")
+public interface StatefulSessionBeanResourceLocal
+{
+ @GET
+ @Path("/fieldInjection")
+ public boolean fieldInjection();
+
+ @GET
+ @Path("/ejbFieldInjection")
+ public boolean ejbFieldInjection();
+
+ @GET
+ @Path("/jaxrsFieldInjection")
+ public boolean jaxrsFieldInjection();
+
+ @GET
+ @Path("/jaxrsFieldInjection2")
+ public String jaxrsFieldInjection2();
+
+ @GET
+ @Path("/jaxrsSetterInjection")
+ public boolean jaxrsSetterInjection();
+
+ @GET
+ @Path("/constructorInjection")
+ public boolean constructorInjection();
+
+ @GET
+ @Path("/initializerInjection")
+ public boolean initializerInjection();
+
+ @GET
+ @Path("/jaxrsMethodInjection")
+ public String jaxrsMethodInjection(@QueryParam("foo") String query);
+
+ @GET
+ @Path("/toString")
+ public int getId();
+
+ @GET
+ @Path("/providers")
+ public Dog testProviders();
+
+ public void setSetterUriInfo(UriInfo setterUriInfo);
+
+ @Path("/subresource")
+ public Subresource subresource();
+
+ public void remove();
+}
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResource.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResource.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResource.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -10,7 +10,7 @@
import org.jboss.resteasy.cdi.test.Cat;
import org.jboss.resteasy.cdi.test.Dog;
-import org.jboss.resteasy.cdi.test.SubResource;
+import org.jboss.resteasy.cdi.test.Subresource;
@Stateless
@Dependent
@@ -29,7 +29,7 @@
private UriInfo uriInfo;
private UriInfo setterUriInfo;
@Inject
- private SubResource subResource;
+ private Subresource subresource;
public StatelessSessionBeanResource()
{
@@ -98,9 +98,9 @@
this.setterUriInfo = setterUriInfo;
}
- public SubResource subResource()
+ public Subresource subresource()
{
- return subResource;
+ return subresource;
}
@Remove
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResourceLocal.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResourceLocal.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/ejb/StatelessSessionBeanResourceLocal.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -8,7 +8,7 @@
import javax.ws.rs.core.UriInfo;
import org.jboss.resteasy.cdi.test.Dog;
-import org.jboss.resteasy.cdi.test.SubResource;
+import org.jboss.resteasy.cdi.test.Subresource;
@Local
@Path("/statelessEjb")
@@ -53,8 +53,8 @@
public void setSetterUriInfo(UriInfo setterUriInfo);
- @Path("/subResource")
- public SubResource subResource();
+ @Path("/subresource")
+ public Subresource subresource();
public void remove();
}
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/interceptor/TestResource.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/interceptor/TestResource.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/main/java/org/jboss/resteasy/cdi/test/interceptor/TestResource.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -3,6 +3,8 @@
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
/**
* This test verifies that a JAX-RS resource method invocation
@@ -15,12 +17,23 @@
@Path("/interceptor")
@Produces("text/plain")
- at TestInterceptorBinding
public class TestResource
{
+ @Context
+ private UriInfo uriInfo;
+
@GET
+ @Path("/interceptedMethod")
+ @TestInterceptorBinding
public boolean getValue()
{
return false;
}
+
+ @GET
+ @Path("/jaxrsFieldInjection")
+ public boolean jaxrsFieldInjection()
+ {
+ return uriInfo != null;
+ }
}
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractResourceTest.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractResourceTest.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/AbstractResourceTest.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -44,8 +44,8 @@
}
@Test
- public void testSubResource()
+ public void testSubresource()
{
- testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "subResource", "bar");
+ testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "subresource", "bar");
}
}
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/InterceptorTest.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/InterceptorTest.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/InterceptorTest.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -8,6 +8,13 @@
@Test
public void testInterceptor()
{
- testPlainTextReadonlyResource(BASE_URI + "interceptor", true);
+ testPlainTextReadonlyResource(BASE_URI + "interceptor/interceptedMethod", true);
}
+
+ // @Test
+ // WELD-557
+ public void testJaxrsFieldInjection()
+ {
+ testPlainTextReadonlyResource(BASE_URI + "interceptor/jaxrsFieldInjection", true);
+ }
}
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatefulSessionBeanWithAnnotationsOnBeanClassTest.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatefulSessionBeanWithAnnotationsOnBeanClassTest.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatefulSessionBeanWithAnnotationsOnBeanClassTest.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,34 +0,0 @@
-package org.jboss.resteasy.cdi.test;
-
-import org.junit.Test;
-
-
-public class StatefulSessionBeanWithAnnotationsOnBeanClassTest extends ResourceTest
-{
-
- @Override
- protected String getTestPrefix()
- {
- return "statefulEjbResourceWithAnnotationsOnBeanClass/";
- }
-
- @Test
- public void testEjbFieldInjection()
- {
- testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "ejbFieldInjection", true);
- }
-
- @Override
- // WELDINT-31 This test is disabled temporarily
- public void testCdiConstructorInjection()
- {
- }
-
- @Override
- // This test is disabled temporarily
- public void testSubResource()
- {
- }
-
-
-}
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatefulSessionBeanWithAnnotationsOnLocalInterfaceTest.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatefulSessionBeanWithAnnotationsOnLocalInterfaceTest.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/StatefulSessionBeanWithAnnotationsOnLocalInterfaceTest.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,17 +1,31 @@
package org.jboss.resteasy.cdi.test;
-public class StatefulSessionBeanWithAnnotationsOnLocalInterfaceTest extends StatefulSessionBeanWithAnnotationsOnBeanClassTest
+import org.junit.Test;
+
+public class StatefulSessionBeanWithAnnotationsOnLocalInterfaceTest extends ResourceTest
{
@Override
protected String getTestPrefix()
{
- return "statefulEjbResourceWithAnnotationsOnLocalInterface/";
+ return "statefulSessionBeanResource/";
}
+ @Test
+ public void testEjbFieldInjection()
+ {
+ testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "ejbFieldInjection", true);
+ }
+
@Override
// WELDINT-31 This test is disabled temporarily
public void testCdiConstructorInjection()
{
}
+
+ @Override
+ // This test is disabled temporarily
+ public void testSubresource()
+ {
+ }
}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/SubresourceTest.java (from rev 106665, trunk/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/SubresourceTest.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/SubresourceTest.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/cdi-test-2/src/test/java/org/jboss/resteasy/cdi/test/SubresourceTest.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,10 @@
+package org.jboss.resteasy.cdi.test;
+
+public class SubresourceTest extends ResourceTest
+{
+ @Override
+ protected String getTestPrefix()
+ {
+ return "resource/subresource/";
+ }
+}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war (from rev 106665, trunk/resteasy-int/test/ejb-jar-war)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-jar)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/pom.xml
===================================================================
--- trunk/resteasy-int/test/ejb-jar-war/ejb-jar/pom.xml 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/pom.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,39 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-parent</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.jbossas.resteasy.test</groupId>
- <artifactId>ejb-jar</artifactId>
- <packaging>jar</packaging>
- <name>Basic Integration Test</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>${version.org.jboss.resteasy}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.ejb</groupId>
- <artifactId>jboss-ejb-api_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/pom.xml (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-jar/pom.xml)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/pom.xml (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/pom.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-parent</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.jbossas.resteasy.test</groupId>
+ <artifactId>ejb-jar</artifactId>
+ <packaging>jar</packaging>
+ <name>Basic Integration Test</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxrs</artifactId>
+ <version>${version.org.jboss.resteasy}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-jar/src)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-jar/src/main)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyException.java
===================================================================
--- trunk/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyException.java 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyException.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,9 +0,0 @@
-package org.jboss.resteasy.test;
-
-/**
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class MyException extends RuntimeException
-{
-}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyException.java (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyException.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyException.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyException.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,9 @@
+package org.jboss.resteasy.test;
+
+/**
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public class MyException extends RuntimeException
+{
+}
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyExceptionMapper.java
===================================================================
--- trunk/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyExceptionMapper.java 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyExceptionMapper.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,18 +0,0 @@
-package org.jboss.resteasy.test;
-
-import javax.ws.rs.core.Response;
-import javax.ws.rs.ext.ExceptionMapper;
-import javax.ws.rs.ext.Provider;
-
-/**
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
- at Provider
-public class MyExceptionMapper implements ExceptionMapper<MyException>
-{
- public Response toResponse(MyException e)
- {
- return Response.status(412).type("text/plain").entity("MyException thrown").build();
- }
-}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyExceptionMapper.java (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyExceptionMapper.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyExceptionMapper.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyExceptionMapper.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,18 @@
+package org.jboss.resteasy.test;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+/**
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+ at Provider
+public class MyExceptionMapper implements ExceptionMapper<MyException>
+{
+ public Response toResponse(MyException e)
+ {
+ return Response.status(412).type("text/plain").entity("MyException thrown").build();
+ }
+}
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyResource.java
===================================================================
--- trunk/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyResource.java 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyResource.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,30 +0,0 @@
-package org.jboss.resteasy.test;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-/**
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
- at Path("/scan")
-public interface MyResource
-{
- @GET
- @Produces("text/plain")
- String get();
-
- @GET
- @Produces("text/plain")
- @Path("exception")
- public String testException();
-
- @Path("/custom-exception")
- @GET
- String throwException();
-
- @Path("/ejb-exception")
- @GET
- String throwEjbException();
-}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyResource.java (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyResource.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyResource.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyResource.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,30 @@
+package org.jboss.resteasy.test;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+/**
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+ at Path("/scan")
+public interface MyResource
+{
+ @GET
+ @Produces("text/plain")
+ String get();
+
+ @GET
+ @Produces("text/plain")
+ @Path("exception")
+ public String testException();
+
+ @Path("/custom-exception")
+ @GET
+ String throwException();
+
+ @Path("/ejb-exception")
+ @GET
+ String throwEjbException();
+}
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyResourceBean.java
===================================================================
--- trunk/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyResourceBean.java 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyResourceBean.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,58 +0,0 @@
-package org.jboss.resteasy.test;
-
-import javax.ejb.EJBException;
-import javax.ws.rs.Path;
-import javax.ws.rs.GET;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ejb.Stateless;
-import javax.ejb.EJBContext;
-import javax.annotation.Resource;
-
-/**
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
- at Path("/scan")
- at Stateless
-public class MyResourceBean implements MyResource
-{
- @Resource
- private EJBContext ctx;
-
- @GET
- @Produces("text/plain")
- public String get()
- {
- if (ctx == null)
- {
- System.out.println("NO CONTEXT!!!!!");
- throw new WebApplicationException(500);
- }
- System.out.println("CONTEXT WAS THERE!");
- return "hello world";
- }
-
- @GET
- @Produces("text/plain")
- @Path("exception")
- public String testException()
- {
- throw new WebApplicationException(412);
- }
-
- @Path("/custom-exception")
- @GET
- public String throwException()
- {
- throw new MyException();
- }
-
-
- @Path("/ejb-exception")
- @GET
- public String throwEjbException()
- {
- throw new EJBException(new MyException());
- }
-}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyResourceBean.java (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyResourceBean.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyResourceBean.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/java/org/jboss/resteasy/test/MyResourceBean.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,58 @@
+package org.jboss.resteasy.test;
+
+import javax.ejb.EJBException;
+import javax.ws.rs.Path;
+import javax.ws.rs.GET;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ejb.Stateless;
+import javax.ejb.EJBContext;
+import javax.annotation.Resource;
+
+/**
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+ at Path("/scan")
+ at Stateless
+public class MyResourceBean implements MyResource
+{
+ @Resource
+ private EJBContext ctx;
+
+ @GET
+ @Produces("text/plain")
+ public String get()
+ {
+ if (ctx == null)
+ {
+ System.out.println("NO CONTEXT!!!!!");
+ throw new WebApplicationException(500);
+ }
+ System.out.println("CONTEXT WAS THERE!");
+ return "hello world";
+ }
+
+ @GET
+ @Produces("text/plain")
+ @Path("exception")
+ public String testException()
+ {
+ throw new WebApplicationException(412);
+ }
+
+ @Path("/custom-exception")
+ @GET
+ public String throwException()
+ {
+ throw new MyException();
+ }
+
+
+ @Path("/ejb-exception")
+ @GET
+ public String throwEjbException()
+ {
+ throw new EJBException(new MyException());
+ }
+}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/WEB-INF (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/WEB-INF)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/WEB-INF/web.xml 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/WEB-INF/web.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,4 +0,0 @@
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-</web-app>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/WEB-INF/web.xml (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/WEB-INF/web.xml)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/WEB-INF/web.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,4 @@
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+</web-app>
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/index.jsp
===================================================================
--- trunk/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/index.jsp 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/index.jsp 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,5 +0,0 @@
-<html>
-<body>
-<h2>Hello World!</h2>
-</body>
-</html>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/index.jsp (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/index.jsp)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/index.jsp (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/main/webapp/index.jsp 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h2>Hello World!</h2>
+</body>
+</html>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-jar/src/test (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-jar/src/test)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-war)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/pom.xml
===================================================================
--- trunk/resteasy-int/test/ejb-jar-war/ejb-war/pom.xml 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/pom.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,95 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-parent</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.jbossas.resteasy.test</groupId>
- <artifactId>ejb-jar-test</artifactId>
- <packaging>war</packaging>
- <name>Basic Integration Test</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>${version.org.jboss.resteasy}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas.resteasy.test</groupId>
- <artifactId>ejb-jar</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <finalName>ejb-test</finalName>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-maven-plugin</artifactId>
- <version>1.3.1</version>
- <configuration>
- <jbossHome>${jboss.home}</jbossHome>
- </configuration>
- <executions>
- <execution>
- <id>jboss-deploy</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy</goal>
- </goals>
- <configuration>
- <fileName>${basedir}/target/ejb-test.war</fileName>
- </configuration>
- </execution>
- <execution>
- <id>jboss-undeploy</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy</goal>
- </goals>
- <configuration>
- <fileName>${basedir}/target/ejb-test.war</fileName>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- <executions>
- <execution>
- <id>surefire-it</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/pom.xml (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-war/pom.xml)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/pom.xml (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/pom.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,95 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-parent</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.jbossas.resteasy.test</groupId>
+ <artifactId>ejb-jar-test</artifactId>
+ <packaging>war</packaging>
+ <name>Basic Integration Test</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxrs</artifactId>
+ <version>${version.org.jboss.resteasy}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas.resteasy.test</groupId>
+ <artifactId>ejb-jar</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <finalName>ejb-test</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-maven-plugin</artifactId>
+ <version>1.3.1</version>
+ <configuration>
+ <jbossHome>${jboss.home}</jbossHome>
+ </configuration>
+ <executions>
+ <execution>
+ <id>jboss-deploy</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy</goal>
+ </goals>
+ <configuration>
+ <fileName>${basedir}/target/ejb-test.war</fileName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>jboss-undeploy</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy</goal>
+ </goals>
+ <configuration>
+ <fileName>${basedir}/target/ejb-test.war</fileName>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-war/src)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-war/src/main)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/java (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-war/src/main/java)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/WEB-INF (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/WEB-INF)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/WEB-INF/web.xml 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/WEB-INF/web.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,4 +0,0 @@
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
-</web-app>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/WEB-INF/web.xml (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/WEB-INF/web.xml)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/WEB-INF/web.xml (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/WEB-INF/web.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,4 @@
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+</web-app>
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/index.jsp
===================================================================
--- trunk/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/index.jsp 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/index.jsp 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,5 +0,0 @@
-<html>
-<body>
-<h2>Hello World!</h2>
-</body>
-</html>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/index.jsp (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/index.jsp)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/index.jsp (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/main/webapp/index.jsp 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h2>Hello World!</h2>
+</body>
+</html>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-war/src/test)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss/resteasy (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss/resteasy)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss/resteasy/test (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss/resteasy/test)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss/resteasy/test/jboss (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss/resteasy/test/jboss)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss/resteasy/test/jboss/EjbTest.java
===================================================================
--- trunk/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss/resteasy/test/jboss/EjbTest.java 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss/resteasy/test/jboss/EjbTest.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,38 +0,0 @@
-package org.jboss.resteasy.test.jboss;
-
-import org.jboss.resteasy.client.ClientRequest;
-import org.jboss.resteasy.client.ClientResponse;
-import org.junit.Test;
-import org.junit.Assert;
-
-/**
- * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
- * @version $Revision: 1 $
- */
-public class EjbTest
-{
- @Test
- public void testIt() throws Exception
- {
- ClientRequest request = new ClientRequest("http://localhost:8080/ejb-test/scan");
- ClientResponse<String> response = request.get(String.class);
- Assert.assertEquals(200, response.getStatus());
- Assert.assertEquals("hello world", response.getEntity());
-
- }
-
- @Test
- public void testException() throws Exception
- {
- ClientRequest request = new ClientRequest("http://localhost:8080/ejb-test/scan/exception");
- ClientResponse<String> response = request.get(String.class);
- Assert.assertEquals(412, response.getStatus());
-
- request = new ClientRequest("http://localhost:8080/ejb-test/scan/custom-exception");
- response = request.get(String.class);
- Assert.assertEquals(412, response.getStatus());
-
- request = new ClientRequest("http://localhost:8080/ejb-test/scan/ejb-exception");
- response = request.get(String.class);
- Assert.assertEquals(412, response.getStatus());
- }}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss/resteasy/test/jboss/EjbTest.java (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss/resteasy/test/jboss/EjbTest.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss/resteasy/test/jboss/EjbTest.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/java/org/jboss/resteasy/test/jboss/EjbTest.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,38 @@
+package org.jboss.resteasy.test.jboss;
+
+import org.jboss.resteasy.client.ClientRequest;
+import org.jboss.resteasy.client.ClientResponse;
+import org.junit.Test;
+import org.junit.Assert;
+
+/**
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public class EjbTest
+{
+ @Test
+ public void testIt() throws Exception
+ {
+ ClientRequest request = new ClientRequest("http://localhost:8080/ejb-test/scan");
+ ClientResponse<String> response = request.get(String.class);
+ Assert.assertEquals(200, response.getStatus());
+ Assert.assertEquals("hello world", response.getEntity());
+
+ }
+
+ @Test
+ public void testException() throws Exception
+ {
+ ClientRequest request = new ClientRequest("http://localhost:8080/ejb-test/scan/exception");
+ ClientResponse<String> response = request.get(String.class);
+ Assert.assertEquals(412, response.getStatus());
+
+ request = new ClientRequest("http://localhost:8080/ejb-test/scan/custom-exception");
+ response = request.get(String.class);
+ Assert.assertEquals(412, response.getStatus());
+
+ request = new ClientRequest("http://localhost:8080/ejb-test/scan/ejb-exception");
+ response = request.get(String.class);
+ Assert.assertEquals(412, response.getStatus());
+ }}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/resources (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-war/src/test/resources)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/resources/jndi.properties
===================================================================
--- trunk/resteasy-int/test/ejb-jar-war/ejb-war/src/test/resources/jndi.properties 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/resources/jndi.properties 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=jnp://localhost:1099
\ No newline at end of file
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/resources/jndi.properties (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-war/src/test/resources/jndi.properties)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/resources/jndi.properties (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/resources/jndi.properties 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=jnp://localhost:1099
\ No newline at end of file
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/resources/log4j.xml
===================================================================
--- trunk/resteasy-int/test/ejb-jar-war/ejb-war/src/test/resources/log4j.xml 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/resources/log4j.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<!-- ===================================================================== -->
-<!-- -->
-<!-- Log4j Configuration -->
-<!-- -->
-<!-- ===================================================================== -->
-
-<!-- $Id: log4j.xml 64736 2007-08-21 15:49:48Z anil.saldhana at jboss.com $ -->
-
-<!--
- | For more configuration infromation and examples see the Jakarta Log4j
- | owebsite: http://jakarta.apache.org/log4j
- -->
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ================================= -->
- <!-- Preserve messages in a local file -->
- <!-- ================================= -->
-
- <!-- A time/date based rolling appender -->
- <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
- <param name="File" value="${build.testlog}/test.log"/>
- <param name="Append" value="true"/>
-
- <!-- Rollover at midnight each day -->
- <param name="DatePattern" value="'.'yyyy-MM-dd"/>
-
- <!-- Rollover at the top of each hour
- <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
- -->
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
-
- <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
- <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
- -->
- </layout>
- </appender>
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Threshold" value="DEBUG"/>
- <param name="Target" value="System.out"/>
-
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
- </layout>
- </appender>
-
-
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
- <appender-ref ref="CONSOLE"/>
- </root>
-
-</log4j:configuration>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/resources/log4j.xml (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/ejb-war/src/test/resources/log4j.xml)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/resources/log4j.xml (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/ejb-war/src/test/resources/log4j.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml 64736 2007-08-21 15:49:48Z anil.saldhana at jboss.com $ -->
+
+<!--
+ | For more configuration infromation and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <param name="File" value="${build.testlog}/test.log"/>
+ <param name="Append" value="true"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <!-- Rollover at the top of each hour
+ <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+ -->
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+
+ <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+ -->
+ </layout>
+ </appender>
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Threshold" value="DEBUG"/>
+ <param name="Target" value="System.out"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ </root>
+
+</log4j:configuration>
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/pom.xml
===================================================================
--- trunk/resteasy-int/test/ejb-jar-war/pom.xml 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/pom.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,19 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-parent</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
- <name>Resteasy JBoss AS Integration Testing EJB + JAR + WAR</name>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>resteasy-ejb-jar-war-testing-pom</artifactId>
- <packaging>pom</packaging>
-
- <modules>
- <module>ejb-jar</module>
- <module>ejb-war</module>
- </modules>
-</project>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/pom.xml (from rev 106665, trunk/resteasy-int/test/ejb-jar-war/pom.xml)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/pom.xml (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-jar-war/pom.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,19 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-parent</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ </parent>
+ <name>Resteasy JBoss AS Integration Testing EJB + JAR + WAR</name>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>resteasy-ejb-jar-war-testing-pom</artifactId>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>ejb-jar</module>
+ <module>ejb-war</module>
+ </modules>
+</project>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-war/src/main/java/org/jboss/resteasy/test/MyException.java (from rev 106665, trunk/resteasy-int/test/ejb-war/src/main/java/org/jboss/resteasy/test/MyException.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-war/src/main/java/org/jboss/resteasy/test/MyException.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-war/src/main/java/org/jboss/resteasy/test/MyException.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,9 @@
+package org.jboss.resteasy.test;
+
+/**
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public class MyException extends RuntimeException
+{
+}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-war/src/main/java/org/jboss/resteasy/test/MyExceptionMapper.java (from rev 106665, trunk/resteasy-int/test/ejb-war/src/main/java/org/jboss/resteasy/test/MyExceptionMapper.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-war/src/main/java/org/jboss/resteasy/test/MyExceptionMapper.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-war/src/main/java/org/jboss/resteasy/test/MyExceptionMapper.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,18 @@
+package org.jboss.resteasy.test;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.ExceptionMapper;
+import javax.ws.rs.ext.Provider;
+
+/**
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+ at Provider
+public class MyExceptionMapper implements ExceptionMapper<MyException>
+{
+ public Response toResponse(MyException e)
+ {
+ return Response.status(412).type("text/plain").entity("MyException thrown").build();
+ }
+}
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-war/src/main/java/org/jboss/resteasy/test/MyResource.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-war/src/main/java/org/jboss/resteasy/test/MyResource.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-war/src/main/java/org/jboss/resteasy/test/MyResource.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -20,4 +20,11 @@
@Path("exception")
public String testException();
+ @Path("/custom-exception")
+ @GET
+ String throwException();
+
+ @Path("/ejb-exception")
+ @GET
+ String throwEjbException();
}
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-war/src/main/java/org/jboss/resteasy/test/MyResourceBean.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-war/src/main/java/org/jboss/resteasy/test/MyResourceBean.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-war/src/main/java/org/jboss/resteasy/test/MyResourceBean.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,5 +1,6 @@
package org.jboss.resteasy.test;
+import javax.ejb.EJBException;
import javax.ws.rs.Path;
import javax.ws.rs.GET;
import javax.ws.rs.Produces;
@@ -39,4 +40,19 @@
{
throw new WebApplicationException(412);
}
+
+ @Path("/custom-exception")
+ @GET
+ public String throwException()
+ {
+ throw new MyException();
+ }
+
+
+ @Path("/ejb-exception")
+ @GET
+ public String throwEjbException()
+ {
+ throw new EJBException(new MyException());
+ }
}
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-war/src/test/java/org/jboss/resteasy/test/jboss/EjbTest.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-war/src/test/java/org/jboss/resteasy/test/jboss/EjbTest.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/ejb-war/src/test/java/org/jboss/resteasy/test/jboss/EjbTest.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -28,4 +28,11 @@
ClientResponse<String> response = request.get(String.class);
Assert.assertEquals(412, response.getStatus());
+ request = new ClientRequest("http://localhost:8080/ejb-test/scan/custom-exception");
+ response = request.get(String.class);
+ Assert.assertEquals(412, response.getStatus());
+
+ request = new ClientRequest("http://localhost:8080/ejb-test/scan/ejb-exception");
+ response = request.get(String.class);
+ Assert.assertEquals(412, response.getStatus());
}}
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/pom.xml
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/pom.xml 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/pom.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -14,8 +14,11 @@
<modules>
<module>application-war</module>
+ <module>application-scanned-war</module>
<module>scanned-war</module>
<module>ejb-war</module>
+ <module>ejb-jar-war</module>
+ <module>async-http-servlet-3.0-test</module>
<module>cdi-test-2</module>
</modules>
</project>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/scanned-war/src/main/java/org/jboss/resteasy/test/MyIntf.java (from rev 106665, trunk/resteasy-int/test/scanned-war/src/main/java/org/jboss/resteasy/test/MyIntf.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/scanned-war/src/main/java/org/jboss/resteasy/test/MyIntf.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/scanned-war/src/main/java/org/jboss/resteasy/test/MyIntf.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,24 @@
+package org.jboss.resteasy.test;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.ext.Providers;
+
+/**
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+ at Path("/scan-intf")
+public interface MyIntf
+{
+ @GET
+ @Produces("text/plain")
+ String get();
+
+ @Path("resolver")
+ @GET
+ @Produces("text/plain")
+ String getResolver(@Context Providers providers);
+}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/scanned-war/src/main/java/org/jboss/resteasy/test/MyIntfResource.java (from rev 106665, trunk/resteasy-int/test/scanned-war/src/main/java/org/jboss/resteasy/test/MyIntfResource.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/scanned-war/src/main/java/org/jboss/resteasy/test/MyIntfResource.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/test/scanned-war/src/main/java/org/jboss/resteasy/test/MyIntfResource.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,27 @@
+package org.jboss.resteasy.test;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.Providers;
+
+/**
+ * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
+ * @version $Revision: 1 $
+ */
+public class MyIntfResource implements MyIntf
+{
+ public String get()
+ {
+ return "hello world";
+ }
+
+ public String getResolver(@Context Providers providers)
+ {
+ System.out.println("IN RESOLVER!!!");
+ MyContextResolver resolver = (MyContextResolver) providers.getContextResolver(Integer.class, MediaType.TEXT_PLAIN_TYPE);
+ return resolver.getContext(null).toString();
+ }
+}
\ No newline at end of file
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/zip/assembly.xml
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/zip/assembly.xml 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/zip/assembly.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -31,6 +31,7 @@
<include>org.jboss.resteasy:resteasy-jackson-provider</include>
<include>org.jboss.resteasy:resteasy-yaml-provider</include>
<include>org.jboss.resteasy:resteasy-cdi</include>
+ <include>org.jboss.resteasy:async-http-servlet-3.0</include>
</includes>
<outputDirectory>resteasy.deployer</outputDirectory>
</dependencySet>
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/zip/pom.xml
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/zip/pom.xml 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/resteasy-int/zip/pom.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -114,6 +114,11 @@
<artifactId>resteasy-cdi</artifactId>
<version>${version.org.jboss.resteasy}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>async-http-servlet-3.0</artifactId>
+ <version>${version.org.jboss.resteasy}</version>
+ </dependency>
</dependencies>
<build>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/etc/bin/password_tool.bat (from rev 106665, trunk/security/src/etc/bin/password_tool.bat)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/etc/bin/password_tool.bat (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/etc/bin/password_tool.bat 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,44 @@
+ at echo off
+rem -------------------------------------------------------------------------
+rem JBoss Password Tool
+rem -------------------------------------------------------------------------
+
+if not "%ECHO%" == "" echo %ECHO%
+if "%OS%" == "Windows_NT" setlocal
+
+set DIRNAME=.\
+if "%OS%" == "Windows_NT" set DIRNAME=%~dp0%
+set PROGNAME=password_tool.bat
+if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
+
+set JAVA=%JAVA_HOME%\bin\java
+if "%JBOSS_HOME%" == "" set JBOSS_HOME=%DIRNAME%\..
+
+rem Setup the java endorsed dirs
+set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
+
+rem Setup the jboss password tool classpath
+rem Shared libs
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JAVA_HOME%\lib\tools.jar
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\client\commons-logging.jar
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\client\jboss-logging-spi.jar
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\lib\endorsed\xalan.jar
+
+rem Shared jaxb libs
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\client\activation.jar
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\client\jaxb-api.jar
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\client\jaxb-impl.jar
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\client\stax-api.jar
+
+rem Specific dependencies
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\client\xmlsec.jar
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\client\jbosssx-as-client.jar
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\client\jcl-over-slf4j.jar
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\client\slf4j-api.jar
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\client\slf4j-jboss-logging.jar
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\client\jboss-logging.jar
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\lib\jbosssx.jar
+set JBOSSPASS_CLASSPATH=%JBOSSPASS_CLASSPATH%;%JBOSS_HOME%\common\lib\log4j.jar
+
+rem Execute the JVM
+"%JAVA%" %JAVA_OPTS% "-Djava.endorsed.dirs=%JBOSS_ENDORSED_DIRS%" "-Dprogram.name=%PROGNAME%" -classpath "%JBOSSPASS_CLASSPATH%" org.jboss.security.integration.password.PasswordTool %*
\ No newline at end of file
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/etc/bin/password_tool.sh
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/etc/bin/password_tool.sh 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/etc/bin/password_tool.sh 2010-07-14 04:19:55 UTC (rev 106681)
@@ -69,7 +69,11 @@
JBOSSPASS_CLASSPATH="$JBOSSPASS_CLASSPATH:$JBOSS_HOME/client/xmlsec.jar"
JBOSSPASS_CLASSPATH="$JBOSSPASS_CLASSPATH:$JBOSS_HOME/client/jbosssx-client.jar"
JBOSSPASS_CLASSPATH="$JBOSSPASS_CLASSPATH:$JBOSS_HOME/client/jbosssx-as-client.jar"
-JBOSSPASS_CLASSPATH="$JBOSSPASS_CLASSPATH:$JBOSS_HOME/common/lib/jbosssx.jar"
+JBOSSPASS_CLASSPATH="$JBOSSPASS_CLASSPATH:$JBOSS_HOME/client/jcl-over-slf4j.jar"
+JBOSSPASS_CLASSPATH="$JBOSSPASS_CLASSPATH:$JBOSS_HOME/client/slf4j-api.jar"
+JBOSSPASS_CLASSPATH="$JBOSSPASS_CLASSPATH:$JBOSS_HOME/client/slf4j-jboss-logging.jar"
+JBOSSPASS_CLASSPATH="$JBOSSPASS_CLASSPATH:$JBOSS_HOME/client/jboss-logging.jar"
+JBOSSPASS_CLASSPATH="$JBOSSPASS_CLASSPATH:$JBOSS_HOME/lib/jbosssx.jar"
JBOSSPASS_CLASSPATH="$JBOSSPASS_CLASSPATH:$JBOSS_HOME/common/lib/log4j.jar"
###
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/etc/deploy/security-jboss-beans.xml
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/etc/deploy/security-jboss-beans.xml 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/etc/deploy/security-jboss-beans.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -23,20 +23,6 @@
<property name="passwordManagement"><inject bean="JBossSecurityPasswordMaskManagement"/></property>
</lifecycle-configure>
- <lifecycle-create xmlns="urn:jboss:aop-beans:1.0"
- name="PasswordCreateDestroyAdvice"
- class="org.jboss.security.integration.password.PasswordLifecycleCallback"
- classes="@org.jboss.security.integration.password.Password">
- <property name="passwordManagement"><inject bean="JBossSecurityPasswordMaskManagement"/></property>
- </lifecycle-create>
-
- <lifecycle-install xmlns="urn:jboss:aop-beans:1.0"
- name="PasswordStartStopAdvice"
- class="org.jboss.security.integration.password.PasswordLifecycleCallback"
- classes="@org.jboss.security.integration.password.Password">
- <property name="passwordManagement"><inject bean="JBossSecurityPasswordMaskManagement"/></property>
- </lifecycle-install>
-
<!-- Establish the basic XML Based Configuration-->
<bean name="XMLLoginConfig" class="org.jboss.security.auth.login.XMLLoginConfig">
<property name="configResource">login-config.xml</property>
@@ -51,10 +37,6 @@
<bean name="JBossSecurityJNDIContextEstablishment"
class="org.jboss.security.integration.JNDIContextEstablishment"/>
- <!-- JNDI Based Security Management -->
- <bean name="JNDIBasedSecurityManagement"
- class="org.jboss.security.integration.JNDIBasedSecurityManagement"/>
-
<!-- Instance of JBoss Security Subject Factory -->
<bean name="JBossSecuritySubjectFactory"
class="org.jboss.security.integration.JBossSecuritySubjectFactory">
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/auth/AuthenticationTimedCachePolicy.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/auth/AuthenticationTimedCachePolicy.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/auth/AuthenticationTimedCachePolicy.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -21,6 +21,7 @@
*/
package org.jboss.security.auth;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -34,7 +35,7 @@
* @author <a href="mmoyses at redhat.com">Marcus Moyses</a>
* @version $Revision: 1 $
*/
-public class AuthenticationTimedCachePolicy extends TimedCachePolicy
+public class AuthenticationTimedCachePolicy extends TimedCachePolicy implements Serializable
{
public AuthenticationTimedCachePolicy(int defaultCacheTimeout, boolean b, int defaultCacheResolution)
{
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/integration/JNDIBasedSecurityManagement.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/integration/JNDIBasedSecurityManagement.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/integration/JNDIBasedSecurityManagement.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -233,6 +233,7 @@
public void setAuthenticationMgrClass(String authenticationMgrClass)
{
this.authenticationMgrClass = authenticationMgrClass;
+ securityMgrMap.clear();
}
@ManagementProperty(use = {ViewUse.CONFIGURATION},
@@ -366,19 +367,16 @@
{
log.debug("Creating SDC for domain="+securityDomain);
AuthenticationManager am = createAuthenticationManager(securityDomain);
- if(cachePolicy == null)
- {
- cachePolicy = createDefaultCachePolicy();
- }
+ CachePolicy cache = createDefaultCachePolicy();
//Set security cache if the auth manager implementation supports it
- setSecurityDomainCache(am, cachePolicy);
+ setSecurityDomainCache(am, cache);
//Set DeepCopySubject option if supported
if(SecurityConfiguration.isDeepCopySubjectMode())
{
setDeepCopySubjectMode(am);
}
- SecurityDomainContext securityDomainContext = new SecurityDomainContext(am, cachePolicy);
+ SecurityDomainContext securityDomainContext = new SecurityDomainContext(am, cache);
securityDomainContext.setAuthorizationManager(createAuthorizationManager(securityDomain));
securityDomainContext.setAuditMgr(createAuditManager(securityDomain));
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/integration/SecurityConstantsBridge.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/integration/SecurityConstantsBridge.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/integration/SecurityConstantsBridge.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -36,4 +36,16 @@
public static int defaultCacheResolution = 60;
/** Frequency of the thread cleaning the authentication cache of expired entries */
public static int defaultCacheFlushPeriod = 60*60;
+
+ private static JNDIBasedSecurityManagement securityManagement;
+
+ public static JNDIBasedSecurityManagement getSecurityManagement()
+ {
+ return securityManagement;
+ }
+
+ public void setSecurityManagement(JNDIBasedSecurityManagement securityManagement)
+ {
+ this.securityManagement = securityManagement;
+ }
}
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/integration/SecurityDomainObjectFactory.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/integration/SecurityDomainObjectFactory.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/integration/SecurityDomainObjectFactory.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -51,7 +51,7 @@
*/
public class SecurityDomainObjectFactory implements InvocationHandler, ObjectFactory
{
- private JNDIBasedSecurityManagement securityManagement = new JNDIBasedSecurityManagement();
+ private JNDIBasedSecurityManagement securityManagement = SecurityConstantsBridge.getSecurityManagement();
public void setSecurityManagement(JNDIBasedSecurityManagement sm)
{
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/integration/password/PasswordLifecycleCallback.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/integration/password/PasswordLifecycleCallback.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/integration/password/PasswordLifecycleCallback.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -21,14 +21,20 @@
*/
package org.jboss.security.integration.password;
+import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aop.joinpoint.MethodInvocation;
+import org.jboss.beans.metadata.spi.AnnotationMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.kernel.plugins.dependency.AbstractKernelControllerContext;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.logging.Logger;
-import org.jboss.metadata.spi.MetaData;
/**
* AOP Lifecycle callback for the @Password annotation
@@ -94,39 +100,51 @@
public void install(ControllerContext context) throws Exception
{
//Get the password
- Password passwordAnnotation = readPasswordAnnotation(context);
- boolean trace = log.isTraceEnabled();
- if( trace )
- log.trace("Binding into JNDI: " + context.getName() + ", passwordInfo: " + passwordAnnotation);
-
- String securityDomain = passwordAnnotation.securityDomain();
-
- char[] passwd = this.passwordManagement.getPassword(securityDomain);
-
- if(passwd == null)
- log.trace("Password does not exist for security domain=" + securityDomain);
- //The bean in question is the target
- String methodName = passwordAnnotation.methodName();
- Object target = context.getTarget();
- if(trace)
+ List<Password> passwordAnnotations = readPasswordAnnotation(context);
+ for (Password passwordAnnotation : passwordAnnotations)
{
- log.trace("Trying to set password on " + target + " with method :" + methodName);
+
+ boolean trace = log.isTraceEnabled();
+ if (trace)
+ log.trace("Binding into JNDI: " + context.getName() + ", passwordInfo: " + passwordAnnotation);
+
+ String securityDomain = passwordAnnotation.securityDomain();
+
+ char[] passwd = this.passwordManagement.getPassword(securityDomain);
+
+ if (passwd == null)
+ log.trace("Password does not exist for security domain=" + securityDomain);
+ //The bean in question is the target
+ String methodName = passwordAnnotation.methodName();
+ Object target = context.getTarget();
+ if (trace)
+ {
+ log.trace("Trying to set password on " + target + " with method :" + methodName);
+ }
+ this.setPassword(target, passwordAnnotation, passwd);
}
- this.setPassword(target, passwordAnnotation, passwd);
}
public void uninstall(ControllerContext context) throws Exception
{
//ignore
}
-
- private Password readPasswordAnnotation(ControllerContext context) throws Exception
+ private List<Password> readPasswordAnnotation(ControllerContext context) throws Exception
{
- MetaData metaData = context.getScopeInfo().getMetaData();
- if (metaData != null)
- return metaData.getAnnotation(Password.class);
- return null;
+ List<Password> passwordAnnotations = new ArrayList<Password>();
+ AbstractKernelControllerContext akcc = (AbstractKernelControllerContext) context;
+ BeanMetaData bmd = akcc.getBeanMetaData();
+ Set<AnnotationMetaData> annotations = bmd.getAnnotations();
+ for (AnnotationMetaData annotationMetaData : annotations)
+ {
+ Annotation annotation = annotationMetaData.getAnnotationInstance();
+ if (annotation.annotationType() == Password.class)
+ {
+ passwordAnnotations.add((Password) annotation);
+ }
+ }
+ return passwordAnnotations;
}
private void setPassword(Object target, Password passwordAnnotation, char[] passwd) throws Exception
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/plugins/JaasSecurityDomain.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/plugins/JaasSecurityDomain.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/plugins/JaasSecurityDomain.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -60,6 +60,7 @@
import org.jboss.security.Util;
import org.jboss.security.auth.callback.JBossCallbackHandler;
import org.jboss.security.integration.JNDIBasedSecurityManagement;
+import org.jboss.security.integration.SecurityConstantsBridge;
/**
* The JaasSecurityDomain is an extension of JaasSecurityManager that addes the notion of a KeyStore, and JSSE
@@ -177,7 +178,7 @@
private String trustStoreProviderArgument;
/** Specify the SecurityManagement instance */
- private ISecurityManagement securityManagement = new JNDIBasedSecurityManagement();
+ private ISecurityManagement securityManagement = SecurityConstantsBridge.getSecurityManagement();
/**
* Creates a default JaasSecurityDomain for with a securityDomain name of 'other'.
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/plugins/JaasSecurityManagerService.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/plugins/JaasSecurityManagerService.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/plugins/JaasSecurityManagerService.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -49,6 +49,7 @@
import javax.naming.StringRefAddr;
import javax.naming.spi.ObjectFactory;
import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
import javax.security.jacc.PolicyContext;
import org.jboss.logging.Logger;
@@ -127,6 +128,8 @@
/** Frequency of the thread cleaning the authentication cache of expired entries */
private static int defaultCacheFlushPeriod = 60*60;
+ private static JNDIBasedSecurityManagement securityManagement = SecurityConstantsBridge.getSecurityManagement();
+
static
{
// Get a log interface, required for some statics below
@@ -160,7 +163,7 @@
throws ClassNotFoundException, ClassCastException
{
securityMgrClassName = className;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ ClassLoader loader = getContextClassLoader();
securityMgrClass = loader.loadClass(securityMgrClassName);
if( AuthenticationManager.class.isAssignableFrom(securityMgrClass) == false )
throw new ClassCastException(securityMgrClass+" does not implement "+AuthenticationManager.class);
@@ -173,7 +176,7 @@
throws ClassNotFoundException
{
securityProxyFactoryClassName = className;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ ClassLoader loader = getContextClassLoader();
securityProxyFactoryClass = loader.loadClass(securityProxyFactoryClassName);
}
@@ -192,7 +195,7 @@
throws ClassNotFoundException
{
callbackHandlerClassName = className;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ ClassLoader loader = getContextClassLoader();
callbackHandlerClass = loader.loadClass(callbackHandlerClassName);
}
@@ -496,7 +499,14 @@
return null;
}
});
+ CallbackHandler callbackHandler = null;
+ callbackHandler = (CallbackHandler) callbackHandlerClass.newInstance();
+ if (callbackHandler != null)
+ securityManagement.setCallBackHandler(callbackHandler);
}
+
+ // Set AuthenticationManager class
+ securityManagement.setAuthenticationMgrClass(securityMgrClassName);
// Register the Principal property editor
PropertyEditorManager.registerEditor(Principal.class, PrincipalEditor.class);
@@ -764,4 +774,15 @@
return cachePolicy;
}
}
+
+ static ClassLoader getContextClassLoader()
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
+ {
+ public ClassLoader run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
}
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/plugins/SecurityKeyManager.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/plugins/SecurityKeyManager.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/plugins/SecurityKeyManager.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -59,7 +59,7 @@
*/
public String chooseServerAlias(String keyType, Principal[] issuers, Socket socket)
{
- return delegate.chooseServerAlias(keyType, issuers, socket);
+ return keyAlias;
}
/**
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/ssl/JBossProvider.java (from rev 106665, trunk/security/src/main/java/org/jboss/security/ssl/JBossProvider.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/ssl/JBossProvider.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/ssl/JBossProvider.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,79 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.security.ssl;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.security.Provider;
+import java.security.Security;
+
+/**
+ * A <code>Provider</code> that overrides the default <code>KeyManagerFactory</code> and
+ * <code>TrustManagerFactory</code> implementations.
+ *
+ * @author <a href="mmoyses at redhat.com">Marcus Moyses</a>
+ * @version $Revision: 1 $
+ */
+public class JBossProvider extends Provider
+{
+ private static final long serialVersionUID = -6211291745955454828L;
+
+ private static String INFO = "JBoss (X509 key/trust manager factories)";
+
+ private static String NAME = "JBoss";
+
+ public JBossProvider()
+ {
+ super(NAME, 1.0, INFO);
+
+ // override only the default algorithms
+ AccessController.doPrivileged(new PrivilegedAction<Object>()
+ {
+ public Object run()
+ {
+ // Sun, OpenJDK and JRockit KeyManagerFactory
+ put("KeyManagerFactory.SunX509", "org.jboss.security.ssl.KeyManagerFactoryImpl$SunX509");
+
+ // IBM KeyManagerFactory
+ put("KeyManagerFactory.IbmX509", "org.jboss.security.ssl.KeyManagerFactoryImpl$IbmX509");
+
+ // put the correct TrustManagerFactory
+ Provider[] providers = Security.getProviders("TrustManagerFactory.PKIX");
+ for (int i = 0; i < providers.length; i++)
+ {
+ String name = providers[i].getName();
+ if (name.equals("SunJSSE"))
+ {
+ put("TrustManagerFactory.PKIX", "org.jboss.security.ssl.TrustManagerFactoryImpl$SunPKIX");
+ break;
+ }
+ else if (name.equals("IBMJSSE2"))
+ {
+ put("TrustManagerFactory.PKIX", "org.jboss.security.ssl.TrustManagerFactoryImpl$IbmPKIX");
+ break;
+ }
+ }
+ return null;
+ }
+ });
+ }
+}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/ssl/JBossSSLConfiguration.java (from rev 106665, trunk/security/src/main/java/org/jboss/security/ssl/JBossSSLConfiguration.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/ssl/JBossSSLConfiguration.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/ssl/JBossSSLConfiguration.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,476 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.security.ssl;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Constructor;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.security.AccessController;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivilegedAction;
+import java.security.Provider;
+import java.security.Security;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.PKIXBuilderParameters;
+import java.security.cert.X509CertSelector;
+
+import javax.net.ssl.CertPathTrustManagerParameters;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.ManagerFactoryParameters;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509KeyManager;
+
+import org.jboss.beans.metadata.api.annotations.FactoryMethod;
+import org.jboss.logging.Logger;
+import org.jboss.security.Util;
+import org.jboss.security.plugins.SecurityKeyManager;
+
+/**
+ * A MC bean that installs a <code>Provider</code> so we can override the default
+ * implementations for <code>KeyManagerFactory</code> and <code>TrustManagerFactory</code>.
+ *
+ * @author <a href="mmoyses at redhat.com">Marcus Moyses</a>
+ * @version $Revision: 1 $
+ */
+public class JBossSSLConfiguration
+{
+ private Provider provider;
+
+ private String keyStoreType;
+
+ private URL keyStoreURL;
+
+ private char[] keyStorePass;
+
+ private String keyStoreAlias;
+
+ private String keyStoreProvider;
+
+ private String keyStoreProviderArgument;
+
+ private KeyStore keyStore;
+
+ private String trustStoreType;
+
+ private URL trustStoreURL;
+
+ private char[] trustStorePass;
+
+ private String trustStoreProvider;
+
+ private String trustStoreProviderArgument;
+
+ private KeyStore trustStore;
+
+ private static JBossSSLConfiguration singleton;
+
+ private static Logger log = Logger.getLogger(JBossSSLConfiguration.class);
+
+ private JBossSSLConfiguration()
+ {
+ }
+
+ @FactoryMethod
+ public static JBossSSLConfiguration getInstance()
+ {
+ if (singleton == null)
+ singleton = new JBossSSLConfiguration();
+ return singleton;
+ }
+
+ public String getKeyStoreType()
+ {
+ return keyStoreType;
+ }
+
+ public void setKeyStoreType(String keyStoreType)
+ {
+ this.keyStoreType = keyStoreType;
+ }
+
+ public String getKeyStoreURL()
+ {
+ String url = null;
+ if (keyStoreURL != null)
+ url = keyStoreURL.toExternalForm();
+ return url;
+ }
+
+ public void setKeyStoreURL(String keyStoreURL) throws IOException
+ {
+ this.keyStoreURL = validateStoreURL(keyStoreURL);
+ }
+
+ public void setKeyStorePassword(String keyStorePassword) throws Exception
+ {
+ keyStorePass = Util.loadPassword(keyStorePassword);
+ }
+
+ public String getKeyStoreAlias()
+ {
+ return keyStoreAlias;
+ }
+
+ public void setKeyStoreAlias(String alias)
+ {
+ keyStoreAlias = alias;
+ }
+
+ public String getKeyStoreProvider()
+ {
+ return keyStoreProvider;
+ }
+
+ public void setKeyStoreProvider(String keyStoreProvider)
+ {
+ this.keyStoreProvider = keyStoreProvider;
+ }
+
+ public String getKeyStoreProviderArgument()
+ {
+ return keyStoreProviderArgument;
+ }
+
+ public void setKeyStoreProviderArgument(String keyStoreProviderArgument)
+ {
+ this.keyStoreProviderArgument = keyStoreProviderArgument;
+ }
+
+ public String getTrustStoreType()
+ {
+ return trustStoreType;
+ }
+
+ public void setTrustStoreType(String trustStoreType)
+ {
+ this.trustStoreType = trustStoreType;
+ }
+
+ public String getTrustStoreURL()
+ {
+ String url = null;
+ if (trustStoreURL != null)
+ url = trustStoreURL.toExternalForm();
+ return url;
+ }
+
+ public void setTrustStoreURL(String trustStoreURL) throws IOException
+ {
+ this.trustStoreURL = validateStoreURL(trustStoreURL);
+ }
+
+ public void setTrustStorePassword(String trustStorePassword) throws Exception
+ {
+ trustStorePass = Util.loadPassword(trustStorePassword);
+ }
+
+ public String getTrustStoreProvider()
+ {
+ return trustStoreProvider;
+ }
+
+ public void setTrustStoreProvider(String trustStoreProvider)
+ {
+ this.trustStoreProvider = trustStoreProvider;
+ }
+
+ public String getTrustStoreProviderArgument()
+ {
+ return trustStoreProviderArgument;
+ }
+
+ public void setTrustStoreProviderArgument(String trustStoreProviderArgument)
+ {
+ this.trustStoreProviderArgument = trustStoreProviderArgument;
+ }
+
+ /**
+ * Callback method that initializes the keystore and truststore
+ * and adds <code>JBossProvider</code> as the first in the list.
+ *
+ * @throws Exception if an error happens during initialization
+ */
+ public void start() throws Exception
+ {
+ // add provider as the first
+ provider = new JBossProvider();
+ addProvider(provider);
+
+ // initialize keystore and truststore
+ if (keyStorePass != null)
+ {
+ if (keyStoreType == null)
+ keyStoreType = KeyStore.getDefaultType();
+ if (keyStoreProvider != null)
+ {
+ if (keyStoreProviderArgument != null)
+ {
+ ClassLoader loader = getContextClassLoader();
+ Class<?> clazz = loader.loadClass(keyStoreProvider);
+ Class<?>[] ctorSig = {String.class};
+ Constructor<?> ctor = clazz.getConstructor(ctorSig);
+ Object[] ctorArgs = {keyStoreProviderArgument};
+ Provider provider = (Provider) ctor.newInstance(ctorArgs);
+ keyStore = KeyStore.getInstance(keyStoreType, provider);
+ }
+ else
+ keyStore = KeyStore.getInstance(keyStoreType, keyStoreProvider);
+ }
+ else
+ keyStore = KeyStore.getInstance(keyStoreType);
+ InputStream is = null;
+ if ((!"PKCS11".equalsIgnoreCase(keyStoreType) || !"PKCS11IMPLKS".equalsIgnoreCase(keyStoreType)) && keyStoreURL != null)
+ {
+ is = keyStoreURL.openStream();
+ }
+ keyStore.load(is, keyStorePass);
+ if (keyStoreAlias != null && !keyStore.isKeyEntry(keyStoreAlias))
+ {
+ throw new IOException("Cannot find key entry with alias " + keyStoreAlias + " in the keyStore");
+ }
+ }
+ if (trustStorePass != null)
+ {
+ if (trustStoreType == null)
+ trustStoreType = KeyStore.getDefaultType();
+ if (trustStoreProvider != null)
+ {
+ if (trustStoreProviderArgument != null)
+ {
+ ClassLoader loader = getContextClassLoader();
+ Class<?> clazz = loader.loadClass(trustStoreProvider);
+ Class<?>[] ctorSig = {String.class};
+ Constructor<?> ctor = clazz.getConstructor(ctorSig);
+ Object[] ctorArgs = {trustStoreProviderArgument};
+ Provider provider = (Provider) ctor.newInstance(ctorArgs);
+ trustStore = KeyStore.getInstance(trustStoreType, provider);
+ }
+ else
+ trustStore = KeyStore.getInstance(trustStoreType, trustStoreProvider);
+ }
+ else
+ trustStore = KeyStore.getInstance(trustStoreType);
+ InputStream is = null;
+ if ((!"PKCS11".equalsIgnoreCase(trustStoreType) || !"PKCS11IMPLKS".equalsIgnoreCase(trustStoreType)) && trustStoreURL != null)
+ {
+ is = trustStoreURL.openStream();
+ }
+ trustStore.load(is, trustStorePass);
+ }
+ }
+
+ /**
+ * Removes <code>JBossProvider</code> from the <code>Provider</code>s list.
+ */
+ public void stop()
+ {
+ if (provider != null)
+ removeProvider(provider);
+ }
+
+ /**
+ * Overrides the keystore using the configuration set in the bean.
+ *
+ * @param delegate <code>KeyManagerFactory</code>implementation
+ * @throws KeyStoreException
+ * @throws UnrecoverableKeyException
+ * @throws NoSuchAlgorithmException
+ */
+ public void initializeKeyManagerFactory(KeyManagerFactory delegate) throws KeyStoreException, UnrecoverableKeyException, NoSuchAlgorithmException
+ {
+ if (keyStore == null)
+ throw new KeyStoreException("Global keystore is not correctly initialized");
+ if (log.isTraceEnabled())
+ log.trace("Using global keystore configuration");
+ delegate.init(keyStore, keyStorePass);
+ }
+
+ /**
+ * Overrides the <code>KeyManager>s if an alias in provided in the configuration.
+ *
+ * @param delegate <code>KeyManagerFactory</code> implementation
+ * @return
+ */
+ public KeyManager[] getKeyManagers(KeyManagerFactory delegate)
+ {
+ KeyManager[] keyManagers = delegate.getKeyManagers();
+ if (keyStoreAlias != null)
+ {
+ for (int i = 0; i < keyManagers.length; i++)
+ {
+ keyManagers[i] = new SecurityKeyManager((X509KeyManager) keyManagers[i], keyStoreAlias);
+ }
+ }
+ return keyManagers;
+ }
+
+ /**
+ * Overrides the truststore using the configuration set in the bean.
+ *
+ * @param delegate <code>TrustManagerFactory</code> implementation
+ * @param ks truststore
+ * @throws KeyStoreException
+ */
+ public void initializeTrustManagerFactory(TrustManagerFactory delegate, KeyStore ks) throws KeyStoreException
+ {
+ if (trustStore == null)
+ {
+ if (log.isTraceEnabled())
+ log.trace("Global truststore is not correctly initialized. Using local truststore configuration");
+ delegate.init(ks);
+ }
+ else
+ {
+ if (log.isTraceEnabled())
+ log.trace("Using global truststore configuration");
+ delegate.init(trustStore);
+ }
+ }
+
+ /**
+ * Overrides the truststore using the configuration set in the bean.
+ *
+ * @param delegate <code>TrustManagerFactory</code> implementation
+ * @param spec <code>ManagerFactoryParameters</code> parameters
+ * @throws InvalidAlgorithmParameterException
+ */
+ public void initializeTrustManagerFactory(TrustManagerFactory delegate, ManagerFactoryParameters spec) throws InvalidAlgorithmParameterException
+ {
+ if (trustStore == null)
+ {
+ if (log.isTraceEnabled())
+ log.trace("Global truststore is not correctly initialized. Using local truststore configuration");
+ delegate.init(spec);
+ }
+ else
+ {
+ CertPathTrustManagerParameters parameters = (CertPathTrustManagerParameters) spec;
+ PKIXBuilderParameters oldParams = (PKIXBuilderParameters) parameters.getParameters();
+
+ PKIXBuilderParameters xparams = null;
+ try
+ {
+ xparams = new PKIXBuilderParameters(trustStore, new X509CertSelector());
+ xparams.setAnyPolicyInhibited(oldParams.isAnyPolicyInhibited());
+ xparams.setCertPathCheckers(oldParams.getCertPathCheckers());
+ xparams.setCertStores(oldParams.getCertStores());
+ xparams.setDate(oldParams.getDate());
+ xparams.setExplicitPolicyRequired(oldParams.isExplicitPolicyRequired());
+ xparams.setInitialPolicies(oldParams.getInitialPolicies());
+ xparams.setMaxPathLength(oldParams.getMaxPathLength());
+ xparams.setPolicyMappingInhibited(oldParams.isPolicyMappingInhibited());
+ xparams.setPolicyQualifiersRejected(oldParams.getPolicyQualifiersRejected());
+ xparams.setRevocationEnabled(oldParams.isRevocationEnabled());
+ xparams.setSigProvider(oldParams.getSigProvider());
+ }
+ catch (KeyStoreException ke)
+ {
+ log.error("Error initializing TrustManagerFactory", ke);
+ }
+ if (log.isTraceEnabled())
+ log.trace("Using global truststore configuration");
+ ManagerFactoryParameters mfp = new CertPathTrustManagerParameters(xparams);
+ delegate.init(mfp);
+ }
+ }
+
+ /**
+ * Loads a key/trust store
+ */
+ private URL validateStoreURL(String storeURL) throws IOException
+ {
+ URL url = null;
+ // First see if this is a URL
+ try
+ {
+ url = new URL(storeURL);
+ }
+ catch (MalformedURLException e)
+ {
+ // Not a URL or a protocol without a handler
+ }
+
+ // Next try to locate this as file path
+ if (url == null)
+ {
+ File tst = new File(storeURL);
+ if (tst.exists() == true)
+ url = tst.toURI().toURL();
+ }
+
+ // Last try to locate this as a classpath resource
+ if (url == null)
+ {
+ ClassLoader loader = getContextClassLoader();
+ url = loader.getResource(storeURL);
+ }
+
+ // Fail if no valid key store was located
+ if (url == null)
+ {
+ String msg = "Failed to find url=" + storeURL + " as a URL, file or resource";
+ throw new MalformedURLException(msg);
+ }
+ return url;
+ }
+
+ private static ClassLoader getContextClassLoader()
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>()
+ {
+ public ClassLoader run()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+ });
+ }
+
+ private static Object addProvider(final Provider provider)
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<Object>()
+ {
+ public Object run()
+ {
+ return Security.insertProviderAt(provider, 1);
+ }
+ });
+ }
+
+ private static Object removeProvider(final Provider provider)
+ {
+ return AccessController.doPrivileged(new PrivilegedAction<Object>()
+ {
+ public Object run()
+ {
+ Security.removeProvider(provider.getName());
+ return null;
+ }
+ });
+ }
+}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/ssl/KeyManagerFactoryImpl.java (from rev 106665, trunk/security/src/main/java/org/jboss/security/ssl/KeyManagerFactoryImpl.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/ssl/KeyManagerFactoryImpl.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/ssl/KeyManagerFactoryImpl.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,123 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.security.ssl;
+
+import java.security.InvalidAlgorithmParameterException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.UnrecoverableKeyException;
+
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.KeyManagerFactorySpi;
+import javax.net.ssl.ManagerFactoryParameters;
+
+import org.jboss.logging.Logger;
+
+/**
+ * <code>KeyManagerFactory</code> implementation that uses the keystore configuration
+ * provided by JBossSSLConfiguration
+ *
+ * @author <a href="mmoyses at redhat.com">Marcus Moyses</a>
+ * @version $Revision: 1 $
+ */
+abstract class KeyManagerFactoryImpl extends KeyManagerFactorySpi
+{
+ protected KeyManagerFactory delegate;
+
+ protected String defaultAlgorithm;
+
+ protected static Logger log = Logger.getLogger(KeyManagerFactoryImpl.class);
+
+ protected JBossSSLConfiguration sslConfiguration = JBossSSLConfiguration.getInstance();
+
+ public KeyManagerFactoryImpl()
+ {
+ defaultAlgorithm = KeyManagerFactory.getDefaultAlgorithm();
+ }
+
+ /**
+ * Overrides the keystore configuration
+ */
+ protected KeyManager[] engineGetKeyManagers()
+ {
+ return sslConfiguration.getKeyManagers(delegate);
+ }
+
+ /**
+ * Overrides the keystore configuration
+ */
+ protected void engineInit(KeyStore ks, char[] password) throws KeyStoreException, NoSuchAlgorithmException,
+ UnrecoverableKeyException
+ {
+ sslConfiguration.initializeKeyManagerFactory(delegate);
+ }
+
+ /**
+ * Delegates to the default <code>KeyManagerFactory</code>
+ */
+ protected void engineInit(ManagerFactoryParameters spec) throws InvalidAlgorithmParameterException
+ {
+ // Not used by the underlying implementations. Throws an exception
+ delegate.init(spec);
+ }
+
+ /**
+ * Implementation for Sun, JRockit and OpenJDK
+ */
+ public static class SunX509 extends KeyManagerFactoryImpl
+ {
+ public SunX509()
+ {
+ try
+ {
+ delegate = KeyManagerFactory.getInstance(defaultAlgorithm, "SunJSSE");
+ }
+ catch (Exception e)
+ {
+ log.error("Could not initialize KeyManagerFactory", e);
+ throw new IllegalStateException(e);
+ }
+ }
+ }
+
+ /**
+ * Implementation for IBM
+ */
+ public static class IbmX509 extends KeyManagerFactoryImpl
+ {
+ public IbmX509()
+ {
+ try
+ {
+ delegate = KeyManagerFactory.getInstance(defaultAlgorithm, "IBMJSSE2");
+ }
+ catch (Exception e)
+ {
+ log.error("Could not initialize KeyManagerFactory", e);
+ throw new IllegalStateException(e);
+ }
+ }
+ }
+
+}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/ssl/TrustManagerFactoryImpl.java (from rev 106665, trunk/security/src/main/java/org/jboss/security/ssl/TrustManagerFactoryImpl.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/ssl/TrustManagerFactoryImpl.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/security/src/main/java/org/jboss/security/ssl/TrustManagerFactoryImpl.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,118 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.security.ssl;
+
+import java.security.InvalidAlgorithmParameterException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+
+import javax.net.ssl.ManagerFactoryParameters;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.TrustManagerFactorySpi;
+
+import org.jboss.logging.Logger;
+
+/**
+ * <code>TrustManagerFactory</code> implementation that uses the truststore configuration
+ * provided by the JBossSSLConfiguration.
+ *
+ * @author <a href="mmoyses at redhat.com">Marcus Moyses</a>
+ * @version $Revision: 1 $
+ */
+abstract class TrustManagerFactoryImpl extends TrustManagerFactorySpi
+{
+ protected String defaultAlgorithm;
+
+ protected TrustManagerFactory delegate;
+
+ protected Logger log = Logger.getLogger(TrustManagerFactoryImpl.class);
+
+ protected JBossSSLConfiguration sslConfiguration = JBossSSLConfiguration.getInstance();
+
+ public TrustManagerFactoryImpl()
+ {
+ defaultAlgorithm = TrustManagerFactory.getDefaultAlgorithm();
+ }
+
+ /**
+ * Delegates to the default <code>TrustManagerFactory</code>
+ */
+ protected TrustManager[] engineGetTrustManagers()
+ {
+ return delegate.getTrustManagers();
+ }
+
+ /**
+ * Overrides the truststore configuration
+ */
+ protected void engineInit(KeyStore ks) throws KeyStoreException
+ {
+ sslConfiguration.initializeTrustManagerFactory(delegate, ks);
+ }
+
+ /**
+ * Overrides the truststore configuration
+ */
+ protected void engineInit(ManagerFactoryParameters spec) throws InvalidAlgorithmParameterException
+ {
+ sslConfiguration.initializeTrustManagerFactory(delegate, spec);
+ }
+
+ /**
+ * Implementation for Sun, JRockit and OpenJDK
+ */
+ public static class SunPKIX extends TrustManagerFactoryImpl
+ {
+ public SunPKIX()
+ {
+ try
+ {
+ delegate = TrustManagerFactory.getInstance(defaultAlgorithm, "SunJSSE");
+ }
+ catch (Exception e)
+ {
+ log.error("Could not initialize TrustManagerFactory", e);
+ throw new IllegalStateException(e);
+ }
+ }
+ }
+
+ /**
+ * Implementation for IBM
+ */
+ public static class IbmPKIX extends TrustManagerFactoryImpl
+ {
+ public IbmPKIX()
+ {
+ try
+ {
+ delegate = TrustManagerFactory.getInstance(defaultAlgorithm, "IBMJSSE2");
+ }
+ catch (Exception e)
+ {
+ log.error("Could not initialize TrustManagerFactory", e);
+ throw new IllegalStateException(e);
+ }
+ }
+ }
+}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/server/src/etc/conf/all/bootstrap/security.xml (from rev 106665, trunk/server/src/etc/conf/all/bootstrap/security.xml)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/server/src/etc/conf/all/bootstrap/security.xml (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/server/src/etc/conf/all/bootstrap/security.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Security bootstrap configuration
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <classloader><inject bean="security-classloader:0.0.0"/></classloader>
+
+ <classloader name="security-classloader" xmlns="urn:jboss:classloader:1.0" export-all="NON_EMPTY" import-all="true">
+ <root>${jboss.lib.url}jbosssx-server.jar</root>
+ <root>${jboss.lib.url}jboss-security-spi.jar</root>
+ <root>${jboss.lib.url}jbosssx.jar</root>
+ </classloader>
+
+ <!-- JNDI Based Security Management -->
+ <bean name="JNDIBasedSecurityManagement"
+ class="org.jboss.security.integration.JNDIBasedSecurityManagement"/>
+
+ <bean name="SecurityConstantsBridge" class="org.jboss.security.integration.SecurityConstantsBridge">
+ <property name="securityManagement"><inject bean="JNDIBasedSecurityManagement"/></property>
+ </bean>
+
+ </deployment>
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/server/src/etc/conf/all/bootstrap.xml
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/server/src/etc/conf/all/bootstrap.xml 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/server/src/etc/conf/all/bootstrap.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -12,4 +12,5 @@
<url>bootstrap/jmx.xml</url>
<url>bootstrap/deployers.xml</url>
<url>bootstrap/profile.xml</url>
+ <url>bootstrap/security.xml</url>
</bootstrap>
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/server/src/etc/conf/minimal/bootstrap.xml
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/server/src/etc/conf/minimal/bootstrap.xml 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/server/src/etc/conf/minimal/bootstrap.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -11,5 +11,6 @@
<url>bootstrap/jmx.xml</url>
<url>bootstrap/deployers.xml</url>
<url>bootstrap/profile.xml</url>
+ <url>bootstrap/security.xml</url>
</bootstrap>
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/server/src/main/java/org/jboss/ejb/plugins/AbstractInstanceCache.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/server/src/main/java/org/jboss/ejb/plugins/AbstractInstanceCache.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/server/src/main/java/org/jboss/ejb/plugins/AbstractInstanceCache.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -203,6 +203,8 @@
if (canPassivate(ctx))
{
+ ClassLoader ccl = SecurityActions.getContextClassLoader();
+ SecurityActions.setContextClassLoader(getContainer().getClassLoader());
try
{
remove(id);
@@ -213,6 +215,10 @@
{
log.warn("failed to passivate, id="+id, ignored);
}
+ finally
+ {
+ SecurityActions.setContextClassLoader(ccl);
+ }
}
else
{
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/build.xml
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/build.xml 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/build.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -187,9 +187,11 @@
</path>
<path id="org.springframework.classpath">
<fileset refid="org.springframework:spring-aop:jar"/>
+ <fileset refid="org.springframework:spring-asm:jar"/>
<fileset refid="org.springframework:spring-beans:jar"/>
<fileset refid="org.springframework:spring-context:jar"/>
<fileset refid="org.springframework:spring-core:jar"/>
+ <fileset refid="org.springframework:spring-expression:jar"/>
<fileset refid="org.springframework:spring-web:jar"/>
<fileset refid="org.springframework:spring-webmvc:jar"/>
</path>
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/imports/sections/ejb.xml
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/imports/sections/ejb.xml 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/imports/sections/ejb.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -42,4 +42,31 @@
</jar>
</target>
+ <!-- passivationcl test -->
+ <target name="_jars-passivationcl">
+ <mkdir dir="${build.lib}"/>
+ <jar destfile="${build.lib}/passivationcl_entity.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/ejb/passivationcl/entity/**"/>
+ </fileset>
+ </jar>
+ <jar destfile="${build.lib}/passivationcl_stateful.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/ejb/passivationcl/stateful/**"/>
+ </fileset>
+ <fileset dir="${build.resources}/ejb/passivationcl/stateful">
+ <include name="**"/>
+ </fileset>
+ </jar>
+ <jar destfile="${build.lib}/passivationcl.ear">
+ <fileset dir="${build.resources}/ejb/passivationcl/ear">
+ <include name="META-INF/*.*"/>
+ </fileset>
+ <fileset dir="${build.lib}">
+ <include name="passivationcl_entity.jar"/>
+ <include name="passivationcl_stateful.jar"/>
+ </fileset>
+ </jar>
+ </target>
+
</project>
\ No newline at end of file
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/imports/test-jars.xml
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/imports/test-jars.xml 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/imports/test-jars.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -114,6 +114,7 @@
_jars-entity,
_jars-ejbdepends,
_jars-entitydepends,
+ _jars-passivationcl,
_jars-entityexc,
_jars-excepiiop,
_jars-exception,
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl (from rev 106665, trunk/testsuite/src/main/org/jboss/test/ejb/passivationcl)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/entity (from rev 106665, trunk/testsuite/src/main/org/jboss/test/ejb/passivationcl/entity)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/entity/ABean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb/passivationcl/entity/ABean.java 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/entity/ABean.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,41 +0,0 @@
-/*
- * 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.test.ejb.passivationcl.entity;
-
-import javax.ejb.Local;
-import javax.ejb.Stateless;
-
-/**
- * A LoggerBean.
- *
- * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
- * @version $Revision: 1.1 $
- */
- at Stateless
- at Local(ALocal.class)
-public class ABean implements ALocal
-{
- @Override
- public void log()
- {
- }
-}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/entity/ABean.java (from rev 106665, trunk/testsuite/src/main/org/jboss/test/ejb/passivationcl/entity/ABean.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/entity/ABean.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/entity/ABean.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,41 @@
+/*
+ * 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.test.ejb.passivationcl.entity;
+
+import javax.ejb.Local;
+import javax.ejb.Stateless;
+
+/**
+ * A LoggerBean.
+ *
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 1.1 $
+ */
+ at Stateless
+ at Local(ALocal.class)
+public class ABean implements ALocal
+{
+ @Override
+ public void log()
+ {
+ }
+}
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/entity/ALocal.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb/passivationcl/entity/ALocal.java 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/entity/ALocal.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,33 +0,0 @@
-/*
- * 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.test.ejb.passivationcl.entity;
-
-/**
- * A LoggerLocal.
- *
- * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
- * @version $Revision: 1.1 $
- */
-public interface ALocal
-{
- public void log();
-}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/entity/ALocal.java (from rev 106665, trunk/testsuite/src/main/org/jboss/test/ejb/passivationcl/entity/ALocal.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/entity/ALocal.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/entity/ALocal.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,33 @@
+/*
+ * 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.test.ejb.passivationcl.entity;
+
+/**
+ * A LoggerLocal.
+ *
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 1.1 $
+ */
+public interface ALocal
+{
+ public void log();
+}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful (from rev 106665, trunk/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSession.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSession.java 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSession.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,37 +0,0 @@
-/*
- * 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.test.ejb.passivationcl.stateful;
-
-import java.rmi.RemoteException;
-
-/**
- * A MySession.
- *
- * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
- * @version $Revision: 1.1 $
- */
-public interface StatefulSession extends javax.ejb.EJBObject
-{
- void test() throws RemoteException;
-
- boolean isPassivated() throws RemoteException;
-}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSession.java (from rev 106665, trunk/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSession.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSession.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSession.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,37 @@
+/*
+ * 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.test.ejb.passivationcl.stateful;
+
+import java.rmi.RemoteException;
+
+/**
+ * A MySession.
+ *
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 1.1 $
+ */
+public interface StatefulSession extends javax.ejb.EJBObject
+{
+ void test() throws RemoteException;
+
+ boolean isPassivated() throws RemoteException;
+}
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSessionBean.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSessionBean.java 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSessionBean.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,101 +0,0 @@
-/*
- * 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.test.ejb.passivationcl.stateful;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.EJBException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.test.ejb.passivationcl.entity.ALocal;
-
-/**
- * A MySessionBean.
- *
- * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
- * @version $Revision: 1.1 $
- */
-public class StatefulSessionBean implements SessionBean
-{
- private boolean passivated;
-
- public void test() throws RemoteException
- {
- Object lookup;
- try
- {
- lookup = getIC().lookup("passivationcl/ABean/local");
- }
- catch (NamingException e)
- {
- throw new IllegalStateException("Failed to lookup", e);
- }
- ALocal.class.cast(lookup);
- }
-
- public void ejbCreate() throws RemoteException
- {
- test();
- }
-
- @Override
- public void ejbActivate() throws EJBException, RemoteException
- {
- }
-
- @Override
- public void ejbPassivate() throws EJBException, RemoteException
- {
- passivated = true;
- test();
- }
-
- public boolean isPassivated() throws RemoteException
- {
- return passivated;
- }
-
- @Override
- public void ejbRemove() throws EJBException, RemoteException
- {
- }
-
- @Override
- public void setSessionContext(SessionContext ctx) throws EJBException, RemoteException
- {
- }
-
- private InitialContext getIC()
- {
- try
- {
- return new InitialContext();
- }
- catch (NamingException e)
- {
- throw new EJBException("Failed to create InitialContext", e);
- }
- }
-}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSessionBean.java (from rev 106665, trunk/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSessionBean.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSessionBean.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSessionBean.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,101 @@
+/*
+ * 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.test.ejb.passivationcl.stateful;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.EJBException;
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.jboss.test.ejb.passivationcl.entity.ALocal;
+
+/**
+ * A MySessionBean.
+ *
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 1.1 $
+ */
+public class StatefulSessionBean implements SessionBean
+{
+ private boolean passivated;
+
+ public void test() throws RemoteException
+ {
+ Object lookup;
+ try
+ {
+ lookup = getIC().lookup("passivationcl/ABean/local");
+ }
+ catch (NamingException e)
+ {
+ throw new IllegalStateException("Failed to lookup", e);
+ }
+ ALocal.class.cast(lookup);
+ }
+
+ public void ejbCreate() throws RemoteException
+ {
+ test();
+ }
+
+ @Override
+ public void ejbActivate() throws EJBException, RemoteException
+ {
+ }
+
+ @Override
+ public void ejbPassivate() throws EJBException, RemoteException
+ {
+ passivated = true;
+ test();
+ }
+
+ public boolean isPassivated() throws RemoteException
+ {
+ return passivated;
+ }
+
+ @Override
+ public void ejbRemove() throws EJBException, RemoteException
+ {
+ }
+
+ @Override
+ public void setSessionContext(SessionContext ctx) throws EJBException, RemoteException
+ {
+ }
+
+ private InitialContext getIC()
+ {
+ try
+ {
+ return new InitialContext();
+ }
+ catch (NamingException e)
+ {
+ throw new EJBException("Failed to create InitialContext", e);
+ }
+ }
+}
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSessionHome.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSessionHome.java 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSessionHome.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,38 +0,0 @@
-/*
- * 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.test.ejb.passivationcl.stateful;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
-
-/**
- * A MySessionHome.
- *
- * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
- * @version $Revision: 1.1 $
- */
-public interface StatefulSessionHome extends EJBHome
-{
- StatefulSession create() throws CreateException, RemoteException;
-}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSessionHome.java (from rev 106665, trunk/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSessionHome.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSessionHome.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/stateful/StatefulSessionHome.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,38 @@
+/*
+ * 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.test.ejb.passivationcl.stateful;
+
+import java.rmi.RemoteException;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBHome;
+
+/**
+ * A MySessionHome.
+ *
+ * @author <a href="alex at jboss.com">Alexey Loubyansky</a>
+ * @version $Revision: 1.1 $
+ */
+public interface StatefulSessionHome extends EJBHome
+{
+ StatefulSession create() throws CreateException, RemoteException;
+}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/test (from rev 106665, trunk/testsuite/src/main/org/jboss/test/ejb/passivationcl/test)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/test/PassivationClUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/ejb/passivationcl/test/PassivationClUnitTestCase.java 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/test/PassivationClUnitTestCase.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,73 +0,0 @@
-/*
- * 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.test.ejb.passivationcl.test;
-
-import javax.rmi.PortableRemoteObject;
-
-import junit.framework.Test;
-
-import org.jboss.test.JBossTestCase;
-import org.jboss.test.ejb.passivationcl.stateful.StatefulSession;
-import org.jboss.test.ejb.passivationcl.stateful.StatefulSessionHome;
-
-/**
- *
- * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
- */
-public class PassivationClUnitTestCase extends JBossTestCase
-{
- public PassivationClUnitTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite() throws Exception
- {
- return getDeploySetup(PassivationClUnitTestCase.class, "passivationcl.ear");
- }
-
- public void testMain() throws Exception
- {
- Object ref = getInitialContext().lookup("StatefulSession");
- StatefulSessionHome home = (StatefulSessionHome) PortableRemoteObject.narrow(ref, StatefulSessionHome.class);
- StatefulSession stateful = home.create();
- stateful.test();
-
- int i = 5;
- while(!stateful.isPassivated())
- {
- if(i == 0)
- fail("Gave up waiting for passivation.");
- try
- {
- Thread.sleep(1500);
- }
- catch(InterruptedException e)
- {
- //
- }
- --i;
- }
-
- stateful.remove();
- }
-}
\ No newline at end of file
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/test/PassivationClUnitTestCase.java (from rev 106665, trunk/testsuite/src/main/org/jboss/test/ejb/passivationcl/test/PassivationClUnitTestCase.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/test/PassivationClUnitTestCase.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/main/org/jboss/test/ejb/passivationcl/test/PassivationClUnitTestCase.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,73 @@
+/*
+ * 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.test.ejb.passivationcl.test;
+
+import javax.rmi.PortableRemoteObject;
+
+import junit.framework.Test;
+
+import org.jboss.test.JBossTestCase;
+import org.jboss.test.ejb.passivationcl.stateful.StatefulSession;
+import org.jboss.test.ejb.passivationcl.stateful.StatefulSessionHome;
+
+/**
+ *
+ * @author <a href="mailto:alex at jboss.org">Alexey Loubyansky</a>
+ */
+public class PassivationClUnitTestCase extends JBossTestCase
+{
+ public PassivationClUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite() throws Exception
+ {
+ return getDeploySetup(PassivationClUnitTestCase.class, "passivationcl.ear");
+ }
+
+ public void testMain() throws Exception
+ {
+ Object ref = getInitialContext().lookup("StatefulSession");
+ StatefulSessionHome home = (StatefulSessionHome) PortableRemoteObject.narrow(ref, StatefulSessionHome.class);
+ StatefulSession stateful = home.create();
+ stateful.test();
+
+ int i = 5;
+ while(!stateful.isPassivated())
+ {
+ if(i == 0)
+ fail("Gave up waiting for passivation.");
+ try
+ {
+ Thread.sleep(1500);
+ }
+ catch(InterruptedException e)
+ {
+ //
+ }
+ --i;
+ }
+
+ stateful.remove();
+ }
+}
\ No newline at end of file
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl (from rev 106665, trunk/testsuite/src/resources/ejb/passivationcl)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/ear (from rev 106665, trunk/testsuite/src/resources/ejb/passivationcl/ear)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/ear/META-INF (from rev 106665, trunk/testsuite/src/resources/ejb/passivationcl/ear/META-INF)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/ear/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/ejb/passivationcl/ear/META-INF/application.xml 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/ear/META-INF/application.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,13 +0,0 @@
-<application xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd"
- version="6">
-
- <display-name>EJB2 passivation classloader test</display-name>
- <module>
- <ejb>passivationcl_entity.jar</ejb>
- </module>
- <module>
- <ejb>passivationcl_stateful.jar</ejb>
- </module>
-</application>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/ear/META-INF/application.xml (from rev 106665, trunk/testsuite/src/resources/ejb/passivationcl/ear/META-INF/application.xml)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/ear/META-INF/application.xml (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/ear/META-INF/application.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,13 @@
+<application xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/application_6.xsd"
+ version="6">
+
+ <display-name>EJB2 passivation classloader test</display-name>
+ <module>
+ <ejb>passivationcl_entity.jar</ejb>
+ </module>
+ <module>
+ <ejb>passivationcl_stateful.jar</ejb>
+ </module>
+</application>
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/ear/META-INF/jboss-app.xml
===================================================================
--- trunk/testsuite/src/resources/ejb/passivationcl/ear/META-INF/jboss-app.xml 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/ear/META-INF/jboss-app.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,7 +0,0 @@
-<!DOCTYPE jboss-app SYSTEM "http://www.jboss.org/j2ee/dtd/jboss-app_5_0.dtd">
-<jboss-app>
- <module-order>strict</module-order>
- <loader-repository>passivationcl.ear:loader=passivationcl.ear
- <loader-repository-config>java2ParentDelegation=false</loader-repository-config>
- </loader-repository>
-</jboss-app>
\ No newline at end of file
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/ear/META-INF/jboss-app.xml (from rev 106665, trunk/testsuite/src/resources/ejb/passivationcl/ear/META-INF/jboss-app.xml)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/ear/META-INF/jboss-app.xml (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/ear/META-INF/jboss-app.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,7 @@
+<!DOCTYPE jboss-app SYSTEM "http://www.jboss.org/j2ee/dtd/jboss-app_5_0.dtd">
+<jboss-app>
+ <module-order>strict</module-order>
+ <loader-repository>passivationcl.ear:loader=passivationcl.ear
+ <loader-repository-config>java2ParentDelegation=false</loader-repository-config>
+ </loader-repository>
+</jboss-app>
\ No newline at end of file
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/stateful (from rev 106665, trunk/testsuite/src/resources/ejb/passivationcl/stateful)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/stateful/META-INF (from rev 106665, trunk/testsuite/src/resources/ejb/passivationcl/stateful/META-INF)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/stateful/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/ejb/passivationcl/stateful/META-INF/ejb-jar.xml 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/stateful/META-INF/ejb-jar.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
-
-<ejb-jar >
-
- <enterprise-beans>
-
- <session>
- <ejb-name>StatefulSession</ejb-name>
- <home>org.jboss.test.ejb.passivationcl.stateful.StatefulSessionHome</home>
- <remote>org.jboss.test.ejb.passivationcl.stateful.StatefulSession</remote>
- <ejb-class>org.jboss.test.ejb.passivationcl.stateful.StatefulSessionBean</ejb-class>
- <session-type>Stateful</session-type>
- <transaction-type>Container</transaction-type>
- </session>
-
- </enterprise-beans>
-
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>StatefulSession</ejb-name>
- <method-name>*</method-name>
- </method>
- <trans-attribute>RequiresNew</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-
-</ejb-jar>
\ No newline at end of file
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/stateful/META-INF/ejb-jar.xml (from rev 106665, trunk/testsuite/src/resources/ejb/passivationcl/stateful/META-INF/ejb-jar.xml)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/stateful/META-INF/ejb-jar.xml (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/stateful/META-INF/ejb-jar.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
+
+<ejb-jar >
+
+ <enterprise-beans>
+
+ <session>
+ <ejb-name>StatefulSession</ejb-name>
+ <home>org.jboss.test.ejb.passivationcl.stateful.StatefulSessionHome</home>
+ <remote>org.jboss.test.ejb.passivationcl.stateful.StatefulSession</remote>
+ <ejb-class>org.jboss.test.ejb.passivationcl.stateful.StatefulSessionBean</ejb-class>
+ <session-type>Stateful</session-type>
+ <transaction-type>Container</transaction-type>
+ </session>
+
+ </enterprise-beans>
+
+ <assembly-descriptor>
+ <container-transaction>
+ <method>
+ <ejb-name>StatefulSession</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>RequiresNew</trans-attribute>
+ </container-transaction>
+ </assembly-descriptor>
+
+</ejb-jar>
\ No newline at end of file
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/stateful/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/ejb/passivationcl/stateful/META-INF/jboss.xml 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/stateful/META-INF/jboss.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_0.dtd">
-
-<jboss>
- <enterprise-beans>
- <session>
- <ejb-name>StatefulSession</ejb-name>
- <jndi-name>StatefulSession</jndi-name>
- <configuration-name>Custom Stateful</configuration-name>
- </session>
-
- </enterprise-beans>
-
- <container-configurations>
- <container-configuration extends="Standard Stateful SessionBean">
- <container-name>Custom Stateful</container-name>
- <container-cache-conf>
- <cache-policy>org.jboss.ejb.plugins.LRUStatefulContextCachePolicy</cache-policy>
- <cache-policy-conf>
- <min-capacity>1</min-capacity>
- <max-capacity>1</max-capacity>
- <remover-period>1800</remover-period>
- <max-bean-life>1800</max-bean-life>
- <overager-period>1</overager-period>
- <max-bean-age>1</max-bean-age>
- <resizer-period>400</resizer-period>
- <max-cache-miss-period>60</max-cache-miss-period>
- <min-cache-miss-period>1</min-cache-miss-period>
- <cache-load-factor>0.75</cache-load-factor>
- </cache-policy-conf>
- </container-cache-conf>
- </container-configuration>
- </container-configurations>
-</jboss>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/stateful/META-INF/jboss.xml (from rev 106665, trunk/testsuite/src/resources/ejb/passivationcl/stateful/META-INF/jboss.xml)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/stateful/META-INF/jboss.xml (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/testsuite/src/resources/ejb/passivationcl/stateful/META-INF/jboss.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 3.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_3_0.dtd">
+
+<jboss>
+ <enterprise-beans>
+ <session>
+ <ejb-name>StatefulSession</ejb-name>
+ <jndi-name>StatefulSession</jndi-name>
+ <configuration-name>Custom Stateful</configuration-name>
+ </session>
+
+ </enterprise-beans>
+
+ <container-configurations>
+ <container-configuration extends="Standard Stateful SessionBean">
+ <container-name>Custom Stateful</container-name>
+ <container-cache-conf>
+ <cache-policy>org.jboss.ejb.plugins.LRUStatefulContextCachePolicy</cache-policy>
+ <cache-policy-conf>
+ <min-capacity>1</min-capacity>
+ <max-capacity>1</max-capacity>
+ <remover-period>1800</remover-period>
+ <max-bean-life>1800</max-bean-life>
+ <overager-period>1</overager-period>
+ <max-bean-age>1</max-bean-age>
+ <resizer-period>400</resizer-period>
+ <max-cache-miss-period>60</max-cache-miss-period>
+ <min-cache-miss-period>1</min-cache-miss-period>
+ <cache-load-factor>0.75</cache-load-factor>
+ </cache-policy-conf>
+ </container-cache-conf>
+ </container-configuration>
+ </container-configurations>
+</jboss>
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldBootstrapDeployer.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldBootstrapDeployer.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/main/java/org/jboss/weld/integration/deployer/env/WeldBootstrapDeployer.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -53,6 +53,7 @@
@Override
protected void deployInternal(DeploymentUnit unit, BootstrapInfo info) throws DeploymentException
{
+
ValueMetaData ejbServicesValue = info.getEjbServices();
if (ejbServicesValue == null)
throw new DeploymentException("Missing ejb services: " + unit);
@@ -79,6 +80,10 @@
bootstrap.setDestroy("shutdown");
bootstrap.addDependency("RealTransactionManager"); // so we know TM is present in JBossTransactionServices
+ //Make the bootstrap depend on this deployment unit so that we know all sub deployments have been processed
+ bootstrap.addDependency(unit.getName());
+
+
// call dynamic dependency creator for EJBs
ParameterMetaDataBuilder install = bootstrap.addInstallWithParameters("createDepenencies", "DynamicDependencyCreator", null, ControllerState.CONFIGURED);
install.addParameterMetaData(Object.class.getName(), bootstrapName);
@@ -123,15 +128,20 @@
{
Object validatorFactory = unit.getAttachment(DeployersUtils.JAVAX_VALIDATION_VALIDATOR_FACTORY);
- if (validatorFactory == null)
+ if (validatorFactory == null && isValidationFactoryRequired(unit))
{
- throw new DeploymentException("Missing ValidatorFactory attachment in deployment: " + unit);
+ throw new DeploymentException("Missing ValidatorFactory attachment in deployment: " + unit);
}
-
String beanName = unit.getName() + "_JBossValidationServices";
BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(beanName, "org.jboss.weld.integration.validation.JBossValidationServices");
unit.addAttachment(beanName + "_" + BeanMetaData.class.getSimpleName(), builder.getBeanMetaData());
builder.addConstructorParameter(DeployersUtils.JAVAX_VALIDATION_VALIDATOR_FACTORY, validatorFactory);
return builder.createInject(beanName);
}
+
+ protected boolean isValidationFactoryRequired(DeploymentUnit deploymentUnit)
+ {
+ //TODO: define more strict criteria for determining whether the presence of a validation factory is required (e.g. JSF, JPA deployments)
+ return false;
+ }
}
\ No newline at end of file
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/test/java/org/jboss/test/deployers/AbstractDeploymentTest.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/test/java/org/jboss/test/deployers/AbstractDeploymentTest.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/test/java/org/jboss/test/deployers/AbstractDeploymentTest.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,163 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.deployers;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.test.deployers.support.MockEmptyEjbServices;
-import org.jboss.test.deployers.support.crm.CrmWebBean;
-import org.jboss.test.deployers.support.ejb.BusinessInterface;
-import org.jboss.test.deployers.support.ejb.MySLSBean;
-import org.jboss.test.deployers.support.ext.ExternalWebBean;
-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.test.deployers.test.AbstractWeldTest;
-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;
-
-/**
- * Abstract Deployment test case.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public abstract class AbstractDeploymentTest extends AbstractWeldTest
-{
- protected AbstractDeploymentTest(String name)
- {
- super(name);
- }
-
- protected void getArchives(List<BeanDeploymentArchive> result, Collection<BeanDeploymentArchive> archives)
- {
- for (BeanDeploymentArchive bda : archives)
- {
- result.add(bda);
- getArchives(result, bda.getBeanDeploymentArchives());
- }
- }
-
- protected abstract int getExpectedArchives();
-
- public void testSimpleUsage() throws Exception
- {
- VirtualFile ear = createBasicEar(MockEmptyEjbServices.class);
- VFSDeploymentUnit topUnit = assertDeploy(ear);
- try
- {
- assertBean(DeployersUtils.getBootstrapBeanName(topUnit), null, Object.class);
-
- Object bean = getBean(Deployment.class);
- Deployment deployment = assertInstanceOf(bean, Deployment.class, false);
-
- List<BeanDeploymentArchive> archives = new ArrayList<BeanDeploymentArchive>();
- getArchives(archives, deployment.getBeanDeploymentArchives());
- assertEquals(getExpectedArchives(), archives.size());
-
- List<URL> urls = new ArrayList<URL>();
- List<Class<?>> classes = new ArrayList<Class<?>>();
- for (BeanDeploymentArchive bad : archives)
- {
- for (URL url : bad.getBeansXml())
- urls.add(url);
- for (Class<?> clazz : bad.getBeanClasses())
- classes.add(clazz);
- }
-
- Set<String> expected = new HashSet<String>();
- addExpectedResource(expected, "ejbs.jar");
- addExpectedResource(expected, "ext.jar");
- addExpectedResource(expected, "simple.jar");
- addExpectedResource(expected, "ui.jar");
- addExpectedResource(expected, "crm.jar");
- addExpectedResource(expected, "simple.war", "/WEB-INF/beans.xml");
-
- assertEquals("Illegal size or urls.", urls.size(), expected.size());
-
- for (URL url : urls)
- {
- boolean found = false;
- Iterator<String> iter = expected.iterator();
- while (iter.hasNext())
- {
- String expectedURL = iter.next();
- if (url.toExternalForm().contains(expectedURL))
- {
- iter.remove();
- found = true;
- break;
- }
- }
- assertTrue("Unexpected wb url: " + url, found);
- }
-
- addExpectedClass(expected, BusinessInterface.class);
- addExpectedClass(expected, MySLSBean.class);
- addExpectedClass(expected, ExternalWebBean.class);
- addExpectedClass(expected, PlainJavaBean.class);
- addExpectedClass(expected, UIWebBean.class);
- addExpectedClass(expected, ServletWebBean.class);
- addExpectedClass(expected, CrmWebBean.class);
-
- assertEquals("Illegal size or classes.", classes.size(), expected.size());
-
- for (Class<?> clazz : classes)
- assertTrue(expected.remove(clazz.getName()));
-
- assertEmpty("Should be emtpy, missing " + expected, expected);
-
- Class<?> newBeanClass = topUnit.getClassLoader().loadClass("org.jboss.test.deployers.support.MockTransactionServices");
- BeanDeploymentArchive newBDA = deployment.loadBeanDeploymentArchive(newBeanClass);
- assertNewBeanDeploymentArchive(archives, newBDA);
- }
- finally
- {
- undeploy(topUnit);
- }
- }
-
- protected abstract void assertNewBeanDeploymentArchive(List<BeanDeploymentArchive> archives, BeanDeploymentArchive newBDA);
-
- private static void addExpectedResource(Set<String> expected, String unit)
- {
- addExpectedResource(expected, unit, "/META-INF/beans.xml");
- }
-
- private static void addExpectedResource(Set<String> expected, String unit, String suffix)
- {
- expected.add(unit + suffix);
- }
-
- private static void addExpectedClass(Set<String> expected, Class<?> clazz)
- {
- expected.add(clazz.getName());
- }
-}
\ No newline at end of file
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/test/java/org/jboss/test/deployers/FlatDeploymentTestCase.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/test/java/org/jboss/test/deployers/FlatDeploymentTestCase.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/test/java/org/jboss/test/deployers/FlatDeploymentTestCase.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.deployers;
-
-import java.util.List;
-
-import junit.framework.Test;
-import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
-
-/**
- * Flat Deployment test case.
- *
- * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
- */
-public class FlatDeploymentTestCase extends AbstractDeploymentTest
-{
- public FlatDeploymentTestCase(String name)
- {
- super(name);
- }
-
- public static Test suite()
- {
- return suite(FlatDeploymentTestCase.class);
- }
-
-
- protected int getExpectedArchives()
- {
- return 1; // flat only
- }
-
- protected void assertNewBeanDeploymentArchive(List<BeanDeploymentArchive> archives, BeanDeploymentArchive newBDA)
- {
- assertSame(newBDA, archives.iterator().next());
- }
-}
\ No newline at end of file
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/test/java/org/jboss/test/deployers/VFSTestSuite.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/test/java/org/jboss/test/deployers/VFSTestSuite.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/test/java/org/jboss/test/deployers/VFSTestSuite.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -26,6 +26,7 @@
import junit.textui.TestRunner;
import org.jboss.test.deployers.test.BootDeployerTestCase;
import org.jboss.test.deployers.test.CLIsolationTestCase;
+import org.jboss.test.deployers.test.FlatDeploymentTestCase;
import org.jboss.test.deployers.test.PostDeployersTestCase;
import org.jboss.test.deployers.test.SmokeTestCase;
import org.jboss.test.deployers.test.WeldDiscoveryEnvTestCase;
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/test/java/org/jboss/test/deployers/test/AbstractDeploymentTest.java (from rev 106665, trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/test/AbstractDeploymentTest.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/test/java/org/jboss/test/deployers/test/AbstractDeploymentTest.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/test/java/org/jboss/test/deployers/test/AbstractDeploymentTest.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,163 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.deployers.test;
+
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.test.deployers.support.MockEmptyEjbServices;
+import org.jboss.test.deployers.support.crm.CrmWebBean;
+import org.jboss.test.deployers.support.ejb.BusinessInterface;
+import org.jboss.test.deployers.support.ejb.MySLSBean;
+import org.jboss.test.deployers.support.ext.ExternalWebBean;
+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.test.deployers.test.AbstractWeldTest;
+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;
+
+/**
+ * Abstract Deployment test case.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public abstract class AbstractDeploymentTest extends AbstractWeldTest
+{
+ protected AbstractDeploymentTest(String name)
+ {
+ super(name);
+ }
+
+ protected void getArchives(List<BeanDeploymentArchive> result, Collection<BeanDeploymentArchive> archives)
+ {
+ for (BeanDeploymentArchive bda : archives)
+ {
+ result.add(bda);
+ getArchives(result, bda.getBeanDeploymentArchives());
+ }
+ }
+
+ protected abstract int getExpectedArchives();
+
+ public void testSimpleUsage() throws Exception
+ {
+ VirtualFile ear = createBasicEar(MockEmptyEjbServices.class);
+ VFSDeploymentUnit topUnit = assertDeploy(ear);
+ try
+ {
+ assertBean(DeployersUtils.getBootstrapBeanName(topUnit), null, Object.class);
+
+ Object bean = getBean(Deployment.class);
+ Deployment deployment = assertInstanceOf(bean, Deployment.class, false);
+
+ List<BeanDeploymentArchive> archives = new ArrayList<BeanDeploymentArchive>();
+ getArchives(archives, deployment.getBeanDeploymentArchives());
+ assertEquals(getExpectedArchives(), archives.size());
+
+ List<URL> urls = new ArrayList<URL>();
+ List<Class<?>> classes = new ArrayList<Class<?>>();
+ for (BeanDeploymentArchive bad : archives)
+ {
+ for (URL url : bad.getBeansXml())
+ urls.add(url);
+ for (Class<?> clazz : bad.getBeanClasses())
+ classes.add(clazz);
+ }
+
+ Set<String> expected = new HashSet<String>();
+ addExpectedResource(expected, "ejbs.jar");
+ addExpectedResource(expected, "ext.jar");
+ addExpectedResource(expected, "simple.jar");
+ addExpectedResource(expected, "ui.jar");
+ addExpectedResource(expected, "crm.jar");
+ addExpectedResource(expected, "simple.war", "/WEB-INF/beans.xml");
+
+ assertEquals("Illegal size or urls.", urls.size(), expected.size());
+
+ for (URL url : urls)
+ {
+ boolean found = false;
+ Iterator<String> iter = expected.iterator();
+ while (iter.hasNext())
+ {
+ String expectedURL = iter.next();
+ if (url.toExternalForm().contains(expectedURL))
+ {
+ iter.remove();
+ found = true;
+ break;
+ }
+ }
+ assertTrue("Unexpected wb url: " + url, found);
+ }
+
+ addExpectedClass(expected, BusinessInterface.class);
+ addExpectedClass(expected, MySLSBean.class);
+ addExpectedClass(expected, ExternalWebBean.class);
+ addExpectedClass(expected, PlainJavaBean.class);
+ addExpectedClass(expected, UIWebBean.class);
+ addExpectedClass(expected, ServletWebBean.class);
+ addExpectedClass(expected, CrmWebBean.class);
+
+ assertEquals("Illegal size or classes.", classes.size(), expected.size());
+
+ for (Class<?> clazz : classes)
+ assertTrue(expected.remove(clazz.getName()));
+
+ assertEmpty("Should be emtpy, missing " + expected, expected);
+
+ Class<?> newBeanClass = topUnit.getClassLoader().loadClass("org.jboss.test.deployers.support.MockTransactionServices");
+ BeanDeploymentArchive newBDA = deployment.loadBeanDeploymentArchive(newBeanClass);
+ assertNewBeanDeploymentArchive(archives, newBDA);
+ }
+ finally
+ {
+ undeploy(topUnit);
+ }
+ }
+
+ protected abstract void assertNewBeanDeploymentArchive(List<BeanDeploymentArchive> archives, BeanDeploymentArchive newBDA);
+
+ private static void addExpectedResource(Set<String> expected, String unit)
+ {
+ addExpectedResource(expected, unit, "/META-INF/beans.xml");
+ }
+
+ private static void addExpectedResource(Set<String> expected, String unit, String suffix)
+ {
+ expected.add(unit + suffix);
+ }
+
+ private static void addExpectedClass(Set<String> expected, Class<?> clazz)
+ {
+ expected.add(clazz.getName());
+ }
+}
\ No newline at end of file
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/test/java/org/jboss/test/deployers/test/FlatDeploymentTestCase.java (from rev 106665, trunk/weld-int/deployer/src/test/java/org/jboss/test/deployers/test/FlatDeploymentTestCase.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/test/java/org/jboss/test/deployers/test/FlatDeploymentTestCase.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer/src/test/java/org/jboss/test/deployers/test/FlatDeploymentTestCase.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.deployers.test;
+
+import java.util.List;
+
+import junit.framework.Test;
+import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
+
+/**
+ * Flat Deployment test case.
+ *
+ * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
+ */
+public class FlatDeploymentTestCase extends AbstractDeploymentTest
+{
+ public FlatDeploymentTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static Test suite()
+ {
+ return suite(FlatDeploymentTestCase.class);
+ }
+
+
+ protected int getExpectedArchives()
+ {
+ return 1; // flat only
+ }
+
+ protected void assertNewBeanDeploymentArchive(List<BeanDeploymentArchive> archives, BeanDeploymentArchive newBDA)
+ {
+ assertSame(newBDA, archives.iterator().next());
+ }
+}
\ No newline at end of file
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/pom.xml
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/pom.xml 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/pom.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -52,6 +52,11 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-plugins</artifactId>
+ </dependency>
<dependency>
<groupId>javax.enterprise</groupId>
@@ -348,6 +353,11 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.scanning</groupId>
+ <artifactId>scanning-deployers</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/main/java/org/jboss/weld/integration/deployer/mc/WeldBeanMetaDataDeployerPlugin.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/main/java/org/jboss/weld/integration/deployer/mc/WeldBeanMetaDataDeployerPlugin.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/main/java/org/jboss/weld/integration/deployer/mc/WeldBeanMetaDataDeployerPlugin.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -21,11 +21,20 @@
*/
package org.jboss.weld.integration.deployer.mc;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.jboss.beans.metadata.api.model.FromContext;
+import org.jboss.beans.metadata.spi.AnnotationMetaData;
import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.ConstructorMetaData;
+import org.jboss.beans.metadata.spi.FeatureMetaData;
+import org.jboss.beans.metadata.spi.InstallMetaData;
+import org.jboss.beans.metadata.spi.PropertyMetaData;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
import org.jboss.dependency.spi.Controller;
import org.jboss.dependency.spi.ControllerState;
@@ -33,6 +42,10 @@
import org.jboss.deployers.vfs.spi.deployer.helpers.BeanMetaDataDeployerPlugin;
import org.jboss.kernel.plugins.dependency.AbstractKernelControllerContext;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.kernel.weld.metadata.api.annotations.Weld;
+import org.jboss.kernel.weld.plugins.annotations.WeldEnabledBeanAnnotationPluginInitializer;
+import org.jboss.scanning.annotations.spi.AnnotationIndex;
+import org.jboss.scanning.annotations.spi.Element;
import org.jboss.weld.integration.deployer.DeployersUtils;
/**
@@ -49,9 +62,14 @@
{
public static int DEFAULT_ORDER = 50;
+ private final static String ATTACHMENT = "Annotated_$_" + WeldBeanMetaDataDeployerPlugin.class.getName();
+
private final int order;
- //private final String[] ignoredSuffixes = new String[] {"_JBossDeployment", "_JBossEjbServices", "_WBInjector", "_JBossJpaServices", "_JBossValidationServices", "_WeldBootstrap", "_WeldBootstrapBean", "_WebCompJndiBinder", "_JavaModuleJndiBinder"};
+ static
+ {
+ WeldEnabledBeanAnnotationPluginInitializer.initialize();
+ }
/** Map of real bean names and intermediate bean names */
private final Map<Object, Object> intermediateBeans = new ConcurrentHashMap<Object, Object>();
@@ -90,24 +108,10 @@
//Not a Weld deployment
return null;
}
-// for (String suffix : ignoredSuffixes)
-// {
-// beanMetaData.getAnnotations()
-// if (beanMetaData.getName().endsWith(suffix))
-// {
-// if (beanMetaData.getName().equals(unit.getTopLevel().getName() + suffix))
-// {
-// //Install Weld deployment bean as normal KernelControllerContext
-// return null;
-// }
-// }
-// }
- if (isSystemBean(unit, beanMetaData))
- {
- //Install Weld deployment bean as normal KernelControllerContext
+
+ if (!isMcBeanWithWeldAnnotatedInjectionPoints(controller, unit, beanMetaData))
return null;
- }
-
+
String beanName = unit.getTopLevel().getName() + "BootstrapBeanInstaller=" + beanMetaData.getName();
BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(beanName, IntermediateWeldBootstrapBean.class.getName());
builder.addPropertyMetaData("bootstrapBean", builder.createInject(DeployersUtils.getBootstrapBeanName(unit), null, ControllerState.CONFIGURED, ControllerState.CREATE));
@@ -122,21 +126,144 @@
return ctx;
}
- private boolean isSystemBean(DeploymentUnit unit, BeanMetaData beanMetaData)
+ private boolean isMcBeanWithWeldAnnotatedInjectionPoints(Controller controller, DeploymentUnit unit, BeanMetaData beanMetaData)
{
- String name = beanMetaData.getName();
- String topLevelName = unit.getTopLevel().getName();
- if (name.contains(topLevelName) ||
- name.contains(unit.getSimpleName()) ||
- name.startsWith("jboss.j2ee:") ||
- name.startsWith("jboss.naming:") ||
- name.startsWith("jboss.ejb3") ||
- name.endsWith("_CompJndiBinder"))
+ if (checkBeanMetaDataForWeldAnnotationOverridesOnInjectionPoints(controller, unit, beanMetaData))
return true;
+
+ return checkAnnotationRepositoryForWeldAnnotationOnInjectionPoints(unit, beanMetaData);
+ }
+
+ private boolean checkBeanMetaDataForWeldAnnotationOverridesOnInjectionPoints(Controller controller, DeploymentUnit unit, BeanMetaData beanMetaData)
+ {
+ ConstructorMetaData con = beanMetaData.getConstructor();
+ if (con != null)
+ {
+ if (hasWeldAnnotation(unit, con))
+ return true;
+ }
+ List<InstallMetaData> installs = beanMetaData.getInstalls();
+ if (installs != null && installs.size() > 0)
+ {
+ for (InstallMetaData install : installs)
+ {
+ if (hasWeldAnnotation(unit, install))
+ return true;
+ }
+ }
+
+ Set<PropertyMetaData> properties = beanMetaData.getProperties();
+ if (properties != null && properties.size() > 0)
+ {
+ for (PropertyMetaData property : properties)
+ {
+ if (hasWeldAnnotation(unit, property))
+ return true;
+ }
+ }
return false;
+ }
+
+ private boolean checkAnnotationRepositoryForWeldAnnotationOnInjectionPoints(DeploymentUnit unit, BeanMetaData beanMetaData)
+ {
+ //This will currently not work if the deployment unit does not contain the classes referenced by the beanmetadata
+
+ while (unit.isComponent())
+ unit = unit.getParent();
+
+ Set<String> classNames = (Set<String>)unit.getAttachment(ATTACHMENT);
+ if (classNames == null)
+ {
+ AnnotationIndex index = unit.getAttachment(AnnotationIndex.class);
+ if (index == null)
+ return false;
+
+ Set<Element<Weld, ?>> result = new HashSet<Element<Weld, ?>>(1);
+ result.addAll(index.classHasConstructorAnnotatedWith(Weld.class));
+ result.addAll(index.classHasFieldAnnotatedWith(Weld.class));
+ result.addAll(index.classHasMethodAnnotatedWith(Weld.class));
+
+ if (result.size() == 0)
+ {
+ classNames = Collections.emptySet();
+ }
+ else
+ {
+ classNames = new HashSet<String>();
+ for (Element<Weld, ?> item : result)
+ classNames.add(item.getOwnerClassName());
+ }
+ unit.addAttachment(ATTACHMENT, classNames);
+ }
+ try
+ {
+ return classNames.contains(beanMetaData.getBean());
+ }
+ catch (Exception e)
+ {
+ // AutoGenerated
+ throw new RuntimeException(e);
+ }
}
+ /* I don't want to delete this yet, although the check for the annotations now comes from the annotation repository
+ private boolean checkClassInfoForWeldAnnotationOnInjectionPoints(Controller controller, DeploymentUnit unit, BeanMetaData beanMetaData)
+ {
+ if (controller instanceof KernelController == false)
+ throw new IllegalArgumentException(controller + " is not a KernelController");
+ ClassInfo classInfo;
+ try
+ {
+ KernelConfigurator config = ((KernelController)controller).getKernel().getConfigurator();
+ classInfo = config.getClassInfo(beanMetaData.getBean(), Configurator.getClassLoader(beanMetaData));
+ }
+ catch (Throwable e)
+ {
+ throw new RuntimeException(e);
+ }
+ if (hasWeldAnnotation(classInfo.getDeclaredConstructors()))
+ return true;
+
+ while (!classInfo.getName().startsWith("java.lang."))
+ {
+ if (hasWeldAnnotation(classInfo.getDeclaredFields()))
+ return true;
+ if (hasWeldAnnotation(classInfo.getDeclaredMethods()))
+ return true;
+
+ classInfo = classInfo.getSuperclass();
+ }
+
+ return false;
+ }
+
+ private boolean hasWeldAnnotation(AnnotatedInfo[] infos)
+ {
+ if (infos == null || infos.length == 0)
+ return false;
+ for (AnnotatedInfo info : infos)
+ {
+ if (info.isAnnotationPresent(Weld.class))
+ return true;
+ }
+ return false;
+ }*/
+
+ private boolean hasWeldAnnotation(DeploymentUnit unit, FeatureMetaData fmd)
+ {
+ Set<AnnotationMetaData> anns = fmd.getAnnotations();
+ if (anns != null && anns.size() > 0)
+ {
+ for (AnnotationMetaData ann : anns)
+ {
+ if (ann.getAnnotationInstance(unit.getClassLoader()).annotationType() == Weld.class)
+ return true;
+ }
+ }
+ return false;
+ }
+
public boolean uninstallContext(Controller controller, DeploymentUnit unit, BeanMetaData beanMetaData)
{
//Only remove the intermediate bean if there is one
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/Kickstart.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/Kickstart.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/Kickstart.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,35 +0,0 @@
-/*
-* 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.test.deployers.as.support.mctoweld.weld;
-
-import javax.ejb.Local;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
- at Local
-public interface Kickstart
-{
-
-}
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/KickstartEjb.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/KickstartEjb.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/mctoweld/weld/KickstartEjb.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,34 +0,0 @@
-/*
-* 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.test.deployers.as.support.mctoweld.weld;
-
-import javax.ejb.Stateless;
-
-/**
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
- at Stateless
-public class KickstartEjb
-{
-
-}
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/Kickstart.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/Kickstart.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/Kickstart.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,35 +0,0 @@
-/*
-* 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.test.deployers.as.support.weldtomctoweld.weld;
-
-import javax.ejb.Local;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
- at Local
-public interface Kickstart
-{
-
-}
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/KickstartEjb.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/KickstartEjb.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/support/weldtomctoweld/weld/KickstartEjb.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,34 +0,0 @@
-/*
-* 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.test.deployers.as.support.weldtomctoweld.weld;
-
-import javax.ejb.Stateless;
-
-/**
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
- at Stateless
-public class KickstartEjb
-{
-
-}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/AbstractWeldInAsTest.java (from rev 106665, trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/AbstractWeldInAsTest.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/AbstractWeldInAsTest.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/AbstractWeldInAsTest.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,189 @@
+/*
+* 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.test.deployers.as.test;
+
+import java.io.File;
+import java.net.URL;
+
+import org.apache.commons.httpclient.HttpMethodBase;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ArchivePath;
+import org.jboss.shrinkwrap.api.ArchivePaths;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.exporter.ExplodedExporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.test.AbstractTestDelegate;
+import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossTestServices;
+import org.jboss.test.deployers.as.support.HttpUtils;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public abstract class AbstractWeldInAsTest extends JBossTestCase
+{
+ private static final ArchivePath META_INF = ArchivePaths.create("META-INF");
+ private static final ArchivePath WEB_INF = ArchivePaths.create("WEB-INF");
+ private static final ArchivePath FACES_CONFIG = ArchivePaths.create(WEB_INF, "faces-config.xml");
+ private static final ArchivePath WEB_XML = ArchivePaths.create(WEB_INF, "web.xml");
+ private static final ArchivePath META_BEANS_XML = ArchivePaths.create(META_INF, "beans.xml");
+ private static final ArchivePath WEB_BEANS_XML = ArchivePaths.create(WEB_INF, "beans.xml");
+ private static final ArchivePath JBOSS_BEANS_XML = ArchivePaths.create(META_INF, "jboss-beans.xml");
+
+ public static AbstractTestDelegate getDelegate(Class<?> clazz)
+ {
+ return new JBossTestServices(clazz);
+ }
+
+ public AbstractWeldInAsTest(String name)
+ {
+ super(name);
+ }
+
+ protected WebArchive createWebArchive(String name)
+ {
+ WebArchive webArchive = ShrinkWrap.create(WebArchive.class, "test-weld.war");
+ webArchive
+ .addResource("org/jboss/test/deployers/as/support/webapp/" + name + ".xhtml", "/" + name + ".xhtml")
+ .addResource("org/jboss/test/deployers/as/support/webapp/WEB-INF/web.xml", WEB_XML)
+ .addResource("org/jboss/test/deployers/as/support/webapp/WEB-INF/faces-config.xml", FACES_CONFIG);
+
+
+
+ getLog().debug(webArchive.toString(true));
+
+ return webArchive;
+ }
+
+ protected JavaArchive createWeldArchive(Class<?>...classes)
+ {
+ JavaArchive javaArchive = ShrinkWrap.create(JavaArchive.class, "weld.jar")
+ .addClasses(classes)
+ .addResource("org/jboss/test/deployers/as/support/weld/META-INF/beans.xml", META_BEANS_XML);
+
+ getLog().debug(javaArchive.toString(true));
+ return javaArchive;
+ }
+
+ protected JavaArchive createMcArchive(String packageFragment, Class<?>...classes)
+ {
+
+ JavaArchive javaArchive = ShrinkWrap.create(JavaArchive.class, "mc.jar")
+ .addClasses(classes)
+ .addResource("org/jboss/test/deployers/as/support/" + packageFragment + "/META-INF/jboss-beans.xml", JBOSS_BEANS_XML);
+
+ getLog().debug(javaArchive.toString(true));
+ return javaArchive;
+ }
+
+ protected URL createAndDeployWar(String name, Class<?>...classes) throws Exception
+ {
+ WebArchive webArchive = createWebArchive(name)
+ .addResource("org/jboss/test/deployers/as/support/weld/META-INF/beans.xml", WEB_BEANS_XML)
+ .addClasses(classes);
+
+ return explodeArchiveAndDeploy(webArchive);
+ }
+
+ protected URL createAndDeployWar(String name, String mcDescriptorPackageFragment, Class<?>...classes) throws Exception
+ {
+ WebArchive webArchive = createWebArchive(name)
+ .addResource("org/jboss/test/deployers/as/support/weld/META-INF/beans.xml", WEB_BEANS_XML)
+ .addResource("org/jboss/test/deployers/as/support/" + mcDescriptorPackageFragment + "/META-INF/jboss-beans.xml", JBOSS_BEANS_XML)
+ .addClasses(classes);
+
+ return explodeArchiveAndDeploy(webArchive);
+ }
+
+ protected URL createAndDeployEar(Archive<?>...archives) throws Exception
+ {
+ EnterpriseArchive enterpriseArchive = ShrinkWrap.create("simple.ear", EnterpriseArchive.class);
+ for (Archive<?> archive : archives)
+ enterpriseArchive.add(archive, "/");
+
+ return explodeArchiveAndDeploy(enterpriseArchive);
+ }
+
+ private URL explodeArchiveAndDeploy(Archive<?> archive) throws Exception
+ {
+ URL url = createExplodedArchive(archive);
+
+ getLog().debug(archive.toString(true));
+
+ undeploy(url.toString());
+ try
+ {
+ deploy(url.toString());
+ }
+ catch(Exception e)
+ {
+ undeploy(url.toString());
+ throw(e);
+ }
+
+ return url;
+ }
+
+ protected void accessWebApp(String urlPath, String...tokens) throws Exception
+ {
+ HttpMethodBase request = HttpUtils.accessURL(new URL(HttpUtils.getBaseURL() + urlPath));
+ String body = request.getResponseBodyAsString();
+
+ assertTrue("Body was not transformed to html:\n" + body, body.indexOf("<h:") < 0);
+
+ System.out.println(body);
+
+
+ for (String token : tokens)
+ assertTrue("Could not find '" + token + "' in body:\n" + body, body.indexOf(token) >= 0);
+ }
+
+ private URL createExplodedArchive(Archive<?> archive) throws Exception
+ {
+ File file = new File("target/lib");
+ if (file.exists())
+ deleteFile(file);
+ file.mkdir();
+ File ear = new File(file, archive.getName());
+ if (ear.exists())
+ deleteFile(file);
+ file = archive.as(ExplodedExporter.class).exportExploded(file);
+
+ return file.toURI().toURL();
+ }
+
+ private void deleteFile(File file)
+ {
+ if (file.isDirectory())
+ {
+ for (String name : file.list())
+ deleteFile(new File(file, name));
+ }
+
+ file.delete();
+ }
+
+}
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/ApplicationServerTestCase.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/ApplicationServerTestCase.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/ApplicationServerTestCase.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,569 +0,0 @@
-/*
-* 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.test.deployers.as.test;
-
-import java.io.File;
-import java.net.URL;
-
-import org.apache.commons.httpclient.HttpMethodBase;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ArchivePath;
-import org.jboss.shrinkwrap.api.ArchivePaths;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.exporter.ExplodedExporter;
-import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.test.AbstractTestDelegate;
-import org.jboss.test.JBossTestCase;
-import org.jboss.test.JBossTestServices;
-import org.jboss.test.deployers.as.support.Blue;
-import org.jboss.test.deployers.as.support.HttpUtils;
-import org.jboss.test.deployers.as.support.Red;
-import org.jboss.test.deployers.as.support.mctoweld.mc.BlueMcBeanNoDependencies;
-import org.jboss.test.deployers.as.support.mctoweld.mc.McBeanNoDependencies;
-import org.jboss.test.deployers.as.support.mctoweld.mc.RedMcBeanNoDependencies;
-import org.jboss.test.deployers.as.support.mctoweld.weld.Kickstart;
-import org.jboss.test.deployers.as.support.mctoweld.weld.KickstartEjb;
-import org.jboss.test.deployers.as.support.mctoweld.weld.McToWeldLocalInterface;
-import org.jboss.test.deployers.as.support.mctoweld.weld.WeldWithMcBean;
-import org.jboss.test.deployers.as.support.mctoweld.weld.WeldWithMcEjb;
-import org.jboss.test.deployers.as.support.weld.simple.BlueWeldDependency;
-import org.jboss.test.deployers.as.support.weld.simple.RedWeldDependency;
-import org.jboss.test.deployers.as.support.weld.simple.SimpleLocalInterface;
-import org.jboss.test.deployers.as.support.weld.simple.SimpleWeldBeanNoInjection;
-import org.jboss.test.deployers.as.support.weld.simple.SimpleWeldBeanWeldInjection;
-import org.jboss.test.deployers.as.support.weld.simple.SimpleWeldEjbNoInjection;
-import org.jboss.test.deployers.as.support.weld.simple.SimpleWeldEjbWeldInjection;
-import org.jboss.test.deployers.as.support.weld.simple.WeldDependency;
-import org.jboss.test.deployers.as.support.weldtomctoweld.mc.BlueMcBeanWeldDependencies;
-import org.jboss.test.deployers.as.support.weldtomctoweld.mc.McBeanWeldDependencies;
-import org.jboss.test.deployers.as.support.weldtomctoweld.mc.RedMcBeanWeldDependencies;
-import org.jboss.test.deployers.as.support.weldtomctoweld.weld.BlueWeldMcDependency;
-import org.jboss.test.deployers.as.support.weldtomctoweld.weld.RedWeldMcDependency;
-import org.jboss.test.deployers.as.support.weldtomctoweld.weld.WeldMcDependency;
-import org.jboss.test.deployers.as.support.weldtomctoweld.weld.WeldToMcToWeldLocalInterface;
-import org.jboss.test.deployers.as.support.weldtomctoweld.weld.WeldWithMcWithWeldBean;
-import org.jboss.test.deployers.as.support.weldtomctoweld.weld.WeldWithMcWithWeldEjb;
-
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class ApplicationServerTestCase extends JBossTestCase
-{
- private final static ArchivePath META_INF = ArchivePaths.create("META-INF");
- private final static ArchivePath WEB_INF = ArchivePaths.create("WEB-INF");
- private final static ArchivePath FACES_CONFIG = ArchivePaths.create(WEB_INF, "faces-config.xml");
- private final static ArchivePath WEB_XML = ArchivePaths.create(WEB_INF, "web.xml");
- private final static ArchivePath META_BEANS_XML = ArchivePaths.create(META_INF, "beans.xml");
- private final static ArchivePath WEB_BEANS_XML = ArchivePaths.create(WEB_INF, "beans.xml");
- private final static ArchivePath JBOSS_BEANS_XML = ArchivePaths.create(META_INF, "jboss-beans.xml");
-
- public ApplicationServerTestCase(String name)
- {
- super(name);
- }
-
- public static AbstractTestDelegate getDelegate(Class<?> clazz)
- {
- return new JBossTestServices(clazz);
- }
-
- /////////////////////////////////////////////////////////////////
- //These first tests are just "sanity" tests to make sure we
- //are deploying things the right way and that weld itself
- //works as expected
-
- public void testSimpleWeldBeanNoInjectionWar() throws Throwable
- {
- URL url = createAndDeployWar("simpleWeldBeanNoInjection", SimpleWeldBeanNoInjection.class);
- try
- {
- accessWebApp("test-weld/simpleWeldBeanNoInjection.jsf", "SimpleWeldBeanNoInjection#ok#");
- }
- finally
- {
- if (url != null)
- undeploy(url.toString());
- }
- }
-
- public void testSimpleWeldBeanNoInjectionEar() throws Throwable
- {
- URL url = createAndDeployEar(
- createWebArchive("simpleWeldBeanNoInjection"),
- createWeldArchive(SimpleWeldBeanNoInjection.class));
- try
- {
- accessWebApp("test-weld/simpleWeldBeanNoInjection.jsf", "SimpleWeldBeanNoInjection#ok#");
- }
- finally
- {
- if (url != null)
- undeploy(url.toString());
- }
- }
-
- public void testSimpleWeldEjbNoInjectionWar() throws Throwable
- {
- URL url = createAndDeployWar("simpleWeldEjbNoInjection",
- SimpleWeldEjbNoInjection.class,
- SimpleLocalInterface.class);
- try
- {
- accessWebApp("test-weld/simpleWeldEjbNoInjection.jsf", "SimpleWeldEjbNoInjection#ok#");
- }
- finally
- {
- if (url != null)
- undeploy(url.toString());
- }
- }
-
- public void testSimpleWeldEjbNoInjectionEar() throws Throwable
- {
- URL url = createAndDeployEar(
- createWebArchive("simpleWeldEjbNoInjection"),
- createWeldArchive(SimpleWeldEjbNoInjection.class, SimpleLocalInterface.class));
- try
- {
- accessWebApp("test-weld/simpleWeldEjbNoInjection.jsf", "SimpleWeldEjbNoInjection#ok#");
- }
- finally
- {
- if (url != null)
- undeploy(url.toString());
- }
- }
-
- public void testSimpleWeldBeanWeldInjectionWar() throws Throwable
- {
- URL url = createAndDeployWar("simpleWeldBeanWeldInjection",
- SimpleWeldBeanWeldInjection.class,
- WeldDependency.class,
- RedWeldDependency.class,
- BlueWeldDependency.class,
- Red.class,
- Blue.class);
- try
- {
- accessWebApp("test-weld/simpleWeldBeanWeldInjection.jsf", "SimpleWeldBeanWeldInjection#ok#");
- }
- finally
- {
- if (url != null)
- undeploy(url.toString());
- }
- }
-
- public void testSimpleWeldBeanWeldInjectionEar() throws Throwable
- {
- URL url = createAndDeployEar(
- createWebArchive("simpleWeldBeanWeldInjection"),
- createWeldArchive(SimpleWeldBeanWeldInjection.class, WeldDependency.class, RedWeldDependency.class, BlueWeldDependency.class, Red.class, Blue.class));
- try
- {
- accessWebApp("test-weld/simpleWeldBeanWeldInjection.jsf", "SimpleWeldBeanWeldInjection#ok#");
- }
- finally
- {
- if (url != null)
- undeploy(url.toString());
- }
- }
-
- public void testSimpleWeldEjbWeldInjectionWar() throws Throwable
- {
- URL url = createAndDeployWar("simpleWeldEjbWeldInjection",
- SimpleWeldEjbWeldInjection.class,
- SimpleLocalInterface.class,
- WeldDependency.class,
- RedWeldDependency.class,
- BlueWeldDependency.class,
- Red.class,
- Blue.class);
- try
- {
- accessWebApp("test-weld/simpleWeldEjbWeldInjection.jsf", "SimpleWeldBeanEjbInjection#ok#");
- }
- finally
- {
- if (url != null)
- undeploy(url.toString());
- }
- }
-
- public void testSimpleWeldEjbWeldInjectionEar() throws Throwable
- {
- URL url = createAndDeployEar(
- createWebArchive("simpleWeldEjbWeldInjection"),
- createWeldArchive(SimpleWeldEjbWeldInjection.class,
- SimpleLocalInterface.class,
- WeldDependency.class,
- RedWeldDependency.class,
- BlueWeldDependency.class,
- Red.class,
- Blue.class));
- try
- {
- accessWebApp("test-weld/simpleWeldEjbWeldInjection.jsf", "SimpleWeldBeanEjbInjection#ok#");
- }
- finally
- {
- if (url != null)
- undeploy(url.toString());
- }
- }
-
- /////////////////////////////////////////////////////////////////
- //These are the real Weld<->MC injection tests
-
- public void testMcNoDependenciesInjectedIntoWeldBeanWar() throws Throwable
- {
- URL url = createAndDeployWar("mcNoDependenciesInjectedIntoWeldBean",
- "mctoweld/nodependencies",
- WeldWithMcBean.class,
- Red.class,
- Blue.class,
- McBeanNoDependencies.class,
- RedMcBeanNoDependencies.class,
- BlueMcBeanNoDependencies.class,
- //TODO Remove the Kickstart EJB, which is currently necessary to make sure that there are some EJB containers to wait for before BootstrapBean can start
- KickstartEjb.class,
- Kickstart.class);
-
- try
- {
- accessWebApp("test-weld/mcNoDependenciesInjectedIntoWeldBean.jsf", "WeldWithMcBean#ok#");
- }
- finally
- {
- if (url != null)
- undeploy(url.toString());
- }
- }
-
- public void testMcNoDependenciesInjectedIntoWeldBeanEar() throws Throwable
- {
- URL url = createAndDeployEar(
- createWebArchive("mcNoDependenciesInjectedIntoWeldBean"),
- //TODO Remove the Kickstart EJB, which is currently necessary to make sure that there are some EJB containers to wait for before BootstrapBean can start
- createWeldArchive(WeldWithMcBean.class, KickstartEjb.class, Kickstart.class),
- createMcArchive("mctoweld/nodependencies", Red.class, Blue.class, McBeanNoDependencies.class, RedMcBeanNoDependencies.class, BlueMcBeanNoDependencies.class));
-
- try
- {
- accessWebApp("test-weld/mcNoDependenciesInjectedIntoWeldBean.jsf", "WeldWithMcBean#ok#");
- }
- finally
- {
- if (url != null)
- undeploy(url.toString());
- }
- }
-
- public void testMcNoDependenciesInjectedIntoWeldEjbWar() throws Throwable
- {
- URL url = createAndDeployWar("mcNoDependenciesInjectedIntoWeldEjb",
- "mctoweld/nodependencies",
- WeldWithMcEjb.class,
- McToWeldLocalInterface.class,
- Red.class,
- Blue.class,
- McBeanNoDependencies.class,
- RedMcBeanNoDependencies.class,
- BlueMcBeanNoDependencies.class);
-
- try
- {
- accessWebApp("test-weld/mcNoDependenciesInjectedIntoWeldEjb.jsf", "WeldWithMcEjb#ok#");
- }
- finally
- {
- if (url != null)
- undeploy(url.toString());
- }
- }
-
- public void testMcNoDependenciesInjectedIntoWeldEjbEar() throws Throwable
- {
- URL url = createAndDeployEar(
- createWebArchive("mcNoDependenciesInjectedIntoWeldEjb"),
- createWeldArchive(WeldWithMcEjb.class, McToWeldLocalInterface.class, Red.class, Blue.class),
- createMcArchive("mctoweld/nodependencies", McBeanNoDependencies.class, RedMcBeanNoDependencies.class, BlueMcBeanNoDependencies.class));
-
- try
- {
- accessWebApp("test-weld/mcNoDependenciesInjectedIntoWeldEjb.jsf", "WeldWithMcEjb#ok#");
- }
- finally
- {
- if (url != null)
- undeploy(url.toString());
- }
- }
-
- public void testWeldInjectedIntoMcInjectedIntoWeldBeanWar() throws Throwable
- {
- URL url = createAndDeployWar("weldInjectedIntoMcInjectedIntoWeldBean",
- "weldtomctoweld",
- WeldWithMcWithWeldBean.class,
- WeldMcDependency.class,
- RedWeldMcDependency.class,
- BlueWeldMcDependency.class,
- Red.class,
- Blue.class,
- McBeanWeldDependencies.class,
- RedMcBeanWeldDependencies.class,
- BlueMcBeanWeldDependencies.class,
- //TODO Remove the Kickstart EJB, which is currently necessary to make sure that there are some EJB containers to wait for before BootstrapBean can start
- KickstartEjb.class,
- Kickstart.class);
-
- try
- {
- accessWebApp("test-weld/weldInjectedIntoMcInjectedIntoWeldBean.jsf", "WeldWithMcWithWeldBean#ok#");
- }
- finally
- {
- if (url != null)
- undeploy(url.toString());
- }
- }
-
- public void testWeldInjectedIntoMcInjectedIntoWeldBeanEar() throws Throwable
- {
- URL url = createAndDeployEar(
- createWebArchive("weldInjectedIntoMcInjectedIntoWeldBean"),
- //TODO Remove the Kickstart EJB, which is currently necessary to make sure that there are some EJB containers to wait for before BootstrapBean can start
- createWeldArchive(WeldWithMcWithWeldBean.class,
- WeldMcDependency.class,
- RedWeldMcDependency.class,
- BlueWeldMcDependency.class,
- KickstartEjb.class,
- Kickstart.class),
- createMcArchive("weldtomctoweld",
- Red.class,
- Blue.class,
- McBeanWeldDependencies.class,
- RedMcBeanWeldDependencies.class,
- BlueMcBeanWeldDependencies.class));
-
- try
- {
- accessWebApp("test-weld/weldInjectedIntoMcInjectedIntoWeldBean.jsf", "WeldWithMcWithWeldBean#ok#");
- }
- finally
- {
- if (url != null)
- undeploy(url.toString());
- }
- }
-
-
- public void testWeldInjectedIntoMcInjectedIntoWeldEjbWar() throws Throwable
- {
- URL url = createAndDeployWar("weldInjectedIntoMcInjectedIntoWeldEjb",
- "weldtomctoweld",
- WeldWithMcWithWeldEjb.class,
- WeldToMcToWeldLocalInterface.class,
- WeldMcDependency.class,
- RedWeldMcDependency.class,
- BlueWeldMcDependency.class,
- Red.class,
- Blue.class,
- McBeanWeldDependencies.class,
- RedMcBeanWeldDependencies.class,
- BlueMcBeanWeldDependencies.class,
- //TODO Remove the Kickstart EJB, which is currently necessary to make sure that there are some EJB containers to wait for before BootstrapBean can start
- KickstartEjb.class,
- Kickstart.class);
-
- try
- {
- accessWebApp("test-weld/weldInjectedIntoMcInjectedIntoWeldEjb.jsf", "WeldWithMcWithWeldEjb#ok#");
- }
- finally
- {
- if (url != null)
- undeploy(url.toString());
- }
-
- }
-
- public void testWeldInjectedIntoMcInjectedIntoWeldEjbEar() throws Throwable
- {
- URL url = createAndDeployEar(
- createWebArchive("weldInjectedIntoMcInjectedIntoWeldEjb"),
- //TODO Remove the Kickstart EJB, which is currently necessary to make sure that there are some EJB containers to wait for before BootstrapBean can start
- createWeldArchive(WeldWithMcWithWeldEjb.class,
- WeldToMcToWeldLocalInterface.class,
- WeldMcDependency.class,
- RedWeldMcDependency.class,
- BlueWeldMcDependency.class,
- KickstartEjb.class,
- Kickstart.class),
- createMcArchive("weldtomctoweld",
- Red.class,
- Blue.class,
- McBeanWeldDependencies.class,
- RedMcBeanWeldDependencies.class,
- BlueMcBeanWeldDependencies.class));
-
- try
- {
- accessWebApp("test-weld/weldInjectedIntoMcInjectedIntoWeldEjb.jsf", "WeldWithMcWithWeldEjb#ok#");
- }
- finally
- {
- if (url != null)
- undeploy(url.toString());
- }
-
- }
-
- private WebArchive createWebArchive(String name)
- {
- WebArchive webArchive = ShrinkWrap.create(WebArchive.class, "test-weld.war");
- webArchive
- .addResource("org/jboss/test/deployers/as/support/webapp/" + name + ".xhtml", "/" + name + ".xhtml")
- .addResource("org/jboss/test/deployers/as/support/webapp/WEB-INF/web.xml", WEB_XML)
- .addResource("org/jboss/test/deployers/as/support/webapp/WEB-INF/faces-config.xml", FACES_CONFIG);
-
-
-
- getLog().debug(webArchive.toString(true));
-
- return webArchive;
- }
-
- private JavaArchive createWeldArchive(Class<?>...classes)
- {
- JavaArchive javaArchive = ShrinkWrap.create(JavaArchive.class, "weld.jar")
- .addClasses(classes)
- .addResource("org/jboss/test/deployers/as/support/weld/META-INF/beans.xml", META_BEANS_XML);
-
- getLog().debug(javaArchive.toString(true));
- return javaArchive;
- }
-
- private JavaArchive createMcArchive(String packageFragment, Class<?>...classes)
- {
-
- JavaArchive javaArchive = ShrinkWrap.create(JavaArchive.class, "mc.jar")
- .addClasses(classes)
- .addResource("org/jboss/test/deployers/as/support/" + packageFragment + "/META-INF/jboss-beans.xml", JBOSS_BEANS_XML);
-
- getLog().debug(javaArchive.toString(true));
- return javaArchive;
- }
-
- private URL createAndDeployWar(String name, Class<?>...classes) throws Exception
- {
- WebArchive webArchive = createWebArchive(name)
- .addResource("org/jboss/test/deployers/as/support/weld/META-INF/beans.xml", WEB_BEANS_XML)
- .addClasses(classes);
-
- return explodeArchiveAndDeploy(webArchive);
- }
-
- private URL createAndDeployWar(String name, String mcDescriptorPackageFragment, Class<?>...classes) throws Exception
- {
- WebArchive webArchive = createWebArchive(name)
- .addResource("org/jboss/test/deployers/as/support/weld/META-INF/beans.xml", WEB_BEANS_XML)
- .addResource("org/jboss/test/deployers/as/support/" + mcDescriptorPackageFragment + "/META-INF/jboss-beans.xml", JBOSS_BEANS_XML)
- .addClasses(classes);
-
- return explodeArchiveAndDeploy(webArchive);
- }
-
- private URL createAndDeployEar(Archive<?>...archives) throws Exception
- {
- EnterpriseArchive enterpriseArchive = ShrinkWrap.create("simple.ear", EnterpriseArchive.class);
- for (Archive<?> archive : archives)
- enterpriseArchive.add(archive, "/");
-
- return explodeArchiveAndDeploy(enterpriseArchive);
- }
-
- private URL explodeArchiveAndDeploy(Archive<?> archive) throws Exception
- {
- URL url = createExplodedArchive(archive);
-
- getLog().debug(archive.toString(true));
-
- undeploy(url.toString());
- try
- {
- deploy(url.toString());
- }
- catch(Exception e)
- {
- undeploy(url.toString());
- throw(e);
- }
-
- return url;
- }
-
- private void accessWebApp(String urlPath, String...tokens) throws Exception
- {
- HttpMethodBase request = HttpUtils.accessURL(new URL(HttpUtils.getBaseURL() + urlPath));
- String body = request.getResponseBodyAsString();
-
- assertTrue("Body was not transformed to html:\n" + body, body.indexOf("<h:") < 0);
-
- System.out.println(body);
-
-
- for (String token : tokens)
- assertTrue("Could not find '" + token + "' in body:\n" + body, body.indexOf(token) >= 0);
- }
-
- private URL createExplodedArchive(Archive<?> archive) throws Exception
- {
- File file = new File("target/lib");
- if (file.exists())
- deleteFile(file);
- file.mkdir();
- File ear = new File(file, archive.getName());
- if (ear.exists())
- deleteFile(file);
- file = archive.as(ExplodedExporter.class).exportExploded(file);
-
- return file.toURI().toURL();
- }
-
- private void deleteFile(File file)
- {
- if (file.isDirectory())
- {
- for (String name : file.list())
- deleteFile(new File(file, name));
- }
-
- file.delete();
- }
-}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/McWeldInjectionApplicationServerTestCase.java (from rev 106665, trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/McWeldInjectionApplicationServerTestCase.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/McWeldInjectionApplicationServerTestCase.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/McWeldInjectionApplicationServerTestCase.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,244 @@
+/*
+* 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.test.deployers.as.test;
+
+import java.net.URL;
+
+import org.jboss.test.deployers.as.support.Blue;
+import org.jboss.test.deployers.as.support.Red;
+import org.jboss.test.deployers.as.support.mctoweld.mc.BlueMcBeanNoDependencies;
+import org.jboss.test.deployers.as.support.mctoweld.mc.McBeanNoDependencies;
+import org.jboss.test.deployers.as.support.mctoweld.mc.RedMcBeanNoDependencies;
+import org.jboss.test.deployers.as.support.mctoweld.weld.McToWeldLocalInterface;
+import org.jboss.test.deployers.as.support.mctoweld.weld.WeldWithMcBean;
+import org.jboss.test.deployers.as.support.mctoweld.weld.WeldWithMcEjb;
+import org.jboss.test.deployers.as.support.weldtomctoweld.mc.BlueMcBeanWeldDependencies;
+import org.jboss.test.deployers.as.support.weldtomctoweld.mc.McBeanWeldDependencies;
+import org.jboss.test.deployers.as.support.weldtomctoweld.mc.RedMcBeanWeldDependencies;
+import org.jboss.test.deployers.as.support.weldtomctoweld.weld.BlueWeldMcDependency;
+import org.jboss.test.deployers.as.support.weldtomctoweld.weld.RedWeldMcDependency;
+import org.jboss.test.deployers.as.support.weldtomctoweld.weld.WeldMcDependency;
+import org.jboss.test.deployers.as.support.weldtomctoweld.weld.WeldToMcToWeldLocalInterface;
+import org.jboss.test.deployers.as.support.weldtomctoweld.weld.WeldWithMcWithWeldBean;
+import org.jboss.test.deployers.as.support.weldtomctoweld.weld.WeldWithMcWithWeldEjb;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class McWeldInjectionApplicationServerTestCase extends AbstractWeldInAsTest
+{
+ public McWeldInjectionApplicationServerTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testMcNoDependenciesInjectedIntoWeldBeanWar() throws Throwable
+ {
+ URL url = createAndDeployWar("mcNoDependenciesInjectedIntoWeldBean",
+ "mctoweld/nodependencies",
+ WeldWithMcBean.class,
+ Red.class,
+ Blue.class,
+ McBeanNoDependencies.class,
+ RedMcBeanNoDependencies.class,
+ BlueMcBeanNoDependencies.class);
+
+ try
+ {
+ accessWebApp("test-weld/mcNoDependenciesInjectedIntoWeldBean.jsf", "WeldWithMcBean#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testMcNoDependenciesInjectedIntoWeldBeanEar() throws Throwable
+ {
+ URL url = createAndDeployEar(
+ createWebArchive("mcNoDependenciesInjectedIntoWeldBean"),
+ createWeldArchive(WeldWithMcBean.class),
+ createMcArchive("mctoweld/nodependencies", Red.class, Blue.class, McBeanNoDependencies.class, RedMcBeanNoDependencies.class, BlueMcBeanNoDependencies.class));
+
+ try
+ {
+ accessWebApp("test-weld/mcNoDependenciesInjectedIntoWeldBean.jsf", "WeldWithMcBean#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testMcNoDependenciesInjectedIntoWeldEjbWar() throws Throwable
+ {
+ URL url = createAndDeployWar("mcNoDependenciesInjectedIntoWeldEjb",
+ "mctoweld/nodependencies",
+ WeldWithMcEjb.class,
+ McToWeldLocalInterface.class,
+ Red.class,
+ Blue.class,
+ McBeanNoDependencies.class,
+ RedMcBeanNoDependencies.class,
+ BlueMcBeanNoDependencies.class);
+
+ try
+ {
+ accessWebApp("test-weld/mcNoDependenciesInjectedIntoWeldEjb.jsf", "WeldWithMcEjb#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testMcNoDependenciesInjectedIntoWeldEjbEar() throws Throwable
+ {
+ URL url = createAndDeployEar(
+ createWebArchive("mcNoDependenciesInjectedIntoWeldEjb"),
+ createWeldArchive(WeldWithMcEjb.class, McToWeldLocalInterface.class, Red.class, Blue.class),
+ createMcArchive("mctoweld/nodependencies", McBeanNoDependencies.class, RedMcBeanNoDependencies.class, BlueMcBeanNoDependencies.class));
+
+ try
+ {
+ accessWebApp("test-weld/mcNoDependenciesInjectedIntoWeldEjb.jsf", "WeldWithMcEjb#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testWeldInjectedIntoMcInjectedIntoWeldBeanWar() throws Throwable
+ {
+ URL url = createAndDeployWar("weldInjectedIntoMcInjectedIntoWeldBean",
+ "weldtomctoweld",
+ WeldWithMcWithWeldBean.class,
+ WeldMcDependency.class,
+ RedWeldMcDependency.class,
+ BlueWeldMcDependency.class,
+ Red.class,
+ Blue.class,
+ McBeanWeldDependencies.class,
+ RedMcBeanWeldDependencies.class,
+ BlueMcBeanWeldDependencies.class);
+
+ try
+ {
+ accessWebApp("test-weld/weldInjectedIntoMcInjectedIntoWeldBean.jsf", "WeldWithMcWithWeldBean#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testWeldInjectedIntoMcInjectedIntoWeldBeanEar() throws Throwable
+ {
+ URL url = createAndDeployEar(
+ createWebArchive("weldInjectedIntoMcInjectedIntoWeldBean"),
+ createWeldArchive(WeldWithMcWithWeldBean.class,
+ WeldMcDependency.class,
+ RedWeldMcDependency.class,
+ BlueWeldMcDependency.class),
+ createMcArchive("weldtomctoweld",
+ Red.class,
+ Blue.class,
+ McBeanWeldDependencies.class,
+ RedMcBeanWeldDependencies.class,
+ BlueMcBeanWeldDependencies.class));
+
+ try
+ {
+ accessWebApp("test-weld/weldInjectedIntoMcInjectedIntoWeldBean.jsf", "WeldWithMcWithWeldBean#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+
+ public void testWeldInjectedIntoMcInjectedIntoWeldEjbWar() throws Throwable
+ {
+ URL url = createAndDeployWar("weldInjectedIntoMcInjectedIntoWeldEjb",
+ "weldtomctoweld",
+ WeldWithMcWithWeldEjb.class,
+ WeldToMcToWeldLocalInterface.class,
+ WeldMcDependency.class,
+ RedWeldMcDependency.class,
+ BlueWeldMcDependency.class,
+ Red.class,
+ Blue.class,
+ McBeanWeldDependencies.class,
+ RedMcBeanWeldDependencies.class,
+ BlueMcBeanWeldDependencies.class);
+
+ try
+ {
+ accessWebApp("test-weld/weldInjectedIntoMcInjectedIntoWeldEjb.jsf", "WeldWithMcWithWeldEjb#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+
+ }
+
+ public void testWeldInjectedIntoMcInjectedIntoWeldEjbEar() throws Throwable
+ {
+ URL url = createAndDeployEar(
+ createWebArchive("weldInjectedIntoMcInjectedIntoWeldEjb"),
+ createWeldArchive(WeldWithMcWithWeldEjb.class,
+ WeldToMcToWeldLocalInterface.class,
+ WeldMcDependency.class,
+ RedWeldMcDependency.class,
+ BlueWeldMcDependency.class),
+ createMcArchive("weldtomctoweld",
+ Red.class,
+ Blue.class,
+ McBeanWeldDependencies.class,
+ RedMcBeanWeldDependencies.class,
+ BlueMcBeanWeldDependencies.class));
+
+ try
+ {
+ accessWebApp("test-weld/weldInjectedIntoMcInjectedIntoWeldEjb.jsf", "WeldWithMcWithWeldEjb#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+
+ }
+}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/SanityApplicationServerTestCase.java (from rev 106665, trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/SanityApplicationServerTestCase.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/SanityApplicationServerTestCase.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/as/test/SanityApplicationServerTestCase.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,193 @@
+/*
+* 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.test.deployers.as.test;
+
+import java.net.URL;
+
+import org.jboss.test.deployers.as.support.Blue;
+import org.jboss.test.deployers.as.support.Red;
+import org.jboss.test.deployers.as.support.weld.simple.BlueWeldDependency;
+import org.jboss.test.deployers.as.support.weld.simple.RedWeldDependency;
+import org.jboss.test.deployers.as.support.weld.simple.SimpleLocalInterface;
+import org.jboss.test.deployers.as.support.weld.simple.SimpleWeldBeanNoInjection;
+import org.jboss.test.deployers.as.support.weld.simple.SimpleWeldBeanWeldInjection;
+import org.jboss.test.deployers.as.support.weld.simple.SimpleWeldEjbNoInjection;
+import org.jboss.test.deployers.as.support.weld.simple.SimpleWeldEjbWeldInjection;
+import org.jboss.test.deployers.as.support.weld.simple.WeldDependency;
+
+/**
+ * A few tests to make sure that basic weld is working as expected.
+ * No MC<->Weld injection here.
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class SanityApplicationServerTestCase extends AbstractWeldInAsTest
+{
+
+ public SanityApplicationServerTestCase(String name)
+ {
+ super(name);
+ }
+
+ public void testSimpleWeldBeanNoInjectionWar() throws Throwable
+ {
+ URL url = createAndDeployWar("simpleWeldBeanNoInjection", SimpleWeldBeanNoInjection.class);
+ try
+ {
+ accessWebApp("test-weld/simpleWeldBeanNoInjection.jsf", "SimpleWeldBeanNoInjection#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testSimpleWeldBeanNoInjectionEar() throws Throwable
+ {
+ URL url = createAndDeployEar(
+ createWebArchive("simpleWeldBeanNoInjection"),
+ createWeldArchive(SimpleWeldBeanNoInjection.class));
+ try
+ {
+ accessWebApp("test-weld/simpleWeldBeanNoInjection.jsf", "SimpleWeldBeanNoInjection#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testSimpleWeldEjbNoInjectionWar() throws Throwable
+ {
+ URL url = createAndDeployWar("simpleWeldEjbNoInjection",
+ SimpleWeldEjbNoInjection.class,
+ SimpleLocalInterface.class);
+ try
+ {
+ accessWebApp("test-weld/simpleWeldEjbNoInjection.jsf", "SimpleWeldEjbNoInjection#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testSimpleWeldEjbNoInjectionEar() throws Throwable
+ {
+ URL url = createAndDeployEar(
+ createWebArchive("simpleWeldEjbNoInjection"),
+ createWeldArchive(SimpleWeldEjbNoInjection.class, SimpleLocalInterface.class));
+ try
+ {
+ accessWebApp("test-weld/simpleWeldEjbNoInjection.jsf", "SimpleWeldEjbNoInjection#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testSimpleWeldBeanWeldInjectionWar() throws Throwable
+ {
+ URL url = createAndDeployWar("simpleWeldBeanWeldInjection",
+ SimpleWeldBeanWeldInjection.class,
+ WeldDependency.class,
+ RedWeldDependency.class,
+ BlueWeldDependency.class,
+ Red.class,
+ Blue.class);
+ try
+ {
+ accessWebApp("test-weld/simpleWeldBeanWeldInjection.jsf", "SimpleWeldBeanWeldInjection#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testSimpleWeldBeanWeldInjectionEar() throws Throwable
+ {
+ URL url = createAndDeployEar(
+ createWebArchive("simpleWeldBeanWeldInjection"),
+ createWeldArchive(SimpleWeldBeanWeldInjection.class, WeldDependency.class, RedWeldDependency.class, BlueWeldDependency.class, Red.class, Blue.class));
+ try
+ {
+ accessWebApp("test-weld/simpleWeldBeanWeldInjection.jsf", "SimpleWeldBeanWeldInjection#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testSimpleWeldEjbWeldInjectionWar() throws Throwable
+ {
+ URL url = createAndDeployWar("simpleWeldEjbWeldInjection",
+ SimpleWeldEjbWeldInjection.class,
+ SimpleLocalInterface.class,
+ WeldDependency.class,
+ RedWeldDependency.class,
+ BlueWeldDependency.class,
+ Red.class,
+ Blue.class);
+ try
+ {
+ accessWebApp("test-weld/simpleWeldEjbWeldInjection.jsf", "SimpleWeldBeanEjbInjection#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+ public void testSimpleWeldEjbWeldInjectionEar() throws Throwable
+ {
+ URL url = createAndDeployEar(
+ createWebArchive("simpleWeldEjbWeldInjection"),
+ createWeldArchive(SimpleWeldEjbWeldInjection.class,
+ SimpleLocalInterface.class,
+ WeldDependency.class,
+ RedWeldDependency.class,
+ BlueWeldDependency.class,
+ Red.class,
+ Blue.class));
+ try
+ {
+ accessWebApp("test-weld/simpleWeldEjbWeldInjection.jsf", "SimpleWeldBeanEjbInjection#ok#");
+ }
+ finally
+ {
+ if (url != null)
+ undeploy(url.toString());
+ }
+ }
+
+}
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/mc/simple/SimpleBean.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/mc/simple/SimpleBean.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/mcandweld/mc/simple/SimpleBean.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -30,8 +30,8 @@
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision: 1.1 $
*/
+ at WeldEnabled
@Default
- at WeldEnabled
public class SimpleBean
{
}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap (from rev 106665, trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/mc (from rev 106665, trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/mc)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/mc/SimpleBeanWithSimpleWebBean.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/mc/SimpleBeanWithSimpleWebBean.java 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/mc/SimpleBeanWithSimpleWebBean.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,39 +0,0 @@
-/*
-* 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.test.deployers.support.nobootstrap.mc;
-
-import javax.inject.Inject;
-
-import org.jboss.kernel.weld.metadata.api.annotations.Weld;
-import org.jboss.test.deployers.support.nobootstrap.weld.SimpleWebBean;
-
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class SimpleBeanWithSimpleWebBean
-{
- @Weld @Inject
- SimpleWebBean simple;
-}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/mc/SimpleBeanWithSimpleWebBean.java (from rev 106665, trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/mc/SimpleBeanWithSimpleWebBean.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/mc/SimpleBeanWithSimpleWebBean.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/mc/SimpleBeanWithSimpleWebBean.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,39 @@
+/*
+* 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.test.deployers.support.nobootstrap.mc;
+
+import javax.inject.Inject;
+
+import org.jboss.kernel.weld.metadata.api.annotations.Weld;
+import org.jboss.test.deployers.support.nobootstrap.weld.SimpleWebBean;
+
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class SimpleBeanWithSimpleWebBean
+{
+ @Weld @Inject
+ SimpleWebBean simple;
+}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/weld (from rev 106665, trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/weld)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/weld/SimpleWebBean.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/weld/SimpleWebBean.java 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/weld/SimpleWebBean.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,32 +0,0 @@
-/*
-* 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.test.deployers.support.nobootstrap.weld;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class SimpleWebBean
-{
-
-}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/weld/SimpleWebBean.java (from rev 106665, trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/weld/SimpleWebBean.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/weld/SimpleWebBean.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/nobootstrap/weld/SimpleWebBean.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,32 @@
+/*
+* 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.test.deployers.support.nobootstrap.weld;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class SimpleWebBean
+{
+
+}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit (from rev 106665, trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithConstructorAnnotation.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithConstructorAnnotation.java 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithConstructorAnnotation.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,40 +0,0 @@
-/*
-* 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.test.deployers.support.unit;
-
-import javax.inject.Inject;
-
-import org.jboss.kernel.weld.metadata.api.annotations.Weld;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class McBeanWithConstructorAnnotation
-{
- @Weld @Inject
- public McBeanWithConstructorAnnotation(Object o)
- {
-
- }
-}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithConstructorAnnotation.java (from rev 106665, trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithConstructorAnnotation.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithConstructorAnnotation.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithConstructorAnnotation.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,40 @@
+/*
+* 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.test.deployers.support.unit;
+
+import javax.inject.Inject;
+
+import org.jboss.kernel.weld.metadata.api.annotations.Weld;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class McBeanWithConstructorAnnotation
+{
+ @Weld @Inject
+ public McBeanWithConstructorAnnotation(Object o)
+ {
+
+ }
+}
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithInstallAnnotation.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithInstallAnnotation.java 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithInstallAnnotation.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,40 +0,0 @@
-/*
-* 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.test.deployers.support.unit;
-
-import javax.inject.Inject;
-
-import org.jboss.kernel.weld.metadata.api.annotations.Weld;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class McBeanWithInstallAnnotation
-{
- @Weld @Inject
- public void install()
- {
-
- }
-}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithInstallAnnotation.java (from rev 106665, trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithInstallAnnotation.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithInstallAnnotation.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithInstallAnnotation.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,40 @@
+/*
+* 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.test.deployers.support.unit;
+
+import javax.inject.Inject;
+
+import org.jboss.kernel.weld.metadata.api.annotations.Weld;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class McBeanWithInstallAnnotation
+{
+ @Weld @Inject
+ public void install()
+ {
+
+ }
+}
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithNoWeldAnnotations.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithNoWeldAnnotations.java 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithNoWeldAnnotations.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,50 +0,0 @@
-/*
-* 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.test.deployers.support.unit;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class McBeanWithNoWeldAnnotations
-{
- public McBeanWithNoWeldAnnotations()
- {
-
- }
-
- public McBeanWithNoWeldAnnotations(Object o)
- {
-
- }
-
- public void install()
- {
-
- }
-
- public void setProperty(Object o)
- {
-
- }
-}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithNoWeldAnnotations.java (from rev 106665, trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithNoWeldAnnotations.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithNoWeldAnnotations.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithNoWeldAnnotations.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,50 @@
+/*
+* 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.test.deployers.support.unit;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class McBeanWithNoWeldAnnotations
+{
+ public McBeanWithNoWeldAnnotations()
+ {
+
+ }
+
+ public McBeanWithNoWeldAnnotations(Object o)
+ {
+
+ }
+
+ public void install()
+ {
+
+ }
+
+ public void setProperty(Object o)
+ {
+
+ }
+}
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithPropertyAnnotation.java
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithPropertyAnnotation.java 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithPropertyAnnotation.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,45 +0,0 @@
-/*
-* 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.test.deployers.support.unit;
-
-import javax.inject.Inject;
-
-import org.jboss.kernel.weld.metadata.api.annotations.Weld;
-
-/**
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class McBeanWithPropertyAnnotation
-{
- public McBeanWithPropertyAnnotation(Object o)
- {
-
- }
-
- @Weld @Inject
- public void setProperty(Object o)
- {
-
- }
-}
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithPropertyAnnotation.java (from rev 106665, trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithPropertyAnnotation.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithPropertyAnnotation.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/support/unit/McBeanWithPropertyAnnotation.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,45 @@
+/*
+* 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.test.deployers.support.unit;
+
+import javax.inject.Inject;
+
+import org.jboss.kernel.weld.metadata.api.annotations.Weld;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class McBeanWithPropertyAnnotation
+{
+ public McBeanWithPropertyAnnotation(Object o)
+ {
+
+ }
+
+ @Weld @Inject
+ public void setProperty(Object o)
+ {
+
+ }
+}
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationNoBootstrapBeanTestCase.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationNoBootstrapBeanTestCase.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationNoBootstrapBeanTestCase.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -27,8 +27,8 @@
import org.jboss.deployers.client.spi.DeployerClient;
import org.jboss.deployers.client.spi.Deployment;
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.test.deployers.support.nobootstrap.mc.SimpleBeanWithSimpleWebBean;
+import org.jboss.test.deployers.support.nobootstrap.weld.SimpleWebBean;
import org.jboss.vfs.VFS;
import org.jboss.vfs.VirtualFile;
import org.jboss.weld.integration.deployer.DeployersUtils;
@@ -57,7 +57,7 @@
VirtualFile ear = VFS.getChild("top-level.ear");
createAssembledDirectory(ear)
.addPath("/weld/mcandweld/ear/weldandmc");
- createMcLib(ear, "/weld/mcandweld/mc/simple", SimpleBean.class);
+ createMcLib(ear, "/weld/mcandweld/mc/nobootstrap", SimpleBeanWithSimpleWebBean.class);
createWeldLib(ear, "/weld/mcandweld/weld", SimpleWebBean.class);
Deployment deployment = createVFSDeployment(ear);
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationTestCase.java
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationTestCase.java 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/McIntegrationTestCase.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -22,6 +22,7 @@
package org.jboss.test.deployers.test;
import java.lang.reflect.Method;
+import java.util.Set;
import javax.enterprise.inject.spi.BeanManager;
@@ -30,6 +31,7 @@
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.DependencyItem;
import org.jboss.deployers.client.spi.DeployerClient;
import org.jboss.deployers.client.spi.Deployment;
import org.jboss.deployers.structure.spi.DeploymentUnit;
@@ -112,7 +114,7 @@
{
public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
{
- assertInstanceOf(getControllerContext("SimpleBean"), WeldKernelControllerContext.class);
+ assertNotNull(getControllerContext("SimpleBean"));
Object o = getBean("SimpleBean");
assertNotNull(o);
assertWebBean(manager, unit, SimpleWebBean.class.getName());
@@ -272,14 +274,100 @@
}
}
- public void testExternalMcBeanInjectedIntoWeld2() throws Exception
+ public void testNonExistantMcBeanInjectedIntoWeldFails() throws Exception
{
+ VirtualFile weldEar = VFS.getChild("weld.ear");
+ createAssembledDirectory(weldEar)
+ .addPath("/weld/mcandweld/ear/weldonly");
+ createWeldLib(weldEar, "/weld/mcandweld/weld", WeldBeanWithInjectedMcBean.class);
+
+ try
+ {
+ testBootstrap(weldEar, null);
+ fail("Weld deployment should not have worked without mc deployment");
+ }
+ catch(Exception expected)
+ {
+ }
+ }
+
+ public void testUndeployedMcBeanInjectedIntoWeldFails() throws Exception
+ {
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);
+ VirtualFile weldEar = VFS.getChild("weld.ear");
+ createAssembledDirectory(weldEar)
+ .addPath("/weld/mcandweld/ear/weldonly");
+ createWeldLib(weldEar, "/weld/mcandweld/weld", WeldBeanWithInjectedMcBean.class);
+
+ try
+ {
+ testBootstrap(weldEar, null);
+ fail("Weld deployment should not have worked without mc deployment");
+ }
+ catch(Exception expected)
+ {
+ }
+ }
+
+ public void testExternalMcBeanInjectedIntoWeldInitiallyNotPresentThenDeployed() throws Exception
+ {
+ VirtualFile weldEar = VFS.getChild("weld.ear");
+ createAssembledDirectory(weldEar)
+ .addPath("/weld/mcandweld/ear/weldonly");
+ createWeldLib(weldEar, "/weld/mcandweld/weld", WeldBeanWithInjectedMcBean.class);
+
+ try
+ {
+ testBootstrap(weldEar, null);
+ fail("Weld deployment should not have worked without mc deployment");
+ }
+ catch(Exception expected)
+ {
+ }
+
+ 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
+ {
+ testBootstrap(weldEar, new RunSpecificTest()
+ {
+ public void runTest(BeanManager manager, DeploymentUnit unit) throws Exception
+ {
+ Object mc = getBean("SimpleBean");
+ assertNotNull(mc);
+ Object weldBean = assertWebBean(manager, unit, WeldBeanWithInjectedMcBean.class.getName());
+ assertSame(mc, assertWebBean(manager, unit, mc));
+
+ Method m = weldBean.getClass().getMethod("getSimpleBean");
+ Object injectedBean = m.invoke(weldBean);
+ assertNotNull(injectedBean);
+ assertSame(mc, injectedBean);
+ }
+ });
+ }
+ finally
+ {
+ undeploy(mc);
+ }
+ }
+
+ public void testExternalMcBeanInjectedIntoWeldInitiallyUndeployedThenDeployed() throws Exception
+ {
+ 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);
VirtualFile weldEar = VFS.getChild("weld.ear");
@@ -323,41 +411,24 @@
protected void testBootstrap(VirtualFile ear, RunSpecificTest test) throws Exception
{
+ enableTrace("org.jboss.dependency.plugins.");
Deployment deployment = deploy(ear);
+ DeploymentUnit earDU = null;
try
{
- DeploymentUnit earDU = getMainDeployerStructure().getDeploymentUnit(deployment.getName());
+ earDU = getMainDeployerStructure().getDeploymentUnit(deployment.getName());
//Check that the flat deployment bean has been started
FlatDeployment flatDeployment = (FlatDeployment)getBean(DeployersUtils.getDeploymentBeanName(earDU));
assertNotNull(flatDeployment);
- String bootName = DeployersUtils.getBootstrapBeanName(earDU);
+ //Check the bootstrap bean has been installed
+ assertNotNull(getControllerContext(DeployersUtils.getBootstrapBeanName(earDU)));
- ControllerContext context = getControllerContext(bootName, null);
- outputContext(context);
+ BeanManager manager = getBeanManager(earDU);
- //Check the bootstrap bean has been created
- assertNotNull(getControllerContext(DeployersUtils.getBootstrapBeanName(earDU), ControllerState.CREATE));
-
- // install ejb
- KernelControllerContext ejb = deploy(new AbstractBeanMetaData("EjbContainer#1", Object.class.getName()));
- try
- {
- assertTrue(ejb.getState().equals(ControllerState.INSTALLED));
- //Check the bootstrap bean has been installed
- assertNotNull(getControllerContext(DeployersUtils.getBootstrapBeanName(earDU)));
-
- BeanManager manager = getBeanManager(earDU);
-
- if (test != null)
- test.runTest(manager, earDU);
-
- }
- finally
- {
- undeploy(ejb);
- }
+ if (test != null)
+ test.runTest(manager, earDU);
}
finally
{
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/WeldBeanMetaDataBuilderPluginUnitTestCase.java (from rev 106665, trunk/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/WeldBeanMetaDataBuilderPluginUnitTestCase.java)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/WeldBeanMetaDataBuilderPluginUnitTestCase.java (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/java/org/jboss/test/deployers/test/WeldBeanMetaDataBuilderPluginUnitTestCase.java 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,477 @@
+/*
+* 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.test.deployers.test;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import junit.framework.TestSuite;
+
+import org.jboss.beans.metadata.plugins.AbstractAnnotationMetaData;
+import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
+import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
+import org.jboss.beans.metadata.plugins.AbstractInstallMetaData;
+import org.jboss.beans.metadata.plugins.AbstractParameterMetaData;
+import org.jboss.beans.metadata.spi.AnnotationMetaData;
+import org.jboss.beans.metadata.spi.BeanMetaData;
+import org.jboss.beans.metadata.spi.InstallMetaData;
+import org.jboss.beans.metadata.spi.ParameterMetaData;
+import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
+import org.jboss.dependency.spi.Controller;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.DependencyInfo;
+import org.jboss.dependency.spi.DependencyItem;
+import org.jboss.deployers.client.spi.main.MainDeployer;
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.deployers.spi.attachments.MutableAttachments;
+import org.jboss.deployers.spi.deployer.DeploymentStage;
+import org.jboss.deployers.structure.spi.ClassLoaderFactory;
+import org.jboss.deployers.structure.spi.DeploymentResourceLoader;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnitVisitor;
+import org.jboss.kernel.Kernel;
+import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
+import org.jboss.kernel.weld.metadata.api.annotations.Weld;
+import org.jboss.metadata.spi.MetaData;
+import org.jboss.metadata.spi.MutableMetaData;
+import org.jboss.metadata.spi.scope.ScopeKey;
+import org.jboss.test.AbstractTestCaseWithSetup;
+import org.jboss.test.AbstractTestDelegate;
+import org.jboss.test.deployers.support.unit.McBeanWithConstructorAnnotation;
+import org.jboss.test.deployers.support.unit.McBeanWithInstallAnnotation;
+import org.jboss.test.deployers.support.unit.McBeanWithNoWeldAnnotations;
+import org.jboss.test.deployers.support.unit.McBeanWithPropertyAnnotation;
+import org.jboss.weld.integration.deployer.mc.WeldBeanMetaDataDeployerPlugin;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class WeldBeanMetaDataBuilderPluginUnitTestCase extends AbstractTestCaseWithSetup
+{
+ public WeldBeanMetaDataBuilderPluginUnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ public static TestSuite suite()
+ {
+ return new TestSuite(WeldBeanMetaDataBuilderPluginUnitTestCase.class);
+ }
+
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+ {
+ return new WeldBeanMetaDataBuilderPluginTestDelegate(clazz);
+ }
+
+ public void testNonWeldMcBeanMinimalMetaData()
+ {
+ BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder("Test", McBeanWithNoWeldAnnotations.class.getName());
+ checkMcBean(builder.getBeanMetaData(), false);
+ }
+
+ public void testNonWeldMcBeanMetaDataNoAnnotations()
+ {
+ BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder("Test", McBeanWithNoWeldAnnotations.class.getName());
+ builder.addConstructorParameter(Object.class.getName(), "Test");
+ builder.addInstall("install");
+ builder.addPropertyMetaData("property", "Test");
+ checkMcBean(builder.getBeanMetaData(), false);
+ }
+
+ public void testWeldMcBeanConstructorMetaDataAnnotation()
+ {
+ AbstractBeanMetaData bmd = new AbstractBeanMetaData("Test", McBeanWithNoWeldAnnotations.class.getName());
+ AbstractConstructorMetaData cmd = new AbstractConstructorMetaData();
+ AbstractParameterMetaData pmd = new AbstractParameterMetaData(Object.class.getName(), "Test");
+ cmd.setParameters(Collections.singletonList((ParameterMetaData)pmd));
+ cmd.setAnnotations(createWeldAnnotationMetaData());
+ bmd.setConstructor(cmd);
+
+ checkMcBean(bmd, true);
+ }
+
+ public void testWeldMcBeanInstallMetaDataAnnotation()
+ {
+ AbstractBeanMetaData bmd = new AbstractBeanMetaData("Test", McBeanWithNoWeldAnnotations.class.getName());
+ AbstractInstallMetaData imd = new AbstractInstallMetaData();
+ imd.setMethodName("install");
+ imd.setAnnotations(createWeldAnnotationMetaData());
+ bmd.setInstalls(Collections.singletonList((InstallMetaData)imd));
+
+ checkMcBean(bmd, true);
+ }
+
+ public void testWeldMcPropertyMetaDataAnnotation()
+ {
+ BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder("Test", McBeanWithNoWeldAnnotations.class.getName());
+ builder.addPropertyMetaData("property", "Test");
+ builder.addPropertyAnnotation("property", "@" + Weld.class.getName());
+
+ checkMcBean(builder.getBeanMetaData(), true);
+ }
+
+ public void testWeldConstructorSourceAnnotation()
+ {
+ BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder("Test", McBeanWithConstructorAnnotation.class.getName());
+ checkMcBean(builder.getBeanMetaData(), true);
+ }
+
+ public void testWeldInstallSourceAnnotation()
+ {
+ BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder("Test", McBeanWithInstallAnnotation.class.getName());
+ checkMcBean(builder.getBeanMetaData(), true);
+ }
+
+ public void testWeldPropertySourceAnnotation()
+ {
+ BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder("Test", McBeanWithPropertyAnnotation.class.getName());
+ checkMcBean(builder.getBeanMetaData(), true);
+ }
+
+ private void checkMcBean(BeanMetaData bmd, boolean isWeld)
+ {
+ ControllerContext ctx = getPlugin().createContext(getController(), new MockDeploymentUnit(), bmd);
+ if (isWeld)
+ assertNotNull(ctx);
+ else
+ assertNull(ctx);
+ }
+
+ private Set<AnnotationMetaData> createWeldAnnotationMetaData()
+ {
+ AbstractAnnotationMetaData amd = new AbstractAnnotationMetaData();
+ amd.setAnnotation("@" + Weld.class.getName());
+ return Collections.singleton((AnnotationMetaData)amd);
+ }
+
+ private WeldBeanMetaDataBuilderPluginTestDelegate getMyDelegate()
+ {
+ return (WeldBeanMetaDataBuilderPluginTestDelegate)getDelegate();
+ }
+
+ private Controller getController()
+ {
+ return getMyDelegate().kernel.getController();
+ }
+
+ private WeldBeanMetaDataDeployerPlugin getPlugin()
+ {
+ return getMyDelegate().plugin;
+ }
+
+ private static class WeldBeanMetaDataBuilderPluginTestDelegate extends AbstractTestDelegate
+ {
+ Kernel kernel;
+ WeldBeanMetaDataDeployerPlugin plugin;
+
+ public WeldBeanMetaDataBuilderPluginTestDelegate(Class<?> clazz)
+ {
+ super(clazz);
+ }
+
+ @Override
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ BasicBootstrap bootstrap = new BasicBootstrap();
+ bootstrap.run();
+ kernel = bootstrap.getKernel();
+
+ plugin = new WeldBeanMetaDataDeployerPlugin();
+ }
+
+ @Override
+ public void tearDown() throws Exception
+ {
+ super.tearDown();
+ }
+ }
+
+ private class MockDeploymentUnit implements DeploymentUnit
+ {
+ public DeploymentUnit addComponent(String name)
+ {
+ return null;
+ }
+
+ public void addControllerContextName(Object name)
+ {
+ }
+
+ public void addIDependOn(DependencyItem dependency)
+ {
+ }
+
+ public boolean createClassLoader(ClassLoaderFactory factory) throws DeploymentException
+ {
+ return false;
+ }
+
+ public <T> Set<? extends T> getAllMetaData(Class<T> type)
+ {
+ return null;
+ }
+
+ public List<DeploymentUnit> getChildren()
+ {
+ return null;
+ }
+
+ public ClassLoader getClassLoader()
+ {
+ return Thread.currentThread().getContextClassLoader();
+ }
+
+ public DeploymentUnit getComponent(String name)
+ {
+ return null;
+ }
+
+ public List<DeploymentUnit> getComponents()
+ {
+ return null;
+ }
+
+ public Object getControllerContextName()
+ {
+ return null;
+ }
+
+ public Set<Object> getControllerContextNames()
+ {
+ return null;
+ }
+
+ public DependencyInfo getDependencyInfo()
+ {
+ return null;
+ }
+
+ public MainDeployer getMainDeployer()
+ {
+ return null;
+ }
+
+ public MetaData getMetaData()
+ {
+ return null;
+ }
+
+ public MutableMetaData getMutableMetaData()
+ {
+ return null;
+ }
+
+ public ScopeKey getMutableScope()
+ {
+ return null;
+ }
+
+ public String getName()
+ {
+ return "Test";
+ }
+
+ public DeploymentUnit getParent()
+ {
+ return null;
+ }
+
+ public String getRelativePath()
+ {
+ return null;
+ }
+
+ public DeploymentStage getRequiredStage()
+ {
+ return null;
+ }
+
+ public ClassLoader getResourceClassLoader()
+ {
+ return null;
+ }
+
+ public DeploymentResourceLoader getResourceLoader()
+ {
+ return null;
+ }
+
+ public ScopeKey getScope()
+ {
+ return null;
+ }
+
+ public String getSimpleName()
+ {
+ return null;
+ }
+
+ public DeploymentUnit getTopLevel()
+ {
+ return this;
+ }
+
+ public MutableAttachments getTransientManagedObjects()
+ {
+ return null;
+ }
+
+ public boolean isComponent()
+ {
+ return false;
+ }
+
+ public boolean isTopLevel()
+ {
+ return false;
+ }
+
+ public void removeClassLoader(ClassLoaderFactory factory)
+ {
+ }
+
+ public boolean removeComponent(String name)
+ {
+ return false;
+ }
+
+ public void removeControllerContextName(Object name)
+ {
+ }
+
+ public void removeIDependOn(DependencyItem dependency)
+ {
+ }
+
+ public void setMutableScope(ScopeKey key)
+ {
+ }
+
+ public void setRequiredStage(DeploymentStage stage)
+ {
+ }
+
+ public void setScope(ScopeKey key)
+ {
+ }
+
+ public void visit(DeploymentUnitVisitor visitor) throws DeploymentException
+ {
+ }
+
+ public Object addAttachment(String name, Object attachment)
+ {
+ return null;
+ }
+
+ public <T> T addAttachment(Class<T> type, T attachment)
+ {
+ return null;
+ }
+
+ public <T> T addAttachment(String name, T attachment, Class<T> expectedType)
+ {
+ return null;
+ }
+
+ public void clear()
+ {
+ }
+
+ public void clearChangeCount()
+ {
+ }
+
+ public int getChangeCount()
+ {
+ return 0;
+ }
+
+ public Object removeAttachment(String name)
+ {
+ return null;
+ }
+
+ public <T> T removeAttachment(Class<T> type)
+ {
+ return null;
+ }
+
+ public <T> T removeAttachment(String name, Class<T> expectedType)
+ {
+ return null;
+ }
+
+ public void setAttachments(Map<String, Object> map)
+ {
+ }
+
+ public Object getAttachment(String name)
+ {
+ return null;
+ }
+
+ public <T> T getAttachment(Class<T> type)
+ {
+ return null;
+ }
+
+ public <T> T getAttachment(String name, Class<T> expectedType)
+ {
+ return null;
+ }
+
+ public Map<String, Object> getAttachments()
+ {
+ return null;
+ }
+
+ public boolean hasAttachments()
+ {
+ return false;
+ }
+
+ public boolean isAttachmentPresent(String name)
+ {
+ if (name.equals("Test_WeldBootstrapBean_BeanMetaData"))
+ return true;
+ return false;
+ }
+
+ public boolean isAttachmentPresent(Class<?> type)
+ {
+ return false;
+ }
+
+ public boolean isAttachmentPresent(String name, Class<?> expectedType)
+ {
+ return false;
+ }
+
+ }
+
+}
Modified: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/test/McIntegrationTestCase.xml
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/test/McIntegrationTestCase.xml 2010-07-14 04:16:29 UTC (rev 106680)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/resources/org/jboss/test/deployers/test/McIntegrationTestCase.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -23,9 +23,7 @@
<beanfactory name="JBossJpaServices" class="org.jboss.test.deployers.support.MockJBossJpaServices"/>
- <bean name="EjbServicesDeployer" class="org.jboss.weld.integration.deployer.env.EjbServicesDeployer">
- <property name="ejbServicesClassName">org.jboss.test.deployers.support.MockEjbServices</property>
- </bean>
+ <bean name="EjbServicesDeployer" class="org.jboss.weld.integration.deployer.env.EjbServicesDeployer"/>
<bean name="DeploymentDeployer" class="org.jboss.weld.integration.deployer.env.FlatDeploymentDeployer"/>
@@ -39,10 +37,23 @@
<!-- Mock EJB utils -->
- <beanfactory name="JBossEjbServices" class="org.jboss.test.deployers.support.MockEjbServices"/>
-
+ <beanfactory name="JBossEjbServices" class="org.jboss.weld.integration.ejb.JBossEjbServices"/>
+
<bean name="JBossTransactionServices" class="org.jboss.test.deployers.support.MockTransactionServices"/>
<bean name="RealTransactionManager" class="java.lang.Object"/>
+ <!-- Annotation scanning -->
+ <bean name="ScanningMDDeployer" class="org.jboss.scanning.deployers.metadata.ScanningMetaDataDeployer"/>
+
+ <bean name="ScannerDeployer" class="org.jboss.scanning.deployers.ScanningDeployer">
+ <property name="filter">
+ <bean class="org.jboss.scanning.deployers.filter.ScanningDeploymentUnitFilter"/>
+ </property>
+ <incallback method="addFactory" />
+ <uncallback method="removeFactory" />
+ </bean>
+
+ <bean name="AnnScanningPlugin" class="org.jboss.scanning.annotations.plugins.AnnotationsScanningPluginFactory"/>
+
</deployment>
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap (from rev 106665, trunk/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap)
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap/META-INF (from rev 106665, trunk/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap/META-INF)
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap/META-INF/MANIFEST.MF
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap/META-INF/MANIFEST.MF 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap/META-INF/MANIFEST.MF 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Created-By: hand
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap/META-INF/MANIFEST.MF (from rev 106665, trunk/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap/META-INF/MANIFEST.MF)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap/META-INF/MANIFEST.MF (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap/META-INF/MANIFEST.MF 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Created-By: hand
Deleted: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap/META-INF/simple-beans.xml
===================================================================
--- trunk/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap/META-INF/simple-beans.xml 2010-07-13 19:40:37 UTC (rev 106665)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap/META-INF/simple-beans.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -1,3 +0,0 @@
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <bean name="SimpleBean" class="org.jboss.test.deployers.support.nobootstrap.mc.SimpleBeanWithSimpleWebBean"/>
-</deployment>
\ No newline at end of file
Copied: branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap/META-INF/simple-beans.xml (from rev 106665, trunk/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap/META-INF/simple-beans.xml)
===================================================================
--- branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap/META-INF/simple-beans.xml (rev 0)
+++ branches/TEMP_ALR_JBAS-8146_ASYNC_EJB3_INTEGRATION/weld-int/deployer-mc-int/src/test/resources/weld/mcandweld/mc/nobootstrap/META-INF/simple-beans.xml 2010-07-14 04:19:55 UTC (rev 106681)
@@ -0,0 +1,3 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="SimpleBean" class="org.jboss.test.deployers.support.nobootstrap.mc.SimpleBeanWithSimpleWebBean"/>
+</deployment>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list