From jbossws-commits at lists.jboss.org Thu Aug 13 10:10:43 2009
Content-Type: multipart/mixed; boundary="===============2411394169726019911=="
MIME-Version: 1.0
From: jbossws-commits at lists.jboss.org
To: jbossws-commits at lists.jboss.org
Subject: [jbossws-commits] JBossWS SVN: r10534 -
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata.
Date: Thu, 13 Aug 2009 10:10:42 -0400
Message-ID: <200908131410.n7DEAgL0015345@svn01.web.mwc.hst.phx2.redhat.com>
--===============2411394169726019911==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: richard.opalka(a)jboss.com
Date: 2009-08-13 10:10:42 -0400 (Thu, 13 Aug 2009)
New Revision: 10534
Modified:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webs=
ervices/integration/metadata/AbstractMetaDataBuilderEJB.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webs=
ervices/integration/metadata/MetaDataBuilderEJB21.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webs=
ervices/integration/metadata/MetaDataBuilderEJB3.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webs=
ervices/integration/metadata/PublishLocationAdapterImpl.java
Log:
[JBWS-2320] refactoring (WIP)
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jbo=
ss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/web=
services/integration/metadata/AbstractMetaDataBuilderEJB.java 2009-08-13 11=
:26:04 UTC (rev 10533)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/web=
services/integration/metadata/AbstractMetaDataBuilderEJB.java 2009-08-13 14=
:10:42 UTC (rev 10534)
@@ -30,61 +30,111 @@
import org.jboss.wsf.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter;
=
/**
* Common class for EJB meta data builders.
*
* @author Richard Opalka
+ * @author Thomas Diesler
*/
abstract class AbstractMetaDataBuilderEJB
{
=
- protected final Logger log =3D Logger.getLogger(getClass());
+ /** Logger. */
+ private static final Logger LOGGER =3D Logger.getLogger(AbstractMetaDat=
aBuilderEJB.class);
=
- final EJBArchiveMetaData create(Deployment dep, DeploymentUnit unit)
+ /**
+ * Builds universal EJB meta data model that is AS agnostic.
+ * =
+ * @param dep webservice deployment
+ * @param unit deployment unit
+ * @return universal EJB meta data model
+ */
+ final EJBArchiveMetaData create(final Deployment dep, final DeploymentU=
nit unit)
{
- final EJBArchiveMetaData umd =3D new EJBArchiveMetaData();
+ final EJBArchiveMetaData ejbArchiveMD =3D new EJBArchiveMetaData();
=
- this.buildEnterpriseBeansMetaData(dep, umd);
- this.buildWebservicesMetaData(dep, umd);
+ this.buildEnterpriseBeansMetaData(dep, ejbArchiveMD);
+ this.buildWebservicesMetaData(dep, ejbArchiveMD);
=
- return umd;
+ return ejbArchiveMD;
}
=
/**
* Template method for build enterprise beans meta data.
* =
+ * @param dep webservice deployment
* @param ejbMetaData universal EJB meta data model
- * @param dep webservice deployment
*/
protected abstract void buildEnterpriseBeansMetaData(Deployment dep, EJ=
BArchiveMetaData ejbMetaData);
=
- private void buildWebservicesMetaData(Deployment dep, EJBArchiveMetaDat=
a ejbMetaData)
+ /**
+ * Builds webservices meta data. This methods sets:
+ *
+ * - context root
+ * - wsdl location resolver
+ * - config name
+ * - config file
+ *
+ * =
+ * @param dep webservice deployment
+ * @param ejbArchiveMD universal EJB meta data model
+ */
+ private void buildWebservicesMetaData(final Deployment dep, final EJBAr=
chiveMetaData ejbArchiveMD)
{
- JBossMetaData jbMetaData =3D WSHelper.getRequiredAttachment(dep, JBo=
ssMetaData.class);
+ final JBossMetaData jbossMD =3D WSHelper.getRequiredAttachment(dep, =
JBossMetaData.class);
+ final WebservicesMetaData webservicesMD =3D jbossMD.getWebservices();
=
- WebservicesMetaData webservicesMD =3D jbMetaData.getWebservices();
- if (webservicesMD !=3D null)
+ if (webservicesMD =3D=3D null)
{
- String contextRoot =3D webservicesMD.getContextRoot();
- ejbMetaData.setWebServiceContextRoot(contextRoot);
+ return;
+ }
=
- ejbMetaData.setPublishLocationAdapter(new PublishLocationAdapterI=
mpl(webservicesMD.getWebserviceDescriptions()));
+ // set context root
+ final String contextRoot =3D webservicesMD.getContextRoot();
+ ejbArchiveMD.setWebServiceContextRoot(contextRoot);
=
- WebserviceDescriptionsMetaData wsDescriptions =3D webservicesMD.g=
etWebserviceDescriptions();
- if (wsDescriptions !=3D null)
+ final WebserviceDescriptionsMetaData wsDescriptionsMD =3D webservice=
sMD.getWebserviceDescriptions();
+
+ if (wsDescriptionsMD !=3D null)
+ {
+ // set wsdl location resolver
+ final PublishLocationAdapter resolver =3D new PublishLocationAdap=
terImpl(wsDescriptionsMD); =
+ ejbArchiveMD.setPublishLocationAdapter(resolver);
+
+ final WebserviceDescriptionMetaData wsDescriptionMD =3D this.getW=
ebserviceDescriptionMetaData(wsDescriptionsMD);
+ if (wsDescriptionMD !=3D null)
{
- if (wsDescriptions.size() > 1)
- log.warn("Multiple elements not su=
pported");
+ // set config name and config file
+ ejbArchiveMD.setConfigName(wsDescriptionMD.getConfigName());
+ ejbArchiveMD.setConfigFile(wsDescriptionMD.getConfigFile());
+ }
+ }
+ }
+ =
+ /**
+ * Returns first webservice description meta data or null if not found.
+ *
+ * @param wsDescriptionsMD webservice descriptions
+ * @return webservice description
+ */
+ private WebserviceDescriptionMetaData getWebserviceDescriptionMetaData(=
final WebserviceDescriptionsMetaData wsDescriptionsMD)
+ {
+ if (wsDescriptionsMD !=3D null)
+ {
+ if (wsDescriptionsMD.size() > 1)
+ {
+ AbstractMetaDataBuilderEJB.LOGGER.warn("Multiple elements not supported");
+ }
=
- if (wsDescriptions.size() > 0)
- {
- WebserviceDescriptionMetaData wsd =3D wsDescriptions.iterat=
or().next();
- ejbMetaData.setConfigName(wsd.getConfigName());
- ejbMetaData.setConfigFile(wsd.getConfigFile());
- }
+ if (wsDescriptionsMD.size() > 0)
+ {
+ return wsDescriptionsMD.iterator().next();
}
}
+ =
+ return null;
}
=
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jbo=
ss/webservices/integration/metadata/MetaDataBuilderEJB21.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/web=
services/integration/metadata/MetaDataBuilderEJB21.java 2009-08-13 11:26:04=
UTC (rev 10533)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/web=
services/integration/metadata/MetaDataBuilderEJB21.java 2009-08-13 14:10:42=
UTC (rev 10534)
@@ -22,11 +22,9 @@
package org.jboss.webservices.integration.metadata;
=
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
=
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;
@@ -48,65 +46,107 @@
final class MetaDataBuilderEJB21 extends AbstractMetaDataBuilderEJB
{
=
+ /**
+ * Constructor.
+ */
+ MetaDataBuilderEJB21()
+ {
+ super();
+ }
+ =
+ /**
+ * @see AbstractMetaDataBuilderEJB#buildEnterpriseBeansMetaData(Deploym=
ent, EJBArchiveMetaData)
+ * =
+ * @param dep webservice deployment
+ * @param ejbArchiveMD EJB archive meta data
+ */
@Override
- protected void buildEnterpriseBeansMetaData(Deployment dep, EJBArchiveM=
etaData jarMetaData)
+ protected void buildEnterpriseBeansMetaData(final Deployment dep, final=
EJBArchiveMetaData ejbArchiveMD)
{
- JBossMetaData jbossMetaData =3D WSHelper.getRequiredAttachment(dep, =
JBossMetaData.class);
- List targetBeans =3D new ArrayList();
- JBossEnterpriseBeansMetaData sourceBeans =3D jbossMetaData.getEnterp=
riseBeans();
- Iterator it =3D sourceBeans.iterator();
- while (it.hasNext())
+ final JBossMetaData jbossMetaData =3D WSHelper.getRequiredAttachment=
(dep, JBossMetaData.class);
+ final List wsEjbsMD =3D new ArrayList();
+
+ for (final JBossEnterpriseBeanMetaData jbossEjbMD : jbossMetaData.ge=
tEnterpriseBeans())
{
- JBossEnterpriseBeanMetaData bmd =3D it.next();
- buildBeanMetaData(targetBeans, bmd);
+ this.buildEnterpriseBeanMetaData(wsEjbsMD, jbossEjbMD);
}
- jarMetaData.setEnterpriseBeans(targetBeans);
- jarMetaData.setSecurityDomain(jbossMetaData.getSecurityDomain());
+ =
+ ejbArchiveMD.setEnterpriseBeans(wsEjbsMD);
+ ejbArchiveMD.setSecurityDomain(jbossMetaData.getSecurityDomain());
}
=
- private EJBMetaData buildBeanMetaData(List ejbBeans, JBoss=
EnterpriseBeanMetaData jbossBeansMetaData)
+ /**
+ * Builds JBoss agnostic EJB meta data.
+ * =
+ * @param wsEjbsMD jboss agnostic EJBs meta data
+ * @param jbossEjbMD jboss specific EJB meta data
+ */
+ private void buildEnterpriseBeanMetaData(final List wsEjbs=
MD, final JBossEnterpriseBeanMetaData jbossEjbMD)
{
- EJBMetaData targetBean =3D null;
- if (jbossBeansMetaData.isSession())
+ final EJBMetaData wsEjbMD =3D this.newEjbMetaData(jbossEjbMD);
+
+ if (wsEjbMD !=3D null)
{
- targetBean =3D new SLSBMetaData();
- JBossSessionBeanMetaData jbossSessionBean =3D (JBossSessionBeanMe=
taData)jbossBeansMetaData;
+ // set EJB name and class
+ wsEjbMD.setEjbName(jbossEjbMD.getEjbName());
+ wsEjbMD.setEjbClass(jbossEjbMD.getEjbClass());
+ =
+ if (jbossEjbMD.isSession())
+ {
+ final JBossSessionBeanMetaData sessionEjbMD =3D (JBossSessionB=
eanMetaData)jbossEjbMD;
=
- targetBean.setEjbName(jbossSessionBean.getEjbName());
- targetBean.setEjbClass(jbossSessionBean.getEjbClass());
- targetBean.setServiceEndpointInterface(jbossSessionBean.getServic=
eEndpoint());
- targetBean.setHome(jbossSessionBean.getHome());
- targetBean.setLocalHome(jbossSessionBean.getLocalHome());
- targetBean.setJndiName(jbossSessionBean.determineJndiName());
- targetBean.setLocalJndiName(jbossBeansMetaData.determineLocalJndi=
Name());
+ // set home interfaces
+ wsEjbMD.setServiceEndpointInterface(sessionEjbMD.getServiceEnd=
point());
+ wsEjbMD.setHome(sessionEjbMD.getHome());
+ wsEjbMD.setLocalHome(sessionEjbMD.getLocalHome());
+ =
+ // set JNDI names
+ wsEjbMD.setJndiName(sessionEjbMD.determineJndiName());
+ wsEjbMD.setLocalJndiName(jbossEjbMD.determineLocalJndiName());
=
- PortComponent pcmd =3D jbossSessionBean.getPortComponent();
- if (pcmd !=3D null)
- {
- targetBean.setPortComponentName(pcmd.getPortComponentName());
- targetBean.setPortComponentURI(pcmd.getPortComponentURI());
- EJBSecurityMetaData smd =3D new EJBSecurityMetaData();
- smd.setAuthMethod(pcmd.getAuthMethod());
- smd.setTransportGuarantee(pcmd.getTransportGuarantee());
- smd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess());
- targetBean.setSecurityMetaData(smd);
+ final PortComponent portComponentMD =3D sessionEjbMD.getPortCo=
mponent();
+ if (portComponentMD !=3D null)
+ {
+ // set port component meta data
+ wsEjbMD.setPortComponentName(portComponentMD.getPortCompone=
ntName());
+ wsEjbMD.setPortComponentURI(portComponentMD.getPortComponen=
tURI());
+ =
+ // set security meta data
+ final EJBSecurityMetaData smd =3D new EJBSecurityMetaData();
+ smd.setAuthMethod(portComponentMD.getAuthMethod());
+ smd.setTransportGuarantee(portComponentMD.getTransportGuara=
ntee());
+ smd.setSecureWSDLAccess(portComponentMD.getSecureWSDLAccess=
());
+ wsEjbMD.setSecurityMetaData(smd);
+ }
}
+
+ wsEjbsMD.add(wsEjbMD);
}
- else if (jbossBeansMetaData.isMessageDriven())
+ }
+
+ /**
+ * Creates new JBoss agnostic EJB bean meta data model.
+ *
+ * @param jbossEjbMD jboss EJB meta data
+ * @return webservices EJB meta data
+ */
+ private EJBMetaData newEjbMetaData(final JBossEnterpriseBeanMetaData jb=
ossEjbMD)
+ {
+ if (jbossEjbMD.isSession())
{
- targetBean =3D new MDBMetaData();
- JBossMessageDrivenBeanMetaData jbossMessageBean =3D (JBossMessage=
DrivenBeanMetaData)jbossBeansMetaData;
+ return new SLSBMetaData();
+ }
+ else if (jbossEjbMD.isMessageDriven())
+ {
+ final MDBMetaData mdbMD =3D new MDBMetaData();
=
- targetBean.setEjbName(jbossMessageBean.getEjbName());
- targetBean.setEjbClass(jbossMessageBean.getEjbClass());
- targetBean.setLocalJndiName(jbossBeansMetaData.getLocalJndiName()=
);
- ((MDBMetaData)targetBean).setDestinationJndiName(jbossMessageBean=
.getDestinationJndiName());
+ final JBossMessageDrivenBeanMetaData jbossMessageBean =3D (JBossM=
essageDrivenBeanMetaData)jbossEjbMD;
+ ((MDBMetaData)mdbMD).setDestinationJndiName(jbossMessageBean.getD=
estinationJndiName());
+ =
+ return mdbMD;
}
-
- if (targetBean !=3D null)
- ejbBeans.add(targetBean);
-
- return targetBean;
+ =
+ return null;
}
=
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jbo=
ss/webservices/integration/metadata/MetaDataBuilderEJB3.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/web=
services/integration/metadata/MetaDataBuilderEJB3.java 2009-08-13 11:26:04 =
UTC (rev 10533)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/web=
services/integration/metadata/MetaDataBuilderEJB3.java 2009-08-13 14:10:42 =
UTC (rev 10534)
@@ -21,23 +21,23 @@
*/
package org.jboss.webservices.integration.metadata;
=
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+
import org.jboss.wsf.common.integration.WSHelper;
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration;
import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
-import org.jboss.wsf.spi.metadata.j2ee.PortComponentSpec;
+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.PortComponentSpec;
import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData;
-import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData;
=
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
/**
* Builds container independent meta data from EJB3 container meta data. =
*
@@ -47,70 +47,112 @@
final class MetaDataBuilderEJB3 extends AbstractMetaDataBuilderEJB
{
=
+ /**
+ * Constructor.
+ */
+ MetaDataBuilderEJB3()
+ {
+ super();
+ }
+
+ /**
+ * @see AbstractMetaDataBuilderEJB#buildEnterpriseBeansMetaData(Deploym=
ent, EJBArchiveMetaData)
+ * =
+ * @param dep webservice deployment
+ * @param ejbArchiveMD EJB archive meta data
+ */
@Override
- protected void buildEnterpriseBeansMetaData(Deployment dep, EJBArchiveM=
etaData jarMetaData)
+ protected void buildEnterpriseBeansMetaData(final Deployment dep, final=
EJBArchiveMetaData ejbArchiveMD)
{
- WebServiceDeployment ejb3Deployment =3D WSHelper.getRequiredAttachme=
nt(dep, WebServiceDeployment.class);
- List ejbMetaDataList =3D new ArrayList();
- Iterator it =3D ejb3Deployment.getServiceEndp=
oints().iterator();
- while (it.hasNext())
+ final WebServiceDeployment ejb3Deployment =3D WSHelper.getRequiredAt=
tachment(dep, WebServiceDeployment.class);
+ final List wsEjbsMD =3D new ArrayList();
+ =
+ for (final WebServiceDeclaration jbossEjbMD : ejb3Deployment.getServ=
iceEndpoints())
{
- WebServiceDeclaration container =3D it.next();
+ this.buildEnterpriseBeanMetaData(wsEjbsMD, jbossEjbMD);
+ }
=
- PortComponentSpec pcMetaData =3D container.getAnnotation(PortComp=
onentSpec.class);
- MessageDriven mdbMetaData =3D container.getAnnotation(MessageDriv=
en.class);
+ ejbArchiveMD.setEnterpriseBeans(wsEjbsMD);
+ }
+ =
+ /**
+ * Builds JBoss agnostic EJB meta data.
+ * =
+ * @param wsEjbsMD jboss agnostic EJBs meta data
+ * @param jbossEjbMD jboss specific EJB meta data
+ */
+ private void buildEnterpriseBeanMetaData(final List wsEjbs=
MD, final WebServiceDeclaration jbossEjbMD)
+ {
+ final EJBMetaData wsEjbMD =3D this.newEjbMetaData(jbossEjbMD);
=
- EJBMetaData ejbMetaData =3D null;
+ if (wsEjbMD !=3D null)
+ {
+ // set EJB name and class
+ wsEjbMD.setEjbName(jbossEjbMD.getComponentName());
+ wsEjbMD.setEjbClass(jbossEjbMD.getComponentClassName());
=
- if (mdbMetaData !=3D null)
+ final PortComponentSpec portComponentAnnotation =3D jbossEjbMD.ge=
tAnnotation(PortComponentSpec.class);
+ if (portComponentAnnotation !=3D null)
{
- ejbMetaData =3D new MDBMetaData();
+ // set port component meta data
+ wsEjbMD.setPortComponentName(portComponentAnnotation.portCompo=
nentName());
+ wsEjbMD.setPortComponentURI(portComponentAnnotation.portCompon=
entURI());
=
- ActivationConfigProperty[] props =3D mdbMetaData.activationCon=
fig();
- if (props !=3D null)
- {
- String destination =3D getActivationProperty("destination",=
props);
- if (destination !=3D null)
- {
- ((MDBMetaData)ejbMetaData).setDestinationJndiName(destin=
ation);
- }
- }
+ // set security meta data
+ final EJBSecurityMetaData wsEjbSecurityMD =3D new EJBSecurityM=
etaData();
+ wsEjbSecurityMD.setAuthMethod(portComponentAnnotation.authMeth=
od());
+ wsEjbSecurityMD.setTransportGuarantee(portComponentAnnotation.=
transportGuarantee());
+ wsEjbSecurityMD.setSecureWSDLAccess(portComponentAnnotation.se=
cureWSDLAccess());
+ wsEjbMD.setSecurityMetaData(wsEjbSecurityMD);
}
- else
- {
- ejbMetaData =3D new SLSBMetaData();
- }
=
- if (ejbMetaData !=3D null)
- {
- ejbMetaData.setEjbName(container.getComponentName());
- ejbMetaData.setEjbClass(container.getComponentClassName());
+ wsEjbsMD.add(wsEjbMD);
+ }
=
- if (pcMetaData !=3D null)
- {
- ejbMetaData.setPortComponentName(pcMetaData.portComponentNa=
me());
- ejbMetaData.setPortComponentURI(pcMetaData.portComponentURI=
());
- EJBSecurityMetaData smd =3D new EJBSecurityMetaData();
- smd.setAuthMethod(pcMetaData.authMethod());
- smd.setTransportGuarantee(pcMetaData.transportGuarantee());
- smd.setSecureWSDLAccess(pcMetaData.secureWSDLAccess());
- ejbMetaData.setSecurityMetaData(smd);
- }
+ }
+ =
+ /**
+ * Creates new JBoss agnostic EJB bean meta data model.
+ *
+ * @param jbossEjbMD jboss EJB meta data
+ * @return webservices EJB meta data
+ */
+ private EJBMetaData newEjbMetaData(final WebServiceDeclaration jbossEjb=
MD)
+ {
+ final MessageDriven mdbAnnotation =3D jbossEjbMD.getAnnotation(Messa=
geDriven.class);
=
- ejbMetaDataList.add(ejbMetaData);
- }
+ if (mdbAnnotation =3D=3D null)
+ {
+ return new SLSBMetaData();
}
+ else
+ {
+ final MDBMetaData mdbMD =3D new MDBMetaData();
=
- jarMetaData.setEnterpriseBeans(ejbMetaDataList);
+ final String destinationName =3D this.getActivationProperty("dest=
ination", mdbAnnotation.activationConfig());
+ mdbMD.setDestinationJndiName(destinationName);
+ =
+ return mdbMD;
+ }
}
=
- private String getActivationProperty(String name, ActivationConfigPrope=
rty[] props)
+ /**
+ * Returns activation config property value or null if not found.
+ * =
+ * @param name activation property name
+ * @param activationConfigProperties activation config properties
+ * @return activation config property value
+ */
+ private String getActivationProperty(final String name, final Activatio=
nConfigProperty[] activationConfigProperties)
{
- for (ActivationConfigProperty p : props)
+ if (activationConfigProperties !=3D null)
{
- if (p.propertyName().equals(name))
+ for (final ActivationConfigProperty activationConfigProperty : ac=
tivationConfigProperties)
{
- return p.propertyValue();
+ if (activationConfigProperty.propertyName().equals(name))
+ {
+ return activationConfigProperty.propertyValue();
+ }
}
}
=
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jbo=
ss/webservices/integration/metadata/PublishLocationAdapterImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/web=
services/integration/metadata/PublishLocationAdapterImpl.java 2009-08-13 11=
:26:04 UTC (rev 10533)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/web=
services/integration/metadata/PublishLocationAdapterImpl.java 2009-08-13 14=
:10:42 UTC (rev 10534)
@@ -29,6 +29,7 @@
* Publish location adapter implementation.
*
* @author Richard Opalka
+ * @author Thomas Diesler
*/
final class PublishLocationAdapterImpl implements PublishLocationAdapter
{
@@ -48,11 +49,17 @@
this.wsDescriptionsMD =3D wsDescriptionsMD;
}
=
+ /**
+ * @see org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter#getWsdlP=
ublishLocationByName(String)
+ * =
+ * @param endpointName endpoint name
+ * @return publish location
+ */
public String getWsdlPublishLocationByName(final String endpointName)
{
if (this.wsDescriptionsMD !=3D null)
{
- final WebserviceDescriptionMetaData endpointMD =3D wsDescriptions=
MD.get(endpointName);
+ final WebserviceDescriptionMetaData endpointMD =3D this.wsDescrip=
tionsMD.get(endpointName);
=
if (endpointMD !=3D null)
{
--===============2411394169726019911==--