Author: adc
Date: Wed Mar 23 18:50:15 2005
New Revision: 158866
URL: http://svn.apache.org/viewcvs?view=rev&rev=158866
Log:
Some fixes.
Modified:
geronimo/trunk/modules/assembly/src/plan/interop-server-plan.xml
geronimo/trunk/modules/core/src/test-data/xml/deployment/connector_1_0/ra.xml
geronimo/trunk/modules/core/src/test-data/xml/deployment/connector_1_5/ra.xml
Modified: geronimo/trunk/modules/assembly/src/plan/interop-server-plan.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/interop-server-plan.xml?view=diff&r1=158865&r2=158866
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/interop-server-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/interop-server-plan.xml Wed Mar 23
18:50:15 2005
@@ -34,7 +34,6 @@
<!-- This is just a simple testing bean for configuration and a junit
test.... -->
<gbean name="InteropGBean"
class="org.apache.geronimo.interop.InteropGBean">
- <attribute name="name">This is my name</attribute>
<attribute name="strprop">This is a string prop</attribute>
<attribute name="properties">
@@ -44,33 +43,8 @@
</attribute>
</gbean>
- <!-- This bean should get a collection of service beans... -->
- <gbean gbeanName="interop:name=ServiceManager"
class="org.apache.geronimo.interop.ServiceManager">
- <references name="services">
- <pattern><gbean-name>interop:name=Service,*</gbean-name></pattern>
- <pattern><gbean-name>interop:name=Service2,*</gbean-name></pattern>
- </references>
- </gbean>
-
- <!-- These are the service beans ... -->
- <gbean gbeanName="interop:name=Service-A"
class="org.apache.geronimo.interop.Service">
- <attribute name="serviceName">service-a</attribute>
- </gbean>
- <gbean gbeanName="interop:name=Service-B,type=Foo"
class="org.apache.geronimo.interop.Service">
- <attribute name="serviceName">service-b</attribute>
- </gbean>
- <gbean gbeanName="interop:name=Service-C,type=Bar"
class="org.apache.geronimo.interop.Service">
- <attribute name="serviceName">service-c</attribute>
- </gbean>
<!-- RMI-IIOP Protocol -->
- <gbean gbeanName="interop:name=AdapterManager"
class="org.apache.geronimo.interop.adapter.AdapterManager">
- <references name="containers">
-
<pattern><gbean-name>geronimo.server:j2eeType=StatelessSessionBean,*</gbean-name></pattern>
-
<pattern><gbean-name>geronimo.server:j2eeType=StatefulSessionBean,*</gbean-name></pattern>
-
<pattern><gbean-name>geronimo.server:j2eeType=EntityBean,*</gbean-name></pattern>
- </references>
- </gbean>
<gbean gbeanName="interop:type=NetworkService,name=RMIIIOP"
class="org.openejb.server.StandardServiceStackGBean">
<attribute name="name">RMIIIOP</attribute>
@@ -82,19 +56,6 @@
<attribute name="logOnSuccess">HOST,NAME,THREADID,USERID</attribute>
<attribute name="logOnFailure">HOST,NAME</attribute>
<reference
name="Server"><gbean-name>interop:type=Server,name=RMIIIOP</gbean-name></reference>
- </gbean>
-
- <gbean gbeanName="interop:type=Server,name=RMIIIOP"
class="org.apache.geronimo.interop.rmi.iiop.server.RmiIiopServerGBean">
- <reference
name="adapterManager"><gbean-name>interop:name=AdapterManager</gbean-name></reference>
- <attribute name="writeSystemExceptionStackTrace">false</attribute>
- <attribute name="simpleIDL">false</attribute>
- <attribute name="args">-ORBPort, 2001, -ORBInitRef,
NameService=corbaloc::localhost:1050/NameService, -ORBCSIv2, -ORBGSSClientUser,
"user1,a"</attribute>
- <attribute name="props">
-
-
org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.transaction.TransactionInitializer
-
org.omg.PortableInterceptor.ORBInitializerClass.org.openejb.corba.security.SecurityInitializer
-
- </attribute>
</gbean>
</configuration>
Modified:
geronimo/trunk/modules/core/src/test-data/xml/deployment/connector_1_0/ra.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/core/src/test-data/xml/deployment/connector_1_0/ra.xml?view=diff&r1=158865&r2=158866
==============================================================================
---
geronimo/trunk/modules/core/src/test-data/xml/deployment/connector_1_0/ra.xml
(original)
+++
geronimo/trunk/modules/core/src/test-data/xml/deployment/connector_1_0/ra.xml
Wed Mar 23 18:50:15 2005
@@ -20,7 +20,7 @@
"http://java.sun.com/dtd/connector_1_0.dtd";>
<connector>
- <display-name>test 1.0 adapter spec</display-name>
+ <display-name>test 1.0 adapterHomeHomeHomeHomeHome spec</display-name>
<description>test ra.xml for jca 1.0</description>
<vendor-name>apache-geronimo</vendor-name>
Modified:
geronimo/trunk/modules/core/src/test-data/xml/deployment/connector_1_5/ra.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/core/src/test-data/xml/deployment/connector_1_5/ra.xml?view=diff&r1=158865&r2=158866
==============================================================================
---
geronimo/trunk/modules/core/src/test-data/xml/deployment/connector_1_5/ra.xml
(original)
+++
geronimo/trunk/modules/core/src/test-data/xml/deployment/connector_1_5/ra.xml
Wed Mar 23 18:50:15 2005
@@ -23,7 +23,7 @@
version="1.5">
<description>test ra.xml for jca 1.5</description>
- <display-name>test 1.5 adapter spec</display-name>
+ <display-name>test 1.5 adapterHomeHomeHomeHomeHome spec</display-name>
<vendor-name>apache-geronimo</vendor-name>
<eis-type>test</eis-type>
