Author: richard.opalka(a)jboss.com Date: 2011-11-07 09:00:31 -0500 (Mon, 07 Nov 2011) New Revision: 15201 Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java Log: [JBWS-3376] refactoring jboss-webservices.xml file format Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java 2011-11-07 14:00:15 UTC (rev 15200) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java 2011-11-07 14:00:31 UTC (rev 15201) @@ -27,8 +27,8 @@ import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter; import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; -import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; -import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.wsf.spi.metadata.webservices.JBossPortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.JBossWebserviceDescriptionMetaData; /** * Common class for EJB meta data builders. @@ -101,18 +101,16 @@ ejbArchiveMD.setConfigFile(configFile); // set wsdl location resolver - final WebserviceDescriptionMetaData[] wsDescriptionsMD = webservicesMD.getWebserviceDescriptions(); + final JBossWebserviceDescriptionMetaData[] wsDescriptionsMD = webservicesMD.getWebserviceDescriptions(); final PublishLocationAdapter resolver = new PublishLocationAdapterImpl(wsDescriptionsMD); ejbArchiveMD.setPublishLocationAdapter(resolver); } - protected PortComponentMetaData getPortComponent(final String ejbName, final JBossWebservicesMetaData jbossWebservicesMD) { + protected JBossPortComponentMetaData getPortComponent(final String ejbName, final JBossWebservicesMetaData jbossWebservicesMD) { if (jbossWebservicesMD == null) return null; - - PortComponentMetaData portComponentMD = null; - for (final WebserviceDescriptionMetaData webserviceDescriptionMD : jbossWebservicesMD.getWebserviceDescriptions()) { - portComponentMD = webserviceDescriptionMD.getPortComponentByEjbLinkName(ejbName); - if (portComponentMD != null) return portComponentMD; + + for (final JBossPortComponentMetaData jbossPortComponentMD : jbossWebservicesMD.getPortComponents()) { + if (ejbName.equals(jbossPortComponentMD.getEjbName())) return jbossPortComponentMD; } return null; Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java 2011-11-07 14:00:15 UTC (rev 15200) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java 2011-11-07 14:00:31 UTC (rev 15201) @@ -34,7 +34,7 @@ import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData; import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData; import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; -import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.JBossPortComponentMetaData; /** * Builds container independent meta data from EJB21 container meta data. @@ -108,18 +108,18 @@ wsEjbMD.setJndiName(sessionEjbMD.determineJndiName()); wsEjbMD.setLocalJndiName(jbossEjbMD.determineLocalJndiName()); - final PortComponentMetaData portComponentMD = getPortComponent(jbossEjbMD.getEjbName(), jbossWebservicesMD); - if (portComponentMD != null) + final JBossPortComponentMetaData jbossPortComponentMD = getPortComponent(jbossEjbMD.getEjbName(), jbossWebservicesMD); + if (jbossPortComponentMD != null) { // set port component meta data - wsEjbMD.setPortComponentName(portComponentMD.getPortComponentName()); - wsEjbMD.setPortComponentURI(portComponentMD.getPortComponentURI()); + wsEjbMD.setPortComponentName(jbossPortComponentMD.getPortComponentName()); + wsEjbMD.setPortComponentURI(jbossPortComponentMD.getPortComponentURI()); // set security meta data final EJBSecurityMetaData smd = new EJBSecurityMetaData(); - smd.setAuthMethod(portComponentMD.getAuthMethod()); - smd.setTransportGuarantee(portComponentMD.getTransportGuarantee()); - smd.setSecureWSDLAccess(portComponentMD.getSecureWSDLAccess()); + smd.setAuthMethod(jbossPortComponentMD.getAuthMethod()); + smd.setTransportGuarantee(jbossPortComponentMD.getTransportGuarantee()); + smd.setSecureWSDLAccess(jbossPortComponentMD.getSecureWSDLAccess()); wsEjbMD.setSecurityMetaData(smd); } } Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2011-11-07 14:00:15 UTC (rev 15200) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2011-11-07 14:00:31 UTC (rev 15201) @@ -35,7 +35,7 @@ import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData; import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData; import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; -import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; +import org.jboss.wsf.spi.metadata.webservices.JBossPortComponentMetaData; /** * Builds container independent meta data from EJB3 container meta data. @@ -92,7 +92,7 @@ if (jbossEjbMD.isSession()) { - final PortComponentMetaData portComponentMD = getPortComponent(jbossEjbMD.getEjbName(), jbossWebservicesMD); + final JBossPortComponentMetaData portComponentMD = getPortComponent(jbossEjbMD.getEjbName(), jbossWebservicesMD); if (portComponentMD != null) { // set port component meta data Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java 2011-11-07 14:00:15 UTC (rev 15200) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/PublishLocationAdapterImpl.java 2011-11-07 14:00:31 UTC (rev 15201) @@ -22,7 +22,7 @@ package org.jboss.webservices.integration.metadata; import org.jboss.wsf.spi.metadata.j2ee.PublishLocationAdapter; -import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; +import org.jboss.wsf.spi.metadata.webservices.JBossWebserviceDescriptionMetaData; /** * Publish location adapter implementation. @@ -33,14 +33,14 @@ final class PublishLocationAdapterImpl implements PublishLocationAdapter { /** Webservice descriptions meta data. */ - private final WebserviceDescriptionMetaData[] wsDescriptionsMD; + private final JBossWebserviceDescriptionMetaData[] wsDescriptionsMD; /** * Constructor. * * @param wsDescriptionsMD webservice descriptions meta data */ - PublishLocationAdapterImpl(final WebserviceDescriptionMetaData[] wsDescriptionsMD) + PublishLocationAdapterImpl(final JBossWebserviceDescriptionMetaData[] wsDescriptionsMD) { this.wsDescriptionsMD = wsDescriptionsMD; } @@ -55,7 +55,7 @@ { if (wsDescriptionsMD != null) { - for (final WebserviceDescriptionMetaData wsDescriptionMD : wsDescriptionsMD) + for (final JBossWebserviceDescriptionMetaData wsDescriptionMD : wsDescriptionsMD) { if (endpointName.equals(wsDescriptionMD.getWebserviceDescriptionName())) return wsDescriptionMD.getWsdlPublishLocation(); @@ -64,4 +64,5 @@ return null; } + }