geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: incubator-geronimo/modules/assembly/src/plan j2ee-server-plan.xml
Date Tue, 15 Jun 2004 21:37:39 GMT
dain        2004/06/15 14:37:39

  Modified:    modules/jetty/src/test/org/apache/geronimo/jetty
                        ApplicationTest.java
               modules/deployment/src/test-resources/etc
                        bootstrapped-service.xml
               modules/connector/src/test-data/connector_1_5
                        geronimo-ra.xml
               modules/connector/src/etc/META-INF geronimo-service.xml
               modules/assembly/src/plan j2ee-server-plan.xml
  Log:
  Updated to 77 object name geronimo.server:j2eeType=JCAManagedConnectionFactory,name=MyName
  
  Revision  Changes    Path
  1.11      +3 -6      incubator-geronimo/modules/jetty/src/test/org/apache/geronimo/jetty/ApplicationTest.java
  
  Index: ApplicationTest.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/test/org/apache/geronimo/jetty/ApplicationTest.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ApplicationTest.java	11 Jun 2004 19:18:21 -0000	1.10
  +++ ApplicationTest.java	15 Jun 2004 21:37:39 -0000	1.11
  @@ -23,9 +23,8 @@
   import java.net.URI;
   import java.net.URL;
   import java.util.Collections;
  -import java.util.Set;
   import java.util.HashSet;
  -
  +import java.util.Set;
   import javax.management.MBeanServer;
   import javax.management.ObjectName;
   
  @@ -38,8 +37,6 @@
   import org.apache.geronimo.transaction.UserTransactionImpl;
   
   /**
  - *
  - *
    * @version $Revision$ $Date$
    */
   public class ApplicationTest extends TestCase {
  @@ -112,7 +109,7 @@
   
           tm = new GBeanMBean(GeronimoTransactionManager.GBEAN_INFO);
           Set patterns = new HashSet();
  -        patterns.add(ObjectName.getInstance("geronimo.management:J2eeType=ManagedConnectionFactory,*"));
  +        patterns.add(ObjectName.getInstance("geronimo.server:j2eeType=JCAManagedConnectionFactory,*"));
           tm.setReferencePatterns("resourceManagers", patterns);
           start(tmName, tm);
           ctc = new GBeanMBean(ConnectionTrackingCoordinator.GBEAN_INFO);
  
  
  
  1.12      +1 -1      incubator-geronimo/modules/deployment/src/test-resources/etc/bootstrapped-service.xml
  
  Index: bootstrapped-service.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/deployment/src/test-resources/etc/bootstrapped-service.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- bootstrapped-service.xml	5 Jun 2004 01:40:09 -0000	1.11
  +++ bootstrapped-service.xml	15 Jun 2004 21:37:39 -0000	1.12
  @@ -78,7 +78,7 @@
   
       <gbean class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator"
objectName="geronimo.connector:service=ConnectionTrackingCoordinator"/>
   
  -    <gbean class="org.apache.geronimo.connector.outbound.ConnectionManagerDeployment"
objectName="geronimo.management:j2eeType=ConnectionManager,name=test">
  +    <gbean class="org.apache.geronimo.connector.outbound.ConnectionManagerDeployment"
objectName="geronimo.server:j2eeType=ConnectionManager,name=test">
           <default attribute="UseConnectionRequestInfo" type="boolean">false</default>
           <default attribute="UseSubject" type="boolean">false</default>
           <default attribute="UseTransactionCaching" type="boolean">true</default>
  
  
  
  1.17      +1 -1      incubator-geronimo/modules/connector/src/test-data/connector_1_5/geronimo-ra.xml
  
  Index: geronimo-ra.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/test-data/connector_1_5/geronimo-ra.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- geronimo-ra.xml	15 Jun 2004 03:00:37 -0000	1.16
  +++ geronimo-ra.xml	15 Jun 2004 21:37:39 -0000	1.17
  @@ -121,7 +121,7 @@
   
       <gbean name="geronimo.server:type=TransactionManager" class="org.apache.geronimo.transaction.GeronimoTransactionManager">
           <references name="resourceManagers">
  -            <pattern>geronimo.management:J2eeType=ManagedConnectionFactory,*</pattern>
  +            <pattern>geronimo.server:j2eeType=JCAManagedConnectionFactory,*</pattern>
               <pattern>geronimo.server:j2eeType=MessageDrivenBean,*</pattern>
           </references>
       </gbean>
  
  
  
  1.7       +10 -10    incubator-geronimo/modules/connector/src/etc/META-INF/geronimo-service.xml
  
  Index: geronimo-service.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/etc/META-INF/geronimo-service.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- geronimo-service.xml	10 Mar 2004 09:58:31 -0000	1.6
  +++ geronimo-service.xml	15 Jun 2004 21:37:39 -0000	1.7
  @@ -15,7 +15,7 @@
       See the License for the specific language governing permissions and
       limitations under the License.
   -->
  -  
  +
   <gbeans>
       <path>geronimo-connector-DEV.jar</path>
       <path>geronimo-spec-j2ee-connector-DEV.jar</path>
  @@ -45,7 +45,7 @@
       <gbean class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator"
objectName="geronimo.connector:service=ConnectionTrackingCoordinator"/>
   
       <!-- test to see if ConnectionManagerDeployment actually deploys.  Normally set
up by deployer. -->
  -    <!--gbean class="org.apache.geronimo.connector.outbound.ConnectionManagerDeployment"
objectName="geronimo.management:j2eeType=ConnectionManager,name=test">
  +    <!--gbean class="org.apache.geronimo.connector.outbound.ConnectionManagerDeployment"
objectName="geronimo.server:j2eeType=ConnectionManager,name=test">
           <default attribute="UseConnectionRequestInfo" type="boolean">false</default>
           <default attribute="UseSubject" type="boolean">false</default>
           <default attribute="UseTransactionCaching" type="boolean">true</default>
  @@ -64,12 +64,12 @@
               <pattern>geronimo.boot:role=Kernel</pattern>
           </endpoint>
       </gbean-->
  -<!--
  -    <gbean class="org.apache.geronimo.connector.deployment.ConnectorDeployer" objectName="geronimo.deployment:type=connector">
  -        <default attribute="ConnectionTrackerNamePattern" type="javax.management.ObjectName">geronimo.connector:service=ConnectionTrackingCoordinator</default>
  -        <endpoint name="ParserFactory">
  -            <pattern>geronimo.system:type=ParserFactory</pattern>
  -        </endpoint>
  -    </gbean>
  --->
  +    <!--
  +        <gbean class="org.apache.geronimo.connector.deployment.ConnectorDeployer" objectName="geronimo.deployment:type=connector">
  +            <default attribute="ConnectionTrackerNamePattern" type="javax.management.ObjectName">geronimo.connector:service=ConnectionTrackingCoordinator</default>
  +            <endpoint name="ParserFactory">
  +                <pattern>geronimo.system:type=ParserFactory</pattern>
  +            </endpoint>
  +        </gbean>
  +    -->
   </gbeans>
  
  
  
  1.26      +1 -1      incubator-geronimo/modules/assembly/src/plan/j2ee-server-plan.xml
  
  Index: j2ee-server-plan.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/src/plan/j2ee-server-plan.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- j2ee-server-plan.xml	14 Jun 2004 17:12:58 -0000	1.25
  +++ j2ee-server-plan.xml	15 Jun 2004 21:37:39 -0000	1.26
  @@ -124,7 +124,7 @@
   
       <gbean name="geronimo.server:type=TransactionManager" class="org.apache.geronimo.transaction.GeronimoTransactionManager">
           <references name="resourceManagers">
  -            <pattern>geronimo.management:J2eeType=ManagedConnectionFactory,*</pattern>
  +            <pattern>geronimo.server:j2eeType=JCAManagedConnectionFactory,*</pattern>
               <pattern>geronimo.server:j2eeType=MessageDrivenBean,*</pattern>
           </references>
       </gbean>
  
  
  

Mime
View raw message