You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2004/01/05 01:00:28 UTC

cvs commit: incubator-geronimo/modules/core/src/test-data/xml/deployment/connector_1_5 ra.xml

djencks     2004/01/04 16:00:28

  Modified:    modules/core/src/test-data/xml/deployment/connector_1_0
                        ra.xml
               modules/core/src/test-data/xml/deployment/connector_1_5
                        ra.xml
  Log:
  make more compliant to grammar
  
  Revision  Changes    Path
  1.2       +8 -2      incubator-geronimo/modules/core/src/test-data/xml/deployment/connector_1_0/ra.xml
  
  Index: ra.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/test-data/xml/deployment/connector_1_0/ra.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ra.xml	11 Nov 2003 21:11:59 -0000	1.1
  +++ ra.xml	5 Jan 2004 00:00:28 -0000	1.2
  @@ -1,4 +1,7 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!DOCTYPE connector PUBLIC "-//Sun Microsystems, Inc.//DTD Connector 1.0//EN"
  +	"http://java.sun.com/dtd/connector_1_0.dtd">
  +
   <connector>
     <display-name>test 1.0 adapter spec</display-name>
     <description>test ra.xml for jca 1.0</description>
  @@ -18,13 +21,16 @@
             <config-property-name>OutboundStringProperty</config-property-name>
             <config-property-type>java.lang.String</config-property-type>
           </config-property>
  -            
  +
         <authentication-mechanism>
           <description>description</description>
           <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
           <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
         </authentication-mechanism>
         <reauthentication-support>false</reauthentication-support>
  -      <security-permission></security-permission>
  +      <security-permission>
  +          <description>test security permission</description>
  +          <security-permission-spec>org.apache.geronimo.TestSecurityPermission</security-permission-spec>
  +      </security-permission>
     </resourceadapter>
   </connector>
  
  
  
  1.2       +10 -10    incubator-geronimo/modules/core/src/test-data/xml/deployment/connector_1_5/ra.xml
  
  Index: ra.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/test-data/xml/deployment/connector_1_5/ra.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ra.xml	11 Nov 2003 21:11:59 -0000	1.1
  +++ ra.xml	5 Jan 2004 00:00:28 -0000	1.2
  @@ -1,9 +1,10 @@
   <?xml version="1.0" encoding="UTF-8"?>
  -<connector  version="1.5">
  -<!--xmlns="http://java.sun.com/xml/ns/j2ee"
  - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee file:/connector_1_5.xsd"
  --->
  +<connector xmlns="http://java.sun.com/xml/ns/j2ee"
  +  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  +  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
  +     http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
  +  version="1.5">
  +
     <description>test ra.xml for jca 1.5</description>
     <display-name>test 1.5 adapter spec</display-name>
   
  @@ -43,7 +44,7 @@
           <connectionfactory-impl-class>org.apache.geronimo.test.ConnectionFactory</connectionfactory-impl-class>
           <connection-interface>javax.resource.cci.Connection</connection-interface>
           <connection-impl-class>org.apache.geronimo.test.Connection</connection-impl-class>
  -            
  +
         </connection-definition>
         <connection-definition>
           <managedconnectionfactory-class>org.apache.geronimo.test.ManagedConnectionFactory</managedconnectionfactory-class>
  @@ -55,16 +56,15 @@
           <connectionfactory-impl-class>org.apache.geronimo.test.ConnectionFactory</connectionfactory-impl-class>
           <connection-interface>javax.resource.cci.Connection</connection-interface>
           <connection-impl-class>org.apache.geronimo.test.Connection</connection-impl-class>
  -            
  +
         </connection-definition>
  -      <transaction-support></transaction-support>
  +      <transaction-support>LocalTransaction</transaction-support>
         <authentication-mechanism>
           <description>description</description>
           <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
           <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
         </authentication-mechanism>
         <reauthentication-support>false</reauthentication-support>
  -      <security-permission></security-permission>
       </outbound-resourceadapter>
       <inbound-resourceadapter>
         <!--0 or one-->
  @@ -80,7 +80,7 @@
             </activationspec>
           </messagelistener>
         </messageadapter>
  -        
  +
       </inbound-resourceadapter>
       <adminobject>
         <adminobject-interface>org.apache.geronimo.jca.test.AdminObject</adminobject-interface>