[jboss-cvs] JBossAS SVN: r108424 - in projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers: fungal and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 4 11:56:06 EDT 2010
Author: maeste
Date: 2010-10-04 11:56:05 -0400 (Mon, 04 Oct 2010)
New Revision: 108424
Modified:
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/CommonDeployment.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalRADeployer.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java
Log:
fixing a bug and little refactoring for AS7 deployers
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2010-10-04 15:31:21 UTC (rev 108423)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2010-10-04 15:56:05 UTC (rev 108424)
@@ -92,10 +92,10 @@
public abstract class AbstractResourceAdapterDeployer
{
/** the logger **/
- protected static final Logger log = Logger.getLogger(AbstractResourceAdapterDeployer.class);
+ protected final Logger log;
/** trace boolean check */
- protected static final boolean trace = log.isTraceEnabled();
+ protected final boolean trace;
/** boolean to set if validation is needed at class level or it should be considered already valid
* (IOW object put in repository at previous steps have been already validated at class level**/
@@ -109,10 +109,13 @@
*
* @param validateClasses validateClasses validateClasses boolean to express if this instance will
* apply validation on classes structure
+ * @param log the right log where put messages
*/
- public AbstractResourceAdapterDeployer(boolean validateClasses)
+ public AbstractResourceAdapterDeployer(boolean validateClasses, Logger log)
{
super();
+ this.log = log;
+ trace = log.isTraceEnabled();
this.validateClasses = validateClasses;
}
@@ -202,7 +205,7 @@
{
reportDirectory = getReportDirectory();
}
- if (reportDirectory.exists())
+ if (reportDirectory != null && reportDirectory.exists())
{
int lastSlashIndex = urlFileName.lastIndexOf("/");
int lastSepaIndex = urlFileName.lastIndexOf(File.separator);
@@ -608,11 +611,9 @@
* @param url url
* @param deploymentName deploymentName
* @param root root
- * @param destination destination
* @param cl cl
* @param cmd connector md
* @param ijmd ironjacamar md
- * @param deployment deployment
* @return return the exchange POJO with value useful for injection in the container (fungal or AS)
* @throws DeployException DeployException
* @throws ResourceException ResourceException
@@ -621,9 +622,9 @@
* @throws ClassNotFoundException ClassNotFoundException
* @throws Throwable Throwable
*/
- protected CommonDeployment createObjectsAndInjectValue(URL url, String deploymentName, File root,
- File destination, ClassLoader cl, Connector cmd, IronJacamar ijmd, URL deployment) throws DeployException,
- ResourceException, ValidatorException, AlreadyExistsException, ClassNotFoundException, Throwable
+ protected CommonDeployment createObjectsAndInjectValue(URL url, String deploymentName, File root, ClassLoader cl,
+ Connector cmd, IronJacamar ijmd) throws DeployException, ResourceException, ValidatorException,
+ AlreadyExistsException, ClassNotFoundException, Throwable
{
Set<Failure> failures = null;
try
@@ -1126,8 +1127,8 @@
log.debug("Activated: " + url.toExternalForm());
}
- return new CommonDeployment(url, deploymentName, activateDeployment, resourceAdapter, cfs, destination, cl,
- log, jndiNames, deployment, activateDeployment);
+ return new CommonDeployment(url, deploymentName, activateDeployment, resourceAdapter, cfs, cl, log,
+ jndiNames);
}
catch (DeployException de)
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/CommonDeployment.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/CommonDeployment.java 2010-10-04 15:31:21 UTC (rev 108423)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/CommonDeployment.java 2010-10-04 15:56:05 UTC (rev 108424)
@@ -21,7 +21,6 @@
*/
package org.jboss.jca.deployers.common;
-import java.io.File;
import java.net.URL;
import java.util.Arrays;
@@ -49,18 +48,12 @@
private final Object[] cfs;
- private final File destination;
-
private final ClassLoader cl;
private final Logger log;
private final String[] jndiNames;
- private final URL deployment;
-
- private final boolean activateDeployment2;
-
/**
* Create a new Deployment.
*
@@ -69,29 +62,23 @@
* @param activateDeployment activateDeployment
* @param resourceAdapter resourceAdapter
* @param cfs cfs
- * @param destination destination
* @param cl cl
* @param log log
* @param jndiNames jndiNames
- * @param deployment deployment
- * @param activateDeployment2 activateDeployment2
*/
- public CommonDeployment(URL url, String deploymentName, boolean activateDeployment, ResourceAdapter resourceAdapter,
- Object[] cfs, File destination, ClassLoader cl, Logger log, String[] jndiNames, URL deployment,
- boolean activateDeployment2)
+ public CommonDeployment(URL url, String deploymentName, boolean activateDeployment,
+ ResourceAdapter resourceAdapter, Object[] cfs, ClassLoader cl, Logger log, String[] jndiNames)
{
super();
this.url = url;
this.deploymentName = deploymentName;
this.activateDeployment = activateDeployment;
this.resourceAdapter = resourceAdapter;
- this.cfs = Arrays.copyOf(cfs, cfs.length);
- this.destination = destination;
+ this.cfs = cfs != null ? Arrays.copyOf(cfs, cfs.length) : null;
this.cl = cl;
this.log = log;
- this.jndiNames = Arrays.copyOf(jndiNames, jndiNames.length);;
- this.deployment = deployment;
- this.activateDeployment2 = activateDeployment2;
+ this.jndiNames = jndiNames != null ? Arrays.copyOf(jndiNames, jndiNames.length) : null;
+
}
/**
@@ -141,20 +128,10 @@
*/
public final Object[] getCfs()
{
- return Arrays.copyOf(cfs, cfs.length);
+ return cfs != null ? Arrays.copyOf(cfs, cfs.length) : null;
}
/**
- * Get the destination.
- *
- * @return the destination.
- */
- public final File getDestination()
- {
- return destination;
- }
-
- /**
* Get the cl.
*
* @return the cl.
@@ -181,27 +158,7 @@
*/
public final String[] getJndiNames()
{
- return Arrays.copyOf(jndiNames, jndiNames.length);
+ return jndiNames != null ? Arrays.copyOf(jndiNames, jndiNames.length) : null;
}
- /**
- * Get the deployment.
- *
- * @return the deployment.
- */
- public final URL getDeployment()
- {
- return deployment;
- }
-
- /**
- * Get the activateDeployment2.
- *
- * @return the activateDeployment2.
- */
- public final boolean isActivateDeployment2()
- {
- return activateDeployment2;
- }
-
}
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalRADeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalRADeployer.java 2010-10-04 15:31:21 UTC (rev 108423)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalRADeployer.java 2010-10-04 15:56:05 UTC (rev 108424)
@@ -40,6 +40,8 @@
import javax.transaction.TransactionManager;
+import org.jboss.logging.Logger;
+
import com.github.fungal.api.util.Injection;
import com.github.fungal.api.util.JarFilter;
@@ -51,15 +53,15 @@
public abstract class AbstractFungalRADeployer extends AbstractResourceAdapterDeployer
{
-
/**
* Create a new AbstractResourceAdapterDeployer.
*
* @param validateClasses boolean to express if this instance will apply validation on classes structure
+ * @param log the right log where put messages
*/
- public AbstractFungalRADeployer(boolean validateClasses)
+ public AbstractFungalRADeployer(boolean validateClasses, Logger log)
{
- super(validateClasses);
+ super(validateClasses, log);
}
/**
@@ -128,7 +130,6 @@
return list.toArray(new URL[list.size()]);
}
-
@Override
public String[] bindConnectionFactory(URL url, String deployment, Object cf) throws Throwable
{
@@ -136,13 +137,12 @@
String[] result = js.bindConnectionFactories(deployment, new Object[]{cf});
- ((RAConfiguration) getConfiguration()).getMetadataRepository().registerJndiMapping(url, cf.getClass().getName(),
- result[0]);
+ ((RAConfiguration) getConfiguration()).getMetadataRepository().registerJndiMapping(url,
+ cf.getClass().getName(), result[0]);
return result;
}
-
@Override
public String[] bindConnectionFactory(URL url, String deployment, Object cf, String jndi) throws Throwable
{
@@ -150,8 +150,8 @@
String[] result = js.bindConnectionFactories(deployment, new Object[]{cf}, new String[]{jndi});
- ((RAConfiguration) getConfiguration()).getMetadataRepository().registerJndiMapping(url, cf.getClass().getName(),
- jndi);
+ ((RAConfiguration) getConfiguration()).getMetadataRepository().registerJndiMapping(url,
+ cf.getClass().getName(), jndi);
return result;
}
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java 2010-10-04 15:31:21 UTC (rev 108423)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java 2010-10-04 15:56:05 UTC (rev 108424)
@@ -28,7 +28,6 @@
import org.jboss.jca.core.spi.mdr.MetadataRepository;
import org.jboss.jca.core.spi.naming.JndiStrategy;
import org.jboss.jca.deployers.common.CommonDeployment;
-import org.jboss.jca.validator.Failure;
import java.io.File;
import java.net.URL;
@@ -76,7 +75,7 @@
*/
public RAActivator()
{
- super(false);
+ super(false, log);
kernel = null;
enabled = true;
excludeArchives = null;
@@ -156,7 +155,8 @@
{
if (enabled)
{
- Set<URL> rarDeployments = ((RAConfiguration) getConfiguration()).getMetadataRepository().getResourceAdapters();
+ Set<URL> rarDeployments = ((RAConfiguration) getConfiguration()).getMetadataRepository()
+ .getResourceAdapters();
for (URL deployment : rarDeployments)
{
@@ -176,8 +176,8 @@
if (include)
{
- Map<String, List<String>> jndiMappings = ((RAConfiguration) getConfiguration()).getMetadataRepository()
- .getJndiMappings(deployment);
+ Map<String, List<String>> jndiMappings = ((RAConfiguration) getConfiguration())
+ .getMetadataRepository().getJndiMappings(deployment);
// If there isn't any JNDI mappings then the archive isn't active
// so activate it
@@ -242,7 +242,6 @@
*/
private Deployment deploy(URL url, ClassLoader parent) throws DeployException
{
- Set<Failure> failures = null;
log.debug("Deploying: " + url.toExternalForm());
@@ -290,7 +289,7 @@
cmd = (new Merger()).mergeConnectorWithCommonIronJacamar(ijmd, cmd);
- CommonDeployment c = createObjectsAndInjectValue(url, deploymentName, root, destination, cl, cmd, ijmd, null);
+ CommonDeployment c = createObjectsAndInjectValue(url, deploymentName, root, cl, cmd, ijmd);
JndiStrategy jndiStrategy = ((RAConfiguration) getConfiguration()).getJndiStrategy();
return new RAActivatorDeployment(c.getURL(), c.getDeploymentName(), c.getResourceAdapter(), jndiStrategy,
metadataRepository, c.getCfs(), c.getJndiNames(), c.getCl(), c.getLog());
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2010-10-04 15:31:21 UTC (rev 108423)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2010-10-04 15:56:05 UTC (rev 108424)
@@ -45,6 +45,8 @@
import java.util.List;
import java.util.Set;
+import org.jboss.logging.Logger;
+
import com.github.fungal.api.classloading.ClassLoaderFactory;
import com.github.fungal.api.classloading.KernelClassLoader;
import com.github.fungal.api.util.FileUtil;
@@ -62,12 +64,15 @@
public final class RADeployer extends AbstractFungalRADeployer implements Deployer, MultiStageDeployer, DeployerOrder
{
+ /** The logger */
+ static Logger log = Logger.getLogger(RADeployer.class);
+
/**
* Constructor
*/
public RADeployer()
{
- super(true);
+ super(true, log);
}
/**
@@ -87,7 +92,6 @@
* @return The deployment
* @exception DeployException Thrown if an error occurs during deployment
*/
- @SuppressWarnings("rawtypes")
@Override
public synchronized com.github.fungal.spi.deployers.Deployment deploy(URL url, ClassLoader parent)
throws DeployException
@@ -150,11 +154,11 @@
// Merge metadata
cmd = (new Merger()).mergeConnectorWithCommonIronJacamar(ijmd, cmd);
- CommonDeployment c = createObjectsAndInjectValue(url, deploymentName, root, destination, cl, cmd, ijmd, null);
+ CommonDeployment c = createObjectsAndInjectValue(url, deploymentName, root, cl, cmd, ijmd);
JndiStrategy jndiStrategy = ((RAConfiguration) getConfiguration()).getJndiStrategy();
MetadataRepository metadataRepository = ((RAConfiguration) getConfiguration()).getMetadataRepository();
return new RADeployment(c.getURL(), c.getDeploymentName(), c.isActivateDeployment(), c.getResourceAdapter(),
- jndiStrategy, metadataRepository, c.getCfs(), c.getJndiNames(), c.getDestination(),
+ jndiStrategy, metadataRepository, c.getCfs(), c.getJndiNames(), destination,
c.getCl(), c.getLog());
}
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java 2010-10-04 15:31:21 UTC (rev 108423)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java 2010-10-04 15:56:05 UTC (rev 108424)
@@ -103,7 +103,7 @@
*/
public RaXmlDeployer()
{
- super(false);
+ super(false, log);
}
/**
More information about the jboss-cvs-commits
mailing list