[jboss-cvs] JBossAS SVN: r75275 - in trunk: tomcat/src/main/org/jboss/web/tomcat/service/deployers and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 1 13:25:25 EDT 2008
Author: adrian at jboss.org
Date: 2008-07-01 13:25:25 -0400 (Tue, 01 Jul 2008)
New Revision: 75275
Modified:
trunk/server/src/main/org/jboss/deployment/JBossWebAppParsingDeployer.java
trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java
Log:
[JBAS-5637] - Move all the legacy jboss-web classloading processing to the WarClassLoaderDeployer and the broken tests
Modified: trunk/server/src/main/org/jboss/deployment/JBossWebAppParsingDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossWebAppParsingDeployer.java 2008-07-01 16:57:11 UTC (rev 75274)
+++ trunk/server/src/main/org/jboss/deployment/JBossWebAppParsingDeployer.java 2008-07-01 17:25:25 UTC (rev 75275)
@@ -21,23 +21,11 @@
*/
package org.jboss.deployment;
-import java.util.Set;
-
-import javax.management.ObjectName;
-
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.metadata.common.jboss.LoaderRepositoryConfigMetaData;
-import org.jboss.metadata.common.jboss.LoaderRepositoryMetaData;
-import org.jboss.metadata.ear.jboss.JBossAppMetaData;
-import org.jboss.metadata.ear.spec.EarMetaData;
-import org.jboss.metadata.web.jboss.ClassLoadingMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.WebMetaData;
-import org.jboss.mx.loading.LoaderRepositoryFactory.LoaderRepositoryConfig;
-import org.jboss.virtual.VirtualFile;
/**
* An ObjectModelFactoryDeployer for translating jboss-web.xml descriptors into
@@ -105,32 +93,6 @@
unit.addAttachment("Raw"+JBossWebMetaData.class.getName(), metaData, JBossWebMetaData.class);
}
- @Override
- protected void init(VFSDeploymentUnit unit, JBossWebMetaData metaData, VirtualFile file) throws Exception
- {
- // Add the loader repository config
- ClassLoadingMetaData classLoading = metaData.getClassLoading();
- LoaderRepositoryMetaData lrmd = null;
- if(classLoading != null)
- lrmd = classLoading.getLoaderRepository();
- if (lrmd != null)
- {
- LoaderRepositoryConfig loaderConfig = new LoaderRepositoryConfig();
-
- loaderConfig.repositoryClassName = lrmd.getLoaderRepositoryClass();
- if(lrmd.getName() != null)
- loaderConfig.repositoryName = new ObjectName(lrmd.getName());
- Set<LoaderRepositoryConfigMetaData> configs = lrmd.getLoaderRepositoryConfig();
- if (configs != null && configs.isEmpty() == false)
- {
- LoaderRepositoryConfigMetaData config = configs.iterator().next();
- loaderConfig.configParserClassName = config.getConfigParserClass();
- loaderConfig.repositoryConfig = config.getConfig();
- }
- unit.addAttachment(LoaderRepositoryConfig.class, loaderConfig);
- }
- }
-
/**
* Make sure we always have a JBossWebMetaData object attached, even if there is no jboss-web.xml
* in the deployment
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java 2008-07-01 16:57:11 UTC (rev 75274)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java 2008-07-01 17:25:25 UTC (rev 75275)
@@ -21,10 +21,12 @@
*/
package org.jboss.web.tomcat.service.deployers;
+import java.io.ByteArrayInputStream;
import java.util.ArrayList;
import java.util.List;
+import java.util.Properties;
+import java.util.Set;
-import org.jboss.classloader.spi.ClassLoaderSystem;
import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
import org.jboss.classloading.spi.metadata.ExportAll;
import org.jboss.classloading.spi.version.Version;
@@ -32,6 +34,8 @@
import org.jboss.deployers.spi.deployer.DeploymentStages;
import org.jboss.deployers.vfs.spi.deployer.AbstractSimpleVFSRealDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.metadata.common.jboss.LoaderRepositoryConfigMetaData;
+import org.jboss.metadata.common.jboss.LoaderRepositoryMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.virtual.VirtualFile;
@@ -116,18 +120,76 @@
// Ignore if it already has classloading
if (unit.isAttachmentPresent(ClassLoadingMetaData.class))
return;
+
+ // The default domain name is the unit name
+ String domainName = unit.getName();
+ // The default classloading compliance is on the deployer
boolean j2seClassLoadingCompliance = java2ClassLoadingCompliance;
+
+ // Do we have a legacy classloading element?
org.jboss.metadata.web.jboss.ClassLoadingMetaData webCLMD = metaData.getClassLoading();
if (webCLMD != null)
- j2seClassLoadingCompliance = webCLMD.isJava2ClassLoadingCompliance();
+ {
+ // Was the complince set?
+ if (webCLMD.wasJava2ClassLoadingComplianceSet())
+ j2seClassLoadingCompliance = webCLMD.isJava2ClassLoadingCompliance();
+ // Does it have a loader repository
+ LoaderRepositoryMetaData lrmd = webCLMD.getLoaderRepository();
+ if (lrmd != null)
+ {
+ // Use the trimmed repository name as the domain
+ String repositoryName = lrmd.getName();
+ if (repositoryName != null)
+ {
+ repositoryName = repositoryName.trim();
+ if (repositoryName != null)
+ {
+ domainName = repositoryName;
+
+ // If there was no compliance set see if the loader repository has one
+ if (webCLMD.wasJava2ClassLoadingComplianceSet() == false)
+ {
+ Set<LoaderRepositoryConfigMetaData> configs = lrmd.getLoaderRepositoryConfig();
+ if (configs != null && configs.isEmpty() == false)
+ {
+ LoaderRepositoryConfigMetaData lrcmd = configs.iterator().next();
+
+ Properties props = new Properties();
+ String config = lrcmd.getConfig();
+ try
+ {
+ if (config != null)
+ {
+ ByteArrayInputStream bais = new ByteArrayInputStream(config.getBytes());
+ props.load(bais);
+ }
+ }
+ catch (Exception e)
+ {
+ throw DeploymentException.rethrowAsDeploymentException("Error parsing repository config " + config, e);
+ }
+ String java2ParentDelegation = props.getProperty("java2ParentDelegation");
+ if( java2ParentDelegation == null )
+ {
+ // Check for previous mis-spelled property name
+ java2ParentDelegation = props.getProperty("java2ParentDelegaton", "false");
+ }
+ j2seClassLoadingCompliance = Boolean.valueOf(java2ParentDelegation).booleanValue();
+ }
+ }
+ }
+ }
+ }
+ }
+
// Create a classloading metadata
// NOTE: Don't explicitly set the parentDomain otherwise it will create a top level classloader
// for subdeployments rather than a classloader hanging off the main deployment's classloader
ClassLoadingMetaData classLoadingMetaData = new ClassLoadingMetaData();
classLoadingMetaData.setName(unit.getName());
- classLoadingMetaData.setDomain(unit.getName());
+ classLoadingMetaData.setDomain(domainName);
classLoadingMetaData.setExportAll(ExportAll.NON_EMPTY);
classLoadingMetaData.setImportAll(true);
classLoadingMetaData.setVersion(Version.DEFAULT_VERSION);
More information about the jboss-cvs-commits
mailing list