[jboss-cvs] JBossAS SVN: r70111 - in projects/naming/trunk/jnpserver: src/main/java/org/jnp/server and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 26 10:17:53 EST 2008
Author: scott.stark at jboss.org
Date: 2008-02-26 10:17:53 -0500 (Tue, 26 Feb 2008)
New Revision: 70111
Added:
projects/naming/trunk/jnpserver/src/test/resources/
projects/naming/trunk/jnpserver/src/test/resources/jndi.properties
projects/naming/trunk/jnpserver/src/test/resources/log4j.xml
Modified:
projects/naming/trunk/jnpserver/.classpath
projects/naming/trunk/jnpserver/src/main/java/org/jnp/server/Main.java
projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/TestJNPSockets.java
Log:
Fix the tests
Modified: projects/naming/trunk/jnpserver/.classpath
===================================================================
--- projects/naming/trunk/jnpserver/.classpath 2008-02-26 15:14:19 UTC (rev 70110)
+++ projects/naming/trunk/jnpserver/.classpath 2008-02-26 15:17:53 UTC (rev 70111)
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="naming/target-eclipse-test-classes" path="test/java"/>
<classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" output="target/eclipse-test-classes" path="src/test/resources"/>
+ <classpathentry kind="src" output="target/eclipse-test-classes" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
Modified: projects/naming/trunk/jnpserver/src/main/java/org/jnp/server/Main.java
===================================================================
--- projects/naming/trunk/jnpserver/src/main/java/org/jnp/server/Main.java 2008-02-26 15:14:19 UTC (rev 70110)
+++ projects/naming/trunk/jnpserver/src/main/java/org/jnp/server/Main.java 2008-02-26 15:17:53 UTC (rev 70111)
@@ -351,7 +351,8 @@
+",rmiPort="+rmiPort
+",clientSocketFactory="+clientSocketFactory
+",serverSocketFactory="+serverSocketFactory);
- Remote stub = UnicastRemoteObject.exportObject(getNamingInstance(),
+ Naming instance = getNamingInstance();
+ Remote stub = UnicastRemoteObject.exportObject(instance,
rmiPort, clientSocketFactory, serverSocketFactory);
log.debug("NamingServer stub: "+stub);
serverStub = new MarshalledObject(stub);
Modified: projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/TestJNPSockets.java
===================================================================
--- projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/TestJNPSockets.java 2008-02-26 15:14:19 UTC (rev 70110)
+++ projects/naming/trunk/jnpserver/src/test/java/org/jnp/test/TestJNPSockets.java 2008-02-26 15:17:53 UTC (rev 70111)
@@ -34,15 +34,20 @@
import junit.framework.TestCase;
import org.jnp.server.Main;
+import org.jnp.server.NamingBean;
+import org.jnp.server.NamingBeanImpl;
/** A test of RMI custom sockets with the jnp JNDI provider.
- @author Scott_Stark at displayscape.com
- @version $Revision$
+ @author Scott.Stark at jboss.org
+ @version $Revision:70105 $
*/
public class TestJNPSockets extends TestCase
{
- static Main server;
+ /** The actual namingMain service impl bean */
+ private static NamingBeanImpl namingBean;
+ /** */
+ private static Main namingMain = new Main();
static int serverPort;
@@ -53,16 +58,18 @@
protected void setUp() throws Exception
{
- if (server != null)
+ if (namingBean != null)
return;
- server = new Main();
- server.setPort(0);
- server.setBindAddress("localhost");
- server.setClientSocketFactory(ClientSocketFactory.class.getName());
- server.setServerSocketFactory(ServerSocketFactory.class.getName());
- server.start();
- serverPort = server.getPort();
+ namingBean = new NamingBeanImpl();
+ namingBean.start();
+ namingMain.setPort(0);
+ namingMain.setBindAddress("localhost");
+ namingMain.setClientSocketFactory(ClientSocketFactory.class.getName());
+ namingMain.setServerSocketFactory(ServerSocketFactory.class.getName());
+ namingMain.setNamingInfo(namingBean);
+ namingMain.start();
+ serverPort = namingMain.getPort();
}
public void testAccess() throws Exception
@@ -79,7 +86,7 @@
fail("No ClientSocketFactory was created");
if (ServerSocketFactory.created == false)
fail("No ServerSocketFactory was created");
- server.stop();
+ namingMain.stop();
}
public static void main(String[] args) throws Exception
Added: projects/naming/trunk/jnpserver/src/test/resources/jndi.properties
===================================================================
--- projects/naming/trunk/jnpserver/src/test/resources/jndi.properties (rev 0)
+++ projects/naming/trunk/jnpserver/src/test/resources/jndi.properties 2008-02-26 15:17:53 UTC (rev 70111)
@@ -0,0 +1,4 @@
+# DO NOT EDIT THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING
+#
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
Added: projects/naming/trunk/jnpserver/src/test/resources/log4j.xml
===================================================================
--- projects/naming/trunk/jnpserver/src/test/resources/log4j.xml (rev 0)
+++ projects/naming/trunk/jnpserver/src/test/resources/log4j.xml 2008-02-26 15:17:53 UTC (rev 70111)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- $Id$ -->
+
+<!--
+ | 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">
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="DEBUG"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Messagen -->
+ <!--
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ -->
+ <param name="ConversionPattern" value="%-5p %d{dd-MM HH:mm:ss,SSS} (%F:%M:%L) -%m%n"/>
+ </layout>
+ </appender>
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ </root>
+
+</log4j:configuration>
Property changes on: projects/naming/trunk/jnpserver/src/test/resources/log4j.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
More information about the jboss-cvs-commits
mailing list