You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/04/17 17:11:54 UTC
svn commit: r1327133 - in /openejb/trunk/openejb/container/openejb-core/src/main: java/org/apache/openejb/assembler/ java/org/apache/openejb/assembler/classic/ java/org/apache/openejb/monitoring/ java/org/apache/openejb/resource/jdbc/ resources/META-INF/

Author: rmannibucau
Date: Tue Apr 17 15:11:52 2012
New Revision: 1327133

URL: http://svn.apache.org/viewvc?rev=1327133&view=rev
Log:
refactoring to respect dependency

Removed:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/JMXDeployer.java
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/monitoring/JMXBasicDataSource.java
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/monitoring/JMXContainer.java
Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSource.java
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicManagedDataSource.java
    openejb/trunk/openejb/container/openejb-core/src/main/resources/META-INF/scan.xml

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1327133&r1=1327132&r2=1327133&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Tue Apr 17 15:11:52 2012
@@ -116,7 +116,7 @@ import org.apache.openejb.javaagent.Agen
 import org.apache.openejb.loader.Options;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.monitoring.DynamicMBeanWrapper;
-import org.apache.openejb.monitoring.JMXContainer;
+import org.apache.openejb.assembler.monitoring.JMXContainer;
 import org.apache.openejb.monitoring.LocalMBeanServer;
 import org.apache.openejb.monitoring.ObjectNameBuilder;
 import org.apache.openejb.persistence.JtaEntityManagerRegistry;

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSource.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSource.java?rev=1327133&r1=1327132&r2=1327133&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSource.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicDataSource.java Tue Apr 17 15:11:52 2012
@@ -25,7 +25,7 @@ import java.sql.SQLFeatureNotSupportedEx
 import java.util.Properties;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.logging.Logger;
-import org.apache.openejb.monitoring.JMXBasicDataSource;
+import org.apache.openejb.assembler.monitoring.JMXBasicDataSource;
 
 @SuppressWarnings({"UnusedDeclaration"})
 public class BasicDataSource extends org.apache.commons.dbcp.BasicDataSource {

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicManagedDataSource.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicManagedDataSource.java?rev=1327133&r1=1327132&r2=1327133&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicManagedDataSource.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/BasicManagedDataSource.java Tue Apr 17 15:11:52 2012
@@ -24,7 +24,7 @@ import java.util.concurrent.locks.Reentr
 import java.util.logging.Logger;
 import javax.sql.DataSource;
 import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.monitoring.JMXBasicDataSource;
+import org.apache.openejb.assembler.monitoring.JMXBasicDataSource;
 
 @SuppressWarnings({"UnusedDeclaration"})
 public class BasicManagedDataSource extends org.apache.commons.dbcp.managed.BasicManagedDataSource {

Modified: openejb/trunk/openejb/container/openejb-core/src/main/resources/META-INF/scan.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/resources/META-INF/scan.xml?rev=1327133&r1=1327132&r2=1327133&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/resources/META-INF/scan.xml (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/resources/META-INF/scan.xml Tue Apr 17 15:11:52 2012
@@ -19,7 +19,7 @@
 <scan>
   <classes>
     <class>org.apache.openejb.assembler.DeployerEjb</class>
-    <class>org.apache.openejb.assembler.JMXDeployer</class>
+    <class>org.apache.openejb.assembler.monitoring.JMXDeployer</class>
     <class>org.apache.openejb.assembler.classic.cmd.ConfigurationInfoEjb</class>
     <class>org.apache.openejb.bval.BeanValidationAppendixInterceptor</class>
     <class>org.apache.openejb.cdi.CdiInterceptor</class>