Author: thomas.diesler(a)jboss.com Date: 2007-05-25 11:27:43 -0400 (Fri, 25 May 2007) New Revision: 3258 Added: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri50/ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri50/ModifyWebMetaDataDeployer.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire50/ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire50/ModifyWebMetaDataDeployer.java Removed: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ModifyWebMetaDataDeployer.java trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/VirtualFileResourceLoader.java trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java Modified: trunk/integration/sunri/.classpath trunk/integration/sunri/ant-import/build-thirdparty.xml trunk/integration/sunri/build.xml trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml trunk/integration/xfire/.classpath trunk/integration/xfire/ant-import/build-thirdparty.xml trunk/integration/xfire/build.xml trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml Log: Resolve dependency on jboss50 Modified: trunk/integration/sunri/.classpath =================================================================== --- trunk/integration/sunri/.classpath 2007-05-25 15:25:08 UTC (rev 3257) +++ trunk/integration/sunri/.classpath 2007-05-25 15:27:43 UTC (rev 3258) @@ -23,5 +23,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/integration-spi"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-common-core.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss50"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/integration/sunri/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-05-25 15:25:08 UTC (rev 3257) +++ trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-05-25 15:27:43 UTC (rev 3258) @@ -70,28 +70,12 @@ <target name="thirdparty-classpath" depends="thirdparty-init"> <!-- The compile classpath for jboss50 integration --> - <path id="sunri50.integration.classpath"> + <path id="sunri.integration.classpath"> <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> - <pathelement location="${jboss50.lib}/dom4j.jar"/> - <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss50.lib}/jboss-common-core.jar"/> - <pathelement location="${jboss50.lib}/jboss-dependency.jar"/> - <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> - <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> - <pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/> - <pathelement location="${jboss50.lib}/jboss-microcontainer.jar"/> - <pathelement location="${jboss50.lib}/jboss-system.jar"/> - <pathelement location="${jboss50.lib}/jboss-system-jmx.jar"/> - <pathelement location="${jboss50.lib}/jboss-vfs.jar"/> - <pathelement location="${jboss50.lib}/jboss-xml-binding.jar"/> - <pathelement location="${jboss50.server.lib}/jboss.jar"/> - <pathelement location="${jboss50.server.lib}/jboss-javaee.jar"/> - <pathelement location="${jboss50.server.lib}/jboss-security-spi.jar"/> - <pathelement location="${jboss50.server.lib}/jnpserver.jar"/> - <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3x.jar"/> + <pathelement location="${spi.dir}/thirdparty/dom4j.jar"/> + <pathelement location="${spi.dir}/thirdparty/jboss-common-core.jar"/> + <pathelement location="${spi.dir}/thirdparty/jboss-logging-spi.jar"/> + <pathelement location="${spi.dir}/thirdparty/jboss-javaee.jar"/> <pathelement location="${thirdparty.dir}/http.jar"/> <pathelement location="${thirdparty.dir}/jaxb-api.jar"/> <pathelement location="${thirdparty.dir}/jaxb-impl.jar"/> @@ -102,6 +86,13 @@ <pathelement location="${thirdparty.dir}/servlet-api.jar"/> </path> + <!-- The compile classpath for jboss50 integration --> + <path id="sunri50.integration.classpath"> + <path refid="sunri.integration.classpath"/> + <pathelement location="${int.jboss50.dir}/output/lib/jbossws-jboss50.jar"/> + <pathelement location="${jboss50.server.lib}/jboss.jar"/> + </path> + </target> </project> Modified: trunk/integration/sunri/build.xml =================================================================== --- trunk/integration/sunri/build.xml 2007-05-25 15:25:08 UTC (rev 3257) +++ trunk/integration/sunri/build.xml 2007-05-25 15:27:43 UTC (rev 3258) @@ -58,11 +58,21 @@ <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/> <!-- Compile java sources --> - <target name="compile-classes" depends="init"> + <target name="compile-classes" depends="compile-classes-sunri,compile-classes-sunri50"/> + <target name="compile-classes-sunri" depends="init"> <mkdir dir="${sunri.output.classes.dir}"/> <javac srcdir="${sunri.java.dir}" sourcepath="" destdir="${sunri.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/wsf/stack/sunri/**"/> + <classpath refid="sunri.integration.classpath"/> + </javac> + </target> + <target name="compile-classes-sunri50" depends="init" if="jboss50.home"> + <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> + <mkdir dir="${sunri.output.classes.dir}"/> + <javac srcdir="${sunri.java.dir}" sourcepath="" destdir="${sunri.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + <include name="org/jboss/wsf/stack/sunri50/**"/> <classpath refid="sunri50.integration.classpath"/> </javac> </target> @@ -95,7 +105,7 @@ <!-- | Build all jar files. --> - <target name="jars" depends="compile,jars-jboss50,jars-jboss42" description="Builds all jar files."> + <target name="jars" depends="compile,jars-jboss42,jars-jboss50" description="Builds all jar files."> </target> <target name="jars-common" depends="compile"> @@ -104,6 +114,7 @@ <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}"> + <include name="org/jboss/wsf/stack/sunri50/**"/> <include name="org/jboss/wsf/stack/sunri/**"/> </fileset> </jar> @@ -127,8 +138,6 @@ <target name="jars-jboss50" depends="jars-common" if="jboss50.home"> - <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> - <!-- Build jbossws-sunri50.sar --> <jar jarfile="${sunri.output.lib.dir}/jbossws-sunri50.sar" manifest="${sunri.output.etc.dir}/default.mf"> <!-- [JBAS-4379] MC beans deployed twice because of jacc service Deleted: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ModifyWebMetaDataDeployer.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ModifyWebMetaDataDeployer.java 2007-05-25 15:25:08 UTC (rev 3257) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ModifyWebMetaDataDeployer.java 2007-05-25 15:27:43 UTC (rev 3258) @@ -1,137 +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.stack.sunri; - -//$Id$ - -import org.jboss.metadata.Listener; -import org.jboss.metadata.WebMetaData; -import org.jboss.metadata.web.ParamValue; -import org.jboss.metadata.web.Servlet; -import org.jboss.metadata.web.ParamValue.ParamType; -import org.jboss.wsf.spi.deployment.AbstractDeployer; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.stack.sunri.metadata.sunjaxws.DDEndpoints; - -/** - * A deployer that modifies the web.xml meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class ModifyWebMetaDataDeployer extends AbstractDeployer -{ - private String listenerClass; - private String servletClass; - - public String getListenerClass() - { - return listenerClass; - } - - public void setListenerClass(String listenerClass) - { - this.listenerClass = listenerClass; - } - - public String getServletClass() - { - return servletClass; - } - - public void setServletClass(String servletClass) - { - this.servletClass = servletClass; - } - - @Override - public void create(Deployment dep) - { - WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); - if (webMetaData != null) - { - Listener listener = new Listener(); - listener.setListenerClass(listenerClass); - webMetaData.addListener(listener); - - DDEndpoints ddSunJaxws = dep.getContext().getAttachment(DDEndpoints.class); - if (ddSunJaxws == null) - throw new IllegalStateException("Cannot obtain sun-jaxws meta data"); - - // Add the path to sun-jaxws.xml - ParamValue ctxParam = new ParamValue(); - ctxParam.setType(ParamType.CONTEXT_PARAM); - ctxParam.setName(WSServletContextListenerJBWS.PARAM_SUN_JAXWS_URL); - ctxParam.setValue(ddSunJaxws.createFileURL().toExternalForm()); - webMetaData.addContextParam(ctxParam); - - for (Servlet servlet : webMetaData.getServlets()) - { - String orgServletClass = servlet.getServletClass(); - - // JSP - if (orgServletClass == null || orgServletClass.length() == 0) - { - log.debug("Innore servlet class: " + orgServletClass); - continue; - } - - if (!isJavaxServlet(orgServletClass, dep.getClassLoader())) - { - servlet.setServletClass(servletClass); - } - } - } - } - - @Override - public void destroy(Deployment dep) - { - DDEndpoints ddSunJaxws = dep.getContext().getAttachment(DDEndpoints.class); - if (ddSunJaxws != null) - { - ddSunJaxws.destroyFileURL(); - } - } - - private boolean isJavaxServlet(String orgServletClass, ClassLoader loader) - { - boolean isServlet = false; - if (loader != null) - { - try - { - Class servletClass = loader.loadClass(orgServletClass); - isServlet = javax.servlet.Servlet.class.isAssignableFrom(servletClass); - if (isServlet == true) - { - log.info("Ignore servlet: " + orgServletClass); - } - } - catch (ClassNotFoundException e) - { - log.warn("Cannot load servlet class: " + orgServletClass); - } - } - return isServlet; - } -} \ No newline at end of file Deleted: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/VirtualFileResourceLoader.java =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/VirtualFileResourceLoader.java 2007-05-25 15:25:08 UTC (rev 3257) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/VirtualFileResourceLoader.java 2007-05-25 15:27:43 UTC (rev 3258) @@ -1,94 +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.stack.sunri; - -//$Id$ - -import java.net.MalformedURLException; -import java.net.URL; -import java.util.HashSet; -import java.util.Set; - -import org.jboss.virtual.VirtualFile; - -import com.sun.xml.ws.transport.http.ResourceLoader; - -/** - * A ResourceLoader that delegates to the VFS - * - * @author Thomas.Diesler(a)jboss.org - * @since 25-Apr-2007 - */ -public class VirtualFileResourceLoader implements ResourceLoader -{ - private final VirtualFile vfRoot; - - public VirtualFileResourceLoader(VirtualFile vfRoot) - { - this.vfRoot = vfRoot; - } - - public URL getResource(String path) throws MalformedURLException - { - if (path.startsWith("/")) - path = path.substring(1); - - URL resURL = null; - try - { - VirtualFile vfChild = vfRoot.findChild(path); - resURL = vfChild.toURL(); - } - catch (Exception ex) - { - // ignore - } - return resURL; - } - - public URL getCatalogFile() throws MalformedURLException - { - return getResource("/WEB-INF/jax-ws-catalog.xml"); - } - - public Set<String> getResourcePaths(String path) - { - if (path.startsWith("/")) - path = path.substring(1); - - Set<String> paths = new HashSet<String>(); - try - { - VirtualFile vfChild = vfRoot.findChild(path); - for (VirtualFile vf : vfChild.getChildren()) - { - String name = vf.getName(); - paths.add(name); - } - } - catch (Exception ex) - { - // ignore - } - return paths; - } -} Copied: trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri50/ModifyWebMetaDataDeployer.java (from rev 3245, trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/ModifyWebMetaDataDeployer.java) =================================================================== --- trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri50/ModifyWebMetaDataDeployer.java (rev 0) +++ trunk/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri50/ModifyWebMetaDataDeployer.java 2007-05-25 15:27:43 UTC (rev 3258) @@ -0,0 +1,90 @@ +/* + * 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.sunri50; + +//$Id$ + +import org.jboss.metadata.Listener; +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.web.ParamValue; +import org.jboss.metadata.web.ParamValue.ParamType; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.stack.sunri.WSServletContextListenerJBWS; +import org.jboss.wsf.stack.sunri.metadata.sunjaxws.DDEndpoints; + +/** + * A deployer that modifies the web.xml meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 25-Apr-2007 + */ +public class ModifyWebMetaDataDeployer extends org.jboss.wsf.container.jboss50.ModifyWebMetaDataDeployer +{ + private String listenerClass; + + public String getListenerClass() + { + return listenerClass; + } + + public void setListenerClass(String listenerClass) + { + this.listenerClass = listenerClass; + } + + @Override + public void create(Deployment dep) + { + super.create(dep); + + WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); + if (webMetaData != null) + { + Listener listener = new Listener(); + listener.setListenerClass(listenerClass); + webMetaData.addListener(listener); + + DDEndpoints ddSunJaxws = dep.getContext().getAttachment(DDEndpoints.class); + if (ddSunJaxws == null) + throw new IllegalStateException("Cannot obtain sun-jaxws meta data"); + + // Add the path to sun-jaxws.xml + ParamValue ctxParam = new ParamValue(); + ctxParam.setType(ParamType.CONTEXT_PARAM); + ctxParam.setName(WSServletContextListenerJBWS.PARAM_SUN_JAXWS_URL); + ctxParam.setValue(ddSunJaxws.createFileURL().toExternalForm()); + webMetaData.addContextParam(ctxParam); + } + } + + @Override + public void destroy(Deployment dep) + { + super.destroy(dep); + + DDEndpoints ddSunJaxws = dep.getContext().getAttachment(DDEndpoints.class); + if (ddSunJaxws != null) + { + ddSunJaxws.destroyFileURL(); + } + } +} \ No newline at end of file Modified: trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml =================================================================== --- trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml 2007-05-25 15:25:08 UTC (rev 3257) +++ trunk/integration/sunri/src/main/resources/jbossws-sunri50.sar/META-INF/jbossws-beans.xml 2007-05-25 15:27:43 UTC (rev 3258) @@ -137,7 +137,7 @@ <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/> <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/> - <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.stack.sunri.ModifyWebMetaDataDeployer"> + <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.stack.sunri50.ModifyWebMetaDataDeployer"> <property name="listenerClass"><inject bean="WSWebAppDesciptorModifier" property="listenerClass"/></property> <property name="servletClass"><inject bean="WSWebAppDesciptorModifier" property="servletClass"/></property> </bean> Modified: trunk/integration/xfire/.classpath =================================================================== --- trunk/integration/xfire/.classpath 2007-05-25 15:25:08 UTC (rev 3257) +++ trunk/integration/xfire/.classpath 2007-05-25 15:27:43 UTC (rev 3258) @@ -2,7 +2,6 @@ <classpath> <classpathentry kind="src" path="src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/> <classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/> <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/> @@ -14,5 +13,9 @@ <classpathentry kind="lib" path="thirdparty/xfire-jsr181-api.jar"/> <classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-common-core.jar"/> <classpathentry kind="lib" path="thirdparty/spring.jar"/> + <classpathentry kind="lib" path="thirdparty/xbean.jar"/> + <classpathentry kind="lib" path="thirdparty/xbean-spring.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss50"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/integration/xfire/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-05-25 15:25:08 UTC (rev 3257) +++ trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-05-25 15:27:43 UTC (rev 3258) @@ -68,28 +68,11 @@ <target name="thirdparty-classpath" depends="thirdparty-init"> <!-- The compile classpath for jboss50 integration --> - <path id="xfire50.integration.classpath"> + <path id="xfire.integration.classpath"> <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> - <pathelement location="${jboss50.lib}/dom4j.jar"/> - <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss50.lib}/jboss-common-core.jar"/> - <pathelement location="${jboss50.lib}/jboss-dependency.jar"/> - <pathelement location="${jboss50.lib}/jboss-deployers.jar"/> - <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> - <pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/> - <pathelement location="${jboss50.lib}/jboss-microcontainer.jar"/> - <pathelement location="${jboss50.lib}/jboss-system.jar"/> - <pathelement location="${jboss50.lib}/jboss-system-jmx.jar"/> - <pathelement location="${jboss50.lib}/jboss-vfs.jar"/> - <pathelement location="${jboss50.lib}/jboss-xml-binding.jar"/> - <pathelement location="${jboss50.server.lib}/jboss.jar"/> - <pathelement location="${jboss50.server.lib}/jboss-javaee.jar"/> - <pathelement location="${jboss50.server.lib}/jboss-security-spi.jar"/> - <pathelement location="${jboss50.server.lib}/jnpserver.jar"/> - <pathelement location="${jboss50.server.deployers}/jboss-aop-jboss5.deployer/jboss-aspect-library-jdk50.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3x.jar"/> + <pathelement location="${spi.dir}/thirdparty/dom4j.jar"/> + <pathelement location="${spi.dir}/thirdparty/jboss-common-core.jar"/> + <pathelement location="${spi.dir}/thirdparty/jboss-logging-spi.jar"/> <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> <pathelement location="${thirdparty.dir}/servlet-api.jar"/> <pathelement location="${thirdparty.dir}/spring.jar"/> @@ -97,6 +80,12 @@ <pathelement location="${thirdparty.dir}/xfire-jsr181-api.jar"/> </path> + <path id="xfire50.integration.classpath"> + <path refid="xfire.integration.classpath"/> + <pathelement location="${int.jboss50.dir}/output/lib/jbossws-jboss50.jar"/> + <pathelement location="${jboss50.server.lib}/jboss.jar"/> + </path> + </target> </project> Modified: trunk/integration/xfire/build.xml =================================================================== --- trunk/integration/xfire/build.xml 2007-05-25 15:25:08 UTC (rev 3257) +++ trunk/integration/xfire/build.xml 2007-05-25 15:27:43 UTC (rev 3258) @@ -58,11 +58,21 @@ <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/> <!-- Compile java sources --> - <target name="compile-classes" depends="init"> + <target name="compile-classes" depends="compile-classes-xfire,compile-classes-xfire50"/> + <target name="compile-classes-xfire" depends="init"> <mkdir dir="${xfire.output.classes.dir}"/> <javac srcdir="${xfire.java.dir}" sourcepath="" destdir="${xfire.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/wsf/stack/xfire/**"/> + <classpath refid="xfire.integration.classpath"/> + </javac> + </target> + <target name="compile-classes-xfire50" depends="init" if="jboss50.home"> + <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> + <mkdir dir="${xfire.output.classes.dir}"/> + <javac srcdir="${xfire.java.dir}" sourcepath="" destdir="${xfire.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + <include name="org/jboss/wsf/stack/xfire50/**"/> <classpath refid="xfire50.integration.classpath"/> </javac> </target> @@ -95,7 +105,7 @@ <!-- | Build all jar files. --> - <target name="jars" depends="compile,jars-jboss50,jars-jboss42" description="Builds all jar files."> + <target name="jars" depends="compile,jars-jboss42,jars-jboss50" description="Builds all jar files."> </target> <target name="jars-common" depends="compile"> @@ -104,6 +114,7 @@ <mkdir dir="${xfire.output.lib.dir}"/> <jar jarfile="${xfire.output.lib.dir}/jbossws-xfire.jar" manifest="${xfire.output.etc.dir}/default.mf"> <fileset dir="${xfire.output.classes.dir}"> + <include name="org/jboss/wsf/stack/xfire50/**"/> <include name="org/jboss/wsf/stack/xfire/**"/> </fileset> </jar> Deleted: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java 2007-05-25 15:25:08 UTC (rev 3257) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire/ModifyWebMetaDataDeployer.java 2007-05-25 15:27:43 UTC (rev 3258) @@ -1,121 +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.stack.xfire; - -//$Id$ - -import org.jboss.metadata.WebMetaData; -import org.jboss.metadata.web.ParamValue; -import org.jboss.metadata.web.Servlet; -import org.jboss.metadata.web.ParamValue.ParamType; -import org.jboss.wsf.spi.deployment.AbstractDeployer; -import org.jboss.wsf.spi.deployment.Deployment; -import org.jboss.wsf.stack.xfire.metadata.services.DDBeans; - -/** - * A deployer that modifies the web.xml meta data - * - * @author Thomas.Diesler(a)jboss.org - * @since 21-Mai-2007 - */ -public class ModifyWebMetaDataDeployer extends AbstractDeployer -{ - private String servletClass; - - public String getServletClass() - { - return servletClass; - } - - public void setServletClass(String servletClass) - { - this.servletClass = servletClass; - } - - @Override - public void create(Deployment dep) - { - WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); - if (webMetaData != null) - { - DDBeans ddbeans = dep.getContext().getAttachment(DDBeans.class); - if (ddbeans == null) - throw new IllegalStateException("Cannot obtain services.xml meta data"); - - // Add the path to sun-jaxws.xml - ParamValue ctxParam = new ParamValue(); - ctxParam.setType(ParamType.CONTEXT_PARAM); - ctxParam.setName(XFireConfigurableServletExt.PARAM_XFIRE_SERVICES_URL); - ctxParam.setValue(ddbeans.createFileURL().toExternalForm()); - webMetaData.addContextParam(ctxParam); - - for (Servlet servlet : webMetaData.getServlets()) - { - String orgServletClass = servlet.getServletClass(); - - // JSP - if (orgServletClass == null || orgServletClass.length() == 0) - { - log.debug("Innore servlet class: " + orgServletClass); - continue; - } - - if (!isJavaxServlet(orgServletClass, dep.getClassLoader())) - { - servlet.setServletClass(servletClass); - } - } - } - } - - @Override - public void destroy(Deployment dep) - { - DDBeans ddbeans = dep.getContext().getAttachment(DDBeans.class); - if (ddbeans != null) - { - ddbeans.destroyFileURL(); - } - } - - private boolean isJavaxServlet(String orgServletClass, ClassLoader loader) - { - boolean isServlet = false; - if (loader != null) - { - try - { - Class servletClass = loader.loadClass(orgServletClass); - isServlet = javax.servlet.Servlet.class.isAssignableFrom(servletClass); - if (isServlet == true) - { - log.info("Ignore servlet: " + orgServletClass); - } - } - catch (ClassNotFoundException e) - { - log.warn("Cannot load servlet class: " + orgServletClass); - } - } - return isServlet; - } -} \ No newline at end of file Added: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire50/ModifyWebMetaDataDeployer.java =================================================================== --- trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire50/ModifyWebMetaDataDeployer.java (rev 0) +++ trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire50/ModifyWebMetaDataDeployer.java 2007-05-25 15:27:43 UTC (rev 3258) @@ -0,0 +1,85 @@ +/* + * 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.xfire50; + +//$Id$ + +import org.jboss.metadata.WebMetaData; +import org.jboss.metadata.web.ParamValue; +import org.jboss.metadata.web.ParamValue.ParamType; +import org.jboss.wsf.spi.deployment.Deployment; +import org.jboss.wsf.stack.xfire.XFireConfigurableServletExt; +import org.jboss.wsf.stack.xfire.metadata.services.DDBeans; + +/** + * A deployer that modifies the web.xml meta data + * + * @author Thomas.Diesler(a)jboss.org + * @since 21-Mai-2007 + */ +public class ModifyWebMetaDataDeployer extends org.jboss.wsf.container.jboss50.ModifyWebMetaDataDeployer +{ + private String servletClass; + + public String getServletClass() + { + return servletClass; + } + + public void setServletClass(String servletClass) + { + this.servletClass = servletClass; + } + + @Override + public void create(Deployment dep) + { + super.create(dep); + + WebMetaData webMetaData = dep.getContext().getAttachment(WebMetaData.class); + if (webMetaData != null) + { + DDBeans ddbeans = dep.getContext().getAttachment(DDBeans.class); + if (ddbeans == null) + throw new IllegalStateException("Cannot obtain services.xml meta data"); + + // Add the path to sun-jaxws.xml + ParamValue ctxParam = new ParamValue(); + ctxParam.setType(ParamType.CONTEXT_PARAM); + ctxParam.setName(XFireConfigurableServletExt.PARAM_XFIRE_SERVICES_URL); + ctxParam.setValue(ddbeans.createFileURL().toExternalForm()); + webMetaData.addContextParam(ctxParam); + } + } + + @Override + public void destroy(Deployment dep) + { + super.destroy(dep); + + DDBeans ddbeans = dep.getContext().getAttachment(DDBeans.class); + if (ddbeans != null) + { + ddbeans.destroyFileURL(); + } + } +} \ No newline at end of file Property changes on: trunk/integration/xfire/src/main/java/org/jboss/wsf/stack/xfire50/ModifyWebMetaDataDeployer.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml =================================================================== --- trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml 2007-05-25 15:25:08 UTC (rev 3257) +++ trunk/integration/xfire/src/main/resources/jbossws-xfire50.sar/META-INF/jbossws-beans.xml 2007-05-25 15:27:43 UTC (rev 3258) @@ -137,7 +137,7 @@ <bean name="WSEndpointLifecycleDeployer" class="org.jboss.wsf.spi.deployment.EndpointLifecycleDeployer"/> <bean name="WSEndpointNameDeployer" class="org.jboss.wsf.spi.deployment.EndpointNameDeployer"/> <bean name="WSEndpointRegistryDeployer" class="org.jboss.wsf.spi.deployment.EndpointRegistryDeployer"/> - <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.stack.xfire.ModifyWebMetaDataDeployer"> + <bean name="WSModifyWebMetaDataDeployer" class="org.jboss.wsf.stack.xfire50.ModifyWebMetaDataDeployer"> <property name="servletClass"><inject bean="WSWebAppDesciptorModifier" property="servletClass"/></property> </bean> <bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss50.UnifiedDeploymentInfoDeployer"/>