[jboss-cvs] JBossAS SVN: r66358 - in trunk/webservices: src/main/org/jboss/wsf/container/jboss50 and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 23 05:49:25 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-10-23 05:49:24 -0400 (Tue, 23 Oct 2007)
New Revision: 66358
Modified:
trunk/webservices/.classpath
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ContainerMetaDataAdapter.java
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB21.java
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB3.java
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JSEArchiveMetaDataAdapter.java
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/RuntimeLoaderDeploymentAspect.java
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/SecurityHandlerEJB21.java
Log:
Fix EJB21 deployment issues
Modified: trunk/webservices/.classpath
===================================================================
--- trunk/webservices/.classpath 2007-10-23 08:31:11 UTC (rev 66357)
+++ trunk/webservices/.classpath 2007-10-23 09:49:24 UTC (rev 66358)
@@ -33,7 +33,7 @@
<classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jboss-saaj.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi.jar" sourcepath="/thirdparty/jboss/jboss-security-spi/lib/jboss-security-spi-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbossws-common/lib/jbossws-common.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/jbossws-spi/lib/jbossws-spi.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jbossws-spi/lib/jbossws-spi.jar" sourcepath="/thirdparty/jboss/jbossws-spi/lib/jbossws-spi-src.zip"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbosssx/lib/jbosssx.jar" sourcepath="/thirdparty/jboss/jbosssx/lib/jbosssx-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/metadata/lib/jboss-metadata.jar" sourcepath="/thirdparty/jboss/metadata/lib/jboss-metadata-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-jaxb/lib/jaxb-api.jar"/>
Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ContainerMetaDataAdapter.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ContainerMetaDataAdapter.java 2007-10-23 08:31:11 UTC (rev 66357)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/ContainerMetaDataAdapter.java 2007-10-23 09:49:24 UTC (rev 66358)
@@ -23,18 +23,18 @@
//$Id: ContainerMetaDataAdapter.java 4022 2007-07-27 13:54:43Z heiko.braun at jboss.com $
+import java.net.URL;
+
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.logging.Logger;
-import org.jboss.metadata.ear.jboss.JBossAppMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData;
-import java.net.URL;
-
/**
* Build container independent deployment info.
*
@@ -46,18 +46,18 @@
// logging support
private static Logger log = Logger.getLogger(ContainerMetaDataAdapter.class);
- private EJBArchiveMetaDataAdapterEJB3 applicationMetaDataAdapterEJB3 = new EJBArchiveMetaDataAdapterEJB3();
- private EJBArchiveMetaDataAdapterEJB21 applicationMetaDataAdapterEJB21 = new EJBArchiveMetaDataAdapterEJB21();
+ private EJBArchiveMetaDataAdapterEJB3 ejbMetaDataAdapterEJB3 = new EJBArchiveMetaDataAdapterEJB3();
+ private EJBArchiveMetaDataAdapterEJB21 ejbMetaDataAdapterEJB21 = new EJBArchiveMetaDataAdapterEJB21();
private JSEArchiveMetaDataAdapter webMetaDataAdapter = new JSEArchiveMetaDataAdapter();
- public void setApplicationMetaDataAdapterEJB21(EJBArchiveMetaDataAdapterEJB21 adapter)
+ public void setEjbMetaDataAdapterEJB21(EJBArchiveMetaDataAdapterEJB21 adapter)
{
- this.applicationMetaDataAdapterEJB21 = adapter;
+ this.ejbMetaDataAdapterEJB21 = adapter;
}
- public void setApplicationMetaDataAdapterEJB3(EJBArchiveMetaDataAdapterEJB3 adapter)
+ public void setEjbMetaDataAdapterEJB3(EJBArchiveMetaDataAdapterEJB3 adapter)
{
- this.applicationMetaDataAdapterEJB3 = adapter;
+ this.ejbMetaDataAdapterEJB3 = adapter;
}
public void setWebMetaDataAdapter(JSEArchiveMetaDataAdapter adapter)
@@ -74,7 +74,7 @@
// JSE endpoints
if (unit.getAttachment(JBossWebMetaData.class) != null)
{
- JSEArchiveMetaData webMetaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, unit);
+ JSEArchiveMetaData webMetaData = webMetaDataAdapter.buildMetaData(dep, unit);
if (webMetaData != null)
dep.addAttachment(JSEArchiveMetaData.class, webMetaData);
@@ -88,17 +88,17 @@
// EJB3 endpoints
else if (unit.getAttachment(Ejb3Deployment.class) != null)
{
- EJBArchiveMetaData appMetaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, unit);
- if (appMetaData != null)
- dep.addAttachment(EJBArchiveMetaData.class, appMetaData);
+ EJBArchiveMetaData ejbMetaData = ejbMetaDataAdapterEJB3.buildMetaData(dep, unit);
+ if (ejbMetaData != null)
+ dep.addAttachment(EJBArchiveMetaData.class, ejbMetaData);
}
// EJB21 endpoints
- else if (unit.getAttachment(JBossAppMetaData.class) != null)
+ else if (unit.getAttachment(JBossMetaData.class) != null)
{
- EJBArchiveMetaData appMetaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, unit);
- if (appMetaData != null)
- dep.addAttachment(EJBArchiveMetaData.class, appMetaData);
+ EJBArchiveMetaData ejbMetaData = ejbMetaDataAdapterEJB21.buildMetaData(dep, unit);
+ if (ejbMetaData != null)
+ dep.addAttachment(EJBArchiveMetaData.class, ejbMetaData);
}
}
catch (RuntimeException rte)
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-23 08:31:11 UTC (rev 66357)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB21.java 2007-10-23 09:49:24 UTC (rev 66358)
@@ -23,17 +23,32 @@
// $Id: EJBArchiveMetaDataAdapterEJB21.java 4013 2007-07-27 04:37:52Z thomas.diesler at jboss.com $
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.logging.Logger;
-import org.jboss.metadata.*;
+import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData;
+import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeansMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMessageDrivenBeanMetaData;
+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.*;
+import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.MDBMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData.PublishLocationAdapter;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
/**
* Build container independent application meta data
*
@@ -45,34 +60,47 @@
// logging support
private static Logger log = Logger.getLogger(EJBArchiveMetaDataAdapterEJB21.class);
- public EJBArchiveMetaData buildUnifiedApplicationMetaData(Deployment dep, DeploymentUnit unit)
+ public EJBArchiveMetaData buildMetaData(Deployment dep, DeploymentUnit unit)
{
- ApplicationMetaData appMetaData = unit.getAttachment(ApplicationMetaData.class);
- dep.addAttachment(ApplicationMetaData.class, appMetaData);
+ JBossMetaData jbmd = unit.getAttachment(JBossMetaData.class);
+ dep.addAttachment(JBossMetaData.class, jbmd);
EJBArchiveMetaData umd = new EJBArchiveMetaData();
- buildUnifiedBeanMetaData(umd, appMetaData);
- buildWebservicesMetaData(umd, appMetaData);
- umd.setSecurityDomain(appMetaData.getSecurityDomain());
+ buildEnterpriseBeansMetaData(umd, jbmd);
+ buildWebservicesMetaData(umd, jbmd);
+ umd.setSecurityDomain(jbmd.getSecurityDomain());
return umd;
}
- private void buildWebservicesMetaData(EJBArchiveMetaData umd, ApplicationMetaData apmd)
+ private void buildEnterpriseBeansMetaData(EJBArchiveMetaData umd, JBossMetaData jbmd)
{
- Webservices webservices = apmd.getWebservices();
+ List<EJBMetaData> targetBeans = new ArrayList<EJBMetaData>();
+ JBossEnterpriseBeansMetaData sourceBeans = jbmd.getEnterpriseBeans();
+ Iterator<JBossEnterpriseBeanMetaData> it = sourceBeans.iterator();
+ while (it.hasNext())
+ {
+ JBossEnterpriseBeanMetaData bmd = it.next();
+ buildBeanMetaData(targetBeans, bmd);
+ }
+ umd.setEnterpriseBeans(targetBeans);
+ }
+
+ private void buildWebservicesMetaData(EJBArchiveMetaData umd, JBossMetaData apmd)
+ {
+ WebservicesMetaData webservices = apmd.getWebservices();
if (webservices != null)
{
String contextRoot = webservices.getContextRoot();
umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices));
- List<WebserviceDescription> wsDescriptions = webservices.getWebserviceDescriptions();
+ WebserviceDescriptionsMetaData wsDescriptions = webservices.getWebserviceDescriptions();
if (wsDescriptions.size() > 1)
log.warn("Multiple <webservice-description> elements not supported");
if (wsDescriptions.size() > 0)
{
- WebserviceDescription wsd = wsDescriptions.get(0);
+ WebserviceDescriptionMetaData wsd = wsDescriptions.iterator().next();
umd.setConfigName(wsd.getConfigName());
umd.setConfigFile(wsd.getConfigFile());
}
@@ -81,16 +109,19 @@
}
}
- private PublishLocationAdapter getPublishLocationAdpater(final Webservices webservices)
+ private PublishLocationAdapter getPublishLocationAdpater(final WebservicesMetaData webservices)
{
return new PublishLocationAdapter()
{
public String getWsdlPublishLocationByName(String name)
{
String wsdlPublishLocation = null;
- for (WebserviceDescription wsd : webservices.getWebserviceDescriptions())
+ WebserviceDescriptionsMetaData wsds = webservices.getWebserviceDescriptions();
+ Iterator<WebserviceDescriptionMetaData> it = wsds.iterator();
+ while (it.hasNext())
{
- if (wsd.getDescriptionName().equals(name))
+ WebserviceDescriptionMetaData wsd = it.next();
+ if (wsd.getWebserviceDescriptionName().equals(name))
{
wsdlPublishLocation = wsd.getWsdlPublishLocation();
}
@@ -100,55 +131,54 @@
};
}
- private void buildUnifiedBeanMetaData(EJBArchiveMetaData umd, ApplicationMetaData appMetaData)
+ private EJBMetaData buildBeanMetaData(List<EJBMetaData> beans, JBossEnterpriseBeanMetaData jbmd)
{
- List<EJBMetaData> beans = new ArrayList<EJBMetaData>();
- Iterator it = appMetaData.getEnterpriseBeans();
- while (it.hasNext())
+ EnterpriseBeanMetaData stdMetaData = jbmd.getOverridenMetaData();
+
+ EJBMetaData targetBean = null;
+ if (jbmd.isSession())
{
- BeanMetaData bmd = (BeanMetaData)it.next();
- buildUnifiedBeanMetaData(beans, bmd);
- }
- umd.setEnterpriseBeans(beans);
- }
-
- private EJBMetaData buildUnifiedBeanMetaData(List<EJBMetaData> beans, BeanMetaData bmd)
- {
- EJBMetaData ubmd = null;
- if (bmd instanceof SessionMetaData)
- {
- ubmd = new SLSBMetaData();
- }
- else if (bmd instanceof MessageDrivenMetaData)
- {
- ubmd = new MDBMetaData();
- ((MDBMetaData)ubmd).setDestinationJndiName(((MessageDrivenMetaData)bmd).getDestinationJndiName());
- }
-
- if (ubmd != null)
- {
- ubmd.setEjbName(bmd.getEjbName());
- ubmd.setEjbClass(bmd.getEjbClass());
- ubmd.setServiceEndpointInterface(bmd.getServiceEndpoint());
- ubmd.setHome(bmd.getHome());
- ubmd.setLocalHome(bmd.getLocalHome());
- ubmd.setJndiName(bmd.getJndiName());
- ubmd.setLocalJndiName(bmd.getLocalJndiName());
-
- EjbPortComponentMetaData pcmd = bmd.getPortComponent();
+ targetBean = new SLSBMetaData();
+ SessionBeanMetaData stdSessionBean = (SessionBeanMetaData)stdMetaData;
+ JBossSessionBeanMetaData jbossSessionBean = (JBossSessionBeanMetaData)jbmd;
+
+ targetBean.setEjbName(stdSessionBean.getEjbName());
+ targetBean.setEjbClass(stdSessionBean.getEjbClass());
+ targetBean.setServiceEndpointInterface(stdSessionBean.getServiceEndpoint());
+ targetBean.setHome(stdSessionBean.getHome());
+ targetBean.setLocalHome(stdSessionBean.getLocalHome());
+ targetBean.setJndiName(jbossSessionBean.determineJndiName());
+ targetBean.setLocalJndiName(jbmd.determineLocalJndiName());
+
+ PortComponent pcmd = jbossSessionBean.getPortComponent();
if (pcmd != null)
{
- ubmd.setPortComponentName(pcmd.getPortComponentName());
- ubmd.setPortComponentURI(pcmd.getPortComponentURI());
+ targetBean.setPortComponentName(pcmd.getPortComponentName());
+ targetBean.setPortComponentURI(pcmd.getPortComponentURI());
EJBSecurityMetaData smd = new EJBSecurityMetaData();
smd.setAuthMethod(pcmd.getAuthMethod());
smd.setTransportGuarantee(pcmd.getTransportGuarantee());
smd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess());
- ubmd.setSecurityMetaData(smd);
+ targetBean.setSecurityMetaData(smd);
}
+ }
+ else if (jbmd.isMessageDriven())
+ {
+ targetBean = new MDBMetaData();
+ MessageDrivenBeanMetaData stdMessageBean = (MessageDrivenBeanMetaData)stdMetaData;
+ JBossMessageDrivenBeanMetaData jbossMessageBean = (JBossMessageDrivenBeanMetaData)jbmd;
+
+ targetBean.setEjbName(stdMessageBean.getEjbName());
+ targetBean.setEjbClass(stdMessageBean.getEjbClass());
+ //targetBean.setServiceEndpointInterface(???);
+ //targetBean.setJndiName(???);
+ targetBean.setLocalJndiName(jbmd.getLocalJndiName());
+ ((MDBMetaData)targetBean).setDestinationJndiName(jbossMessageBean.getDestinationJndiName());
+ }
- beans.add(ubmd);
- }
- return ubmd;
+ if (targetBean != null)
+ beans.add(targetBean);
+
+ return targetBean;
}
}
Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB3.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB3.java 2007-10-23 08:31:11 UTC (rev 66357)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB3.java 2007-10-23 09:49:24 UTC (rev 66358)
@@ -58,14 +58,14 @@
// logging support
private static Logger log = Logger.getLogger(EJBArchiveMetaDataAdapterEJB3.class);
- public EJBArchiveMetaData buildUnifiedApplicationMetaData(Deployment dep, DeploymentUnit unit)
+ public EJBArchiveMetaData buildMetaData(Deployment dep, DeploymentUnit unit)
{
Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class);
dep.addAttachment(Ejb3Deployment.class, ejb3Deployment);
EjbJarDD jarDD = unit.getAttachment(EjbJarDD.class);
EJBArchiveMetaData umd = new EJBArchiveMetaData();
- buildUnifiedBeanMetaData(umd, ejb3Deployment);
+ buildEnterpriseBeansMetaData(umd, ejb3Deployment);
buildWebservicesMetaData(umd, jarDD);
return umd;
@@ -98,7 +98,7 @@
}
}
- private void buildUnifiedBeanMetaData(EJBArchiveMetaData umd, Ejb3Deployment ejb3Deployment)
+ private void buildEnterpriseBeansMetaData(EJBArchiveMetaData umd, Ejb3Deployment ejb3Deployment)
{
List<EJBMetaData> ubmdList = new ArrayList<EJBMetaData>();
Iterator<Container> it = ejb3Deployment.getEjbContainers().values().iterator();
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-23 08:31:11 UTC (rev 66357)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-10-23 09:49:24 UTC (rev 66358)
@@ -25,13 +25,13 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.metadata.ApplicationMetaData;
-import org.jboss.metadata.BeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Deployment;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.deployment.Service;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData;
import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData;
import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData;
@@ -61,8 +61,8 @@
Service service = dep.getService();
- ApplicationMetaData appmd = unit.getAttachment(ApplicationMetaData.class);
- if (appmd == null)
+ JBossMetaData jbmd = unit.getAttachment(JBossMetaData.class);
+ if (jbmd == null)
throw new IllegalStateException("Deployment unit does not contain application meta data");
WebservicesMetaData wsMetaData = getWebservicesMetaData(unit);
@@ -71,7 +71,7 @@
// Copy the attachments
dep.addAttachment(WebservicesMetaData.class, wsMetaData);
- dep.addAttachment(ApplicationMetaData.class, appmd);
+ dep.addAttachment(JBossMetaData.class, jbmd);
for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions())
{
@@ -81,11 +81,11 @@
if (ejbLink == null)
throw new IllegalStateException("ejb-link cannot be null");
- BeanMetaData beanMetaData = appmd.getBeanByEjbName(ejbLink);
+ JBossEnterpriseBeanMetaData beanMetaData = jbmd.getEnterpriseBean(ejbLink);
if (beanMetaData == null)
throw new IllegalStateException("Cannot obtain bean meta data for: " + ejbLink);
- String ejbClass = beanMetaData.getEjbClass();
+ String ejbClass = beanMetaData.getOverridenMetaData().getEjbClass();
// Create the endpoint
Endpoint ep = newEndpoint(ejbClass);
@@ -100,6 +100,6 @@
public boolean isWebServiceDeployment(DeploymentUnit unit)
{
WebservicesMetaData wsMetaData = getWebservicesMetaData(unit);
- return wsMetaData != null && unit.getAllMetaData(ApplicationMetaData.class).size() > 0;
+ return wsMetaData != null && unit.getAllMetaData(JBossMetaData.class).size() > 0;
}
}
\ No newline at end of file
Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JSEArchiveMetaDataAdapter.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JSEArchiveMetaDataAdapter.java 2007-10-23 08:31:11 UTC (rev 66357)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/JSEArchiveMetaDataAdapter.java 2007-10-23 09:49:24 UTC (rev 66358)
@@ -54,7 +54,7 @@
*/
public class JSEArchiveMetaDataAdapter
{
- public JSEArchiveMetaData buildUnifiedWebMetaData(Deployment dep, DeploymentUnit unit)
+ public JSEArchiveMetaData buildMetaData(Deployment dep, DeploymentUnit unit)
{
String contextRoot = null;
Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/RuntimeLoaderDeploymentAspect.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/RuntimeLoaderDeploymentAspect.java 2007-10-23 08:31:11 UTC (rev 66357)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/RuntimeLoaderDeploymentAspect.java 2007-10-23 09:49:24 UTC (rev 66358)
@@ -23,7 +23,7 @@
// $Id: RuntimeLoaderDeploymentAspect.java 4244 2007-08-08 09:19:04Z thomas.diesler at jboss.com $
-import org.jboss.metadata.ApplicationMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
@@ -56,7 +56,7 @@
}
// EJB21 endpoints
- else if (dep.getAttachment(ApplicationMetaData.class) != null)
+ else if (dep.getAttachment(JBossMetaData.class) != null)
{
dep.setRuntimeClassLoader(dep.getInitialClassLoader());
}
Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/SecurityHandlerEJB21.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/SecurityHandlerEJB21.java 2007-10-23 08:31:11 UTC (rev 66357)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/SecurityHandlerEJB21.java 2007-10-23 09:49:24 UTC (rev 66358)
@@ -24,8 +24,10 @@
//$Id: SecurityHandlerEJB21.java 4013 2007-07-27 04:37:52Z thomas.diesler at jboss.com $
import org.dom4j.Element;
-import org.jboss.metadata.ApplicationMetaData;
-import org.jboss.metadata.AssemblyDescriptorMetaData;
+import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.ejb.spec.AssemblyDescriptorMetaData;
+import org.jboss.metadata.ejb.spec.EjbJarMetaData;
+import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.SecurityHandler;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
@@ -43,11 +45,11 @@
{
public void addSecurityDomain(Element jbossWeb, Deployment dep)
{
- EJBArchiveMetaData appMetaData = dep.getAttachment(EJBArchiveMetaData.class);
- if (appMetaData == null)
+ EJBArchiveMetaData ejbMetaData = dep.getAttachment(EJBArchiveMetaData.class);
+ if (ejbMetaData == null)
throw new IllegalStateException("Cannot obtain application meta data");
- String securityDomain = appMetaData.getSecurityDomain();
+ String securityDomain = ejbMetaData.getSecurityDomain();
if (securityDomain != null)
{
if (securityDomain.startsWith("java:/jaas/") == false)
@@ -60,14 +62,15 @@
public void addSecurityRoles(Element webApp, Deployment dep)
{
// Fix: http://jira.jboss.org/jira/browse/JBWS-309
- ApplicationMetaData applMetaData = dep.getAttachment(ApplicationMetaData.class);
- AssemblyDescriptorMetaData assemblyDescriptor = applMetaData.getAssemblyDescriptor();
+ JBossMetaData jbmd = dep.getAttachment(JBossMetaData.class);
+ EjbJarMetaData stdMetaData = jbmd.getOverridenMetaData();
+ AssemblyDescriptorMetaData assemblyDescriptor = stdMetaData.getAssemblyDescriptor();
if (assemblyDescriptor != null)
{
- Map securityRoles = assemblyDescriptor.getSecurityRoles();
- if (securityRoles != null)
+ SecurityRolesMetaData srmd = assemblyDescriptor.getSecurityRoles();
+ if (srmd != null)
{
- Iterator it = securityRoles.keySet().iterator();
+ Iterator it = srmd.keySet().iterator();
while (it.hasNext())
{
webApp.addElement("security-role").addElement("role-name").addText((String)it.next());
More information about the jboss-cvs-commits
mailing list