[jboss-cvs] JBossAS SVN: r110976 - in projects/jboss-jca/trunk/rhq/src: main/java/org/jboss/jca/rhq/util and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Mar 20 23:57:24 EDT 2011
Author: jeff.zhang
Date: 2011-03-20 23:57:23 -0400 (Sun, 20 Mar 2011)
New Revision: 110976
Added:
projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/Lifecycle.java
projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/util/ContainerHelper.java
projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/embed/
projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/embed/core/
projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/embed/core/EmbeddedJcaDiscover.java
projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/embed/core/package.html
Removed:
projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/core/EmbeddedJcaDiscover.java
projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/core/package.html
Modified:
projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/Discover.java
projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/IronJacamarPluginLifecyleListener.java
projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/ManagementRepositoryManager.java
projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java
Log:
[JBJCA-522] implements PluginLifecycleListener to control container start and stop
Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/Discover.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/Discover.java 2011-03-19 04:08:25 UTC (rev 110975)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/Discover.java 2011-03-21 03:57:23 UTC (rev 110976)
@@ -31,11 +31,21 @@
*/
public interface Discover
{
+ /** embedded */
+ public static final String EMBEDDED = "embedded";
+
/**
* Get a management repository instance
*
* @return ManagementRepository
*/
public ManagementRepository getManagementRepository();
+
+ /**
+ * Get plugin environment
+ *
+ * @return String in which container
+ */
+ public String getPluginEnv();
}
Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/IronJacamarPluginLifecyleListener.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/IronJacamarPluginLifecyleListener.java 2011-03-19 04:08:25 UTC (rev 110975)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/IronJacamarPluginLifecyleListener.java 2011-03-21 03:57:23 UTC (rev 110976)
@@ -21,6 +21,10 @@
*/
package org.jboss.jca.rhq.core;
+import org.jboss.jca.rhq.util.ContainerHelper;
+
+import org.jboss.logging.Logger;
+
import org.rhq.core.pluginapi.plugin.PluginContext;
import org.rhq.core.pluginapi.plugin.PluginLifecycleListener;
@@ -32,21 +36,35 @@
*/
public class IronJacamarPluginLifecyleListener implements PluginLifecycleListener
{
+ /** log */
+ private static final Logger logger = Logger.getLogger(IronJacamarPluginLifecyleListener.class);
/**
* initialize
*
* @param context PluginContext
* @throws Exception exception
*/
+ @Override
public void initialize(PluginContext context) throws Exception
{
+ if (ContainerHelper.useEmbeddedJCA())
+ {
+ ((Lifecycle)ContainerHelper.getEmbeddedDiscover()).start();
+ }
+ logger.info("IronJacamarPlugin started");
}
/**
* shutdown
*/
+ @Override
public void shutdown()
{
+ if (ContainerHelper.useEmbeddedJCA())
+ {
+ ((Lifecycle)ContainerHelper.getEmbeddedDiscover()).stop();
+ }
+ logger.info("IronJacamarPlugin stoped");
}
}
Added: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/Lifecycle.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/Lifecycle.java (rev 0)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/Lifecycle.java 2011-03-21 03:57:23 UTC (rev 110976)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.rhq.core;
+
+/**
+ * lifecycle interface of jca contaner
+ *
+ * @author <a href="mailto:jeff.zhang at jboss.org">Jeff Zhang</a>
+ */
+public interface Lifecycle
+{
+ /**
+ * start jca container
+ */
+ public void start();
+
+ /**
+ * stop the embedded jca container.
+ */
+ public void stop();
+
+}
Modified: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/ManagementRepositoryManager.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/ManagementRepositoryManager.java 2011-03-19 04:08:25 UTC (rev 110975)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/core/ManagementRepositoryManager.java 2011-03-21 03:57:23 UTC (rev 110976)
@@ -22,9 +22,8 @@
package org.jboss.jca.rhq.core;
import org.jboss.jca.core.api.management.ManagementRepository;
+import org.jboss.jca.rhq.util.ContainerHelper;
-import java.lang.reflect.Method;
-
/**
* ManagementRepositoryManager
*
@@ -39,19 +38,11 @@
*/
public static ManagementRepository getManagementRepository()
{
- //currently use embedded JCA
- String jcaClass = ManagementRepositoryManager.class.getPackage().getName() + ".EmbeddedJcaDiscover";
- try
+ if (ContainerHelper.useEmbeddedJCA())
{
- Class<?> cls = Class.forName (jcaClass);
- Method method = cls.getMethod ("getInstance");
- Discover discover = (Discover)method.invoke(cls, (Object[])null);
- return discover.getManagementRepository();
+ return ((Discover)ContainerHelper.getEmbeddedDiscover()).getManagementRepository();
}
- catch (Exception e)
- {
- e.printStackTrace();
- }
+
return null;
}
Added: projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/util/ContainerHelper.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/util/ContainerHelper.java (rev 0)
+++ projects/jboss-jca/trunk/rhq/src/main/java/org/jboss/jca/rhq/util/ContainerHelper.java 2011-03-21 03:57:23 UTC (rev 110976)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.rhq.util;
+
+import java.lang.reflect.Method;
+
+
+/**
+ * Helper class for embedded container
+ *
+ * @author <a href="mailto:jeff.zhang at jboss.org">Jeff Zhang</a>
+ */
+public class ContainerHelper
+{
+ /** EmbedDiscoverClassName */
+ private static final String EmbedDiscoverClassName = "org.jboss.jca.rhq.embed.core.EmbeddedJcaDiscover";
+
+ /**
+ * get discover object of embedded JCA container
+ *
+ * @return boolean
+ */
+ public static Object getEmbeddedDiscover()
+ {
+ try
+ {
+ Class<?> cls = Class.forName (EmbedDiscoverClassName);
+ Method method = cls.getMethod ("getInstance");
+ Object discoverObject = method.invoke(cls, (Object[])null);
+ return discoverObject;
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ /**
+ * use embedded JCA container
+ *
+ * @return boolean
+ */
+ public static boolean useEmbeddedJCA()
+ {
+ try
+ {
+ Class.forName(EmbedDiscoverClassName);
+ }
+ catch (ClassNotFoundException cnfe)
+ {
+ return false;
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ return false;
+ }
+ return true;
+ }
+
+}
Deleted: projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/core/EmbeddedJcaDiscover.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/core/EmbeddedJcaDiscover.java 2011-03-19 04:08:25 UTC (rev 110975)
+++ projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/core/EmbeddedJcaDiscover.java 2011-03-21 03:57:23 UTC (rev 110976)
@@ -1,216 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2011, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jca.rhq.core;
-
-import org.jboss.jca.core.api.management.ManagementRepository;
-
-import org.jboss.jca.embedded.Embedded;
-import org.jboss.jca.embedded.EmbeddedFactory;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import org.jboss.logging.Logger;
-
-/**
- * EmbeddedJcaDiscover
- * Discover implement by embedded JCA
- *
- * @author <a href="mailto:lgao at redhat.com">Lin Gao</a>
- * @author <a href="mailto:jeff.zhang at jboss.org">Jeff Zhang</a>
- */
-public class EmbeddedJcaDiscover implements Discover
-{
- /** log */
- private static final Logger logger = Logger.getLogger(EmbeddedJcaDiscover.class);
-
- /** instance of EmbeddedRHQ */
- private static EmbeddedJcaDiscover instance;
-
- /** embedJCA */
- private Embedded embedJCA;
-
- /** stopped */
- private boolean stopped = true;
-
- /** ManagementRepository */
- ManagementRepository mr = null;
-
- /**
- * singleton getInstance
- *
- * @return EmbeddedJCAContainer EmbeddedJCAContainer
- */
- public static synchronized EmbeddedJcaDiscover getInstance()
- {
- if (null == instance)
- {
- instance = new EmbeddedJcaDiscover();
- }
- return instance;
- }
-
- /**
- * default constructor
- */
- private EmbeddedJcaDiscover()
- {
- }
-
- /**
- * start jca container
- */
- public void start()
- {
- try
- {
- embedJCA = EmbeddedFactory.create(true);
- embedJCA.startup();
- logger.info("embedded JCA container started");
-
- //embedJCA.deploy(EmbeddedJcaDiscover.class.getResource("h2-ds.xml"));
-
- deployFile("/xa.rar");
- logger.debug("xa.rar deployed");
-
- stopped = false;
- }
- catch (Throwable e)
- {
- throw new IllegalStateException("Something wrong when starting Embedded JCA container", e);
- }
-
- }
-
- /**
- * deploy file into container
- *
- * @param fileName file name
- */
- private void deployFile(String fileName)
- {
- URL url = EmbeddedJcaDiscover.class.getResource(fileName);
- try
- {
- String tmpPath = System.getProperty("java.io.tmpdir");
- File outputFile = new File(tmpPath, fileName);
- copyURLToFile(url, outputFile);
- URL finalURL = outputFile.toURI().toURL();
- embedJCA.deploy(finalURL);
- outputFile.deleteOnExit();
- }
- catch (Throwable e)
- {
- throw new IllegalStateException("Can not deploy resource: " + url, e);
- }
- }
-
- /**
- * copyURLToFile
- * @param url URL
- * @param outputFile File
- * @throws Exception
- */
- private void copyURLToFile(URL url, File outputFile) throws Exception
- {
- InputStream from = null;
- FileOutputStream to = null;
- try
- {
- from = url.openStream();
- to = new FileOutputStream(outputFile);
- byte[] buffer = new byte[4096];
- int bytesRead;
-
- while ((bytesRead = from.read(buffer)) != -1)
- to.write(buffer, 0, bytesRead);
- }
- finally
- {
- if (from != null)
- try
- {
- from.close();
- }
- catch (IOException e)
- {
- ;
- }
- if (to != null)
- try
- {
- to.close();
- }
- catch (IOException e)
- {
- ;
- }
- }
- }
-
- /**
- * getManagementRepository
- *
- * @return ManagementRepository
- */
- @Override
- public synchronized ManagementRepository getManagementRepository()
- {
- if (mr != null)
- return mr;
-
- try
- {
- if (stopped)
- {
- start();
- if (stopped)
- throw new IllegalStateException("Container is stopped");
- }
- mr = embedJCA.lookup("ManagementRepository", ManagementRepository.class);
- return mr;
- }
- catch (Throwable e)
- {
- throw new IllegalStateException("Can not get the beanManagementRepository", e);
- }
- }
-
- /**
- * stop the embedded jca container.
- */
- public void stop()
- {
- try
- {
- embedJCA.shutdown();
- stopped = true;
- }
- catch (Throwable e)
- {
- throw new IllegalStateException("Can not shutdown the Embedded JCA container", e);
- }
- }
-}
Deleted: projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/core/package.html
===================================================================
--- projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/core/package.html 2011-03-19 04:08:25 UTC (rev 110975)
+++ projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/core/package.html 2011-03-21 03:57:23 UTC (rev 110976)
@@ -1,3 +0,0 @@
-<body>
-IronJacamar RHQ test.
-</body>
Copied: projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/embed/core/EmbeddedJcaDiscover.java (from rev 110975, projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/core/EmbeddedJcaDiscover.java)
===================================================================
--- projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/embed/core/EmbeddedJcaDiscover.java (rev 0)
+++ projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/embed/core/EmbeddedJcaDiscover.java 2011-03-21 03:57:23 UTC (rev 110976)
@@ -0,0 +1,229 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.rhq.embed.core;
+
+import org.jboss.jca.core.api.management.ManagementRepository;
+
+import org.jboss.jca.embedded.Embedded;
+import org.jboss.jca.embedded.EmbeddedFactory;
+import org.jboss.jca.rhq.core.Discover;
+import org.jboss.jca.rhq.core.Lifecycle;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+import org.jboss.logging.Logger;
+
+/**
+ * EmbeddedJcaDiscover
+ * Discover implement by embedded JCA
+ *
+ * @author <a href="mailto:lgao at redhat.com">Lin Gao</a>
+ * @author <a href="mailto:jeff.zhang at jboss.org">Jeff Zhang</a>
+ */
+public class EmbeddedJcaDiscover implements Discover, Lifecycle
+{
+ /** log */
+ private static final Logger logger = Logger.getLogger(EmbeddedJcaDiscover.class);
+
+ /** instance of EmbeddedRHQ */
+ private static EmbeddedJcaDiscover instance;
+
+ /** embedJCA */
+ private Embedded embedJCA;
+
+ /** stopped */
+ private boolean stopped = true;
+
+ /** ManagementRepository */
+ ManagementRepository mr = null;
+
+ /**
+ * singleton getInstance
+ *
+ * @return EmbeddedJCAContainer EmbeddedJCAContainer
+ */
+ public static synchronized EmbeddedJcaDiscover getInstance()
+ {
+ if (null == instance)
+ {
+ instance = new EmbeddedJcaDiscover();
+ }
+ return instance;
+ }
+
+ /**
+ * default constructor
+ */
+ private EmbeddedJcaDiscover()
+ {
+ }
+
+ /**
+ * start jca container
+ */
+ @Override
+ public void start()
+ {
+ try
+ {
+ embedJCA = EmbeddedFactory.create(true);
+ embedJCA.startup();
+ logger.info("embedded JCA container started");
+
+ //embedJCA.deploy(EmbeddedJcaDiscover.class.getResource("h2-ds.xml"));
+
+ deployFile("/xa.rar");
+ logger.debug("xa.rar deployed");
+
+ stopped = false;
+ }
+ catch (Throwable e)
+ {
+ throw new IllegalStateException("Something wrong when starting Embedded JCA container", e);
+ }
+
+ }
+
+ /**
+ * deploy file into container
+ *
+ * @param fileName file name
+ */
+ private void deployFile(String fileName)
+ {
+ URL url = EmbeddedJcaDiscover.class.getResource(fileName);
+ try
+ {
+ String tmpPath = System.getProperty("java.io.tmpdir");
+ File outputFile = new File(tmpPath, fileName);
+ copyURLToFile(url, outputFile);
+ URL finalURL = outputFile.toURI().toURL();
+ embedJCA.deploy(finalURL);
+ outputFile.deleteOnExit();
+ }
+ catch (Throwable e)
+ {
+ throw new IllegalStateException("Can not deploy resource: " + url, e);
+ }
+ }
+
+ /**
+ * copyURLToFile
+ * @param url URL
+ * @param outputFile File
+ * @throws Exception
+ */
+ private void copyURLToFile(URL url, File outputFile) throws Exception
+ {
+ InputStream from = null;
+ FileOutputStream to = null;
+ try
+ {
+ from = url.openStream();
+ to = new FileOutputStream(outputFile);
+ byte[] buffer = new byte[4096];
+ int bytesRead;
+
+ while ((bytesRead = from.read(buffer)) != -1)
+ to.write(buffer, 0, bytesRead);
+ }
+ finally
+ {
+ if (from != null)
+ try
+ {
+ from.close();
+ }
+ catch (IOException e)
+ {
+ ;
+ }
+ if (to != null)
+ try
+ {
+ to.close();
+ }
+ catch (IOException e)
+ {
+ ;
+ }
+ }
+ }
+
+ /**
+ * getManagementRepository
+ *
+ * @return ManagementRepository
+ */
+ @Override
+ public synchronized ManagementRepository getManagementRepository()
+ {
+ if (mr != null)
+ return mr;
+
+ try
+ {
+ if (stopped)
+ {
+ return null;
+ }
+ mr = embedJCA.lookup("ManagementRepository", ManagementRepository.class);
+ return mr;
+ }
+ catch (Throwable e)
+ {
+ throw new IllegalStateException("Can not get the beanManagementRepository", e);
+ }
+ }
+
+ /**
+ * stop the embedded jca container.
+ */
+ @Override
+ public void stop()
+ {
+ try
+ {
+ embedJCA.shutdown();
+ mr = null;
+ stopped = true;
+ }
+ catch (Throwable e)
+ {
+ throw new IllegalStateException("Can not shutdown the Embedded JCA container", e);
+ }
+ }
+ /**
+ * Get plugin environment
+ *
+ * @return String in which container
+ */
+ @Override
+ public String getPluginEnv()
+ {
+ return Discover.EMBEDDED;
+ }
+}
Copied: projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/embed/core/package.html (from rev 110975, projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/core/package.html)
===================================================================
--- projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/embed/core/package.html (rev 0)
+++ projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/embed/core/package.html 2011-03-21 03:57:23 UTC (rev 110976)
@@ -0,0 +1,3 @@
+<body>
+IronJacamar RHQ test.
+</body>
Modified: projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java
===================================================================
--- projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java 2011-03-19 04:08:25 UTC (rev 110975)
+++ projects/jboss-jca/trunk/rhq/src/test/java/org/jboss/jca/rhq/test/XATestCase.java 2011-03-21 03:57:23 UTC (rev 110976)
@@ -29,8 +29,9 @@
import org.jboss.jca.core.api.management.ManagedConnectionFactory;
import org.jboss.jca.core.api.management.ManagementRepository;
import org.jboss.jca.core.api.management.ResourceAdapter;
-import org.jboss.jca.rhq.core.EmbeddedJcaDiscover;
+
import org.jboss.jca.rhq.core.ManagementRepositoryManager;
+import org.jboss.jca.rhq.embed.core.EmbeddedJcaDiscover;
import org.jboss.jca.rhq.rar.xa.XAAdminObjectImpl;
import org.jboss.jca.rhq.rar.xa.XAManagedConnectionFactory;
import org.jboss.jca.rhq.rar.xa.XAResourceAdapter;
More information about the jboss-cvs-commits
mailing list