geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r371779 - in /geronimo/trunk/modules: connector/src/java/org/apache/geronimo/connector/ management/src/java/org/apache/geronimo/management/geronimo/
Date Tue, 24 Jan 2006 02:38:47 GMT
Author: ammulder
Date: Mon Jan 23 18:38:42 2006
New Revision: 371779

URL: http://svn.apache.org/viewcvs?rev=371779&view=rev
Log:
Merge JCAResourceAdapter change from branch

Added:
    geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/JCAResource.java
  (props changed)
      - copied unchanged from r371778, geronimo/branches/1.0/modules/management/src/java/org/apache/geronimo/management/geronimo/JCAResource.java
Modified:
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/JCAResourceImpl.java
    geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/JCAResourceImplGBean.java

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/JCAResourceImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/JCAResourceImpl.java?rev=371779&r1=371778&r2=371779&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/JCAResourceImpl.java
(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/JCAResourceImpl.java
Mon Jan 23 18:38:42 2006
@@ -25,7 +25,7 @@
 import org.apache.geronimo.j2ee.management.impl.Util;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.jmx.JMXUtil;
-import org.apache.geronimo.management.JCAResource;
+import org.apache.geronimo.management.geronimo.JCAResource;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/JCAResourceImplGBean.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/JCAResourceImplGBean.java?rev=371779&r1=371778&r2=371779&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/JCAResourceImplGBean.java
(original)
+++ geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/JCAResourceImplGBean.java
Mon Jan 23 18:38:42 2006
@@ -21,7 +21,7 @@
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.management.JCAResource;
+import org.apache.geronimo.management.geronimo.JCAResource;
 
 public class JCAResourceImplGBean {
 

Propchange: geronimo/trunk/modules/management/src/java/org/apache/geronimo/management/geronimo/JCAResource.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message