geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From viol...@apache.org
Subject svn commit: r1082111 - in /geronimo/server/trunk/testsuite/aries-testsuite: ds-jndi/ds-wab/src/main/java/org/apache/geronimo/testsuite/ds/web/DSServlet.java pom.xml
Date Wed, 16 Mar 2011 10:13:46 GMT
Author: violalu
Date: Wed Mar 16 10:13:46 2011
New Revision: 1082111

URL: http://svn.apache.org/viewvc?rev=1082111&view=rev
Log:
Update test case: Enable datasource osgi:service jndi lookup test case

Modified:
    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/pom.xml

Modified: 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=1082111&r1=1082110&r2=1082111&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/src/main/java/org/apache/geronimo/testsuite/ds/web/DSServlet.java
(original)
+++ geronimo/server/trunk/testsuite/aries-testsuite/ds-jndi/ds-wab/src/main/java/org/apache/geronimo/testsuite/ds/web/DSServlet.java
Wed Mar 16 10:13:46 2011
@@ -66,7 +66,7 @@ public class DSServlet extends HttpServl
         try {
             PrintWriter pw = response.getWriter();
             
-            ds = (DataSource) getOSGIService(DataSource.class.getName() , "(osgi.jndi.service.name=jdbc/jndidbDataSource)");
          
+            ds = (DataSource) getOSGIService(DataSource.class.getName() , "(osgi.jndi.service.name=jdbc/NoTxjndidbDataSource)");
          
             if(ds != null){
                 pw.println("Datasource OSGI Service JNDI Lookup Pass");
             } else{

Modified: geronimo/server/trunk/testsuite/aries-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/aries-testsuite/pom.xml?rev=1082111&r1=1082110&r2=1082111&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/aries-testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/aries-testsuite/pom.xml Wed Mar 16 10:13:46 2011
@@ -37,9 +37,8 @@
     <modules>
         <module>simple</module>
         <module>jpa</module>
-        <module>require-bundle-test</module>
-    <!--Datasource JNDI Lookup fail, so comment it
-    <module>ds-jndi</module>-->
+        <module>require-bundle-test</module>    
+    <module>ds-jndi</module>
     <module>ejb-osgi-service</module>
     <module>osgi-service-custom</module>    
     <!--mail/MailSession is not bound to MailGBean, so comment it



Mime
View raw message