[jboss-cvs] JBossAS SVN: r66470 - in trunk: server/src/main/org/jboss/deployment/security and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Oct 25 21:08:14 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-25 21:08:13 -0400 (Thu, 25 Oct 2007)
New Revision: 66470
Modified:
trunk/server/src/main/org/jboss/deployment/JBossWebAppParsingDeployer.java
trunk/server/src/main/org/jboss/deployment/security/JaccPolicyUtil.java
trunk/server/src/main/org/jboss/ejb/EjbUtil50.java
trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
trunk/server/src/main/org/jboss/serviceref/ServiceRefMetaDataAdator.java
trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB21.java
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java
Log:
Update for the latest metadata changes
Modified: trunk/server/src/main/org/jboss/deployment/JBossWebAppParsingDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/JBossWebAppParsingDeployer.java 2007-10-25 23:33:09 UTC (rev 66469)
+++ trunk/server/src/main/org/jboss/deployment/JBossWebAppParsingDeployer.java 2007-10-26 01:08:13 UTC (rev 66470)
@@ -31,6 +31,7 @@
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.ClassLoadingMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.WebMetaData;
import org.jboss.mx.loading.LoaderRepositoryFactory.LoaderRepositoryConfig;
@@ -97,7 +98,10 @@
metaData.setOverridenMetaData(specMetaData);
// Add the loader repository config
- LoaderRepositoryMetaData lrmd = metaData.getLoaderRepository();
+ ClassLoadingMetaData classLoading = metaData.getClassLoading();
+ LoaderRepositoryMetaData lrmd = null;
+ if(classLoading != null)
+ lrmd = classLoading.getLoaderRepository();
if (lrmd != null)
{
LoaderRepositoryConfig loaderConfig = new LoaderRepositoryConfig();
Modified: trunk/server/src/main/org/jboss/deployment/security/JaccPolicyUtil.java
===================================================================
--- trunk/server/src/main/org/jboss/deployment/security/JaccPolicyUtil.java 2007-10-25 23:33:09 UTC (rev 66469)
+++ trunk/server/src/main/org/jboss/deployment/security/JaccPolicyUtil.java 2007-10-26 01:08:13 UTC (rev 66470)
@@ -23,7 +23,6 @@
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import javax.security.jacc.PolicyConfiguration;
@@ -31,7 +30,6 @@
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.ejb.EJBPermissionMapping;
-import org.jboss.metadata.common.ejb.IEnterpriseBeansMetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
@@ -131,7 +129,7 @@
else if(metadata instanceof JBossMetaData)
{
JBossMetaData jmd = (JBossMetaData)metadata;
- IEnterpriseBeansMetaData<JBossEnterpriseBeanMetaData> beans = jmd.getEnterpriseBeans();
+ JBossEnterpriseBeansMetaData beans = jmd.getEnterpriseBeans();
for(JBossEnterpriseBeanMetaData bmd : beans)
{
EJBPermissionMapping.createPermissions(bmd, policyConfiguration);
Modified: trunk/server/src/main/org/jboss/ejb/EjbUtil50.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/EjbUtil50.java 2007-10-25 23:33:09 UTC (rev 66469)
+++ trunk/server/src/main/org/jboss/ejb/EjbUtil50.java 2007-10-26 01:08:13 UTC (rev 66470)
@@ -30,7 +30,6 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.structure.spi.main.MainDeployerStructure;
import org.jboss.logging.Logger;
-import org.jboss.metadata.common.ejb.IEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossEntityBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
@@ -202,7 +201,7 @@
if (targetUnit.getAttachment(JBossMetaData.class) != null)
{
JBossMetaData appMD = targetUnit.getAttachment(JBossMetaData.class);
- IEnterpriseBeanMetaData<JBossEnterpriseBeanMetaData> beanMD = appMD.getEnterpriseBean(ejbName);
+ JBossEnterpriseBeanMetaData beanMD = appMD.getEnterpriseBean(ejbName);
if (beanMD != null)
{
@@ -234,7 +233,7 @@
if (unit.getAttachment(JBossMetaData.class) != null)
{
JBossMetaData appMD = unit.getAttachment(JBossMetaData.class);
- IEnterpriseBeanMetaData<JBossEnterpriseBeanMetaData> beanMD = appMD.getEnterpriseBean(link);
+ JBossEnterpriseBeanMetaData beanMD = appMD.getEnterpriseBean(link);
if (beanMD != null)
{
ejbName = getJndiName(beanMD, isLocal);
@@ -272,10 +271,9 @@
return ejbName;
}
- private static String getJndiName(IEnterpriseBeanMetaData<JBossEnterpriseBeanMetaData> ibeanMD, boolean isLocal)
+ private static String getJndiName(JBossEnterpriseBeanMetaData beanMD, boolean isLocal)
{
String jndiName = null;
- JBossEnterpriseBeanMetaData beanMD = ibeanMD.cast();
if (isLocal)
{
// Validate that there is a local home associated with this bean
Modified: trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java 2007-10-25 23:33:09 UTC (rev 66469)
+++ trunk/server/src/main/org/jboss/ejb/deployers/EjbDeployer.java 2007-10-26 01:08:13 UTC (rev 66470)
@@ -36,10 +36,10 @@
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.ejb.EjbModule;
import org.jboss.metadata.ApplicationMetaData;
-import org.jboss.metadata.common.ejb.IEnterpriseBeansMetaData;
import org.jboss.metadata.ejb.jboss.ContainerConfigurationMetaData;
import org.jboss.metadata.ejb.jboss.InvokerProxyBindingMetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.security.ISecurityManagement;
import org.jboss.system.metadata.ServiceAttributeMetaData;
@@ -245,7 +245,7 @@
dependencies.add(ccm);
}
// Add dependencies on the invoker services in use
- IEnterpriseBeansMetaData<JBossEnterpriseBeanMetaData> beans = deployment.getEnterpriseBeans();
+ JBossEnterpriseBeansMetaData beans = deployment.getEnterpriseBeans();
Iterator<JBossEnterpriseBeanMetaData> beansIter = beans.iterator();
HashSet<String> invokerNames = new HashSet<String>();
HashSet<String> beanDepends = new HashSet<String>();
Modified: trunk/server/src/main/org/jboss/serviceref/ServiceRefMetaDataAdator.java
===================================================================
--- trunk/server/src/main/org/jboss/serviceref/ServiceRefMetaDataAdator.java 2007-10-25 23:33:09 UTC (rev 66469)
+++ trunk/server/src/main/org/jboss/serviceref/ServiceRefMetaDataAdator.java 2007-10-26 01:08:13 UTC (rev 66470)
@@ -64,11 +64,11 @@
result.setMappingFile(sref.getJaxrpcMappingFile());
result.setServiceQName(sref.getServiceQname());
- // TODO: should be unbounded
- PortComponentRef pcRef = sref.getPortComponentRef();
- if (pcRef != null)
+ List<? extends PortComponentRef> pcRefs = sref.getPortComponentRef();
+ if (pcRefs != null)
{
- UnifiedPortComponentRefMetaData upcRef = getUnifiedPortComponentRefMetaData(result, pcRef);
+ PortComponentRef ref = pcRefs.get(0);
+ UnifiedPortComponentRefMetaData upcRef = getUnifiedPortComponentRefMetaData(result, ref);
result.addPortComponentRef(upcRef);
}
@@ -92,9 +92,8 @@
for (ServiceReferenceHandlerChainMetaData srHandlerChain : srHandlerChainList)
{
UnifiedHandlerChainMetaData uHandlerChain = new UnifiedHandlerChainMetaData();
- // TODO: soapHeader should be a QName
- uHandlerChain.setServiceNamePattern(new QName(srHandlerChain.getServiceNamePattern()));
- uHandlerChain.setPortNamePattern(new QName(srHandlerChain.getPortNamePattern()));
+ uHandlerChain.setServiceNamePattern(srHandlerChain.getServiceNamePattern());
+ uHandlerChain.setPortNamePattern(srHandlerChain.getPortNamePattern());
//uHandlerChain.setProtocolBindings(srHandlerChain.get);
List<ServiceReferenceHandlerMetaData> srHandlerChainHandlers = srHandlerChain.getHandler();
Iterator<ServiceReferenceHandlerMetaData> it = srHandlerChainHandlers.iterator();
@@ -139,13 +138,12 @@
uhmd.addInitParam(param);
}
}
- List<String> soapHeaders = srhmd.getSoapHeader();
+ List<QName> soapHeaders = srhmd.getSoapHeader();
if (soapHeaders != null)
{
- for (String soapHeader : soapHeaders)
+ for (QName soapHeader : soapHeaders)
{
- // TODO: soapHeader should be a QName
- uhmd.addSoapHeader(new QName(soapHeader));
+ uhmd.addSoapHeader(soapHeader);
}
}
List<String> soapRoles = srhmd.getSoapRole();
@@ -169,6 +167,7 @@
private UnifiedPortComponentRefMetaData getUnifiedPortComponentRefMetaData(UnifiedServiceRefMetaData usref, PortComponentRef pcref)
{
+
UnifiedPortComponentRefMetaData result = new UnifiedPortComponentRefMetaData(usref);
result.setServiceEndpointInterface(pcref.getServiceEndpointInterface());
result.setEnableMTOM(pcref.isEnableMtom());
Modified: trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
===================================================================
--- trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java 2007-10-25 23:33:09 UTC (rev 66469)
+++ trunk/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java 2007-10-26 01:08:13 UTC (rev 66470)
@@ -40,6 +40,7 @@
import org.jboss.deployers.vfs.spi.deployer.AbstractSimpleVFSRealDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
import org.jboss.deployment.J2eeModuleMetaData;
+import org.jboss.metadata.web.jboss.ClassLoadingMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.WebMetaData;
import org.jboss.metadata.ear.jboss.JBossAppMetaData;
@@ -420,7 +421,11 @@
}
//
- metaData.setJava2ClassLoadingCompliance(this.java2ClassLoadingCompliance);
+ ClassLoadingMetaData classLoading = metaData.getClassLoading();
+ if(classLoading == null)
+ classLoading = new ClassLoadingMetaData();
+ classLoading.setJava2ClassLoadingCompliance(this.java2ClassLoadingCompliance);
+ metaData.setClassLoading(classLoading);
// Build the context root if its not been set or is specified at the ear
String webContext = metaData.getContextRoot();
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java 2007-10-25 23:33:09 UTC (rev 66469)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java 2007-10-26 01:08:13 UTC (rev 66470)
@@ -56,6 +56,7 @@
import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData;
import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData;
import org.jboss.metadata.serviceref.VirtualFileAdaptor;
+import org.jboss.metadata.web.jboss.ClassLoadingMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metamodel.descriptor.EnvironmentRefGroup;
import org.jboss.mx.util.MBeanServerLocator;
@@ -553,7 +554,8 @@
}
}
- if (metaData.getJava2ClassLoadingCompliance())
+ ClassLoadingMetaData classLoading = metaData.getClassLoading();
+ if (classLoading != null && classLoading.isJava2ClassLoadingCompliance())
{
WebCtxLoader jbossLoader = new WebCtxLoader(loader, injectionContainer);
if (classpath != null)
Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB21.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB21.java 2007-10-25 23:33:09 UTC (rev 66469)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB21.java 2007-10-26 01:08:13 UTC (rev 66470)
@@ -29,7 +29,6 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.logging.Logger;
-import org.jboss.metadata.common.ejb.IEnterpriseBeansMetaData;
import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData;
import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
@@ -38,9 +37,6 @@
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
import org.jboss.metadata.ejb.jboss.WebservicesMetaData;
-import org.jboss.metadata.ejb.spec.EnterpriseBeanMetaData;
-import org.jboss.metadata.ejb.spec.MessageDrivenBeanMetaData;
-import org.jboss.metadata.ejb.spec.SessionBeanMetaData;
import org.jboss.metadata.javaee.spec.PortComponent;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
@@ -77,7 +73,7 @@
private void buildEnterpriseBeansMetaData(EJBArchiveMetaData umd, JBossMetaData jbmd)
{
List<EJBMetaData> targetBeans = new ArrayList<EJBMetaData>();
- IEnterpriseBeansMetaData<JBossEnterpriseBeanMetaData> sourceBeans = jbmd.getEnterpriseBeans();
+ JBossEnterpriseBeansMetaData sourceBeans = jbmd.getEnterpriseBeans();
Iterator<JBossEnterpriseBeanMetaData> it = sourceBeans.iterator();
while (it.hasNext())
{
Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-10-25 23:33:09 UTC (rev 66469)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-10-26 01:08:13 UTC (rev 66470)
@@ -25,7 +25,6 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.metadata.common.ejb.IEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
@@ -82,7 +81,7 @@
if (ejbLink == null)
throw new IllegalStateException("ejb-link cannot be null");
- IEnterpriseBeanMetaData<JBossEnterpriseBeanMetaData> beanMetaData = jbmd.getEnterpriseBean(ejbLink);
+ JBossEnterpriseBeanMetaData beanMetaData = jbmd.getEnterpriseBean(ejbLink);
if (beanMetaData == null)
throw new IllegalStateException("Cannot obtain bean meta data for: " + ejbLink);
More information about the jboss-cvs-commits
mailing list