You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by vi...@apache.org on 2011/03/11 10:27:11 UTC
svn commit: r1080495 [1/2] - in
/geronimo/server/trunk/testsuite/aries-testsuite: ./ ds-jndi/
ds-jndi/ds-db/ ds-jndi/ds-db/src/ ds-jndi/ds-db/src/main/
ds-jndi/ds-db/src/main/resources/
ds-jndi/ds-db/src/main/resources/OSGI-INF/ ds-jndi/ds-db/src/main/...
Author: violalu
Date: Fri Mar 11 09:27:06 2011
New Revision: 1080495
URL: http://svn.apache.org/viewvc?rev=1080495&view=rev
Log:
GERONIMO-5445 Add testcases for osgi:service jndi lookup
Added:
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-db/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-db/pom.xml
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-db/src/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-db/src/main/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-db/src/main/resources/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-db/src/main/resources/OSGI-INF/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-db/src/main/resources/OSGI-INF/blueprint/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-db/src/main/resources/OSGI-INF/blueprint/blueprint.xml
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-eba/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-eba/pom.xml
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-eba/src/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-eba/src/test/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-eba/src/test/java/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-eba/src/test/java/org/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-eba/src/test/java/org/apache/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-eba/src/test/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-eba/src/test/java/org/apache/geronimo/testsuite/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-eba/src/test/java/org/apache/geronimo/testsuite/DSJndiTest.java
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/pom.xml
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/src/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/src/main/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/src/main/java/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/src/main/java/org/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/src/main/java/org/apache/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/src/main/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/src/main/java/org/apache/geronimo/testsuite/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/src/main/java/org/apache/geronimo/testsuite/ds/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/src/main/java/org/apache/geronimo/testsuite/ds/web/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/src/main/java/org/apache/geronimo/testsuite/ds/web/DSServlet.java
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/src/main/resources/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/src/main/resources/WEB-INF/
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/src/main/resources/WEB-INF/web.xml
geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/pom.xml
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/pom.xml
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/src/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/src/main/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/src/main/java/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/src/main/java/org/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/src/main/java/org/apache/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/src/main/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/src/main/java/org/apache/geronimo/testsuite/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/src/main/java/org/apache/geronimo/testsuite/aries/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/src/main/java/org/apache/geronimo/testsuite/aries/ejb/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/src/main/java/org/apache/geronimo/testsuite/aries/ejb/api/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/src/main/java/org/apache/geronimo/testsuite/aries/ejb/api/HelloService.java
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/pom.xml
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/src/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/src/test/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/src/test/java/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/src/test/java/org/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/src/test/java/org/apache/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/src/test/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/src/test/java/org/apache/geronimo/testsuite/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/src/test/java/org/apache/geronimo/testsuite/areis/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/src/test/java/org/apache/geronimo/testsuite/areis/ejb/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/src/test/java/org/apache/geronimo/testsuite/areis/ejb/test/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/src/test/java/org/apache/geronimo/testsuite/areis/ejb/test/EJBOSGIServiceTest.java
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/pom.xml
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/src/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/src/main/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/src/main/java/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/src/main/java/org/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/src/main/java/org/apache/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/src/main/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/src/main/java/org/apache/geronimo/testsuite/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/src/main/java/org/apache/geronimo/testsuite/aries/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/src/main/java/org/apache/geronimo/testsuite/aries/ejb/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/src/main/java/org/apache/geronimo/testsuite/aries/ejb/impl/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/src/main/java/org/apache/geronimo/testsuite/aries/ejb/impl/HelloEJB.java
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/src/main/resources/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/src/main/resources/OSGI-INF/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/src/main/resources/OSGI-INF/blueprint/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/pom.xml
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/src/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/src/main/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/src/main/java/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/src/main/java/org/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/src/main/java/org/apache/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/src/main/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/src/main/java/org/apache/geronimo/testsuite/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/src/main/java/org/apache/geronimo/testsuite/aries/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/src/main/java/org/apache/geronimo/testsuite/aries/ejb/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/src/main/java/org/apache/geronimo/testsuite/aries/ejb/web/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/src/main/java/org/apache/geronimo/testsuite/aries/ejb/web/EJBServlet.java
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/src/main/resources/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/src/main/resources/WEB-INF/
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/src/main/resources/WEB-INF/web.xml
geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/pom.xml
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-eba/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-eba/pom.xml
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-eba/src/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-eba/src/test/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-eba/src/test/java/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-eba/src/test/java/org/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-eba/src/test/java/org/apache/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-eba/src/test/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-eba/src/test/java/org/apache/geronimo/testsuite/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-eba/src/test/java/org/apache/geronimo/testsuite/aries/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-eba/src/test/java/org/apache/geronimo/testsuite/aries/mail/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-eba/src/test/java/org/apache/geronimo/testsuite/aries/mail/test/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-eba/src/test/java/org/apache/geronimo/testsuite/aries/mail/test/MailTest.java
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/pom.xml
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/src/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/src/main/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/src/main/java/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/src/main/java/org/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/src/main/java/org/apache/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/src/main/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/src/main/java/org/apache/geronimo/testsuite/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/src/main/java/org/apache/geronimo/testsuite/aries/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/src/main/java/org/apache/geronimo/testsuite/aries/mail/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/src/main/java/org/apache/geronimo/testsuite/aries/mail/web/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/src/main/java/org/apache/geronimo/testsuite/aries/mail/web/MailServlet.java
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/src/main/resources/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/src/main/resources/WEB-INF/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/src/main/resources/WEB-INF/web.xml
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/src/test/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/pom.xml
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/src/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/src/main/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/src/main/java/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/src/main/java/org/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/src/main/java/org/apache/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/src/main/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/src/main/java/org/apache/geronimo/testsuite/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/src/main/java/org/apache/geronimo/testsuite/App.java
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/src/test/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/src/test/java/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/src/test/java/org/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/src/test/java/org/apache/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/src/test/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/src/test/java/org/apache/geronimo/testsuite/
geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/src/test/java/org/apache/geronimo/testsuite/AppTest.java
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-api/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-api/pom.xml
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-api/src/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-api/src/main/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-api/src/main/java/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-api/src/main/java/org/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-api/src/main/java/org/apache/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-api/src/main/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-api/src/main/java/org/apache/geronimo/testsuite/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-api/src/main/java/org/apache/geronimo/testsuite/aries/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-api/src/main/java/org/apache/geronimo/testsuite/aries/custom/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-api/src/main/java/org/apache/geronimo/testsuite/aries/custom/api/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-api/src/main/java/org/apache/geronimo/testsuite/aries/custom/api/HelloService.java
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-eba/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-eba/pom.xml
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-eba/src/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-eba/src/test/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-eba/src/test/java/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-eba/src/test/java/org/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-eba/src/test/java/org/apache/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-eba/src/test/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-eba/src/test/java/org/apache/geronimo/testsuite/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-eba/src/test/java/org/apache/geronimo/testsuite/aries/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-eba/src/test/java/org/apache/geronimo/testsuite/aries/custom/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-eba/src/test/java/org/apache/geronimo/testsuite/aries/custom/test/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-eba/src/test/java/org/apache/geronimo/testsuite/aries/custom/test/CustomOSGIServiceTest.java
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-impl/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-impl/pom.xml
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-impl/src/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-impl/src/main/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-impl/src/main/java/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-impl/src/main/java/org/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-impl/src/main/java/org/apache/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-impl/src/main/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-impl/src/main/java/org/apache/geronimo/testsuite/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-impl/src/main/java/org/apache/geronimo/testsuite/aries/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-impl/src/main/java/org/apache/geronimo/testsuite/aries/custom/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-impl/src/main/java/org/apache/geronimo/testsuite/aries/custom/impl/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-impl/src/main/java/org/apache/geronimo/testsuite/aries/custom/impl/HelloImpl.java
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-impl/src/main/resources/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-impl/src/main/resources/OSGI-INF/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-impl/src/main/resources/OSGI-INF/blueprint/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-wab/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-wab/pom.xml
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-wab/src/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-wab/src/main/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-wab/src/main/java/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-wab/src/main/java/org/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-wab/src/main/java/org/apache/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-wab/src/main/java/org/apache/geronimo/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-wab/src/main/java/org/apache/geronimo/testsuite/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-wab/src/main/java/org/apache/geronimo/testsuite/aries/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-wab/src/main/java/org/apache/geronimo/testsuite/aries/custom/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-wab/src/main/java/org/apache/geronimo/testsuite/aries/custom/web/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-wab/src/main/java/org/apache/geronimo/testsuite/aries/custom/web/CustomServlet.java
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-wab/src/main/resources/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-wab/src/main/resources/WEB-INF/
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/custom-wab/src/main/resources/WEB-INF/web.xml
geronimo/server/trunk/testsuite/aries-testsuite/osgi-service-custom/pom.xml
Modified:
geronimo/server/trunk/testsuite/aries-testsuite/pom.xml
Added: geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-db/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-db/pom.xml?rev=1080495&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-db/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-db/pom.xml Fri Mar 11 09:27:06 2011
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>ds-jndi</artifactId>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+
+ <artifactId>ds-db</artifactId>
+
+ <name>Geronimo TestSuite :: Aries Testsuite :: DS-DB</name>
+
+ <packaging>bundle</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-db/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-db/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1080495&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-db/src/main/resources/OSGI-INF/blueprint/blueprint.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-db/src/main/resources/OSGI-INF/blueprint/blueprint.xml Fri Mar 11 09:27:06 2011
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ default-activation="eager">
+
+ <bean id="derbyXADataSource" class="org.apache.derby.jdbc.EmbeddedXADataSource">
+ <property name="databaseName" value="jndidb"/>
+ <!-- This creates the database on the fly. -->
+ <property name="createDatabase" value="create" />
+ </bean>
+
+ <service id="jndidbDataSource" ref="derbyXADataSource" interface="javax.sql.XADataSource">
+ <service-properties>
+ <entry key="osgi.jndi.service.name" value="jdbc/jndidbDataSource"/>
+ </service-properties>
+ </service>
+
+
+ <bean id="derbyDataSource" class="org.apache.derby.jdbc.EmbeddedDataSource">
+ <property name="databaseName" value="jndidb"/>
+ <!-- This creates the database on the fly. -->
+ <property name="createDatabase" value="create" />
+ </bean>
+
+ <service id="NoTxjndidbDataSource" ref="derbyDataSource" interface="javax.sql.DataSource">
+ <service-properties>
+ <entry key="osgi.jndi.service.name" value="jdbc/NoTxjndidbDataSource"/>
+ </service-properties>
+ </service>
+
+</blueprint>
Added: geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-eba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-eba/pom.xml?rev=1080495&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-eba/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-eba/pom.xml Fri Mar 11 09:27:06 2011
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>ds-jndi</artifactId>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+
+ <artifactId>ds-eba</artifactId>
+
+ <name>Geronimo TestSuite :: Aries Testsuite :: ds-eba</name>
+
+ <packaging>eba</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>ds-db</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>ds-wab</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>eba-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <generateManifest>true</generateManifest>
+ <instructions>
+ <Application-Version>1.0.0</Application-Version>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>it</id>
+ <activation>
+ <property>
+ <name>it</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <webAppName>ds</webAppName>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-eba</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.eba</moduleArchive>
+ </configuration>
+ </execution>
+
+ <execution>
+ <id>undeploy-eba</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>application/${project.groupId}.${project.artifactId}/1.0.0/eba</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Added: geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-eba/src/test/java/org/apache/geronimo/testsuite/DSJndiTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-eba/src/test/java/org/apache/geronimo/testsuite/DSJndiTest.java?rev=1080495&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-eba/src/test/java/org/apache/geronimo/testsuite/DSJndiTest.java (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-eba/src/test/java/org/apache/geronimo/testsuite/DSJndiTest.java Fri Mar 11 09:27:06 2011
@@ -0,0 +1,69 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.testsuite;
+
+import java.io.IOException;
+import java.net.URL;
+
+import org.testng.annotations.Test;
+import org.apache.geronimo.testsupport.HttpUtils;
+import org.apache.geronimo.testsupport.TestSupport;
+/**
+ * Unit test for simple App.
+ */
+public class DSJndiTest extends TestSupport
+{
+ private String baseURL = "http://localhost:8080/";
+
+ @Test
+ public void testServlet() throws Exception {
+ checkReply("/DSServlet");
+ }
+
+
+ private void checkReply(String address)
+ throws Exception {
+ String warName = System.getProperty("webAppName");
+ assertNotNull(warName);
+ URL url = new URL(baseURL + warName + address);
+ /**
+ * WABs are deployed asynchronously so it might take a
+ * bit to actually invoke the servlet.
+ */
+ String reply = doGET(url, 6, 10 * 1000);
+ assertTrue("WAB",
+ reply.contains("Datasource OSGI Service JNDI Lookup Pass"));
+
+ }
+
+ private String doGET(URL url, int repeat, long delay) {
+ for (int i = 0; i < repeat; i++) {
+ try {
+ return HttpUtils.doGET(url);
+ } catch (IOException e) {
+ // ignore
+ try {
+ Thread.sleep(delay);
+ } catch (Exception ee) {
+ break;
+ }
+ }
+ }
+ fail("Did not get servlet response in time");
+ return "";
+ }
+}
Added: geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/pom.xml?rev=1080495&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/pom.xml Fri Mar 11 09:27:06 2011
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>ds-jndi</artifactId>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+
+ <artifactId>ds-wab</artifactId>
+
+ <name>Geronimo TestSuite :: Aries Testsuite :: DS-WAB</name>
+
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>ds-db</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Web-ContextPath>/ds</Web-ContextPath>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Private-Package>org.apache.geronimo.testsuite.ds.web</Private-Package>
+ <Export-Package>!org.apache.geronimo.testsuite.ds.web</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/src/main/java/org/apache/geronimo/testsuite/ds/web/DSServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/src/main/java/org/apache/geronimo/testsuite/ds/web/DSServlet.java?rev=1080495&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/src/main/java/org/apache/geronimo/testsuite/ds/web/DSServlet.java (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/src/main/java/org/apache/geronimo/testsuite/ds/web/DSServlet.java Fri Mar 11 09:27:06 2011
@@ -0,0 +1,105 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.testsuite.ds.web;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.sql.DataSource;
+
+
+
+/**
+ * Servlet implementation class DSServlet
+ */
+@WebServlet("/dsservlet")
+public class DSServlet extends HttpServlet {
+ private static final long serialVersionUID = 1L;
+ private DataSource ds = null;
+ private static final String OSGI_SERVICE_PREFIX = "osgi:service/";
+
+
+ /**
+ * @see HttpServlet#HttpServlet()
+ */
+ public DSServlet() {
+ super();
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
+ */
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ performTask(request, response);
+ }
+
+ /**
+ * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
+ */
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ performTask(request, response);
+ }
+
+ protected void performTask(HttpServletRequest request, HttpServletResponse response){
+ try {
+ PrintWriter pw = response.getWriter();
+
+ ds = (DataSource) getOSGIService(DataSource.class.getName() , "(osgi.jndi.service.name=jdbc/jndidbDataSource)");
+ if(ds != null){
+ pw.println("Datasource OSGI Service JNDI Lookup Pass");
+ } else{
+ pw.println("Datasource OSGI Service JNDI Lookup Fail");
+ }
+
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ }
+
+ /**
+ * Lookup and return an osgi service
+ *
+ * @return Object
+ *
+ */
+ public static final Object getOSGIService(String serviceName, String filter) {
+
+ String name = OSGI_SERVICE_PREFIX + serviceName;
+ if (filter != null) {
+ name = name + "/" + filter;
+ }
+
+ try {
+ InitialContext ic = new InitialContext();
+ return ic.lookup(name);
+ } catch (NamingException e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+}
Added: geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/src/main/resources/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/src/main/resources/WEB-INF/web.xml?rev=1080495&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/src/main/resources/WEB-INF/web.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/src/main/resources/WEB-INF/web.xml Fri Mar 11 09:27:06 2011
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="3.0"
+ metadata-complete="true">
+
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
+
+ <servlet>
+ <display-name>DSServlet</display-name>
+ <servlet-name>DSServlet</servlet-name>
+ <servlet-class>org.apache.geronimo.testsuite.ds.web.DSServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>DSServlet</servlet-name>
+ <url-pattern>/DSServlet</url-pattern>
+
+ </servlet-mapping>
+</web-app>
Added: geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/pom.xml?rev=1080495&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/pom.xml Fri Mar 11 09:27:06 2011
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>aries-testsuite</artifactId>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+
+ <artifactId>ds-jndi</artifactId>
+ <name>Geronimo TestSuite :: Aries Testsuite :: Datasource JNDI Lookup Test</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>ds-db</module>
+ <module>ds-wab</module>
+ <module>ds-eba</module>
+ </modules>
+</project>
\ No newline at end of file
Added: geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/pom.xml?rev=1080495&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/pom.xml Fri Mar 11 09:27:06 2011
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>ejb-osgi-service</artifactId>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+
+ <artifactId>ejb-api</artifactId>
+
+ <name>Geronimo TestSuite :: Aries Testsuite :: ejb-api</name>
+
+ <packaging>bundle</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Added: geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/src/main/java/org/apache/geronimo/testsuite/aries/ejb/api/HelloService.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/src/main/java/org/apache/geronimo/testsuite/aries/ejb/api/HelloService.java?rev=1080495&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/src/main/java/org/apache/geronimo/testsuite/aries/ejb/api/HelloService.java (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-api/src/main/java/org/apache/geronimo/testsuite/aries/ejb/api/HelloService.java Fri Mar 11 09:27:06 2011
@@ -0,0 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.testsuite.aries.ejb.api;
+
+public interface HelloService {
+ String sayHello();
+
+}
Added: geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/pom.xml?rev=1080495&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/pom.xml Fri Mar 11 09:27:06 2011
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>ejb-osgi-service</artifactId>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>ejb-eba</artifactId>
+
+ <name>Geronimo TestSuite :: Aries Testsuite :: ejb-eba</name>
+
+ <packaging>eba</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>ejb-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>ejb-impl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>ejb-wab</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>eba-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <generateManifest>true</generateManifest>
+ <instructions>
+ <Application-Version>1.0.0</Application-Version>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>it</id>
+ <activation>
+ <property>
+ <name>it</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <webAppName>ejb</webAppName>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-eba</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.eba</moduleArchive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>undeploy-eba-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>${project.groupId}/${project.artifactId}/1.0.0/eba</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Added: geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/src/test/java/org/apache/geronimo/testsuite/areis/ejb/test/EJBOSGIServiceTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/src/test/java/org/apache/geronimo/testsuite/areis/ejb/test/EJBOSGIServiceTest.java?rev=1080495&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/src/test/java/org/apache/geronimo/testsuite/areis/ejb/test/EJBOSGIServiceTest.java (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-eba/src/test/java/org/apache/geronimo/testsuite/areis/ejb/test/EJBOSGIServiceTest.java Fri Mar 11 09:27:06 2011
@@ -0,0 +1,67 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.testsuite.areis.ejb.test;
+
+import org.apache.geronimo.testsupport.TestSupport;
+import org.testng.annotations.Test;
+import org.apache.geronimo.testsupport.HttpUtils;
+
+import java.net.URL;
+import java.io.IOException;
+/**
+ * Unit test for simple App.
+ */
+public class EJBOSGIServiceTest extends TestSupport{
+ private String baseURL = "http://localhost:8080/";
+
+ @Test
+ public void testServlet() throws Exception {
+ checkReply("/EJBServlet");
+ }
+
+
+ private void checkReply(String address)
+ throws Exception {
+ String warName = System.getProperty("webAppName");
+ assertNotNull(warName);
+ URL url = new URL(baseURL + warName + address);
+
+ String reply = doGET(url, 6, 10 * 1000);
+ assertTrue("EJB as OSGI Service",
+ reply.contains("Hello!"));
+
+
+
+ }
+
+ private String doGET(URL url, int repeat, long delay) {
+ for (int i = 0; i < repeat; i++) {
+ try {
+ return HttpUtils.doGET(url);
+ } catch (IOException e) {
+ // ignore
+ try {
+ Thread.sleep(delay);
+ } catch (Exception ee) {
+ break;
+ }
+ }
+ }
+ fail("Did not get servlet response in time");
+ return "";
+ }
+}
\ No newline at end of file
Added: geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/pom.xml?rev=1080495&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/pom.xml Fri Mar 11 09:27:06 2011
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>ejb-osgi-service</artifactId>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+
+ <artifactId>ejb-impl</artifactId>
+
+ <name>Geronimo TestSuite :: Aries Testsuite :: ejb-impl</name>
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>ejb-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ejb_3.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/src/main/java/org/apache/geronimo/testsuite/aries/ejb/impl/HelloEJB.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/src/main/java/org/apache/geronimo/testsuite/aries/ejb/impl/HelloEJB.java?rev=1080495&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/src/main/java/org/apache/geronimo/testsuite/aries/ejb/impl/HelloEJB.java (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/src/main/java/org/apache/geronimo/testsuite/aries/ejb/impl/HelloEJB.java Fri Mar 11 09:27:06 2011
@@ -0,0 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.testsuite.aries.ejb.impl;
+
+import javax.ejb.Stateless;
+import org.apache.geronimo.testsuite.aries.ejb.api.HelloService;
+/**
+ * Hello world!
+ *
+ */
+
+@Stateless
+public class HelloEJB implements HelloService
+{
+ public String sayHello(){
+ return "Hello!";
+
+ }
+}
Added: geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml?rev=1080495&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml Fri Mar 11 09:27:06 2011
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+ -->
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+
+ <bean id="helloservice"
+ class="org.apache.geronimo.testsuite.aries.ejb.impl.HelloEJB">
+ </bean>
+
+ <service ref="helloservice"
+ interface="org.apache.geronimo.testsuite.aries.ejb.api.HelloService" />
+
+</blueprint>
Added: geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/pom.xml?rev=1080495&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/pom.xml Fri Mar 11 09:27:06 2011
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>ejb-osgi-service</artifactId>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+
+ <artifactId>ejb-wab</artifactId>
+
+ <name>Geronimo TestSuite :: Aries Testsuite :: ejb-wab</name>
+
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>ejb-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>ejb-impl</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Web-ContextPath>/ejb</Web-ContextPath>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Private-Package>org.apache.geronimo.testsuite.aries.ejb.web</Private-Package>
+ <Export-Package>!org.apache.geronimo.testsuite.aries.ejb.web</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/src/main/java/org/apache/geronimo/testsuite/aries/ejb/web/EJBServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/src/main/java/org/apache/geronimo/testsuite/aries/ejb/web/EJBServlet.java?rev=1080495&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/src/main/java/org/apache/geronimo/testsuite/aries/ejb/web/EJBServlet.java (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/src/main/java/org/apache/geronimo/testsuite/aries/ejb/web/EJBServlet.java Fri Mar 11 09:27:06 2011
@@ -0,0 +1,121 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.testsuite.aries.ejb.web;
+
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.*;
+import java.io.PrintWriter;
+import java.io.IOException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.ServletContext;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+import org.apache.geronimo.testsuite.aries.ejb.api.HelloService;
+
+/**
+ * Call EJB as an OSGI Service
+ *
+ */
+@WebServlet("/ejbservlet")
+public class EJBServlet extends HttpServlet{
+
+ private ServletContext sc;
+ private BundleContext bundleContext;
+ private static final String OSGI_SERVICE_PREFIX = "osgi:service/";
+
+ /**
+ * @see Servlet#init(ServletConfig)
+ */
+ public void init(ServletConfig config) throws ServletException {
+ sc = config.getServletContext();
+ }
+
+ /**
+ * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
+ */
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ performTask(request, response);
+ }
+
+ /**
+ * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
+ */
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ performTask(request, response);
+ }
+
+ protected void performTask(HttpServletRequest request, HttpServletResponse response){
+ try {
+
+ bundleContext = (BundleContext) sc.getAttribute("osgi-bundlecontext");
+ PrintWriter pw = response.getWriter();
+ if (bundleContext != null) {
+ ServiceReference sr = bundleContext.getServiceReference(HelloService.class.getName());
+ if (sr != null) {
+ HelloService sm = (HelloService) bundleContext.getService(sr);
+ pw.println(sm.sayHello());
+ bundleContext.ungetService(sr);
+ }
+ } else {
+ pw.println("Bundle Context is Null");
+ }
+
+ //JNDI Lookup via osgi:service
+ HelloService sm = (HelloService) getOSGIService(HelloService.class.getName(),null);
+ if(sm != null){
+ pw.println(sm.sayHello());
+ }else {
+ pw.println("Service Lookup is Null");
+ }
+
+
+
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ }
+
+ /**
+ * Lookup and return an osgi service
+ *
+ * @return Object
+ *
+ */
+ public static final Object getOSGIService(String serviceName, String filter) {
+
+ String name = OSGI_SERVICE_PREFIX + serviceName;
+ if (filter != null) {
+ name = name + "/" + filter;
+ }
+
+ try {
+ InitialContext ic = new InitialContext();
+ return ic.lookup(name);
+ } catch (NamingException e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+}
Added: geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/src/main/resources/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/src/main/resources/WEB-INF/web.xml?rev=1080495&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/src/main/resources/WEB-INF/web.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/ejb-wab/src/main/resources/WEB-INF/web.xml Fri Mar 11 09:27:06 2011
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="3.0"
+ metadata-complete="true">
+
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
+
+ <servlet>
+ <display-name>EJBServlet</display-name>
+ <servlet-name>EJBServlet</servlet-name>
+ <servlet-class>org.apache.geronimo.testsuite.aries.ejb.web.EJBServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>EJBServlet</servlet-name>
+ <url-pattern>/EJBServlet</url-pattern>
+
+ </servlet-mapping>
+</web-app>
Added: geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/pom.xml?rev=1080495&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/ejb-osgi-service/pom.xml Fri Mar 11 09:27:06 2011
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>aries-testsuite</artifactId>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>ejb-osgi-service</artifactId>
+
+ <name>Geronimo TestSuite :: Aries Testsuite :: EJB As an OSGI Service</name>
+
+ <packaging>pom</packaging>
+
+
+ <modules>
+ <module>ejb-api</module>
+ <module>ejb-impl</module>
+ <module>ejb-wab</module>
+ <module>ejb-eba</module>
+ </modules>
+</project>
\ No newline at end of file
Added: geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-eba/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-eba/pom.xml?rev=1080495&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-eba/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-eba/pom.xml Fri Mar 11 09:27:06 2011
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>mail-osgi-service</artifactId>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>mail-eba</artifactId>
+
+ <name>Geronimo TestSuite :: Aries Testsuite :: mail-eba</name>
+
+ <packaging>eba</packaging>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>mail-wab</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ </dependencies>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.aries</groupId>
+ <artifactId>eba-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <generateManifest>true</generateManifest>
+ <instructions>
+ <Application-Version>1.0.0</Application-Version>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>it</id>
+ <activation>
+ <property>
+ <name>it</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <!--<appContext>${project.artifactId}</appContext>-->
+ <webAppName>mail</webAppName>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-eba</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>deploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.eba</moduleArchive>
+ </configuration>
+ </execution>
+ <execution>
+ <id>undeploy-eba-as-moduleId</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>undeploy-module</goal>
+ </goals>
+ <configuration>
+ <moduleId>${project.groupId}/${project.artifactId}/1.0.0/eba</moduleId>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Added: geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-eba/src/test/java/org/apache/geronimo/testsuite/aries/mail/test/MailTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-eba/src/test/java/org/apache/geronimo/testsuite/aries/mail/test/MailTest.java?rev=1080495&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-eba/src/test/java/org/apache/geronimo/testsuite/aries/mail/test/MailTest.java (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-eba/src/test/java/org/apache/geronimo/testsuite/aries/mail/test/MailTest.java Fri Mar 11 09:27:06 2011
@@ -0,0 +1,68 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.testsuite.aries.mail.test;
+
+import org.apache.geronimo.testsupport.TestSupport;
+import org.testng.annotations.Test;
+import org.apache.geronimo.testsupport.HttpUtils;
+
+import java.net.URL;
+import java.io.IOException;
+
+/**
+ * Unit test for simple App.
+ */
+public class MailTest extends TestSupport{
+ private String baseURL = "http://localhost:8080/";
+
+ @Test
+ public void testServlet() throws Exception {
+ checkReply("/MailServlet");
+ }
+
+
+ private void checkReply(String address)
+ throws Exception {
+ String warName = System.getProperty("webAppName");
+ assertNotNull(warName);
+ URL url = new URL(baseURL + warName + address);
+
+ String reply = doGET(url, 6, 10 * 1000);
+ assertTrue("Lookup Mail via osgi:service",
+ reply.contains("Java Mail JNDI Lookup via osgi:service Pass"));
+
+
+
+ }
+
+ private String doGET(URL url, int repeat, long delay) {
+ for (int i = 0; i < repeat; i++) {
+ try {
+ return HttpUtils.doGET(url);
+ } catch (IOException e) {
+ // ignore
+ try {
+ Thread.sleep(delay);
+ } catch (Exception ee) {
+ break;
+ }
+ }
+ }
+ fail("Did not get servlet response in time");
+ return "";
+ }
+}
Added: geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/pom.xml?rev=1080495&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/pom.xml (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/pom.xml Fri Mar 11 09:27:06 2011
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>mail-osgi-service</artifactId>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>mail-wab</artifactId>
+
+ <name>Geronimo TestSuite :: Aries Testsuite :: mail-wab</name>
+
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>javamail</artifactId>
+ <scope>provided</scope>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ <version>1.8.2</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Web-ContextPath>/mail</Web-ContextPath>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Private-Package>org.apache.geronimo.testsuite.aries.mail.web</Private-Package>
+ <Export-Package>!org.apache.geronimo.testsuite.aries.mail.web</Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/src/main/java/org/apache/geronimo/testsuite/aries/mail/web/MailServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/src/main/java/org/apache/geronimo/testsuite/aries/mail/web/MailServlet.java?rev=1080495&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/src/main/java/org/apache/geronimo/testsuite/aries/mail/web/MailServlet.java (added)
+++ geronimo/server/trunk/testsuite/aries-testsuite/mail-osgi-service/mail-wab/src/main/java/org/apache/geronimo/testsuite/aries/mail/web/MailServlet.java Fri Mar 11 09:27:06 2011
@@ -0,0 +1,125 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.testsuite.aries.mail.web;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.*;
+
+import java.io.PrintWriter;
+import java.io.IOException;
+import java.util.Properties;
+
+import javax.servlet.annotation.WebServlet;
+
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+import javax.mail.Session;
+import org.apache.geronimo.resource.mail.MailGBean;
+
+/**
+ * Call Java Mail Session via osgi:service
+ *
+ */
+@WebServlet("/mailservlet")
+public class MailServlet extends HttpServlet
+{
+ private ServletContext sc;
+ private BundleContext bundleContext;
+ private static final String OSGI_SERVICE_PREFIX = "osgi:service/";
+
+ /**
+ * @see Servlet#init(ServletConfig)
+ */
+ public void init(ServletConfig config) throws ServletException {
+ sc = config.getServletContext();
+ }
+
+ /**
+ * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
+ */
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ performTask(request, response);
+ }
+
+ /**
+ * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
+ */
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ performTask(request, response);
+ }
+
+ protected void performTask(HttpServletRequest request, HttpServletResponse response){
+ PrintWriter pw = null;
+ try {
+ pw = response.getWriter();
+ /*bundleContext = (BundleContext) sc.getAttribute("osgi-bundlecontext");
+ ServiceReference sr = bundleContext.getServiceReference(MailGBean.class.getName());
+ if (sr != null) {
+ MailGBean sm = (MailGBean) bundleContext.getService(sr);
+ if (sm != null){
+ pw.println("Java Mail JNDI Lookup via osgi:service Pass");
+ }else {
+ pw.println("Java Mail JNDI Lookup via osgi:service Fail");
+ }
+ bundleContext.ungetService(sr);
+ }*/
+
+ //JNDI Lookup via osgi:service , MailGBean jndi name is on to-do list
+ Session mailSession = (Session) getOSGIService("mail/MailSession",null);
+ if (mailSession != null){
+ pw.println("Java Mail JNDI Lookup via osgi:service Pass" );
+ } else {
+ pw.println("Java Mail JNDI Lookup via osgi:service Fail");
+ }
+
+
+
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ pw.println(e.toString());
+ e.printStackTrace();
+ }
+
+ }
+ /**
+ * Lookup and return an osgi service
+ *
+ * @return Object
+ *
+ */
+ public static final Object getOSGIService(String serviceName, String filter) {
+
+ String name = OSGI_SERVICE_PREFIX + serviceName;
+ if (filter != null) {
+ name = name + "/" + filter;
+ }
+
+ try {
+ InitialContext ic = new InitialContext();
+ return ic.lookup(name);
+ } catch (NamingException e) {
+ e.printStackTrace();
+ return null;
+ }
+ }
+}
\ No newline at end of file