geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jeremy Boynes <jboy...@apache.org>
Subject Re: svn commit: r202303 - in /geronimo/trunk/modules: connector/src/java/org/apache/geronimo/connector/outbound/ connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking/ j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/ jetty/src...
Date Wed, 29 Jun 2005 01:24:43 GMT
OpenEJB changed as well - you should build it too until the maven 
version is refreshed.

--
Jeremy

jboynes@apache.org wrote:
> Author: jboynes
> Date: Tue Jun 28 18:18:59 2005
> New Revision: 202303
> 
> URL: http://svn.apache.org/viewcvs?rev=202303&view=rev
> Log:
> fix for GERONIMO-687 bad name for ConnectionTracker
> 
> Modified:
>     geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java
>     geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java
>     geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
>     geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
> 
> Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java?rev=202303&r1=202302&r2=202303&view=diff
> ==============================================================================
> --- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java
(original)
> +++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/GenericConnectionManager.java
Tue Jun 28 18:18:59 2005
> @@ -140,7 +140,7 @@
>          infoBuilder.addAttribute("objectName", String.class, false);
>          infoBuilder.addAttribute("classLoader", ClassLoader.class, false);
>  
> -        infoBuilder.addReference("ConnectionTracker", ConnectionTracker.class, NameFactory.JCA_RESOURCE);
> +        infoBuilder.addReference("ConnectionTracker", ConnectionTracker.class, NameFactory.JCA_CONNECTION_TRACKER);
>          infoBuilder.addReference("RealmBridge", RealmBridge.class, NameFactory.GERONIMO_SERVICE);
>          infoBuilder.addReference("TransactionContextManager", TransactionContextManager.class,
NameFactory.JTA_RESOURCE);
>  
> 
> Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java?rev=202303&r1=202302&r2=202303&view=diff
> ==============================================================================
> --- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java
(original)
> +++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/connectiontracking/ConnectionTrackingCoordinator.java
Tue Jun 28 18:18:59 2005
> @@ -146,7 +146,7 @@
>      }
>  
>      static {
> -        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(ConnectionTrackingCoordinator.class,
NameFactory.JCA_RESOURCE);
> +        GBeanInfoBuilder infoFactory = new GBeanInfoBuilder(ConnectionTrackingCoordinator.class,
NameFactory.JCA_CONNECTION_TRACKER);
>          infoFactory.addInterface(TrackedConnectionAssociator.class);
>          infoFactory.addInterface(ConnectionTracker.class);
>          GBEAN_INFO = infoFactory.getBeanInfo();
> 
> Modified: geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java?rev=202303&r1=202302&r2=202303&view=diff
> ==============================================================================
> --- geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
(original)
> +++ geronimo/trunk/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
Tue Jun 28 18:18:59 2005
> @@ -52,6 +52,7 @@
>      public static String JAVA_MAIL_RESOURCE = "JavaMailResource";
>      public static String JCA_RESOURCE = "JCAResource";
>      public static String JCA_CONNECTION_FACTORY = "JCAConnectionFactory";
> +    public static String JCA_CONNECTION_TRACKER = "JCAConnectionTracker";
>      public static String JCA_MANAGED_CONNECTION_FACTORY = "JCAManagedConnectionFactory";
>      public static String JDBC_RESOURCE = "JDBCResource";
>      public static String JDBC_DATASOURCE = "JDBCDataSource";
> 
> Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java?rev=202303&r1=202302&r2=202303&view=diff
> ==============================================================================
> --- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
(original)
> +++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
Tue Jun 28 18:18:59 2005
> @@ -515,7 +515,7 @@
>          infoBuilder.addAttribute("contextPath", String.class, true);
>  
>          infoBuilder.addReference("TransactionContextManager", TransactionContextManager.class,
NameFactory.JTA_RESOURCE);
> -        infoBuilder.addReference("TrackedConnectionAssociator", TrackedConnectionAssociator.class,
NameFactory.JCA_RESOURCE);
> +        infoBuilder.addReference("TrackedConnectionAssociator", TrackedConnectionAssociator.class,
NameFactory.JCA_CONNECTION_TRACKER);
>          infoBuilder.addReference("JettyContainer", JettyContainer.class, NameFactory.GERONIMO_SERVICE);
>          infoBuilder.addReference("RoleDesignateSource", RoleDesignateSource.class, NameFactory.JACC_MANAGER);
>  
> 
> 


Mime
View raw message