[jbossws-commits] JBossWS SVN: r3857 - in branches/hbraun/trunk/integration/sunri: src/main/java/org/jboss/wsf/stack/sunri and 3 other directories.

Author: heiko.braun(a)jboss.com Date: 2007-07-12 10:24:20 -0400 (Thu, 12 Jul 2007) New Revision: 3857 Added: branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/client/ branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/client/DummyServiceRefBinderJAXRPC.java branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/client/ServiceRefBinderJAXWS.java Modified: branches/hbraun/trunk/integration/sunri/build.xml branches/hbraun/trunk/integration/sunri/src/main/resources/jbossws-sunri50.deployer/META-INF/jbossws-deployer-beans.xml branches/hbraun/trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml Log: Register Sun-RI ServiceRefBinder with MC. Base for further tests Modified: branches/hbraun/trunk/integration/sunri/build.xml =================================================================== --- branches/hbraun/trunk/integration/sunri/build.xml 2007-07-12 14:02:02 UTC (rev 3856) +++ branches/hbraun/trunk/integration/sunri/build.xml 2007-07-12 14:24:20 UTC (rev 3857) @@ -112,15 +112,16 @@ <target name="jars-common" depends="compile"> <!-- Build jbossws-sunri.jar --> - <mkdir dir="${sunri.output.lib.dir}"/> + <mkdir dir="${sunri.output.lib.dir}"/> <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri.jar" manifest="${sunri.output.etc.dir}/default.mf"> <fileset dir="${sunri.output.classes.dir}"> - <exclude name="org/jboss/wsf/stack/sunri/sunri/tools/**"/> - <include name="org/jboss/wsf/stack/sunri50/**"/> + <exclude name="org/jboss/wsf/stack/sunri/sunri/tools/**"/> + <include name="org/jboss/wsf/stack/sunri50/**"/> <include name="org/jboss/wsf/stack/sunri/injection/**"/> - <include name="org/jboss/wsf/stack/sunri/metadata/**"/> - <include name="org/jboss/wsf/stack/sunri/log/**"/> - <include name="org/jboss/wsf/stack/sunri/*"/> + <include name="org/jboss/wsf/stack/sunri/client/**"/> + <include name="org/jboss/wsf/stack/sunri/metadata/**"/> + <include name="org/jboss/wsf/stack/sunri/log/**"/> + <include name="org/jboss/wsf/stack/sunri/*"/> </fileset> </jar> Added: branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/client/DummyServiceRefBinderJAXRPC.java =================================================================== --- branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/client/DummyServiceRefBinderJAXRPC.java (rev 0) +++ branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/client/DummyServiceRefBinderJAXRPC.java 2007-07-12 14:24:20 UTC (rev 3857) @@ -0,0 +1,41 @@ +/* + * 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.stack.sunri.client; + +import org.jboss.wsf.spi.deployment.serviceref.ServiceRefBinder; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; + +import javax.naming.Context; +import javax.naming.NamingException; +import java.lang.reflect.AnnotatedElement; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 12, 2007 + */ +public class DummyServiceRefBinderJAXRPC implements ServiceRefBinder +{ + public void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef) throws NamingException + { + throw new IllegalArgumentException("The Sun-RI stack doesnt support JAX-RPC service-ref deployments"); + } +} Property changes on: branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/client/DummyServiceRefBinderJAXRPC.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/client/ServiceRefBinderJAXWS.java =================================================================== --- branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/client/ServiceRefBinderJAXWS.java (rev 0) +++ branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/client/ServiceRefBinderJAXWS.java 2007-07-12 14:24:20 UTC (rev 3857) @@ -0,0 +1,44 @@ +/* + * 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.stack.sunri.client; + +import org.jboss.wsf.spi.deployment.serviceref.ServiceRefBinder; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; + +import javax.naming.Context; +import javax.naming.NamingException; +import java.lang.reflect.AnnotatedElement; + +/** + * @author Heiko.Braun(a)jboss.com + * Created: Jul 12, 2007 + */ +public class ServiceRefBinderJAXWS implements ServiceRefBinder +{ + public void setupServiceRef( + Context encCtx, String encName, AnnotatedElement anElement, + UnifiedServiceRefMetaData serviceRef) + throws NamingException + { + throw new IllegalArgumentException("Sun-RI service-ref handling is not yet implemented"); + } +} Property changes on: branches/hbraun/trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/client/ServiceRefBinderJAXWS.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: branches/hbraun/trunk/integration/sunri/src/main/resources/jbossws-sunri50.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- branches/hbraun/trunk/integration/sunri/src/main/resources/jbossws-sunri50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-12 14:02:02 UTC (rev 3856) +++ branches/hbraun/trunk/integration/sunri/src/main/resources/jbossws-sunri50.deployer/META-INF/jbossws-deployer-beans.xml 2007-07-12 14:24:20 UTC (rev 3857) @@ -8,16 +8,6 @@ <bean name="WebServiceDeployerEJB" class="org.jboss.wsf.container.jboss50.WebServiceDeployerEJB"> <property name="relOrderEJB2x"><inject bean="EJB2xDeployer" property="relativeOrder"/></property> <property name="relOrderEJB3"><inject bean="EJBRegistrationDeployer" property="relativeOrder"/></property> - <install bean="MainDeployer" method="addDeployer"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="MainDeployer" method="removeDeployer"> - <parameter> - <this/> - </parameter> - </uninstall> <depends>EJB2xDeployer</depends> <depends>EJBRegistrationDeployer</depends> </bean> @@ -27,16 +17,6 @@ --> <bean name="WebServiceDeployerJSE" class="org.jboss.wsf.container.jboss50.WebServiceDeployerJSE"> <property name="relOrderWar"><inject bean="WarDeployer" property="relativeOrder"/></property> - <install bean="MainDeployer" method="addDeployer"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="MainDeployer" method="removeDeployer"> - <parameter> - <this/> - </parameter> - </uninstall> <depends>WebAppParsingDeployer</depends> </bean> @@ -46,16 +26,6 @@ <bean name="WebServiceMainDeployer" class="org.jboss.wsf.container.jboss50.WebServiceMainDeployer"> <property name="relOrderJSE"><inject bean="WebServiceDeployerJSE" property="relativeOrder"/></property> <property name="relOrderEJB"><inject bean="WebServiceDeployerEJB" property="relativeOrder"/></property> - <install bean="MainDeployer" method="addDeployer"> - <parameter> - <this/> - </parameter> - </install> - <uninstall bean="MainDeployer" method="removeDeployer"> - <parameter> - <this/> - </parameter> - </uninstall> <depends>WarDeployer</depends> <depends>WebServiceDeployerEJB</depends> <depends>WebServiceDeployerJSE</depends> Modified: branches/hbraun/trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml =================================================================== --- branches/hbraun/trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml 2007-07-12 14:02:02 UTC (rev 3856) +++ branches/hbraun/trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml 2007-07-12 14:24:20 UTC (rev 3857) @@ -29,8 +29,15 @@ <bean name="WSEndpointRegistry" class="org.jboss.wsf.stack.sunri.ManagedEndpointRegistry"/> <!-- Bind Service objects in client environment context --> - <!-- The bean name is compiled into the server. Changeit with the next release. --> - <!--bean name="ServiceRefHandler" class="org.jboss.wsf.spi.deployment.serviceref.ServiceRefHandlerImpl"/--> + <bean name="WSServiceRefHandler" class="org.jboss.wsf.spi.deployment.serviceref.ServiceRefHandlerImpl"> + <property name="jaxrpcBinder"><inject bean="WSServiceRefBinderJAXRPC"/></property> + <property name="jaxwsBinder"><inject bean="WSServiceRefBinderJAXWS"/></property> + </bean> + + <bean name="WSServiceRefBinderJAXRPC" class="org.jboss.wsf.stack.sunri.client.DummyServiceRefBinderJAXRPC"/> + + <bean name="WSServiceRefBinderJAXWS" class="org.jboss.wsf.stack.sunri.client.ServiceRefBinderJAXWS"/> + <!-- Locate the single instance of the kernel --> <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator">