July 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r4013 - in trunk: integration/jboss40/src/main/resources and 9 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-27 00:37:52 -0400 (Fri, 27 Jul 2007) New Revision: 4013 Added: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/EJBArchiveMetaDataAdapterEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataAdapter.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataDeploymentAspect.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapter.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JSEArchiveMetaDataAdapter.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataAdapter.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataDeploymentAspect.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB21.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB3.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JSEArchiveMetaDataAdapter.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/ContainerMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBArchiveMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBSecurityMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSEArchiveMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSESecurityMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/MDBMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/SLSBMetaData.java Removed: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ApplicationMetaDataAdapterEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapterFactory.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeploymentAspect.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedApplicationMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedBeanMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedEjbPortComponentMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedMessageDrivenMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedSessionMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedWebMetaData.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedWebSecurityMetaData.java Modified: trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB21.java trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BackwardCompatibleContextRootDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java Log: Refactor container meta data Deleted: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ApplicationMetaDataAdapterEJB21.java =================================================================== --- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ApplicationMetaDataAdapterEJB21.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ApplicationMetaDataAdapterEJB21.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -1,82 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.container.jboss40; - -// $Id$ - -import org.jboss.metadata.BeanMetaData; -import org.jboss.metadata.EjbPortComponentMetaData; -import org.jboss.metadata.MessageDrivenMetaData; -import org.jboss.metadata.SessionMetaData; -import org.jboss.wsf.container.jboss42.AbstractApplicationMetaDataAdapter; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedSessionMetaData; - -/** - * Build container independent application meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class ApplicationMetaDataAdapterEJB21 extends AbstractApplicationMetaDataAdapter -{ - @Override - protected UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd) - { - UnifiedBeanMetaData ubmd = null; - if (bmd instanceof SessionMetaData) - { - ubmd = new UnifiedSessionMetaData(); - } - else if (bmd instanceof MessageDrivenMetaData) - { - ubmd = new UnifiedMessageDrivenMetaData(); - ((UnifiedMessageDrivenMetaData)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(); - if (pcmd != null) - { - UnifiedEjbPortComponentMetaData upcmd = new UnifiedEjbPortComponentMetaData(); - upcmd.setPortComponentName(pcmd.getPortComponentName()); - upcmd.setPortComponentURI(pcmd.getPortComponentURI()); - upcmd.setAuthMethod(pcmd.getAuthMethod()); - upcmd.setTransportGuarantee(pcmd.getTransportGuarantee()); - //upcmd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess()); - ubmd.setPortComponent(upcmd); - } - } - return ubmd; - } -} Copied: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/EJBArchiveMetaDataAdapterEJB21.java (from rev 4012, trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ApplicationMetaDataAdapterEJB21.java) =================================================================== --- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/EJBArchiveMetaDataAdapterEJB21.java (rev 0) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/EJBArchiveMetaDataAdapterEJB21.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -0,0 +1,82 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.container.jboss40; + +// $Id$ + +import org.jboss.metadata.BeanMetaData; +import org.jboss.metadata.EjbPortComponentMetaData; +import org.jboss.metadata.MessageDrivenMetaData; +import org.jboss.metadata.SessionMetaData; +import org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapter; +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; + +/** + * Build container independent application meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class EJBArchiveMetaDataAdapterEJB21 extends EJBArchiveMetaDataAdapter +{ + @Override + protected EJBMetaData buildUnifiedBeanMetaData(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(); + if (pcmd != null) + { + ubmd.setPortComponentName(pcmd.getPortComponentName()); + ubmd.setPortComponentURI(pcmd.getPortComponentURI()); + EJBSecurityMetaData smd = new EJBSecurityMetaData(); + smd.setAuthMethod(pcmd.getAuthMethod()); + smd.setTransportGuarantee(pcmd.getTransportGuarantee()); + //smd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess()); + ubmd.setSecurityMetaData(smd); + } + } + return ubmd; + } +} Modified: trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml =================================================================== --- trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-07-27 04:37:52 UTC (rev 4013) @@ -80,6 +80,11 @@  + <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ContainerMetaDataDeploymentAspect"> + <property name="provides">ContainerMetaData</property> + <property name="metaDataAdapter"><inject bean="WSContainerMetaDataAdapter"/></property> + </bean> + <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect"> <property name="requires">ContainerMetaData</property> <property name="provides">ContextRoot</property> @@ -118,11 +123,6 @@ <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> </bean> - <bean name="WSUnifiedDeploymentInfoDeploymentAspect" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeploymentAspect"> - <property name="provides">ContainerMetaData</property> - <property name="deploymentInfoAdapter"><inject bean="WSDeploymentInfoAdapter"/></property> - </bean> - <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect"> <property name="requires">ContextRoot, ContainerMetaData</property> <property name="provides">URLPattern</property> @@ -141,9 +141,9 @@ </bean>  - <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss40.ApplicationMetaDataAdapterEJB21"/> - <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB3"/> - <bean name="WSDeploymentInfoAdapter" class="org.jboss.wsf.container.jboss42.DeploymentInfoAdapter"> + <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss40.EJBArchiveMetaDataAdapterEJB21"/> + <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB3"/> + <bean name="WSContainerMetaDataAdapter" class="org.jboss.wsf.container.jboss42.ContainerMetaDataAdapter"> <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property> <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property> <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property> @@ -153,7 +153,7 @@ <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/> <bean name="WSServiceRefMetaDataAdapter" class="org.jboss.wsf.container.jboss40.ServiceRefMetaDataAdapter"/> <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.framework.deployment.DefaultWebAppDesciptorModifierImpl"/> - <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.WebMetaDataAdapter"/> + <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.JSEArchiveMetaDataAdapter"/> <bean name="WSWebXMLRewriter" class="org.jboss.wsf.framework.deployment.WebXMLRewriterImpl"> <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> </bean> @@ -163,6 +163,7 @@ <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContainerMetaDataDeploymentAspect"/> <inject bean="WSContextRootDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> @@ -171,7 +172,6 @@ <inject bean="WSEndpointNameDeploymentAspect"/> <inject bean="WSEndpointRegistryDeploymentAspect"/> <inject bean="WSModifyWebMetaDataDeploymentAspect"/> - <inject bean="WSUnifiedDeploymentInfoDeploymentAspect"/> <inject bean="WSURLPatternDeploymentAspect"/> </set> </property> @@ -180,6 +180,7 @@ <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContainerMetaDataDeploymentAspect"/> <inject bean="WSContextRootDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> @@ -187,7 +188,6 @@ <inject bean="WSEndpointMetricsDeploymentAspect"/> <inject bean="WSEndpointNameDeploymentAspect"/> <inject bean="WSEndpointRegistryDeploymentAspect"/> - <inject bean="WSUnifiedDeploymentInfoDeploymentAspect"/> <inject bean="WSURLPatternDeploymentAspect"/> <inject bean="WSWebAppDeploymentAspect"/> <inject bean="WSWebAppGeneratorDeploymentAspect"/> Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -1,89 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.container.jboss42; - -// $Id$ - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.metadata.ApplicationMetaData; -import org.jboss.metadata.BeanMetaData; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; - -/** - * Build container independent application meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public abstract class AbstractApplicationMetaDataAdapter -{ - public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, DeploymentInfo di) - { - ApplicationMetaData apmd = (ApplicationMetaData)di.metaData; - dep.addAttachment(ApplicationMetaData.class, apmd); - - UnifiedApplicationMetaData appMetaData = new UnifiedApplicationMetaData(); - buildUnifiedBeanMetaData(appMetaData, apmd); - appMetaData.setConfigName(apmd.getConfigName()); - appMetaData.setConfigFile(apmd.getConfigFile()); - appMetaData.setWebServiceContextRoot(apmd.getWebServiceContextRoot()); - appMetaData.setSecurityDomain(apmd.getSecurityDomain()); - appMetaData.setPublishLocationAdapter(getPublishLocationAdpater(apmd)); - return appMetaData; - } - - protected PublishLocationAdapter getPublishLocationAdpater(final ApplicationMetaData apmd) - { - return new PublishLocationAdapter() - { - public String getWsdlPublishLocationByName(String name) - { - return apmd.getWsdlPublishLocationByName(name); - } - }; - } - - protected void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData metaData) - { - List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>(); - Iterator it = metaData.getEnterpriseBeans(); - while (it.hasNext()) - { - BeanMetaData bmd = (BeanMetaData)it.next(); - UnifiedBeanMetaData ubmd = buildUnifiedBeanMetaData(bmd); - if (ubmd != null) - { - beans.add(ubmd); - } - } - umd.setEnterpriseBeans(beans); - } - - protected abstract UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd); -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB21.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB21.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -1,81 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.container.jboss42; - -// $Id$ - -import org.jboss.metadata.BeanMetaData; -import org.jboss.metadata.EjbPortComponentMetaData; -import org.jboss.metadata.MessageDrivenMetaData; -import org.jboss.metadata.SessionMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedSessionMetaData; - -/** - * Build container independent application meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class ApplicationMetaDataAdapterEJB21 extends AbstractApplicationMetaDataAdapter -{ - @Override - protected UnifiedBeanMetaData buildUnifiedBeanMetaData(BeanMetaData bmd) - { - UnifiedBeanMetaData ubmd = null; - if (bmd instanceof SessionMetaData) - { - ubmd = new UnifiedSessionMetaData(); - } - else if (bmd instanceof MessageDrivenMetaData) - { - ubmd = new UnifiedMessageDrivenMetaData(); - ((UnifiedMessageDrivenMetaData)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(); - if (pcmd != null) - { - UnifiedEjbPortComponentMetaData upcmd = new UnifiedEjbPortComponentMetaData(); - upcmd.setPortComponentName(pcmd.getPortComponentName()); - upcmd.setPortComponentURI(pcmd.getPortComponentURI()); - upcmd.setAuthMethod(pcmd.getAuthMethod()); - upcmd.setTransportGuarantee(pcmd.getTransportGuarantee()); - upcmd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess()); - ubmd.setPortComponent(upcmd); - } - } - return ubmd; - } -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -1,103 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.container.jboss42; - -// $Id$ - -import java.util.ArrayList; - -import javax.management.MBeanServer; -import javax.management.ObjectName; - -import org.jboss.ejb3.Ejb3ModuleMBean; -import org.jboss.ejb3.stateless.StatelessContainer; -import org.jboss.logging.Logger; -import org.jboss.mx.util.MBeanProxy; -import org.jboss.mx.util.MBeanProxyCreationException; -import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.WSFDeploymentException; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedSessionMetaData; - -/** - * Build container independent application meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 14-Apr-2007 - */ -public class ApplicationMetaDataAdapterEJB3 -{ - // logging support - private static Logger log = Logger.getLogger(ApplicationMetaDataAdapterEJB3.class); - - public static final String DEPLOYED_OBJECT = "org.jboss.ws.ejb3.deployed.object"; - - public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep) - { - UnifiedApplicationMetaData appMetaData = null; - - ObjectName oname = (ObjectName)dep.getProperty(DEPLOYED_OBJECT); - - // jboss.j2ee:service=EJB3,module=some-ejb3.jar - if (oname != null && oname.getDomain().equals("jboss.j2ee") && "EJB3".equals(oname.getKeyProperty("service"))) - { - Ejb3ModuleMBean ejb3Module = getEJB3Module(oname); - - ArrayList<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>(); - for (Object container : ejb3Module.getContainers().values()) - { - if (container instanceof StatelessContainer) - { - StatelessContainer slc = (StatelessContainer)container; - UnifiedBeanMetaData usmd = new UnifiedSessionMetaData(); - usmd.setEjbName(slc.getEjbName()); - usmd.setEjbClass(slc.getBeanClassName()); - beans.add(usmd); - } - } - - appMetaData = new UnifiedApplicationMetaData(); - appMetaData.setEnterpriseBeans(beans); - } - return appMetaData; - } - - static Ejb3ModuleMBean getEJB3Module(ObjectName objectName) - { - Ejb3ModuleMBean ejb3Module; - try - { - MBeanServer server = MBeanServerLocator.locateJBoss(); - ejb3Module = (Ejb3ModuleMBean)MBeanProxy.get(Ejb3ModuleMBean.class, objectName, server); - if (ejb3Module == null) - throw new WSFDeploymentException("Cannot obtain EJB3 module: " + objectName); - - return ejb3Module; - } - catch (MBeanProxyCreationException ex) - { - throw new WSFDeploymentException("Cannot obtain proxy to EJB3 module"); - } - } -} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataAdapter.java (from rev 4012, trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataAdapter.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataAdapter.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -0,0 +1,117 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.container.jboss42; + +// $Id$ + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.logging.Logger; +import org.jboss.metadata.ApplicationMetaData; +import org.jboss.metadata.WebMetaData; +import org.jboss.wsf.framework.deployment.WebXMLRewriter; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; + +/** + * Build container independent deployment info. + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class ContainerMetaDataAdapter +{ + // logging support + private static Logger log = Logger.getLogger(ContainerMetaDataAdapter.class); + + private EJBArchiveMetaDataAdapterEJB3 applicationMetaDataAdapterEJB3; + private EJBArchiveMetaDataAdapter applicationMetaDataAdapterEJB21; + private JSEArchiveMetaDataAdapter webMetaDataAdapter; + + public void setApplicationMetaDataAdapterEJB21(EJBArchiveMetaDataAdapter adapter) + { + this.applicationMetaDataAdapterEJB21 = adapter; + } + + public void setApplicationMetaDataAdapterEJB3(EJBArchiveMetaDataAdapterEJB3 adapter) + { + this.applicationMetaDataAdapterEJB3 = adapter; + } + + public void setWebMetaDataAdapter(JSEArchiveMetaDataAdapter adapter) + { + this.webMetaDataAdapter = adapter; + } + + public void buildContainerMetaData(Deployment dep, DeploymentInfo di) + { + dep.addAttachment(DeploymentInfo.class, di); + dep.setProperty(EJBArchiveMetaDataAdapterEJB3.DEPLOYED_OBJECT, di.deployedObject); + + if (di.metaData instanceof WebMetaData) + { + JSEArchiveMetaData webMetaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, di); + if (webMetaData != null) + dep.addAttachment(JSEArchiveMetaData.class, webMetaData); + + dep.setProperty(WebXMLRewriter.WEBAPP_URL, getDeploymentURL(di)); + } + else if (dep.getType() == DeploymentType.JAXRPC_EJB3 || dep.getType() == DeploymentType.JAXWS_EJB3) + { + EJBArchiveMetaData appMetaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep); + if (appMetaData != null) + dep.addAttachment(EJBArchiveMetaData.class, appMetaData); + } + else if (di.metaData instanceof ApplicationMetaData) + { + EJBArchiveMetaData appMetaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, di); + if (appMetaData != null) + dep.addAttachment(EJBArchiveMetaData.class, appMetaData); + } + } + + private URL getDeploymentURL(DeploymentInfo di) + { + URL deploymentURL = (di.localUrl != null ? di.localUrl : di.url); + if ("file".equals(deploymentURL.getProtocol())) + { + String path = deploymentURL.getPath(); + if (new File(path).isFile()) + { + try + { + deploymentURL = new URL("jar:file:" + path + "!/"); + } + catch (MalformedURLException e) + { + // ignore + } + } + } + return deploymentURL; + } +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataDeploymentAspect.java (from rev 4012, trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeploymentAspect.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataDeploymentAspect.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ContainerMetaDataDeploymentAspect.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.container.jboss42; + +//$Id: UnifiedDeploymentInfoDeployer.java 3407 2007-06-03 16:06:36Z thomas.diesler(a)jboss.com $ + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspect; + +/** + * A deployer that builds the UnifiedDeploymentInfo + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class ContainerMetaDataDeploymentAspect extends DeploymentAspect +{ + private ContainerMetaDataAdapter metaDataAdapter; + + public void setMetaDataAdapter(ContainerMetaDataAdapter adapter) + { + this.metaDataAdapter = adapter; + } + + @Override + public void create(Deployment dep) + { + DeploymentInfo di = dep.getAttachment(DeploymentInfo.class); + if (di == null) + throw new IllegalStateException("Cannot obtain deployment info"); + + metaDataAdapter.buildContainerMetaData(dep, di); + } +} \ No newline at end of file Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -1,117 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.container.jboss42; - -// $Id$ - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.logging.Logger; -import org.jboss.metadata.ApplicationMetaData; -import org.jboss.metadata.WebMetaData; -import org.jboss.wsf.framework.deployment.WebXMLRewriter; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; - -/** - * Build container independent deployment info. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class DeploymentInfoAdapter -{ - // logging support - private static Logger log = Logger.getLogger(DeploymentInfoAdapter.class); - - private ApplicationMetaDataAdapterEJB3 applicationMetaDataAdapterEJB3; - private AbstractApplicationMetaDataAdapter applicationMetaDataAdapterEJB21; - private WebMetaDataAdapter webMetaDataAdapter; - - public void setApplicationMetaDataAdapterEJB21(AbstractApplicationMetaDataAdapter adapter) - { - this.applicationMetaDataAdapterEJB21 = adapter; - } - - public void setApplicationMetaDataAdapterEJB3(ApplicationMetaDataAdapterEJB3 adapter) - { - this.applicationMetaDataAdapterEJB3 = adapter; - } - - public void setWebMetaDataAdapter(WebMetaDataAdapter adapter) - { - this.webMetaDataAdapter = adapter; - } - - public void buildDeploymentInfo(Deployment dep, DeploymentInfo di) - { - dep.addAttachment(DeploymentInfo.class, di); - dep.setProperty(ApplicationMetaDataAdapterEJB3.DEPLOYED_OBJECT, di.deployedObject); - - if (di.metaData instanceof WebMetaData) - { - UnifiedWebMetaData webMetaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, di); - if (webMetaData != null) - dep.addAttachment(UnifiedWebMetaData.class, webMetaData); - - dep.setProperty(WebXMLRewriter.WEBAPP_URL, getDeploymentURL(di)); - } - else if (dep.getType() == DeploymentType.JAXRPC_EJB3 || dep.getType() == DeploymentType.JAXWS_EJB3) - { - UnifiedApplicationMetaData appMetaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep); - if (appMetaData != null) - dep.addAttachment(UnifiedApplicationMetaData.class, appMetaData); - } - else if (di.metaData instanceof ApplicationMetaData) - { - UnifiedApplicationMetaData appMetaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, di); - if (appMetaData != null) - dep.addAttachment(UnifiedApplicationMetaData.class, appMetaData); - } - } - - private URL getDeploymentURL(DeploymentInfo di) - { - URL deploymentURL = (di.localUrl != null ? di.localUrl : di.url); - if ("file".equals(deploymentURL.getProtocol())) - { - String path = deploymentURL.getPath(); - if (new File(path).isFile()) - { - try - { - deploymentURL = new URL("jar:file:" + path + "!/"); - } - catch (MalformedURLException e) - { - // ignore - } - } - } - return deploymentURL; - } -} Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapterFactory.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapterFactory.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapterFactory.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -1,47 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.container.jboss42; - -// $Id$ - -import org.jboss.kernel.spi.registry.KernelRegistry; -import org.jboss.kernel.spi.registry.KernelRegistryEntry; -import org.jboss.ws.integration.KernelLocator; - -/** - * @author Thomas.Diesler(a)jboss.org - * @since 10-Mar-2007 - */ -public class DeploymentInfoAdapterFactory -{ - // Hide ctor - private DeploymentInfoAdapterFactory() - { - } - - public static DeploymentInfoAdapter getDeploymentInfoAdapter() - { - KernelRegistry registry = KernelLocator.getKernel().getRegistry(); - KernelRegistryEntry entry = registry.getEntry("WSDeploymentInfoAdapter"); - return (DeploymentInfoAdapter)entry.getTarget(); - } -} Added: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapter.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapter.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapter.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -0,0 +1,89 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.container.jboss42; + +// $Id$ + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.metadata.ApplicationMetaData; +import org.jboss.metadata.BeanMetaData; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData.PublishLocationAdapter; + +/** + * Build container independent application meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public abstract class EJBArchiveMetaDataAdapter +{ + public EJBArchiveMetaData buildUnifiedApplicationMetaData(Deployment dep, DeploymentInfo di) + { + ApplicationMetaData apmd = (ApplicationMetaData)di.metaData; + dep.addAttachment(ApplicationMetaData.class, apmd); + + EJBArchiveMetaData appMetaData = new EJBArchiveMetaData(); + buildUnifiedBeanMetaData(appMetaData, apmd); + appMetaData.setConfigName(apmd.getConfigName()); + appMetaData.setConfigFile(apmd.getConfigFile()); + appMetaData.setWebServiceContextRoot(apmd.getWebServiceContextRoot()); + appMetaData.setSecurityDomain(apmd.getSecurityDomain()); + appMetaData.setPublishLocationAdapter(getPublishLocationAdpater(apmd)); + return appMetaData; + } + + protected PublishLocationAdapter getPublishLocationAdpater(final ApplicationMetaData apmd) + { + return new PublishLocationAdapter() + { + public String getWsdlPublishLocationByName(String name) + { + return apmd.getWsdlPublishLocationByName(name); + } + }; + } + + protected void buildUnifiedBeanMetaData(EJBArchiveMetaData umd, ApplicationMetaData metaData) + { + List<EJBMetaData> beans = new ArrayList<EJBMetaData>(); + Iterator it = metaData.getEnterpriseBeans(); + while (it.hasNext()) + { + BeanMetaData bmd = (BeanMetaData)it.next(); + EJBMetaData ubmd = buildUnifiedBeanMetaData(bmd); + if (ubmd != null) + { + beans.add(ubmd); + } + } + umd.setEnterpriseBeans(beans); + } + + protected abstract EJBMetaData buildUnifiedBeanMetaData(BeanMetaData bmd); +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB21.java (from rev 4012, trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB21.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB21.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB21.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -0,0 +1,81 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.container.jboss42; + +// $Id$ + +import org.jboss.metadata.BeanMetaData; +import org.jboss.metadata.EjbPortComponentMetaData; +import org.jboss.metadata.MessageDrivenMetaData; +import org.jboss.metadata.SessionMetaData; +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; + +/** + * Build container independent application meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class EJBArchiveMetaDataAdapterEJB21 extends EJBArchiveMetaDataAdapter +{ + @Override + protected EJBMetaData buildUnifiedBeanMetaData(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(); + if (pcmd != null) + { + ubmd.setPortComponentName(pcmd.getPortComponentName()); + ubmd.setPortComponentURI(pcmd.getPortComponentURI()); + EJBSecurityMetaData smd = new EJBSecurityMetaData(); + smd.setAuthMethod(pcmd.getAuthMethod()); + smd.setTransportGuarantee(pcmd.getTransportGuarantee()); + smd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess()); + ubmd.setSecurityMetaData(smd); + } + } + return ubmd; + } +} Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB3.java (from rev 4012, trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB3.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/EJBArchiveMetaDataAdapterEJB3.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -0,0 +1,103 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.container.jboss42; + +// $Id$ + +import java.util.ArrayList; + +import javax.management.MBeanServer; +import javax.management.ObjectName; + +import org.jboss.ejb3.Ejb3ModuleMBean; +import org.jboss.ejb3.stateless.StatelessContainer; +import org.jboss.logging.Logger; +import org.jboss.mx.util.MBeanProxy; +import org.jboss.mx.util.MBeanProxyCreationException; +import org.jboss.mx.util.MBeanServerLocator; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.WSFDeploymentException; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; +import org.jboss.wsf.spi.metadata.j2ee.SLSBMetaData; + +/** + * Build container independent application meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 14-Apr-2007 + */ +public class EJBArchiveMetaDataAdapterEJB3 +{ + // logging support + private static Logger log = Logger.getLogger(EJBArchiveMetaDataAdapterEJB3.class); + + public static final String DEPLOYED_OBJECT = "org.jboss.ws.ejb3.deployed.object"; + + public EJBArchiveMetaData buildUnifiedApplicationMetaData(Deployment dep) + { + EJBArchiveMetaData appMetaData = null; + + ObjectName oname = (ObjectName)dep.getProperty(DEPLOYED_OBJECT); + + // jboss.j2ee:service=EJB3,module=some-ejb3.jar + if (oname != null && oname.getDomain().equals("jboss.j2ee") && "EJB3".equals(oname.getKeyProperty("service"))) + { + Ejb3ModuleMBean ejb3Module = getEJB3Module(oname); + + ArrayList<EJBMetaData> beans = new ArrayList<EJBMetaData>(); + for (Object container : ejb3Module.getContainers().values()) + { + if (container instanceof StatelessContainer) + { + StatelessContainer slc = (StatelessContainer)container; + EJBMetaData usmd = new SLSBMetaData(); + usmd.setEjbName(slc.getEjbName()); + usmd.setEjbClass(slc.getBeanClassName()); + beans.add(usmd); + } + } + + appMetaData = new EJBArchiveMetaData(); + appMetaData.setEnterpriseBeans(beans); + } + return appMetaData; + } + + static Ejb3ModuleMBean getEJB3Module(ObjectName objectName) + { + Ejb3ModuleMBean ejb3Module; + try + { + MBeanServer server = MBeanServerLocator.locateJBoss(); + ejb3Module = (Ejb3ModuleMBean)MBeanProxy.get(Ejb3ModuleMBean.class, objectName, server); + if (ejb3Module == null) + throw new WSFDeploymentException("Cannot obtain EJB3 module: " + objectName); + + return ejb3Module; + } + catch (MBeanProxyCreationException ex) + { + throw new WSFDeploymentException("Cannot obtain proxy to EJB3 module"); + } + } +} Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -50,8 +50,8 @@ import org.jboss.wsf.spi.invocation.InvocationHandler; import org.jboss.wsf.spi.invocation.SecurityAdaptor; import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; /** * Handles invocations on EJB21 endpoints. @@ -86,8 +86,8 @@ { String ejbName = ep.getShortName(); Deployment dep = ep.getService().getDeployment(); - UnifiedApplicationMetaData apMetaData = dep.getAttachment(UnifiedApplicationMetaData.class); - UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)apMetaData.getBeanByEjbName(ejbName); + EJBArchiveMetaData apMetaData = dep.getAttachment(EJBArchiveMetaData.class); + EJBMetaData beanMetaData = (EJBMetaData)apMetaData.getBeanByEjbName(ejbName); if (beanMetaData == null) throw new WebServiceException("Cannot obtain ejb meta data for: " + ejbName); Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookEJB3.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -62,7 +62,7 @@ Service service = dep.getService(); - Ejb3ModuleMBean ejb3Module = ApplicationMetaDataAdapterEJB3.getEJB3Module(di.deployedObject); + Ejb3ModuleMBean ejb3Module = EJBArchiveMetaDataAdapterEJB3.getEJB3Module(di.deployedObject); for (Object manager : ejb3Module.getContainers().values()) { if (manager instanceof EJBContainer) @@ -93,7 +93,7 @@ boolean isWebserviceDeployment = false; // Check if the ejb3 contains annotated endpoints - Ejb3ModuleMBean ejb3Module = ApplicationMetaDataAdapterEJB3.getEJB3Module(unit.deployedObject); + Ejb3ModuleMBean ejb3Module = EJBArchiveMetaDataAdapterEJB3.getEJB3Module(unit.deployedObject); for (Object manager : ejb3Module.getContainers().values()) { if (manager instanceof EJBContainer) Copied: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JSEArchiveMetaDataAdapter.java (from rev 4012, trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java) =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JSEArchiveMetaDataAdapter.java (rev 0) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JSEArchiveMetaDataAdapter.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -0,0 +1,143 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.container.jboss42; + +// $Id$ + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import org.jboss.deployment.DeploymentInfo; +import org.jboss.deployment.J2eeApplicationMetaData; +import org.jboss.deployment.J2eeModuleMetaData; +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.WebSecurityMetaData; +import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData; +import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData.PublishLocationAdapter; +import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData.JSEResourceCollection; + +/** + * Build container independent web meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class JSEArchiveMetaDataAdapter +{ + public JSEArchiveMetaData buildUnifiedWebMetaData(Deployment dep, DeploymentInfo di) + { + String contextRoot = null; + + WebMetaData wmd = (WebMetaData)di.metaData; + dep.addAttachment(WebMetaData.class, wmd); + + if (di.parent != null) + { + J2eeApplicationMetaData appmd = (J2eeApplicationMetaData)di.parent.metaData; + Iterator it = appmd.getModules(); + while (it.hasNext()) + { + J2eeModuleMetaData module = (J2eeModuleMetaData)it.next(); + if (module.getFileName().equals(dep.getSimpleName())) + contextRoot = module.getWebContext(); + } + } + + if (contextRoot == null) + contextRoot = wmd.getContextRoot(); + + JSEArchiveMetaData webMetaData = new JSEArchiveMetaData(); + webMetaData.setContextRoot(contextRoot); + webMetaData.setServletMappings(wmd.getServletMappings()); + webMetaData.setServletClassNames(getServletClassMap(wmd)); + webMetaData.setConfigName(wmd.getConfigName()); + webMetaData.setConfigFile(wmd.getConfigFile()); + webMetaData.setSecurityDomain(wmd.getSecurityDomain()); + webMetaData.setPublishLocationAdapter(getPublishLocationAdpater(wmd)); + webMetaData.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints())); + + return webMetaData; + } + + private PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd) + { + return new PublishLocationAdapter() + { + public String getWsdlPublishLocationByName(String name) + { + return wmd.getWsdlPublishLocationByName(name); + } + }; + } + + private List<JSESecurityMetaData> getSecurityMetaData(final Iterator securityConstraints) + { + ArrayList<JSESecurityMetaData> unifiedsecurityMetaData = new ArrayList<JSESecurityMetaData>(); + + while (securityConstraints.hasNext()) + { + WebSecurityMetaData securityMetaData = (WebSecurityMetaData)securityConstraints.next(); + + JSESecurityMetaData current = new JSESecurityMetaData(); + unifiedsecurityMetaData.add(current); + + current.setTransportGuarantee(securityMetaData.getTransportGuarantee()); + + HashMap resources = securityMetaData.getWebResources(); + for (Object webResourceObj : resources.values()) + { + WebResourceCollection webResource = (WebResourceCollection)webResourceObj; + JSEResourceCollection currentResource = current.addWebResource(webResource.getName()); + for (String currentPattern : webResource.getUrlPatterns()) + { + currentResource.addPattern(currentPattern); + } + } + + } + + return unifiedsecurityMetaData; + } + + private Map<String, String> getServletClassMap(WebMetaData wmd) + { + Map<String, String> mappings = new HashMap<String, String>(); + Iterator it = wmd.getServletClassMap().entrySet().iterator(); + while (it.hasNext()) + { + Map.Entry entry = (Entry)it.next(); + String servletName = (String)entry.getKey(); + String servletClass = (String)entry.getValue(); + // Skip JSPs + if (servletClass != null) + mappings.put(servletName, servletClass); + } + return mappings; + } +} Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB21.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB21.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -31,7 +31,7 @@ import org.jboss.metadata.AssemblyDescriptorMetaData; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.SecurityHandler; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; /** * Generate a service endpoint deployment for EJB endpoints @@ -43,7 +43,7 @@ { public void addSecurityDomain(Element jbossWeb, Deployment dep) { - UnifiedApplicationMetaData appMetaData = dep.getAttachment(UnifiedApplicationMetaData.class); + EJBArchiveMetaData appMetaData = dep.getAttachment(EJBArchiveMetaData.class); if (appMetaData == null) throw new IllegalStateException("Cannot obtain application meta data"); Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -50,7 +50,7 @@ { String securityDomain = null; - ObjectName deployedObject = (ObjectName)dep.getProperty(ApplicationMetaDataAdapterEJB3.DEPLOYED_OBJECT); + ObjectName deployedObject = (ObjectName)dep.getProperty(EJBArchiveMetaDataAdapterEJB3.DEPLOYED_OBJECT); Ejb3ModuleMBean ejb3Module = getEJB3Module(deployedObject); for (Object manager : ejb3Module.getContainers().values()) { @@ -81,7 +81,7 @@ public void addSecurityRoles(Element webApp, Deployment dep) { // The container objects below provide access to all of the ejb metadata - ObjectName deployedObject = (ObjectName)dep.getProperty(ApplicationMetaDataAdapterEJB3.DEPLOYED_OBJECT); + ObjectName deployedObject = (ObjectName)dep.getProperty(EJBArchiveMetaDataAdapterEJB3.DEPLOYED_OBJECT); Ejb3ModuleMBean ejb3Module = getEJB3Module(deployedObject); for (Object manager : ejb3Module.getContainers().values()) { Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeploymentAspect.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -1,54 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.container.jboss42; - -//$Id: UnifiedDeploymentInfoDeployer.java 3407 2007-06-03 16:06:36Z thomas.diesler(a)jboss.com $ - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentAspect; - -/** - * A deployer that builds the UnifiedDeploymentInfo - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class UnifiedDeploymentInfoDeploymentAspect extends DeploymentAspect -{ - private DeploymentInfoAdapter deploymentInfoAdapter; - - public void setDeploymentInfoAdapter(DeploymentInfoAdapter adapter) - { - this.deploymentInfoAdapter = adapter; - } - - @Override - public void create(Deployment dep) - { - DeploymentInfo di = dep.getAttachment(DeploymentInfo.class); - if (di == null) - throw new IllegalStateException("Cannot obtain deployment info"); - - deploymentInfoAdapter.buildDeploymentInfo(dep, di); - } -} \ No newline at end of file Deleted: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -1,143 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.container.jboss42; - -// $Id$ - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import org.jboss.deployment.DeploymentInfo; -import org.jboss.deployment.J2eeApplicationMetaData; -import org.jboss.deployment.J2eeModuleMetaData; -import org.jboss.metadata.WebMetaData; -import org.jboss.metadata.WebSecurityMetaData; -import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; - -/** - * Build container independent web meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class WebMetaDataAdapter -{ - public UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, DeploymentInfo di) - { - String contextRoot = null; - - WebMetaData wmd = (WebMetaData)di.metaData; - dep.addAttachment(WebMetaData.class, wmd); - - if (di.parent != null) - { - J2eeApplicationMetaData appmd = (J2eeApplicationMetaData)di.parent.metaData; - Iterator it = appmd.getModules(); - while (it.hasNext()) - { - J2eeModuleMetaData module = (J2eeModuleMetaData)it.next(); - if (module.getFileName().equals(dep.getSimpleName())) - contextRoot = module.getWebContext(); - } - } - - if (contextRoot == null) - contextRoot = wmd.getContextRoot(); - - UnifiedWebMetaData webMetaData = new UnifiedWebMetaData(); - webMetaData.setContextRoot(contextRoot); - webMetaData.setServletMappings(wmd.getServletMappings()); - webMetaData.setServletClassNames(getServletClassMap(wmd)); - webMetaData.setConfigName(wmd.getConfigName()); - webMetaData.setConfigFile(wmd.getConfigFile()); - webMetaData.setSecurityDomain(wmd.getSecurityDomain()); - webMetaData.setPublishLocationAdapter(getPublishLocationAdpater(wmd)); - webMetaData.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints())); - - return webMetaData; - } - - private PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd) - { - return new PublishLocationAdapter() - { - public String getWsdlPublishLocationByName(String name) - { - return wmd.getWsdlPublishLocationByName(name); - } - }; - } - - private List<UnifiedWebSecurityMetaData> getSecurityMetaData(final Iterator securityConstraints) - { - ArrayList<UnifiedWebSecurityMetaData> unifiedsecurityMetaData = new ArrayList<UnifiedWebSecurityMetaData>(); - - while (securityConstraints.hasNext()) - { - WebSecurityMetaData securityMetaData = (WebSecurityMetaData)securityConstraints.next(); - - UnifiedWebSecurityMetaData current = new UnifiedWebSecurityMetaData(); - unifiedsecurityMetaData.add(current); - - current.setTransportGuarantee(securityMetaData.getTransportGuarantee()); - - HashMap resources = securityMetaData.getWebResources(); - for (Object webResourceObj : resources.values()) - { - WebResourceCollection webResource = (WebResourceCollection)webResourceObj; - UnifiedWebResourceCollection currentResource = current.addWebResource(webResource.getName()); - for (String currentPattern : webResource.getUrlPatterns()) - { - currentResource.addPattern(currentPattern); - } - } - - } - - return unifiedsecurityMetaData; - } - - private Map<String, String> getServletClassMap(WebMetaData wmd) - { - Map<String, String> mappings = new HashMap<String, String>(); - Iterator it = wmd.getServletClassMap().entrySet().iterator(); - while (it.hasNext()) - { - Map.Entry entry = (Entry)it.next(); - String servletName = (String)entry.getKey(); - String servletClass = (String)entry.getValue(); - // Skip JSPs - if (servletClass != null) - mappings.put(servletName, servletClass); - } - return mappings; - } -} Modified: trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml =================================================================== --- trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-07-27 04:37:52 UTC (rev 4013) @@ -80,6 +80,11 @@  + <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ContainerMetaDataDeploymentAspect"> + <property name="provides">ContainerMetaData</property> + <property name="metaDataAdapter"><inject bean="WSContainerMetaDataAdapter"/></property> + </bean> + <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect"> <property name="requires">ContainerMetaData</property> <property name="provides">ContextRoot</property> @@ -117,11 +122,6 @@ <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> </bean> - <bean name="WSUnifiedDeploymentInfoDeploymentAspect" class="org.jboss.wsf.container.jboss42.UnifiedDeploymentInfoDeploymentAspect"> - <property name="provides">ContainerMetaData</property> - <property name="deploymentInfoAdapter"><inject bean="WSDeploymentInfoAdapter"/></property> - </bean> - <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect"> <property name="requires">ContextRoot, ContainerMetaData</property> <property name="provides">URLPattern</property> @@ -140,9 +140,9 @@ </bean>  - <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB21"/> - <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.ApplicationMetaDataAdapterEJB3"/> - <bean name="WSDeploymentInfoAdapter" class="org.jboss.wsf.container.jboss42.DeploymentInfoAdapter"> + <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB21"/> + <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB3"/> + <bean name="WSContainerMetaDataAdapter" class="org.jboss.wsf.container.jboss42.ContainerMetaDataAdapter"> <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property> <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property> <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property> @@ -151,7 +151,7 @@ <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/> <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/> <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.framework.deployment.DefaultWebAppDesciptorModifierImpl"/> - <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.WebMetaDataAdapter"/> + <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.JSEArchiveMetaDataAdapter"/> <bean name="WSWebXMLRewriter" class="org.jboss.wsf.framework.deployment.WebXMLRewriterImpl"> <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> </bean> @@ -161,6 +161,7 @@ <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContainerMetaDataDeploymentAspect"/> <inject bean="WSContextRootDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> @@ -169,7 +170,6 @@ <inject bean="WSEndpointNameDeploymentAspect"/> <inject bean="WSEndpointRegistryDeploymentAspect"/> <inject bean="WSModifyWebMetaDataDeploymentAspect"/> - <inject bean="WSUnifiedDeploymentInfoDeploymentAspect"/> <inject bean="WSURLPatternDeploymentAspect"/> </set> </property> @@ -178,6 +178,7 @@ <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContainerMetaDataDeploymentAspect"/> <inject bean="WSContextRootDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> @@ -185,7 +186,6 @@ <inject bean="WSEndpointMetricsDeploymentAspect"/> <inject bean="WSEndpointNameDeploymentAspect"/> <inject bean="WSEndpointRegistryDeploymentAspect"/> - <inject bean="WSUnifiedDeploymentInfoDeploymentAspect"/> <inject bean="WSURLPatternDeploymentAspect"/> <inject bean="WSWebAppDeploymentAspect"/> <inject bean="WSWebAppGeneratorDeploymentAspect"/> Deleted: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -1,156 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.container.jboss50; - -// $Id$ - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.logging.Logger; -import org.jboss.metadata.*; -import org.jboss.metadata.ApplicationMetaData.WebserviceDescription; -import org.jboss.metadata.ApplicationMetaData.Webservices; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.j2ee.*; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -/** - * Build container independent application meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class ApplicationMetaDataAdapterEJB21 -{ - // logging support - private static Logger log = Logger.getLogger(ApplicationMetaDataAdapterEJB21.class); - - public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, DeploymentUnit unit) - { - ApplicationMetaData appMetaData = unit.getAttachment(ApplicationMetaData.class); - dep.addAttachment(ApplicationMetaData.class, appMetaData); - - UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData(); - buildUnifiedBeanMetaData(umd, appMetaData); - buildWebservicesMetaData(umd, appMetaData); - umd.setSecurityDomain(appMetaData.getSecurityDomain()); - - return umd; - } - - private void buildWebservicesMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData apmd) - { - Webservices webservices = apmd.getWebservices(); - if (webservices != null) - { - String contextRoot = webservices.getContextRoot(); - umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices)); - - List<WebserviceDescription> wsDescriptions = webservices.getWebserviceDescriptions(); - if (wsDescriptions.size() > 1) - log.warn("Multiple <webservice-description> elements not supported"); - - if (wsDescriptions.size() > 0) - { - WebserviceDescription wsd = wsDescriptions.get(0); - umd.setConfigName(wsd.getConfigName()); - umd.setConfigFile(wsd.getConfigFile()); - } - - umd.setWebServiceContextRoot(contextRoot); - } - } - - private PublishLocationAdapter getPublishLocationAdpater(final Webservices webservices) - { - return new PublishLocationAdapter() - { - public String getWsdlPublishLocationByName(String name) - { - String wsdlPublishLocation = null; - for (WebserviceDescription wsd : webservices.getWebserviceDescriptions()) - { - if (wsd.getDescriptionName().equals(name)) - { - wsdlPublishLocation = wsd.getWsdlPublishLocation(); - } - } - return wsdlPublishLocation; - } - }; - } - - private void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, ApplicationMetaData appMetaData) - { - List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>(); - Iterator it = appMetaData.getEnterpriseBeans(); - while (it.hasNext()) - { - BeanMetaData bmd = (BeanMetaData)it.next(); - buildUnifiedBeanMetaData(beans, bmd); - } - umd.setEnterpriseBeans(beans); - } - - private UnifiedBeanMetaData buildUnifiedBeanMetaData(List<UnifiedBeanMetaData> beans, BeanMetaData bmd) - { - UnifiedBeanMetaData ubmd = null; - if (bmd instanceof SessionMetaData) - { - ubmd = new UnifiedSessionMetaData(); - } - else if (bmd instanceof MessageDrivenMetaData) - { - ubmd = new UnifiedMessageDrivenMetaData(); - ((UnifiedMessageDrivenMetaData)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(); - if (pcmd != null) - { - UnifiedEjbPortComponentMetaData upcmd = new UnifiedEjbPortComponentMetaData(); - upcmd.setPortComponentName(pcmd.getPortComponentName()); - upcmd.setPortComponentURI(pcmd.getPortComponentURI()); - upcmd.setAuthMethod(pcmd.getAuthMethod()); - upcmd.setTransportGuarantee(pcmd.getTransportGuarantee()); - upcmd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess()); - ubmd.setPortComponent(upcmd); - } - - beans.add(ubmd); - } - return ubmd; - } -} Deleted: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -1,160 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.container.jboss50; - -// $Id$ - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.ejb3.Container; -import org.jboss.ejb3.EJBContainer; -import org.jboss.ejb3.Ejb3Deployment; -import org.jboss.ejb3.session.SessionContainer; -import org.jboss.ejb3.mdb.MessagingContainer; -import org.jboss.ejb3.metamodel.*; -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.j2ee.*; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData.PublishLocationAdapter; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -/** - * Build container independent application meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 14-Apr-2007 - */ -public class ApplicationMetaDataAdapterEJB3 -{ - // logging support - private static Logger log = Logger.getLogger(ApplicationMetaDataAdapterEJB3.class); - - public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, DeploymentUnit unit) - { - Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class); - dep.addAttachment(Ejb3Deployment.class, ejb3Deployment); - - EjbJarDD jarDD = unit.getAttachment(EjbJarDD.class); - UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData(); - buildUnifiedBeanMetaData(umd, ejb3Deployment); - buildWebservicesMetaData(umd, jarDD); - - return umd; - } - - private void buildWebservicesMetaData(UnifiedApplicationMetaData umd, EjbJarDD jarDD) - { - // nothing to do - if (jarDD == null) - return; - - Webservices webservices = jarDD.getWebservices(); - if (webservices != null) - { - String contextRoot = webservices.getContextRoot(); - umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices)); - - List<WebserviceDescription> wsDescriptions = webservices.getWebserviceDescriptions(); - if (wsDescriptions.size() > 1) - log.warn("Multiple <webservice-description> elements not supported"); - - if (wsDescriptions.size() > 0) - { - WebserviceDescription wsd = wsDescriptions.get(0); - umd.setConfigName(wsd.getConfigName()); - umd.setConfigFile(wsd.getConfigFile()); - - // com/sun/ts/tests/webservices12/ejb/annotations/WSEjbWebServiceRefTest1 - // WSEjbWebServiceRefTest1VerifyTargetEndpointAddress - if (contextRoot == null) - contextRoot = "/" + wsd.getDescriptionName(); - } - - umd.setWebServiceContextRoot(contextRoot); - } - } - - private void buildUnifiedBeanMetaData(UnifiedApplicationMetaData umd, Ejb3Deployment ejb3Deployment) - { - List<UnifiedBeanMetaData> ubmdList = new ArrayList<UnifiedBeanMetaData>(); - Iterator<Container> it = ejb3Deployment.getEjbContainers().values().iterator(); - while (it.hasNext()) - { - EJBContainer container = (EJBContainer)it.next(); - UnifiedBeanMetaData ubmd = null; - if (container instanceof SessionContainer) - { - ubmd = new UnifiedSessionMetaData(); - } - else if (container instanceof MessagingContainer) - { - ubmd = new UnifiedMessageDrivenMetaData(); - log.warn("No implemented: initialize MDB destination"); - //((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessagingContainer)container).getDestination()); - } - - if (ubmd != null) - { - ubmd.setEjbName(container.getEjbName()); - ubmd.setEjbClass(container.getBeanClassName()); - - EnterpriseBean bean = container.getXml(); - Ejb3PortComponent pcMetaData = (bean != null ? bean.getPortComponent() : null); - if (pcMetaData != null) - { - UnifiedEjbPortComponentMetaData ejbPortComp = new UnifiedEjbPortComponentMetaData(); - ejbPortComp.setPortComponentName(pcMetaData.getPortComponentName()); - ejbPortComp.setPortComponentURI(pcMetaData.getPortComponentURI()); - ejbPortComp.setAuthMethod(pcMetaData.getAuthMethod()); - ejbPortComp.setTransportGuarantee(pcMetaData.getTransportGuarantee()); - ejbPortComp.setSecureWSDLAccess(pcMetaData.getSecureWSDLAccess()); - - ubmd.setPortComponent(ejbPortComp); - } - - ubmdList.add(ubmd); - } - } - umd.setEnterpriseBeans(ubmdList); - } - - private PublishLocationAdapter getPublishLocationAdpater(final Webservices webservices) - { - return new PublishLocationAdapter() - { - public String getWsdlPublishLocationByName(String name) - { - String wsdlPublishLocation = null; - for (WebserviceDescription wsd : webservices.getWebserviceDescriptions()) - { - if (wsd.getDescriptionName().equals(name)) - { - wsdlPublishLocation = wsd.getWsdlPublishLocation(); - } - } - return wsdlPublishLocation; - } - }; - } -} Copied: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataAdapter.java (from rev 4012, trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java) =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataAdapter.java (rev 0) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataAdapter.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -0,0 +1,114 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.container.jboss50; + +//$Id$ + +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.ApplicationMetaData; +import org.jboss.metadata.WebMetaData; +import org.jboss.wsf.framework.deployment.WebXMLRewriter; +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; + +/** + * Build container independent deployment info. + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class ContainerMetaDataAdapter +{ + // logging support + private static Logger log = Logger.getLogger(ContainerMetaDataAdapter.class); + + private EJBArchiveMetaDataAdapterEJB3 applicationMetaDataAdapterEJB3 = new EJBArchiveMetaDataAdapterEJB3(); + private EJBArchiveMetaDataAdapterEJB21 applicationMetaDataAdapterEJB21 = new EJBArchiveMetaDataAdapterEJB21(); + private JSEArchiveMetaDataAdapter webMetaDataAdapter = new JSEArchiveMetaDataAdapter(); + + public void setApplicationMetaDataAdapterEJB21(EJBArchiveMetaDataAdapterEJB21 adapter) + { + this.applicationMetaDataAdapterEJB21 = adapter; + } + + public void setApplicationMetaDataAdapterEJB3(EJBArchiveMetaDataAdapterEJB3 adapter) + { + this.applicationMetaDataAdapterEJB3 = adapter; + } + + public void setWebMetaDataAdapter(JSEArchiveMetaDataAdapter adapter) + { + this.webMetaDataAdapter = adapter; + } + + public void buildContainerMetaData(Deployment dep, DeploymentUnit unit) + { + dep.addAttachment(DeploymentUnit.class, unit); + + try + { + // JSE endpoints + if (unit.getAttachment(WebMetaData.class) != null) + { + JSEArchiveMetaData webMetaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, unit); + if (webMetaData != null) + dep.addAttachment(JSEArchiveMetaData.class, webMetaData); + + if (dep instanceof ArchiveDeployment) + { + URL webURL = ((ArchiveDeployment)dep).getRootFile().toURL(); + dep.setProperty(WebXMLRewriter.WEBAPP_URL, webURL); + } + } + + // EJB3 endpoints + else if (unit.getAttachment(Ejb3Deployment.class) != null) + { + EJBArchiveMetaData appMetaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, unit); + if (appMetaData != null) + dep.addAttachment(EJBArchiveMetaData.class, appMetaData); + } + + // EJB21 endpoints + else if (unit.getAttachment(ApplicationMetaData.class) != null) + { + EJBArchiveMetaData appMetaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, unit); + if (appMetaData != null) + dep.addAttachment(EJBArchiveMetaData.class, appMetaData); + } + } + catch (RuntimeException rte) + { + throw rte; + } + catch (Exception ex) + { + throw new IllegalStateException(ex); + } + } +} Copied: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataDeploymentAspect.java (from rev 4012, trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java) =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataDeploymentAspect.java (rev 0) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ContainerMetaDataDeploymentAspect.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.container.jboss50; + +//$Id: UnifiedDeploymentInfoDeployer.java 3772 2007-07-01 19:29:13Z thomas.diesler(a)jboss.com $ + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspect; + +/** + * A deployer that builds the UnifiedDeploymentInfo + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class ContainerMetaDataDeploymentAspect extends DeploymentAspect +{ + private ContainerMetaDataAdapter metaDataAdapter = new ContainerMetaDataAdapter(); + + public void setMetaDataAdapter(ContainerMetaDataAdapter adapter) + { + this.metaDataAdapter = adapter; + } + + @Override + public void create(Deployment dep) + { + DeploymentUnit unit = dep.getAttachment(DeploymentUnit.class); + if (unit == null) + throw new IllegalStateException("Cannot obtain deployment unit"); + + metaDataAdapter.buildContainerMetaData(dep, unit); + } +} \ No newline at end of file Deleted: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -1,114 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.container.jboss50; - -//$Id$ - -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.ApplicationMetaData; -import org.jboss.metadata.WebMetaData; -import org.jboss.wsf.framework.deployment.WebXMLRewriter; -import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; - -/** - * Build container independent deployment info. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class DeploymentInfoAdapter -{ - // logging support - private static Logger log = Logger.getLogger(DeploymentInfoAdapter.class); - - private ApplicationMetaDataAdapterEJB3 applicationMetaDataAdapterEJB3 = new ApplicationMetaDataAdapterEJB3(); - private ApplicationMetaDataAdapterEJB21 applicationMetaDataAdapterEJB21 = new ApplicationMetaDataAdapterEJB21(); - private WebMetaDataAdapter webMetaDataAdapter = new WebMetaDataAdapter(); - - public void setApplicationMetaDataAdapterEJB21(ApplicationMetaDataAdapterEJB21 adapter) - { - this.applicationMetaDataAdapterEJB21 = adapter; - } - - public void setApplicationMetaDataAdapterEJB3(ApplicationMetaDataAdapterEJB3 adapter) - { - this.applicationMetaDataAdapterEJB3 = adapter; - } - - public void setWebMetaDataAdapter(WebMetaDataAdapter adapter) - { - this.webMetaDataAdapter = adapter; - } - - public void buildDeploymentInfo(Deployment dep, DeploymentUnit unit) - { - dep.addAttachment(DeploymentUnit.class, unit); - - try - { - // JSE endpoints - if (unit.getAttachment(WebMetaData.class) != null) - { - UnifiedWebMetaData webMetaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, unit); - if (webMetaData != null) - dep.addAttachment(UnifiedWebMetaData.class, webMetaData); - - if (dep instanceof ArchiveDeployment) - { - URL webURL = ((ArchiveDeployment)dep).getRootFile().toURL(); - dep.setProperty(WebXMLRewriter.WEBAPP_URL, webURL); - } - } - - // EJB3 endpoints - else if (unit.getAttachment(Ejb3Deployment.class) != null) - { - UnifiedApplicationMetaData appMetaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, unit); - if (appMetaData != null) - dep.addAttachment(UnifiedApplicationMetaData.class, appMetaData); - } - - // EJB21 endpoints - else if (unit.getAttachment(ApplicationMetaData.class) != null) - { - UnifiedApplicationMetaData appMetaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, unit); - if (appMetaData != null) - dep.addAttachment(UnifiedApplicationMetaData.class, appMetaData); - } - } - catch (RuntimeException rte) - { - throw rte; - } - catch (Exception ex) - { - throw new IllegalStateException(ex); - } - } -} Copied: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB21.java (from rev 4012, trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java) =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB21.java (rev 0) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB21.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -0,0 +1,156 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.container.jboss50; + +// $Id$ + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.logging.Logger; +import org.jboss.metadata.*; +import org.jboss.metadata.ApplicationMetaData.WebserviceDescription; +import org.jboss.metadata.ApplicationMetaData.Webservices; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.j2ee.*; +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 + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class EJBArchiveMetaDataAdapterEJB21 +{ + // logging support + private static Logger log = Logger.getLogger(EJBArchiveMetaDataAdapterEJB21.class); + + public EJBArchiveMetaData buildUnifiedApplicationMetaData(Deployment dep, DeploymentUnit unit) + { + ApplicationMetaData appMetaData = unit.getAttachment(ApplicationMetaData.class); + dep.addAttachment(ApplicationMetaData.class, appMetaData); + + EJBArchiveMetaData umd = new EJBArchiveMetaData(); + buildUnifiedBeanMetaData(umd, appMetaData); + buildWebservicesMetaData(umd, appMetaData); + umd.setSecurityDomain(appMetaData.getSecurityDomain()); + + return umd; + } + + private void buildWebservicesMetaData(EJBArchiveMetaData umd, ApplicationMetaData apmd) + { + Webservices webservices = apmd.getWebservices(); + if (webservices != null) + { + String contextRoot = webservices.getContextRoot(); + umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices)); + + List<WebserviceDescription> wsDescriptions = webservices.getWebserviceDescriptions(); + if (wsDescriptions.size() > 1) + log.warn("Multiple <webservice-description> elements not supported"); + + if (wsDescriptions.size() > 0) + { + WebserviceDescription wsd = wsDescriptions.get(0); + umd.setConfigName(wsd.getConfigName()); + umd.setConfigFile(wsd.getConfigFile()); + } + + umd.setWebServiceContextRoot(contextRoot); + } + } + + private PublishLocationAdapter getPublishLocationAdpater(final Webservices webservices) + { + return new PublishLocationAdapter() + { + public String getWsdlPublishLocationByName(String name) + { + String wsdlPublishLocation = null; + for (WebserviceDescription wsd : webservices.getWebserviceDescriptions()) + { + if (wsd.getDescriptionName().equals(name)) + { + wsdlPublishLocation = wsd.getWsdlPublishLocation(); + } + } + return wsdlPublishLocation; + } + }; + } + + private void buildUnifiedBeanMetaData(EJBArchiveMetaData umd, ApplicationMetaData appMetaData) + { + List<EJBMetaData> beans = new ArrayList<EJBMetaData>(); + Iterator it = appMetaData.getEnterpriseBeans(); + while (it.hasNext()) + { + 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(); + if (pcmd != null) + { + ubmd.setPortComponentName(pcmd.getPortComponentName()); + ubmd.setPortComponentURI(pcmd.getPortComponentURI()); + EJBSecurityMetaData smd = new EJBSecurityMetaData(); + smd.setAuthMethod(pcmd.getAuthMethod()); + smd.setTransportGuarantee(pcmd.getTransportGuarantee()); + smd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess()); + ubmd.setSecurityMetaData(smd); + } + + beans.add(ubmd); + } + return ubmd; + } +} Copied: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB3.java (from rev 4012, trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java) =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB3.java (rev 0) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/EJBArchiveMetaDataAdapterEJB3.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -0,0 +1,166 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.container.jboss50; + +// $Id$ + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.ejb3.Container; +import org.jboss.ejb3.EJBContainer; +import org.jboss.ejb3.Ejb3Deployment; +import org.jboss.ejb3.mdb.MessagingContainer; +import org.jboss.ejb3.metamodel.Ejb3PortComponent; +import org.jboss.ejb3.metamodel.EjbJarDD; +import org.jboss.ejb3.metamodel.EnterpriseBean; +import org.jboss.ejb3.metamodel.WebserviceDescription; +import org.jboss.ejb3.metamodel.Webservices; +import org.jboss.ejb3.session.SessionContainer; +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; +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; + +/** + * Build container independent application meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 14-Apr-2007 + */ +public class EJBArchiveMetaDataAdapterEJB3 +{ + // logging support + private static Logger log = Logger.getLogger(EJBArchiveMetaDataAdapterEJB3.class); + + public EJBArchiveMetaData buildUnifiedApplicationMetaData(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); + buildWebservicesMetaData(umd, jarDD); + + return umd; + } + + private void buildWebservicesMetaData(EJBArchiveMetaData umd, EjbJarDD jarDD) + { + // nothing to do + if (jarDD == null) + return; + + Webservices webservices = jarDD.getWebservices(); + if (webservices != null) + { + String contextRoot = webservices.getContextRoot(); + umd.setPublishLocationAdapter(getPublishLocationAdpater(webservices)); + + List<WebserviceDescription> wsDescriptions = webservices.getWebserviceDescriptions(); + if (wsDescriptions.size() > 1) + log.warn("Multiple <webservice-description> elements not supported"); + + if (wsDescriptions.size() > 0) + { + WebserviceDescription wsd = wsDescriptions.get(0); + umd.setConfigName(wsd.getConfigName()); + umd.setConfigFile(wsd.getConfigFile()); + + // com/sun/ts/tests/webservices12/ejb/annotations/WSEjbWebServiceRefTest1 + // WSEjbWebServiceRefTest1VerifyTargetEndpointAddress + if (contextRoot == null) + contextRoot = "/" + wsd.getDescriptionName(); + } + + umd.setWebServiceContextRoot(contextRoot); + } + } + + private void buildUnifiedBeanMetaData(EJBArchiveMetaData umd, Ejb3Deployment ejb3Deployment) + { + List<EJBMetaData> ubmdList = new ArrayList<EJBMetaData>(); + Iterator<Container> it = ejb3Deployment.getEjbContainers().values().iterator(); + while (it.hasNext()) + { + EJBContainer container = (EJBContainer)it.next(); + EJBMetaData ubmd = null; + if (container instanceof SessionContainer) + { + ubmd = new SLSBMetaData(); + } + else if (container instanceof MessagingContainer) + { + ubmd = new MDBMetaData(); + log.warn("No implemented: initialize MDB destination"); + //((UnifiedMessageDrivenMetaData)ubmd).setDestinationJndiName(((MessagingContainer)container).getDestination()); + } + + if (ubmd != null) + { + ubmd.setEjbName(container.getEjbName()); + ubmd.setEjbClass(container.getBeanClassName()); + + EnterpriseBean bean = container.getXml(); + Ejb3PortComponent pcmd = (bean != null ? bean.getPortComponent() : null); + if (pcmd != null) + { + ubmd.setPortComponentName(pcmd.getPortComponentName()); + ubmd.setPortComponentURI(pcmd.getPortComponentURI()); + EJBSecurityMetaData smd = new EJBSecurityMetaData(); + smd.setAuthMethod(pcmd.getAuthMethod()); + smd.setTransportGuarantee(pcmd.getTransportGuarantee()); + smd.setSecureWSDLAccess(pcmd.getSecureWSDLAccess()); + ubmd.setSecurityMetaData(smd); + } + + ubmdList.add(ubmd); + } + } + umd.setEnterpriseBeans(ubmdList); + } + + private PublishLocationAdapter getPublishLocationAdpater(final Webservices webservices) + { + return new PublishLocationAdapter() { + public String getWsdlPublishLocationByName(String name) + { + String wsdlPublishLocation = null; + for (WebserviceDescription wsd : webservices.getWebserviceDescriptions()) + { + if (wsd.getDescriptionName().equals(name)) + { + wsdlPublishLocation = wsd.getWsdlPublishLocation(); + } + } + return wsdlPublishLocation; + } + }; + } +} Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -52,8 +52,8 @@ import org.jboss.wsf.spi.invocation.InvocationHandler; import org.jboss.wsf.spi.invocation.SecurityAdaptor; import org.jboss.wsf.spi.invocation.SecurityAdaptorFactory; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; /** * Handles invocations on EJB21 endpoints. @@ -83,8 +83,8 @@ { String ejbName = ep.getShortName(); Deployment dep = ep.getService().getDeployment(); - UnifiedApplicationMetaData apMetaData = dep.getAttachment(UnifiedApplicationMetaData.class); - UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)apMetaData.getBeanByEjbName(ejbName); + EJBArchiveMetaData apMetaData = dep.getAttachment(EJBArchiveMetaData.class); + EJBMetaData beanMetaData = (EJBMetaData)apMetaData.getBeanByEjbName(ejbName); if (beanMetaData == null) throw new WebServiceException("Cannot obtain ejb meta data for: " + ejbName); Copied: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JSEArchiveMetaDataAdapter.java (from rev 4012, trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java) =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JSEArchiveMetaDataAdapter.java (rev 0) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JSEArchiveMetaDataAdapter.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -0,0 +1,150 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.container.jboss50; + +// $Id$ + +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.deployment.J2eeApplicationMetaData; +import org.jboss.deployment.J2eeModuleMetaData; +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.WebSecurityMetaData; +import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection; +import org.jboss.metadata.web.Servlet; +import org.jboss.metadata.web.ServletMapping; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData.PublishLocationAdapter; +import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData; +import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData.JSEResourceCollection; + +import java.util.*; + +/** + * Build container independent web meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class JSEArchiveMetaDataAdapter +{ + public JSEArchiveMetaData buildUnifiedWebMetaData(Deployment dep, DeploymentUnit unit) + { + String contextRoot = null; + + WebMetaData wmd = unit.getAttachment(WebMetaData.class); + dep.addAttachment(WebMetaData.class, wmd); + + if (unit.getParent() != null) + { + J2eeApplicationMetaData appmd = unit.getParent().getAttachment(J2eeApplicationMetaData.class); + if (appmd != null) + { + J2eeModuleMetaData module = appmd.getModule(dep.getSimpleName()); + if (module != null) + contextRoot = module.getWebContext(); + } + } + + if (contextRoot == null) + contextRoot = wmd.getContextRoot(); + + JSEArchiveMetaData umd = new JSEArchiveMetaData(); + umd.setContextRoot(contextRoot); + umd.setServletMappings(getServletMappings(wmd)); + umd.setServletClassNames(getServletClassMap(wmd)); + umd.setConfigName(wmd.getConfigName()); + umd.setConfigFile(wmd.getConfigFile()); + umd.setSecurityDomain(wmd.getSecurityDomain()); + umd.setPublishLocationAdapter(getPublishLocationAdpater(wmd)); + umd.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints())); + + return umd; + } + + private PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd) + { + return new PublishLocationAdapter() + { + public String getWsdlPublishLocationByName(String name) + { + return wmd.getWsdlPublishLocationByName(name); + } + }; + } + + protected List<JSESecurityMetaData> getSecurityMetaData(final Iterator securityConstraints) + { + ArrayList<JSESecurityMetaData> unifiedsecurityMetaData = new ArrayList<JSESecurityMetaData>(); + + while (securityConstraints.hasNext()) + { + WebSecurityMetaData securityMetaData = (WebSecurityMetaData)securityConstraints.next(); + + JSESecurityMetaData current = new JSESecurityMetaData(); + unifiedsecurityMetaData.add(current); + + current.setTransportGuarantee(securityMetaData.getTransportGuarantee()); + + Map<String, WebResourceCollection> resources = securityMetaData.getWebResources(); + for (WebResourceCollection webResource : resources.values()) + { + JSEResourceCollection currentResource = current.addWebResource(webResource.getName()); + for (String currentPattern : webResource.getUrlPatterns()) + { + currentResource.addPattern(currentPattern); + } + } + } + + return unifiedsecurityMetaData; + } + + private Map<String, String> getServletMappings(WebMetaData wmd) + { + Map<String, String> mappings = new HashMap<String, String>(); + Iterator it = wmd.getServletMappings().iterator(); + while (it.hasNext()) + { + ServletMapping sm = (ServletMapping)it.next(); + // FIXME - Add support for multiple mappings + mappings.put(sm.getName(), sm.getUrlPatterns().get(0)); + } + return mappings; + } + + private Map<String, String> getServletClassMap(WebMetaData wmd) + { + Map<String, String> mappings = new HashMap<String, String>(); + Iterator it = wmd.getServlets().iterator(); + while (it.hasNext()) + { + Servlet servlet = (Servlet)it.next(); + // Skip JSPs + if (servlet.getServletClass() == null || servlet.getServletClass().length() == 0) + continue; + + mappings.put(servlet.getName(), servlet.getServletClass()); + } + return mappings; + } +} Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB21.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB21.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB21.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -28,7 +28,7 @@ import org.jboss.metadata.AssemblyDescriptorMetaData; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.SecurityHandler; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; import java.util.Iterator; import java.util.Map; @@ -43,7 +43,7 @@ { public void addSecurityDomain(Element jbossWeb, Deployment dep) { - UnifiedApplicationMetaData appMetaData = dep.getAttachment(UnifiedApplicationMetaData.class); + EJBArchiveMetaData appMetaData = dep.getAttachment(EJBArchiveMetaData.class); if (appMetaData == null) throw new IllegalStateException("Cannot obtain application meta data"); Deleted: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -1,54 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.container.jboss50; - -//$Id: UnifiedDeploymentInfoDeployer.java 3772 2007-07-01 19:29:13Z thomas.diesler(a)jboss.com $ - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentAspect; - -/** - * A deployer that builds the UnifiedDeploymentInfo - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class UnifiedDeploymentInfoDeploymentAspect extends DeploymentAspect -{ - private DeploymentInfoAdapter deploymentInfoAdapter = new DeploymentInfoAdapter(); - - public void setDeploymentInfoAdapter(DeploymentInfoAdapter adapter) - { - this.deploymentInfoAdapter = adapter; - } - - @Override - public void create(Deployment dep) - { - DeploymentUnit unit = dep.getAttachment(DeploymentUnit.class); - if (unit == null) - throw new IllegalStateException("Cannot obtain deployment unit"); - - deploymentInfoAdapter.buildDeploymentInfo(dep, unit); - } -} \ No newline at end of file Deleted: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -1,150 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.container.jboss50; - -// $Id$ - -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.deployment.J2eeApplicationMetaData; -import org.jboss.deployment.J2eeModuleMetaData; -import org.jboss.metadata.WebMetaData; -import org.jboss.metadata.WebSecurityMetaData; -import org.jboss.metadata.WebSecurityMetaData.WebResourceCollection; -import org.jboss.metadata.web.Servlet; -import org.jboss.metadata.web.ServletMapping; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData.PublishLocationAdapter; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; - -import java.util.*; - -/** - * Build container independent web meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class WebMetaDataAdapter -{ - public UnifiedWebMetaData buildUnifiedWebMetaData(Deployment dep, DeploymentUnit unit) - { - String contextRoot = null; - - WebMetaData wmd = unit.getAttachment(WebMetaData.class); - dep.addAttachment(WebMetaData.class, wmd); - - if (unit.getParent() != null) - { - J2eeApplicationMetaData appmd = unit.getParent().getAttachment(J2eeApplicationMetaData.class); - if (appmd != null) - { - J2eeModuleMetaData module = appmd.getModule(dep.getSimpleName()); - if (module != null) - contextRoot = module.getWebContext(); - } - } - - if (contextRoot == null) - contextRoot = wmd.getContextRoot(); - - UnifiedWebMetaData umd = new UnifiedWebMetaData(); - umd.setContextRoot(contextRoot); - umd.setServletMappings(getServletMappings(wmd)); - umd.setServletClassNames(getServletClassMap(wmd)); - umd.setConfigName(wmd.getConfigName()); - umd.setConfigFile(wmd.getConfigFile()); - umd.setSecurityDomain(wmd.getSecurityDomain()); - umd.setPublishLocationAdapter(getPublishLocationAdpater(wmd)); - umd.setSecurityMetaData(getSecurityMetaData(wmd.getSecurityContraints())); - - return umd; - } - - private PublishLocationAdapter getPublishLocationAdpater(final WebMetaData wmd) - { - return new PublishLocationAdapter() - { - public String getWsdlPublishLocationByName(String name) - { - return wmd.getWsdlPublishLocationByName(name); - } - }; - } - - protected List<UnifiedWebSecurityMetaData> getSecurityMetaData(final Iterator securityConstraints) - { - ArrayList<UnifiedWebSecurityMetaData> unifiedsecurityMetaData = new ArrayList<UnifiedWebSecurityMetaData>(); - - while (securityConstraints.hasNext()) - { - WebSecurityMetaData securityMetaData = (WebSecurityMetaData)securityConstraints.next(); - - UnifiedWebSecurityMetaData current = new UnifiedWebSecurityMetaData(); - unifiedsecurityMetaData.add(current); - - current.setTransportGuarantee(securityMetaData.getTransportGuarantee()); - - Map<String, WebResourceCollection> resources = securityMetaData.getWebResources(); - for (WebResourceCollection webResource : resources.values()) - { - UnifiedWebResourceCollection currentResource = current.addWebResource(webResource.getName()); - for (String currentPattern : webResource.getUrlPatterns()) - { - currentResource.addPattern(currentPattern); - } - } - } - - return unifiedsecurityMetaData; - } - - private Map<String, String> getServletMappings(WebMetaData wmd) - { - Map<String, String> mappings = new HashMap<String, String>(); - Iterator it = wmd.getServletMappings().iterator(); - while (it.hasNext()) - { - ServletMapping sm = (ServletMapping)it.next(); - // FIXME - Add support for multiple mappings - mappings.put(sm.getName(), sm.getUrlPatterns().get(0)); - } - return mappings; - } - - private Map<String, String> getServletClassMap(WebMetaData wmd) - { - Map<String, String> mappings = new HashMap<String, String>(); - Iterator it = wmd.getServlets().iterator(); - while (it.hasNext()) - { - Servlet servlet = (Servlet)it.next(); - // Skip JSPs - if (servlet.getServletClass() == null || servlet.getServletClass().length() == 0) - continue; - - mappings.put(servlet.getName(), servlet.getServletClass()); - } - return mappings; - } -} Modified: trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-27 04:37:52 UTC (rev 4013) @@ -134,6 +134,10 @@  + <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss50.ContainerMetaDataDeploymentAspect"> + <property name="provides">ContainerMetaData</property> + </bean> + <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect"> <property name="requires">ContainerMetaData</property> <property name="provides">ContextRoot</property> @@ -170,10 +174,6 @@ <property name="requires">ContextProperties, StackDescriptor</property> </bean> - <bean name="WSUnifiedDeploymentInfoDeploymentAspect" class="org.jboss.wsf.container.jboss50.UnifiedDeploymentInfoDeploymentAspect"> - <property name="provides">ContainerMetaData</property> - </bean> - <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect"> <property name="requires">ContextRoot, ContainerMetaData</property> <property name="provides">URLPattern</property> @@ -206,6 +206,7 @@ <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContainerMetaDataDeploymentAspect"/> <inject bean="WSContextRootDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> @@ -214,7 +215,6 @@ <inject bean="WSEndpointNameDeploymentAspect"/> <inject bean="WSEndpointRegistryDeploymentAspect"/> <inject bean="WSModifyWebMetaDataDeploymentAspect"/> - <inject bean="WSUnifiedDeploymentInfoDeploymentAspect"/> <inject bean="WSURLPatternDeploymentAspect"/> </set> </property> @@ -223,6 +223,7 @@ <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> <property name="aspects"> <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContainerMetaDataDeploymentAspect"/> <inject bean="WSContextRootDeploymentAspect"/> <inject bean="WSEndpointAddressDeploymentAspect"/> <inject bean="WSEndpointHandlerDeploymentAspect"/> @@ -230,7 +231,6 @@ <inject bean="WSEndpointMetricsDeploymentAspect"/> <inject bean="WSEndpointNameDeploymentAspect"/> <inject bean="WSEndpointRegistryDeploymentAspect"/> - <inject bean="WSUnifiedDeploymentInfoDeploymentAspect"/> <inject bean="WSURLPatternDeploymentAspect"/> <inject bean="WSWebAppDeploymentAspect"/> <inject bean="WSWebAppGeneratorDeploymentAspect"/> Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BackwardCompatibleContextRootDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BackwardCompatibleContextRootDeploymentAspect.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BackwardCompatibleContextRootDeploymentAspect.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -25,11 +25,10 @@ import java.util.StringTokenizer; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; /** * A deployer that assigns the context root to the service. @@ -58,7 +57,7 @@ { String firstToken = st.nextToken(); if (contextRoot != null && contextRoot.equals(firstToken) == false) - throw new IllegalStateException("All endpoints must share the same <context-root>: " + contextRoot + "!=" + firstToken); + throw new IllegalStateException("All endpoints must share the same <context-root>: " + contextRoot + "!=" + firstToken); contextRoot = firstToken; } @@ -72,15 +71,11 @@ { String urlPattern = null; - UnifiedApplicationMetaData appMetaData = dep.getAttachment(UnifiedApplicationMetaData.class); + EJBArchiveMetaData appMetaData = dep.getAttachment(EJBArchiveMetaData.class); if (appMetaData != null && appMetaData.getBeanByEjbName(ep.getShortName()) != null) { - UnifiedBeanMetaData bmd = appMetaData.getBeanByEjbName(ep.getShortName()); - UnifiedEjbPortComponentMetaData pcmd = bmd.getPortComponent(); - if (pcmd != null) - { - urlPattern = pcmd.getPortComponentURI(); - } + EJBMetaData bmd = appMetaData.getBeanByEjbName(ep.getShortName()); + urlPattern = bmd.getPortComponentURI(); } return urlPattern; Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -28,8 +28,8 @@ import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; /** * A deployer that assigns the context root to the service @@ -62,7 +62,7 @@ String contextRoot = null; // #1 Use the explicit context root from the web meta data - UnifiedWebMetaData webMetaData = dep.getAttachment(UnifiedWebMetaData.class); + JSEArchiveMetaData webMetaData = dep.getAttachment(JSEArchiveMetaData.class); if (webMetaData != null) contextRoot = webMetaData.getContextRoot(); @@ -84,7 +84,7 @@ } // #3 Use the explicit context root from webservices/context-root - UnifiedApplicationMetaData appMetaData = dep.getAttachment(UnifiedApplicationMetaData.class); + EJBArchiveMetaData appMetaData = dep.getAttachment(EJBArchiveMetaData.class); if (contextRoot == null && appMetaData != null) { contextRoot = appMetaData.getWebServiceContextRoot(); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -35,9 +35,9 @@ import org.jboss.wsf.spi.invocation.InvocationType; import org.jboss.wsf.spi.invocation.RequestHandler; import org.jboss.wsf.spi.invocation.RequestHandlerFactory; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; +import org.jboss.wsf.spi.metadata.j2ee.MDBMetaData; /** * A deployer that assigns the handlers to the Endpoint @@ -89,11 +89,11 @@ String key = dep.getType().toString(); // Use a special key for MDB endpoints - UnifiedApplicationMetaData uapp = dep.getAttachment(UnifiedApplicationMetaData.class); + EJBArchiveMetaData uapp = dep.getAttachment(EJBArchiveMetaData.class); if (uapp != null) { - UnifiedBeanMetaData bmd = uapp.getBeanByEjbName(ep.getShortName()); - if (bmd instanceof UnifiedMessageDrivenMetaData) + EJBMetaData bmd = uapp.getBeanByEjbName(ep.getShortName()); + if (bmd instanceof MDBMetaData) { key = "JAXRPC_MDB21"; } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -23,9 +23,9 @@ //$Id$ -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; +import org.jboss.wsf.spi.metadata.j2ee.MDBMetaData; import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; @@ -53,13 +53,13 @@ name.append(Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ep.getShortName()); // Append the JMS destination, for an MDB endpoint - UnifiedApplicationMetaData uapp = dep.getAttachment(UnifiedApplicationMetaData.class); + EJBArchiveMetaData uapp = dep.getAttachment(EJBArchiveMetaData.class); if (uapp != null) { - UnifiedBeanMetaData bmd = uapp.getBeanByEjbName(ep.getShortName()); - if (bmd instanceof UnifiedMessageDrivenMetaData) + EJBMetaData bmd = uapp.getBeanByEjbName(ep.getShortName()); + if (bmd instanceof MDBMetaData) { - String destName = ((UnifiedMessageDrivenMetaData)bmd).getDestinationJndiName(); + String destName = ((MDBMetaData)bmd).getDestinationJndiName(); name.append(",jms=" + destName); } } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -24,13 +24,12 @@ //$Id$ import org.jboss.wsf.spi.annotation.WebContext; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; -import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.spi.deployment.DeploymentAspect; import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; /** * A deployer that assigns the URLPattern to endpoints. @@ -66,7 +65,7 @@ String urlPattern = null; // #1 For JSE lookup the url-pattern from the servlet mappings - UnifiedWebMetaData webMetaData = dep.getAttachment(UnifiedWebMetaData.class); + JSEArchiveMetaData webMetaData = dep.getAttachment(JSEArchiveMetaData.class); if (webMetaData != null) { String epName = ep.getShortName(); @@ -76,15 +75,11 @@ } // #2 Use the explicit urlPattern from port-component/port-component-uri - UnifiedApplicationMetaData appMetaData = dep.getAttachment(UnifiedApplicationMetaData.class); + EJBArchiveMetaData appMetaData = dep.getAttachment(EJBArchiveMetaData.class); if (appMetaData != null && appMetaData.getBeanByEjbName(ep.getShortName()) != null) { - UnifiedBeanMetaData bmd = appMetaData.getBeanByEjbName(ep.getShortName()); - UnifiedEjbPortComponentMetaData pcmd = bmd.getPortComponent(); - if (pcmd != null) - { - urlPattern = pcmd.getPortComponentURI(); - } + EJBMetaData bmd = appMetaData.getBeanByEjbName(ep.getShortName()); + urlPattern = bmd.getPortComponentURI(); } // #3 For EJB use @WebContext.urlPattern Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -45,9 +45,9 @@ import org.jboss.wsf.spi.deployment.WSFDeploymentException; import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData; /** * A deployer that generates a webapp for an EJB endpoint @@ -180,16 +180,16 @@ secureWSDLAccess = anWebContext.secureWSDLAccess(); } - UnifiedApplicationMetaData appMetaData = dep.getAttachment(UnifiedApplicationMetaData.class); + EJBArchiveMetaData appMetaData = dep.getAttachment(EJBArchiveMetaData.class); if (appMetaData != null && appMetaData.getBeanByEjbName(ejbName) != null) { - UnifiedBeanMetaData bmd = appMetaData.getBeanByEjbName(ejbName); - UnifiedEjbPortComponentMetaData pc = bmd.getPortComponent(); - if (pc != null) + EJBMetaData bmd = appMetaData.getBeanByEjbName(ejbName); + EJBSecurityMetaData smd = bmd.getSecurityMetaData(); + if (smd != null) { - beanAuthMethod = pc.getAuthMethod(); - transportGuarantee = pc.getTransportGuarantee(); - secureWSDLAccess = pc.getSecureWSDLAccess(); + beanAuthMethod = smd.getAuthMethod(); + transportGuarantee = smd.getTransportGuarantee(); + secureWSDLAccess = smd.getSecureWSDLAccess(); } } Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/ContainerMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/ContainerMetaData.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/ContainerMetaData.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -0,0 +1,83 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.spi.metadata.j2ee; + +//$Id: BasicDeploymentContext.java 3959 2007-07-20 14:44:19Z heiko.braun(a)jboss.com $ + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import org.jboss.wsf.spi.deployment.Extendible; + +/** + * A general extendible artifact + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public class ContainerMetaData implements Extendible +{ + private Map<Class, Object> attachments = new HashMap<Class, Object>(); + private Map<String, Object> properties = new HashMap<String, Object>(); + + public Collection<Object> getAttachments() + { + return attachments.values(); + } + + public <T> T getAttachment(Class<T> clazz) + { + return (T)attachments.get(clazz); + } + + public <T> T addAttachment(Class<T> clazz, Object obj) + { + return (T)attachments.put(clazz, obj); + } + + public <T> T removeAttachment(Class<T> key) + { + return (T)attachments.remove(key); + } + + public Set<String> getProperties() + { + return properties.keySet(); + } + + public Object getProperty(String key) + { + return properties.get(key); + } + + public void removeProperty(String key) + { + properties.remove(key); + } + + public void setProperty(String key, Object value) + { + properties.put(key, value); + } +} Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBArchiveMetaData.java (from rev 4012, trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedApplicationMetaData.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBArchiveMetaData.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBArchiveMetaData.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -0,0 +1,129 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.spi.metadata.j2ee; + +//$Id$ + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +/** + * The container independent top level meta data from the jboss.xml and ejb-jar.xml descriptor. + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class EJBArchiveMetaData extends ContainerMetaData +{ + /** ArrayList<BeanMetaData> for the ejbs */ + private List<EJBMetaData> beans = new ArrayList<EJBMetaData>(); + /** The optional JBossWS config-name */ + private String configName; + /** The optional JBossWS config-file */ + private String configFile; + /** The web context root to use for web services */ + private String webServiceContextRoot; + /** The security-domain value assigned to the application */ + private String securityDomain; + /** A HashMap<String, String> for webservice description publish locations */ + private PublishLocationAdapter publishLocationAdapter; + + public EJBMetaData getBeanByEjbName(String ejbName) + { + for (EJBMetaData beanMetaData : beans) + { + if (beanMetaData.getEjbName().equals(ejbName)) + { + return beanMetaData; + } + } + return null; + } + + public Iterator<EJBMetaData> getEnterpriseBeans() + { + return beans.iterator(); + } + + public void setEnterpriseBeans(List<EJBMetaData> beans) + { + this.beans = beans; + } + + public String getConfigName() + { + return configName; + } + + public void setConfigName(String configName) + { + this.configName = configName; + } + + public String getConfigFile() + { + return configFile; + } + + public void setConfigFile(String configFile) + { + this.configFile = configFile; + } + + public String getWebServiceContextRoot() + { + return webServiceContextRoot; + } + + public void setWebServiceContextRoot(String contextRoot) + { + this.webServiceContextRoot = contextRoot; + } + + public String getSecurityDomain() + { + return securityDomain; + } + + public void setSecurityDomain(String securityDomain) + { + this.securityDomain = securityDomain; + } + + public void setPublishLocationAdapter(PublishLocationAdapter publishLocationAdapter) + { + this.publishLocationAdapter = publishLocationAdapter; + } + + public String getWsdlPublishLocationByName(String name) + { + String publishLocation = (publishLocationAdapter != null ? publishLocationAdapter.getWsdlPublishLocationByName(name) : null); + return publishLocation; + + } + + public interface PublishLocationAdapter + { + String getWsdlPublishLocationByName(String name); + } +} Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBMetaData.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBMetaData.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -0,0 +1,159 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.spi.metadata.j2ee; + +//$Id: UnifiedBeanMetaData.java 3772 2007-07-01 19:29:13Z thomas.diesler(a)jboss.com $ + +/** + * The container independent common meta data class for the entity, message-driven and session beans. + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public abstract class EJBMetaData extends ContainerMetaData +{ + // The ejb-name element specifies an enterprise bean's name. + private String ejbName; + // The ejb-class element contains the fully-qualified name of the enterprise bean's class. + private String ejbClass; + // The home element contains the fully-qualified name of the enterprise bean's home interface. */ + private String homeClass; + // The local-home element contains the fully-qualified name of the enterprise bean's local home interface. + private String localHomeClass; + // The service-endpoint element contains the fully-qualified name of the beans service endpoint interface (SEI) + private String seiName; + // The JNDI name under with the home interface should be bound + private String jndiName; + // The JNDI name under with the local home interface should be bound + private String localJndiName; + // The optional port-component-name + private String portComponentName; + // The optional port-component-uri + private String portComponentURI; + // The optional security meta data + private EJBSecurityMetaData securityMetaData; + + public String getEjbName() + { + return ejbName; + } + + public void setEjbName(String ejbName) + { + this.ejbName = ejbName; + } + + public String getEjbClass() + { + return ejbClass; + } + + public void setEjbClass(String ejbClass) + { + this.ejbClass = ejbClass; + } + + public String getServiceEndpointInterface() + { + return seiName; + } + + public void setServiceEndpointInterface(String seiName) + { + this.seiName = seiName; + } + + public String getContainerObjectNameJndiName() + { + return getHome() != null ? getJndiName() : getLocalJndiName(); + } + + public String getHome() + { + return homeClass; + } + + public void setHome(String homeClass) + { + this.homeClass = homeClass; + } + + public String getJndiName() + { + return jndiName; + } + + public void setJndiName(String jndiName) + { + this.jndiName = jndiName; + } + + public String getLocalHome() + { + return localHomeClass; + } + + public void setLocalHome(String localHomeClass) + { + this.localHomeClass = localHomeClass; + } + + public String getLocalJndiName() + { + return localJndiName; + } + + public void setLocalJndiName(String localJndiName) + { + this.localJndiName = localJndiName; + } + + public String getPortComponentName() + { + return portComponentName; + } + + public void setPortComponentName(String portComponentName) + { + this.portComponentName = portComponentName; + } + + public String getPortComponentURI() + { + return portComponentURI; + } + + public void setPortComponentURI(String portComponentURI) + { + this.portComponentURI = portComponentURI; + } + + public EJBSecurityMetaData getSecurityMetaData() + { + return securityMetaData; + } + + public void setSecurityMetaData(EJBSecurityMetaData securityMetaData) + { + this.securityMetaData = securityMetaData; + } +} Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBSecurityMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBSecurityMetaData.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBSecurityMetaData.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -0,0 +1,68 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.spi.metadata.j2ee; + +//$Id: UnifiedBeanMetaData.java 3772 2007-07-01 19:29:13Z thomas.diesler(a)jboss.com $ + +/** + * The container independent EJB security meta data class + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class EJBSecurityMetaData +{ + private String authMethod; + private String transportGuarantee; + private boolean secureWSDLAccess; + + public String getAuthMethod() + { + return authMethod; + } + + public void setAuthMethod(String authMethod) + { + this.authMethod = authMethod; + } + + public String getTransportGuarantee() + { + return transportGuarantee; + } + + public void setTransportGuarantee(String transportGuarantee) + { + this.transportGuarantee = transportGuarantee; + } + + public boolean getSecureWSDLAccess() + { + return secureWSDLAccess; + } + + public void setSecureWSDLAccess(Boolean access) + { + if (access != null) + this.secureWSDLAccess = access; + } +} Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSEArchiveMetaData.java (from rev 4012, trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedWebMetaData.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSEArchiveMetaData.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSEArchiveMetaData.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -0,0 +1,143 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.spi.metadata.j2ee; + +//$Id$ + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * The container independent representation of the web.xml and jboss-web.xml deployment descriptors + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class JSEArchiveMetaData extends ContainerMetaData +{ + // The war context root as specified at the jboss-web.xml descriptor level. + private String contextRoot; + // The servlet-mapping <servlet-name, url-pattern> + private Map<String, String> servletMappings = new HashMap<String, String>(); + // The servlet <servlet-name, servlet-class> + private Map<String, String> servletClassNames = new HashMap<String, String>(); + // The optional JBossWS config-name + private String configName; + // The optional JBossWS config-file + private String configFile; + // The security-domain value assigned to the application + private String securityDomain; + // A HashMap<String, String> for webservice description publish locations + private PublishLocationAdapter publishLocationAdapter; + // web.xml security-constraints + private List<JSESecurityMetaData> securityMetaData; + + public String getContextRoot() + { + return contextRoot; + } + + public void setContextRoot(String contextRoot) + { + this.contextRoot = contextRoot; + } + + public Map<String, String> getServletMappings() + { + return servletMappings; + } + + public void setServletMappings(Map<String, String> servletMappings) + { + this.servletMappings = servletMappings; + } + + public Map<String, String> getServletClassNames() + { + return servletClassNames; + } + + public void setServletClassNames(Map<String, String> servletClassNames) + { + this.servletClassNames = servletClassNames; + } + + public String getConfigName() + { + return configName; + } + + public void setConfigName(String configName) + { + this.configName = configName; + } + + public String getConfigFile() + { + return configFile; + } + + public void setConfigFile(String configFile) + { + this.configFile = configFile; + } + + public String getSecurityDomain() + { + return securityDomain; + } + + public void setSecurityDomain(String securityDomain) + { + this.securityDomain = securityDomain; + } + + public List<JSESecurityMetaData> getSecurityMetaData() + { + return securityMetaData; + } + + public void setSecurityMetaData(List<JSESecurityMetaData> securityMetaData) + { + this.securityMetaData = securityMetaData; + } + + public void setPublishLocationAdapter(PublishLocationAdapter publishLocationAdapter) + { + this.publishLocationAdapter = publishLocationAdapter; + } + + public String getWsdlPublishLocationByName(String name) + { + String publishLocation = null; + if (publishLocationAdapter != null) + publishLocation = publishLocationAdapter.getWsdlPublishLocationByName(name); + return publishLocation; + + } + + public interface PublishLocationAdapter + { + String getWsdlPublishLocationByName(String name); + } +} Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSESecurityMetaData.java (from rev 4012, trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedWebSecurityMetaData.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSESecurityMetaData.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSESecurityMetaData.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -0,0 +1,89 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.spi.metadata.j2ee; + +// $Id$ + +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; + +/** + * + * @author darran.lofthouse(a)jboss.com + * @since Oct 22, 2006 + */ +public class JSESecurityMetaData +{ + // The optional security-constraint/user-data-constraint/transport-guarantee + private String transportGuarantee; + // The HashMap for the security-constraint/web-resource-collection elements. + private HashMap<String, JSEResourceCollection> webResources = new HashMap<String, JSEResourceCollection>(); + + public JSEResourceCollection addWebResource(final String name) + { + JSEResourceCollection wrc = new JSEResourceCollection(name); + webResources.put(name, wrc); + return wrc; + } + + public Collection<JSEResourceCollection> getWebResources() + { + return webResources.values(); + } + + public String getTransportGuarantee() + { + return transportGuarantee; + } + + public void setTransportGuarantee(String transportGuarantee) + { + this.transportGuarantee = transportGuarantee; + } + + public static class JSEResourceCollection + { + private String name; + private HashSet<String> urlPatterns = new HashSet<String>(); + + public JSEResourceCollection(final String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + + public void addPattern(String pattern) + { + urlPatterns.add(pattern); + } + + public HashSet<String> getUrlPatterns() + { + return urlPatterns; + } + } +} Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/MDBMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/MDBMetaData.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/MDBMetaData.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -0,0 +1,47 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.spi.metadata.j2ee; + + +// $Id: UnifiedMessageDrivenMetaData.java 3146 2007-05-18 22:55:26Z thomas.diesler(a)jboss.com $ + + +/** + * The container independent metadata of a message driven bean. + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class MDBMetaData extends EJBMetaData +{ + private String destinationJndiName; + + public String getDestinationJndiName() + { + return destinationJndiName; + } + + public void setDestinationJndiName(String destinationJndiName) + { + this.destinationJndiName = destinationJndiName; + } +} Property changes on: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/MDBMetaData.java ___________________________________________________________________ Name: svn:executable + * Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/SLSBMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/SLSBMetaData.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/SLSBMetaData.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.spi.metadata.j2ee; + + +// $Id: UnifiedSessionMetaData.java 3146 2007-05-18 22:55:26Z thomas.diesler(a)jboss.com $ + + +/** + * The container independent metadata of a stateless session bean. + * + * @author Thomas.Diesler(a)jboss.org + * @since 05-May-2006 + */ +public class SLSBMetaData extends EJBMetaData +{ + +} Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedApplicationMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedApplicationMetaData.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedApplicationMetaData.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -1,129 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.spi.metadata.j2ee; - -//$Id$ - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -/** - * The container independent top level meta data from the jboss.xml and ejb-jar.xml descriptor. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class UnifiedApplicationMetaData -{ - /** ArrayList<BeanMetaData> for the ejbs */ - private List<UnifiedBeanMetaData> beans = new ArrayList<UnifiedBeanMetaData>(); - /** The optional JBossWS config-name */ - private String configName; - /** The optional JBossWS config-file */ - private String configFile; - /** The web context root to use for web services */ - private String webServiceContextRoot; - /** The security-domain value assigned to the application */ - private String securityDomain; - /** A HashMap<String, String> for webservice description publish locations */ - private PublishLocationAdapter publishLocationAdapter; - - public UnifiedBeanMetaData getBeanByEjbName(String ejbName) - { - for (UnifiedBeanMetaData beanMetaData : beans) - { - if (beanMetaData.getEjbName().equals(ejbName)) - { - return beanMetaData; - } - } - return null; - } - - public Iterator<UnifiedBeanMetaData> getEnterpriseBeans() - { - return beans.iterator(); - } - - public void setEnterpriseBeans(List<UnifiedBeanMetaData> beans) - { - this.beans = beans; - } - - public String getConfigName() - { - return configName; - } - - public void setConfigName(String configName) - { - this.configName = configName; - } - - public String getConfigFile() - { - return configFile; - } - - public void setConfigFile(String configFile) - { - this.configFile = configFile; - } - - public String getWebServiceContextRoot() - { - return webServiceContextRoot; - } - - public void setWebServiceContextRoot(String contextRoot) - { - this.webServiceContextRoot = contextRoot; - } - - public String getSecurityDomain() - { - return securityDomain; - } - - public void setSecurityDomain(String securityDomain) - { - this.securityDomain = securityDomain; - } - - public void setPublishLocationAdapter(PublishLocationAdapter publishLocationAdapter) - { - this.publishLocationAdapter = publishLocationAdapter; - } - - public String getWsdlPublishLocationByName(String name) - { - String publishLocation = (publishLocationAdapter != null ? publishLocationAdapter.getWsdlPublishLocationByName(name) : null); - return publishLocation; - - } - - public interface PublishLocationAdapter - { - String getWsdlPublishLocationByName(String name); - } -} Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedBeanMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedBeanMetaData.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedBeanMetaData.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -1,138 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.spi.metadata.j2ee; - -//$Id$ - -/** - * The container independent common meta data class for the entity, message-driven and session beans. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public abstract class UnifiedBeanMetaData -{ - /** The ejb-name element specifies an enterprise bean's name. */ - private String ejbName; - /** The ejb-class element contains the fully-qualified name of the enterprise bean's class. */ - private String ejbClass; - /** The home element contains the fully-qualified name of the enterprise - bean's home interface. */ - private String homeClass; - /** The local-home element contains the fully-qualified name of the - enterprise bean's local home interface. */ - private String localHomeClass; - /** The service-endpoint element contains the fully-qualified name of the beans service endpoint interface (SEI) */ - protected String seiName; - /** The JNDI name under with the home interface should be bound */ - private String jndiName; - /** The JNDI name under with the local home interface should be bound */ - private String localJndiName; - /** The jboss port-component binding for a ejb webservice */ - protected UnifiedEjbPortComponentMetaData portComponent; - - public String getEjbName() - { - return ejbName; - } - - public void setEjbName(String ejbName) - { - this.ejbName = ejbName; - } - - public String getEjbClass() - { - return ejbClass; - } - - public void setEjbClass(String ejbClass) - { - this.ejbClass = ejbClass; - } - - public UnifiedEjbPortComponentMetaData getPortComponent() - { - return portComponent; - } - - public void setPortComponent(UnifiedEjbPortComponentMetaData portComponent) - { - this.portComponent = portComponent; - } - - public String getServiceEndpointInterface() - { - return seiName; - } - - public void setServiceEndpointInterface(String seiName) - { - this.seiName = seiName; - } - - public String getContainerObjectNameJndiName() - { - return getHome() != null ? getJndiName() : getLocalJndiName(); - } - - public String getHome() - { - return homeClass; - } - - public void setHome(String homeClass) - { - this.homeClass = homeClass; - } - - public String getJndiName() - { - return jndiName; - } - - public void setJndiName(String jndiName) - { - this.jndiName = jndiName; - } - - public String getLocalHome() - { - return localHomeClass; - } - - public void setLocalHome(String localHomeClass) - { - this.localHomeClass = localHomeClass; - } - - public String getLocalJndiName() - { - return localJndiName; - } - - public void setLocalJndiName(String localJndiName) - { - this.localJndiName = localJndiName; - } - -} Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedEjbPortComponentMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedEjbPortComponentMetaData.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedEjbPortComponentMetaData.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -1,91 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.spi.metadata.j2ee; - - -//$Id$ - - -/** - * The container independent metadata for session/port-component element from jboss.xml - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class UnifiedEjbPortComponentMetaData -{ - private String portComponentName; - private String portComponentURI; - private String authMethod; - private String transportGuarantee; - private Boolean secureWSDLAccess; - - public String getPortComponentName() - { - return portComponentName; - } - - public void setPortComponentName(String portComponentName) - { - this.portComponentName = portComponentName; - } - - public String getPortComponentURI() - { - return portComponentURI; - } - - public void setPortComponentURI(String portComponentURI) - { - this.portComponentURI = portComponentURI; - } - - public String getAuthMethod() - { - return authMethod; - } - - public void setAuthMethod(String authMethod) - { - this.authMethod = authMethod; - } - - public String getTransportGuarantee() - { - return transportGuarantee; - } - - public void setTransportGuarantee(String transportGuarantee) - { - this.transportGuarantee = transportGuarantee; - } - - public Boolean getSecureWSDLAccess() - { - return secureWSDLAccess; - } - - public void setSecureWSDLAccess(Boolean secureWSDLAccess) - { - this.secureWSDLAccess = secureWSDLAccess; - } -} Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedMessageDrivenMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedMessageDrivenMetaData.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedMessageDrivenMetaData.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -1,47 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.spi.metadata.j2ee; - - -// $Id$ - - -/** - * The container independent metadata of a message driven bean. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class UnifiedMessageDrivenMetaData extends UnifiedBeanMetaData -{ - private String destinationJndiName; - - public String getDestinationJndiName() - { - return destinationJndiName; - } - - public void setDestinationJndiName(String destinationJndiName) - { - this.destinationJndiName = destinationJndiName; - } -} Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedSessionMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedSessionMetaData.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedSessionMetaData.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.spi.metadata.j2ee; - - -// $Id$ - - -/** - * The container independent metadata of a message driven bean. - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class UnifiedSessionMetaData extends UnifiedBeanMetaData -{ - -} Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedWebMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedWebMetaData.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedWebMetaData.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -1,143 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.spi.metadata.j2ee; - -//$Id$ - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * The container independent representation of the web.xml and jboss-web.xml deployment descriptors - * - * @author Thomas.Diesler(a)jboss.org - * @since 05-May-2006 - */ -public class UnifiedWebMetaData -{ - /** The war context root as specified at the jboss-web.xml descriptor level. */ - private String contextRoot; - /** The servlet-mapping <servlet-name, url-pattern> */ - private Map<String, String> servletMappings = new HashMap<String, String>(); - /** The servlet <servlet-name, servlet-class> */ - private Map<String, String> servletClassNames = new HashMap<String, String>(); - /** The optional JBossWS config-name */ - private String configName; - /** The optional JBossWS config-file */ - private String configFile; - /** The security-domain value assigned to the application */ - private String securityDomain; - /** A HashMap<String, String> for webservice description publish locations */ - private PublishLocationAdapter publishLocationAdapter; - /** web.xml security-constraints */ - private List<UnifiedWebSecurityMetaData> securityMetaData; - - public String getContextRoot() - { - return contextRoot; - } - - public void setContextRoot(String contextRoot) - { - this.contextRoot = contextRoot; - } - - public Map<String, String> getServletMappings() - { - return servletMappings; - } - - public void setServletMappings(Map<String, String> servletMappings) - { - this.servletMappings = servletMappings; - } - - public Map<String, String> getServletClassNames() - { - return servletClassNames; - } - - public void setServletClassNames(Map<String, String> servletClassNames) - { - this.servletClassNames = servletClassNames; - } - - public String getConfigName() - { - return configName; - } - - public void setConfigName(String configName) - { - this.configName = configName; - } - - public String getConfigFile() - { - return configFile; - } - - public void setConfigFile(String configFile) - { - this.configFile = configFile; - } - - public String getSecurityDomain() - { - return securityDomain; - } - - public void setSecurityDomain(String securityDomain) - { - this.securityDomain = securityDomain; - } - - public List<UnifiedWebSecurityMetaData> getSecurityMetaData() - { - return securityMetaData; - } - - public void setSecurityMetaData(List<UnifiedWebSecurityMetaData> securityMetaData) - { - this.securityMetaData = securityMetaData; - } - - public void setPublishLocationAdapter(PublishLocationAdapter publishLocationAdapter) - { - this.publishLocationAdapter = publishLocationAdapter; - } - - public String getWsdlPublishLocationByName(String name) - { - String publishLocation = null; - if (publishLocationAdapter != null) - publishLocation = publishLocationAdapter.getWsdlPublishLocationByName(name); - return publishLocation; - - } - - public interface PublishLocationAdapter - { - String getWsdlPublishLocationByName(String name); - } -} Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedWebSecurityMetaData.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedWebSecurityMetaData.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/metadata/j2ee/UnifiedWebSecurityMetaData.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -1,95 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.spi.metadata.j2ee; - -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; - -/** - * - * @author darran.lofthouse(a)jboss.com - * @since Oct 22, 2006 - */ -public class UnifiedWebSecurityMetaData -{ - - /** The optional security-constraint/user-data-constraint/transport-guarantee */ - private String transportGuarantee; - - /** - * The HashMap for the security-constraint/web-resource-collection - * elements. - */ - private HashMap<String, UnifiedWebResourceCollection> webResources = new HashMap<String, UnifiedWebResourceCollection>(); - - public UnifiedWebResourceCollection addWebResource(final String name) - { - UnifiedWebResourceCollection wrc = new UnifiedWebResourceCollection(name); - webResources.put(name, wrc); - - return wrc; - } - - public Collection<UnifiedWebResourceCollection> getWebResources() - { - return webResources.values(); - } - - public String getTransportGuarantee() - { - return transportGuarantee; - } - - public void setTransportGuarantee(String transportGuarantee) - { - this.transportGuarantee = transportGuarantee; - } - - public static class UnifiedWebResourceCollection - { - private String name; - /** The required url-pattern element(s) */ - private HashSet<String> urlPatterns = new HashSet<String>(); - - public UnifiedWebResourceCollection(final String name) - { - this.name = name; - } - - public String getName() - { - return name; - } - - public void addPattern(String pattern) - { - urlPatterns.add(pattern); - } - - public HashSet<String> getUrlPatterns() - { - return urlPatterns; - } - } - -} Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -73,12 +73,12 @@ import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.management.ServerConfig; import org.jboss.wsf.spi.management.ServerConfigFactory; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedMessageDrivenMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebSecurityMetaData.UnifiedWebResourceCollection; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; +import org.jboss.wsf.spi.metadata.j2ee.MDBMetaData; +import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData; +import org.jboss.wsf.spi.metadata.j2ee.JSESecurityMetaData.JSEResourceCollection; /** An abstract meta data builder. * @@ -204,20 +204,20 @@ idstr.append("," + ServerEndpointMetaData.SEPID_PROPERTY_ENDPOINT + "=" + linkName); // Add JMS destination JNDI name for MDB endpoints - UnifiedApplicationMetaData apMetaData = dep.getAttachment(UnifiedApplicationMetaData.class); + EJBArchiveMetaData apMetaData = dep.getAttachment(EJBArchiveMetaData.class); if (apMetaData != null) { String ejbName = sepMetaData.getLinkName(); if (ejbName == null) throw new WSException("Cannot obtain ejb-link from port component"); - UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)apMetaData.getBeanByEjbName(ejbName); + EJBMetaData beanMetaData = (EJBMetaData)apMetaData.getBeanByEjbName(ejbName); if (beanMetaData == null) throw new WSException("Cannot obtain ejb meta data for: " + ejbName); - if (beanMetaData instanceof UnifiedMessageDrivenMetaData) + if (beanMetaData instanceof MDBMetaData) { - UnifiedMessageDrivenMetaData mdMetaData = (UnifiedMessageDrivenMetaData)beanMetaData; + MDBMetaData mdMetaData = (MDBMetaData)beanMetaData; String jndiName = mdMetaData.getDestinationJndiName(); idstr.append(",jms=" + jndiName); } @@ -264,7 +264,7 @@ protected void initTransportGuaranteeJSE(Deployment dep, ServerEndpointMetaData sepMetaData, String servletLink) throws IOException { String transportGuarantee = null; - UnifiedWebMetaData webMetaData = dep.getAttachment(UnifiedWebMetaData.class); + JSEArchiveMetaData webMetaData = dep.getAttachment(JSEArchiveMetaData.class); if (webMetaData != null) { Map<String, String> servletMappings = webMetaData.getServletMappings(); @@ -273,12 +273,12 @@ if (urlPattern == null) throw new WSException("Cannot find <url-pattern> for servlet-name: " + servletLink); - List<UnifiedWebSecurityMetaData> securityList = webMetaData.getSecurityMetaData(); - for (UnifiedWebSecurityMetaData currentSecurity : securityList) + List<JSESecurityMetaData> securityList = webMetaData.getSecurityMetaData(); + for (JSESecurityMetaData currentSecurity : securityList) { if (currentSecurity.getTransportGuarantee() != null && currentSecurity.getTransportGuarantee().length() > 0) { - for (UnifiedWebResourceCollection currentCollection : currentSecurity.getWebResources()) + for (JSEResourceCollection currentCollection : currentSecurity.getWebResources()) { for (String currentUrlPattern : currentCollection.getUrlPatterns()) { Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -43,11 +43,10 @@ import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; import org.jboss.ws.metadata.wsse.WSSecurityOMFactory; import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedEjbPortComponentMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBSecurityMetaData; +import org.jboss.wsf.spi.metadata.j2ee.JSEArchiveMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; import org.jboss.wsf.spi.metadata.webservices.PortComponentMetaData; @@ -105,9 +104,7 @@ // Assign the WS-Security configuration, WSSecurityConfigFactory wsseConfFactory = WSSecurityConfigFactory.newInstance(); - WSSecurityConfiguration securityConfiguration = wsseConfFactory.createConfiguration( - wsMetaData.getRootFile(), WSSecurityOMFactory.SERVER_RESOURCE_NAME - ); + WSSecurityConfiguration securityConfiguration = wsseConfFactory.createConfiguration(wsMetaData.getRootFile(), WSSecurityOMFactory.SERVER_RESOURCE_NAME); serviceMetaData.setSecurityConfiguration(securityConfiguration); // For every port-component build the EndpointMetaData @@ -144,8 +141,8 @@ initEndpointAddress(dep, sepMetaData); - UnifiedApplicationMetaData apMetaData = dep.getAttachment(UnifiedApplicationMetaData.class); - UnifiedWebMetaData webMetaData = dep.getAttachment(UnifiedWebMetaData.class); + EJBArchiveMetaData apMetaData = dep.getAttachment(EJBArchiveMetaData.class); + JSEArchiveMetaData webMetaData = dep.getAttachment(JSEArchiveMetaData.class); if (apMetaData != null) { wsMetaData.setSecurityDomain(apMetaData.getSecurityDomain()); @@ -156,8 +153,8 @@ serviceMetaData.setWsdlPublishLocation(wsdlPublishLocation); // Copy <port-component> meta data - UnifiedBeanMetaData beanMetaData = apMetaData.getBeanByEjbName(linkName); - if (beanMetaData == null) + EJBMetaData bmd = apMetaData.getBeanByEjbName(linkName); + if (bmd == null) throw new WSException("Cannot obtain UnifiedBeanMetaData for: " + linkName); String configName = apMetaData.getConfigName(); @@ -165,24 +162,15 @@ if (configName != null || configFile != null) sepMetaData.setConfigName(configName, configFile); - UnifiedEjbPortComponentMetaData bpcMetaData = beanMetaData.getPortComponent(); - if (bpcMetaData != null) + EJBSecurityMetaData smd = bmd.getSecurityMetaData(); + if (smd != null) { - if (bpcMetaData.getAuthMethod() != null) - { - String authMethod = bpcMetaData.getAuthMethod(); - sepMetaData.setAuthMethod(authMethod); - } - if (bpcMetaData.getTransportGuarantee() != null) - { - String transportGuarantee = bpcMetaData.getTransportGuarantee(); - sepMetaData.setTransportGuarantee(transportGuarantee); - } - if (bpcMetaData.getSecureWSDLAccess() != null) - { - Boolean secureWSDLAccess = bpcMetaData.getSecureWSDLAccess(); - sepMetaData.setSecureWSDLAccess(secureWSDLAccess); - } + String authMethod = smd.getAuthMethod(); + sepMetaData.setAuthMethod(authMethod); + String transportGuarantee = smd.getTransportGuarantee(); + sepMetaData.setTransportGuarantee(transportGuarantee); + Boolean secureWSDLAccess = smd.getSecureWSDLAccess(); + sepMetaData.setSecureWSDLAccess(secureWSDLAccess); } } else if (webMetaData != null) Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-07-27 03:15:32 UTC (rev 4012) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-07-27 04:37:52 UTC (rev 4013) @@ -32,8 +32,8 @@ import org.jboss.ws.WSException; import org.jboss.ws.metadata.umdm.UnifiedMetaData; import org.jboss.wsf.spi.deployment.ArchiveDeployment; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; -import org.jboss.wsf.spi.metadata.j2ee.UnifiedBeanMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBArchiveMetaData; +import org.jboss.wsf.spi.metadata.j2ee.EJBMetaData; /** * A server side meta data builder that is based on JSR-181 annotations @@ -61,11 +61,11 @@ wsMetaData.setClassLoader(dep.getInitialClassLoader()); // The container objects below provide access to all of the ejb metadata - UnifiedApplicationMetaData apMetaData = dep.getAttachment(UnifiedApplicationMetaData.class); - Iterator<UnifiedBeanMetaData> it = apMetaData.getEnterpriseBeans(); + EJBArchiveMetaData apMetaData = dep.getAttachment(EJBArchiveMetaData.class); + Iterator<EJBMetaData> it = apMetaData.getEnterpriseBeans(); while (it.hasNext()) { - UnifiedBeanMetaData beanMetaData = it.next(); + EJBMetaData beanMetaData = it.next(); String ejbClassName = beanMetaData.getEjbClass(); Class<?> beanClass = wsMetaData.getClassLoader().loadClass(ejbClassName); if (beanClass.isAnnotationPresent(WebService.class) || beanClass.isAnnotationPresent(WebServiceProvider.class))

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r4012 - in trunk: integration/spi/src/main/java/org/jboss/wsf/spi/binding and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-26 23:15:32 -0400 (Thu, 26 Jul 2007) New Revision: 4012 Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicEndpoint.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicExtendible.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicService.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/BindingCustomization.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Extendible.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Service.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBBindingCustomization.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java Log: Use Extendible for BindingCustomizations Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicEndpoint.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicEndpoint.java 2007-07-27 02:45:35 UTC (rev 4011) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicEndpoint.java 2007-07-27 03:15:32 UTC (rev 4012) @@ -22,7 +22,6 @@ package org.jboss.wsf.framework.deployment; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import javax.management.ObjectName; @@ -194,44 +193,45 @@ this.invocationHandler = handler; } - public List<BindingCustomization> getBindingCustomizations() + public EndpointMetrics getEndpointMetrics() { - return Collections.unmodifiableList(bindingCustomizsations); + return metrics; } - /* Get a concrete binding customization */ - public BindingCustomization getBindingCustomization(BindingCustomization customization) + public void setEndpointMetrics(EndpointMetrics metrics) { - BindingCustomization match = null; + assertEndpointSetterAccess(); + metrics.setEndpoint(this); + this.metrics = metrics; - for (BindingCustomization bc : bindingCustomizsations) - { - if (bc.getClass().equals(customization.getClass())) - { - match = bc; - } - } + } - return match; + @Override + public <T> T addAttachment(Class<T> clazz, Object obj) + { + assertEndpointSetterAccess(); + return super.addAttachment(clazz, obj); } - public void addBindingCustomization(BindingCustomization customization) + @Override + public <T> T removeAttachment(Class<T> key) { assertEndpointSetterAccess(); - bindingCustomizsations.add(customization); + return super.removeAttachment(key); } - public EndpointMetrics getEndpointMetrics() + @Override + public void removeProperty(String key) { - return metrics; + assertEndpointSetterAccess(); + super.removeProperty(key); } - public void setEndpointMetrics(EndpointMetrics metrics) + @Override + public void setProperty(String key, Object value) { assertEndpointSetterAccess(); - metrics.setEndpoint(this); - this.metrics = metrics; - + super.setProperty(key, value); } private void assertEndpointSetterAccess() Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicExtendible.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicExtendible.java 2007-07-27 02:45:35 UTC (rev 4011) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicExtendible.java 2007-07-27 03:15:32 UTC (rev 4012) @@ -23,6 +23,7 @@ //$Id: BasicDeploymentContext.java 3959 2007-07-20 14:44:19Z heiko.braun(a)jboss.com $ +import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -40,6 +41,11 @@ private Map<Class, Object> attachments = new HashMap<Class, Object>(); private Map<String, Object> properties = new HashMap<String, Object>(); + public Collection<Object> getAttachments() + { + return attachments.values(); + } + public <T> T getAttachment(Class<T> clazz) { return (T)attachments.get(clazz); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicService.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicService.java 2007-07-27 02:45:35 UTC (rev 4011) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicService.java 2007-07-27 03:15:32 UTC (rev 4012) @@ -78,21 +78,4 @@ { this.contextRoot = contextRoot; } - - public Endpoint getEndpointByName(String shortName) - { - if (shortName == null) - throw new IllegalArgumentException("shortName cannot be null"); - - Endpoint retEndpoint = null; - for (Endpoint ep : endpoints) - { - if (ep.getShortName().equals(shortName)) - { - retEndpoint = ep; - break; - } - } - return retEndpoint; - } } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/BindingCustomization.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/BindingCustomization.java 2007-07-27 02:45:35 UTC (rev 4011) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/binding/BindingCustomization.java 2007-07-27 03:15:32 UTC (rev 4012) @@ -34,6 +34,7 @@ * @author Heiko.Braun(a)jboss.com * Created: Jun 28, 2007 */ -public abstract class BindingCustomization extends HashMap { - +public abstract class BindingCustomization extends HashMap +{ + } Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-07-27 02:45:35 UTC (rev 4011) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-07-27 03:15:32 UTC (rev 4012) @@ -23,15 +23,12 @@ // $Id$ -import org.jboss.wsf.spi.binding.BindingCustomization; +import javax.management.ObjectName; + import org.jboss.wsf.spi.invocation.InvocationHandler; import org.jboss.wsf.spi.invocation.RequestHandler; import org.jboss.wsf.spi.management.EndpointMetrics; -import javax.management.ObjectName; -import java.util.List; -import java.util.Set; - /** * A general JAXWS endpoint. * @@ -114,15 +111,6 @@ /** Set the endpoint bean invoker */ void setInvocationHandler(InvocationHandler invoker); - /** Get all binding customizations for this endpoint */ - List<BindingCustomization> getBindingCustomizations(); - - /** Get a concrete binding customization */ - BindingCustomization getBindingCustomization(BindingCustomization bindingCustomization); - - /** Add a binding customization to this endpoint*/ - void addBindingCustomization (BindingCustomization bindingCustomization); - /** Get the endpoint metrics for this endpoint */ EndpointMetrics getEndpointMetrics(); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Extendible.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Extendible.java 2007-07-27 02:45:35 UTC (rev 4011) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Extendible.java 2007-07-27 03:15:32 UTC (rev 4012) @@ -23,6 +23,7 @@ //$Id: Deployment.java 3999 2007-07-26 11:33:20Z thomas.diesler(a)jboss.com $ +import java.util.Collection; import java.util.Set; /** @@ -37,6 +38,9 @@ <T> T addAttachment(Class<T> key, Object value); /** Get arbitrary attachments */ + <T> Collection<T> getAttachments(); + + /** Get an arbitrary attachment */ <T> T getAttachment(Class<T> key); /** Remove arbitrary attachments */ Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Service.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Service.java 2007-07-27 02:45:35 UTC (rev 4011) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Service.java 2007-07-27 03:15:32 UTC (rev 4012) @@ -25,7 +25,6 @@ import java.util.List; - /** * A general service deployment. * @@ -53,7 +52,4 @@ /** Set the context root for this service */ void setContextRoot(String contextRoot); - - /** Get the Endpoint for a give short name */ - Endpoint getEndpointByName(String shortName); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBBindingCustomization.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBBindingCustomization.java 2007-07-27 02:45:35 UTC (rev 4011) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBBindingCustomization.java 2007-07-27 03:15:32 UTC (rev 4012) @@ -22,6 +22,7 @@ package org.jboss.ws.core.jaxws; import org.jboss.wsf.spi.binding.BindingCustomization; + import com.sun.xml.bind.api.JAXBRIContext; /** @@ -32,8 +33,8 @@ * @author Heiko.Braun(a)jboss.com * Created: Jun 28, 2007 */ -public class JAXBBindingCustomization extends BindingCustomization { - +public class JAXBBindingCustomization extends BindingCustomization +{ // Use an alternative RuntimeAnnotationReader implementation public final static String ANNOTATION_READER = JAXBRIContext.ANNOTATION_READER; @@ -42,6 +43,4 @@ // Enable the c14n marshalling support in the JAXBContext. public final static String CANONICALIZATION_SUPPORT = JAXBRIContext.CANONICALIZATION_SUPPORT; - - } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-07-27 02:45:35 UTC (rev 4011) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-07-27 03:15:32 UTC (rev 4012) @@ -136,10 +136,11 @@ // Get the URL pattern from the endpoint String linkName = sepMetaData.getLinkName(); - if (linkName != null && dep.getService().getEndpointByName(linkName) != null) + if (linkName != null) { - Endpoint endpoint = dep.getService().getEndpointByName(linkName); - urlPattern = endpoint.getURLPattern(); + Endpoint endpoint = getEndpointByName(dep, linkName); + if (endpoint != null) + urlPattern = endpoint.getURLPattern(); } // If not, derive the context root from the deployment @@ -174,6 +175,23 @@ sepMetaData.setEndpointAddress(getServiceEndpointAddress(null, servicePath)); } + private Endpoint getEndpointByName(Deployment dep, String shortName) + { + if (shortName == null) + throw new IllegalArgumentException("shortName cannot be null"); + + Endpoint retEndpoint = null; + for (Endpoint ep : dep.getService().getEndpoints()) + { + if (ep.getShortName().equals(shortName)) + { + retEndpoint = ep; + break; + } + } + return retEndpoint; + } + public static ObjectName createServiceEndpointID(Deployment dep, ServerEndpointMetaData sepMetaData) { String linkName = sepMetaData.getLinkName(); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-07-27 02:45:35 UTC (rev 4011) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/EndpointMetaData.java 2007-07-27 03:15:32 UTC (rev 4012) @@ -23,6 +23,24 @@ // $Id$ +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Observable; +import java.util.Properties; +import java.util.Set; + +import javax.jws.soap.SOAPBinding.ParameterStyle; +import javax.xml.namespace.QName; +import javax.xml.rpc.ParameterMode; +import javax.xml.ws.Service.Mode; + import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; @@ -40,19 +58,16 @@ import org.jboss.ws.core.soap.Style; import org.jboss.ws.core.soap.Use; import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.ws.metadata.config.*; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; -import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; +import org.jboss.ws.metadata.config.CommonConfig; +import org.jboss.ws.metadata.config.Configurable; +import org.jboss.ws.metadata.config.ConfigurationProvider; +import org.jboss.ws.metadata.config.EndpointFeature; +import org.jboss.ws.metadata.config.JBossWSConfigFactory; import org.jboss.wsf.common.JavaUtils; import org.jboss.wsf.spi.binding.BindingCustomization; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData.HandlerType; -import javax.jws.soap.SOAPBinding.ParameterStyle; -import javax.xml.namespace.QName; -import javax.xml.rpc.ParameterMode; -import javax.xml.ws.Service.Mode; -import java.lang.reflect.Method; -import java.util.*; - /** * A Service component describes a set of endpoints. * @@ -314,7 +329,8 @@ return type; } - public List<BindingCustomization> getBindingCustomizations() { + public Collection<BindingCustomization> getBindingCustomizations() + { return bindingCustomization; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-07-27 02:45:35 UTC (rev 4011) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServerEndpointMetaData.java 2007-07-27 03:15:32 UTC (rev 4012) @@ -31,6 +31,9 @@ import javax.management.ObjectName; import javax.xml.namespace.QName; + +import java.util.ArrayList; +import java.util.Collection; import java.util.List; /** @@ -191,9 +194,15 @@ * Will be set through a deployment aspect * @return List<BindingCustomization> of available customizations */ - public List<BindingCustomization> getBindingCustomizations() + public Collection<BindingCustomization> getBindingCustomizations() { - return endpoint.getBindingCustomizations(); + List<BindingCustomization> list = new ArrayList<BindingCustomization>(); + for (Object att : endpoint.getAttachments()) + { + if (att instanceof BindingCustomization) + list.add((BindingCustomization)att); + } + return list; } public String toString() Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java 2007-07-27 02:45:35 UTC (rev 4011) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/jaxws/binding/BindingCustomizationTestCase.java 2007-07-27 03:15:32 UTC (rev 4012) @@ -22,17 +22,15 @@ package org.jboss.test.ws.jaxws.binding; import junit.framework.TestCase; + import org.jboss.ws.core.jaxws.JAXBBindingCustomization; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.binding.BindingCustomization; import org.jboss.wsf.spi.deployment.DeploymentModelFactory; import org.jboss.wsf.spi.deployment.Endpoint; -import static org.jboss.wsf.spi.deployment.Endpoint.EndpointState; +import org.jboss.wsf.spi.deployment.Endpoint.EndpointState; -import java.util.Iterator; -import java.util.List; - /** * @author Heiko.Braun(a)jboss.com * Created: Jun 28, 2007 @@ -54,13 +52,13 @@ Endpoint endpoint = deploymentModelFactory.createEndpoint(); JAXBBindingCustomization jaxbCustomization = new JAXBBindingCustomization(); jaxbCustomization.put(JAXBBindingCustomization.DEFAULT_NAMESPACE_REMAP, "http://org.jboss.bindingCustomization"); - endpoint.addBindingCustomization(jaxbCustomization); + endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); // a started endpoint should deny customizations try { endpoint.setState(EndpointState.STARTED); - endpoint.addBindingCustomization(jaxbCustomization); + endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); fail("It should not be possible to change bindinig customizations on a started endpoint"); } @@ -75,26 +73,17 @@ Endpoint endpoint = deploymentModelFactory.createEndpoint(); JAXBBindingCustomization jaxbCustomization = new JAXBBindingCustomization(); jaxbCustomization.put(JAXBBindingCustomization.DEFAULT_NAMESPACE_REMAP, "http://org.jboss.bindingCustomization"); - endpoint.addBindingCustomization(jaxbCustomization); + endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); endpoint.setState(EndpointState.STARTED); // read a single customization - List<BindingCustomization> customizations = endpoint.getBindingCustomizations(); - - BindingCustomization knownCustomization = null; - Iterator<BindingCustomization> it = customizations.iterator(); - while(it.hasNext()) - { - knownCustomization = it.next(); - break; - } - + BindingCustomization knownCustomization = endpoint.getAttachment(BindingCustomization.class); assertNotNull(knownCustomization); // however the iteratoion should be unmodifiable try { - customizations.add( new JAXBBindingCustomization() ); + endpoint.addAttachment(BindingCustomization.class, jaxbCustomization); fail("Started Endpoints should only axpose read acccess to their binding customizations"); } catch (Exception e)

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r4011 - in trunk: integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50 and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-26 22:45:35 -0400 (Thu, 26 Jul 2007) New Revision: 4011 Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicExtendible.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Extendible.java Removed: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeploymentContext.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentContext.java Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB21.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeploymentAspect.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB21.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB3.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BackwardCompatibleContextRootDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicEndpoint.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicService.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifierImpl.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Service.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java Log: Add Extendible. Remove DeploymentContext Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractApplicationMetaDataAdapter.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -46,7 +46,7 @@ public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, DeploymentInfo di) { ApplicationMetaData apmd = (ApplicationMetaData)di.metaData; - dep.getContext().addAttachment(ApplicationMetaData.class, apmd); + dep.addAttachment(ApplicationMetaData.class, apmd); UnifiedApplicationMetaData appMetaData = new UnifiedApplicationMetaData(); buildUnifiedBeanMetaData(appMetaData, apmd); Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ApplicationMetaDataAdapterEJB3.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -57,7 +57,7 @@ { UnifiedApplicationMetaData appMetaData = null; - ObjectName oname = (ObjectName)dep.getContext().getProperty(DEPLOYED_OBJECT); + ObjectName oname = (ObjectName)dep.getProperty(DEPLOYED_OBJECT); // jboss.j2ee:service=EJB3,module=some-ejb3.jar if (oname != null && oname.getDomain().equals("jboss.j2ee") && "EJB3".equals(oname.getKeyProperty("service"))) Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/ArchiveDeployerHook.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -91,7 +91,7 @@ if (dep == null) { dep = createDeployment(unit); - dep.getContext().addAttachment(DeploymentInfo.class, unit); + dep.addAttachment(DeploymentInfo.class, unit); } getDeploymentAspectManager().deploy(dep); Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentInfoAdapter.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -33,7 +33,6 @@ import org.jboss.metadata.WebMetaData; import org.jboss.wsf.framework.deployment.WebXMLRewriter; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentContext; import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.metadata.j2ee.UnifiedApplicationMetaData; import org.jboss.wsf.spi.metadata.j2ee.UnifiedWebMetaData; @@ -70,30 +69,28 @@ public void buildDeploymentInfo(Deployment dep, DeploymentInfo di) { - DeploymentContext ctx = dep.getContext(); - - ctx.addAttachment(DeploymentInfo.class, di); - ctx.setProperty(ApplicationMetaDataAdapterEJB3.DEPLOYED_OBJECT, di.deployedObject); + dep.addAttachment(DeploymentInfo.class, di); + dep.setProperty(ApplicationMetaDataAdapterEJB3.DEPLOYED_OBJECT, di.deployedObject); if (di.metaData instanceof WebMetaData) { UnifiedWebMetaData webMetaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, di); if (webMetaData != null) - ctx.addAttachment(UnifiedWebMetaData.class, webMetaData); + dep.addAttachment(UnifiedWebMetaData.class, webMetaData); - ctx.setProperty(WebXMLRewriter.WEBAPP_URL, getDeploymentURL(di)); + dep.setProperty(WebXMLRewriter.WEBAPP_URL, getDeploymentURL(di)); } else if (dep.getType() == DeploymentType.JAXRPC_EJB3 || dep.getType() == DeploymentType.JAXWS_EJB3) { UnifiedApplicationMetaData appMetaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep); if (appMetaData != null) - ctx.addAttachment(UnifiedApplicationMetaData.class, appMetaData); + dep.addAttachment(UnifiedApplicationMetaData.class, appMetaData); } else if (di.metaData instanceof ApplicationMetaData) { UnifiedApplicationMetaData appMetaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, di); if (appMetaData != null) - ctx.addAttachment(UnifiedApplicationMetaData.class, appMetaData); + dep.addAttachment(UnifiedApplicationMetaData.class, appMetaData); } } Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB21.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -86,7 +86,7 @@ { String ejbName = ep.getShortName(); Deployment dep = ep.getService().getDeployment(); - UnifiedApplicationMetaData apMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); + UnifiedApplicationMetaData apMetaData = dep.getAttachment(UnifiedApplicationMetaData.class); UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)apMetaData.getBeanByEjbName(ejbName); if (beanMetaData == null) throw new WebServiceException("Cannot obtain ejb meta data for: " + ejbName); Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookEJB21.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -70,8 +70,8 @@ throw new IllegalStateException("Deployment unit does not contain webservices meta data"); // Copy the attachments - dep.getContext().addAttachment(WebservicesMetaData.class, wsMetaData); - dep.getContext().addAttachment(ApplicationMetaData.class, appmd); + dep.addAttachment(WebservicesMetaData.class, wsMetaData); + dep.addAttachment(ApplicationMetaData.class, appmd); for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) { Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXRPCDeployerHookJSE.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -76,8 +76,8 @@ throw new IllegalStateException("Deployment unit does not contain webservices meta data"); // Copy the attachments - dep.getContext().addAttachment(WebservicesMetaData.class, wsMetaData); - dep.getContext().addAttachment(WebMetaData.class, webMetaData); + dep.addAttachment(WebservicesMetaData.class, wsMetaData); + dep.addAttachment(WebMetaData.class, webMetaData); for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) { Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/JAXWSDeployerHookJSE.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -71,7 +71,7 @@ throw new IllegalStateException("Deployment unit does not contain web meta data"); // Copy the attachments - dep.getContext().addAttachment(WebMetaData.class, webMetaData); + dep.addAttachment(WebMetaData.class, webMetaData); List<Servlet> servlets = getRelevantServlets(webMetaData, di.annotationsCl); for (Servlet servlet : servlets) Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB21.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB21.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB21.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -43,7 +43,7 @@ { public void addSecurityDomain(Element jbossWeb, Deployment dep) { - UnifiedApplicationMetaData appMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); + UnifiedApplicationMetaData appMetaData = dep.getAttachment(UnifiedApplicationMetaData.class); if (appMetaData == null) throw new IllegalStateException("Cannot obtain application meta data"); @@ -60,7 +60,7 @@ public void addSecurityRoles(Element webApp, Deployment dep) { // Fix: http://jira.jboss.org/jira/browse/JBWS-309 - ApplicationMetaData applMetaData = dep.getContext().getAttachment(ApplicationMetaData.class); + ApplicationMetaData applMetaData = dep.getAttachment(ApplicationMetaData.class); AssemblyDescriptorMetaData assemblyDescriptor = applMetaData.getAssemblyDescriptor(); if (assemblyDescriptor != null) { Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/SecurityHandlerEJB3.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -50,7 +50,7 @@ { String securityDomain = null; - ObjectName deployedObject = (ObjectName)dep.getContext().getProperty(ApplicationMetaDataAdapterEJB3.DEPLOYED_OBJECT); + ObjectName deployedObject = (ObjectName)dep.getProperty(ApplicationMetaDataAdapterEJB3.DEPLOYED_OBJECT); Ejb3ModuleMBean ejb3Module = getEJB3Module(deployedObject); for (Object manager : ejb3Module.getContainers().values()) { @@ -81,7 +81,7 @@ public void addSecurityRoles(Element webApp, Deployment dep) { // The container objects below provide access to all of the ejb metadata - ObjectName deployedObject = (ObjectName)dep.getContext().getProperty(ApplicationMetaDataAdapterEJB3.DEPLOYED_OBJECT); + ObjectName deployedObject = (ObjectName)dep.getProperty(ApplicationMetaDataAdapterEJB3.DEPLOYED_OBJECT); Ejb3ModuleMBean ejb3Module = getEJB3Module(deployedObject); for (Object manager : ejb3Module.getContainers().values()) { Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeploymentAspect.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -45,7 +45,7 @@ @Override public void create(Deployment dep) { - DeploymentInfo di = dep.getContext().getAttachment(DeploymentInfo.class); + DeploymentInfo di = dep.getAttachment(DeploymentInfo.class); if (di == null) throw new IllegalStateException("Cannot obtain deployment info"); Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeploymentAspect.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -58,12 +58,12 @@ { if (dep.getType().toString().endsWith("EJB21") || dep.getType().toString().endsWith("EJB3")) { - URL warURL = (URL)dep.getContext().getProperty(WebXMLRewriter.WEBAPP_URL); + URL warURL = (URL)dep.getProperty(WebXMLRewriter.WEBAPP_URL); log.debug("publishServiceEndpoint: " + warURL); try { - DeploymentInfo di = dep.getContext().getAttachment(DeploymentInfo.class); + DeploymentInfo di = dep.getAttachment(DeploymentInfo.class); if (di == null) throw new IllegalStateException("Cannot obtain DeploymentInfo from context"); @@ -83,7 +83,7 @@ public void destroy(Deployment dep) { - URL warURL = (URL)dep.getContext().getProperty(WebXMLRewriter.WEBAPP_URL); + URL warURL = (URL)dep.getProperty(WebXMLRewriter.WEBAPP_URL); if (warURL == null) { log.error("Cannot obtain warURL"); Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebMetaDataAdapter.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -55,7 +55,7 @@ String contextRoot = null; WebMetaData wmd = (WebMetaData)di.metaData; - dep.getContext().addAttachment(WebMetaData.class, wmd); + dep.addAttachment(WebMetaData.class, wmd); if (di.parent != null) { Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB21.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -50,7 +50,7 @@ public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, DeploymentUnit unit) { ApplicationMetaData appMetaData = unit.getAttachment(ApplicationMetaData.class); - dep.getContext().addAttachment(ApplicationMetaData.class, appMetaData); + dep.addAttachment(ApplicationMetaData.class, appMetaData); UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData(); buildUnifiedBeanMetaData(umd, appMetaData); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ApplicationMetaDataAdapterEJB3.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -53,7 +53,7 @@ public UnifiedApplicationMetaData buildUnifiedApplicationMetaData(Deployment dep, DeploymentUnit unit) { Ejb3Deployment ejb3Deployment = unit.getAttachment(Ejb3Deployment.class); - dep.getContext().addAttachment(Ejb3Deployment.class, ejb3Deployment); + dep.addAttachment(Ejb3Deployment.class, ejb3Deployment); EjbJarDD jarDD = unit.getAttachment(EjbJarDD.class); UnifiedApplicationMetaData umd = new UnifiedApplicationMetaData(); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ArchiveDeployerHook.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -88,7 +88,7 @@ if (dep == null) { dep = createDeployment(unit); - dep.getContext().addAttachment(DeploymentUnit.class, unit); + dep.addAttachment(DeploymentUnit.class, unit); } getDeploymentAspectManager().deploy(dep); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DeploymentInfoAdapter.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -68,7 +68,7 @@ public void buildDeploymentInfo(Deployment dep, DeploymentUnit unit) { - dep.getContext().addAttachment(DeploymentUnit.class, unit); + dep.addAttachment(DeploymentUnit.class, unit); try { @@ -77,12 +77,12 @@ { UnifiedWebMetaData webMetaData = webMetaDataAdapter.buildUnifiedWebMetaData(dep, unit); if (webMetaData != null) - dep.getContext().addAttachment(UnifiedWebMetaData.class, webMetaData); + dep.addAttachment(UnifiedWebMetaData.class, webMetaData); if (dep instanceof ArchiveDeployment) { URL webURL = ((ArchiveDeployment)dep).getRootFile().toURL(); - dep.getContext().setProperty(WebXMLRewriter.WEBAPP_URL, webURL); + dep.setProperty(WebXMLRewriter.WEBAPP_URL, webURL); } } @@ -91,7 +91,7 @@ { UnifiedApplicationMetaData appMetaData = applicationMetaDataAdapterEJB3.buildUnifiedApplicationMetaData(dep, unit); if (appMetaData != null) - dep.getContext().addAttachment(UnifiedApplicationMetaData.class, appMetaData); + dep.addAttachment(UnifiedApplicationMetaData.class, appMetaData); } // EJB21 endpoints @@ -99,7 +99,7 @@ { UnifiedApplicationMetaData appMetaData = applicationMetaDataAdapterEJB21.buildUnifiedApplicationMetaData(dep, unit); if (appMetaData != null) - dep.getContext().addAttachment(UnifiedApplicationMetaData.class, appMetaData); + dep.addAttachment(UnifiedApplicationMetaData.class, appMetaData); } } catch (RuntimeException rte) Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB21.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -83,7 +83,7 @@ { String ejbName = ep.getShortName(); Deployment dep = ep.getService().getDeployment(); - UnifiedApplicationMetaData apMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); + UnifiedApplicationMetaData apMetaData = dep.getAttachment(UnifiedApplicationMetaData.class); UnifiedBeanMetaData beanMetaData = (UnifiedBeanMetaData)apMetaData.getBeanByEjbName(ejbName); if (beanMetaData == null) throw new WebServiceException("Cannot obtain ejb meta data for: " + ejbName); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookEJB21.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -70,8 +70,8 @@ throw new IllegalStateException("Deployment unit does not contain webservices meta data"); // Copy the attachments - dep.getContext().addAttachment(WebservicesMetaData.class, wsMetaData); - dep.getContext().addAttachment(ApplicationMetaData.class, appmd); + dep.addAttachment(WebservicesMetaData.class, wsMetaData); + dep.addAttachment(ApplicationMetaData.class, appmd); for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) { Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXRPCDeployerHookJSE.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -73,8 +73,8 @@ throw new IllegalStateException("Deployment unit does not contain webservices meta data"); // Copy the attachments - dep.getContext().addAttachment(WebservicesMetaData.class, wsMetaData); - dep.getContext().addAttachment(WebMetaData.class, webMetaData); + dep.addAttachment(WebservicesMetaData.class, wsMetaData); + dep.addAttachment(WebMetaData.class, webMetaData); for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions()) { Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -68,7 +68,7 @@ throw new IllegalStateException("Deployment unit does not contain ejb3 deployment"); // Copy the attachments - dep.getContext().addAttachment(Ejb3Deployment.class, ejb3Deployment); + dep.addAttachment(Ejb3Deployment.class, ejb3Deployment); Iterator it = ejb3Deployment.getEjbContainers().values().iterator(); while (it.hasNext()) Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookJSE.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -68,7 +68,7 @@ throw new IllegalStateException("Deployment unit does not contain web meta data"); // Copy the attachments - dep.getContext().addAttachment(WebMetaData.class, webMetaData); + dep.addAttachment(WebMetaData.class, webMetaData); List<Servlet> servlets = getRelevantServlets(webMetaData, unit.getClassLoader()); for (Servlet servlet : servlets) Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/ModifyWebMetaDataDeploymentAspect.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -49,19 +49,19 @@ public void create(Deployment dep) { String propKey = WebAppDesciptorModifier.SERVLET_CLASS; - String servletClass = (String)dep.getContext().getProperty(propKey); + String servletClass = (String)dep.getProperty(propKey); if (servletClass == null) throw new IllegalStateException("Cannot obtain context property: " + propKey); modifyServletClass(dep, servletClass); propKey = WebAppDesciptorModifier.SERVLET_CONTEXT_LISTENER; - String listenerClass = (String)dep.getContext().getProperty(propKey); + String listenerClass = (String)dep.getProperty(propKey); if (listenerClass != null) modifyListener(dep, listenerClass); propKey = WebAppDesciptorModifier.CONTEXT_PARAMETER_MAP; - Map<String, String> contextParams = (Map<String, String>)dep.getContext().getProperty(propKey); + Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey); if (contextParams != null) modifyContextParams(dep, contextParams); } @@ -69,7 +69,7 @@ private void modifyServletClass(Deployment dep, String servletClass) { - WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); + WebMetaData webMetaData = dep.getAttachment(WebMetaData.class); if (webMetaData != null) { for (Servlet servlet : webMetaData.getServlets()) @@ -96,7 +96,7 @@ private void modifyListener(Deployment dep, String listenerClass) { - WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); + WebMetaData webMetaData = dep.getAttachment(WebMetaData.class); if (webMetaData != null) { Listener listener = new Listener(); @@ -107,7 +107,7 @@ private void modifyContextParams(Deployment dep, Map<String, String> contextParams) { - WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); + WebMetaData webMetaData = dep.getAttachment(WebMetaData.class); if (webMetaData != null) { for (Map.Entry<String, String> entry : contextParams.entrySet()) Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB21.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB21.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB21.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -43,7 +43,7 @@ { public void addSecurityDomain(Element jbossWeb, Deployment dep) { - UnifiedApplicationMetaData appMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); + UnifiedApplicationMetaData appMetaData = dep.getAttachment(UnifiedApplicationMetaData.class); if (appMetaData == null) throw new IllegalStateException("Cannot obtain application meta data"); @@ -60,7 +60,7 @@ public void addSecurityRoles(Element webApp, Deployment dep) { // Fix: http://jira.jboss.org/jira/browse/JBWS-309 - ApplicationMetaData applMetaData = dep.getContext().getAttachment(ApplicationMetaData.class); + ApplicationMetaData applMetaData = dep.getAttachment(ApplicationMetaData.class); AssemblyDescriptorMetaData assemblyDescriptor = applMetaData.getAssemblyDescriptor(); if (assemblyDescriptor != null) { Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB3.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB3.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/SecurityHandlerEJB3.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -45,7 +45,7 @@ { String securityDomain = null; - Ejb3Deployment ejb3Deployment = dep.getContext().getAttachment(Ejb3Deployment.class); + Ejb3Deployment ejb3Deployment = dep.getAttachment(Ejb3Deployment.class); if (ejb3Deployment != null) { Iterator it = ejb3Deployment.getEjbContainers().values().iterator(); @@ -74,7 +74,7 @@ public void addSecurityRoles(Element webApp, Deployment dep) { - Ejb3Deployment ejb3Deployment = dep.getContext().getAttachment(Ejb3Deployment.class); + Ejb3Deployment ejb3Deployment = dep.getAttachment(Ejb3Deployment.class); if (ejb3Deployment != null) { Iterator it = ejb3Deployment.getEjbContainers().values().iterator(); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/UnifiedDeploymentInfoDeploymentAspect.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -45,7 +45,7 @@ @Override public void create(Deployment dep) { - DeploymentUnit unit = dep.getContext().getAttachment(DeploymentUnit.class); + DeploymentUnit unit = dep.getAttachment(DeploymentUnit.class); if (unit == null) throw new IllegalStateException("Cannot obtain deployment unit"); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeploymentAspect.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -66,7 +66,7 @@ { if (dep.getType().toString().endsWith("EJB21") || dep.getType().toString().endsWith("EJB3")) { - URL warURL = (URL)dep.getContext().getProperty(WebXMLRewriter.WEBAPP_URL); + URL warURL = (URL)dep.getProperty(WebXMLRewriter.WEBAPP_URL); log.debug("publishServiceEndpoint: " + warURL); try @@ -87,7 +87,7 @@ public void destroy(Deployment dep) { - URL warURL = (URL)dep.getContext().getProperty(WebXMLRewriter.WEBAPP_URL); + URL warURL = (URL)dep.getProperty(WebXMLRewriter.WEBAPP_URL); if (warURL == null) { log.error("Cannot obtain warURL"); Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebMetaDataAdapter.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -52,7 +52,7 @@ String contextRoot = null; WebMetaData wmd = unit.getAttachment(WebMetaData.class); - dep.getContext().addAttachment(WebMetaData.class, wmd); + dep.addAttachment(WebMetaData.class, wmd); if (unit.getParent() != null) { Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java =================================================================== --- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EagerInitializeDeploymentAspect.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -38,7 +38,7 @@ @Override public void create(Deployment dep) { - UnifiedMetaData umd = dep.getContext().getAttachment(UnifiedMetaData.class); + UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class); if (umd == null) throw new IllegalStateException("Cannot obtain unified meta data"); Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java =================================================================== --- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/EndpointServlet.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -105,7 +105,7 @@ if (dep.getType() == DeploymentType.JAXRPC_JSE || dep.getType() == DeploymentType.JAXWS_JSE) { // Initialize the meta data model - UnifiedMetaData umd = dep.getContext().getAttachment(UnifiedMetaData.class); + UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class); if (umd.isEagerInitialized() == false) { umd.setClassLoader(dep.getRuntimeClassLoader()); Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java =================================================================== --- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -42,7 +42,7 @@ @Override public void create(Deployment dep) { - UnifiedMetaData umd = dep.getContext().getAttachment(UnifiedMetaData.class); + UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class); if (umd == null) throw new IllegalStateException("Cannot obtain unified meta data"); Modified: trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java =================================================================== --- trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/native/src/main/java/org/jboss/wsf/stack/jbws/UnifiedMetaDataDeploymentAspect.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -47,7 +47,7 @@ @Override public void create(Deployment dep) { - UnifiedMetaData umd = dep.getContext().getAttachment(UnifiedMetaData.class); + UnifiedMetaData umd = dep.getAttachment(UnifiedMetaData.class); if (umd == null) { if (dep.getType() == DeploymentType.JAXRPC_JSE) @@ -75,7 +75,7 @@ throw new IllegalStateException("Invalid type: " + dep.getType()); } - dep.getContext().addAttachment(UnifiedMetaData.class, umd); + dep.addAttachment(UnifiedMetaData.class, umd); } for (Endpoint ep : dep.getService().getEndpoints()) Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BackwardCompatibleContextRootDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BackwardCompatibleContextRootDeploymentAspect.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BackwardCompatibleContextRootDeploymentAspect.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -72,7 +72,7 @@ { String urlPattern = null; - UnifiedApplicationMetaData appMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); + UnifiedApplicationMetaData appMetaData = dep.getAttachment(UnifiedApplicationMetaData.class); if (appMetaData != null && appMetaData.getBeanByEjbName(ep.getShortName()) != null) { UnifiedBeanMetaData bmd = appMetaData.getBeanByEjbName(ep.getShortName()); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeployment.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -22,7 +22,6 @@ package org.jboss.wsf.framework.deployment; import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.spi.deployment.DeploymentContext; import org.jboss.wsf.spi.deployment.Service; //$Id$ @@ -35,10 +34,8 @@ * @author Thomas.Diesler(a)jboss.com * @since 20-Apr-2007 */ -public class BasicDeployment implements Deployment +public class BasicDeployment extends BasicExtendible implements Deployment { - // The context for this deployment dep - private DeploymentContext context; // The name for this deployment private String simpleName; // A deployment has one service @@ -55,22 +52,11 @@ BasicDeployment(String name, ClassLoader classLoader) { simpleName = name; - context = new BasicDeploymentContext(); state = DeploymentState.UNDEFINED; initialLoader = classLoader; setService(new BasicService()); } - public DeploymentContext getContext() - { - return context; - } - - public void setContext(DeploymentContext context) - { - this.context = context; - } - public String getSimpleName() { return simpleName; Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeploymentContext.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeploymentContext.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicDeploymentContext.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -1,77 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.framework.deployment; - -//$Id$ - -import org.jboss.wsf.spi.deployment.DeploymentContext; - -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -/** - * A general web service deployment context. - * - * @author Thomas.Diesler(a)jboss.com - * @since 20-Apr-2007 - */ -public class BasicDeploymentContext implements DeploymentContext -{ - private Map<Class, Object> attachments = new HashMap<Class, Object>(); - private Map<String, Object> properties = new HashMap<String, Object>(); - - public <T> T getAttachment(Class<T> clazz) - { - return (T)attachments.get(clazz); - } - - public <T> T addAttachment(Class<T> clazz, Object obj) - { - return (T)attachments.put(clazz, obj); - } - - public <T> T removeAttachment(Class<T> key) - { - return (T)attachments.remove(key); - } - - public Set<String> getProperties() - { - return properties.keySet(); - } - - public Object getProperty(String key) - { - return properties.get(key); - } - - public void removeProperty(String key) - { - properties.remove(key); - } - - public void setProperty(String key, Object value) - { - properties.put(key, value); - } -} Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicEndpoint.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicEndpoint.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicEndpoint.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -21,25 +21,28 @@ */ package org.jboss.wsf.framework.deployment; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.management.ObjectName; + import org.jboss.wsf.spi.binding.BindingCustomization; -import org.jboss.wsf.spi.invocation.InvocationHandler; -import org.jboss.wsf.spi.invocation.RequestHandler; -import org.jboss.wsf.spi.management.EndpointMetrics; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.deployment.Service; import org.jboss.wsf.spi.deployment.LifecycleHandler; +import org.jboss.wsf.spi.deployment.Service; import org.jboss.wsf.spi.deployment.WSFDeploymentException; +import org.jboss.wsf.spi.invocation.InvocationHandler; +import org.jboss.wsf.spi.invocation.RequestHandler; +import org.jboss.wsf.spi.management.EndpointMetrics; -import javax.management.ObjectName; -import java.util.*; - /** * A general JAXWS endpoint. * * @author Thomas.Diesler(a)jboss.com * @since 20-Apr-2007 */ -public class BasicEndpoint implements Endpoint +public class BasicEndpoint extends BasicExtendible implements Endpoint { private Service service; private ObjectName name; @@ -50,8 +53,6 @@ private RequestHandler requestHandler; private InvocationHandler invocationHandler; private LifecycleHandler lifecycleHandler; - private Map<Class, Object> attachments = new HashMap<Class, Object>(); - private Map<String, Object> properties = new HashMap<String, Object>(); private EndpointMetrics metrics; private List<BindingCustomization> bindingCustomizsations = new ArrayList<BindingCustomization>(); private String address; @@ -220,41 +221,6 @@ bindingCustomizsations.add(customization); } - public <T> T addAttachment(Class<T> key, Object value) - { - return (T)attachments.put(key, value); - } - - public <T> T getAttachment(Class<T> key) - { - return (T)attachments.get(key); - } - - public <T> T removeAttachment(Class<T> key) - { - return (T)attachments.get(key); - } - - public Set<String> getProperties() - { - return properties.keySet(); - } - - public Object getProperty(String key) - { - return properties.get(key); - } - - public void removeProperty(String key) - { - properties.remove(key); - } - - public void setProperty(String key, Object value) - { - properties.put(key, value); - } - public EndpointMetrics getEndpointMetrics() { return metrics; Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicExtendible.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicExtendible.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicExtendible.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -0,0 +1,77 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.framework.deployment; + +//$Id: BasicDeploymentContext.java 3959 2007-07-20 14:44:19Z heiko.braun(a)jboss.com $ + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import org.jboss.wsf.spi.deployment.Extendible; + +/** + * A general extendible artifact + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public class BasicExtendible implements Extendible +{ + private Map<Class, Object> attachments = new HashMap<Class, Object>(); + private Map<String, Object> properties = new HashMap<String, Object>(); + + public <T> T getAttachment(Class<T> clazz) + { + return (T)attachments.get(clazz); + } + + public <T> T addAttachment(Class<T> clazz, Object obj) + { + return (T)attachments.put(clazz, obj); + } + + public <T> T removeAttachment(Class<T> key) + { + return (T)attachments.remove(key); + } + + public Set<String> getProperties() + { + return properties.keySet(); + } + + public Object getProperty(String key) + { + return properties.get(key); + } + + public void removeProperty(String key) + { + properties.remove(key); + } + + public void setProperty(String key, Object value) + { + properties.put(key, value); + } +} Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicService.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicService.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/BasicService.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -39,7 +39,7 @@ * @author Thomas.Diesler(a)jboss.com * @since 20-Apr-2007 */ -public class BasicService implements Service +public class BasicService extends BasicExtendible implements Service { private Deployment dep; private List<Endpoint> endpoints = new LinkedList<Endpoint>(); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextPropertiesDeploymentAspect.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -57,7 +57,7 @@ { String key = it.next(); String value = contextProperties.get(key); - dep.getContext().setProperty(key, value); + dep.setProperty(key, value); } } } \ No newline at end of file Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -62,7 +62,7 @@ String contextRoot = null; // #1 Use the explicit context root from the web meta data - UnifiedWebMetaData webMetaData = dep.getContext().getAttachment(UnifiedWebMetaData.class); + UnifiedWebMetaData webMetaData = dep.getAttachment(UnifiedWebMetaData.class); if (webMetaData != null) contextRoot = webMetaData.getContextRoot(); @@ -84,7 +84,7 @@ } // #3 Use the explicit context root from webservices/context-root - UnifiedApplicationMetaData appMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); + UnifiedApplicationMetaData appMetaData = dep.getAttachment(UnifiedApplicationMetaData.class); if (contextRoot == null && appMetaData != null) { contextRoot = appMetaData.getWebServiceContextRoot(); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultWebAppDesciptorModifierImpl.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -47,12 +47,12 @@ Element root = webXml.getRootElement(); String propKey = SERVLET_CLASS; - String servletClass = (String)dep.getContext().getProperty(propKey); + String servletClass = (String)dep.getProperty(propKey); if (servletClass == null) throw new IllegalStateException("Cannot obtain context property: " + propKey); propKey = CONTEXT_PARAMETER_MAP; - Map<String, String> contextParams = (Map<String, String>)dep.getContext().getProperty(propKey); + Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey); if (contextParams != null) { for (Map.Entry<String, String> entry : contextParams.entrySet()) @@ -64,7 +64,7 @@ } propKey = SERVLET_CONTEXT_LISTENER; - String listenerClass = (String)dep.getContext().getProperty(propKey); + String listenerClass = (String)dep.getProperty(propKey); if (listenerClass != null) { Element listener = root.addElement("listener"); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointHandlerDeploymentAspect.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -89,7 +89,7 @@ String key = dep.getType().toString(); // Use a special key for MDB endpoints - UnifiedApplicationMetaData uapp = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); + UnifiedApplicationMetaData uapp = dep.getAttachment(UnifiedApplicationMetaData.class); if (uapp != null) { UnifiedBeanMetaData bmd = uapp.getBeanByEjbName(ep.getShortName()); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/EndpointNameDeploymentAspect.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -53,7 +53,7 @@ name.append(Endpoint.SEPID_PROPERTY_ENDPOINT + "=" + ep.getShortName()); // Append the JMS destination, for an MDB endpoint - UnifiedApplicationMetaData uapp = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); + UnifiedApplicationMetaData uapp = dep.getAttachment(UnifiedApplicationMetaData.class); if (uapp != null) { UnifiedBeanMetaData bmd = uapp.getBeanByEjbName(ep.getShortName()); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/URLPatternDeploymentAspect.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -66,7 +66,7 @@ String urlPattern = null; // #1 For JSE lookup the url-pattern from the servlet mappings - UnifiedWebMetaData webMetaData = dep.getContext().getAttachment(UnifiedWebMetaData.class); + UnifiedWebMetaData webMetaData = dep.getAttachment(UnifiedWebMetaData.class); if (webMetaData != null) { String epName = ep.getShortName(); @@ -76,7 +76,7 @@ } // #2 Use the explicit urlPattern from port-component/port-component-uri - UnifiedApplicationMetaData appMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); + UnifiedApplicationMetaData appMetaData = dep.getAttachment(UnifiedApplicationMetaData.class); if (appMetaData != null && appMetaData.getBeanByEjbName(ep.getShortName()) != null) { UnifiedBeanMetaData bmd = appMetaData.getBeanByEjbName(ep.getShortName()); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifierImpl.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifierImpl.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppDesciptorModifierImpl.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -47,12 +47,12 @@ Element root = webXml.getRootElement(); String propKey = SERVLET_CLASS; - String servletClass = (String)dep.getContext().getProperty(propKey); + String servletClass = (String)dep.getProperty(propKey); if (servletClass == null) throw new IllegalStateException("Cannot obtain context property: " + propKey); propKey = CONTEXT_PARAMETER_MAP; - Map<String, String> contextParams = (Map<String, String>)dep.getContext().getProperty(propKey); + Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey); if (contextParams != null) { for (Map.Entry<String, String> entry : contextParams.entrySet()) @@ -64,7 +64,7 @@ } propKey = SERVLET_CONTEXT_LISTENER; - String listenerClass = (String)dep.getContext().getProperty(propKey); + String listenerClass = (String)dep.getProperty(propKey); if (listenerClass != null) { Element listener = root.addElement("listener"); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -76,12 +76,12 @@ if (dep.getType().toString().endsWith("EJB21")) { URL webAppURL = generatWebDeployment((ArchiveDeployment)dep, securityHandlerEJB21); - dep.getContext().setProperty(WebXMLRewriter.WEBAPP_URL, webAppURL); + dep.setProperty(WebXMLRewriter.WEBAPP_URL, webAppURL); } else if (dep.getType().toString().endsWith("EJB3")) { URL webAppURL = generatWebDeployment((ArchiveDeployment)dep, securityHandlerEJB3); - dep.getContext().setProperty(WebXMLRewriter.WEBAPP_URL, webAppURL); + dep.setProperty(WebXMLRewriter.WEBAPP_URL, webAppURL); } } @@ -180,7 +180,7 @@ secureWSDLAccess = anWebContext.secureWSDLAccess(); } - UnifiedApplicationMetaData appMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); + UnifiedApplicationMetaData appMetaData = dep.getAttachment(UnifiedApplicationMetaData.class); if (appMetaData != null && appMetaData.getBeanByEjbName(ejbName) != null) { UnifiedBeanMetaData bmd = appMetaData.getBeanByEjbName(ejbName); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -63,7 +63,7 @@ public RewriteResults rewriteWebXml(Deployment dep) { - URL warURL = (URL)dep.getContext().getProperty(WebXMLRewriter.WEBAPP_URL); + URL warURL = (URL)dep.getProperty(WebXMLRewriter.WEBAPP_URL); File warFile = new File(warURL.getFile()); if (warFile.isDirectory() == false) throw new WebServiceException("Expected a war directory: " + warURL); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -31,7 +31,7 @@ * @author Thomas.Diesler(a)jboss.com * @since 20-Apr-2007 */ -public interface Deployment +public interface Deployment extends Extendible { public enum DeploymentType { @@ -61,12 +61,6 @@ /** Set the runtime class loader for this deployment */ void setRuntimeClassLoader(ClassLoader loader); - /** Get the deployment context */ - DeploymentContext getContext(); - - /** Set the deployment context */ - void setContext(DeploymentContext context); - /** Get the deployment type */ DeploymentType getType(); Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentContext.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentContext.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/DeploymentContext.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -1,50 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.wsf.spi.deployment; - -// $Id$ - -import java.util.Set; - -public interface DeploymentContext -{ - /** Add arbitrary attachments */ - <T> T addAttachment(Class<T> key, Object value); - - /** Get arbitrary attachments */ - <T> T getAttachment(Class<T> key); - - /** Remove arbitrary attachments */ - <T> T removeAttachment(Class<T> key); - - /** Get an context property */ - Object getProperty(String key); - - /** Set an context property */ - void setProperty(String key, Object value); - - /** Remove an context property */ - void removeProperty(String key); - - /** Get the set of context property names */ - Set<String> getProperties(); -} \ No newline at end of file Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -38,7 +38,7 @@ * @author Thomas.Diesler(a)jboss.com * @since 20-Apr-2007 */ -public interface Endpoint +public interface Endpoint extends Extendible { static final String SEPID_DOMAIN = "jboss.ws"; static final String SEPID_PROPERTY_CONTEXT = "context"; @@ -117,7 +117,7 @@ /** Get all binding customizations for this endpoint */ List<BindingCustomization> getBindingCustomizations(); - /* Get a concrete binding customization */ + /** Get a concrete binding customization */ BindingCustomization getBindingCustomization(BindingCustomization bindingCustomization); /** Add a binding customization to this endpoint*/ @@ -128,25 +128,4 @@ /** Set the endpoint metrics for this endpoint */ void setEndpointMetrics(EndpointMetrics metrics); - - /** Add arbitrary attachments */ - <T> T addAttachment(Class<T> key, Object value); - - /** Get arbitrary attachments */ - <T> T getAttachment(Class<T> key); - - /** Remove arbitrary attachments */ - <T> T removeAttachment(Class<T> key); - - /** Get an endpoint property */ - Object getProperty(String key); - - /** Set an endpoint property */ - void setProperty(String key, Object value); - - /** Remove an endpoint property */ - void removeProperty(String key); - - /** Get the set of endpoint property names */ - Set<String> getProperties(); } Added: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Extendible.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Extendible.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Extendible.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -0,0 +1,56 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.wsf.spi.deployment; + +//$Id: Deployment.java 3999 2007-07-26 11:33:20Z thomas.diesler(a)jboss.com $ + +import java.util.Set; + +/** + * A general extendible artifact + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public interface Extendible +{ + /** Add arbitrary attachments */ + <T> T addAttachment(Class<T> key, Object value); + + /** Get arbitrary attachments */ + <T> T getAttachment(Class<T> key); + + /** Remove arbitrary attachments */ + <T> T removeAttachment(Class<T> key); + + /** Get an context property */ + Object getProperty(String key); + + /** Set an context property */ + void setProperty(String key, Object value); + + /** Remove an context property */ + void removeProperty(String key); + + /** Get the set of context property names */ + Set<String> getProperties(); +} \ No newline at end of file Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Service.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Service.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Service.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -34,7 +34,7 @@ * @author Thomas.Diesler(a)jboss.com * @since 20-Apr-2007 */ -public interface Service +public interface Service extends Extendible { /** Get the deployment this service belongs to */ Deployment getDeployment(); Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -48,7 +48,7 @@ public void create(Deployment dep) { - DDEndpoints dd = dep.getContext().getAttachment(DDEndpoints.class); + DDEndpoints dd = dep.getAttachment(DDEndpoints.class); if (dd == null) { dd = new DDEndpoints(); @@ -74,14 +74,14 @@ dd.addEndpoint(ddep); } - dep.getContext().addAttachment(DDEndpoints.class, dd); + dep.addAttachment(DDEndpoints.class, dd); String propKey = WebAppDesciptorModifier.CONTEXT_PARAMETER_MAP; - Map<String, String> contextParams = (Map<String, String>)dep.getContext().getProperty(propKey); + Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey); if (contextParams == null) { contextParams = new HashMap<String, String>(); - dep.getContext().setProperty(propKey, contextParams); + dep.setProperty(propKey, contextParams); } contextParams.put(WSServletContextListenerJBWS.PARAM_SUN_JAXWS_URL, dd.createFileURL().toExternalForm()); } @@ -90,7 +90,7 @@ @Override public void destroy(Deployment dep) { - DDEndpoints dd = dep.getContext().getAttachment(DDEndpoints.class); + DDEndpoints dd = dep.getAttachment(DDEndpoints.class); if (dd != null) { dd.destroyFileURL(); Modified: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/WebAppDesciptorModifierImpl.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -71,7 +71,7 @@ Element root = webXml.getRootElement(); - DDEndpoints ddSunJaxws = dep.getContext().getAttachment(DDEndpoints.class); + DDEndpoints ddSunJaxws = dep.getAttachment(DDEndpoints.class); if (ddSunJaxws == null) throw new IllegalStateException("Cannot obtain sun-jaxws meta data"); Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/DescriptorDeploymentAspect.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -104,14 +104,14 @@ dd.addBean(bean); } - dep.getContext().addAttachment(DDBeans.class, dd); + dep.addAttachment(DDBeans.class, dd); String propKey = WebAppDesciptorModifier.CONTEXT_PARAMETER_MAP; - Map<String, String> contextParams = (Map<String, String>)dep.getContext().getProperty(propKey); + Map<String, String> contextParams = (Map<String, String>)dep.getProperty(propKey); if (contextParams == null) { contextParams = new HashMap<String, String>(); - dep.getContext().setProperty(propKey, contextParams); + dep.setProperty(propKey, contextParams); } contextParams.put(CXFServletExt.PARAM_CXF_BEANS_URL, dd.createFileURL().toExternalForm()); } @@ -119,7 +119,7 @@ @Override public void destroy(Deployment dep) { - DDBeans dd = dep.getContext().getAttachment(DDBeans.class); + DDBeans dd = dep.getAttachment(DDBeans.class); if (dd != null) { dd.destroyFileURL(); Modified: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/WebAppDesciptorModifierImpl.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -60,7 +60,7 @@ Element root = webXml.getRootElement(); - DDBeans ddbeans = dep.getContext().getAttachment(DDBeans.class); + DDBeans ddbeans = dep.getAttachment(DDBeans.class); if (ddbeans == null) throw new IllegalStateException("Cannot obtain sun-jaxws meta data"); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/MetaDataBuilder.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -186,7 +186,7 @@ idstr.append("," + ServerEndpointMetaData.SEPID_PROPERTY_ENDPOINT + "=" + linkName); // Add JMS destination JNDI name for MDB endpoints - UnifiedApplicationMetaData apMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); + UnifiedApplicationMetaData apMetaData = dep.getAttachment(UnifiedApplicationMetaData.class); if (apMetaData != null) { String ejbName = sepMetaData.getLinkName(); @@ -246,7 +246,7 @@ protected void initTransportGuaranteeJSE(Deployment dep, ServerEndpointMetaData sepMetaData, String servletLink) throws IOException { String transportGuarantee = null; - UnifiedWebMetaData webMetaData = dep.getContext().getAttachment(UnifiedWebMetaData.class); + UnifiedWebMetaData webMetaData = dep.getAttachment(UnifiedWebMetaData.class); if (webMetaData != null) { Map<String, String> servletMappings = webMetaData.getServletMappings(); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCServerMetaDataBuilder.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -78,7 +78,7 @@ wsMetaData.setDeploymentName(dep.getCanonicalName()); wsMetaData.setClassLoader(dep.getInitialClassLoader()); - WebservicesMetaData jaxrpcMapping = dep.getContext().getAttachment(WebservicesMetaData.class); + WebservicesMetaData jaxrpcMapping = dep.getAttachment(WebservicesMetaData.class); WebserviceDescriptionMetaData[] wsDescriptionArr = jaxrpcMapping.getWebserviceDescriptions(); for (WebserviceDescriptionMetaData wsdMetaData : wsDescriptionArr) { @@ -144,8 +144,8 @@ initEndpointAddress(dep, sepMetaData); - UnifiedApplicationMetaData apMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); - UnifiedWebMetaData webMetaData = dep.getContext().getAttachment(UnifiedWebMetaData.class); + UnifiedApplicationMetaData apMetaData = dep.getAttachment(UnifiedApplicationMetaData.class); + UnifiedWebMetaData webMetaData = dep.getAttachment(UnifiedWebMetaData.class); if (apMetaData != null) { wsMetaData.setSecurityDomain(apMetaData.getSecurityDomain()); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-07-26 19:38:33 UTC (rev 4010) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilderEJB3.java 2007-07-27 02:45:35 UTC (rev 4011) @@ -61,7 +61,7 @@ wsMetaData.setClassLoader(dep.getInitialClassLoader()); // The container objects below provide access to all of the ejb metadata - UnifiedApplicationMetaData apMetaData = dep.getContext().getAttachment(UnifiedApplicationMetaData.class); + UnifiedApplicationMetaData apMetaData = dep.getAttachment(UnifiedApplicationMetaData.class); Iterator<UnifiedBeanMetaData> it = apMetaData.getEnterpriseBeans(); while (it.hasNext()) {

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r4010 - trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-07-26 15:38:33 -0400 (Thu, 26 Jul 2007) New Revision: 4010 Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java Log: [JBWS-1723] Test WSDL with bound headers defined as anonymous types. Fix import Modified: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2007-07-26 16:51:02 UTC (rev 4009) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2007-07-26 19:38:33 UTC (rev 4010) @@ -27,10 +27,10 @@ import org.jboss.test.ws.tools.fixture.JBossSourceComparator; import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; import org.jboss.ws.tools.WSTools; -import org.jboss.wsf.spi.test.JBossWSTest; +import org.jboss.wsf.test.JBossWSTest; /** - * Test WSDL with bound headers defined as anonymous types. + * [JBWS-1723] Test WSDL with bound headers defined as anonymous types. * * @see http://jira.jboss.com/jira/browse/JBWS-1723 *

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r4009 - in branches/jbossws-1.2.1.GA_JBWS-1768: jbossws-core/src/java/org/jboss/ws/tools/helpers and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-07-26 12:51:02 -0400 (Thu, 26 Jul 2007) New Revision: 4009 Added: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1723/ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/BillingAccount.java branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/Person.java branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/BillingAccount.java branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/Person.java branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/wstools-config.xml Removed: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/BillingAccount.java branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/Person.java branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/wstools-config.xml branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/BillingAccount.java branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/Person.java branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/wstools-config.xml Modified: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java Log: JBWS-1768 WSDL To Java - Anonymous Types Referenced As Bound Headers Not Handled Correctly. Modified: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-07-26 16:09:49 UTC (rev 4008) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-core/src/java/org/jboss/ws/tools/WSDLToJava.java 2007-07-26 16:51:02 UTC (rev 4009) @@ -56,6 +56,7 @@ import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput; import org.jboss.ws.metadata.wsdl.WSDLRPCPart; import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader; +import org.jboss.ws.metadata.wsdl.WSDLTypes; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; @@ -439,7 +440,8 @@ JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI()); XSTypeDefinition xt = xe.getTypeDefinition(); - QName xmlType = new QName(xt.getNamespace(), xt.getName()); + WSDLTypes wsdlTypes = wsdl.getWsdlTypes(); + QName xmlType = wsdlTypes.getXMLType(header.getElement()); // Replace the xt with the real type from the schema. xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); @@ -449,7 +451,7 @@ buf.append(", "); } - generateParameter(buf, "", xmlType, xsmodel, xt, false, true, holder); + generateParameter(buf, xe.getName(), xmlType, xsmodel, xt, false, true, holder); buf.append(" ").append(header.getPartName()); } Modified: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-07-26 16:09:49 UTC (rev 4008) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-core/src/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-07-26 16:51:02 UTC (rev 4009) @@ -371,13 +371,13 @@ JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI()); XSTypeDefinition xt = xe.getTypeDefinition(); - QName xmlType = new QName(xt.getNamespace(), xt.getName()); + WSDLTypes wsdlTypes = wsdlDefinitions.getWsdlTypes(); + QName xmlType = wsdlTypes.getXMLType(header.getElement()); // Replace the xt with the real type from the schema. xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); if (xt instanceof XSSimpleTypeDefinition) xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); - String partName = header.getPartName(); MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm, elementName, xmlType, paramPosition, wsdlMessageName, mode, partName, false, true); Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1723 (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723) Deleted: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2007-07-26 15:33:02 UTC (rev 4003) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2007-07-26 16:51:02 UTC (rev 4009) @@ -1,107 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.test.ws.tools.jbws1723; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.test.ws.tools.fixture.JBossSourceComparator; -import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; -import org.jboss.ws.tools.WSTools; -import org.jboss.wsf.spi.test.JBossWSTest; - -/** - * Test WSDL with bound headers defined as anonymous types. - * - * @see http://jira.jboss.com/jira/browse/JBWS-1723 - * - * @author darran.lofthouse(a)jboss.com - * @since Jul 26, 2007 - */ -public class JBWS1723TestCase extends JBossWSTest -{ - public void testGenerateDocLitIn() throws Exception - { - generateScenario("doclit_in"); - } - - public void testGenerateRpcLitIn() throws Exception - { - generateScenario("rpclit_in"); - } - - protected void generateScenario(final String scenario) throws Exception - { - String resourceDir = "resources/tools/jbws1723/" + scenario; - String toolsDir = "tools/jbws1723/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - File resourceDirFile = new File(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { - public boolean accept(File dir, String name) - { - return name.endsWith(".java"); - } - }); - - for (int i = 0; i < expectedFiles.length; i++) - { - String currentFile = expectedFiles[i]; - - try - { - compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1723/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1723"); - String[] generatedFiles = packageDir.list(); - for (int i = 0; i < generatedFiles.length; i++) - { - String currentFile = generatedFiles[i]; - - boolean matched = "PhoneBookService.java".equals(currentFile); - - for (int j = 0; j < expectedFiles.length && (matched == false); j++) - matched = currentFile.equals(expectedFiles[j]); - - assertTrue("File '" + currentFile + "' was not expected to be generated", matched); - } - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); - } - - private static void compareSource(final String expectedName, final String generatedName) throws Exception - { - File expected = new File(expectedName); - File generated = new File(generatedName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } -} Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2007-07-26 16:51:02 UTC (rev 4009) @@ -0,0 +1,107 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.test.ws.tools.jbws1723; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.tools.WSTools; + +/** + * Test WSDL with bound headers defined as anonymous types. + * + * @see http://jira.jboss.com/jira/browse/JBWS-1723 + * + * @author darran.lofthouse(a)jboss.com + * @since Jul 26, 2007 + */ +public class JBWS1723TestCase extends JBossWSTest +{ + public void testGenerateDocLitIn() throws Exception + { + generateScenario("doclit_in"); + } + + public void testGenerateRpcLitIn() throws Exception + { + generateScenario("rpclit_in"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws1723/" + scenario; + String toolsDir = "tools/jbws1723/" + scenario; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + File resourceDirFile = new File(resourceDir); + String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.endsWith(".java"); + } + }); + + for (int i = 0; i < expectedFiles.length; i++) + { + String currentFile = expectedFiles[i]; + + try + { + compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1723/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1723"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = "PhoneBookService.java".equals(currentFile); + + for (int j = 0; j < expectedFiles.length && (matched == false); j++) + matched = currentFile.equals(expectedFiles[j]); + + assertTrue("File '" + currentFile + "' was not expected to be generated", matched); + } + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + } + + private static void compareSource(final String expectedName, final String generatedName) throws Exception + { + File expected = new File(expectedName); + File generated = new File(generatedName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } +} Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723 (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723) Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in) Deleted: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/BillingAccount.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java 2007-07-26 15:33:02 UTC (rev 4003) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/BillingAccount.java 2007-07-26 16:51:02 UTC (rev 4009) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Jul 26 15:56:31 BST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1723; - - -public class BillingAccount -{ - -protected java.lang.String sortCode; - -protected java.lang.String accountNumber; -public BillingAccount(){} - -public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ -this.sortCode=sortCode; -this.accountNumber=accountNumber; -} -public java.lang.String getSortCode() { return sortCode ;} - -public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } - -public java.lang.String getAccountNumber() { return accountNumber ;} - -public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/BillingAccount.java (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/BillingAccount.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/BillingAccount.java 2007-07-26 16:51:02 UTC (rev 4009) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Jul 26 15:56:31 BST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1723; + + +public class BillingAccount +{ + +protected java.lang.String sortCode; + +protected java.lang.String accountNumber; +public BillingAccount(){} + +public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ +this.sortCode=sortCode; +this.accountNumber=accountNumber; +} +public java.lang.String getSortCode() { return sortCode ;} + +public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } + +public java.lang.String getAccountNumber() { return accountNumber ;} + +public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/Person.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java 2007-07-26 15:33:02 UTC (rev 4003) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/Person.java 2007-07-26 16:51:02 UTC (rev 4009) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Jul 26 15:56:31 BST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1723; - - -public class Person -{ - -protected java.lang.String firstName; - -protected java.lang.String surname; -public Person(){} - -public Person(java.lang.String firstName, java.lang.String surname){ -this.firstName=firstName; -this.surname=surname; -} -public java.lang.String getFirstName() { return firstName ;} - -public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } - -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/Person.java (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/Person.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/Person.java 2007-07-26 16:51:02 UTC (rev 4009) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Jul 26 15:56:31 BST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1723; + + +public class Person +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public Person(){} + +public Person(java.lang.String firstName, java.lang.String surname){ +this.firstName=firstName; +this.surname=surname; +} +public java.lang.String getFirstName() { return firstName ;} + +public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } + +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl 2007-07-26 15:33:02 UTC (rev 4003) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl 2007-07-26 16:51:02 UTC (rev 4009) @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1723' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1723/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1723' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1723/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1723/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - <element name='billingAccount'> - <complexType> - <sequence> - <element name='sortCode' nillable='true' type='string'/> - <element name='accountNumber' nillable='true' type='string'/> - </sequence> - </complexType> - </element> - </schema> - </types> - - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - <part element='ns1:billingAccount' name='header'/> - </message> - - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal' parts='parameters'/> - <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' /> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl 2007-07-26 16:51:02 UTC (rev 4009) @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1723' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1723/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1723' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1723/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1723/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='areaCode' nillable='true' type='string'/> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + <element name='billingAccount'> + <complexType> + <sequence> + <element name='sortCode' nillable='true' type='string'/> + <element name='accountNumber' nillable='true' type='string'/> + </sequence> + </complexType> + </element> + </schema> + </types> + + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + <part element='ns1:billingAccount' name='header'/> + </message> + + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal' parts='parameters'/> + <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' /> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java 2007-07-26 15:33:02 UTC (rev 4003) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java 2007-07-26 16:51:02 UTC (rev 4009) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Jul 26 15:56:31 BST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws1723; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1723.TelephoneNumber lookup(org.jboss.test.ws.jbws1723.Person lookup, org.jboss.test.ws.jbws1723.BillingAccount header) throws java.rmi.RemoteException; -} Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java 2007-07-26 16:51:02 UTC (rev 4009) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Jul 26 15:56:31 BST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1723; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1723.TelephoneNumber lookup(org.jboss.test.ws.jbws1723.Person lookup, org.jboss.test.ws.jbws1723.BillingAccount header) throws java.rmi.RemoteException; +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/TelephoneNumber.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java 2007-07-26 15:33:02 UTC (rev 4003) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/TelephoneNumber.java 2007-07-26 16:51:02 UTC (rev 4009) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Jul 26 15:56:31 BST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1723; - - -public class TelephoneNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public TelephoneNumber(){} - -public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/TelephoneNumber.java (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/TelephoneNumber.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/TelephoneNumber.java 2007-07-26 16:51:02 UTC (rev 4009) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Jul 26 15:56:31 BST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1723; + + +public class TelephoneNumber +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ +this.areaCode=areaCode; +this.number=number; +} +public java.lang.String getAreaCode() { return areaCode ;} + +public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } + +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml 2007-07-26 15:33:02 UTC (rev 4003) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml 2007-07-26 16:51:02 UTC (rev 4009) @@ -1,89 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1723</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1723/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1723</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1723</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1723.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1723.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1723.BillingAccount</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:>billingAccount</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>sortCode</java-variable-name> - <xml-element-name>sortCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>accountNumber</java-variable-name> - <xml-element-name>accountNumber</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1723.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1723'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1723.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1723'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1723'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1723.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>org.jboss.test.ws.jbws1723.BillingAccount</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook</wsdl-message> - <wsdl-message-part-name>header</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1723.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml 2007-07-26 16:51:02 UTC (rev 4009) @@ -0,0 +1,89 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1723</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1723/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1723</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1723</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1723.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1723.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1723.BillingAccount</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:>billingAccount</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>sortCode</java-variable-name> + <xml-element-name>sortCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>accountNumber</java-variable-name> + <xml-element-name>accountNumber</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1723.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1723'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1723.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1723'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1723'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1723.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <method-param-parts-mapping> + <param-position>1</param-position> + <param-type>org.jboss.test.ws.jbws1723.BillingAccount</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook</wsdl-message> + <wsdl-message-part-name>header</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1723.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml 2007-07-26 15:33:02 UTC (rev 4003) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/wstools-config.xml 2007-07-26 16:51:02 UTC (rev 4009) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1723/doclit_in/PhoneBook.wsdl" - parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/wstools-config.xml (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/doclit_in/wstools-config.xml 2007-07-26 16:51:02 UTC (rev 4009) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1723/doclit_in/PhoneBook.wsdl" + parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in) Deleted: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/BillingAccount.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java 2007-07-26 15:33:02 UTC (rev 4003) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/BillingAccount.java 2007-07-26 16:51:02 UTC (rev 4009) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Jul 26 15:58:39 BST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1723; - - -public class BillingAccount -{ - -protected java.lang.String sortCode; - -protected java.lang.String accountNumber; -public BillingAccount(){} - -public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ -this.sortCode=sortCode; -this.accountNumber=accountNumber; -} -public java.lang.String getSortCode() { return sortCode ;} - -public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } - -public java.lang.String getAccountNumber() { return accountNumber ;} - -public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/BillingAccount.java (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/BillingAccount.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/BillingAccount.java 2007-07-26 16:51:02 UTC (rev 4009) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Jul 26 15:58:39 BST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1723; + + +public class BillingAccount +{ + +protected java.lang.String sortCode; + +protected java.lang.String accountNumber; +public BillingAccount(){} + +public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ +this.sortCode=sortCode; +this.accountNumber=accountNumber; +} +public java.lang.String getSortCode() { return sortCode ;} + +public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } + +public java.lang.String getAccountNumber() { return accountNumber ;} + +public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/Person.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java 2007-07-26 15:33:02 UTC (rev 4003) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/Person.java 2007-07-26 16:51:02 UTC (rev 4009) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Jul 26 15:58:39 BST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1723; - - -public class Person -{ - -protected java.lang.String firstName; - -protected java.lang.String surname; -public Person(){} - -public Person(java.lang.String firstName, java.lang.String surname){ -this.firstName=firstName; -this.surname=surname; -} -public java.lang.String getFirstName() { return firstName ;} - -public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } - -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/Person.java (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/Person.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/Person.java 2007-07-26 16:51:02 UTC (rev 4009) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Jul 26 15:58:39 BST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1723; + + +public class Person +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public Person(){} + +public Person(java.lang.String firstName, java.lang.String surname){ +this.firstName=firstName; +this.surname=surname; +} +public java.lang.String getFirstName() { return firstName ;} + +public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } + +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl 2007-07-26 15:33:02 UTC (rev 4003) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl 2007-07-26 16:51:02 UTC (rev 4009) @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1723' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1723/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1723' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1723/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1723/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - - - <element name='billingAccount'> - <complexType> - <sequence> - <element name='sortCode' nillable='true' type='string'/> - <element name='accountNumber' nillable='true' type='string'/> - </sequence> - </complexType> - </element> - </schema> - </types> - - <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part name='Person_1' type='ns1:Person'/> - <part name='Account_1' element='ns1:billingAccount'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part name='result' type='ns1:TelephoneNumber'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup' parameterOrder='Person_1'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' /> - <soap:header message="tns:PhoneBook_lookup" - part="Account_1" use="literal" /> - </input> - <output> - <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/> - </output> - </operation> - </binding> - - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl 2007-07-26 16:51:02 UTC (rev 4009) @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1723' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1723/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1723' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1723/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1723/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='areaCode' nillable='true' type='string'/> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + + + <element name='billingAccount'> + <complexType> + <sequence> + <element name='sortCode' nillable='true' type='string'/> + <element name='accountNumber' nillable='true' type='string'/> + </sequence> + </complexType> + </element> + </schema> + </types> + + <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part name='Person_1' type='ns1:Person'/> + <part name='Account_1' element='ns1:billingAccount'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part name='result' type='ns1:TelephoneNumber'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup' parameterOrder='Person_1'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' /> + <soap:header message="tns:PhoneBook_lookup" + part="Account_1" use="literal" /> + </input> + <output> + <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/> + </output> + </operation> + </binding> + + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java 2007-07-26 15:33:02 UTC (rev 4003) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java 2007-07-26 16:51:02 UTC (rev 4009) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Jul 26 15:58:39 BST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws1723; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1723.TelephoneNumber lookup(org.jboss.test.ws.jbws1723.Person person_1, org.jboss.test.ws.jbws1723.BillingAccount Account_1) throws java.rmi.RemoteException; -} Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java 2007-07-26 16:51:02 UTC (rev 4009) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Jul 26 15:58:39 BST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1723; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1723.TelephoneNumber lookup(org.jboss.test.ws.jbws1723.Person person_1, org.jboss.test.ws.jbws1723.BillingAccount Account_1) throws java.rmi.RemoteException; +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java 2007-07-26 15:33:02 UTC (rev 4003) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java 2007-07-26 16:51:02 UTC (rev 4009) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Jul 26 15:58:39 BST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1723; - - -public class TelephoneNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public TelephoneNumber(){} - -public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java 2007-07-26 16:51:02 UTC (rev 4009) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Jul 26 15:58:39 BST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1723; + + +public class TelephoneNumber +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ +this.areaCode=areaCode; +this.number=number; +} +public java.lang.String getAreaCode() { return areaCode ;} + +public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } + +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml 2007-07-26 15:33:02 UTC (rev 4003) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml 2007-07-26 16:51:02 UTC (rev 4009) @@ -1,89 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1723</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1723/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1723</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1723</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1723.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1723.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1723.BillingAccount</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:>billingAccount</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>sortCode</java-variable-name> - <xml-element-name>sortCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>accountNumber</java-variable-name> - <xml-element-name>accountNumber</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1723.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1723'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1723.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1723'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1723'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1723.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Person_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>org.jboss.test.ws.jbws1723.BillingAccount</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook</wsdl-message> - <wsdl-message-part-name>Account_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1723.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml 2007-07-26 16:51:02 UTC (rev 4009) @@ -0,0 +1,89 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1723</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1723/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1723</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1723</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1723.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1723.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1723.BillingAccount</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:>billingAccount</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>sortCode</java-variable-name> + <xml-element-name>sortCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>accountNumber</java-variable-name> + <xml-element-name>accountNumber</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1723.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1723'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1723.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1723'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1723'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1723.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Person_1</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <method-param-parts-mapping> + <param-position>1</param-position> + <param-type>org.jboss.test.ws.jbws1723.BillingAccount</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook</wsdl-message> + <wsdl-message-part-name>Account_1</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1723.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml 2007-07-26 15:33:02 UTC (rev 4003) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/wstools-config.xml 2007-07-26 16:51:02 UTC (rev 4009) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl" - parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/wstools-config.xml (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml) =================================================================== --- branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/wstools-config.xml (rev 0) +++ branches/jbossws-1.2.1.GA_JBWS-1768/jbossws-tests/src/resources/tools/jbws1723/rpclit_in/wstools-config.xml 2007-07-26 16:51:02 UTC (rev 4009) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl" + parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r4008 - branches/dlofthouse.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-07-26 12:09:49 -0400 (Thu, 26 Jul 2007) New Revision: 4008 Removed: branches/dlofthouse/JBWS-1723/ Log: No longer required.

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r4007 - branches/jbossws-2.0.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-07-26 12:08:45 -0400 (Thu, 26 Jul 2007) New Revision: 4007 Modified: branches/jbossws-2.0/mergeinfo.txt Log: Added JBWS-1723 Modified: branches/jbossws-2.0/mergeinfo.txt =================================================================== --- branches/jbossws-2.0/mergeinfo.txt 2007-07-26 16:07:57 UTC (rev 4006) +++ branches/jbossws-2.0/mergeinfo.txt 2007-07-26 16:08:45 UTC (rev 4007) @@ -55,3 +55,6 @@ svn merge -r 3755:3756 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0 svn merge -r 3756:3758 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0 svn merge -r 3763:3764 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0 + +darran.lofthouse(a)jboss.com 26-Jul-07 +svn merge -r 4002:4003 https://svn.jboss.org/repos/jbossws/branches/jbossws-2.0

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r4006 - in trunk/jbossws-core/src: main/java/org/jboss/ws/tools/helpers and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-07-26 12:07:57 -0400 (Thu, 26 Jul 2007) New Revision: 4006 Added: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java trunk/jbossws-core/src/test/resources/tools/jbws1723/ trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/ trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/ trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml Removed: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/ trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/ trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java Log: JBWS-1723 - WSDL To Java - Anonymous Types Referenced As Bound Headers Not Handled Correctly. Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-07-26 15:58:13 UTC (rev 4005) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2007-07-26 16:07:57 UTC (rev 4006) @@ -55,6 +55,7 @@ import org.jboss.ws.metadata.wsdl.WSDLInterfaceOperationOutput; import org.jboss.ws.metadata.wsdl.WSDLRPCPart; import org.jboss.ws.metadata.wsdl.WSDLSOAPHeader; +import org.jboss.ws.metadata.wsdl.WSDLTypes; import org.jboss.ws.metadata.wsdl.WSDLUtils; import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel; import org.jboss.ws.metadata.wsdl.xsd.SchemaUtils; @@ -439,7 +440,8 @@ JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdl.getWsdlTypes()); XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI()); XSTypeDefinition xt = xe.getTypeDefinition(); - QName xmlType = new QName(xt.getNamespace(), xt.getName()); + WSDLTypes wsdlTypes = wsdl.getWsdlTypes(); + QName xmlType = wsdlTypes.getXMLType(header.getElement()); // Replace the xt with the real type from the schema. xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); @@ -449,7 +451,7 @@ buf.append(", "); } - generateParameter(buf, "", xmlType, xsmodel, xt, false, true, holder); + generateParameter(buf, xe.getName(), xmlType, xsmodel, xt, false, true, holder); buf.append(" ").append(header.getPartName()); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-07-26 15:58:13 UTC (rev 4005) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/helpers/MappingFileGeneratorHelper.java 2007-07-26 16:07:57 UTC (rev 4006) @@ -371,13 +371,13 @@ JBossXSModel xsmodel = WSDLUtils.getSchemaModel(wsdlDefinitions.getWsdlTypes()); XSElementDeclaration xe = xsmodel.getElementDeclaration(elementName.getLocalPart(), elementName.getNamespaceURI()); XSTypeDefinition xt = xe.getTypeDefinition(); - QName xmlType = new QName(xt.getNamespace(), xt.getName()); + WSDLTypes wsdlTypes = wsdlDefinitions.getWsdlTypes(); + QName xmlType = wsdlTypes.getXMLType(header.getElement()); // Replace the xt with the real type from the schema. xt = xsmodel.getTypeDefinition(xmlType.getLocalPart(), xmlType.getNamespaceURI()); if (xt instanceof XSSimpleTypeDefinition) xmlType = SchemaUtils.handleSimpleType((XSSimpleTypeDefinition)xt); - String partName = header.getPartName(); MethodParamPartsMapping mpin = getMethodParamPartsMapping(semm, elementName, xmlType, paramPosition, wsdlMessageName, mode, partName, false, true); Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723 (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723) Deleted: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2007-07-26 16:07:57 UTC (rev 4006) @@ -1,107 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2007, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt 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.test.ws.tools.jbws1723; - -import java.io.File; -import java.io.FilenameFilter; - -import org.jboss.test.ws.tools.fixture.JBossSourceComparator; -import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; -import org.jboss.ws.tools.WSTools; -import org.jboss.wsf.spi.test.JBossWSTest; - -/** - * Test WSDL with bound headers defined as anonymous types. - * - * @see http://jira.jboss.com/jira/browse/JBWS-1723 - * - * @author darran.lofthouse(a)jboss.com - * @since Jul 26, 2007 - */ -public class JBWS1723TestCase extends JBossWSTest -{ - public void testGenerateDocLitIn() throws Exception - { - generateScenario("doclit_in"); - } - - public void testGenerateRpcLitIn() throws Exception - { - generateScenario("rpclit_in"); - } - - protected void generateScenario(final String scenario) throws Exception - { - String resourceDir = "resources/tools/jbws1723/" + scenario; - String toolsDir = "tools/jbws1723/" + scenario; - String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; - new WSTools().generate(args); - File resourceDirFile = new File(resourceDir); - String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { - public boolean accept(File dir, String name) - { - return name.endsWith(".java"); - } - }); - - for (int i = 0; i < expectedFiles.length; i++) - { - String currentFile = expectedFiles[i]; - - try - { - compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1723/" + currentFile); - } - catch (Exception e) - { - throw new Exception("Validation of '" + currentFile + "' failed.", e); - } - } - - File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1723"); - String[] generatedFiles = packageDir.list(); - for (int i = 0; i < generatedFiles.length; i++) - { - String currentFile = generatedFiles[i]; - - boolean matched = "PhoneBookService.java".equals(currentFile); - - for (int j = 0; j < expectedFiles.length && (matched == false); j++) - matched = currentFile.equals(expectedFiles[j]); - - assertTrue("File '" + currentFile + "' was not expected to be generated", matched); - } - - JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); - mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); - } - - private static void compareSource(final String expectedName, final String generatedName) throws Exception - { - File expected = new File(expectedName); - File generated = new File(generatedName); - - JBossSourceComparator sc = new JBossSourceComparator(expected, generated); - sc.validate(); - sc.validateImports(); - } -} Copied: trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java) =================================================================== --- trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java (rev 0) +++ trunk/jbossws-core/src/test/java/org/jboss/test/ws/tools/jbws1723/JBWS1723TestCase.java 2007-07-26 16:07:57 UTC (rev 4006) @@ -0,0 +1,107 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2007, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt 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.test.ws.tools.jbws1723; + +import java.io.File; +import java.io.FilenameFilter; + +import org.jboss.test.ws.tools.fixture.JBossSourceComparator; +import org.jboss.test.ws.tools.validation.JaxrpcMappingValidator; +import org.jboss.ws.tools.WSTools; +import org.jboss.wsf.spi.test.JBossWSTest; + +/** + * Test WSDL with bound headers defined as anonymous types. + * + * @see http://jira.jboss.com/jira/browse/JBWS-1723 + * + * @author darran.lofthouse(a)jboss.com + * @since Jul 26, 2007 + */ +public class JBWS1723TestCase extends JBossWSTest +{ + public void testGenerateDocLitIn() throws Exception + { + generateScenario("doclit_in"); + } + + public void testGenerateRpcLitIn() throws Exception + { + generateScenario("rpclit_in"); + } + + protected void generateScenario(final String scenario) throws Exception + { + String resourceDir = "resources/tools/jbws1723/" + scenario; + String toolsDir = "tools/jbws1723/" + scenario; + String[] args = new String[] { "-dest", toolsDir, "-config", resourceDir + "/wstools-config.xml" }; + new WSTools().generate(args); + File resourceDirFile = new File(resourceDir); + String[] expectedFiles = resourceDirFile.list(new FilenameFilter() { + public boolean accept(File dir, String name) + { + return name.endsWith(".java"); + } + }); + + for (int i = 0; i < expectedFiles.length; i++) + { + String currentFile = expectedFiles[i]; + + try + { + compareSource(resourceDir + "/" + currentFile, toolsDir + "/org/jboss/test/ws/jbws1723/" + currentFile); + } + catch (Exception e) + { + throw new Exception("Validation of '" + currentFile + "' failed.", e); + } + } + + File packageDir = new File(toolsDir + "/org/jboss/test/ws/jbws1723"); + String[] generatedFiles = packageDir.list(); + for (int i = 0; i < generatedFiles.length; i++) + { + String currentFile = generatedFiles[i]; + + boolean matched = "PhoneBookService.java".equals(currentFile); + + for (int j = 0; j < expectedFiles.length && (matched == false); j++) + matched = currentFile.equals(expectedFiles[j]); + + assertTrue("File '" + currentFile + "' was not expected to be generated", matched); + } + + JaxrpcMappingValidator mappingValidator = new JaxrpcMappingValidator(); + mappingValidator.validate(resourceDir + "/jaxrpc-mapping.xml", toolsDir + "/jaxrpc-mapping.xml"); + } + + private static void compareSource(final String expectedName, final String generatedName) throws Exception + { + File expected = new File(expectedName); + File generated = new File(generatedName); + + JBossSourceComparator sc = new JBossSourceComparator(expected, generated); + sc.validate(); + sc.validateImports(); + } +} Copied: trunk/jbossws-core/src/test/resources/tools/jbws1723 (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723) Copied: trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in) Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java 2007-07-26 16:07:57 UTC (rev 4006) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Jul 26 15:56:31 BST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1723; - - -public class BillingAccount -{ - -protected java.lang.String sortCode; - -protected java.lang.String accountNumber; -public BillingAccount(){} - -public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ -this.sortCode=sortCode; -this.accountNumber=accountNumber; -} -public java.lang.String getSortCode() { return sortCode ;} - -public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } - -public java.lang.String getAccountNumber() { return accountNumber ;} - -public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } - -} Copied: trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/BillingAccount.java 2007-07-26 16:07:57 UTC (rev 4006) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Jul 26 15:56:31 BST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1723; + + +public class BillingAccount +{ + +protected java.lang.String sortCode; + +protected java.lang.String accountNumber; +public BillingAccount(){} + +public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ +this.sortCode=sortCode; +this.accountNumber=accountNumber; +} +public java.lang.String getSortCode() { return sortCode ;} + +public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } + +public java.lang.String getAccountNumber() { return accountNumber ;} + +public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } + +} Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java 2007-07-26 16:07:57 UTC (rev 4006) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Jul 26 15:56:31 BST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1723; - - -public class Person -{ - -protected java.lang.String firstName; - -protected java.lang.String surname; -public Person(){} - -public Person(java.lang.String firstName, java.lang.String surname){ -this.firstName=firstName; -this.surname=surname; -} -public java.lang.String getFirstName() { return firstName ;} - -public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } - -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/Person.java 2007-07-26 16:07:57 UTC (rev 4006) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Jul 26 15:56:31 BST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1723; + + +public class Person +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public Person(){} + +public Person(java.lang.String firstName, java.lang.String surname){ +this.firstName=firstName; +this.surname=surname; +} +public java.lang.String getFirstName() { return firstName ;} + +public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } + +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl 2007-07-26 16:07:57 UTC (rev 4006) @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1723' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1723/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1723' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1723/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1723/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - - <element name='lookup' type='tns:Person'/> - <element name='lookupResponse' type='tns:TelephoneNumber'/> - <element name='billingAccount'> - <complexType> - <sequence> - <element name='sortCode' nillable='true' type='string'/> - <element name='accountNumber' nillable='true' type='string'/> - </sequence> - </complexType> - </element> - </schema> - </types> - - <message name='PhoneBook_lookup'> - <part element='ns1:lookup' name='parameters'/> - <part element='ns1:billingAccount' name='header'/> - </message> - - <message name='PhoneBook_lookupResponse'> - <part element='ns1:lookupResponse' name='result'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body use='literal' parts='parameters'/> - <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' /> - </input> - <output> - <soap:body use='literal'/> - </output> - </operation> - </binding> - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook.wsdl 2007-07-26 16:07:57 UTC (rev 4006) @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1723' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1723/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1723' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1723/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1723/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='areaCode' nillable='true' type='string'/> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + + <element name='lookup' type='tns:Person'/> + <element name='lookupResponse' type='tns:TelephoneNumber'/> + <element name='billingAccount'> + <complexType> + <sequence> + <element name='sortCode' nillable='true' type='string'/> + <element name='accountNumber' nillable='true' type='string'/> + </sequence> + </complexType> + </element> + </schema> + </types> + + <message name='PhoneBook_lookup'> + <part element='ns1:lookup' name='parameters'/> + <part element='ns1:billingAccount' name='header'/> + </message> + + <message name='PhoneBook_lookupResponse'> + <part element='ns1:lookupResponse' name='result'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='document' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body use='literal' parts='parameters'/> + <soap:header use='literal' message='tns:PhoneBook_lookup' part='header' /> + </input> + <output> + <soap:body use='literal'/> + </output> + </operation> + </binding> + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java 2007-07-26 16:07:57 UTC (rev 4006) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Jul 26 15:56:31 BST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws1723; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1723.TelephoneNumber lookup(org.jboss.test.ws.jbws1723.Person lookup, org.jboss.test.ws.jbws1723.BillingAccount header) throws java.rmi.RemoteException; -} Copied: trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/PhoneBook_PortType.java 2007-07-26 16:07:57 UTC (rev 4006) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Jul 26 15:56:31 BST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1723; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1723.TelephoneNumber lookup(org.jboss.test.ws.jbws1723.Person lookup, org.jboss.test.ws.jbws1723.BillingAccount header) throws java.rmi.RemoteException; +} Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java 2007-07-26 16:07:57 UTC (rev 4006) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Jul 26 15:56:31 BST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1723; - - -public class TelephoneNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public TelephoneNumber(){} - -public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/TelephoneNumber.java 2007-07-26 16:07:57 UTC (rev 4006) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Jul 26 15:56:31 BST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1723; + + +public class TelephoneNumber +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ +this.areaCode=areaCode; +this.number=number; +} +public java.lang.String getAreaCode() { return areaCode ;} + +public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } + +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml 2007-07-26 16:07:57 UTC (rev 4006) @@ -1,89 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1723</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1723/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1723</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1723</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1723.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1723.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1723.BillingAccount</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:>billingAccount</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>sortCode</java-variable-name> - <xml-element-name>sortCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>accountNumber</java-variable-name> - <xml-element-name>accountNumber</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1723.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1723'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1723.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1723'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1723'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1723.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>parameters</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>org.jboss.test.ws.jbws1723.BillingAccount</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook</wsdl-message> - <wsdl-message-part-name>header</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1723.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/jaxrpc-mapping.xml 2007-07-26 16:07:57 UTC (rev 4006) @@ -0,0 +1,89 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1723</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1723/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1723</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1723</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1723.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1723.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1723.BillingAccount</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:>billingAccount</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>sortCode</java-variable-name> + <xml-element-name>sortCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>accountNumber</java-variable-name> + <xml-element-name>accountNumber</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1723.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1723'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1723.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1723'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1723'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1723.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>parameters</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <method-param-parts-mapping> + <param-position>1</param-position> + <param-type>org.jboss.test.ws.jbws1723.BillingAccount</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook</wsdl-message> + <wsdl-message-part-name>header</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1723.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml 2007-07-26 16:07:57 UTC (rev 4006) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1723/doclit_in/PhoneBook.wsdl" - parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/doclit_in/wstools-config.xml 2007-07-26 16:07:57 UTC (rev 4006) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1723/doclit_in/PhoneBook.wsdl" + parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration> Copied: trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in) Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java 2007-07-26 16:07:57 UTC (rev 4006) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Jul 26 15:58:39 BST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1723; - - -public class BillingAccount -{ - -protected java.lang.String sortCode; - -protected java.lang.String accountNumber; -public BillingAccount(){} - -public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ -this.sortCode=sortCode; -this.accountNumber=accountNumber; -} -public java.lang.String getSortCode() { return sortCode ;} - -public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } - -public java.lang.String getAccountNumber() { return accountNumber ;} - -public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } - -} Copied: trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/BillingAccount.java 2007-07-26 16:07:57 UTC (rev 4006) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Jul 26 15:58:39 BST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1723; + + +public class BillingAccount +{ + +protected java.lang.String sortCode; + +protected java.lang.String accountNumber; +public BillingAccount(){} + +public BillingAccount(java.lang.String sortCode, java.lang.String accountNumber){ +this.sortCode=sortCode; +this.accountNumber=accountNumber; +} +public java.lang.String getSortCode() { return sortCode ;} + +public void setSortCode(java.lang.String sortCode){ this.sortCode=sortCode; } + +public java.lang.String getAccountNumber() { return accountNumber ;} + +public void setAccountNumber(java.lang.String accountNumber){ this.accountNumber=accountNumber; } + +} Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java 2007-07-26 16:07:57 UTC (rev 4006) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Jul 26 15:58:39 BST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1723; - - -public class Person -{ - -protected java.lang.String firstName; - -protected java.lang.String surname; -public Person(){} - -public Person(java.lang.String firstName, java.lang.String surname){ -this.firstName=firstName; -this.surname=surname; -} -public java.lang.String getFirstName() { return firstName ;} - -public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } - -public java.lang.String getSurname() { return surname ;} - -public void setSurname(java.lang.String surname){ this.surname=surname; } - -} Copied: trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/Person.java 2007-07-26 16:07:57 UTC (rev 4006) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Jul 26 15:58:39 BST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1723; + + +public class Person +{ + +protected java.lang.String firstName; + +protected java.lang.String surname; +public Person(){} + +public Person(java.lang.String firstName, java.lang.String surname){ +this.firstName=firstName; +this.surname=surname; +} +public java.lang.String getFirstName() { return firstName ;} + +public void setFirstName(java.lang.String firstName){ this.firstName=firstName; } + +public java.lang.String getSurname() { return surname ;} + +public void setSurname(java.lang.String surname){ this.surname=surname; } + +} Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl 2007-07-26 16:07:57 UTC (rev 4006) @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='PhoneBook' - targetNamespace='http://test.jboss.org/ws/jbws1723' - xmlns='http://schemas.xmlsoap.org/wsdl/' - xmlns:ns1='http://test.jboss.org/ws/jbws1723/types' - xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' - xmlns:tns='http://test.jboss.org/ws/jbws1723' - xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <schema targetNamespace='http://test.jboss.org/ws/jbws1723/types' - xmlns='http://www.w3.org/2001/XMLSchema' - xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' - xmlns:tns='http://test.jboss.org/ws/jbws1723/types' - xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> - - <complexType name='Person'> - <sequence> - <element name='firstName' nillable='true' type='string'/> - <element name='surname' nillable='true' type='string'/> - </sequence> - </complexType> - - <complexType name='TelephoneNumber'> - <sequence> - <element name='areaCode' nillable='true' type='string'/> - <element name='number' nillable='true' type='string'/> - </sequence> - </complexType> - - - <element name='billingAccount'> - <complexType> - <sequence> - <element name='sortCode' nillable='true' type='string'/> - <element name='accountNumber' nillable='true' type='string'/> - </sequence> - </complexType> - </element> - </schema> - </types> - - <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> - <part name='Person_1' type='ns1:Person'/> - <part name='Account_1' element='ns1:billingAccount'/> - </message> - <message name='PhoneBook_lookupResponse'> - <part name='result' type='ns1:TelephoneNumber'/> - </message> - - <portType name='PhoneBook'> - <operation name='lookup' parameterOrder='Person_1'> - <input message='tns:PhoneBook_lookup'/> - <output message='tns:PhoneBook_lookupResponse'/> - </operation> - </portType> - - <binding name='PhoneBookBinding' type='tns:PhoneBook'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='lookup'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' /> - <soap:header message="tns:PhoneBook_lookup" - part="Account_1" use="literal" /> - </input> - <output> - <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/> - </output> - </operation> - </binding> - - <service name='PhoneBook'> - <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl 2007-07-26 16:07:57 UTC (rev 4006) @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='PhoneBook' + targetNamespace='http://test.jboss.org/ws/jbws1723' + xmlns='http://schemas.xmlsoap.org/wsdl/' + xmlns:ns1='http://test.jboss.org/ws/jbws1723/types' + xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' + xmlns:tns='http://test.jboss.org/ws/jbws1723' + xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <schema targetNamespace='http://test.jboss.org/ws/jbws1723/types' + xmlns='http://www.w3.org/2001/XMLSchema' + xmlns:soap11-enc='http://schemas.xmlsoap.org/soap/encoding/' + xmlns:tns='http://test.jboss.org/ws/jbws1723/types' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'> + + <complexType name='Person'> + <sequence> + <element name='firstName' nillable='true' type='string'/> + <element name='surname' nillable='true' type='string'/> + </sequence> + </complexType> + + <complexType name='TelephoneNumber'> + <sequence> + <element name='areaCode' nillable='true' type='string'/> + <element name='number' nillable='true' type='string'/> + </sequence> + </complexType> + + + <element name='billingAccount'> + <complexType> + <sequence> + <element name='sortCode' nillable='true' type='string'/> + <element name='accountNumber' nillable='true' type='string'/> + </sequence> + </complexType> + </element> + </schema> + </types> + + <message name='PhoneBook_lookup' xmlns='http://schemas.xmlsoap.org/wsdl/'> + <part name='Person_1' type='ns1:Person'/> + <part name='Account_1' element='ns1:billingAccount'/> + </message> + <message name='PhoneBook_lookupResponse'> + <part name='result' type='ns1:TelephoneNumber'/> + </message> + + <portType name='PhoneBook'> + <operation name='lookup' parameterOrder='Person_1'> + <input message='tns:PhoneBook_lookup'/> + <output message='tns:PhoneBook_lookupResponse'/> + </operation> + </portType> + + <binding name='PhoneBookBinding' type='tns:PhoneBook'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='lookup'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal' parts='Person_1' /> + <soap:header message="tns:PhoneBook_lookup" + part="Account_1" use="literal" /> + </input> + <output> + <soap:body namespace='http://www.jboss.org/support/phonebook' use='literal'/> + </output> + </operation> + </binding> + + <service name='PhoneBook'> + <port binding='tns:PhoneBookBinding' name='PhoneBookPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java 2007-07-26 16:07:57 UTC (rev 4006) @@ -1,15 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Jul 26 15:58:39 BST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ -package org.jboss.test.ws.jbws1723; -public interface PhoneBook_PortType extends java.rmi.Remote -{ - - public org.jboss.test.ws.jbws1723.TelephoneNumber lookup(org.jboss.test.ws.jbws1723.Person person_1, org.jboss.test.ws.jbws1723.BillingAccount Account_1) throws java.rmi.RemoteException; -} Copied: trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/PhoneBook_PortType.java 2007-07-26 16:07:57 UTC (rev 4006) @@ -0,0 +1,15 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Jul 26 15:58:39 BST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ +package org.jboss.test.ws.jbws1723; +public interface PhoneBook_PortType extends java.rmi.Remote +{ + + public org.jboss.test.ws.jbws1723.TelephoneNumber lookup(org.jboss.test.ws.jbws1723.Person person_1, org.jboss.test.ws.jbws1723.BillingAccount Account_1) throws java.rmi.RemoteException; +} Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java 2007-07-26 16:07:57 UTC (rev 4006) @@ -1,34 +0,0 @@ -/* - * JBossWS WS-Tools Generated Source - * - * Generation Date: Thu Jul 26 15:58:39 BST 2007 - * - * This generated source code represents a derivative work of the input to - * the generator that produced it. Consult the input for the copyright and - * terms of use that apply to this source code. - */ - -package org.jboss.test.ws.jbws1723; - - -public class TelephoneNumber -{ - -protected java.lang.String areaCode; - -protected java.lang.String number; -public TelephoneNumber(){} - -public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ -this.areaCode=areaCode; -this.number=number; -} -public java.lang.String getAreaCode() { return areaCode ;} - -public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } - -public java.lang.String getNumber() { return number ;} - -public void setNumber(java.lang.String number){ this.number=number; } - -} Copied: trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/TelephoneNumber.java 2007-07-26 16:07:57 UTC (rev 4006) @@ -0,0 +1,34 @@ +/* + * JBossWS WS-Tools Generated Source + * + * Generation Date: Thu Jul 26 15:58:39 BST 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + */ + +package org.jboss.test.ws.jbws1723; + + +public class TelephoneNumber +{ + +protected java.lang.String areaCode; + +protected java.lang.String number; +public TelephoneNumber(){} + +public TelephoneNumber(java.lang.String areaCode, java.lang.String number){ +this.areaCode=areaCode; +this.number=number; +} +public java.lang.String getAreaCode() { return areaCode ;} + +public void setAreaCode(java.lang.String areaCode){ this.areaCode=areaCode; } + +public java.lang.String getNumber() { return number ;} + +public void setNumber(java.lang.String number){ this.number=number; } + +} Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml 2007-07-26 16:07:57 UTC (rev 4006) @@ -1,89 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1723</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1723/types</namespaceURI> - </package-mapping> - <package-mapping> - <package-type>org.jboss.test.ws.jbws1723</package-type> - <namespaceURI>http://test.jboss.org/ws/jbws1723</namespaceURI> - </package-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1723.Person</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:Person</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>firstName</java-variable-name> - <xml-element-name>firstName</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>surname</java-variable-name> - <xml-element-name>surname</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1723.TelephoneNumber</java-type> - <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:TelephoneNumber</root-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>areaCode</java-variable-name> - <xml-element-name>areaCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>number</java-variable-name> - <xml-element-name>number</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <java-xml-type-mapping> - <java-type>org.jboss.test.ws.jbws1723.BillingAccount</java-type> - <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:>billingAccount</anonymous-type-qname> - <qname-scope>complexType</qname-scope> - <variable-mapping> - <java-variable-name>sortCode</java-variable-name> - <xml-element-name>sortCode</xml-element-name> - </variable-mapping> - <variable-mapping> - <java-variable-name>accountNumber</java-variable-name> - <xml-element-name>accountNumber</xml-element-name> - </variable-mapping> - </java-xml-type-mapping> - <service-interface-mapping> - <service-interface>org.jboss.test.ws.jbws1723.PhoneBook_Service</service-interface> - <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1723'>serviceNS:PhoneBook</wsdl-service-name> - <port-mapping> - <port-name>PhoneBookPort</port-name> - <java-port-name>PhoneBookPort</java-port-name> - </port-mapping> - </service-interface-mapping> - <service-endpoint-interface-mapping> - <service-endpoint-interface>org.jboss.test.ws.jbws1723.PhoneBook_PortType</service-endpoint-interface> - <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1723'>portTypeNS:PhoneBook</wsdl-port-type> - <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1723'>bindingNS:PhoneBookBinding</wsdl-binding> - <service-endpoint-method-mapping> - <java-method-name>lookup</java-method-name> - <wsdl-operation>lookup</wsdl-operation> - <method-param-parts-mapping> - <param-position>0</param-position> - <param-type>org.jboss.test.ws.jbws1723.Person</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> - <wsdl-message-part-name>Person_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <method-param-parts-mapping> - <param-position>1</param-position> - <param-type>org.jboss.test.ws.jbws1723.BillingAccount</param-type> - <wsdl-message-mapping> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook</wsdl-message> - <wsdl-message-part-name>Account_1</wsdl-message-part-name> - <parameter-mode>IN</parameter-mode> - </wsdl-message-mapping> - </method-param-parts-mapping> - <wsdl-return-value-mapping> - <method-return-value>org.jboss.test.ws.jbws1723.TelephoneNumber</method-return-value> - <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> - <wsdl-message-part-name>result</wsdl-message-part-name> - </wsdl-return-value-mapping> - </service-endpoint-method-mapping> - </service-endpoint-interface-mapping> -</java-wsdl-mapping> \ No newline at end of file Copied: trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/jaxrpc-mapping.xml 2007-07-26 16:07:57 UTC (rev 4006) @@ -0,0 +1,89 @@ +<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1723</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1723/types</namespaceURI> + </package-mapping> + <package-mapping> + <package-type>org.jboss.test.ws.jbws1723</package-type> + <namespaceURI>http://test.jboss.org/ws/jbws1723</namespaceURI> + </package-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1723.Person</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:Person</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>firstName</java-variable-name> + <xml-element-name>firstName</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>surname</java-variable-name> + <xml-element-name>surname</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1723.TelephoneNumber</java-type> + <root-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:TelephoneNumber</root-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>areaCode</java-variable-name> + <xml-element-name>areaCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>number</java-variable-name> + <xml-element-name>number</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <java-xml-type-mapping> + <java-type>org.jboss.test.ws.jbws1723.BillingAccount</java-type> + <anonymous-type-qname xmlns:typeNS='http://test.jboss.org/ws/jbws1723/types'>typeNS:>billingAccount</anonymous-type-qname> + <qname-scope>complexType</qname-scope> + <variable-mapping> + <java-variable-name>sortCode</java-variable-name> + <xml-element-name>sortCode</xml-element-name> + </variable-mapping> + <variable-mapping> + <java-variable-name>accountNumber</java-variable-name> + <xml-element-name>accountNumber</xml-element-name> + </variable-mapping> + </java-xml-type-mapping> + <service-interface-mapping> + <service-interface>org.jboss.test.ws.jbws1723.PhoneBook_Service</service-interface> + <wsdl-service-name xmlns:serviceNS='http://test.jboss.org/ws/jbws1723'>serviceNS:PhoneBook</wsdl-service-name> + <port-mapping> + <port-name>PhoneBookPort</port-name> + <java-port-name>PhoneBookPort</java-port-name> + </port-mapping> + </service-interface-mapping> + <service-endpoint-interface-mapping> + <service-endpoint-interface>org.jboss.test.ws.jbws1723.PhoneBook_PortType</service-endpoint-interface> + <wsdl-port-type xmlns:portTypeNS='http://test.jboss.org/ws/jbws1723'>portTypeNS:PhoneBook</wsdl-port-type> + <wsdl-binding xmlns:bindingNS='http://test.jboss.org/ws/jbws1723'>bindingNS:PhoneBookBinding</wsdl-binding> + <service-endpoint-method-mapping> + <java-method-name>lookup</java-method-name> + <wsdl-operation>lookup</wsdl-operation> + <method-param-parts-mapping> + <param-position>0</param-position> + <param-type>org.jboss.test.ws.jbws1723.Person</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook_lookup</wsdl-message> + <wsdl-message-part-name>Person_1</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <method-param-parts-mapping> + <param-position>1</param-position> + <param-type>org.jboss.test.ws.jbws1723.BillingAccount</param-type> + <wsdl-message-mapping> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook</wsdl-message> + <wsdl-message-part-name>Account_1</wsdl-message-part-name> + <parameter-mode>IN</parameter-mode> + </wsdl-message-mapping> + </method-param-parts-mapping> + <wsdl-return-value-mapping> + <method-return-value>org.jboss.test.ws.jbws1723.TelephoneNumber</method-return-value> + <wsdl-message xmlns:wsdlMsgNS='http://test.jboss.org/ws/jbws1723'>wsdlMsgNS:PhoneBook_lookupResponse</wsdl-message> + <wsdl-message-part-name>result</wsdl-message-part-name> + </wsdl-return-value-mapping> + </service-endpoint-method-mapping> + </service-endpoint-interface-mapping> +</java-wsdl-mapping> \ No newline at end of file Deleted: trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml 2007-07-26 16:07:57 UTC (rev 4006) @@ -1,6 +0,0 @@ -<configuration> - <wsdl-java location="resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl" - parameter-style="bare"> - <mapping file="jaxrpc-mapping.xml"/> - </wsdl-java> -</configuration> Copied: trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml (from rev 4003, branches/jbossws-2.0/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml) =================================================================== --- trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml (rev 0) +++ trunk/jbossws-core/src/test/resources/tools/jbws1723/rpclit_in/wstools-config.xml 2007-07-26 16:07:57 UTC (rev 4006) @@ -0,0 +1,6 @@ +<configuration> + <wsdl-java location="resources/tools/jbws1723/rpclit_in/PhoneBook.wsdl" + parameter-style="bare"> + <mapping file="jaxrpc-mapping.xml"/> + </wsdl-java> +</configuration>

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r4005 - branches.

by jbossws-commits＠lists.jboss.org

Author: darran.lofthouse(a)jboss.com Date: 2007-07-26 11:58:13 -0400 (Thu, 26 Jul 2007) New Revision: 4005 Added: branches/jbossws-1.2.1.GA_JBWS-1768/ Log: Branch for JBWS-1768 Patch Copied: branches/jbossws-1.2.1.GA_JBWS-1768 (from rev 4004, branches/jbossws-1.2.1.GA_JBWS-1703)

17 years, 5 months

1
0
0 / 0

JBossWS SVN: r4004 - in trunk: build and 9 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-07-26 11:42:09 -0400 (Thu, 26 Jul 2007) New Revision: 4004 Modified: trunk/JBossWS-Trunk.ipr trunk/JBossWS-Trunk.iws trunk/build/build.iml trunk/integration/jboss40/int-40.iml trunk/integration/jboss42/int-42.iml trunk/integration/jboss50/int-50.iml trunk/integration/native/int-native.iml trunk/integration/spi/spi.iml trunk/integration/sunri/int-sunri.iml trunk/integration/xfire/int-xfire.iml trunk/jbossws-core/jbossws-core.iml trunk/testsuite/testsuite.iml Log: Cleanup intelli setup Modified: trunk/JBossWS-Trunk.ipr =================================================================== --- trunk/JBossWS-Trunk.ipr 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/JBossWS-Trunk.ipr 2007-07-26 15:42:09 UTC (rev 4004) @@ -3,13 +3,19 @@ <component name="AntConfiguration"> <defaultAnt bundledAnt="true" /> </component> + <component name="BuildJarProjectSettings"> + <option name="BUILD_JARS_ON_MAKE" value="false" /> + </component> + <component name="CodeStyleProjectProfileManger"> + <option name="PROJECT_PROFILE" /> + <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> + </component> <component name="CodeStyleSettingsManager"> <option name="PER_PROJECT_SETTINGS" /> <option name="USE_PER_PROJECT_SETTINGS" value="false" /> </component> <component name="CompilerConfiguration"> <option name="DEFAULT_COMPILER" value="Javac" /> - <option name="CLEAR_OUTPUT_DIRECTORY" value="false" /> <option name="DEPLOY_AFTER_MAKE" value="0" /> <resourceExtensions> <entry name=".+\.(properties|xml|html|dtd|tld)" /> @@ -32,6 +38,20 @@ <option name="myForwardDirection" value="false" /> </component> <component name="DependencyValidationManager" /> + <component name="EclipseCompilerSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="true" /> + <option name="DEPRECATION" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> + <component name="EclipseEmbeddedCompilerSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="true" /> + <option name="DEPRECATION" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> <component name="EntryPointsManager"> <entry_points /> </component> @@ -41,6 +61,36 @@ <option name="OUTPUT_DIRECTORY" /> </component> <component name="GUI Designer component loader factory" /> + <component name="IdProvider" IDEtalkID="8B97D162B1F783C14FB5AEC484C03A29" /> + <component name="InspectionProjectProfileManager"> + <option name="PROJECT_PROFILE" value="Project Default" /> + <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> + <scopes /> + <profiles> + <profile version="1.0" is_locked="false"> + <option name="myName" value="Project Default" /> + <option name="myLocal" value="false" /> + <used_levels> + <error> + <option name="myName" value="ERROR" /> + <option name="myVal" value="400" /> + </error> + <warning> + <option name="myName" value="WARNING" /> + <option name="myVal" value="300" /> + </warning> + <information> + <option name="myName" value="INFO" /> + <option name="myVal" value="200" /> + </information> + <server> + <option name="myName" value="SERVER PROBLEM" /> + <option name="myVal" value="100" /> + </server> + </used_levels> + </profile> + </profiles> + </component> <component name="JavacSettings"> <option name="DEBUGGING_INFO" value="true" /> <option name="GENERATE_NO_WARNINGS" value="false" /> @@ -62,6 +112,7 @@ <option name="OPTION_DEPRECATED_LIST" value="true" /> <option name="OTHER_OPTIONS" value="" /> <option name="HEAP_SIZE" /> + <option name="LOCALE" /> <option name="OPEN_IN_BROWSER" value="true" /> </component> <component name="JikesSettings"> @@ -72,108 +123,131 @@ <option name="IS_EMACS_ERRORS_MODE" value="true" /> <option name="ADDITIONAL_OPTIONS_STRING" value="" /> </component> + <component name="LogConsolePreferences"> + <option name="FILTER_ERRORS" value="false" /> + <option name="FILTER_WARNINGS" value="false" /> + <option name="FILTER_INFO" value="true" /> + <option name="CUSTOM_FILTER" /> + </component> <component name="Palette2"> <group name="Swing"> - <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false"> + <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" /> </item> - <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false"> + <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" /> </item> - <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false"> + <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false"> <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" /> </item> - <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false"> + <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true"> <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" /> </item> - <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false"> + <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" /> <initial-values> <property name="text" value="Button" /> </initial-values> </item> - <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false"> + <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> <initial-values> <property name="text" value="RadioButton" /> </initial-values> </item> - <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false"> + <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> <initial-values> <property name="text" value="CheckBox" /> </initial-values> </item> - <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false"> + <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false"> <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" /> <initial-values> <property name="text" value="Label" /> </initial-values> </item> - <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false"> + <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> <preferred-size width="150" height="-1" /> </default-constraints> </item> - <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false"> + <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> <preferred-size width="150" height="-1" /> </default-constraints> </item> - <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false"> + <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> <preferred-size width="150" height="-1" /> </default-constraints> </item> - <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false"> + <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> - <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false"> + <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> - <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false"> + <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> - <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false"> + <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" /> </item> - <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false"> + <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> - <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false"> + <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> - <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false"> + <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> - <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false"> + <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> <preferred-size width="200" height="200" /> </default-constraints> </item> - <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false"> + <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false"> <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> <preferred-size width="200" height="200" /> </default-constraints> </item> - <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false"> + <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> </item> - <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false"> + <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> </item> + <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1"> + <preferred-size width="-1" height="20" /> + </default-constraints> + </item> + <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" /> + </item> </group> </component> <component name="ProjectModuleManager"> @@ -181,6 +255,10 @@ <module fileurl="file:///home/hbraun/dev/prj/jbossas/branches/Branch_4_2/ejb3/42-ejb3.iml" filepath="/home/hbraun/dev/prj/jbossas/branches/Branch_4_2/ejb3/42-ejb3.iml" /> <module fileurl="file:///home/hbraun/dev/prj/jbossas/branches/Branch_4_2/server/42-server.iml" filepath="/home/hbraun/dev/prj/jbossas/branches/Branch_4_2/server/42-server.iml" /> <module fileurl="file:///home/hbraun/dev/prj/jbossas/branches/Branch_4_2/tomcat/42-tomcat.iml" filepath="/home/hbraun/dev/prj/jbossas/branches/Branch_4_2/tomcat/42-tomcat.iml" /> + <module fileurl="file:///home/hbraun/dev/prj/jbossas/trunk/ejb3/as-ejb3.iml" filepath="/home/hbraun/dev/prj/jbossas/trunk/ejb3/as-ejb3.iml" /> + <module fileurl="file:///home/hbraun/dev/prj/jbossas/trunk/server/as-server.iml" filepath="/home/hbraun/dev/prj/jbossas/trunk/server/as-server.iml" /> + <module fileurl="file:///home/hbraun/dev/prj/jbossas/trunk/system/as-system.iml" filepath="/home/hbraun/dev/prj/jbossas/trunk/system/as-system.iml" /> + <module fileurl="file:///home/hbraun/dev/prj/jbossas/trunk/tomcat/as-tomcat.iml" filepath="/home/hbraun/dev/prj/jbossas/trunk/tomcat/as-tomcat.iml" /> <module fileurl="file://$PROJECT_DIR$/build/build.iml" filepath="$PROJECT_DIR$/build/build.iml" /> <module fileurl="file://$PROJECT_DIR$/integration/jboss40/int-40.iml" filepath="$PROJECT_DIR$/integration/jboss40/int-40.iml" /> <module fileurl="file://$PROJECT_DIR$/integration/jboss42/int-42.iml" filepath="$PROJECT_DIR$/integration/jboss42/int-42.iml" /> @@ -195,6 +273,7 @@ </modules> </component> <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" /> + <component name="ProjectRunConfigurationManager" /> <component name="RmicSettings"> <option name="IS_EANABLED" value="false" /> <option name="DEBUGGING_INFO" value="true" /> @@ -202,39 +281,20 @@ <option name="GENERATE_IIOP_STUBS" value="false" /> <option name="ADDITIONAL_OPTIONS_STRING" value="" /> </component> - <component name="libraryTable"> - <library name="jboss-system"> - <CLASSES> - <root url="jar:///home/hbraun/dev/prj/jbossas/branches/Branch_4_2/build/output/jboss-4.2.1.GA/lib/jboss-system.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - <library name="jboss-logging-spi"> - <CLASSES> - <root url="jar://$PROJECT_DIR$/jbossws-core/thirdparty/jboss-logging-spi.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - <library name="jboss-jmx"> - <CLASSES> - <root url="jar:///home/hbraun/dev/prj/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-jmx.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - <library name="jboss-system-jmx"> - <CLASSES> - <root url="jar:///home/hbraun/dev/prj/jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-system-jmx.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> + <component name="StarteamVcsAdapter" /> + <component name="VssVcs" /> + <component name="com.intellij.jsf.UserDefinedFacesConfigs"> + <option name="USER_DEFINED_CONFIGS"> + <value> + <list size="0" /> + </value> + </option> </component> + <component name="libraryTable" /> <component name="uidesigner-configuration"> <option name="INSTRUMENT_CLASSES" value="true" /> <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" /> + <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" /> </component> <UsedPathMacros /> </project> Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/JBossWS-Trunk.iws 2007-07-26 15:42:09 UTC (rev 4004) @@ -18,6 +18,26 @@ <option name="USE_USER_FILTER" value="false" /> <option name="USER" value="" /> </component> + <component name="ChangeListManager"> + <list default="true" name="Default" comment=""> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss50/int-50.iml" afterPath="$PROJECT_DIR$/integration/jboss50/int-50.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/sunri/int-sunri.iml" afterPath="$PROJECT_DIR$/integration/sunri/int-sunri.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss42/int-42.iml" afterPath="$PROJECT_DIR$/integration/jboss42/int-42.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/native/int-native.iml" afterPath="$PROJECT_DIR$/integration/native/int-native.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/xfire/int-xfire.iml" afterPath="$PROJECT_DIR$/integration/xfire/int-xfire.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" afterPath="$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testsuite/testsuite.iml" afterPath="$PROJECT_DIR$/testsuite/testsuite.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss40/int-40.iml" afterPath="$PROJECT_DIR$/integration/jboss40/int-40.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/build.iml" afterPath="$PROJECT_DIR$/build/build.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/eclipse/jbossws.userlibraries" afterPath="$PROJECT_DIR$/build/eclipse/jbossws.userlibraries" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_0.dtd" afterPath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_0.dtd" /> + <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_2.dtd" afterPath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_2.dtd" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jbossws-core/jbossws-core.iml" afterPath="$PROJECT_DIR$/jbossws-core/jbossws-core.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/spi/spi.iml" afterPath="$PROJECT_DIR$/integration/spi/spi.iml" /> + </list> + </component> + <component name="ChangeListSynchronizer" /> + <component name="ChangesViewManager" flattened_view="true" /> <component name="CheckinPanelState" /> <component name="Commander"> <leftPanel /> @@ -29,7 +49,10 @@ <option name="AUTO_SHOW_ERRORS_IN_EDITOR" value="true" /> <option name="CLOSE_MESSAGE_VIEW_IF_SUCCESS" value="true" /> <option name="COMPILE_DEPENDENT_FILES" value="false" /> + <option name="CLEAR_OUTPUT_DIRECTORY" value="false" /> + <option name="ASSERT_NOT_NULL" value="true" /> </component> + <component name="CoverageDataManager" /> <component name="Cvs2Configuration"> <option name="PRUNE_EMPTY_DIRECTORIES" value="true" /> <option name="MERGING_MODE" value="0" /> @@ -121,7 +144,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="58" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> + <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="51" class="org.jboss.wsf.framework.DefaultSPIProviderResolver" package="org.jboss.wsf.framework"> <option name="ENABLED" value="false" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -134,19 +157,6 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java" line="80" class="org.jboss.wsf.framework.deployment.WebAppGeneratorDeploymentAspect" package="org.jboss.wsf.framework.deployment"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> <breakpoint url="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/SunJaxwsDeploymentAspect.java" line="50" class="org.jboss.wsf.stack.sunri.SunJaxwsDeploymentAspect" package="org.jboss.wsf.stack.sunri"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> @@ -199,7 +209,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="105" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> + <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="101" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -212,7 +222,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="115" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> + <breakpoint url="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java" line="109" class="org.jboss.wsf.framework.DefaultSPIProviderResolver.Provider" package="org.jboss.wsf.framework"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -265,6 +275,10 @@ <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> <option name="HIDE_WARNINGS" value="false" /> </component> + <component name="FavoritesManager"> + <favorites_list name="JBossWS-Trunk" /> + </component> + <component name="FavoritesProjectViewPane" /> <component name="FavoritesViewImpl"> <favorites_list name="JBossWS-Trunk"> <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> @@ -280,15 +294,37 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="org.jboss.wsf.spi.invocation.InvocationHandlerFactory" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory"> + <file leaf-file-name="InvocationHandlerEJB3.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="49" selection-start="49" selection-end="49" vertical-scroll-proportion="0.0"> + <state line="127" column="33" selection-start="4801" selection-end="4801" vertical-scroll-proportion="0.33614457"> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="StatelessBeanContext.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessBeanContext.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="45" column="15" selection-start="1624" selection-end="1624" vertical-scroll-proportion="0.56213015"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="EJBContainerInvocation.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/ejb3/src/main/org/jboss/ejb3/EJBContainerInvocation.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="23" column="0" selection-start="1057" selection-end="1057" vertical-scroll-proportion="-0.6192771"> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FindManager"> @@ -305,163 +341,22 @@ <option name="AUTOSCROLL_TO_SOURCE" value="false" /> <option name="SPLITTER_PROPORTION" value="0.5" /> <option name="GROUP_BY_SEVERITY" value="false" /> + <option name="FILTER_RESOLVED_ITEMS" value="true" /> <option name="ANALYZE_TEST_SOURCES" value="true" /> + <option name="SHOW_DIFF_WITH_PREVIOUS_RUN" value="false" /> <option name="SCOPE_TYPE" value="3" /> <option name="CUSTOM_SCOPE_NAME" value="Project Files" /> - <profile name="Default" /> + <option name="SHOW_ONLY_DIFF" value="false" /> + <option name="myCurrentProfileName" value="Default" /> </component> - <component name="J2EEProjectPane"> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.j2ee.module.view.nodes.J2EEProjectNodeDescriptor" /> - </PATH_ELEMENT> - </PATH> - <setting name="SHOW_AS_DEPLOYMENT_VIEW" value="false" /> - </component> + <component name="J2EEProjectPane" /> + <component name="JspContextManager" /> <component name="ModuleEditorState"> <option name="LAST_EDITED_MODULE_NAME" value="int-42" /> <option name="LAST_EDITED_TAB_NAME" value="Libraries (Classpath)" /> </component> <component name="NamedScopeManager" /> - <component name="PackagesPane"> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="container" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-42" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-42" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="container" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss42" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-40" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-40" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="org" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="container" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jboss40" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> - </PATH_ELEMENT> - </PATH> - </component> + <component name="PackagesPane" /> <component name="PerforceChangeBrowserSettings"> <option name="USE_CLIENT_FILTER" value="true" /> <option name="CLIENT" value="" /> @@ -484,13 +379,9 @@ <option name="ENABLED" value="true" /> <option name="USE_LOGIN" value="false" /> <option name="LOGIN_SILENTLY" value="false" /> - <option name="INTEGRATE_BRANCH_NAME" /> - <option name="INTEGRATE_CHANGELIST_NUM" value="-1" /> <option name="INTEGRATE_RUN_RESOLVE" value="true" /> <option name="INTEGRATE_REVERT_UNCHANGED" value="true" /> - <option name="INTEGRATE_CHANGE_LIST_NUMBER" value="" /> - <option name="INTEGRATE_CHANGE_LIST" value="false" /> - <option name="INTEGRATE_REVERSE" value="false" /> + <option name="SERVER_TIMEOUT" value="20000" /> </component> <component name="ProjectLevelVcsManager"> <OptionsSetting value="true" id="Add" /> @@ -507,356 +398,20 @@ <ConfirmationsSetting value="0" id="Remove" /> </component> <component name="ProjectPane"> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main/java/org/jboss" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/spi/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main/resources" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="JBossWS-Trunk.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="int-50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/jboss50/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> + <subPane> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + </PATH> + </subPane> </component> <component name="ProjectReloadState"> <option name="STATE" value="0" /> </component> <component name="ProjectView"> - <navigator currentView="ProjectPane" splitterProportion="0.5"> + <navigator currentView="ProjectPane" proportions="0.16666667" version="1" splitterProportion="0.5"> <flattenPackages PackagesPane="false" /> <showMembers /> <showModules /> @@ -870,14 +425,14 @@ </navigator> </component> <component name="PropertiesComponent"> - <property name="MemberChooser.copyJavadoc" value="false" /> - <property name="GoToClass.includeLibraries" value="false" /> - <property name="MemberChooser.showClasses" value="true" /> - <property name="MemberChooser.sorted" value="false" /> - <property name="RunManagerConfig.compileBeforeRunning" value="false" /> <property name="GoToFile.includeJavaFiles" value="false" /> <property name="GoToClass.toSaveIncludeLibraries" value="false" /> <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" /> + <property name="RunManagerConfig.compileBeforeRunning" value="false" /> + <property name="MemberChooser.sorted" value="false" /> + <property name="MemberChooser.showClasses" value="true" /> + <property name="GoToClass.includeLibraries" value="false" /> + <property name="MemberChooser.copyJavadoc" value="false" /> </component> <component name="ReadonlyStatusHandler"> <option name="SHOW_DIALOG" value="true" /> @@ -896,10 +451,108 @@ <recent name="org.jboss.wsf.stack.jbws" /> </key> </component> - <component name="RestoreUpdateTree" /> - <component name="RunManager"> - <activeType name="Remote" /> - <configuration selected="false" default="true" type="Applet" factoryName="Applet"> + <component name="RestoreUpdateTree"> + <UpdateInfo date="7/26/07 4:18 PM" ActionInfo="_Update"> + <UpdatedFiles> + <FILE-GROUP> + <option name="myUpdateName" value="Updated from server" /> + <option name="myStatusName" value="Changed on server" /> + <option name="mySupportsDeletion" value="false" /> + <option name="myCanBeAbsent" value="false" /> + <option name="myId" value="CHANGED_ON_SERVER" /> + <FILE-GROUP> + <option name="myUpdateName" value="Updated" /> + <option name="myStatusName" value="Changed" /> + <option name="mySupportsDeletion" value="false" /> + <option name="myCanBeAbsent" value="false" /> + <option name="myId" value="UPDATED" /> + <PATH>$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebXMLRewriterImpl.java</PATH> + <PATH>$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/WebAppGeneratorDeploymentAspect.java</PATH> + <PATH>$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/ContextRootDeploymentAspect.java</PATH> + </FILE-GROUP> + <FILE-GROUP> + <option name="myUpdateName" value="Created" /> + <option name="myStatusName" value="Created" /> + <option name="mySupportsDeletion" value="false" /> + <option name="myCanBeAbsent" value="false" /> + <option name="myId" value="CREATED" /> + </FILE-GROUP> + <FILE-GROUP> + <option name="myUpdateName" value="Deleted" /> + <option name="myStatusName" value="Deleted" /> + <option name="mySupportsDeletion" value="false" /> + <option name="myCanBeAbsent" value="true" /> + <option name="myId" value="REMOVED_FROM_REPOSITORY" /> + <PATH>$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/UnifiedDeploymentInfo.java</PATH> + <PATH>$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCClientDeployment.java</PATH> + <PATH>$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXRPCDeployment.java</PATH> + <PATH>$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/JAXWSDeployment.java</PATH> + <PATH>$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXRPCClientDeployment.java</PATH> + <PATH>$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXRPCDeployment.java</PATH> + <PATH>$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/JAXWSDeployment.java</PATH> + </FILE-GROUP> + <FILE-GROUP> + <option name="myUpdateName" value="Restored" /> + <option name="myStatusName" value="Will be restored" /> + <option name="mySupportsDeletion" value="false" /> + <option name="myCanBeAbsent" value="false" /> + <option name="myId" value="RESTORED" /> + </FILE-GROUP> + </FILE-GROUP> + <FILE-GROUP> + <option name="myUpdateName" value="Modified" /> + <option name="myStatusName" value="Modified" /> + <option name="mySupportsDeletion" value="false" /> + <option name="myCanBeAbsent" value="false" /> + <option name="myId" value="MODIFIED" /> + </FILE-GROUP> + <FILE-GROUP> + <option name="myUpdateName" value="Skipped" /> + <option name="myStatusName" value="Skipped" /> + <option name="mySupportsDeletion" value="false" /> + <option name="myCanBeAbsent" value="false" /> + <option name="myId" value="SKIPPED" /> + </FILE-GROUP> + <FILE-GROUP> + <option name="myUpdateName" value="Merged with conflicts" /> + <option name="myStatusName" value="Will be merged with conflicts" /> + <option name="mySupportsDeletion" value="false" /> + <option name="myCanBeAbsent" value="false" /> + <option name="myId" value="MERGED_WITH_CONFLICTS" /> + </FILE-GROUP> + <FILE-GROUP> + <option name="myUpdateName" value="Merged" /> + <option name="myStatusName" value="Will be merged" /> + <option name="mySupportsDeletion" value="false" /> + <option name="myCanBeAbsent" value="false" /> + <option name="myId" value="MERGED" /> + </FILE-GROUP> + <FILE-GROUP> + <option name="myUpdateName" value="Not in repository" /> + <option name="myStatusName" value="Not in repository" /> + <option name="mySupportsDeletion" value="true" /> + <option name="myCanBeAbsent" value="false" /> + <option name="myId" value="UNKNOWN" /> + </FILE-GROUP> + <FILE-GROUP> + <option name="myUpdateName" value="Locally added" /> + <option name="myStatusName" value="Locally added" /> + <option name="mySupportsDeletion" value="false" /> + <option name="myCanBeAbsent" value="false" /> + <option name="myId" value="LOCALLY_ADDED" /> + </FILE-GROUP> + <FILE-GROUP> + <option name="myUpdateName" value="Locally removed" /> + <option name="myStatusName" value="Locally removed" /> + <option name="mySupportsDeletion" value="false" /> + <option name="myCanBeAbsent" value="false" /> + <option name="myId" value="LOCALLY_REMOVED" /> + </FILE-GROUP> + </UpdatedFiles> + </UpdateInfo> + </component> + <component name="RunManager" selected="Remote.client"> + <configuration default="true" type="Applet" factoryName="Applet"> <module name="" /> <option name="MAIN_CLASS_NAME" /> <option name="HTML_FILE_NAME" /> @@ -911,16 +564,17 @@ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> </configuration> - <configuration selected="false" default="true" type="Application" factoryName="Application"> + <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> <option name="MAIN_CLASS_NAME" /> <option name="VM_PARAMETERS" /> <option name="PROGRAM_PARAMETERS" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> + <option name="ENABLE_SWING_INSPECTOR" value="false" /> <module name="" /> </configuration> - <configuration selected="false" default="true" type="JUnit" factoryName="JUnit"> + <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> <module name="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> @@ -936,14 +590,14 @@ <value defaultName="wholeProject" /> </option> </configuration> - <configuration selected="false" default="true" type="Remote" factoryName="Remote"> + <configuration default="true" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="SERVER_MODE" value="false" /> <option name="SHMEM_ADDRESS" value="javadebug" /> <option name="HOST" value="localhost" /> <option name="PORT" value="5005" /> </configuration> - <configuration selected="false" default="false" name="server" type="Remote" factoryName="Remote"> + <configuration default="false" name="server" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="SERVER_MODE" value="false" /> <option name="SHMEM_ADDRESS" value="javadebug" /> @@ -956,7 +610,7 @@ </RunnerSettings> <ConfigurationWrapper RunnerId="Debug" /> </configuration> - <configuration selected="true" default="false" name="client" type="Remote" factoryName="Remote"> + <configuration default="false" name="client" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="SERVER_MODE" value="false" /> <option name="SHMEM_ADDRESS" value="javadebug" /> @@ -970,6 +624,7 @@ <ConfigurationWrapper RunnerId="Debug" /> </configuration> </component> + <component name="ScopeViewComponent" /> <component name="SelectInManager" /> <component name="StarteamConfiguration"> <option name="SERVER" value="" /> @@ -979,6 +634,8 @@ <option name="PROJECT" value="" /> <option name="VIEW" value="" /> <option name="ALTERNATIVE_WORKING_PATH" value="" /> + <option name="LOCK_ON_CHECKOUT" value="false" /> + <option name="UNLOCK_ON_CHECKIN" value="false" /> </component> <component name="StructuralSearchPlugin" /> <component name="StructureViewFactory"> @@ -986,6 +643,21 @@ <option name="AUTOSCROLL_FROM_SOURCE" value="false" /> <option name="ACTIVE_ACTIONS" value="SHOW_INTERFACES,ALPHA_COMPARATOR,SHOW_FIELDS" /> </component> + <component name="Struts Assistant"> + <option name="showInputs" value="true" /> + <option name="resources"> + <value> + <option name="strutsPath" /> + <option name="strutsHelp" /> + </value> + </option> + <option name="selectedTaglibs" /> + <option name="selectedTaglibs" /> + <option name="myStrutsValidationEnabled" value="true" /> + <option name="myTilesValidationEnabled" value="true" /> + <option name="myValidatorValidationEnabled" value="true" /> + <option name="myReportErrorsAsWarnings" value="true" /> + </component> <component name="SvnChangesBrowserSettings"> <option name="USE_AUTHOR_FIELD" value="true" /> <option name="AUTHOR" value="" /> @@ -997,8 +669,12 @@ <option name="USER" value="" /> <option name="PASSWORD" value="" /> <option name="PROCESS_UNRESOLVED" value="false" /> - <configuration useDefault="false">/home/hbraun/.subversion</configuration> - <checkoutURL active="true">https://svn.jboss.org/repos/jbossws</checkoutURL> + <option name="LAST_MERGED_REVISION" /> + <option name="UPDATE_RUN_STATUS" value="false" /> + <option name="UPDATE_RECURSIVELY" value="true" /> + <option name="MERGE_DRY_RUN" value="false" /> + <configuration useDefault="true">/home/hbraun/.subversion</configuration> + <checkoutURL>https://svn.jboss.org/repos/jbossws</checkoutURL> </component> <component name="TodoView" selected-index="0"> <todo-panel id="selected-file"> @@ -1015,30 +691,37 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="0" y="25" width="1680" height="1000" extended-state="1" /> + <frame x="0" y="25" width="1680" height="1000" extended-state="6" /> <editor active="true" /> <layout> - <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.38717633" order="0" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.5040092" order="1" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25215784" order="1" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> - <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="6" /> - <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.3298397" order="3" /> - <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.66323024" order="8" /> - <window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> - <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="2" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.13440198" order="2" /> - <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39862543" order="4" /> - <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" /> - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" /> - <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" /> - <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="0" /> - <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="3" /> - <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="5" /> + <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.50342464" order="1" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39862543" order="4" /> + <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295325" order="8" /> + <window_info id="simpleUML" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25585696" order="1" /> + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" /> + <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> + <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298397" order="3" /> + <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.66323024" order="8" /> + <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3220859" order="0" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13440198" order="2" /> + <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="2" /> + <window_info id="TunnelliJ 1.3" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" /> + <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" /> + <window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> + <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" /> + <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="3" /> </layout> </component> <component name="VCS.FileViewConfiguration"> @@ -1049,14 +732,16 @@ <option name="SHOW_FILE_HISTORY_AS_TREE" value="true" /> </component> <component name="VcsManagerConfiguration"> + <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" /> <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" /> + <option name="PERFORM_UPDATE_IN_BACKGROUND" value="false" /> + <option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" /> <option name="PUT_FOCUS_INTO_COMMENT" value="false" /> <option name="FORCE_NON_EMPTY_COMMENT" value="false" /> <option name="LAST_COMMIT_MESSAGE" /> <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" /> <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" /> <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> - <option name="OPTIMIZE_IMPORTS_BEFORE_FILE_COMMIT" value="false" /> <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" /> <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" /> <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" /> @@ -1085,7 +770,6 @@ <option name="RECURSIVE" value="false" /> </CheckinOptions> <AddOptions> - <option name="COMMENT" value="" /> <option name="STORE_ONLY_LATEST_VERSION" value="false" /> <option name="CHECK_OUT_IMMEDIATELY" value="false" /> <option name="FILE_TYPE" value="0" /> @@ -1098,127 +782,190 @@ <GetOptions> <option name="REPLACE_WRITABLE" value="0" /> <option name="MAKE_WRITABLE" value="false" /> + <option name="ANSWER_NEGATIVELY" value="false" /> + <option name="ANSWER_POSITIVELY" value="false" /> <option name="RECURSIVE" value="false" /> + <option name="VERSION" /> </GetOptions> + <VssConfigurableExcludedFilesTag /> </component> <component name="antWorkspaceConfiguration"> <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> <option name="FILTER_TARGETS" value="false" /> </component> + <component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="0.16666667" version="1"> + <option name="myLastEditedConfigurable" value="Local Scopes" /> + </component> + <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.16666667" version="1"> + <option name="myPlainMode" value="false" /> + <option name="myLastEditedConfigurable" value="as-ejb3" /> + </component> + <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1"> + <option name="myLastEditedConfigurable" /> + </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/ServiceMetaData.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="281" column="70" selection-start="11747" selection-end="11747" vertical-scroll-proportion="0.14782609"> + <state line="428" column="27" selection-start="12534" selection-end="12534" vertical-scroll-proportion="0.07619048"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceContextFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="43" column="4" selection-start="1294" selection-end="1705" vertical-scroll-proportion="0.55757576"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="175" column="17" selection-start="5373" selection-end="5373" vertical-scroll-proportion="0.024242423"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory"> <provider selected="true" editor-type-id="text-editor"> - <state line="63" column="0" selection-start="2289" selection-end="2289" vertical-scroll-proportion="0.8060606"> + <state line="0" column="49" selection-start="49" selection-end="49" vertical-scroll-proportion="0.0" /> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/integration/jboss40/build.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state line="76" column="70" selection-start="4241" selection-end="4241" vertical-scroll-proportion="0.6060606"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="43" column="4" selection-start="1705" selection-end="1705" vertical-scroll-proportion="0.55757576"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="81" column="10" selection-start="2762" selection-end="2984" vertical-scroll-proportion="0.2857143"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="63" column="3" selection-start="2195" selection-end="2195" vertical-scroll-proportion="0.8060606"> + <state line="33" column="17" selection-start="1315" selection-end="1315" vertical-scroll-proportion="0.2923077"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="63" column="4" selection-start="2245" selection-end="2245" vertical-scroll-proportion="0.8060606"> + <state line="40" column="20" selection-start="1423" selection-end="1423" vertical-scroll-proportion="0.38224852"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandlerFactory.java"> + <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/PublishContractDeploymentAspect.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="33" selection-start="1284" selection-end="1284" vertical-scroll-proportion="0.26190478"> + <state line="50" column="51" selection-start="1926" selection-end="1926" vertical-scroll-proportion="0.53964496"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory"> + <entry file="file://$PROJECT_DIR$/integration/native/src/main/java/org/jboss/wsf/stack/jbws/WSDLFilePublisher.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="60" selection-start="60" selection-end="60" vertical-scroll-proportion="0.0"> + <state line="74" column="10" selection-start="2749" selection-end="2749" vertical-scroll-proportion="0.15621302"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceContextFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/JAXWSDeployerHookEJB3.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="31" column="41" selection-start="1228" selection-end="1256" vertical-scroll-proportion="0.26190478"> + <state line="46" column="13" selection-start="1863" selection-end="1863" vertical-scroll-proportion="-0.6970414"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java"> + <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/ejb3/src/main/org/jboss/ejb3/EJBContainerInvocation.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="21" column="36" selection-start="1022" selection-end="1050" vertical-scroll-proportion="0.024242423"> + <state line="23" column="0" selection-start="1057" selection-end="1057" vertical-scroll-proportion="-0.6192771"> <folding> <element signature="imports" expanded="true" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory"> + <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/ejb3/src/main/org/jboss/ejb3/BeanContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="31" selection-start="31" selection-end="31" vertical-scroll-proportion="0.0"> - <folding /> + <state line="23" column="29" selection-start="1086" selection-end="1086" vertical-scroll-proportion="0.06745562"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/resources/jbossws-jboss42.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory"> + <entry file="jar://$PROJECT_DIR$/integration/spi/thirdparty/jboss-javaee.jar!/javax/ejb/EJBContext.class"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="49" selection-start="49" selection-end="49" vertical-scroll-proportion="0.0"> + <state line="5" column="17" selection-start="151" selection-end="151" vertical-scroll-proportion="0.08994083"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory"> + <entry file="file:///home/hbraun/dev/prj/jbossas/trunk/ejb3/src/main/org/jboss/ejb3/stateless/StatelessBeanContext.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="49" selection-start="49" selection-end="49" vertical-scroll-proportion="0.0"> - <folding /> + <state line="45" column="15" selection-start="1624" selection-end="1624" vertical-scroll-proportion="0.56213015"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss40/src/main/resources/jbossws-jboss40.jar/META-INF/services/org.jboss.wsf.spi.invocation.WebServiceContextFactory"> + <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="31" selection-start="31" selection-end="31" vertical-scroll-proportion="0.0"> + <state line="127" column="33" selection-start="4801" selection-end="4801" vertical-scroll-proportion="0.33614457"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss50/src/main/resources/jbossws-jboss50.jar/META-INF/services/org.jboss.wsf.spi.invocation.InvocationHandlerFactory"> - <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="49" selection-start="49" selection-end="49" vertical-scroll-proportion="0.0"> - <folding /> - </state> - </provider> - </entry> </component> + <component name="simpleUML.DiagramSettingsWorkspace" /> + <component name="simpleUML.UMLToolWindowPlugin"> + <General> + <option name="birdViewUpdateDelay" value="2000" /> + <option name="defaultFileLocation" value="file://$PROJECT_DIR$" /> + </General> + <Classdiagram> + <option name="diagramTitleFont" value="SansSerif,1,12" /> + <option name="diagramFont" value="SansSerif,0,10" /> + <option name="defaultFieldsExpanded" value="false" /> + <option name="defaultContructorsExpanded" value="false" /> + <option name="defaultMethodsExpanded" value="false" /> + <option name="showParameters" value="true" /> + <option name="showTooltip" value="true" /> + <option name="showReturnValues" value="true" /> + <option name="longModifier" value="true" /> + <option name="implementsBehaviour" value="1" /> + <option name="extendsBehaviour" value="1" /> + <option name="compartmentBehaviour" value="1" /> + <option name="interfaceBackgroundColor" value="-6494306" /> + <option name="abstractClassBackgroundColor" value="-1580132" /> + <option name="classBackgroundColor" value="-6508057" /> + <option name="diagramBackgroundColor" value="-1" /> + <option name="useAntialiasedConnectors" value="true" /> + <option name="quickSourceLinkColor" value="-16776961" /> + <option name="quickDiagramLinkColor" value="-8454144" /> + <option name="drawDecorations" value="false" /> + <option name="hideFieldList" value="" /> + <option name="showFieldList" value="" /> + <option name="hideConstructorList" value="" /> + <option name="showConstructorList" value="" /> + <option name="hideMethodList" value="" /> + <option name="showMethodList" value="" /> + <option name="minimumFigureSize" value="0,0" /> + </Classdiagram> + <Dependencydiagram> + <option name="diagramTitleFont" value="SansSerif,1,12" /> + <option name="diagramFont" value="SansSerif,0,10" /> + <option name="diagramBackgroundColor" value="-1" /> + <option name="useAntialiasedConnectors" value="true" /> + <option name="packageNameCompressionLevel" value="0" /> + </Dependencydiagram> + <Packagediagram> + <option name="diagramTitleFont" value="SansSerif,0,12" /> + <option name="diagramFont" value="SansSerif,0,10" /> + <option name="packageBackgroundColor" value="-4144960" /> + <option name="diagramBackgroundColor" value="-1" /> + <option name="useAntialiasedConnectors" value="true" /> + <option name="packageNameCompressionLevel" value="2" /> + </Packagediagram> + </component> </project> Modified: trunk/build/build.iml =================================================================== --- trunk/build/build.iml 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/build/build.iml 2007-07-26 15:42:09 UTC (rev 4004) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <module version="4" relativePaths="true" type="JAVA_MODULE"> <component name="ModuleRootManager" /> - <component name="NewModuleRootManager"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/output/classes" /> <exclude-output /> <content url="file://$MODULE_DIR$" /> Modified: trunk/integration/jboss40/int-40.iml =================================================================== --- trunk/integration/jboss40/int-40.iml 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/integration/jboss40/int-40.iml 2007-07-26 15:42:09 UTC (rev 4004) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <module version="4" relativePaths="true" type="JAVA_MODULE"> <component name="ModuleRootManager" /> - <component name="NewModuleRootManager"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> @@ -25,6 +25,7 @@ <orderEntry type="library" name="jboss-logging-spi" level="project" /> <orderEntry type="library" name="jboss-system" level="project" /> <orderEntry type="library" name="jboss-system-jmx" level="project" /> + <orderEntry type="library" name="jaxws-api" level="application" /> <orderEntryProperties /> </component> </module> Modified: trunk/integration/jboss42/int-42.iml =================================================================== --- trunk/integration/jboss42/int-42.iml 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/integration/jboss42/int-42.iml 2007-07-26 15:42:09 UTC (rev 4004) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <module version="4" relativePaths="true" type="JAVA_MODULE"> <component name="ModuleRootManager" /> - <component name="NewModuleRootManager"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> @@ -33,6 +33,7 @@ <orderEntry type="library" name="jboss-jmx" level="project" /> <orderEntry type="library" name="jboss-system-jmx" level="project" /> <orderEntry type="module" module-name="jbossws-core" /> + <orderEntry type="library" name="jaxws-api" level="application" /> <orderEntryProperties /> </component> </module> Modified: trunk/integration/jboss50/int-50.iml =================================================================== --- trunk/integration/jboss50/int-50.iml 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/integration/jboss50/int-50.iml 2007-07-26 15:42:09 UTC (rev 4004) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <module version="4" relativePaths="true" type="JAVA_MODULE"> <component name="ModuleRootManager" /> - <component name="NewModuleRootManager"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/output/classes" /> <exclude-output /> <content url="file://$MODULE_DIR$"> @@ -10,498 +10,23 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="spi" /> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-microcontainer.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/wsdl4j-src.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jaxb-impl.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jbosssx-client.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-common-core.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/getopt.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jbosssx.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-remoting-src.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/ant.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-remoting.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-common-core-sources.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/mail.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/resolver.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/stax-api.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-microcontainer-src.zip!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/xml-apis.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/log4j.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/dom4j.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/serializer.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/xmlunit.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-xml-binding.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/streambuffer.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/xalan.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jaxws-tools.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/wsdl4j.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jaxb-xjc.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/servlet-api.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/qdox.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/xercesImpl.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-vfs.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jaxws-rt.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/xmlsec.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-logging-log4j.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-xml-binding-sources.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/wstx.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/javassist.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/commons-collections.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jbosssx-src.zip!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/activation.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-vfs-sources.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/stax-ex.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jaxen.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jaxb-api.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-logging-spi.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-dependency.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-dependency-src.zip!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/ejb3.deployer.zip!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/commons-logging.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-container.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/policy.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/hibernate3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/concurrent.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-j2ee.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> <orderEntry type="module" module-name="as-server" /> <orderEntry type="module" module-name="as-system" /> <orderEntry type="module" module-name="as-tomcat" /> <orderEntry type="module" module-name="as-ejb3" /> + <orderEntry type="library" name="jaxws-api" level="application" /> + <orderEntry type="library" name="jboss-javaee" level="application" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/../spi/thirdparty/jaxws-api.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-aop-jdk50.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="library" name="jboss-system" level="project" /> - <orderEntry type="library" name="jboss-logging-spi" level="project" /> + <orderEntry type="library" name="jboss-aop-jdk50" level="application" /> + <orderEntry type="library" name="jboss-jaxrpc" level="application" /> <orderEntryProperties /> </component> </module> Modified: trunk/integration/native/int-native.iml =================================================================== --- trunk/integration/native/int-native.iml 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/integration/native/int-native.iml 2007-07-26 15:42:09 UTC (rev 4004) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <module version="4" relativePaths="true" type="JAVA_MODULE"> <component name="ModuleRootManager" /> - <component name="NewModuleRootManager"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/output/classes" /> <exclude-output /> <content url="file://$MODULE_DIR$"> Modified: trunk/integration/spi/spi.iml =================================================================== --- trunk/integration/spi/spi.iml 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/integration/spi/spi.iml 2007-07-26 15:42:09 UTC (rev 4004) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <module version="4" relativePaths="true" type="JAVA_MODULE"> <component name="ModuleRootManager" /> - <component name="NewModuleRootManager"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/classes" /> <exclude-output /> <content url="file://$MODULE_DIR$"> Modified: trunk/integration/sunri/int-sunri.iml =================================================================== --- trunk/integration/sunri/int-sunri.iml 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/integration/sunri/int-sunri.iml 2007-07-26 15:42:09 UTC (rev 4004) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <module version="4" relativePaths="true" type="JAVA_MODULE"> <component name="ModuleRootManager" /> - <component name="NewModuleRootManager"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> Modified: trunk/integration/xfire/int-xfire.iml =================================================================== --- trunk/integration/xfire/int-xfire.iml 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/integration/xfire/int-xfire.iml 2007-07-26 15:42:09 UTC (rev 4004) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <module version="4" relativePaths="true" type="JAVA_MODULE"> <component name="ModuleRootManager" /> - <component name="NewModuleRootManager"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> Modified: trunk/jbossws-core/jbossws-core.iml =================================================================== --- trunk/jbossws-core/jbossws-core.iml 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/jbossws-core/jbossws-core.iml 2007-07-26 15:42:09 UTC (rev 4004) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <module version="4" relativePaths="true" type="JAVA_MODULE"> <component name="ModuleRootManager" /> - <component name="NewModuleRootManager"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/output/classes" /> <exclude-output /> <content url="file://$MODULE_DIR$"> Modified: trunk/testsuite/testsuite.iml =================================================================== --- trunk/testsuite/testsuite.iml 2007-07-26 15:33:02 UTC (rev 4003) +++ trunk/testsuite/testsuite.iml 2007-07-26 15:42:09 UTC (rev 4004) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <module version="4" relativePaths="true" type="JAVA_MODULE"> <component name="ModuleRootManager" /> - <component name="NewModuleRootManager"> + <component name="NewModuleRootManager" inherit-compiler-output="false"> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />

17 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits July 2007