[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rhq-commits
Subject:    [rhq] Branch 'rhq-on-as7' - modules/enterprise modules/integration-tests
From:       mazz () fedoraproject ! org (mazz)
Date:       2012-09-27 16:33:41
Message-ID: 20120927163341.D85E1A2966 () fedorahosted ! org
[Download RAW message or body]

 modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java \
|    4 ++--  modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java \
|    8 ++++----  2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit f4823b701c5503c0b9a5e0b155682de5be8388f5
Author: John Mazzitelli <mazz at redhat.com>
Date:   Thu Sep 27 12:33:34 2012 -0400

    AS7 doesn't use jnp initial context factory

diff --git a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java \
b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java
 index b35a939..274e94f 100644
--- a/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java
                
+++ b/modules/enterprise/server/itests/src/test/java/org/rhq/enterprise/client/security/test/JndiAccessTest.java
 @@ -172,8 +172,8 @@ public class JndiAccessTest extends AbstractEJB3Test {
         try {
             engine.eval(""
                 + "var env = new java.util.Hashtable();"
-                + "env.put('java.naming.factory.initial', \
                'org.jnp.interfaces.LocalOnlyContextFactory');"
-                + "env.put('java.naming.factory.url.pkgs', \
'org.jboss.naming:org.jnp.interfaces');" +                + \
"env.put('java.naming.factory.initial', \
'org.jboss.as.naming.InitialContextFactory');" +                //+ \
"env.put('java.naming.factory.url.pkgs', 'org.jboss.naming:org.jnp.interfaces');"  + \
                "var ctx = new javax.naming.InitialContext(env);\n"
                 + "var entityManagerFactory = ctx.lookup('" + \
                RHQConstants.ENTITY_MANAGER_JNDI_NAME + "');\n"
                 + "var entityManager = \
                entityManagerFactory.createEntityManager();\n"
diff --git a/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java \
b/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
 index 9a422b4..d49c7ae 100644
--- a/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
                
+++ b/modules/integration-tests/jndi-access/jndi-access-test/src/test/java/org/rhq/jndi/test/JndiAccessTest.java
 @@ -128,8 +128,8 @@ public class JndiAccessTest extends AbstractEJB3Test {
     @Parameters("jnp.port")
     public void testRemoteConnectionWorkingFromJava(int jnpPort) throws Exception {
         Properties env = new Properties();
-        env.put("java.naming.factory.initial", \
                "org.jboss.naming.NamingContextFactory");
-        env.put("java.naming.provider.url", "jnp://localhost:" + jnpPort);
+        env.put("java.naming.factory.initial", \
"org.jboss.as.naming.InitialContextFactory"); +        \
//env.put("java.naming.provider.url", "jnp://localhost:" + jnpPort);  InitialContext \
ctx = new InitialContext(env);  Object kachny = ctx.lookup("kachny");
         
@@ -163,8 +163,8 @@ public class JndiAccessTest extends AbstractEJB3Test {
         try {
             engine.eval(""
                 + "var env = new java.util.Hashtable();"
-                + "env.put('java.naming.factory.initial', \
                'org.jboss.naming.NamingContextFactory');"
-                + "env.put('java.naming.provider.url', 'jnp://localhost:" + jnpPort \
+ "');" +                + "env.put('java.naming.factory.initial', \
'org.jboss.as.naming.InitialContextFactory');" +                //+ \
"env.put('java.naming.provider.url', 'jnp://localhost:" + jnpPort + "');"  + "var ctx \
= new javax.naming.InitialContext(env);\n"  + "var kachny = ctx.lookup('kachny');\n"
                 + "assertNotNull(kachny);\n");


[prev in list] [next in list] [prev in thread] [next in thread]