You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/09/20 10:30:45 UTC

svn commit: r697330 - in /geronimo/gshell/trunk/gshell-remote/gshell-whisper: ./ src/main/resources/META-INF/spring/ src/test/java/org/apache/geronimo/gshell/whisper/ src/test/java/org/apache/geronimo/gshell/whisper/message/ src/test/java/org/apache/ge...

Author: jdillon
Date: Sat Sep 20 01:30:44 2008
New Revision: 697330

URL: http://svn.apache.org/viewvc?rev=697330&view=rev
Log:
Re-enable tests

Added:
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/SpringTestSupport.java   (contents, props changed)
      - copied, changed from r697030, geronimo/gshell/trunk/gshell-support/gshell-spring/src/test/java/org/apache/geronimo/gshell/spring/SpringTestSupport.java
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest.java   (contents, props changed)
      - copied, changed from r697030, geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTester.java
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/message/
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest-context.xml   (with props)
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/transport/
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorTest-context.xml   (with props)
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/transport/vm/
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportFactoryTest-context.xml   (with props)
Removed:
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTester.java
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportTest.java
Modified:
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/pom.xml
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/resources/META-INF/spring/components.xml
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorTest.java
    geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportFactoryTest.java

Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/pom.xml?rev=697330&r1=697329&r2=697330&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/pom.xml (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/pom.xml Sat Sep 20 01:30:44 2008
@@ -37,13 +37,6 @@
         Messaging framework muck and fluff.
     </description>
 
-    <properties>
-        <!--
-        FIXME: Tests disabled temporarily while refactoring for wisdom/spring support.
-        -->
-        <maven.test.skip>true</maven.test.skip>
-    </properties>
-    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.gshell.support</groupId>
@@ -89,6 +82,18 @@
             <groupId>commons-vfs</groupId>
             <artifactId>commons-vfs</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/resources/META-INF/spring/components.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/resources/META-INF/spring/components.xml?rev=697330&r1=697329&r2=697330&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/resources/META-INF/spring/components.xml (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/main/resources/META-INF/spring/components.xml Sat Sep 20 01:30:44 2008
@@ -29,7 +29,7 @@
 
     <context:annotation-config/>
 
-    <bean id="transportFactoryLocator" class="org.apache.geronimo.gshell.whisper.TransportFactoryLocatorImpl">
+    <bean id="transportFactoryLocator" class="org.apache.geronimo.gshell.whisper.transport.TransportFactoryLocatorImpl">
         <property name="factories">
             <set>
                 <ref bean="vmTransportFactory"/>

Copied: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/SpringTestSupport.java (from r697030, geronimo/gshell/trunk/gshell-support/gshell-spring/src/test/java/org/apache/geronimo/gshell/spring/SpringTestSupport.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/SpringTestSupport.java?p2=geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/SpringTestSupport.java&p1=geronimo/gshell/trunk/gshell-support/gshell-spring/src/test/java/org/apache/geronimo/gshell/spring/SpringTestSupport.java&r1=697030&r2=697330&rev=697330&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-support/gshell-spring/src/test/java/org/apache/geronimo/gshell/spring/SpringTestSupport.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/SpringTestSupport.java Sat Sep 20 01:30:44 2008
@@ -17,9 +17,20 @@
  * under the License.
  */
 
-package org.apache.geronimo.gshell.spring;
+package org.apache.geronimo.gshell.whisper;
 
 import org.springframework.test.AbstractDependencyInjectionSpringContextTests;
+import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.apache.geronimo.gshell.spring.BeanContainerAwareProcessor;
+import org.apache.geronimo.gshell.spring.BeanContainer;
+import org.codehaus.plexus.classworlds.realm.ClassRealm;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+import java.util.List;
+import java.net.URL;
 
 /**
  * Suport for Spring-based tests.
@@ -29,9 +40,80 @@
 public abstract class SpringTestSupport
     extends AbstractDependencyInjectionSpringContextTests
 {
+    protected final Logger log = LoggerFactory.getLogger(getClass());
+
     protected String[] getConfigLocations() {
         return new String[] {
             "classpath:" + getClass().getName().replace('.', '/') + "-context.xml"
         };
     }
+
+    private BeanContainer container;
+
+    protected void prepareApplicationContext(final GenericApplicationContext context) {
+        assert context != null;
+        
+	    log.debug("Prepare applciation context");
+
+        container = new BeanContainer() {
+            public BeanContainer getParent() {
+                return null;
+            }
+
+            public ClassRealm getClassRealm() {
+                throw new UnsupportedOperationException();
+            }
+
+            public void start() {
+                context.start();
+            }
+
+            public void stop() {
+                context.stop();
+            }
+
+            public void close() {
+                context.close();
+            }
+
+            public <T> T getBean(Class<T> type) {
+                throw new UnsupportedOperationException();
+            }
+
+            @SuppressWarnings({"unchecked"})
+            public <T> T getBean(String name, Class<T> requiredType) {
+                return (T)context.getBean(name, requiredType);
+            }
+
+            @SuppressWarnings({"unchecked"})
+            public <T> Map<String, T> getBeans(Class<T> type) {
+                return (Map<String, T>)context.getBeansOfType(type);
+            }
+
+            public String[] getBeanNames() {
+                return context.getBeanDefinitionNames();
+            }
+
+            public String[] getBeanNames(Class type) {
+                return context.getBeanNamesForType(type);
+            }
+
+            public BeanContainer createChild(String id, List<URL> classPath) {
+                throw new UnsupportedOperationException();
+            }
+
+            public BeanContainer createChild(String id) {
+                return createChild(id, null);
+            }
+        };
+    }
+
+    protected void customizeBeanFactory(final DefaultListableBeanFactory beanFactory) {
+        assert beanFactory != null;
+
+        log.debug("Customize bean factory");
+
+        assert container != null;
+        beanFactory.addBeanPostProcessor(new BeanContainerAwareProcessor(container));
+	}
 }
\ No newline at end of file

Propchange: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/SpringTestSupport.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/SpringTestSupport.java
------------------------------------------------------------------------------
    svn:executable = *

Propchange: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/SpringTestSupport.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/SpringTestSupport.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/SpringTestSupport.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest.java (from r697030, geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTester.java)
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest.java?p2=geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest.java&p1=geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTester.java&r1=697030&r2=697330&rev=697330&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTester.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest.java Sat Sep 20 01:30:44 2008
@@ -27,21 +27,26 @@
 import org.apache.geronimo.gshell.whisper.transport.TransportFactory;
 import org.apache.geronimo.gshell.whisper.transport.TransportFactoryLocator;
 import org.apache.geronimo.gshell.whisper.transport.TransportServer;
+import org.apache.geronimo.gshell.whisper.SpringTestSupport;
 import org.apache.mina.common.IoSession;
 import org.apache.mina.handler.demux.DemuxingIoHandler;
 import org.apache.mina.handler.demux.MessageHandler;
-import org.codehaus.plexus.PlexusTestCase;
 
 /**
  * ???
  *
  * @version $Rev$ $Date$
  */
-public class PingPongProtocolTester
-    extends PlexusTestCase
+public class PingPongProtocolTest
+    extends SpringTestSupport
 {
     private static void log(Object msg) {
-        System.err.println(">>> [" + Thread.currentThread().getName() + "] " + msg);
+        System.out.println(">>> [" + Thread.currentThread().getName() + "] " + msg);
+    }
+
+    private static void sleep(int seconds) throws InterruptedException {
+        log("Sleeping for: " + seconds);
+        Thread.sleep(seconds * 1000);
     }
 
     public static class PingMessage
@@ -63,7 +68,7 @@
         public void messageReceived(IoSession session, PingMessage message) throws Exception {
             log(message);
 
-            Thread.sleep(5 * 1000);
+            sleep(2);
 
             session.write(new PingMessage()).join();
         }
@@ -129,20 +134,31 @@
     public static class PingPongClientHandler
         extends PingPongProtocolHandler
     {
-
+        // Empty
     }
 
     public static class PingPongServerHandler
         extends PingPongProtocolHandler
     {
+        // Empty
+    }
+
+    private TransportFactoryLocator locator;
 
+    private TransportFactoryLocator getLocator() {
+        TransportFactoryLocator locator = (TransportFactoryLocator) applicationContext.getBean("transportFactoryLocator");
+        assertNotNull(locator);
+
+        return locator;
+    }
+
+    protected void onSetUp() throws Exception {
+        locator = getLocator();
     }
 
     public void testPingPong() throws Exception {
         URI uri = new URI("vm://local:1");
 
-        TransportFactoryLocator locator = (TransportFactoryLocator) lookup(TransportFactoryLocator.class);
-
         log("Locator: " + locator);
 
         TransportFactory factory = locator.locate(uri);
@@ -159,11 +175,11 @@
 
         Session session = client.getSession();
 
-        Thread.sleep(5 * 1000);
+        sleep(2);
 
         session.send(new PingMessage()).join();
         
-        Thread.sleep(30 * 1000);
+        sleep(10);
 
         client.close();
 

Propchange: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorTest.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorTest.java?rev=697330&r1=697329&r2=697330&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorTest.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorTest.java Sat Sep 20 01:30:44 2008
@@ -24,7 +24,7 @@
 import org.apache.geronimo.gshell.whisper.transport.ssl.SslTransportFactory;
 import org.apache.geronimo.gshell.whisper.transport.tcp.TcpTransportFactory;
 import org.apache.geronimo.gshell.whisper.transport.vm.VmTransportFactory;
-import org.codehaus.plexus.PlexusTestCase;
+import org.apache.geronimo.gshell.whisper.SpringTestSupport;
 
 /**
  * Tests for the {@link TransportFactoryLocator} class.
@@ -32,15 +32,19 @@
  * @version $Rev$ $Date$
  */
 public class TransportFactoryLocatorTest
-    extends PlexusTestCase
+    extends SpringTestSupport
 {
-    TransportFactoryLocator locator;
+    private TransportFactoryLocator locator;
 
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        locator = (TransportFactoryLocator) lookup(TransportFactoryLocator.class);
+    private TransportFactoryLocator getLocator() {
+        TransportFactoryLocator locator = (TransportFactoryLocator) applicationContext.getBean("transportFactoryLocator");
         assertNotNull(locator);
+
+        return locator;
+    }
+
+    protected void onSetUp() throws Exception {
+        locator = getLocator();
     }
 
     public void testLocate_vm() throws Exception {
@@ -80,7 +84,7 @@
             locator.locate(uri);
             fail();
         }
-        catch (LookupException expected) {}
+        catch (InvalidLocationException expected) {}
     }
 
     public void testLocate_badLocation() throws Exception {

Modified: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportFactoryTest.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportFactoryTest.java?rev=697330&r1=697329&r2=697330&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportFactoryTest.java (original)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/java/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportFactoryTest.java Sat Sep 20 01:30:44 2008
@@ -24,8 +24,8 @@
 import org.apache.geronimo.gshell.whisper.transport.TransportFactory;
 import org.apache.geronimo.gshell.whisper.transport.TransportFactoryLocator;
 import org.apache.geronimo.gshell.whisper.transport.TransportServer;
+import org.apache.geronimo.gshell.whisper.SpringTestSupport;
 import org.apache.mina.common.IoHandlerAdapter;
-import org.codehaus.plexus.PlexusTestCase;
 
 /**
  * Tests for the {@link VmTransportFactory} class.
@@ -33,22 +33,23 @@
  * @version $Rev$ $Date$
  */
 public class VmTransportFactoryTest
-    extends PlexusTestCase
+    extends SpringTestSupport
 {
-    TransportFactory factory;
+    private TransportFactory factory;
 
-    URI uri;
-
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        TransportFactoryLocator locator = (TransportFactoryLocator) lookup(TransportFactoryLocator.class);
+    private URI uri;
 
+    private TransportFactoryLocator getLocator() {
+        TransportFactoryLocator locator = (TransportFactoryLocator) applicationContext.getBean("transportFactoryLocator");
         assertNotNull(locator);
 
+        return locator;
+    }
+
+    protected void onSetUp() throws Exception {
         uri = new URI("vm://local:1");
 
-        factory = locator.locate(uri);
+        factory = getLocator().locate(uri);
 
         assertNotNull(factory);
     }

Added: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest-context.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest-context.xml?rev=697330&view=auto
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest-context.xml (added)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest-context.xml Sat Sep 20 01:30:44 2008
@@ -0,0 +1,48 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="
+            http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+
+    <context:annotation-config/>
+
+    <bean id="transportFactoryLocator" class="org.apache.geronimo.gshell.whisper.transport.TransportFactoryLocatorImpl">
+        <property name="factories">
+            <set>
+                <ref bean="vmTransportFactory"/>
+            </set>
+        </property>
+    </bean>
+
+    <!-- vm:// -->
+
+    <bean id="vmTransportFactory" class="org.apache.geronimo.gshell.whisper.transport.vm.VmTransportFactory"/>
+
+    <bean id="vmTransport" class="org.apache.geronimo.gshell.whisper.transport.vm.VmTransport" scope="prototype"/>
+
+    <bean id="vmTransportServer" class="org.apache.geronimo.gshell.whisper.transport.vm.VmTransportServer" scope="prototype"/>
+
+</beans>
\ No newline at end of file

Propchange: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest-context.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest-context.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/message/PingPongProtocolTest-context.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorTest-context.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorTest-context.xml?rev=697330&view=auto
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorTest-context.xml (added)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorTest-context.xml Sat Sep 20 01:30:44 2008
@@ -0,0 +1,66 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="
+            http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+
+    <context:annotation-config/>
+
+    <bean id="transportFactoryLocator" class="org.apache.geronimo.gshell.whisper.transport.TransportFactoryLocatorImpl">
+        <property name="factories">
+            <set>
+                <ref bean="vmTransportFactory"/>
+                <ref bean="tcpTransportFactory"/>
+                <ref bean="sslTransportFactory"/>
+            </set>
+        </property>
+    </bean>
+
+    <!-- vm:// -->
+
+    <bean id="vmTransportFactory" class="org.apache.geronimo.gshell.whisper.transport.vm.VmTransportFactory"/>
+
+    <bean id="vmTransport" class="org.apache.geronimo.gshell.whisper.transport.vm.VmTransport" scope="prototype"/>
+
+    <bean id="vmTransportServer" class="org.apache.geronimo.gshell.whisper.transport.vm.VmTransportServer" scope="prototype"/>
+
+    <!-- tcp:// -->
+
+    <bean id="tcpTransportFactory" class="org.apache.geronimo.gshell.whisper.transport.tcp.TcpTransportFactory"/>
+
+    <bean id="tcpTransport" class="org.apache.geronimo.gshell.whisper.transport.tcp.TcpTransport" scope="prototype"/>
+
+    <bean id="tcpTransportServer" class="org.apache.geronimo.gshell.whisper.transport.tcp.TcpTransportServer" scope="prototype"/>
+
+    <!-- ssl:// -->
+
+    <bean id="sslTransportFactory" class="org.apache.geronimo.gshell.whisper.transport.ssl.SslTransportFactory"/>
+
+    <bean id="sslTransport" class="org.apache.geronimo.gshell.whisper.transport.ssl.SslTransport" scope="prototype"/>
+
+    <bean id="TransportServer" class="org.apache.geronimo.gshell.whisper.transport.ssl.SslTransportServer" scope="prototype"/>
+
+</beans>
\ No newline at end of file

Propchange: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorTest-context.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorTest-context.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/transport/TransportFactoryLocatorTest-context.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportFactoryTest-context.xml
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportFactoryTest-context.xml?rev=697330&view=auto
==============================================================================
--- geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportFactoryTest-context.xml (added)
+++ geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportFactoryTest-context.xml Sat Sep 20 01:30:44 2008
@@ -0,0 +1,48 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="
+            http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+
+    <context:annotation-config/>
+
+    <bean id="transportFactoryLocator" class="org.apache.geronimo.gshell.whisper.transport.TransportFactoryLocatorImpl">
+        <property name="factories">
+            <set>
+                <ref bean="vmTransportFactory"/>
+            </set>
+        </property>
+    </bean>
+
+    <!-- vm:// -->
+
+    <bean id="vmTransportFactory" class="org.apache.geronimo.gshell.whisper.transport.vm.VmTransportFactory"/>
+
+    <bean id="vmTransport" class="org.apache.geronimo.gshell.whisper.transport.vm.VmTransport" scope="prototype"/>
+
+    <bean id="vmTransportServer" class="org.apache.geronimo.gshell.whisper.transport.vm.VmTransportServer" scope="prototype"/>
+
+</beans>
\ No newline at end of file

Propchange: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportFactoryTest-context.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportFactoryTest-context.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/gshell/trunk/gshell-remote/gshell-whisper/src/test/resources/org/apache/geronimo/gshell/whisper/transport/vm/VmTransportFactoryTest-context.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml