[jboss-cvs] JBossAS SVN: r93435 - in projects/jboss-jca/trunk: embedded/src/main/java/org/jboss/jca/embedded and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 11 16:59:58 EDT 2009
Author: jesper.pedersen
Date: 2009-09-11 16:59:57 -0400 (Fri, 11 Sep 2009)
New Revision: 93435
Added:
projects/jboss-jca/trunk/core/src/test/resources/logging.properties
Modified:
projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java
projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployer.java
projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployerMBean.java
Log:
[JBJCA-166] Add undeploy to MainDeployer
Added: projects/jboss-jca/trunk/core/src/test/resources/logging.properties
===================================================================
--- projects/jboss-jca/trunk/core/src/test/resources/logging.properties (rev 0)
+++ projects/jboss-jca/trunk/core/src/test/resources/logging.properties 2009-09-11 20:59:57 UTC (rev 93435)
@@ -0,0 +1,62 @@
+#
+# JBoss, Home of Professional Open Source.
+# Copyright 2009, 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.
+#
+
+### $Id: $ ###
+
+# Additional logger names to configure (root logger is always configured)
+loggers=org.jboss.jca,org.jboss,org.jnp,com.arjuna
+
+# Root logger level
+logger.level=${jboss.jca.log.level:INFO}
+logger.handlers=CONSOLE, FILE
+
+# org.jboss.jca
+logger.org.jboss.jca.level=DEBUG
+
+# org.jboss
+logger.org.jboss.level=INFO
+
+# org.jnp
+logger.org.jnp.level=INFO
+
+# com.arjuna
+logger.com.arjuna.level=INFO
+
+# Console handler configuration
+handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
+handler.CONSOLE.properties=autoFlush
+handler.CONSOLE.level=${jboss.jca.log.console.level:INFO}
+handler.CONSOLE.autoFlush=true
+handler.CONSOLE.formatter=PATTERN
+
+# File handler configuration
+handler.FILE=org.jboss.logmanager.handlers.FileHandler
+handler.FILE.level=${jboss.jca.log.file.level:DEBUG}
+handler.FILE.properties=autoFlush,fileName
+handler.FILE.autoFlush=true
+handler.FILE.fileName=${test.dir}/test.log
+handler.FILE.formatter=PATTERN
+
+# Formatter pattern configuration
+formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
+formatter.PATTERN.properties=pattern
+formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n
Modified: projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java
===================================================================
--- projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java 2009-09-11 19:50:36 UTC (rev 93434)
+++ projects/jboss-jca/trunk/embedded/src/main/java/org/jboss/jca/embedded/EmbeddedJCA.java 2009-09-11 20:59:57 UTC (rev 93435)
@@ -163,6 +163,7 @@
if (url == null)
throw new IllegalArgumentException("Url is null");
+ kernel.getMainDeployer().undeploy(url);
}
/**
@@ -179,6 +180,8 @@
if (name == null)
throw new IllegalArgumentException("Name is null");
+ URL url = cl.getResource(name);
+ kernel.getMainDeployer().undeploy(url);
}
/**
@@ -190,5 +193,11 @@
{
if (clz == null)
throw new IllegalArgumentException("Clz is null");
+
+ String name = clz.getName().replace('.', '/');
+ name += "-jboss-beans.xml";
+
+ URL url = clz.getClassLoader().getResource(name);
+ kernel.getMainDeployer().undeploy(url);
}
}
Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployer.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployer.java 2009-09-11 19:50:36 UTC (rev 93434)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployer.java 2009-09-11 20:59:57 UTC (rev 93435)
@@ -100,6 +100,26 @@
}
/**
+ * Undeploy
+ * @param url The URL for the deployment
+ * @exception Throwable If an error occurs
+ */
+ public synchronized void undeploy(URL url) throws Throwable
+ {
+ undeploy(url, kernel.getKernelClassLoader());
+ }
+
+ /**
+ * Undeploy
+ * @param url The URL for the deployment
+ * @param classLoader The class loader
+ * @exception Throwable If an error occurs
+ */
+ public synchronized void undeploy(URL url, ClassLoader classLoader) throws Throwable
+ {
+ }
+
+ /**
* Init logging
*/
private static void initLogging()
Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployerMBean.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployerMBean.java 2009-09-11 19:50:36 UTC (rev 93434)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployerMBean.java 2009-09-11 20:59:57 UTC (rev 93435)
@@ -36,4 +36,11 @@
* @exception Throwable If an error occurs
*/
public void deploy(URL url) throws Throwable;
+
+ /**
+ * Undeploy
+ * @param url The URL for the deployment
+ * @exception Throwable If an error occurs
+ */
+ public void undeploy(URL url) throws Throwable;
}
More information about the jboss-cvs-commits
mailing list