Author: richard.opalka(a)jboss.com Date: 2011-06-27 15:29:39 -0400 (Mon, 27 Jun 2011) New Revision: 14633 Added: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/WebServiceDeclaration.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/WebServiceDeployment.java Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.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/tomcat/SecurityMetaDataAccessorEJB3.java container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/util/ASHelper.java Log: [JBWS-3323] adding ASIL abstraction classes Added: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/WebServiceDeclaration.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/WebServiceDeclaration.java (rev 0) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/WebServiceDeclaration.java 2011-06-27 19:29:39 UTC (rev 14633) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.webservices.integration; + +import javax.naming.Context; + +/** + * A minimum web service meta data representation that offers a generic + * way to access more fine grained meta data through {@link #getAnnotation(Class)} + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public interface WebServiceDeclaration +{ + /** + * A distinct identifier across deployments.<br> + * In case of EJB3 this would be the <code>ObjectName</code> under which get's registered with the MC. + * @return + */ + String getContainerName(); + + /** + * An identifier within a deployment. + * In case of EJB3 this would be the <code>ejb-name</code>. + * @return a name, that can be used to susequently address the service impl. + */ + String getComponentName(); + + /** + * Web service endpoint implementation class + * @return + */ + String getComponentClassName(); + + /** + * Get a unified meta data view represented by an annotation. + * + * @param t + * @return + */ + <T extends java.lang.annotation.Annotation> T getAnnotation(Class<T> t); +} Added: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/WebServiceDeployment.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/WebServiceDeployment.java (rev 0) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/WebServiceDeployment.java 2011-06-27 19:29:39 UTC (rev 14633) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.webservices.integration; + +import java.util.List; + +/** + * A web service deployment contains {@link WebServiceDeclaration} declarations. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; + */ +public interface WebServiceDeployment +{ + List<WebServiceDeclaration> getServiceEndpoints(); +} Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java 2011-06-27 19:27:12 UTC (rev 14632) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java 2011-06-27 19:29:39 UTC (rev 14633) @@ -40,8 +40,8 @@ import org.jboss.metadata.ejb.jboss.JBossMetaData; import org.jboss.webservices.integration.util.ASHelper; import org.jboss.ws.api.util.BundleUtils; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment; +import org.jboss.webservices.integration.WebServiceDeclaration; +import org.jboss.webservices.integration.WebServiceDeployment; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; /** Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2011-06-27 19:27:12 UTC (rev 14632) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2011-06-27 19:29:39 UTC (rev 14633) @@ -28,7 +28,7 @@ import org.jboss.metadata.web.jboss.JBossWebMetaData; import org.jboss.webservices.integration.util.ASHelper; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment; +import org.jboss.webservices.integration.WebServiceDeployment; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; /** Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2011-06-27 19:27:12 UTC (rev 14632) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXRPC_EJB21.java 2011-06-27 19:29:39 UTC (rev 14633) @@ -25,7 +25,7 @@ import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData; import org.jboss.metadata.ejb.jboss.JBossMetaData; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment; +import org.jboss.webservices.integration.WebServiceDeployment; import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; import org.jboss.wsf.spi.metadata.webservices.WebserviceDescriptionMetaData; import org.jboss.wsf.spi.metadata.webservices.WebservicesMetaData; Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2011-06-27 19:27:12 UTC (rev 14632) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/deployers/deployment/DeploymentModelBuilderJAXWS_EJB3.java 2011-06-27 19:29:39 UTC (rev 14633) @@ -26,8 +26,8 @@ import org.jboss.webservices.integration.util.ASHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment; +import org.jboss.webservices.integration.WebServiceDeclaration; +import org.jboss.webservices.integration.WebServiceDeployment; /** * Creates new JAXWS EJB3 deployment. Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2011-06-27 19:27:12 UTC (rev 14632) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2011-06-27 19:29:39 UTC (rev 14633) @@ -49,8 +49,8 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.Service; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment; +import org.jboss.webservices.integration.WebServiceDeclaration; +import org.jboss.webservices.integration.WebServiceDeployment; import org.jboss.wsf.spi.metadata.injection.InjectionMetaData; import org.jboss.wsf.spi.metadata.injection.InjectionsMetaData; import org.jboss.wsf.spi.metadata.injection.ReferenceResolver; 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-06-27 19:27:12 UTC (rev 14632) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2011-06-27 19:29:39 UTC (rev 14633) @@ -29,8 +29,8 @@ import org.jboss.ws.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.webservices.integration.WebServiceDeclaration; +import org.jboss.webservices.integration.WebServiceDeployment; import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData; Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java 2011-06-27 19:27:12 UTC (rev 14632) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java 2011-06-27 19:29:39 UTC (rev 14633) @@ -32,8 +32,8 @@ import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment; +import org.jboss.webservices.integration.WebServiceDeclaration; +import org.jboss.webservices.integration.WebServiceDeployment; /** * Creates web app security meta data for EJB 3 deployment. Modified: container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/util/ASHelper.java =================================================================== --- container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/util/ASHelper.java 2011-06-27 19:27:12 UTC (rev 14632) +++ container/jboss60/branches/jbossws-jboss600/src/main/java/org/jboss/webservices/integration/util/ASHelper.java 2011-06-27 19:29:39 UTC (rev 14633) @@ -39,8 +39,8 @@ import org.jboss.metadata.web.spec.ServletMetaData; import org.jboss.ws.api.util.BundleUtils; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration; -import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment; +import org.jboss.webservices.integration.WebServiceDeclaration; +import org.jboss.webservices.integration.WebServiceDeployment; /** * JBoss AS integration helper class.