JBossWS SVN: r4087 - in trunk/integration: jboss42/src/main/java/org/jboss/wsf/container/jboss42 and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-02 06:14:28 -0400 (Thu, 02 Aug 2007)
New Revision: 4087
Added:
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractInvocationHandler.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandler.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandlerJAXRPC.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandlerJAXWS.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractInvocationHandler.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DefaultInvocationHandler.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DefaultInvocationHandlerJAXRPC.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DefaultInvocationHandlerJAXWS.java
Modified:
trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java
trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerFactoryImpl.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java
trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerMDB21.java
trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java
Log:
Remove SPI dependency on JavaUtils
Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java
===================================================================
--- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java 2007-08-02 10:09:53 UTC (rev 4086)
+++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerEJB3.java 2007-08-02 10:14:28 UTC (rev 4087)
@@ -31,10 +31,10 @@
import org.jboss.aop.Dispatcher;
import org.jboss.ejb3.stateless.StatelessContainer;
import org.jboss.wsf.common.ObjectNameFactory;
+import org.jboss.wsf.container.jboss42.AbstractInvocationHandler;
import org.jboss.wsf.spi.deployment.ArchiveDeployment;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.Invocation;
-import org.jboss.wsf.spi.invocation.InvocationHandler;
/**
* Handles invocations on EJB3 endpoints.
@@ -42,7 +42,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 25-Apr-2007
*/
-public class InvocationHandlerEJB3 extends InvocationHandler
+public class InvocationHandlerEJB3 extends AbstractInvocationHandler
{
private ObjectName objectName;
@@ -52,7 +52,7 @@
}
public void init(Endpoint ep)
- {
+ {
String ejbName = ep.getShortName();
ArchiveDeployment dep = (ArchiveDeployment)ep.getService().getDeployment();
String nameStr = "jboss.j2ee:name=" + ejbName + ",service=EJB3,jar=" + dep.getSimpleName();
@@ -68,7 +68,6 @@
throw new WebServiceException("Cannot find service endpoint target: " + objectName);
}
-
public void invoke(Endpoint ep, Invocation epInv) throws Exception
{
try
Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerFactoryImpl.java
===================================================================
--- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerFactoryImpl.java 2007-08-02 10:09:53 UTC (rev 4086)
+++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/InvocationHandlerFactoryImpl.java 2007-08-02 10:14:28 UTC (rev 4087)
@@ -21,7 +21,13 @@
*/
package org.jboss.wsf.container.jboss40;
-import org.jboss.wsf.spi.invocation.*;
+import org.jboss.wsf.container.jboss42.DefaultInvocationHandlerJAXRPC;
+import org.jboss.wsf.container.jboss42.DefaultInvocationHandlerJAXWS;
+import org.jboss.wsf.container.jboss42.InvocationHandlerEJB21;
+import org.jboss.wsf.container.jboss42.InvocationHandlerMDB21;
+import org.jboss.wsf.spi.invocation.InvocationHandler;
+import org.jboss.wsf.spi.invocation.InvocationHandlerFactory;
+import org.jboss.wsf.spi.invocation.InvocationType;
/**
* @author Heiko.Braun(a)jboss.com
@@ -39,16 +45,16 @@
handler = new DefaultInvocationHandlerJAXRPC();
break;
case JAXRPC_EJB21:
- handler = new org.jboss.wsf.container.jboss42.InvocationHandlerEJB21();
+ handler = new InvocationHandlerEJB21();
break;
case JAXRPC_MDB21:
- handler = new org.jboss.wsf.container.jboss42.InvocationHandlerMDB21();
+ handler = new InvocationHandlerMDB21();
break;
case JAXWS_JSE:
handler = new DefaultInvocationHandlerJAXWS();
break;
case JAXWS_EJB21:
- handler = new org.jboss.wsf.container.jboss42.InvocationHandlerEJB21();
+ handler = new InvocationHandlerEJB21();
break;
case JAXWS_EJB3:
handler = new InvocationHandlerEJB3();
Added: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractInvocationHandler.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractInvocationHandler.java (rev 0)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/AbstractInvocationHandler.java 2007-08-02 10:14:28 UTC (rev 4087)
@@ -0,0 +1,55 @@
+/*
+ * 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: InvocationHandlerEJB3.java 4023 2007-07-28 07:14:06Z thomas.diesler(a)jboss.com $
+
+import java.lang.reflect.Method;
+
+import org.jboss.wsf.common.JavaUtils;
+import org.jboss.wsf.spi.invocation.InvocationHandler;
+
+/**
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public abstract class AbstractInvocationHandler extends InvocationHandler
+{
+ protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException
+ {
+ String methodName = seiMethod.getName();
+ Class[] paramTypes = seiMethod.getParameterTypes();
+ for (int i = 0; i < paramTypes.length; i++)
+ {
+ Class paramType = paramTypes[i];
+ if (JavaUtils.isPrimitive(paramType) == false)
+ {
+ String paramTypeName = paramType.getName();
+ paramType = JavaUtils.loadJavaType(paramTypeName);
+ paramTypes[i] = paramType;
+ }
+ }
+
+ Method implMethod = implClass.getMethod(methodName, paramTypes);
+ return implMethod;
+ }
+}
\ No newline at end of file
Added: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandler.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandler.java (rev 0)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandler.java 2007-08-02 10:14:28 UTC (rev 4087)
@@ -0,0 +1,121 @@
+/*
+ * 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: DefaultInvocationHandlerJAXWS.java 4023 2007-07-28 07:14:06Z thomas.diesler(a)jboss.com $
+
+import java.lang.reflect.Method;
+
+import javax.xml.ws.WebServiceContext;
+
+import org.jboss.wsf.common.JavaUtils;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationContext;
+import org.jboss.wsf.spi.invocation.InvocationHandler;
+import org.jboss.wsf.spi.invocation.ResourceInjector;
+import org.jboss.wsf.spi.invocation.ResourceInjectorFactory;
+
+/**
+ * Handles invocations on JSE endpoints.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class DefaultInvocationHandler extends InvocationHandler
+{
+ public Invocation createInvocation()
+ {
+ return new Invocation();
+ }
+
+ public void init(Endpoint ep)
+ {
+ }
+
+ protected Object getTargetBean(Endpoint ep, Invocation epInv)
+ {
+ InvocationContext invCtx = epInv.getInvocationContext();
+ Object targetBean = invCtx.getTargetBean();
+ if (targetBean == null)
+ {
+ try
+ {
+ Class epImpl = ep.getTargetBeanClass();
+ targetBean = epImpl.newInstance();
+ invCtx.setTargetBean(targetBean);
+ }
+ catch (Exception ex)
+ {
+ throw new IllegalStateException("Canot get target bean instance", ex);
+ }
+ }
+ return targetBean;
+ }
+
+ public void invoke(Endpoint ep, Invocation epInv) throws Exception
+ {
+ try
+ {
+ Object targetBean = getTargetBean(ep, epInv);
+
+ InvocationContext invContext = epInv.getInvocationContext();
+ WebServiceContext wsContext = invContext.getAttachment(WebServiceContext.class);
+ if (wsContext != null)
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ResourceInjectorFactory factory = spiProvider.getSPI(ResourceInjectorFactory.class);
+ ResourceInjector injector = factory.newResourceInjector();
+ injector.inject(targetBean, wsContext);
+ }
+
+ Method method = getImplMethod(targetBean.getClass(), epInv.getJavaMethod());
+ Object retObj = method.invoke(targetBean, epInv.getArgs());
+ epInv.setReturnValue(retObj);
+ }
+ catch (Exception e)
+ {
+ handleInvocationException(e);
+ }
+ }
+
+ protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException
+ {
+ String methodName = seiMethod.getName();
+ Class[] paramTypes = seiMethod.getParameterTypes();
+ for (int i = 0; i < paramTypes.length; i++)
+ {
+ Class paramType = paramTypes[i];
+ if (JavaUtils.isPrimitive(paramType) == false)
+ {
+ String paramTypeName = paramType.getName();
+ paramType = JavaUtils.loadJavaType(paramTypeName);
+ paramTypes[i] = paramType;
+ }
+ }
+
+ Method implMethod = implClass.getMethod(methodName, paramTypes);
+ return implMethod;
+ }
+}
Added: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandlerJAXRPC.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandlerJAXRPC.java (rev 0)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandlerJAXRPC.java 2007-08-02 10:14:28 UTC (rev 4087)
@@ -0,0 +1,72 @@
+/*
+ * 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: DefaultInvocationHandlerJAXRPC.java 3959 2007-07-20 14:44:19Z heiko.braun(a)jboss.com $
+
+import javax.xml.rpc.server.ServiceLifecycle;
+import javax.xml.rpc.server.ServletEndpointContext;
+
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationContext;
+
+/**
+ * Handles invocations on JSE endpoints.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class DefaultInvocationHandlerJAXRPC extends DefaultInvocationHandler
+{
+ public void invoke(Endpoint ep, Invocation epInv) throws Exception
+ {
+ try
+ {
+ Object targetBean = getTargetBean(ep, epInv);
+
+ InvocationContext invContext = epInv.getInvocationContext();
+ if (targetBean instanceof ServiceLifecycle)
+ {
+ ServletEndpointContext sepContext = invContext.getAttachment(ServletEndpointContext.class);
+ if (sepContext != null)
+ ((ServiceLifecycle)targetBean).init(sepContext);
+ }
+
+ try
+ {
+ super.invoke(ep, epInv);
+ }
+ finally
+ {
+ if (targetBean instanceof ServiceLifecycle)
+ {
+ ((ServiceLifecycle)targetBean).destroy();
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ handleInvocationException(e);
+ }
+ }
+}
Added: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandlerJAXWS.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandlerJAXWS.java (rev 0)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DefaultInvocationHandlerJAXWS.java 2007-08-02 10:14:28 UTC (rev 4087)
@@ -0,0 +1,34 @@
+/*
+ * 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: DefaultInvocationHandlerJAXWS.java 4023 2007-07-28 07:14:06Z thomas.diesler(a)jboss.com $
+
+/**
+ * Handles invocations on JSE endpoints.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class DefaultInvocationHandlerJAXWS extends DefaultInvocationHandler
+{
+}
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-08-02 10:09:53 UTC (rev 4086)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-08-02 10:14:28 UTC (rev 4087)
@@ -54,7 +54,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 25-Apr-2007
*/
-public class InvocationHandlerEJB3 extends InvocationHandler
+public class InvocationHandlerEJB3 extends AbstractInvocationHandler
{
private ObjectName objectName;
Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerMDB21.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerMDB21.java 2007-08-02 10:09:53 UTC (rev 4086)
+++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerMDB21.java 2007-08-02 10:14:28 UTC (rev 4087)
@@ -37,7 +37,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 25-Apr-2007
*/
-public class InvocationHandlerMDB21 extends InvocationHandler
+public class InvocationHandlerMDB21 extends AbstractInvocationHandler
{
// provide logging
private static final Logger log = Logger.getLogger(InvocationHandlerMDB21.class);
Added: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractInvocationHandler.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractInvocationHandler.java (rev 0)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/AbstractInvocationHandler.java 2007-08-02 10:14:28 UTC (rev 4087)
@@ -0,0 +1,55 @@
+/*
+ * 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: InvocationHandlerEJB3.java 4023 2007-07-28 07:14:06Z thomas.diesler(a)jboss.com $
+
+import java.lang.reflect.Method;
+
+import org.jboss.wsf.common.JavaUtils;
+import org.jboss.wsf.spi.invocation.InvocationHandler;
+
+/**
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public abstract class AbstractInvocationHandler extends InvocationHandler
+{
+ protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException
+ {
+ String methodName = seiMethod.getName();
+ Class[] paramTypes = seiMethod.getParameterTypes();
+ for (int i = 0; i < paramTypes.length; i++)
+ {
+ Class paramType = paramTypes[i];
+ if (JavaUtils.isPrimitive(paramType) == false)
+ {
+ String paramTypeName = paramType.getName();
+ paramType = JavaUtils.loadJavaType(paramTypeName);
+ paramTypes[i] = paramType;
+ }
+ }
+
+ Method implMethod = implClass.getMethod(methodName, paramTypes);
+ return implMethod;
+ }
+}
\ No newline at end of file
Added: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DefaultInvocationHandler.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DefaultInvocationHandler.java (rev 0)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DefaultInvocationHandler.java 2007-08-02 10:14:28 UTC (rev 4087)
@@ -0,0 +1,121 @@
+/*
+ * 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: DefaultInvocationHandlerJAXWS.java 4023 2007-07-28 07:14:06Z thomas.diesler(a)jboss.com $
+
+import java.lang.reflect.Method;
+
+import javax.xml.ws.WebServiceContext;
+
+import org.jboss.wsf.common.JavaUtils;
+import org.jboss.wsf.spi.SPIProvider;
+import org.jboss.wsf.spi.SPIProviderResolver;
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationContext;
+import org.jboss.wsf.spi.invocation.InvocationHandler;
+import org.jboss.wsf.spi.invocation.ResourceInjector;
+import org.jboss.wsf.spi.invocation.ResourceInjectorFactory;
+
+/**
+ * Handles invocations on JSE endpoints.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class DefaultInvocationHandler extends InvocationHandler
+{
+ public Invocation createInvocation()
+ {
+ return new Invocation();
+ }
+
+ public void init(Endpoint ep)
+ {
+ }
+
+ protected Object getTargetBean(Endpoint ep, Invocation epInv)
+ {
+ InvocationContext invCtx = epInv.getInvocationContext();
+ Object targetBean = invCtx.getTargetBean();
+ if (targetBean == null)
+ {
+ try
+ {
+ Class epImpl = ep.getTargetBeanClass();
+ targetBean = epImpl.newInstance();
+ invCtx.setTargetBean(targetBean);
+ }
+ catch (Exception ex)
+ {
+ throw new IllegalStateException("Canot get target bean instance", ex);
+ }
+ }
+ return targetBean;
+ }
+
+ public void invoke(Endpoint ep, Invocation epInv) throws Exception
+ {
+ try
+ {
+ Object targetBean = getTargetBean(ep, epInv);
+
+ InvocationContext invContext = epInv.getInvocationContext();
+ WebServiceContext wsContext = invContext.getAttachment(WebServiceContext.class);
+ if (wsContext != null)
+ {
+ SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
+ ResourceInjectorFactory factory = spiProvider.getSPI(ResourceInjectorFactory.class);
+ ResourceInjector injector = factory.newResourceInjector();
+ injector.inject(targetBean, wsContext);
+ }
+
+ Method method = getImplMethod(targetBean.getClass(), epInv.getJavaMethod());
+ Object retObj = method.invoke(targetBean, epInv.getArgs());
+ epInv.setReturnValue(retObj);
+ }
+ catch (Exception e)
+ {
+ handleInvocationException(e);
+ }
+ }
+
+ protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException
+ {
+ String methodName = seiMethod.getName();
+ Class[] paramTypes = seiMethod.getParameterTypes();
+ for (int i = 0; i < paramTypes.length; i++)
+ {
+ Class paramType = paramTypes[i];
+ if (JavaUtils.isPrimitive(paramType) == false)
+ {
+ String paramTypeName = paramType.getName();
+ paramType = JavaUtils.loadJavaType(paramTypeName);
+ paramTypes[i] = paramType;
+ }
+ }
+
+ Method implMethod = implClass.getMethod(methodName, paramTypes);
+ return implMethod;
+ }
+}
Added: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DefaultInvocationHandlerJAXRPC.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DefaultInvocationHandlerJAXRPC.java (rev 0)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DefaultInvocationHandlerJAXRPC.java 2007-08-02 10:14:28 UTC (rev 4087)
@@ -0,0 +1,72 @@
+/*
+ * 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: DefaultInvocationHandlerJAXRPC.java 3959 2007-07-20 14:44:19Z heiko.braun(a)jboss.com $
+
+import javax.xml.rpc.server.ServiceLifecycle;
+import javax.xml.rpc.server.ServletEndpointContext;
+
+import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.invocation.Invocation;
+import org.jboss.wsf.spi.invocation.InvocationContext;
+
+/**
+ * Handles invocations on JSE endpoints.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class DefaultInvocationHandlerJAXRPC extends DefaultInvocationHandler
+{
+ public void invoke(Endpoint ep, Invocation epInv) throws Exception
+ {
+ try
+ {
+ Object targetBean = getTargetBean(ep, epInv);
+
+ InvocationContext invContext = epInv.getInvocationContext();
+ if (targetBean instanceof ServiceLifecycle)
+ {
+ ServletEndpointContext sepContext = invContext.getAttachment(ServletEndpointContext.class);
+ if (sepContext != null)
+ ((ServiceLifecycle)targetBean).init(sepContext);
+ }
+
+ try
+ {
+ super.invoke(ep, epInv);
+ }
+ finally
+ {
+ if (targetBean instanceof ServiceLifecycle)
+ {
+ ((ServiceLifecycle)targetBean).destroy();
+ }
+ }
+ }
+ catch (Exception e)
+ {
+ handleInvocationException(e);
+ }
+ }
+}
Added: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DefaultInvocationHandlerJAXWS.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DefaultInvocationHandlerJAXWS.java (rev 0)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/DefaultInvocationHandlerJAXWS.java 2007-08-02 10:14:28 UTC (rev 4087)
@@ -0,0 +1,34 @@
+/*
+ * 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: DefaultInvocationHandlerJAXWS.java 4023 2007-07-28 07:14:06Z thomas.diesler(a)jboss.com $
+
+/**
+ * Handles invocations on JSE endpoints.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 25-Apr-2007
+ */
+public class DefaultInvocationHandlerJAXWS extends DefaultInvocationHandler
+{
+}
Modified: trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java
===================================================================
--- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-08-02 10:09:53 UTC (rev 4086)
+++ trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-08-02 10:14:28 UTC (rev 4087)
@@ -54,7 +54,7 @@
* @author Thomas.Diesler(a)jboss.org
* @since 25-Apr-2007
*/
-public class InvocationHandlerEJB3 extends InvocationHandler
+public class InvocationHandlerEJB3 extends AbstractInvocationHandler
{
private ObjectName objectName;
17 years, 4 months
- 1
- 0
JBossWS SVN: r4086 - in spi/trunk/src/main/java/org/jboss/wsf: spi/invocation and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-02 06:09:53 -0400 (Thu, 02 Aug 2007)
New Revision: 4086
Removed:
spi/trunk/src/main/java/org/jboss/wsf/common/
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/DefaultInvocationHandlerJAXRPC.java
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/DefaultInvocationHandlerJAXWS.java
Modified:
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java
spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java
Log:
Remove unwanted classes
Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/DefaultInvocationHandlerJAXRPC.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/DefaultInvocationHandlerJAXRPC.java 2007-08-02 10:07:39 UTC (rev 4085)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/DefaultInvocationHandlerJAXRPC.java 2007-08-02 10:09:53 UTC (rev 4086)
@@ -1,71 +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.invocation;
-
-// $Id$
-
-import org.jboss.wsf.spi.deployment.Endpoint;
-
-import javax.xml.rpc.server.ServiceLifecycle;
-import javax.xml.rpc.server.ServletEndpointContext;
-
-/**
- * Handles invocations on JSE endpoints.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
- */
-public class DefaultInvocationHandlerJAXRPC extends DefaultInvocationHandlerJAXWS
-{
- @Override
- public void invoke(Endpoint ep, Invocation epInv) throws Exception
- {
- try
- {
- Object targetBean = getTargetBean(ep, epInv);
-
- InvocationContext invContext = epInv.getInvocationContext();
- if (targetBean instanceof ServiceLifecycle)
- {
- ServletEndpointContext sepContext = invContext.getAttachment(ServletEndpointContext.class);
- if (sepContext != null)
- ((ServiceLifecycle)targetBean).init(sepContext);
- }
-
- try
- {
- super.invoke(ep, epInv);
- }
- finally
- {
- if (targetBean instanceof ServiceLifecycle)
- {
- ((ServiceLifecycle)targetBean).destroy();
- }
- }
- }
- catch (Exception e)
- {
- handleInvocationException(e);
- }
- }
-}
Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/DefaultInvocationHandlerJAXWS.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/DefaultInvocationHandlerJAXWS.java 2007-08-02 10:07:39 UTC (rev 4085)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/DefaultInvocationHandlerJAXWS.java 2007-08-02 10:09:53 UTC (rev 4086)
@@ -1,96 +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.invocation;
-
-// $Id$
-
-import org.jboss.wsf.spi.deployment.Endpoint;
-import org.jboss.wsf.spi.SPIProvider;
-import org.jboss.wsf.spi.SPIProviderResolver;
-
-import javax.xml.ws.WebServiceContext;
-import java.lang.reflect.Method;
-
-/**
- * Handles invocations on JSE endpoints.
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 25-Apr-2007
- */
-public class DefaultInvocationHandlerJAXWS extends InvocationHandler
-{
- public Invocation createInvocation()
- {
- return new Invocation();
- }
-
- public void init(Endpoint ep)
- {
-
- }
-
- protected Object getTargetBean(Endpoint ep, Invocation epInv)
- {
- InvocationContext invCtx = epInv.getInvocationContext();
- Object targetBean = invCtx.getTargetBean();
- if (targetBean == null)
- {
- try
- {
- Class epImpl = ep.getTargetBeanClass();
- targetBean = epImpl.newInstance();
- invCtx.setTargetBean(targetBean);
- }
- catch (Exception ex)
- {
- throw new IllegalStateException("Canot get target bean instance", ex);
- }
- }
- return targetBean;
- }
-
- public void invoke(Endpoint ep, Invocation epInv) throws Exception
- {
- try
- {
- Object targetBean = getTargetBean(ep, epInv);
-
- InvocationContext invContext = epInv.getInvocationContext();
- WebServiceContext wsContext = invContext.getAttachment(WebServiceContext.class);
- if (wsContext != null)
- {
- SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider();
- ResourceInjectorFactory factory = spiProvider.getSPI(ResourceInjectorFactory.class);
- ResourceInjector injector = factory.newResourceInjector();
- injector.inject(targetBean, wsContext);
- }
-
- Method method = getImplMethod(targetBean.getClass(), epInv.getJavaMethod());
- Object retObj = method.invoke(targetBean, epInv.getArgs());
- epInv.setReturnValue(retObj);
- }
- catch (Exception e)
- {
- handleInvocationException(e);
- }
- }
-}
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java 2007-08-02 10:07:39 UTC (rev 4085)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java 2007-08-02 10:09:53 UTC (rev 4086)
@@ -21,14 +21,13 @@
*/
package org.jboss.wsf.spi.invocation;
-import org.jboss.wsf.common.JavaUtils;
-import org.jboss.wsf.spi.deployment.Endpoint;
-
-import javax.management.MBeanException;
import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.lang.reflect.UndeclaredThrowableException;
+import javax.management.MBeanException;
+
+import org.jboss.wsf.spi.deployment.Endpoint;
+
/**
* Handles invocations on endpoints.
*
@@ -38,7 +37,6 @@
*/
public abstract class InvocationHandler
{
-
/** Create a container specific invocation **/
public abstract Invocation createInvocation();
@@ -48,25 +46,6 @@
/** Initilize the invocation handler **/
public abstract void init(Endpoint ep);
- protected Method getImplMethod(Class implClass, Method seiMethod) throws ClassNotFoundException, NoSuchMethodException
- {
- String methodName = seiMethod.getName();
- Class[] paramTypes = seiMethod.getParameterTypes();
- for (int i = 0; i < paramTypes.length; i++)
- {
- Class paramType = paramTypes[i];
- if (JavaUtils.isPrimitive(paramType) == false)
- {
- String paramTypeName = paramType.getName();
- paramType = JavaUtils.loadJavaType(paramTypeName);
- paramTypes[i] = paramType;
- }
- }
-
- Method implMethod = implClass.getMethod(methodName, paramTypes);
- return implMethod;
- }
-
protected void handleInvocationException(Throwable th) throws Exception
{
if (th instanceof MBeanException)
Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java 2007-08-02 10:07:39 UTC (rev 4085)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java 2007-08-02 10:09:53 UTC (rev 4086)
@@ -23,8 +23,6 @@
import gnu.getopt.Getopt;
import gnu.getopt.LongOpt;
-import org.jboss.wsf.spi.tools.WSContractProvider;
-import org.jboss.wsf.common.JavaUtils;
import java.io.File;
import java.io.PrintStream;
@@ -34,6 +32,8 @@
import java.util.ArrayList;
import java.util.List;
+import org.jboss.wsf.spi.tools.WSContractProvider;
+
/**
* WSProvideTask is a cmd line tool that generates portable JAX-WS artifacts
* for a service endpoint implementation.
@@ -157,8 +157,12 @@
private int generate(String endpoint)
{
- if (!JavaUtils.isLoaded(endpoint, loader))
+ try
{
+ loader.loadClass(endpoint);
+ }
+ catch (ClassNotFoundException e)
+ {
System.err.println("Error: Could not load class [" + endpoint + "]. Did you specify a valid --classpath?");
return 1;
}
17 years, 4 months
- 1
- 0
JBossWS SVN: r4085 - trunk/integration/xfire/ant-import.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-08-02 06:07:39 -0400 (Thu, 02 Aug 2007)
New Revision: 4085
Modified:
trunk/integration/xfire/ant-import/macros-deploy-xfire.xml
Log:
fix deploy macros
Modified: trunk/integration/xfire/ant-import/macros-deploy-xfire.xml
===================================================================
--- trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-08-02 10:05:47 UTC (rev 4084)
+++ trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-08-02 10:07:39 UTC (rev 4085)
@@ -19,7 +19,7 @@
<!-- Deploy to jboss50 -->
<macrodef name="macro-deploy-xfire50">
- <attribute name="spilibs"/>
+ <attribute name="wsflibs"/>
<attribute name="jbosslibs"/>
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
@@ -28,7 +28,7 @@
<!-- CLIENT JARS -->
<copy todir="${jboss50.home}/client" overwrite="true">
- <fileset dir="@{spilibs}">
+ <fileset dir="@{wsflibs}">
<include name="jbossws-framework.jar"/>
</fileset>
<fileset dir="@{jbosslibs}">
@@ -102,7 +102,7 @@
</macrodef>
<macrodef name="macro-deploy-xfire42">
- <attribute name="spilibs"/>
+ <attribute name="wsflibs"/>
<attribute name="jbosslibs"/>
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
@@ -111,7 +111,7 @@
<!-- CLIENT JARS -->
<copy todir="${jboss42.home}/client" overwrite="true">
- <fileset dir="@{spilibs}">
+ <fileset dir="@{wsflibs}">
<include name="jbossws-framework.jar"/>
</fileset>
<fileset dir="@{jbosslibs}">
17 years, 4 months
- 1
- 0
JBossWS SVN: r4084 - trunk/integration/sunri/ant-import.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-08-02 06:05:47 -0400 (Thu, 02 Aug 2007)
New Revision: 4084
Modified:
trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
Log:
fix deploy macros
Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml
===================================================================
--- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-08-02 09:57:42 UTC (rev 4083)
+++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-08-02 10:05:47 UTC (rev 4084)
@@ -18,7 +18,7 @@
<!-- ================================================================== -->
<macrodef name="macro-deploy-sunri50">
- <attribute name="spilibs"/>
+ <attribute name="wsflibs"/>
<attribute name="jbosslibs"/>
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
@@ -117,7 +117,7 @@
</macrodef>
<macrodef name="macro-deploy-sunri42">
- <attribute name="spilibs"/>
+ <attribute name="wsflibs"/>
<attribute name="jbosslibs"/>
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
17 years, 4 months
- 1
- 0
JBossWS SVN: r4083 - in trunk: build/ant-import and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-08-02 05:57:42 -0400 (Thu, 02 Aug 2007)
New Revision: 4083
Added:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBean.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java
trunk/testsuite/src/resources/jaxws/smoke/
trunk/testsuite/src/resources/jaxws/smoke/tools/
trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/
trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestService.wsdl
trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl
trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/async-binding.xml
trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/jax-ws-catalog.xml
trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/ws-addr-wsdl.xsd
Removed:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/tools/
trunk/testsuite/src/resources/jaxws/tools/
Modified:
trunk/JBossWS-Trunk.iws
trunk/build/ant-import/build-testsuite.xml
Log:
Created smoke tests package and corresponding build target
Modified: trunk/JBossWS-Trunk.iws
===================================================================
--- trunk/JBossWS-Trunk.iws 2007-08-02 09:36:42 UTC (rev 4082)
+++ trunk/JBossWS-Trunk.iws 2007-08-02 09:57:42 UTC (rev 4083)
@@ -21,14 +21,20 @@
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/ant-import/build-testsuite.xml" afterPath="$PROJECT_DIR$/build/ant-import/build-testsuite.xml" />
- <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/xfire/build.xml" afterPath="$PROJECT_DIR$/integration/xfire/build.xml" />
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/CalculatorBean.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/sunri/ant-import/macros-deploy-sunri.xml" afterPath="$PROJECT_DIR$/integration/sunri/ant-import/macros-deploy-sunri.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestService.wsdl" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl/async-binding.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl/jax-ws-catalog.xml" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBean.java" />
<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="$PROJECT_DIR$/integration/xfire/ant-import/macros-deploy-xfire.xml" afterPath="$PROJECT_DIR$/integration/xfire/ant-import/macros-deploy-xfire.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/sunri/build.xml" afterPath="$PROJECT_DIR$/integration/sunri/build.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools" />
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl/ws-addr-wsdl.xsd" />
<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" />
</list>
</component>
@@ -218,7 +224,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java" line="193" class="org.jboss.test.ws.jaxws.tools.WSConsumerTestCase" package="org.jboss.test.ws.jaxws.tools">
+ <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java" line="193" class="org.jboss.test.ws.jaxws.tools.WSConsumerTestCase" package="org.jboss.test.ws.jaxws.tools">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -231,7 +237,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java" line="257" class="org.jboss.test.ws.jaxws.tools.WSConsumerTestCase" package="org.jboss.test.ws.jaxws.tools">
+ <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java" line="257" class="org.jboss.test.ws.jaxws.tools.WSConsumerTestCase" package="org.jboss.test.ws.jaxws.tools">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -257,7 +263,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java" line="115" class="org.jboss.test.ws.jaxws.tools.WSProvideTestCase" package="org.jboss.test.ws.jaxws.tools">
+ <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java" line="112" class="org.jboss.test.ws.jaxws.tools.WSProvideTestCase" package="org.jboss.test.ws.jaxws.tools">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -270,7 +276,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java" line="80" class="org.jboss.test.ws.jaxws.tools.WSProvideTestCase" package="org.jboss.test.ws.jaxws.tools">
+ <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java" line="77" class="org.jboss.test.ws.jaxws.tools.WSProvideTestCase" package="org.jboss.test.ws.jaxws.tools">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -283,7 +289,7 @@
<option name="CONDITION" value="" />
<option name="LOG_MESSAGE" value="" />
</breakpoint>
- <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java" line="83" class="org.jboss.test.ws.jaxws.tools.WSProvideTestCase" package="org.jboss.test.ws.jaxws.tools">
+ <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java" line="80" class="org.jboss.test.ws.jaxws.tools.WSProvideTestCase" package="org.jboss.test.ws.jaxws.tools">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -377,84 +383,50 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="SunRIProviderImpl.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderImpl.java">
+ <file leaf-file-name="build-testsuite.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/build/ant-import/build-testsuite.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="182" column="34" selection-start="5521" selection-end="5521" vertical-scroll-proportion="0.6294046">
+ <state line="398" column="14" selection-start="19181" selection-end="19181" vertical-scroll-proportion="0.748184">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="WsgenTool.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/wscompile/WsgenTool.java">
+ <file leaf-file-name="ant.properties" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/build/ant.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="335" column="113" selection-start="13365" selection-end="13395" vertical-scroll-proportion="5.9764853">
+ <state line="47" column="26" selection-start="1533" selection-end="1558" vertical-scroll-proportion="0.50297266">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="WebServiceVisitor.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceVisitor.java">
+ <file leaf-file-name="WSConsumerTestCase.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="352" column="18" selection-start="15735" selection-end="15735" vertical-scroll-proportion="0.33415842">
+ <state line="281" column="46" selection-start="10059" selection-end="10059" vertical-scroll-proportion="0.7699758">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ModelBuilder.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/ModelBuilder.java">
+ <file leaf-file-name="WSProvideTestCase.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="56" column="18" selection-start="2306" selection-end="2306" vertical-scroll-proportion="0.60024303">
+ <state line="100" column="42" selection-start="2978" selection-end="2978" vertical-scroll-proportion="0.4233056">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="WebServiceWrapperGenerator.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java">
+ <file leaf-file-name="build-testsuite.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/integration/native/ant-import/build-testsuite.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="69" column="28" selection-start="2591" selection-end="2591" vertical-scroll-proportion="0.31064355">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="WebServiceAP.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceAP.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="106" column="19" selection-start="3831" selection-end="3831" vertical-scroll-proportion="0.19183168">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="AnnotationProcessorContext.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/AnnotationProcessorContext.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="41" column="13" selection-start="1444" selection-end="1444" vertical-scroll-proportion="0.09234508">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="WsimportListener.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/wscompile/WsimportListener.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="28" column="13" selection-start="934" selection-end="934" vertical-scroll-proportion="0.20777643">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="CalculatorBean.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/CalculatorBean.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="41" column="0" selection-start="1361" selection-end="1361" vertical-scroll-proportion="0.48481166">
+ <state line="26" column="20" selection-start="1252" selection-end="1252" vertical-scroll-proportion="0.59806293">
<folding>
- <element signature="imports" expanded="true" />
+ <marker date="1186047277000" expanded="true" signature="1397:2394" placeholder="..." />
+ <marker date="1186047277000" expanded="true" signature="1397:1960" placeholder="..." />
+ <marker date="1186047277000" expanded="true" signature="1397:1774" placeholder="..." />
</folding>
</state>
</provider>
@@ -473,7 +445,7 @@
<option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" />
</component>
<component name="HighlightingSettingsPerFile">
- <setting file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSConsumerTestCase.java" root0="SKIP_INSPECTION" />
+ <setting file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java" root0="SKIP_INSPECTION" />
</component>
<component name="InspectionManager">
<option name="AUTOSCROLL_TO_SOURCE" value="false" />
@@ -542,10 +514,6 @@
<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="testsuite" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -553,154 +521,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="testsuite" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" />
- <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="testsuite" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/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="testsuite" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/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$/testsuite/src/java/org/jboss/test" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools" />
- <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="testsuite" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/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$/testsuite/src/java/org/jboss/test" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws" />
- <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="testsuite" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src" />
- <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>
- <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-native" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
</PATH_ELEMENT>
@@ -792,7 +612,7 @@
<showLibraryContents />
<hideEmptyPackages PackagesPane="false" ProjectPane="false" />
<abbreviatePackageNames />
- <showStructure ProjectPane="false" PackagesPane="false" Favorites="false" />
+ <showStructure Scope="false" ProjectPane="false" PackagesPane="false" Favorites="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@@ -815,10 +635,10 @@
<property name="cvs_file_history_treeWidth0" value="391" />
<property name="cvs_file_history_treeWidth1" value="391" />
<property name="cvs_file_history_treeWidth2" value="391" />
- <property name="cvs_file_history_flatWidth2" value="391" />
<property name="cvs_file_history_treeWidth3" value="391" />
- <property name="cvs_file_history_flatWidth3" value="391" />
+ <property name="cvs_file_history_flatWidth2" value="391" />
<property name="cvs_file_history_treeOrder0" value="0" />
+ <property name="cvs_file_history_flatWidth3" value="391" />
<property name="MemberChooser.showClasses" value="true" />
<property name="cvs_file_history_flatWidth0" value="391" />
<property name="cvs_file_history_flatWidth1" value="391" />
@@ -836,11 +656,11 @@
<recent name="org.jboss.wsf.stack.xfire" />
</key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+ <recent name="org.jboss.test.ws.jaxws.smoke" />
<recent name="org.jboss.wsf.framework.deployment" />
<recent name="org.jboss.wsf.common" />
<recent name="org.jboss.wsf.spi.invocation" />
<recent name="org.jboss.ws.core.server" />
- <recent name="org.jboss.wsf.stack.jbws" />
</key>
</component>
<component name="RestoreUpdateTree" />
@@ -850,8 +670,8 @@
<module name="testsuite" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" value="org.jboss.test.ws.jaxws.tools" />
- <option name="MAIN_CLASS_NAME" value="org.jboss.test.ws.jaxws.tools.WSProvideTestCase" />
+ <option name="PACKAGE_NAME" value="org.jboss.test.ws.jaxws.smoke.tools" />
+ <option name="MAIN_CLASS_NAME" value="org.jboss.test.ws.jaxws.smoke.tools.WSProvideTestCase" />
<option name="METHOD_NAME" value="testOutputDirectory" />
<option name="TEST_OBJECT" value="method" />
<option name="VM_PARAMETERS" />
@@ -892,18 +712,6 @@
<option name="Make" value="true" />
</method>
</configuration>
- <configuration default="true" type="Applet" factoryName="Applet">
- <module name="" />
- <option name="MAIN_CLASS_NAME" />
- <option name="HTML_FILE_NAME" />
- <option name="HTML_USED" value="false" />
- <option name="WIDTH" value="400" />
- <option name="HEIGHT" value="300" />
- <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
- <option name="VM_PARAMETERS" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- </configuration>
<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
@@ -924,13 +732,25 @@
<option name="HOST" value="localhost" />
<option name="PORT" value="5005" />
</configuration>
+ <configuration default="true" type="Applet" factoryName="Applet">
+ <module name="" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="HTML_FILE_NAME" />
+ <option name="HTML_USED" value="false" />
+ <option name="WIDTH" value="400" />
+ <option name="HEIGHT" value="300" />
+ <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+ <option name="VM_PARAMETERS" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ </configuration>
<configuration default="false" name="WSConsumerTestCase.testWsdlLocation" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<pattern value="org.jboss.test.ws.jaxws.tools.*" />
<module name="testsuite" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
- <option name="PACKAGE_NAME" value="org.jboss.test.ws.jaxws.tools" />
- <option name="MAIN_CLASS_NAME" value="org.jboss.test.ws.jaxws.tools.WSConsumerTestCase" />
+ <option name="PACKAGE_NAME" value="org.jboss.test.ws.jaxws.smoke.tools" />
+ <option name="MAIN_CLASS_NAME" value="org.jboss.test.ws.jaxws.smoke.tools.WSConsumerTestCase" />
<option name="METHOD_NAME" value="testWsdlLocation" />
<option name="TEST_OBJECT" value="method" />
<option name="VM_PARAMETERS" value="" />
@@ -985,7 +805,16 @@
</method>
</configuration>
</component>
- <component name="ScopeViewComponent" />
+ <component name="ScopeViewComponent">
+ <subPane subId="Project">
+ <PATH>
+ <PATH_ELEMENT USER_OBJECT="Root">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ </PATH>
+ </subPane>
+ </component>
<component name="SelectInManager" />
<component name="StarteamConfiguration">
<option name="SERVER" value="" />
@@ -1064,7 +893,7 @@
<window_info id="simpleUML" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<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="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="false" weight="0.25432098" order="0" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26419753" order="0" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.51376146" order="2" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25617284" order="2" />
<window_info id="soapUI Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
@@ -1072,7 +901,7 @@
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38417432" order="1" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39793578" order="4" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32912844" order="8" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25555557" order="1" />
+ <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25555557" 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="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298397" order="3" />
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
@@ -1101,7 +930,7 @@
<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" value="Display information about output and source directories being used" />
+ <option name="LAST_COMMIT_MESSAGE" value="really exclude jaxws/tools tests for xfire" />
<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" />
@@ -1115,6 +944,8 @@
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
<MESSAGE value="Display information about output and source directories being used" />
+ <MESSAGE value="Implement SPIView marker" />
+ <MESSAGE value="really exclude jaxws/tools tests for xfire" />
</component>
<component name="VssConfiguration">
<option name="CLIENT_PATH" value="" />
@@ -1168,109 +999,111 @@
<option name="myLastEditedConfigurable" value="IDE Profiles" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/build/ant.properties.example">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandlerFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="38" column="33" selection-start="1550" selection-end="1550" vertical-scroll-proportion="0.39246657">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/management/ContextServlet.java">
+ <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefHandlerImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="176" column="12" selection-start="6518" selection-end="6518" vertical-scroll-proportion="0.7514863">
+ <state line="67" column="88" selection-start="2423" selection-end="2423" vertical-scroll-proportion="-0.42326733">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderFactoryImpl.java">
+ <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="32" column="35" selection-start="1347" selection-end="1347" vertical-scroll-proportion="0.24851367">
+ <state line="57" column="13" selection-start="2274" selection-end="2274" vertical-scroll-proportion="0.37623763">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/spi/tools/WSContractProvider.java">
+ <entry file="file://$PROJECT_DIR$/integration/native/ant-import/macros-deploy-native.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="46" column="36" selection-start="1534" selection-end="1534" vertical-scroll-proportion="0.3329298">
+ <state line="160" column="55" selection-start="7335" selection-end="7370" vertical-scroll-proportion="3.3922517">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/CalculatorBean.java">
+ <entry file="file://$PROJECT_DIR$/integration/native/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="41" column="0" selection-start="1361" selection-end="1361" vertical-scroll-proportion="0.48481166">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.06900726">
+ <folding />
</state>
</provider>
</entry>
- <entry file="jar://$PROJECT_DIR$/integration/sunri/thirdparty/jaxws-tools.jar!/com/sun/tools/ws/wscompile/WsgenTool.class">
+ <entry file="file://$PROJECT_DIR$/build/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="17" column="10" selection-start="898" selection-end="898" vertical-scroll-proportion="0.3329298">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-3.0714285">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/wscompile/WsimportListener.java">
+ <entry file="file://$PROJECT_DIR$/integration/native/ant-import/build-deploy.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="13" selection-start="934" selection-end="934" vertical-scroll-proportion="0.20777643">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.34503633">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/AnnotationProcessorContext.java">
+ <entry file="file://$PROJECT_DIR$/integration/xfire/src/test/resources/test-excludes-jboss42.txt">
<provider selected="true" editor-type-id="text-editor">
- <state line="41" column="13" selection-start="1444" selection-end="1444" vertical-scroll-proportion="0.09234508">
+ <state line="57" column="32" selection-start="1975" selection-end="1975" vertical-scroll-proportion="0.82066506">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceWrapperGenerator.java">
+ <entry file="file://$PROJECT_DIR$/integration/xfire/src/test/resources/test-excludes-jboss50.txt">
<provider selected="true" editor-type-id="text-editor">
- <state line="69" column="28" selection-start="2591" selection-end="2591" vertical-scroll-proportion="0.31064355">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.4655582">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceVisitor.java">
+ <entry file="file://$PROJECT_DIR$/integration/native/ant-import/build-testsuite.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="352" column="18" selection-start="15735" selection-end="15735" vertical-scroll-proportion="0.33415842">
- <folding />
+ <state line="26" column="20" selection-start="1252" selection-end="1252" vertical-scroll-proportion="0.59806293">
+ <folding>
+ <marker date="1186047277000" expanded="true" signature="1397:2394" placeholder="..." />
+ <marker date="1186047277000" expanded="true" signature="1397:1960" placeholder="..." />
+ <marker date="1186047277000" expanded="true" signature="1397:1774" placeholder="..." />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/ModelBuilder.java">
+ <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="56" column="18" selection-start="2306" selection-end="2306" vertical-scroll-proportion="0.60024303">
+ <state line="100" column="42" selection-start="2978" selection-end="2978" vertical-scroll-proportion="0.4233056">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/processor/modeler/annotation/WebServiceAP.java">
+ <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="106" column="19" selection-start="3831" selection-end="3831" vertical-scroll-proportion="0.19183168">
+ <state line="281" column="46" selection-start="10059" selection-end="10059" vertical-scroll-proportion="0.7699758">
<folding />
</state>
</provider>
</entry>
- <entry file="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/wscompile/WsgenTool.java">
+ <entry file="file://$PROJECT_DIR$/build/ant-import/build-testsuite.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="335" column="113" selection-start="13365" selection-end="13395" vertical-scroll-proportion="5.9764853">
+ <state line="398" column="14" selection-start="19181" selection-end="19181" vertical-scroll-proportion="0.748184">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/tools/WSProvideTestCase.java">
+ <entry file="file://$PROJECT_DIR$/build/version.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="188" column="16" selection-start="5832" selection-end="5832" vertical-scroll-proportion="0.42284325">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/integration/sunri/src/main/java/org/jboss/wsf/stack/sunri/tools/SunRIProviderImpl.java">
+ <entry file="file://$PROJECT_DIR$/build/ant.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="182" column="34" selection-start="5521" selection-end="5521" vertical-scroll-proportion="0.6294046">
+ <state line="47" column="26" selection-start="1533" selection-end="1558" vertical-scroll-proportion="0.50297266">
<folding />
</state>
</provider>
Modified: trunk/build/ant-import/build-testsuite.xml
===================================================================
--- trunk/build/ant-import/build-testsuite.xml 2007-08-02 09:36:42 UTC (rev 4082)
+++ trunk/build/ant-import/build-testsuite.xml 2007-08-02 09:57:42 UTC (rev 4083)
@@ -376,13 +376,13 @@
</antcall>
<antcall target="tests-report"/>
</target>
-
+
<!-- Run samples test cases -->
- <target name="tests-samples" depends="tests-init" description="Run samples unit tests">
+ <target name="tests-smoke" depends="tests-init" description="Run samples unit tests">
<antcall target="tests-run-internal">
- <param name="include.wildcard" value="org/jboss/test/ws/*/samples/**/*TestCase.class"/>
+ <param name="include.wildcard" value="org/jboss/test/ws/*/samples/**/*TestCase.class org/jboss/test/ws/*/smoke/**/*TestCase.class"/>
<param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/>
- <!--
+ <!--
According to our commit policy, haltonfailure MUST be be true for tests-samples.
It is a prerequisite for any commit that this target passes without failure.
-->
@@ -390,6 +390,14 @@
</antcall>
<antcall target="tests-report"/>
</target>
+
+ <!-- Run samples test cases -->
+ <target name="tests-samples" depends="tests-init" description="Run samples unit tests">
+ <antcall target="tests-run-internal">
+ <param name="include.wildcard" value="org/jboss/test/ws/*/samples/**/*TestCase.class"/>
+ <param name="exclude.wildcard" value="org/jboss/test/ws/*/samples/jaxr/**"/>
+ </antcall>
+ </target>
<!--
Run a collection of unit tests.
Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBean.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBean.java (rev 0)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBean.java 2007-08-02 09:57:42 UTC (rev 4083)
@@ -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.test.ws.jaxws.smoke.tools;
+
+import javax.jws.WebService;
+import javax.jws.WebMethod;
+
+@WebService(targetNamespace = "http://foo.bar.com/calculator")
+public class CalculatorBean
+{
+ @WebMethod
+ public int add(int a, int b)
+ {
+ return a+b;
+ }
+
+ @WebMethod
+ public int subtract(int a, int b)
+ {
+ return a-b;
+ }
+}
Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java (rev 0)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java 2007-08-02 09:57:42 UTC (rev 4083)
@@ -0,0 +1,285 @@
+/*
+ * 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.test.ws.jaxws.smoke.tools;
+
+import junit.framework.TestCase;
+import org.jboss.wsf.spi.tools.WSContractConsumer;
+
+import javax.xml.ws.WebServiceClient;
+import javax.xml.ws.WebServiceFeature;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.PrintStream;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.List;
+import java.lang.reflect.Method;
+
+/**
+ * Test the WSContractConsumer API across different implementations.
+ * NOTE: All tests expect to be execurted below 'output/tests'.
+ *
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class WSConsumerTestCase extends TestCase
+{
+
+ // Tools delegate. Recreated for every test. See setup(...)
+ WSContractConsumer consumer;
+
+ // common output dir for all tests. Tests need to be executed below 'output/tests'
+ File outputDirectory;
+
+ // default is off
+ boolean toogleMessageOut = false;
+
+ /**
+ * Recreates a tools delegate for every test
+ * @throws Exception
+ */
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ // create a new consumer for every test case
+ consumer = WSContractConsumer.newInstance();
+ if(toogleMessageOut) consumer.setMessageStream(System.out);
+
+ // shared output directory, relative to test execution
+ outputDirectory = new File("wsconsume/java");
+ }
+
+ /**
+ * Specifies the JAX-WS and JAXB binding files to use on import operations.
+ * See http://java.sun.com/webservices/docs/2.0/jaxws/customizations.html
+ */
+ public void testBindingFiles() throws Exception
+ {
+ List<File> files = new ArrayList<File>();
+ files.add( new File("resources/jaxws/smoke/tools/wsdl/async-binding.xml") );
+
+ consumer.setBindingFiles(files);
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testBindingFiles");
+ consumer.setGenerateSource(true);
+
+ consumeWSDL();
+
+ URLClassLoader loader = new URLClassLoader(new URL[] { new URL("file:"+System.getProperty("user.dir")+"/wsconsume/java/") });
+ String seiClassName = "org.jboss.test.ws.tools.testBindingFiles.EndpointInterface";
+ Class sei = loader.loadClass(seiClassName);
+
+ boolean containsAsyncOperations = false;
+ for(Method m : sei.getDeclaredMethods())
+ {
+ if(m.getName().equals("echoAsync"))
+ {
+ containsAsyncOperations = true;
+ break;
+ }
+ }
+
+ assertTrue("External binding file was ignored", containsAsyncOperations);
+
+ }
+
+ /**
+ * Sets the OASIS XML Catalog file to use for entity resolution.
+ *
+ */
+ public void testCatalog() throws Exception
+ {
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testCatalog");
+ consumer.setCatalog( new File("resources/jaxws/smoke/tools/wsdl/jax-ws-catalog.xml") );
+ consumer.setGenerateSource(true);
+ consumer.setOutputDirectory(outputDirectory);
+ consumer.consume("resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl");
+ }
+
+ /**
+ * Sets the main output directory. If the directory does not exist, it will be created.
+ *
+ */
+ public void testOutputDirectory() throws Exception
+ {
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testOutputDirectory");
+ consumer.setGenerateSource(true);
+ consumer.setSourceDirectory( new File("work/testOutputDirectory/java/") );
+
+ consumeWSDL();
+
+ File sei = new File("work/testOutputDirectory/java/org/jboss/test/ws/tools/testOutputDirectory/EndpointInterface.java");
+ assertTrue("Output directory switch ignored", sei.exists());
+ }
+
+ /**
+ * Sets the source directory. This directory will contain any generated Java source.
+ * If the directory does not exist, it will be created. If not specified,
+ * the output directory will be used instead.
+ *
+ */
+ public void testSourceDirectory() throws Exception
+ {
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testSourceDirectory");
+ consumer.setGenerateSource(true);
+ consumer.setSourceDirectory( new File("work/wsconsumeSource/java/") );
+
+ consumeWSDL();
+
+ File sei = new File("work/wsconsumeSource/java/org/jboss/test/ws/tools/testSourceDirectory/EndpointInterface.java");
+ assertTrue("Source directory switch ignored", sei.exists());
+ }
+
+ /**
+ * Enables/Disables Java source generation.
+ *
+ */
+ public void testGenerateSource() throws Exception
+ {
+ testTargetPackage();
+ }
+
+ /**
+ * Sets the target package for generated source. If not specified the default
+ * is based off of the XML namespace.
+ *
+ */
+ public void testTargetPackage() throws Exception
+ {
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testTargetPackage");
+ consumer.setGenerateSource(true);
+
+ consumeWSDL();
+
+ File packageDir = new File("wsconsume/java/org/jboss/test/ws/tools/testTargetPackage");
+ assertTrue("Package not created", packageDir.exists());
+
+ File sei = new File("wsconsume/java/org/jboss/test/ws/tools/testTargetPackage/EndpointInterface.java");
+ assertTrue("SEI not generated", sei.exists());
+ }
+
+ /**
+ * Sets the @(a)WebService.wsdlLocation and @(a)WebServiceClient.wsdlLocation attributes to a custom value.
+ *
+ */
+ public void testWsdlLocation() throws Exception
+ {
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testWsdlLocation");
+ consumer.setWsdlLocation("http://foo.bar.com/endpoint?wsdl");
+ consumer.setGenerateSource(true);
+
+ consumeWSDL();
+
+ URLClassLoader loader = new URLClassLoader(new URL[] { new URL("file:"+System.getProperty("user.dir")+"/wsconsume/java/") });
+ String seiClassName = "org.jboss.test.ws.tools.testWsdlLocation.TestService";
+ Class sei = loader.loadClass(seiClassName);
+
+ WebServiceClient webServiceClient = (WebServiceClient) sei.getAnnotation(WebServiceClient.class);
+ assertNotNull("@WebServiceClient not generated on service interface", webServiceClient);
+ assertEquals("@WebServiceClient.wsdlLocation not set", "http://foo.bar.com/endpoint?wsdl", webServiceClient.wsdlLocation());
+ }
+
+ /**
+ * Sets the PrintStream to use for status feedback.
+ * The simplest example would be to use System.out.
+ */
+ public void testMessageStream() throws Exception
+ {
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ PrintStream pout = new PrintStream(bout);
+
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testMessageStream");
+ consumer.setMessageStream(pout);
+
+ consumeWSDL();
+
+ String messageOut = new String (bout.toByteArray());
+ System.out.println("-- Begin captured output -- ");
+ System.out.println(messageOut);
+ System.out.println("--- End captured output --");
+
+ System.out.println("FIXME [JBWS-1772]: WSConsume output is not correctly redirected");
+
+ /*assertTrue("Tools output not correctly redirected",
+ messageOut.indexOf("org/jboss/test/ws/tools/testMessageStream/EndpointInterface.java")!=-1
+ );*/
+ }
+
+ /**
+ * Sets the additional classpath to use if/when invoking the Java compiler.
+ * Typically an implementation will use the system <code>java.class.path</code>
+ * property. So for most normal applications this method is not needed. However,
+ * if this API is being used from an isolated classloader, then it needs to
+ * be called in order to reference all jars that are required by the
+ * implementation.
+ *
+ */
+ public void testAdditionalCompilerClassPath()
+ {
+ System.out.println("FIXME [JBWS-1773]: Verify isolated classloading with WSConsume");
+ }
+
+ /**
+ * Set the target JAX-WS specification target. Defaults to <code>2.0</code>
+ */
+ public void testTarget() throws Exception
+ {
+ consumer.setTargetPackage("org.jboss.test.ws.tools.testTarget");
+ consumer.setGenerateSource(true);
+ consumer.setTarget("2.1");
+
+ consumeWSDL();
+
+ URLClassLoader loader = new URLClassLoader(new URL[] { new URL("file:"+System.getProperty("user.dir")+"/wsconsume/java/") });
+ String seiClassName = "org.jboss.test.ws.tools.testTarget.TestService";
+ Class sei = loader.loadClass(seiClassName);
+
+
+ boolean featureSig = false;
+ for(Method m : sei.getDeclaredMethods())
+ {
+ if(m.getName().equals("getEndpointInterfacePort"))
+ {
+ for(Class c : m.getParameterTypes())
+ {
+ if(c.isArray() &&
+ c.getComponentType().equals(WebServiceFeature.class))
+ {
+ featureSig = true;
+ break;
+ }
+ }
+ }
+ }
+
+ assertTrue("JAX-WS 2.1 extensions not generated with 'target=2.1'", featureSig);
+
+ }
+
+ private void consumeWSDL() throws Exception
+ {
+ consumer.setOutputDirectory(outputDirectory);
+ consumer.consume("resources/jaxws/smoke/tools/wsdl/TestService.wsdl");
+ }
+
+}
Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java
===================================================================
--- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java (rev 0)
+++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java 2007-08-02 09:57:42 UTC (rev 4083)
@@ -0,0 +1,212 @@
+/*
+ * 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.test.ws.jaxws.smoke.tools;
+
+import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.spi.tools.WSContractProvider;
+import org.jboss.wsf.test.JBossWSTest;
+import org.w3c.dom.Element;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.PrintStream;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+/**
+ * @author Heiko.Braun(a)jboss.com
+ * @version $Revision$
+ */
+public class WSProvideTestCase extends JBossWSTest
+{
+ // tools delegate
+ WSContractProvider provider;
+
+ // redirect tools message to System.out ?
+ boolean toogleMessageOut = false;
+
+ // relative to test execution
+ File outputDirectory;
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ // create a new consumer for every test case
+ provider = WSContractProvider.newInstance();
+ if(toogleMessageOut) provider.setMessageStream(System.out);
+
+ // shared output directory, relative to test execution
+ outputDirectory = new File("wsprovide/java");
+ }
+
+ private ClassLoader getArtefactClassLoader() throws Exception {
+ URLClassLoader loader = new URLClassLoader(new URL[] {
+ new URL("file:"+System.getProperty("user.dir")+"/wsprovide/java/") }
+ );
+
+ return loader;
+ }
+
+ /**
+ * Enables/Disables WSDL generation.
+ *
+ */
+ public void testGenerateWsdl() throws Exception
+ {
+ provider.setGenerateWsdl(true);
+ provide();
+
+ verifyWSDL(outputDirectory);
+ }
+
+ /**
+ * Enables/Disables Java source generation.
+ *
+ */
+ public void testGenerateSource() throws Exception
+ {
+ provider.setGenerateSource(true);
+ provide();
+
+ verifyJavaSource(outputDirectory);
+
+ }
+
+ private void verifyJavaSource(File directory)
+ {
+ File javaSource = new File(
+ directory.getAbsolutePath()+
+ "/org/jboss/test/ws/jaxws/smoke/tools/jaxws/AddResponse.java"
+ );
+
+ assertTrue("Source not generated", javaSource.exists());
+ }
+
+ /**
+ * Sets the main output directory.
+ * If the directory does not exist, it will be created.
+ */
+ public void testOutputDirectory() throws Exception
+ {
+ provide();
+ ClassLoader loader = getArtefactClassLoader();
+ Class responseWrapper = loader.loadClass("org.jboss.test.ws.jaxws.smoke.tools.jaxws.AddResponse");
+ XmlRootElement rootElement = (XmlRootElement) responseWrapper.getAnnotation(XmlRootElement.class);
+ assertNotNull("@XmlRootElement missing form response wrapper", rootElement);
+ assertEquals("Wrong namespace", rootElement.namespace(), "http://foo.bar.com/calculator");
+ }
+
+ /**
+ * Sets the resource directory. This directory will contain any generated
+ * WSDL and XSD files. If the directory does not exist, it will be created.
+ * If not specified, the output directory will be used instead.
+ *
+ */
+ public void testResourceDirectory() throws Exception
+ {
+ File directory = new File("wsprovide/resources");
+ provider.setResourceDirectory(directory);
+ provide();
+
+ verifyWSDL(directory);
+ }
+
+ private void verifyWSDL(File directory) throws Exception
+ {
+ File wsdl = new File(
+ outputDirectory.getAbsolutePath()+
+ "/CalculatorBeanService.wsdl"
+ );
+
+ assertTrue("WSDL not generated", wsdl.exists());
+ Element root = DOMUtils.parse( new FileInputStream(wsdl));
+ Element serviceElement = DOMUtils.getFirstChildElement(root, "service");
+ assertEquals(serviceElement.getAttribute("name"), "CalculatorBeanService");
+ }
+
+ /**
+ * Sets the source directory. This directory will contain any generated Java source.
+ * If the directory does not exist, it will be created. If not specified,
+ * the output directory will be used instead.
+ *
+ */
+ public void testSourceDirectory() throws Exception
+ {
+ File sourceDir = new File("wsprovide/sources");
+ provider.setSourceDirectory(sourceDir);
+ provider.setGenerateSource(true);
+ provide();
+
+ verifyJavaSource(sourceDir);
+ }
+
+ /**
+ * Sets the ClassLoader used to discover types.
+ * This defaults to the one used in instantiation.
+ *
+ */
+ public void testClassLoader()
+ {
+ System.out.println("FIXME [JBWS-1776]: Verify isolated classloading with WSProvide");
+ }
+
+ /**
+ * Sets the PrintStream to use for status feedback. The simplest example
+ * would be to use System.out.
+ *
+ */
+ public void testMessageStream() throws Exception
+ {
+
+ if(isIntegrationSunRI())
+ {
+ System.out.println("FIXME [JBWS-1777]: WSProvide output is not correctly redirected");
+ return;
+ }
+
+ ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ PrintStream pout = new PrintStream(bout);
+
+ provider.setMessageStream(pout);
+ provide();
+
+ String messageOut = new String(bout.toByteArray());
+
+ System.out.println("-- Begin captured output --");
+ System.out.println(messageOut);
+ System.out.println("-- End captured output --");
+
+ assertTrue("Provider messages not correctly redirected",
+ messageOut.indexOf("org/jboss/test/ws/jaxws/smoke/tools/jaxws/Add.class") != -1 );
+ }
+
+ private void provide() throws Exception
+ {
+ //provider.setGenerateSource(true);
+ provider.setOutputDirectory(outputDirectory);
+ provider.provide(CalculatorBean.class);
+ }
+
+}
Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestService.wsdl
===================================================================
--- trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestService.wsdl (rev 0)
+++ trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestService.wsdl 2007-08-02 09:57:42 UTC (rev 4083)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<definitions name="TestService"
+ targetNamespace="http://www.openuri.org/2004/04/HelloWorld"
+ xmlns:tns="http://www.openuri.org/2004/04/HelloWorld"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+ <types/>
+ <message name="EndpointInterface_echo">
+ <part name="String_1" type="xsd:string"/>
+ </message>
+ <message name="EndpointInterface_echoResponse">
+ <part name="result" type="xsd:string"/>
+ </message>
+ <portType name="EndpointInterface">
+ <operation name="echo" parameterOrder="String_1">
+ <input message="tns:EndpointInterface_echo"/>
+ <output message="tns:EndpointInterface_echoResponse"/>
+ </operation>
+ </portType>
+ <binding name="EndpointInterfaceBinding" type="tns:EndpointInterface">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
+ <operation name="echo">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/>
+ </input>
+ <output>
+ <soap:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="TestService">
+ <port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
+</definitions>
Property changes on: trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl
===================================================================
--- trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl (rev 0)
+++ trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl 2007-08-02 09:57:42 UTC (rev 4083)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<definitions name="TestService"
+ targetNamespace="http://www.openuri.org/2004/04/HelloWorld"
+ xmlns:tns="http://www.openuri.org/2004/04/HelloWorld"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:wsaw='http://www.w3.org/2006/05/addressing/wsdl'>
+ <types/>
+ <message name="EndpointInterface_echo">
+ <part name="String_1" type="xsd:string"/>
+ </message>
+ <message name="EndpointInterface_echoResponse">
+ <part name="result" type="xsd:string"/>
+ </message>
+ <portType name="EndpointInterface">
+ <operation name="echo" parameterOrder="String_1">
+ <input message="tns:EndpointInterface_echo" wsaw:Action='http://foo.bar.com/action/echo'/>
+ <output message="tns:EndpointInterface_echoResponse"/>
+ </operation>
+ </portType>
+ <binding name="EndpointInterfaceBinding" type="tns:EndpointInterface">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
+ <operation name="echo">
+ <soap:operation soapAction=""/>
+ <input>
+ <soap:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/>
+ </input>
+ <output>
+ <soap:body use="literal" namespace="http://www.openuri.org/2004/04/HelloWorld"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="TestService">
+ <port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding">
+ <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
+ </port>
+ </service>
+</definitions>
Property changes on: trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/async-binding.xml
===================================================================
--- trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/async-binding.xml (rev 0)
+++ trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/async-binding.xml 2007-08-02 09:57:42 UTC (rev 4083)
@@ -0,0 +1,9 @@
+<bindings
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ wsdlLocation="TestService.wsdl"
+ xmlns="http://java.sun.com/xml/ns/jaxws">
+ <package name="org.jboss.test.ws.tools.testBindingFiles"/>
+ <enableWrapperStyle>true</enableWrapperStyle>
+ <enableAsyncMapping>true</enableAsyncMapping>
+</bindings>
+
Property changes on: trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/async-binding.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/jax-ws-catalog.xml
===================================================================
--- trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/jax-ws-catalog.xml (rev 0)
+++ trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/jax-ws-catalog.xml 2007-08-02 09:57:42 UTC (rev 4083)
@@ -0,0 +1,3 @@
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system">
+ <system systemId="http://www.w3.org/2006/05/addressing/wsdl" uri="ws-addr-wsdl.xsd"/>
+</catalog>
\ No newline at end of file
Property changes on: trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/jax-ws-catalog.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/ws-addr-wsdl.xsd
===================================================================
--- trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/ws-addr-wsdl.xsd (rev 0)
+++ trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/ws-addr-wsdl.xsd 2007-08-02 09:57:42 UTC (rev 4083)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd">
+<!--
+ W3C XML Schema defined in the Web Services Addressing 1.0
+ - WSDL Binding specification
+ http://www.w3.org/TR/ws-addr-core
+
+ Copyright © 2006 World Wide Web Consortium,
+
+ (Massachusetts Institute of Technology, European Research Consortium for
+ Informatics and Mathematics, Keio University). All Rights Reserved. This
+ work is distributed under the W3C® Software License [1] 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.
+
+ [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+ $Id$
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.w3.org/2006/05/addressing/wsdl" targetNamespace="http://www.w3.org/2006/05/addressing/wsdl" blockDefault="#all" elementFormDefault="qualified">
+
+ <xs:element name="ServiceName" type="tns:ServiceNameType"/>
+ <xs:complexType name="ServiceNameType">
+ <xs:simpleContent>
+ <xs:extension base="xs:QName">
+ <xs:attribute name="EndpointName" type="xs:NCName" use="optional"/>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:element name="InterfaceName" type="tns:AttributedQNameType"/>
+ <xs:complexType name="AttributedQNameType">
+ <xs:simpleContent>
+ <xs:extension base="xs:QName">
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+
+ <xs:attribute name="Action" type="xs:anyURI"/>
+
+ <xs:element name="UsingAddressing">
+ <xs:complexType>
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:simpleType name="AnonymousType">
+ <xs:restriction base="xs:token">
+ <xs:enumeration value="optional"/>
+ <xs:enumeration value="required"/>
+ <xs:enumeration value="prohibited"/>
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:element name="Anonymous">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="tns:AnonymousType">
+ <xs:anyAttribute namespace="##other" processContents="lax"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+
+</xs:schema>
\ No newline at end of file
Property changes on: trunk/testsuite/src/resources/jaxws/smoke/tools/wsdl/ws-addr-wsdl.xsd
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 4 months
- 1
- 0
JBossWS SVN: r4082 - in trunk: integration/jboss42 and 7 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-02 05:36:42 -0400 (Thu, 02 Aug 2007)
New Revision: 4082
Modified:
trunk/integration/jboss40/.classpath
trunk/integration/jboss42/.classpath
trunk/integration/jboss50/.classpath
trunk/integration/native/.classpath
trunk/integration/spi/.project
trunk/integration/sunri/.classpath
trunk/integration/xfire/.classpath
trunk/jbossws-core/.classpath
trunk/testsuite/.classpath
Log:
Fix eclipse classpath
Modified: trunk/integration/jboss40/.classpath
===================================================================
--- trunk/integration/jboss40/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
+++ trunk/integration/jboss40/.classpath 2007-08-02 09:36:42 UTC (rev 4082)
@@ -2,15 +2,15 @@
<classpath>
<classpathentry excluding="org/jboss/wsf/container/jboss42/jms/" kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/integration-spi"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxrpc-api.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxws-api.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/jsr181-api.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/saaj-api.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.0.x"/>
<classpathentry combineaccessrules="false" kind="src" path="/integration-jboss42"/>
<classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/>
<classpathentry combineaccessrules="false" kind="src" path="/spi"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxrpc-api.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxws-api.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/jsr181-api.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/saaj-api.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/jboss42/.classpath
===================================================================
--- trunk/integration/jboss42/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
+++ trunk/integration/jboss42/.classpath 2007-08-02 09:36:42 UTC (rev 4082)
@@ -3,12 +3,12 @@
<classpathentry excluding="org/jboss/wsf/container/jboss42/jms/" 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-4.2.x"/>
- <classpathentry combineaccessrules="false" kind="src" path="/integration-spi"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxrpc-api.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxws-api.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/jsr181-api.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/saaj-api.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/spi"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxws-api.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/jsr181-api.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/saaj-api.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxrpc-api.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/jboss50/.classpath
===================================================================
--- trunk/integration/jboss50/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
+++ trunk/integration/jboss50/.classpath 2007-08-02 09:36:42 UTC (rev 4082)
@@ -3,12 +3,12 @@
<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 combineaccessrules="false" kind="src" path="/integration-spi"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxrpc-api.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxws-api.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/jsr181-api.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/saaj-api.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/spi"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxws-api.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/jsr181-api.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/saaj-api.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxrpc-api.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/native/.classpath
===================================================================
--- trunk/integration/native/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
+++ trunk/integration/native/.classpath 2007-08-02 09:36:42 UTC (rev 4082)
@@ -3,12 +3,12 @@
<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 combineaccessrules="false" kind="src" path="/integration-spi"/>
<classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/jbossws-core/thirdparty/wsdl4j.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/activation.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/spi"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/activation.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/jboss-common-core.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/spi/.project
===================================================================
--- trunk/integration/spi/.project 2007-08-02 09:23:17 UTC (rev 4081)
+++ trunk/integration/spi/.project 2007-08-02 09:36:42 UTC (rev 4082)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>integration-spi</name>
+ <name>integration-framework</name>
<comment></comment>
<projects>
</projects>
Modified: trunk/integration/sunri/.classpath
===================================================================
--- trunk/integration/sunri/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
+++ trunk/integration/sunri/.classpath 2007-08-02 09:36:42 UTC (rev 4082)
@@ -20,10 +20,10 @@
<classpathentry kind="lib" path="thirdparty/stax-ex.jar"/>
<classpathentry kind="lib" path="thirdparty/streambuffer.jar"/>
<classpathentry kind="lib" path="thirdparty/servlet-api.jar"/>
- <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 combineaccessrules="false" kind="src" path="/spi"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/jboss-common-core.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/xfire/.classpath
===================================================================
--- trunk/integration/xfire/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
+++ trunk/integration/xfire/.classpath 2007-08-02 09:36:42 UTC (rev 4082)
@@ -6,10 +6,7 @@
<classpathentry kind="lib" path="thirdparty/jaxb-impl.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/>
<classpathentry kind="lib" path="thirdparty/servlet-api.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/integration-spi"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-common-core.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/integration-jboss50"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
<classpathentry kind="lib" path="thirdparty/cxf-incubator.jar" sourcepath="/home/tdiesler/Download/java/apache/cxf/apache-cxf-2.0-incubator-src.zip"/>
@@ -20,5 +17,8 @@
<classpathentry kind="lib" path="thirdparty/spring-core.jar"/>
<classpathentry kind="lib" path="thirdparty/spring-web.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/spi"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/jboss-common-core.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/jbossws-core/.classpath
===================================================================
--- trunk/jbossws-core/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
+++ trunk/jbossws-core/.classpath 2007-08-02 09:36:42 UTC (rev 4082)
@@ -30,13 +30,13 @@
<classpathentry kind="lib" path="thirdparty/qdox.jar"/>
<classpathentry kind="lib" path="thirdparty/policy.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/>
- <classpathentry combineaccessrules="false" kind="src" path="/integration-spi"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/junit.jar"/>
<classpathentry kind="lib" path="thirdparty/dom4j.jar"/>
<classpathentry kind="lib" path="thirdparty/xmlunit.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxws-tools.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxws-rt.jar"/>
<classpathentry kind="lib" path="thirdparty/concurrent.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/spi"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/junit.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/testsuite/.classpath
===================================================================
--- trunk/testsuite/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
+++ trunk/testsuite/.classpath 2007-08-02 09:36:42 UTC (rev 4082)
@@ -3,18 +3,16 @@
<classpathentry excluding="org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.java" kind="src" path="src/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 combineaccessrules="false" kind="src" path="/integration-spi"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxrpc-api.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxws-api.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-logging-spi.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/jsr181-api.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/saaj-api.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/junit.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/activation.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxb-api.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/jaxb-impl.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/stax-api.jar"/>
- <classpathentry kind="lib" path="/integration-spi/thirdparty/wsdl4j.jar" sourcepath="/integration-spi/thirdparty/wsdl4j-src.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/spi"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/activation.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxb-api.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxrpc-api.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxws-api.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/jsr181-api.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/saaj-api.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/wsdl4j.jar"/>
+ <classpathentry kind="lib" path="/integration-framework/thirdparty/junit.jar"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
17 years, 4 months
- 1
- 0
JBossWS SVN: r4081 - in trunk: build/ant-import and 35 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-02 05:23:17 -0400 (Thu, 02 Aug 2007)
New Revision: 4081
Added:
trunk/integration/spi/ant-import/macros-deploy-wsf.xml
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParser.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParserFactory.java
Removed:
trunk/integration/spi/ant-import/macros-deploy-spi.xml
trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java
trunk/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/
Modified:
trunk/build/ant-import/build-release.xml
trunk/build/ant-import/build-samples.xml
trunk/build/ant-import/build-setup.xml
trunk/build/build.xml
trunk/build/version.properties
trunk/integration/jboss40/.classpath
trunk/integration/jboss40/ant-import/build-thirdparty.xml
trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java
trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml
trunk/integration/jboss42/.classpath
trunk/integration/jboss42/ant-import/build-thirdparty.xml
trunk/integration/jboss42/build.xml
trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/KernelLocator.java
trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml
trunk/integration/jboss50/.classpath
trunk/integration/jboss50/ant-import/build-thirdparty.xml
trunk/integration/jboss50/build.xml
trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
trunk/integration/native/.classpath
trunk/integration/native/ant-import/build-bin-dist.xml
trunk/integration/native/ant-import/build-deploy.xml
trunk/integration/native/ant-import/build-testsuite.xml
trunk/integration/native/ant-import/build-thirdparty.xml
trunk/integration/native/ant-import/macros-deploy-native.xml
trunk/integration/native/build.xml
trunk/integration/native/src/main/etc/bin-dist-build.xml
trunk/integration/spi/.classpath
trunk/integration/spi/ant-import/build-release.xml
trunk/integration/spi/ant-import/build-thirdparty.xml
trunk/integration/spi/build.xml
trunk/integration/spi/src/main/etc/component-info.xml
trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java
trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java
trunk/integration/sunri/.classpath
trunk/integration/sunri/ant-import/build-bin-dist.xml
trunk/integration/sunri/ant-import/build-deploy.xml
trunk/integration/sunri/ant-import/build-testsuite.xml
trunk/integration/sunri/ant-import/build-thirdparty.xml
trunk/integration/sunri/build.xml
trunk/integration/sunri/src/main/etc/bin-dist-build.xml
trunk/integration/xfire/.classpath
trunk/integration/xfire/ant-import/build-bin-dist.xml
trunk/integration/xfire/ant-import/build-deploy.xml
trunk/integration/xfire/ant-import/build-testsuite.xml
trunk/integration/xfire/ant-import/build-thirdparty.xml
trunk/integration/xfire/ant-import/macros-deploy-xfire.xml
trunk/integration/xfire/build.xml
trunk/integration/xfire/src/main/etc/bin-dist-build.xml
trunk/jbossws-core/.classpath
trunk/jbossws-core/ant-import-tests/build-testsuite.xml
trunk/jbossws-core/ant-import/build-thirdparty.xml
trunk/jbossws-core/build.xml
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java
trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java
trunk/testsuite/.classpath
Log:
Externalize jbossws-spi.jar
Modified: trunk/build/ant-import/build-release.xml
===================================================================
--- trunk/build/ant-import/build-release.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/build/ant-import/build-release.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -36,7 +36,7 @@
</target>
<target name="release-to-repository" depends="prepare" description="Release to local repository">
- <ant antfile="${spi.dir}/build.xml" target="release" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="release" inheritall="false"/>
<ant antfile="${core.dir}/build.xml" target="release" inheritall="false"/>
<ant antfile="${int.jboss50.dir}/build.xml" target="release" inheritall="false"/>
<ant antfile="${int.jboss42.dir}/build.xml" target="release" inheritall="false"/>
Modified: trunk/build/ant-import/build-samples.xml
===================================================================
--- trunk/build/ant-import/build-samples.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/build/ant-import/build-samples.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -67,7 +67,6 @@
<mkdir dir="${build.src.samples.dir}/lib"/>
<copy todir="${build.src.samples.dir}/lib">
<fileset dir="${core.output.lib.dir}">
- <include name="jbossws-spi.jar"/>
<include name="jbossws-client.jar"/>
<include name="jbossws-core.jar"/>
<include name="jboss-jaxrpc.jar"/>
Modified: trunk/build/ant-import/build-setup.xml
===================================================================
--- trunk/build/ant-import/build-setup.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/build/ant-import/build-setup.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -18,7 +18,7 @@
<!-- ================================================================== -->
<property name="build.dir" value="${basedir}/build"/>
- <property name="spi.dir" value="${basedir}/integration/spi"/>
+ <property name="framework.dir" value="${basedir}/integration/spi"/>
<property name="core.dir" value="${basedir}/jbossws-core"/>
<property name="testsuite.dir" value="${basedir}/testsuite"/>
<property name="int.jboss50.dir" value="${basedir}/integration/jboss50"/>
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/build/build.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -113,7 +113,7 @@
| Build all jar files.
-->
<target name="jars" depends="prepare" description="Builds all jar files.">
- <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/>
<ant antfile="${core.dir}/build.xml" target="jars" inheritall="false"/>
</target>
@@ -123,7 +123,7 @@
<target name="clean" depends="prepare" description="Cleans up most generated files.">
<delete dir="${build.dir}/output"/>
- <ant antfile="${spi.dir}/build.xml" target="clean" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${core.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${int.jboss50.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${int.jboss42.dir}/build.xml" target="clean" inheritall="false"/>
@@ -136,7 +136,7 @@
<target name="clobber" depends="prepare" description="Cleans up all generated files.">
<delete dir="${build.dir}/output"/>
- <ant antfile="${spi.dir}/build.xml" target="clobber" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${core.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${testsuite.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${int.jboss50.dir}/build.xml" target="clobber" inheritall="false"/>
Modified: trunk/build/version.properties
===================================================================
--- trunk/build/version.properties 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/build/version.properties 2007-08-02 09:23:17 UTC (rev 4081)
@@ -24,6 +24,7 @@
jboss-jaxr=1.2.0.GA
jboss-jbossxb=1.0.0.GA-brew
jboss-microcontainer=2.0.0.Beta3
+jbossws-spi=2.0.1.CR1
junit=3.8.1
stax-api=1.0
sun-jaf=1.1
Modified: trunk/integration/jboss40/.classpath
===================================================================
--- trunk/integration/jboss40/.classpath 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss40/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
@@ -11,5 +11,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.0.x"/>
<classpathentry combineaccessrules="false" kind="src" path="/integration-jboss42"/>
<classpathentry combineaccessrules="false" kind="src" path="/jbossws-core"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/jboss40/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/jboss40/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss40/ant-import/build-thirdparty.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -32,12 +32,13 @@
<!-- The compile classpath for jboss40 integration -->
<path id="jbws40.integration.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
<pathelement location="${core.dir}/output/lib/jbossws-core.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jaxws-api.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jaxrpc-api.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jsr181-api.jar"/>
- <pathelement location="${spi.dir}/thirdparty/saaj-api.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jaxws-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jaxrpc-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jsr181-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/saaj-api.jar"/>
<pathelement location="${jboss40.lib}/jboss-common.jar"/>
<pathelement location="${jboss40.lib}/jboss-jmx.jar"/>
<pathelement location="${jboss40.lib}/jboss-system.jar"/>
Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java
===================================================================
--- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/ServiceRefMetaDataAdapterFactory.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -25,7 +25,7 @@
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-import org.jboss.wsf.common.KernelLocator;
+import org.jboss.wsf.spi.util.KernelLocator;
/**
* @author Thomas.Diesler(a)jboss.org
Modified: trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml
===================================================================
--- trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -1,6 +1,6 @@
<!-- Locate the single instance of the kernel -->
- <bean name="WSKernelLocator" class="org.jboss.wsf.common.KernelLocator">
+ <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator">
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
</bean>
@@ -12,9 +12,6 @@
<property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property>
</bean>
- <!-- Bind Service objects in client environment context -->
- <bean name="ServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/>
-
<!--
*********************************************************************************************************************
Web Service deployment
Modified: trunk/integration/jboss42/.classpath
===================================================================
--- trunk/integration/jboss42/.classpath 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss42/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
@@ -9,5 +9,6 @@
<classpathentry kind="lib" path="/integration-spi/thirdparty/jsr181-api.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/saaj-api.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/jboss42/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -32,11 +32,12 @@
<!-- The compile classpath for jboss42 integration -->
<path id="jbws42.integration.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jaxws-api.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jaxrpc-api.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jsr181-api.jar"/>
- <pathelement location="${spi.dir}/thirdparty/saaj-api.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jaxws-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jaxrpc-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jsr181-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/saaj-api.jar"/>
<pathelement location="${jboss42.lib}/jboss-common.jar"/>
<pathelement location="${jboss42.lib}/jboss-jmx.jar"/>
<pathelement location="${jboss42.lib}/jboss-system.jar"/>
Modified: trunk/integration/jboss42/build.xml
===================================================================
--- trunk/integration/jboss42/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss42/build.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -39,7 +39,7 @@
<target name="init" depends="prepare, thirdparty">
<fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
- <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/>
</target>
<!-- ================================================================== -->
Modified: trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/KernelLocator.java
===================================================================
--- trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/KernelLocator.java 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss42/src/main/java/org/jboss/ws/integration/KernelLocator.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -32,6 +32,6 @@
{
public static Kernel getKernel()
{
- return org.jboss.wsf.common.KernelLocator.getKernel();
+ return org.jboss.wsf.spi.util.KernelLocator.getKernel();
}
}
Modified: trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml
===================================================================
--- trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -1,6 +1,6 @@
<!-- Locate the single instance of the kernel -->
- <bean name="WSKernelLocator" class="org.jboss.wsf.common.KernelLocator">
+ <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator">
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
</bean>
Modified: trunk/integration/jboss50/.classpath
===================================================================
--- trunk/integration/jboss50/.classpath 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss50/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
@@ -9,5 +9,6 @@
<classpathentry kind="lib" path="/integration-spi/thirdparty/jsr181-api.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/saaj-api.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/dom4j.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/jboss50/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -32,11 +32,12 @@
<!-- The compile classpath for jboss50 integration -->
<path id="jbws50.integration.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jaxws-api.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jaxrpc-api.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jsr181-api.jar"/>
- <pathelement location="${spi.dir}/thirdparty/saaj-api.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jaxws-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jaxrpc-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jsr181-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/saaj-api.jar"/>
<pathelement location="${jboss50.lib}/dom4j.jar"/>
<pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/>
<pathelement location="${jboss50.lib}/jboss-common-core.jar"/>
Modified: trunk/integration/jboss50/build.xml
===================================================================
--- trunk/integration/jboss50/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss50/build.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -39,7 +39,7 @@
<target name="init" depends="prepare,thirdparty">
<fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
- <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/>
</target>
<!-- ================================================================== -->
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-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -3,7 +3,7 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<!-- Locate the single instance of the kernel -->
- <bean name="WSKernelLocator" class="org.jboss.wsf.common.KernelLocator">
+ <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator">
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
</bean>
Modified: trunk/integration/native/.classpath
===================================================================
--- trunk/integration/native/.classpath 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/native/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
@@ -9,5 +9,6 @@
<classpathentry kind="lib" path="/integration-spi/thirdparty/jboss-common-core.jar"/>
<classpathentry kind="lib" path="/jbossws-core/thirdparty/wsdl4j.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/activation.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/native/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/native/ant-import/build-bin-dist.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/native/ant-import/build-bin-dist.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -57,7 +57,7 @@
<fileset dir="${int.sunri.dir}/ant-import">
<include name="macros-deploy-sunri.xml"/>
</fileset>
- <fileset dir="${spi.dir}/ant-import">
+ <fileset dir="${framework.dir}/ant-import">
<include name="macros-deploy-spi.xml"/>
</fileset>
<fileset dir="${int.xfire.dir}/ant-import">
@@ -69,7 +69,7 @@
</copy>
<copy todir="${bindist.bin.dir}">
- <fileset dir="${spi.dir}/src/main/etc">
+ <fileset dir="${framework.dir}/src/main/etc">
<include name="*.sh"/>
<include name="*.bat"/>
</fileset>
@@ -109,9 +109,9 @@
<!-- lib -->
<copy todir="${bindist.lib.dir}" overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.jar"/>
- <include name="jbossws-spi-scripts.zip"/>
+ <fileset dir="${framework.dir}/output/lib">
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-framework-scripts.zip"/>
</fileset>
<fileset dir="${int.jboss50.dir}/output/lib">
<include name="jbossws-jboss50.jar"/>
Modified: trunk/integration/native/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/native/ant-import/build-deploy.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/native/ant-import/build-deploy.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -14,7 +14,7 @@
<project>
<import file="${int.native.dir}/ant-import/macros-deploy-native.xml"/>
- <import file="${spi.dir}/ant-import/macros-deploy-spi.xml"/>
+ <import file="${framework.dir}/ant-import/macros-deploy-wsf.xml"/>
<!-- ================================================================== -->
<!-- Deployment JBoss50 -->
@@ -25,14 +25,14 @@
<ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<macro-deploy-native50
- spilibs="${spi.dir}/output/lib"
+ wsflibs="${framework.dir}/output/lib"
jbosslibs="${int.jboss50.dir}/output/lib"
corelibs="${core.dir}/output/lib"
stacklibs="${int.native.dir}/output/lib"
thirdpartylibs="${core.dir}/thirdparty"/>
- <macro-deploy-spi
- spilibs="${spi.dir}/output/lib"
- thirdpartylibs="${spi.dir}/thirdparty"
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
jbosshome="${jboss50.home}"/>
<!-- [JBWS-1617] JAXRPC doc/literal trims empty string
@@ -51,7 +51,7 @@
<!-- Remove jbossws from jboss50 -->
<target name="undeploy-jboss50" depends="prepare,undeploy-jboss50-endorsed" description="Remove jbossws from jboss50">
<macro-undeploy-native50/>
- <macro-undeploy-spi jbosshome="${jboss50.home}"/>
+ <macro-undeploy-wsf jbosshome="${jboss50.home}"/>
</target>
<target name="undeploy-jboss50-endorsed" depends="prepare">
@@ -63,14 +63,14 @@
<ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<macro-deploy-native42
- spilibs="${spi.dir}/output/lib"
+ wsflibs="${framework.dir}/output/lib"
jbosslibs="${int.jboss42.dir}/output/lib"
corelibs="${core.dir}/output/lib"
stacklibs="${int.native.dir}/output/lib"
thirdpartylibs="${core.dir}/thirdparty"/>
- <macro-deploy-spi
- spilibs="${spi.dir}/output/lib"
- thirdpartylibs="${spi.dir}/thirdparty"
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
jbosshome="${jboss42.home}"/>
<!-- [JBWS-1617] JAXRPC doc/literal trims empty string
@@ -90,7 +90,7 @@
<!-- Remove jbossws from jboss42 -->
<target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws from jboss42">
<macro-undeploy-native42/>
- <macro-undeploy-spi jbosshome="${jboss42.home}"/>
+ <macro-undeploy-wsf jbosshome="${jboss42.home}"/>
</target>
<target name="undeploy-jboss42-endorsed" depends="prepare">
<macro-undeploy-endorsed jbosshome="${jboss42.home}"/>
@@ -101,14 +101,14 @@
<target name="deploy-jboss40-ejb3">
<macro-deploy-native40
- spilibs="${spi.dir}/output/lib"
+ wsflibs="${framework.dir}/output/lib"
jbosslibs="${int.jboss40.dir}/output/lib"
corelibs="${core.dir}/output/lib"
stacklibs="${int.native.dir}/output/lib"
thirdpartylibs="${core.dir}/thirdparty"/>
- <macro-deploy-spi
- spilibs="${spi.dir}/output/lib"
- thirdpartylibs="${spi.dir}/thirdparty"
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
jbosshome="${jboss40.home}"/>
</target>
@@ -125,6 +125,6 @@
<!-- Remove jbossws from jboss40 -->
<target name="undeploy-jboss40" depends="prepare" description="Remove jbossws from jboss40">
<macro-undeploy-native40/>
- <macro-undeploy-spi jbosshome="${jboss40.home}"/>
+ <macro-undeploy-wsf jbosshome="${jboss40.home}"/>
</target>
</project>
Modified: trunk/integration/native/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/native/ant-import/build-testsuite.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/native/ant-import/build-testsuite.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -27,7 +27,7 @@
<target name="tests-init" depends="tests-classpath">
<path id="ws.stack.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
Modified: trunk/integration/native/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/native/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/native/ant-import/build-thirdparty.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -31,12 +31,13 @@
<target name="thirdparty-classpath" depends="thirdparty-init">
<path id="native.integration.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
- <pathelement location="${spi.dir}/thirdparty/activation.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/servlet-api.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/activation.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/dom4j.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jboss-common-core.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jboss-logging-spi.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/servlet-api.jar"/>
<pathelement location="${core.dir}/output/lib/jbossws-core.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
Modified: trunk/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- trunk/integration/native/ant-import/macros-deploy-native.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/native/ant-import/macros-deploy-native.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -18,7 +18,7 @@
<!-- ================================================================== -->
<macrodef name="macro-deploy-native50">
- <attribute name="spilibs"/>
+ <attribute name="wsflibs"/>
<attribute name="jbosslibs"/>
<attribute name="corelibs"/>
<attribute name="stacklibs"/>
@@ -127,7 +127,7 @@
</macrodef>
<macrodef name="macro-deploy-native42">
- <attribute name="spilibs"/>
+ <attribute name="wsflibs"/>
<attribute name="jbosslibs"/>
<attribute name="corelibs"/>
<attribute name="stacklibs"/>
@@ -233,7 +233,7 @@
</macrodef>
<macrodef name="macro-deploy-native40">
- <attribute name="spilibs"/>
+ <attribute name="wsflibs"/>
<attribute name="jbosslibs"/>
<attribute name="corelibs"/>
<attribute name="stacklibs"/>
Modified: trunk/integration/native/build.xml
===================================================================
--- trunk/integration/native/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/native/build.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -277,7 +277,7 @@
defaultexcludes="yes">
<classpath>
<pathelement path="${native.integration.classpath}"/>
- <fileset dir="${spi.dir}/thirdparty">
+ <fileset dir="${framework.dir}/thirdparty">
<include name="**/*.jar"/>
</fileset>
<fileset dir="${core.dir}/thirdparty">
@@ -289,7 +289,7 @@
<include name="org/jboss/wsf/**"/>
<include name="org/jboss/ws/**"/>
</packageset>
- <packageset dir="${spi.dir}/src/main/java">
+ <packageset dir="${framework.dir}/src/main/java">
<include name="org/jboss/wsf/**"/>
<include name="org/jboss/ws/**"/>
</packageset>
Modified: trunk/integration/native/src/main/etc/bin-dist-build.xml
===================================================================
--- trunk/integration/native/src/main/etc/bin-dist-build.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/native/src/main/etc/bin-dist-build.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -95,6 +95,7 @@
<target name="tests-init" depends="prepare,tests-classpath">
<path id="ws.stack.classpath">
+ <pathelement location="${lib.dir}/jbossws-framework.jar"/>
<pathelement location="${lib.dir}/jbossws-spi.jar"/>
<pathelement location="${lib.dir}/jboss-jaxrpc.jar"/>
<pathelement location="${lib.dir}/jboss-jaxws.jar"/>
Modified: trunk/integration/spi/.classpath
===================================================================
--- trunk/integration/spi/.classpath 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/spi/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
@@ -23,5 +23,6 @@
<classpathentry kind="lib" path="thirdparty/getopt.jar"/>
<classpathentry kind="lib" path="thirdparty/saaj-api.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/spi/ant-import/build-release.xml
===================================================================
--- trunk/integration/spi/ant-import/build-release.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/spi/ant-import/build-release.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -21,13 +21,13 @@
<property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
<mkdir dir="${jboss.repository.dir}/jbossws/${repository.id}/lib"/>
<copy todir="${jboss.repository.dir}/jbossws-spi/${repository.id}/lib" overwrite="true">
- <fileset dir="${spi.output.lib.dir}">
- <include name="jbossws-spi.jar"/>
- <include name="jbossws-spi-src.zip"/>
- <include name="jbossws-spi-scripts.zip"/>
+ <fileset dir="${framework.output.lib.dir}">
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-framework-src.zip"/>
+ <include name="jbossws-framework-scripts.zip"/>
</fileset>
</copy>
- <copy tofile="${jboss.repository.dir}/jbossws-spi/${repository.id}/component-info.xml" file="${spi.etc.dir}/component-info.xml" filtering="true" overwrite="true">
+ <copy tofile="${jboss.repository.dir}/jbossws-spi/${repository.id}/component-info.xml" file="${framework.etc.dir}/component-info.xml" filtering="true" overwrite="true">
<filterset>
<filtersfile file="${build.dir}/version.properties"/>
</filterset>
Modified: trunk/integration/spi/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/spi/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/spi/ant-import/build-thirdparty.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -21,7 +21,7 @@
<target name="thirdparty-init" depends="prepare">
- <property name="thirdparty.dir" value="${spi.dir}/thirdparty"/>
+ <property name="thirdparty.dir" value="${framework.dir}/thirdparty"/>
<checksum file="${build.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/>
<condition property="force.thirdparty">
<or>
@@ -48,6 +48,7 @@
<get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/gnu-getopt/${gnu-getopt}/lib/getopt.jar" dest="${thirdparty.dir}/getopt.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/>
@@ -87,6 +88,7 @@
<pathelement location="${thirdparty.dir}/jboss-javaee.jar"/>
<pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/>
<pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/>
Deleted: trunk/integration/spi/ant-import/macros-deploy-spi.xml
===================================================================
--- trunk/integration/spi/ant-import/macros-deploy-spi.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/spi/ant-import/macros-deploy-spi.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project>
-
- <macrodef name="macro-deploy-spi">
- <attribute name="spilibs"/>
- <attribute name="thirdpartylibs"/>
- <attribute name="jbosshome"/>
- <sequential>
-
- <!-- BIN SCRIPTS -->
- <unzip dest="@{jbosshome}/bin" src="@{spilibs}/jbossws-spi-scripts.zip"/>
- <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/>
-
- <!-- CLIENT JARS-->
- <copy todir="@{jbosshome}/client">
- <fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <include name="wsdl4j.jar"/>
- </fileset>
- </copy>
-
- <!-- SERVER JARS-->
- <copy todir="@{jbosshome}/server/${jboss.server.instance}/lib">
- <fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-undeploy-spi">
- <attribute name="jbosshome"/>
- <sequential>
- <delete>
- <!-- BIN SCRIPTS -->
- <fileset dir="@{jbosshome}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- </fileset>
-
- <!-- CLIENT JARS-->
- <fileset dir="@{jbosshome}/client">
- <include name="jbossws-spi.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
-
- <!-- SERVER JARS-->
- <fileset dir="@{jbosshome}/server/${jboss.server.instance}/lib">
- <include name="jbossws-spi.jar"/>
- </fileset>
- </delete>
- </sequential>
- </macrodef>
-
-</project>
\ No newline at end of file
Copied: trunk/integration/spi/ant-import/macros-deploy-wsf.xml (from rev 4080, branches/tdiesler/trunk/integration/spi/ant-import/macros-deploy-wsf.xml)
===================================================================
--- trunk/integration/spi/ant-import/macros-deploy-wsf.xml (rev 0)
+++ trunk/integration/spi/ant-import/macros-deploy-wsf.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id: macros-deploy-spi.xml 3620 2007-06-18 20:39:56Z heiko.braun(a)jboss.com $ -->
+
+<project>
+
+ <macrodef name="macro-deploy-wsf">
+ <attribute name="wsflibs"/>
+ <attribute name="thirdpartylibs"/>
+ <attribute name="jbosshome"/>
+ <sequential>
+
+ <!-- BIN SCRIPTS -->
+ <unzip dest="@{jbosshome}/bin" src="@{wsflibs}/jbossws-framework-scripts.zip"/>
+ <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/>
+
+ <!-- CLIENT JARS-->
+ <copy todir="@{jbosshome}/client">
+ <fileset dir="@{wsflibs}">
+ <include name="jbossws-framework.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-spi.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- SERVER JARS-->
+ <copy todir="@{jbosshome}/server/${jboss.server.instance}/lib">
+ <fileset dir="@{wsflibs}">
+ <include name="jbossws-framework.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-wsf">
+ <attribute name="jbosshome"/>
+ <sequential>
+ <delete>
+ <!-- BIN SCRIPTS -->
+ <fileset dir="@{jbosshome}/bin">
+ <include name="wsconsume.*"/>
+ <include name="wsprovide.*"/>
+ </fileset>
+
+ <!-- CLIENT JARS-->
+ <fileset dir="@{jbosshome}/client">
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-spi.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+
+ <!-- SERVER JARS-->
+ <fileset dir="@{jbosshome}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ </delete>
+ </sequential>
+ </macrodef>
+
+</project>
\ No newline at end of file
Modified: trunk/integration/spi/build.xml
===================================================================
--- trunk/integration/spi/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/spi/build.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -15,22 +15,22 @@
<import file="${basedir}/build/ant-import/build-setup.xml"/>
- <import file="${spi.dir}/ant-import/build-release.xml"/>
- <import file="${spi.dir}/ant-import/build-thirdparty.xml"/>
+ <import file="${framework.dir}/ant-import/build-release.xml"/>
+ <import file="${framework.dir}/ant-import/build-thirdparty.xml"/>
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
- <property name="spi.src.dir" value="${spi.dir}/src/main"/>
- <property name="spi.etc.dir" value="${spi.src.dir}/etc"/>
- <property name="spi.java.dir" value="${spi.src.dir}/java"/>
- <property name="spi.resources.dir" value="${spi.src.dir}/resources"/>
- <property name="spi.output.dir" value="${spi.dir}/output"/>
- <property name="spi.output.apidocs.dir" value="${spi.output.dir}/apidocs"/>
- <property name="spi.output.etc.dir" value="${spi.output.dir}/etc"/>
- <property name="spi.output.classes.dir" value="${spi.output.dir}/classes"/>
- <property name="spi.output.lib.dir" value="${spi.output.dir}/lib"/>
+ <property name="framework.src.dir" value="${framework.dir}/src/main"/>
+ <property name="framework.etc.dir" value="${framework.src.dir}/etc"/>
+ <property name="framework.java.dir" value="${framework.src.dir}/java"/>
+ <property name="framework.resources.dir" value="${framework.src.dir}/resources"/>
+ <property name="framework.output.dir" value="${framework.dir}/output"/>
+ <property name="framework.output.apidocs.dir" value="${framework.output.dir}/apidocs"/>
+ <property name="framework.output.etc.dir" value="${framework.output.dir}/etc"/>
+ <property name="framework.output.classes.dir" value="${framework.output.dir}/classes"/>
+ <property name="framework.output.lib.dir" value="${framework.output.dir}/lib"/>
<!-- ================================================================== -->
<!-- Initialization -->
@@ -58,8 +58,8 @@
<target name="compile-classes" depends="init">
<!-- Compile spi classes with jdk1.5 -->
- <mkdir dir="${spi.output.classes.dir}"/>
- <javac srcdir="${spi.java.dir}" sourcepath="" destdir="${spi.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ <mkdir dir="${framework.output.classes.dir}"/>
+ <javac srcdir="${framework.java.dir}" sourcepath="" destdir="${framework.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5">
<include name="org/jboss/wsf/**"/>
<classpath refid="spi.thirdparty.classpath"/>
@@ -68,12 +68,9 @@
<!-- Compile etc files (manifests and such) -->
<target name="compile-etc" depends="init">
- <mkdir dir="${spi.output.etc.dir}"/>
- <copy todir="${spi.output.etc.dir}" filtering="yes">
- <fileset dir="${spi.etc.dir}"/>
- <fileset dir="${spi.etc.dir}">
- <include name="default.mf"/>
- </fileset>
+ <mkdir dir="${framework.output.etc.dir}"/>
+ <copy todir="${framework.output.etc.dir}" filtering="yes">
+ <fileset dir="${framework.etc.dir}"/>
<filterset>
<filter token="java.vm.version" value="${java.vm.version}"/>
<filter token="java.vm.vendor" value="${java.vm.vendor}"/>
@@ -99,29 +96,31 @@
-->
<target name="module-jars">
- <!-- Build jbossws-spi.jar -->
- <mkdir dir="${spi.output.lib.dir}"/>
- <jar jarfile="${spi.output.lib.dir}/jbossws-spi.jar" manifest="${spi.output.etc.dir}/default.mf">
- <fileset dir="${spi.output.classes.dir}">
- <include name="org/jboss/wsf/**"/>
+ <!-- Build jbossws-framework.jar -->
+ <mkdir dir="${framework.output.lib.dir}"/>
+ <jar jarfile="${framework.output.lib.dir}/jbossws-framework.jar" manifest="${framework.output.etc.dir}/default.mf">
+ <fileset dir="${framework.output.classes.dir}">
+ <include name="org/jboss/wsf/common/**"/>
+ <include name="org/jboss/wsf/framework/**"/>
+ <include name="org/jboss/wsf/test/**"/>
</fileset>
</jar>
<!-- Build jbossws-spi-scripts.zip -->
- <zip zipfile="${spi.output.lib.dir}/jbossws-spi-scripts.zip" >
- <fileset dir="${spi.output.etc.dir}">
+ <zip zipfile="${framework.output.lib.dir}/jbossws-framework-scripts.zip" >
+ <fileset dir="${framework.output.etc.dir}">
<include name="wsconsume.bat"/>
<include name="wsprovide.bat"/>
</fileset>
- <zipfileset dir="${spi.output.etc.dir}" filemode="755">
+ <zipfileset dir="${framework.output.etc.dir}" filemode="755">
<include name="wsconsume.sh"/>
<include name="wsprovide.sh"/>
</zipfileset>
</zip>
<!-- Build jbossws-spi-src.zip -->
- <zip zipfile="${spi.output.lib.dir}/jbossws-spi-src.zip" >
- <fileset dir="${spi.java.dir}"/>
+ <zip zipfile="${framework.output.lib.dir}/jbossws-framework-src.zip" >
+ <fileset dir="${framework.java.dir}"/>
</zip>
</target>
@@ -133,11 +132,10 @@
<!-- Generate the JavaDoc -->
<target name="javadoc" depends="init" description="Generate the Javadoc">
- <mkdir dir="${spi.output.apidocs.dir}"/>
- <javadoc destdir="${spi.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
+ <mkdir dir="${framework.output.apidocs.dir}"/>
+ <javadoc destdir="${framework.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
<classpath refid="spi.thirdparty.classpath"/>
- <packageset dir="${spi.java.dir}" defaultexcludes="yes">
- <include name="org/jboss/ws/**"/>
+ <packageset dir="${framework.java.dir}" defaultexcludes="yes">
<include name="org/jboss/wsf/**"/>
</packageset>
<doctitle><![CDATA[<h1>JBoss Web Service Framework - SPI</h1>]]></doctitle>
@@ -146,11 +144,11 @@
</target>
<target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${spi.output.dir}"/>
+ <delete dir="${framework.output.dir}"/>
</target>
<target name="clobber" depends="clean" description="Cleans up all generated files.">
- <delete dir="${spi.dir}/thirdparty"/>
+ <delete dir="${framework.dir}/thirdparty"/>
</target>
<target name="main" description="Executes the default target (most)." depends="most"/>
Modified: trunk/integration/spi/src/main/etc/component-info.xml
===================================================================
--- trunk/integration/spi/src/main/etc/component-info.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/spi/src/main/etc/component-info.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -1,28 +1,18 @@
-<project name="jboss/jbossws-spi">
+<project name="jboss/jbossws-framework">
- <component id="jboss/jbossws-spi"
+ <component id="jboss/jbossws-framework"
description="JBossWS SPI"
version="@repository.id@"
licenseType="lgpl">
- <artifact id="jbossws-spi.jar"/>
- <artifact id="jbossws-spi-scripts.zip"/>
+ <artifact id="jbossws-framework.jar"/>
+ <artifact id="jbossws-framework-scripts.zip"/>
- <import componentref="sun-jaxb">
- <compatible version="@sun-jaxb@"/>
+ <import componentref="jbossws-spi">
+ <compatible version="@jbossws-spi@"/>
</import>
- <import componentref="sun-jaxws">
- <compatible version="@sun-jaxws@"/>
- </import>
-
- <import componentref="woodstox">
- <compatible version="@woodstox@"/>
- <compatible version="@woodstox@-brew"/>
- </import>
-
<export>
- <include input="jbossws-spi.jar"/>
</export>
</component>
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelAwareSPIFactory.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -24,7 +24,7 @@
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-import org.jboss.wsf.common.KernelLocator;
+import org.jboss.wsf.spi.util.KernelLocator;
/**
* @author Heiko.Braun(a)jboss.com
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/common/KernelLocator.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -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.common;
-
-//$Id: KernelLocator.java 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $
-
-import org.jboss.kernel.Kernel;
-
-/**
- * Locate the single instance of the kernel
- *
- * @author Thomas.Diesler(a)jboss.org
- * @since 12-May-2006
- */
-public class KernelLocator
-{
- private static Kernel kernel;
-
- public static Kernel getKernel()
- {
- return KernelLocator.kernel;
- }
-
- public void setKernel(Kernel kernel)
- {
- KernelLocator.kernel = kernel;
- }
-}
Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/common/ServiceLoader.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -1,251 +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.common;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Properties;
-
-// $Id$
-
-/**
- * Load a service class using this ordered lookup procedure
- *
- * @author Thomas.Diesler(a)jboss.com
- * @since 14-Dec-2006
- */
-public abstract class ServiceLoader
-{
- /**
- * This method uses the algorithm below using the JAXWS Provider as an example.
- *
- * 1. If a resource with the name of META-INF/services/javax.xml.ws.spi.Provider exists, then
- * its first line, if present, is used as the UTF-8 encoded name of the implementation class.
- *
- * 2. If the ${java.home}/lib/jaxws.properties file exists and it is readable by the
- * java.util.Properties.load(InputStream) method and it contains an entry whose key is
- * javax.xml.ws.spi.Provider, then the value of that entry is used as the name of the implementation class.
- *
- * 3. If a system property with the name javax.xml.ws.spi.Provider is defined, then its value is used
- * as the name of the implementation class.
- *
- * 4. Finally, a default implementation class name is used.
- */
- public static Object loadService(String propertyName, String defaultFactory)
- {
- Object factory = loadFromServices(propertyName, null);
- if (factory == null)
- {
- factory = loadFromPropertiesFile(propertyName, null);
- }
- if (factory == null)
- {
- factory = loadFromSystemProperty(propertyName, defaultFactory);
- }
- return factory;
- }
-
- /** Use the Services API (as detailed in the JAR specification), if available, to determine the classname.
- */
- public static Object loadFromServices(String propertyName, String defaultFactory)
- {
- Object factory = null;
- String factoryName = null;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
-
- // Use the Services API (as detailed in the JAR specification), if available, to determine the classname.
- String filename = "META-INF/services/" + propertyName;
- InputStream inStream = loader.getResourceAsStream(filename);
- if (inStream != null)
- {
- try
- {
- BufferedReader br = new BufferedReader(new InputStreamReader(inStream, "UTF-8"));
- factoryName = br.readLine();
- br.close();
- if (factoryName != null)
- {
- Class factoryClass = loader.loadClass(factoryName);
- factory = factoryClass.newInstance();
- }
- }
- catch (Throwable t)
- {
- throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
- }
- }
-
- // Use the default factory implementation class.
- if (factory == null && defaultFactory != null)
- {
- factory = loadDefault(defaultFactory);
- }
-
- return factory;
- }
-
- /** Use the system property
- */
- public static Object loadFromSystemProperty(String propertyName, String defaultFactory)
- {
- Object factory = null;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
-
- PrivilegedAction action = new PropertyAccessAction(propertyName);
- String factoryName = (String)AccessController.doPrivileged(action);
- if (factoryName != null)
- {
- try
- {
- //if(log.isDebugEnabled()) log.debug("Load from system property: " + factoryName);
- Class factoryClass = loader.loadClass(factoryName);
- factory = factoryClass.newInstance();
- }
- catch (Throwable t)
- {
- throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
- }
- }
-
- // Use the default factory implementation class.
- if (factory == null && defaultFactory != null)
- {
- factory = loadDefault(defaultFactory);
- }
-
- return factory;
- }
-
- /**
- * Use the properties file "${java.home}/lib/jaxws.properties" in the JRE directory.
- * This configuration file is in standard java.util.Properties format and contains the
- * fully qualified name of the implementation class with the key being the system property defined above.
- */
- public static Object loadFromPropertiesFile(String propertyName, String defaultFactory)
- {
- Object factory = null;
- String factoryName = null;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
-
- // Use the properties file "lib/jaxm.properties" in the JRE directory.
- // This configuration file is in standard java.util.Properties format and contains the fully qualified name of the implementation class with the key being the system property defined above.
- PrivilegedAction action = new PropertyAccessAction("java.home");
- String javaHome = (String)AccessController.doPrivileged(action);
- File jaxmFile = new File(javaHome + "/lib/jaxws.properties");
- if (jaxmFile.exists())
- {
- try
- {
- action = new PropertyFileAccessAction(jaxmFile.getCanonicalPath());
- Properties jaxmProperties = (Properties)AccessController.doPrivileged(action);
- factoryName = jaxmProperties.getProperty(propertyName);
- if (factoryName != null)
- {
- //if(log.isDebugEnabled()) log.debug("Load from " + jaxmFile + ": " + factoryName);
- Class factoryClass = loader.loadClass(factoryName);
- factory = factoryClass.newInstance();
- }
- }
- catch (Throwable t)
- {
- throw new IllegalStateException("Failed to load " + propertyName + ": " + factoryName, t);
- }
- }
-
- // Use the default factory implementation class.
- if (factory == null && defaultFactory != null)
- {
- factory = loadDefault(defaultFactory);
- }
-
- return factory;
- }
-
- private static Object loadDefault(String defaultFactory)
- {
- Object factory = null;
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
-
- // Use the default factory implementation class.
- if (defaultFactory != null)
- {
- try
- {
- //if(log.isDebugEnabled()) log.debug("Load from default: " + factoryName);
- Class factoryClass = loader.loadClass(defaultFactory);
- factory = factoryClass.newInstance();
- }
- catch (Throwable t)
- {
- throw new IllegalStateException("Failed to load: " + defaultFactory, t);
- }
- }
-
- return factory;
- }
-
- private static class PropertyAccessAction implements PrivilegedAction
- {
- private String name;
-
- PropertyAccessAction(String name)
- {
- this.name = name;
- }
-
- public Object run()
- {
- return System.getProperty(name);
- }
- }
-
- private static class PropertyFileAccessAction implements PrivilegedAction
- {
- private String filename;
-
- PropertyFileAccessAction(String filename)
- {
- this.filename = filename;
- }
-
- public Object run()
- {
- try
- {
- InputStream inStream = new FileInputStream(filename);
- Properties props = new Properties();
- props.load(inStream);
- return props;
- }
- catch (IOException ex)
- {
- throw new SecurityException("Cannot load properties: " + filename, ex);
- }
- }
- }
-}
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultSPIProviderResolver.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -22,15 +22,14 @@
package org.jboss.wsf.framework;
import org.jboss.logging.Logger;
-import org.jboss.wsf.common.ServiceLoader;
import org.jboss.wsf.framework.deployment.DefaultDeploymentAspectManagerFactory;
import org.jboss.wsf.framework.deployment.DefaultDeploymentModelFactory;
import org.jboss.wsf.framework.deployment.DefaultLifecycleHandlerFactory;
import org.jboss.wsf.framework.http.DefaultHttpContextFactory;
import org.jboss.wsf.framework.http.DefaultHttpServerFactory;
import org.jboss.wsf.framework.invocation.DefaultResourceInjectorFactory;
-import org.jboss.wsf.framework.serviceref.DefaultServiceRefHandler;
import org.jboss.wsf.framework.serviceref.DefaultServiceRefHandlerFactory;
+import org.jboss.wsf.framework.serviceref.DefaultServiceRefMetaDataParserFactory;
import org.jboss.wsf.spi.SPIProvider;
import org.jboss.wsf.spi.SPIProviderResolver;
import org.jboss.wsf.spi.WSFException;
@@ -46,8 +45,10 @@
import org.jboss.wsf.spi.invocation.WebServiceContextFactory;
import org.jboss.wsf.spi.management.EndpointRegistryFactory;
import org.jboss.wsf.spi.management.ServerConfigFactory;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.ServiceRefMetaDataParserFactory;
import org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory;
import org.jboss.wsf.spi.serviceref.ServiceRefHandlerFactory;
+import org.jboss.wsf.spi.util.ServiceLoader;
/**
* @author Heiko.Braun(a)jboss.com
@@ -106,6 +107,10 @@
{
returnType = (T)loadService(spiType, DefaultServiceRefHandlerFactory.class.getName());
}
+ else if (ServiceRefMetaDataParserFactory.class.equals(spiType))
+ {
+ returnType = (T)loadService(spiType, DefaultServiceRefMetaDataParserFactory.class.getName());
+ }
// SPI provided by either container or stack integration
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParser.java (from rev 4080, branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParser.java)
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParser.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParser.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -0,0 +1,256 @@
+/*
+ * 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.serviceref;
+
+// $Id: ServiceRefMetaDataParser.java 3959 2007-07-20 14:44:19Z heiko.braun(a)jboss.com $
+
+import java.util.Iterator;
+
+import javax.xml.namespace.QName;
+
+import org.jboss.logging.Logger;
+import org.jboss.wsf.common.DOMUtils;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.ServiceRefMetaDataParser;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedCallPropertyMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData;
+import org.jboss.xb.QNameBuilder;
+import org.w3c.dom.Element;
+
+/**
+ * The metdata data from service-ref element in web.xml, ejb-jar.xml, and
+ * application-client.xml.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ */
+public class DefaultServiceRefMetaDataParser implements ServiceRefMetaDataParser
+{
+ private static final Logger log = Logger.getLogger(DefaultServiceRefMetaDataParser.class);
+
+ public void importStandardXml(Element root, UnifiedServiceRefMetaData sref)
+ {
+ sref.setServiceRefName(getElementContent(root, "service-ref-name"));
+ sref.setServiceInterface(getOptionalElementContent(root, "service-interface"));
+ sref.setWsdlFile(getOptionalElementContent(root, "wsdl-file"));
+ sref.setMappingFile(getOptionalElementContent(root, "jaxrpc-mapping-file"));
+
+ Element child = DOMUtils.getFirstChildElement(root, "service-qname");
+ if (child != null)
+ sref.setServiceQName(QNameBuilder.buildQName(child, getTextContent(child)));
+
+ // Parse the port-component-ref elements
+ Iterator iterator = DOMUtils.getChildElements(root, "port-component-ref");
+ while (iterator.hasNext())
+ {
+ Element pcrefElement = (Element)iterator.next();
+ UnifiedPortComponentRefMetaData pcrefMetaData = new UnifiedPortComponentRefMetaData(sref);
+ pcrefMetaData.importStandardXml(pcrefElement);
+ sref.addPortComponentRef(pcrefMetaData);
+ }
+
+ // Parse the handler elements
+ iterator = DOMUtils.getChildElements(root, "handler");
+ while (iterator.hasNext())
+ {
+ Element handlerElement = (Element)iterator.next();
+ UnifiedHandlerMetaData handlerMetaData = new UnifiedHandlerMetaData();
+ handlerMetaData.importStandardXml(handlerElement);
+ sref.addHandler(handlerMetaData);
+ }
+ }
+
+ public void importJBossXml(Element root, UnifiedServiceRefMetaData sref)
+ {
+ sref.setConfigName(getOptionalElementContent(root, "config-name"));
+ sref.setConfigFile(getOptionalElementContent(root, "config-file"));
+ sref.setWsdlOverride(getOptionalElementContent(root, "wsdl-override"));
+
+ // Parse the port-component-ref elements
+ Iterator iterator = DOMUtils.getChildElements(root, "port-component-ref");
+ while (iterator.hasNext())
+ {
+ Element pcrefElement = (Element)iterator.next();
+ String seiName = getOptionalElementContent(pcrefElement, "service-endpoint-interface");
+ QName portName = getOptionalElementContentAsQName(pcrefElement, "port-qname");
+
+ UnifiedPortComponentRefMetaData pcref = sref.getPortComponentRef(seiName, portName);
+ if (pcref == null && seiName != null)
+ {
+ // Its ok to only have the <port-component-ref> in jboss.xml and not in ejb-jar.xml
+ // if it has at least a SEI declared
+ pcref = new UnifiedPortComponentRefMetaData(sref);
+ pcref.importStandardXml(pcrefElement);
+ sref.addPortComponentRef(pcref);
+ }
+
+ if (pcref != null)
+ pcref.importJBossXml(pcrefElement);
+ }
+
+ // Parse the call-property elements
+ iterator = DOMUtils.getChildElements(root, "call-property");
+ while (iterator.hasNext())
+ {
+ Element propElement = (Element)iterator.next();
+ String name = getElementContent(propElement, "prop-name");
+ String value = getElementContent(propElement, "prop-value");
+ sref.addCallProperty(new UnifiedCallPropertyMetaData(name, value));
+ }
+ }
+
+ public void importStandardXml(Element root, UnifiedPortComponentRefMetaData pcref)
+ {
+ pcref.setServiceEndpointInterface(getOptionalElementContent(root, "service-endpoint-interface"));
+ pcref.setPortComponentLink(getOptionalElementContent(root, "port-component-link"));
+ }
+
+ public void importJBossXml(Element root, UnifiedPortComponentRefMetaData pcref)
+ {
+ // Look for call-property elements
+ Iterator iterator = DOMUtils.getChildElements(root, "call-property");
+ while (iterator.hasNext())
+ {
+ Element propElement = (Element)iterator.next();
+ String name = getElementContent(propElement, "prop-name");
+ String value = getElementContent(propElement, "prop-value");
+ pcref.addCallProperty(new UnifiedCallPropertyMetaData(name, value));
+ }
+
+ // Look for stub-property elements
+ iterator = DOMUtils.getChildElements(root, "stub-property");
+ while (iterator.hasNext())
+ {
+ Element propElement = (Element)iterator.next();
+ String name = getElementContent(propElement, "prop-name");
+ String value = getElementContent(propElement, "prop-value");
+ UnifiedStubPropertyMetaData propMetaData = new UnifiedStubPropertyMetaData();
+ propMetaData.setPropName(name);
+ propMetaData.setPropValue(value);
+ pcref.addStubProperty(propMetaData);
+ }
+
+ // portQName
+ QName portQName = getOptionalElementContentAsQName(root, "port-qname");
+ if (portQName != null)
+ pcref.setPortQName(portQName);
+
+ // config
+ Element configName = DOMUtils.getFirstChildElement(root, "config-name");
+ if (configName != null)
+ pcref.setConfigName(getTextContent(configName));
+
+ Element configFile = DOMUtils.getFirstChildElement(root, "config-file");
+ if (configFile != null)
+ pcref.setConfigFile(getTextContent(configFile));
+
+ // service-endpoint-interface
+ Element sei = DOMUtils.getFirstChildElement(root, "service-endpoint-interface");
+ if (sei != null)
+ pcref.setServiceEndpointInterface(getTextContent(sei));
+
+ }
+
+ public void importStandardXml(Element root, UnifiedHandlerMetaData href)
+ {
+ href.setHandlerName(getElementContent(root, "handler-name"));
+ href.setHandlerClass(getElementContent(root, "handler-class"));
+
+ // Parse the init-param elements
+ Iterator iterator = DOMUtils.getChildElements(root, "init-param");
+ while (iterator.hasNext())
+ {
+ Element paramElement = (Element)iterator.next();
+ UnifiedInitParamMetaData param = new UnifiedInitParamMetaData();
+ param.setParamName(getElementContent(paramElement, "param-name"));
+ param.setParamValue(getElementContent(paramElement, "param-value"));
+ href.addInitParam(param);
+ }
+
+ // Parse the soap-header elements
+ iterator = DOMUtils.getChildElements(root, "soap-header");
+ while (iterator.hasNext())
+ {
+ Element headerElement = (Element)iterator.next();
+ String content = getTextContent(headerElement);
+ QName qname = DOMUtils.resolveQName(headerElement, content);
+ href.addSoapHeader(qname);
+ }
+
+ // Parse the soap-role elements
+ iterator = DOMUtils.getChildElements(root, "soap-role");
+ while (iterator.hasNext())
+ {
+ Element roleElement = (Element)iterator.next();
+ String content = getTextContent(roleElement);
+ href.addSoapRole(content);
+ }
+
+ // Parse the port-name elements
+ iterator = DOMUtils.getChildElements(root, "port-name");
+ while (iterator.hasNext())
+ {
+ Element portElement = (Element)iterator.next();
+ String content = getTextContent(portElement);
+ href.addPortName(content);
+ }
+ }
+
+ private String getElementContent(Element element, String childName)
+ {
+ String childValue = getOptionalElementContent(element, childName);
+ if (childValue == null || childValue.length() == 0)
+ throw new IllegalStateException("Invalid null element content: " + childName);
+
+ return childValue;
+ }
+
+ private String getOptionalElementContent(Element element, String childName)
+ {
+ return getTextContent(DOMUtils.getFirstChildElement(element, childName));
+ }
+
+ private QName getOptionalElementContentAsQName(Element element, String childName)
+ {
+ QName qname = null;
+ String value = getOptionalElementContent(element, childName);
+ if (value != null)
+ {
+ qname = (value.startsWith("{") ? QName.valueOf(value) : DOMUtils.resolveQName(element, value));
+ }
+ return qname;
+ }
+
+ private String getTextContent(Element element)
+ {
+ String content = null;
+ if (element != null)
+ {
+ content = DOMUtils.getTextContent(element);
+ if (content != null)
+ content = content.trim();
+ }
+ return content;
+ }
+}
Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParserFactory.java (from rev 4080, branches/tdiesler/trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParserFactory.java)
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParserFactory.java (rev 0)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefMetaDataParserFactory.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -0,0 +1,39 @@
+/*
+ * 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.serviceref;
+
+// $Id: ServiceRefMetaDataParser.java 3959 2007-07-20 14:44:19Z heiko.braun(a)jboss.com $
+
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.ServiceRefMetaDataParser;
+import org.jboss.wsf.spi.metadata.j2ee.serviceref.ServiceRefMetaDataParserFactory;
+
+/**
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 02-Aug-2007
+ */
+public class DefaultServiceRefMetaDataParserFactory implements ServiceRefMetaDataParserFactory
+{
+ public ServiceRefMetaDataParser getServiceRefMetaDataParser()
+ {
+ return new DefaultServiceRefMetaDataParser();
+ }
+}
Modified: trunk/integration/sunri/.classpath
===================================================================
--- trunk/integration/sunri/.classpath 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/sunri/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
@@ -24,5 +24,6 @@
<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 combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/sunri/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -61,7 +61,7 @@
<fileset dir="${int.sunri.dir}/ant-import">
<include name="macros-deploy-sunri.xml"/>
</fileset>
- <fileset dir="${spi.dir}/ant-import">
+ <fileset dir="${framework.dir}/ant-import">
<include name="macros-deploy-spi.xml"/>
</fileset>
<fileset dir="${int.xfire.dir}/ant-import">
@@ -73,7 +73,7 @@
</copy>
<copy todir="${bindist.bin.dir}">
- <fileset dir="${spi.dir}/src/main/etc">
+ <fileset dir="${framework.dir}/src/main/etc">
<include name="*.sh"/>
<include name="*.bat"/>
</fileset>
@@ -94,11 +94,12 @@
<!-- lib -->
<copy todir="${bindist.lib.dir}" overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
+ <fileset dir="${framework.dir}/output/lib">
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-framework-scripts.zip"/>
+ </fileset>
+ <fileset dir="${framework.dir}/thirdparty">
<include name="jbossws-spi.jar"/>
- <include name="jbossws-spi-scripts.zip"/>
- </fileset>
- <fileset dir="${spi.dir}/thirdparty">
<include name="getopt.jar"/>
<include name="wsdl4j.jar"/>
</fileset>
Modified: trunk/integration/sunri/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-deploy.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -14,7 +14,7 @@
<project>
<import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml"/>
- <import file="${spi.dir}/ant-import/macros-deploy-spi.xml"/>
+ <import file="${framework.dir}/ant-import/macros-deploy-wsf.xml"/>
<!-- ================================================================== -->
<!-- Deployment -->
@@ -25,21 +25,21 @@
<ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<macro-deploy-sunri50
- spilibs="${spi.dir}/output/lib"
+ wsflibs="${framework.dir}/output/lib"
jbosslibs="${int.jboss50.dir}/output/lib"
stacklibs="${int.sunri.dir}/output/lib"
thirdpartylibs="${int.sunri.dir}/thirdparty"/>
- <macro-deploy-spi
- spilibs="${spi.dir}/output/lib"
- thirdpartylibs="${spi.dir}/thirdparty"
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
jbosshome="${jboss50.home}"/>
</target>
<!-- Remove from jboss50 -->
<target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50">
<macro-undeploy-sunri50/>
- <macro-undeploy-spi jbosshome="${jboss50.home}"/>
+ <macro-undeploy-wsf jbosshome="${jboss50.home}"/>
</target>
<!-- Deploy to jboss42 -->
@@ -47,21 +47,21 @@
<ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<macro-deploy-sunri42
- spilibs="${spi.dir}/output/lib"
+ wsflibs="${framework.dir}/output/lib"
jbosslibs="${int.jboss42.dir}/output/lib"
stacklibs="${int.sunri.dir}/output/lib"
thirdpartylibs="${int.sunri.dir}/thirdparty"/>
- <macro-deploy-spi
- spilibs="${spi.dir}/output/lib"
- thirdpartylibs="${spi.dir}/thirdparty"
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
jbosshome="${jboss42.home}"/>
</target>
<!-- Remove from jboss42 -->
<target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42">
<macro-undeploy-sunri42/>
- <macro-undeploy-spi jbosshome="${jboss42.home}"/>
+ <macro-undeploy-wsf jbosshome="${jboss42.home}"/>
</target>
</project>
Modified: trunk/integration/sunri/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -27,7 +27,8 @@
<target name="tests-init" depends="tests-classpath">
<path id="ws.stack.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jbossws-spi.jar"/>
<pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/>
<pathelement location="${int.sunri.dir}/thirdparty/http.jar"/>
<pathelement location="${int.sunri.dir}/thirdparty/jaxws-api.jar"/>
Modified: trunk/integration/sunri/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -43,6 +43,7 @@
<mkdir dir="${thirdparty.dir}"/>
<get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/>
@@ -56,7 +57,6 @@
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-impl.jar" dest="${thirdparty.dir}/saaj-impl.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/sjsxp.jar" dest="${thirdparty.dir}/sjsxp.jar" usetimestamp="true" verbose="true"/>
-
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-rt.jar" dest="${thirdparty.dir}/jaxws-rt.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-tools.jar" dest="${thirdparty.dir}/jaxws-tools.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/stax-ex.jar" dest="${thirdparty.dir}/stax-ex.jar" usetimestamp="true" verbose="true"/>
@@ -65,7 +65,6 @@
<get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
-
<checksum file="${int.sunri.dir}/version.properties" fileext=".md5"/>
</target>
@@ -73,17 +72,18 @@
<!-- The compile classpath for jboss50 integration -->
<path id="sunri.integration.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.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="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/dom4j.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jboss-common-core.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jboss-logging-spi.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jboss-javaee.jar"/>
<pathelement location="${thirdparty.dir}/http.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-rt.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/jsr181-api.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
</path>
Modified: trunk/integration/sunri/build.xml
===================================================================
--- trunk/integration/sunri/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/sunri/build.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -41,7 +41,7 @@
<!-- ================================================================== -->
<target name="init" depends="prepare,thirdparty">
- <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/>
<mkdir dir="${sunri.output.apidocs.dir}"/>
</target>
@@ -165,7 +165,7 @@
<include name="jbossws-context.war"/>
</fileset>
- <fileset dir="${spi.dir}/thirdparty">
+ <fileset dir="${framework.dir}/thirdparty">
<include name="jaxrpc-api.jar"/>
</fileset>
<fileset dir="${thirdparty.dir}">
@@ -214,7 +214,7 @@
<fileset dir="${sunri.output.lib.dir}">
<include name="jbossws-context.war"/>
</fileset>
- <fileset dir="${spi.dir}/thirdparty">
+ <fileset dir="${framework.dir}/thirdparty">
<include name="jaxrpc-api.jar"/>
</fileset>
<fileset dir="${int.jboss42.dir}/output/lib">
@@ -261,7 +261,7 @@
<classpath>
<pathelement path="${sunri50.integration.classpath}"/>
<pathelement path="${sunri.integration.classpath}"/>
- <fileset dir="${spi.dir}/thirdparty">
+ <fileset dir="${framework.dir}/thirdparty">
<include name="**/*.jar"/>
</fileset>
</classpath>
@@ -272,7 +272,7 @@
<packageset dir="${sunri.output.dir}/thirdparty-sources" defaultexcludes="yes">
<include name="com/sun/**"/>
</packageset>
- <packageset dir="${spi.dir}/src/main/java">
+ <packageset dir="${framework.dir}/src/main/java">
<include name="org/jboss/wsf/**"/>
<include name="org/jboss/ws/**"/>
</packageset>
Modified: trunk/integration/sunri/src/main/etc/bin-dist-build.xml
===================================================================
--- trunk/integration/sunri/src/main/etc/bin-dist-build.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/sunri/src/main/etc/bin-dist-build.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -78,6 +78,7 @@
<target name="tests-init" depends="prepare,tests-classpath">
<path id="ws.stack.classpath">
+ <pathelement location="${lib.dir}/jbossws-framework.jar"/>
<pathelement location="${lib.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/FastInfoset.jar"/>
<pathelement location="${thirdparty.dir}/http.jar"/>
Modified: trunk/integration/xfire/.classpath
===================================================================
--- trunk/integration/xfire/.classpath 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/xfire/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
@@ -19,5 +19,6 @@
<classpathentry kind="lib" path="thirdparty/spring-beans.jar"/>
<classpathentry kind="lib" path="thirdparty/spring-core.jar"/>
<classpathentry kind="lib" path="thirdparty/spring-web.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/integration/xfire/ant-import/build-bin-dist.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -62,7 +62,7 @@
<fileset dir="${int.sunri.dir}/ant-import">
<include name="macros-deploy-sunri.xml"/>
</fileset>
- <fileset dir="${spi.dir}/ant-import">
+ <fileset dir="${framework.dir}/ant-import">
<include name="macros-deploy-spi.xml"/>
</fileset>
<fileset dir="${int.xfire.dir}/ant-import">
@@ -74,7 +74,7 @@
</copy>
<copy todir="${bindist.bin.dir}">
- <fileset dir="${spi.dir}/src/main/etc">
+ <fileset dir="${framework.dir}/src/main/etc">
<include name="*.sh"/>
<include name="*.bat"/>
</fileset>
@@ -95,11 +95,12 @@
<!-- lib -->
<copy todir="${bindist.lib.dir}" overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
+ <fileset dir="${framework.dir}/output/lib">
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-framework-scripts.zip"/>
+ </fileset>
+ <fileset dir="${framework.dir}/thirdparty">
<include name="jbossws-spi.jar"/>
- <include name="jbossws-spi-scripts.zip"/>
- </fileset>
- <fileset dir="${spi.dir}/thirdparty">
<include name="getopt.jar"/>
<include name="wsdl4j.jar"/>
</fileset>
Modified: trunk/integration/xfire/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-deploy.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/xfire/ant-import/build-deploy.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -14,7 +14,7 @@
<project>
<import file="${int.xfire.dir}/ant-import/macros-deploy-xfire.xml"/>
- <import file="${spi.dir}/ant-import/macros-deploy-spi.xml"/>
+ <import file="${framework.dir}/ant-import/macros-deploy-wsf.xml"/>
<!-- ================================================================== -->
<!-- Deployment -->
@@ -25,21 +25,21 @@
<ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<macro-deploy-xfire50
- spilibs="${spi.dir}/output/lib"
+ wsflibs="${framework.dir}/output/lib"
jbosslibs="${int.jboss50.dir}/output/lib"
stacklibs="${int.xfire.dir}/output/lib"
thirdpartylibs="${int.xfire.dir}/thirdparty"/>
- <macro-deploy-spi
- spilibs="${spi.dir}/output/lib"
- thirdpartylibs="${spi.dir}/thirdparty"
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
jbosshome="${jboss50.home}"/>
</target>
<!-- Remove from jboss50 -->
<target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50">
<macro-undeploy-xfire50/>
- <macro-undeploy-spi jbosshome="${jboss50.home}"/>
+ <macro-undeploy-wsf jbosshome="${jboss50.home}"/>
</target>
<!-- Deploy to jboss42 -->
@@ -47,21 +47,21 @@
<ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<macro-deploy-xfire42
- spilibs="${spi.dir}/output/lib"
+ wsflibs="${framework.dir}/output/lib"
jbosslibs="${int.jboss42.dir}/output/lib"
stacklibs="${int.xfire.dir}/output/lib"
thirdpartylibs="${int.xfire.dir}/thirdparty"/>
- <macro-deploy-spi
- spilibs="${spi.dir}/output/lib"
- thirdpartylibs="${spi.dir}/thirdparty"
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
jbosshome="${jboss42.home}"/>
</target>
<!-- Remove from jboss42 -->
<target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42">
<macro-undeploy-xfire42/>
- <macro-undeploy-spi jbosshome="${jboss42.home}"/>
+ <macro-undeploy-wsf jbosshome="${jboss42.home}"/>
</target>
</project>
Modified: trunk/integration/xfire/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -27,7 +27,8 @@
<target name="tests-init" depends="tests-classpath">
<path id="ws.stack.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${int.xfire.dir}/thirdparty/jbossws-spi.jar"/>
<pathelement location="${int.xfire.dir}/thirdparty/cxf-incubator.jar"/>
<pathelement location="${int.xfire.dir}/thirdparty/geronimo-javamail.jar"/>
<pathelement location="${int.xfire.dir}/thirdparty/geronimo-ws-metadata.jar"/>
Modified: trunk/integration/xfire/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -58,6 +58,7 @@
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/>
@@ -71,14 +72,15 @@
<target name="thirdparty-classpath" depends="thirdparty-init">
<path id="xfire.integration.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.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="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/dom4j.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jboss-common-core.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jboss-logging-spi.jar"/>
<pathelement location="${thirdparty.dir}/cxf-incubator.jar"/>
<pathelement location="${thirdparty.dir}/geronimo-ws-metadata.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/saaj-api.jar"/>
<pathelement location="${thirdparty.dir}/saaj-impl.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
Modified: trunk/integration/xfire/ant-import/macros-deploy-xfire.xml
===================================================================
--- trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -29,12 +29,13 @@
<!-- CLIENT JARS -->
<copy todir="${jboss50.home}/client" overwrite="true">
<fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
+ <include name="jbossws-framework.jar"/>
</fileset>
<fileset dir="@{jbosslibs}">
<include name="jbossws-jboss50.jar"/>
</fileset>
<fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-spi.jar"/>
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
@@ -77,6 +78,7 @@
<!-- CLIENT JARS -->
<fileset dir="${jboss50.home}/client">
+ <include name="jbossws-framework.jar"/>
<include name="jbossws-spi.jar"/>
<include name="jbossws-jboss50.jar"/>
</fileset>
@@ -110,12 +112,13 @@
<!-- CLIENT JARS -->
<copy todir="${jboss42.home}/client" overwrite="true">
<fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
+ <include name="jbossws-framework.jar"/>
</fileset>
<fileset dir="@{jbosslibs}">
<include name="jbossws-jboss42.jar"/>
</fileset>
<fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-spi.jar"/>
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
Modified: trunk/integration/xfire/build.xml
===================================================================
--- trunk/integration/xfire/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/xfire/build.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -41,7 +41,7 @@
<!-- ================================================================== -->
<target name="init" depends="prepare,thirdparty">
- <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/>
<mkdir dir="${xfire.output.apidocs.dir}"/>
</target>
@@ -151,7 +151,7 @@
<include name="jbossws-context.war"/>
</fileset>
- <fileset dir="${spi.dir}/thirdparty">
+ <fileset dir="${framework.dir}/thirdparty">
<include name="jaxrpc-api.jar"/>
</fileset>
<fileset dir="${thirdparty.dir}">
@@ -205,7 +205,7 @@
<fileset dir="${xfire.output.lib.dir}">
<include name="jbossws-context.war"/>
</fileset>
- <fileset dir="${spi.dir}/thirdparty">
+ <fileset dir="${framework.dir}/thirdparty">
<include name="jaxrpc-api.jar"/>
</fileset>
<fileset dir="${int.jboss42.dir}/output/lib">
@@ -254,7 +254,7 @@
<javadoc destdir="${xfire.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API ${version.id} ">
<classpath>
<pathelement path="${xfire.integration.classpath}"/>
- <fileset dir="${spi.dir}/thirdparty">
+ <fileset dir="${framework.dir}/thirdparty">
<include name="**/*.jar"/>
</fileset>
</classpath>
@@ -264,7 +264,7 @@
<packageset dir="${xfire.output.dir}/thirdparty-sources" defaultexcludes="yes">
<include name="org/codehaus/**"/>
</packageset>
- <packageset dir="${spi.dir}/src/main/java">
+ <packageset dir="${framework.dir}/src/main/java">
<include name="org/jboss/wsf/**"/>
<include name="org/jboss/ws/**"/>
</packageset>
Modified: trunk/integration/xfire/src/main/etc/bin-dist-build.xml
===================================================================
--- trunk/integration/xfire/src/main/etc/bin-dist-build.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/integration/xfire/src/main/etc/bin-dist-build.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -79,6 +79,7 @@
<target name="tests-init" depends="prepare,tests-classpath">
<path id="ws.stack.classpath">
+ <pathelement location="${lib.dir}/jbossws-framework.jar"/>
<pathelement location="${lib.dir}/jbossws-spi.jar"/>
<pathelement location="${lib.dir}/cxf-incubator.jar"/>
<pathelement location="${lib.dir}/geronimo-javamail.jar"/>
Modified: trunk/jbossws-core/.classpath
===================================================================
--- trunk/jbossws-core/.classpath 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/jbossws-core/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
@@ -37,5 +37,6 @@
<classpathentry kind="lib" path="thirdparty/jaxws-tools.jar"/>
<classpathentry kind="lib" path="thirdparty/jaxws-rt.jar"/>
<classpathentry kind="lib" path="thirdparty/concurrent.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml
===================================================================
--- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -82,6 +82,7 @@
<get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx.jar" dest="${thirdparty.dir}/jbosssx.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-src.zip" dest="${thirdparty.dir}/jbosssx-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" />
<get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/>
@@ -115,7 +116,7 @@
<!-- The compile classpath for jbossws core -->
<path id="thirdparty.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
<pathelement location="${thirdparty.dir}/ant.jar"/>
@@ -136,6 +137,7 @@
<pathelement location="${thirdparty.dir}/jboss-remoting.jar"/>
<pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
<pathelement location="${thirdparty.dir}/jbosssx.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/mail.jar"/>
<pathelement location="${thirdparty.dir}/policy.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml
===================================================================
--- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -28,12 +28,13 @@
<target name="tests-init" depends="thirdparty-classpath,tests-classpath">
<path id="ws.stack.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
<pathelement location="${core.dir}/output/lib/jbossws-core.jar"/>
<pathelement location="${core.dir}/output/lib/jbossws-client.jar"/>
+ <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar"/>
<pathelement location="${core.dir}/thirdparty/policy.jar"/>
<pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/>
<pathelement location="${core.dir}/thirdparty/wstx.jar"/>
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/jbossws-core/build.xml 2007-08-02 09:23:17 UTC (rev 4081)
@@ -33,7 +33,7 @@
<property name="core.output.lib.dir" value="${core.output.dir}/lib"/>
<target name="init" depends="prepare,thirdparty-get">
- <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/>
</target>
<!-- ================================================================== -->
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/JAXBContextFactory.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -22,7 +22,7 @@
package org.jboss.ws.core.jaxws;
import org.jboss.ws.WSException;
-import org.jboss.wsf.common.ServiceLoader;
+import org.jboss.wsf.spi.util.ServiceLoader;
import javax.xml.bind.JAXBContext;
@@ -41,7 +41,7 @@
public abstract JAXBContext createContext(Class clazz) throws WSException;
/**
- * Retrieve JAXBContextFactory instance through the {@link org.jboss.wsf.common.ServiceLoader}.
+ * Retrieve JAXBContextFactory instance through the {@link org.jboss.wsf.spi.util.ServiceLoader}.
* Defaults to {@link CustomizableJAXBContextFactory}
* @return JAXBContextFactory
*/
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/handler/LogicalMessageImpl.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -47,7 +47,7 @@
import org.jboss.ws.core.soap.Style;
import org.jboss.ws.core.soap.XMLFragment;
import org.jboss.wsf.common.DOMUtils;
-import org.jboss.wsf.common.ServiceLoader;
+import org.jboss.wsf.spi.util.ServiceLoader;
import org.w3c.dom.Element;
/**
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/MessageFactoryImpl.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -45,8 +45,8 @@
import org.jboss.ws.core.CommonMessageContext;
import org.jboss.ws.core.soap.attachment.MimeConstants;
import org.jboss.ws.core.soap.attachment.MultipartRelatedDecoder;
-import org.jboss.wsf.common.ServiceLoader;
import org.jboss.wsf.common.IOUtils;
+import org.jboss.wsf.spi.util.ServiceLoader;
/**
* MessageFactory implementation
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/SOAPPartImpl.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -42,7 +42,7 @@
import org.jboss.logging.Logger;
import org.jboss.util.NotImplementedException;
-import org.jboss.wsf.common.ServiceLoader;
+import org.jboss.wsf.spi.util.ServiceLoader;
import org.w3c.dom.Attr;
import org.w3c.dom.CDATASection;
import org.w3c.dom.Comment;
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/eventing/mgmt/SubscriptionManagerFactory.java 2007-08-02 09:23:17 UTC (rev 4081)
@@ -2,7 +2,7 @@
import org.jboss.kernel.spi.registry.KernelRegistry;
import org.jboss.kernel.spi.registry.KernelRegistryEntry;
-import org.jboss.wsf.common.KernelLocator;
+import org.jboss.wsf.spi.util.KernelLocator;
/**
* @author Heiko Braun, <heiko(a)openj.net>
Modified: trunk/testsuite/.classpath
===================================================================
--- trunk/testsuite/.classpath 2007-08-02 09:09:47 UTC (rev 4080)
+++ trunk/testsuite/.classpath 2007-08-02 09:23:17 UTC (rev 4081)
@@ -15,5 +15,6 @@
<classpathentry kind="lib" path="/integration-spi/thirdparty/jaxb-impl.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/stax-api.jar"/>
<classpathentry kind="lib" path="/integration-spi/thirdparty/wsdl4j.jar" sourcepath="/integration-spi/thirdparty/wsdl4j-src.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/spi"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
17 years, 4 months
- 1
- 0
JBossWS SVN: r4080 - in branches/tdiesler/trunk: build/ant-import and 23 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-02 05:09:47 -0400 (Thu, 02 Aug 2007)
New Revision: 4080
Added:
branches/tdiesler/trunk/integration/spi/ant-import/macros-deploy-wsf.xml
Removed:
branches/tdiesler/trunk/integration/spi/ant-import/macros-deploy-spi.xml
Modified:
branches/tdiesler/trunk/build/ant-import/build-release.xml
branches/tdiesler/trunk/build/ant-import/build-samples.xml
branches/tdiesler/trunk/build/ant-import/build-setup.xml
branches/tdiesler/trunk/build/build.xml
branches/tdiesler/trunk/build/version.properties
branches/tdiesler/trunk/integration/jboss40/ant-import/build-thirdparty.xml
branches/tdiesler/trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml
branches/tdiesler/trunk/integration/jboss42/ant-import/build-thirdparty.xml
branches/tdiesler/trunk/integration/jboss42/build.xml
branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml
branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml
branches/tdiesler/trunk/integration/jboss50/build.xml
branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
branches/tdiesler/trunk/integration/native/ant-import/build-bin-dist.xml
branches/tdiesler/trunk/integration/native/ant-import/build-deploy.xml
branches/tdiesler/trunk/integration/native/ant-import/build-testsuite.xml
branches/tdiesler/trunk/integration/native/ant-import/build-thirdparty.xml
branches/tdiesler/trunk/integration/native/ant-import/macros-deploy-native.xml
branches/tdiesler/trunk/integration/native/build.xml
branches/tdiesler/trunk/integration/native/src/main/etc/bin-dist-build.xml
branches/tdiesler/trunk/integration/spi/ant-import/build-release.xml
branches/tdiesler/trunk/integration/spi/ant-import/build-thirdparty.xml
branches/tdiesler/trunk/integration/spi/build.xml
branches/tdiesler/trunk/integration/spi/src/main/etc/component-info.xml
branches/tdiesler/trunk/integration/sunri/ant-import/build-bin-dist.xml
branches/tdiesler/trunk/integration/sunri/ant-import/build-deploy.xml
branches/tdiesler/trunk/integration/sunri/ant-import/build-testsuite.xml
branches/tdiesler/trunk/integration/sunri/ant-import/build-thirdparty.xml
branches/tdiesler/trunk/integration/sunri/build.xml
branches/tdiesler/trunk/integration/sunri/src/main/etc/bin-dist-build.xml
branches/tdiesler/trunk/integration/xfire/ant-import/build-bin-dist.xml
branches/tdiesler/trunk/integration/xfire/ant-import/build-deploy.xml
branches/tdiesler/trunk/integration/xfire/ant-import/build-testsuite.xml
branches/tdiesler/trunk/integration/xfire/ant-import/build-thirdparty.xml
branches/tdiesler/trunk/integration/xfire/ant-import/macros-deploy-xfire.xml
branches/tdiesler/trunk/integration/xfire/build.xml
branches/tdiesler/trunk/integration/xfire/src/main/etc/bin-dist-build.xml
branches/tdiesler/trunk/jbossws-core/ant-import-tests/build-testsuite.xml
branches/tdiesler/trunk/jbossws-core/ant-import/build-thirdparty.xml
branches/tdiesler/trunk/jbossws-core/build.xml
Log:
partial
Modified: branches/tdiesler/trunk/build/ant-import/build-release.xml
===================================================================
--- branches/tdiesler/trunk/build/ant-import/build-release.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/build/ant-import/build-release.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -36,7 +36,7 @@
</target>
<target name="release-to-repository" depends="prepare" description="Release to local repository">
- <ant antfile="${spi.dir}/build.xml" target="release" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="release" inheritall="false"/>
<ant antfile="${core.dir}/build.xml" target="release" inheritall="false"/>
<ant antfile="${int.jboss50.dir}/build.xml" target="release" inheritall="false"/>
<ant antfile="${int.jboss42.dir}/build.xml" target="release" inheritall="false"/>
Modified: branches/tdiesler/trunk/build/ant-import/build-samples.xml
===================================================================
--- branches/tdiesler/trunk/build/ant-import/build-samples.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/build/ant-import/build-samples.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -67,7 +67,6 @@
<mkdir dir="${build.src.samples.dir}/lib"/>
<copy todir="${build.src.samples.dir}/lib">
<fileset dir="${core.output.lib.dir}">
- <include name="jbossws-spi.jar"/>
<include name="jbossws-client.jar"/>
<include name="jbossws-core.jar"/>
<include name="jboss-jaxrpc.jar"/>
Modified: branches/tdiesler/trunk/build/ant-import/build-setup.xml
===================================================================
--- branches/tdiesler/trunk/build/ant-import/build-setup.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/build/ant-import/build-setup.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -18,7 +18,7 @@
<!-- ================================================================== -->
<property name="build.dir" value="${basedir}/build"/>
- <property name="spi.dir" value="${basedir}/integration/spi"/>
+ <property name="framework.dir" value="${basedir}/integration/spi"/>
<property name="core.dir" value="${basedir}/jbossws-core"/>
<property name="testsuite.dir" value="${basedir}/testsuite"/>
<property name="int.jboss50.dir" value="${basedir}/integration/jboss50"/>
Modified: branches/tdiesler/trunk/build/build.xml
===================================================================
--- branches/tdiesler/trunk/build/build.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/build/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -113,7 +113,7 @@
| Build all jar files.
-->
<target name="jars" depends="prepare" description="Builds all jar files.">
- <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/>
<ant antfile="${core.dir}/build.xml" target="jars" inheritall="false"/>
</target>
@@ -123,7 +123,7 @@
<target name="clean" depends="prepare" description="Cleans up most generated files.">
<delete dir="${build.dir}/output"/>
- <ant antfile="${spi.dir}/build.xml" target="clean" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${core.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${int.jboss50.dir}/build.xml" target="clean" inheritall="false"/>
<ant antfile="${int.jboss42.dir}/build.xml" target="clean" inheritall="false"/>
@@ -136,7 +136,7 @@
<target name="clobber" depends="prepare" description="Cleans up all generated files.">
<delete dir="${build.dir}/output"/>
- <ant antfile="${spi.dir}/build.xml" target="clobber" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${core.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${testsuite.dir}/build.xml" target="clobber" inheritall="false"/>
<ant antfile="${int.jboss50.dir}/build.xml" target="clobber" inheritall="false"/>
Modified: branches/tdiesler/trunk/build/version.properties
===================================================================
--- branches/tdiesler/trunk/build/version.properties 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/build/version.properties 2007-08-02 09:09:47 UTC (rev 4080)
@@ -24,6 +24,7 @@
jboss-jaxr=1.2.0.GA
jboss-jbossxb=1.0.0.GA-brew
jboss-microcontainer=2.0.0.Beta3
+jbossws-spi=2.0.1.CR1
junit=3.8.1
stax-api=1.0
sun-jaf=1.1
Modified: branches/tdiesler/trunk/integration/jboss40/ant-import/build-thirdparty.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss40/ant-import/build-thirdparty.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/jboss40/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -32,12 +32,13 @@
<!-- The compile classpath for jboss40 integration -->
<path id="jbws40.integration.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
<pathelement location="${core.dir}/output/lib/jbossws-core.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jaxws-api.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jaxrpc-api.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jsr181-api.jar"/>
- <pathelement location="${spi.dir}/thirdparty/saaj-api.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jaxws-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jaxrpc-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jsr181-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/saaj-api.jar"/>
<pathelement location="${jboss40.lib}/jboss-common.jar"/>
<pathelement location="${jboss40.lib}/jboss-jmx.jar"/>
<pathelement location="${jboss40.lib}/jboss-system.jar"/>
Modified: branches/tdiesler/trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/jboss40/src/main/resources/jbossws-jboss40-config.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -1,6 +1,6 @@
<!-- Locate the single instance of the kernel -->
- <bean name="WSKernelLocator" class="org.jboss.wsf.common.KernelLocator">
+ <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator">
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
</bean>
Modified: branches/tdiesler/trunk/integration/jboss42/ant-import/build-thirdparty.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/jboss42/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -32,11 +32,12 @@
<!-- The compile classpath for jboss42 integration -->
<path id="jbws42.integration.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jaxws-api.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jaxrpc-api.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jsr181-api.jar"/>
- <pathelement location="${spi.dir}/thirdparty/saaj-api.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jaxws-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jaxrpc-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jsr181-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/saaj-api.jar"/>
<pathelement location="${jboss42.lib}/jboss-common.jar"/>
<pathelement location="${jboss42.lib}/jboss-jmx.jar"/>
<pathelement location="${jboss42.lib}/jboss-system.jar"/>
Modified: branches/tdiesler/trunk/integration/jboss42/build.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/build.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/jboss42/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -39,7 +39,7 @@
<target name="init" depends="prepare, thirdparty">
<fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
- <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/>
</target>
<!-- ================================================================== -->
Modified: branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/jboss42/src/main/resources/jbossws-jboss42-config.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -1,6 +1,6 @@
<!-- Locate the single instance of the kernel -->
- <bean name="WSKernelLocator" class="org.jboss.wsf.common.KernelLocator">
+ <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator">
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
</bean>
Modified: branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -32,11 +32,12 @@
<!-- The compile classpath for jboss50 integration -->
<path id="jbws50.integration.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jaxws-api.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jaxrpc-api.jar"/>
- <pathelement location="${spi.dir}/thirdparty/jsr181-api.jar"/>
- <pathelement location="${spi.dir}/thirdparty/saaj-api.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jaxws-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jaxrpc-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jsr181-api.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/saaj-api.jar"/>
<pathelement location="${jboss50.lib}/dom4j.jar"/>
<pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/>
<pathelement location="${jboss50.lib}/jboss-common-core.jar"/>
Modified: branches/tdiesler/trunk/integration/jboss50/build.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss50/build.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/jboss50/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -39,7 +39,7 @@
<target name="init" depends="prepare,thirdparty">
<fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
- <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/>
</target>
<!-- ================================================================== -->
Modified: branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml
===================================================================
--- branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/jboss50/src/main/resources/jbossws-jboss50.deployer/META-INF/jbossws-deployer-beans.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -3,7 +3,7 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<!-- Locate the single instance of the kernel -->
- <bean name="WSKernelLocator" class="org.jboss.wsf.common.KernelLocator">
+ <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator">
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
</bean>
Modified: branches/tdiesler/trunk/integration/native/ant-import/build-bin-dist.xml
===================================================================
--- branches/tdiesler/trunk/integration/native/ant-import/build-bin-dist.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/native/ant-import/build-bin-dist.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -57,7 +57,7 @@
<fileset dir="${int.sunri.dir}/ant-import">
<include name="macros-deploy-sunri.xml"/>
</fileset>
- <fileset dir="${spi.dir}/ant-import">
+ <fileset dir="${framework.dir}/ant-import">
<include name="macros-deploy-spi.xml"/>
</fileset>
<fileset dir="${int.xfire.dir}/ant-import">
@@ -69,7 +69,7 @@
</copy>
<copy todir="${bindist.bin.dir}">
- <fileset dir="${spi.dir}/src/main/etc">
+ <fileset dir="${framework.dir}/src/main/etc">
<include name="*.sh"/>
<include name="*.bat"/>
</fileset>
@@ -109,9 +109,9 @@
<!-- lib -->
<copy todir="${bindist.lib.dir}" overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
- <include name="jbossws-spi.jar"/>
- <include name="jbossws-spi-scripts.zip"/>
+ <fileset dir="${framework.dir}/output/lib">
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-framework-scripts.zip"/>
</fileset>
<fileset dir="${int.jboss50.dir}/output/lib">
<include name="jbossws-jboss50.jar"/>
Modified: branches/tdiesler/trunk/integration/native/ant-import/build-deploy.xml
===================================================================
--- branches/tdiesler/trunk/integration/native/ant-import/build-deploy.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/native/ant-import/build-deploy.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -14,7 +14,7 @@
<project>
<import file="${int.native.dir}/ant-import/macros-deploy-native.xml"/>
- <import file="${spi.dir}/ant-import/macros-deploy-spi.xml"/>
+ <import file="${framework.dir}/ant-import/macros-deploy-wsf.xml"/>
<!-- ================================================================== -->
<!-- Deployment JBoss50 -->
@@ -25,14 +25,14 @@
<ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<macro-deploy-native50
- spilibs="${spi.dir}/output/lib"
+ wsflibs="${framework.dir}/output/lib"
jbosslibs="${int.jboss50.dir}/output/lib"
corelibs="${core.dir}/output/lib"
stacklibs="${int.native.dir}/output/lib"
thirdpartylibs="${core.dir}/thirdparty"/>
- <macro-deploy-spi
- spilibs="${spi.dir}/output/lib"
- thirdpartylibs="${spi.dir}/thirdparty"
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
jbosshome="${jboss50.home}"/>
<!-- [JBWS-1617] JAXRPC doc/literal trims empty string
@@ -51,7 +51,7 @@
<!-- Remove jbossws from jboss50 -->
<target name="undeploy-jboss50" depends="prepare,undeploy-jboss50-endorsed" description="Remove jbossws from jboss50">
<macro-undeploy-native50/>
- <macro-undeploy-spi jbosshome="${jboss50.home}"/>
+ <macro-undeploy-wsf jbosshome="${jboss50.home}"/>
</target>
<target name="undeploy-jboss50-endorsed" depends="prepare">
@@ -63,14 +63,14 @@
<ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<macro-deploy-native42
- spilibs="${spi.dir}/output/lib"
+ wsflibs="${framework.dir}/output/lib"
jbosslibs="${int.jboss42.dir}/output/lib"
corelibs="${core.dir}/output/lib"
stacklibs="${int.native.dir}/output/lib"
thirdpartylibs="${core.dir}/thirdparty"/>
- <macro-deploy-spi
- spilibs="${spi.dir}/output/lib"
- thirdpartylibs="${spi.dir}/thirdparty"
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
jbosshome="${jboss42.home}"/>
<!-- [JBWS-1617] JAXRPC doc/literal trims empty string
@@ -90,7 +90,7 @@
<!-- Remove jbossws from jboss42 -->
<target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws from jboss42">
<macro-undeploy-native42/>
- <macro-undeploy-spi jbosshome="${jboss42.home}"/>
+ <macro-undeploy-wsf jbosshome="${jboss42.home}"/>
</target>
<target name="undeploy-jboss42-endorsed" depends="prepare">
<macro-undeploy-endorsed jbosshome="${jboss42.home}"/>
@@ -101,14 +101,14 @@
<target name="deploy-jboss40-ejb3">
<macro-deploy-native40
- spilibs="${spi.dir}/output/lib"
+ wsflibs="${framework.dir}/output/lib"
jbosslibs="${int.jboss40.dir}/output/lib"
corelibs="${core.dir}/output/lib"
stacklibs="${int.native.dir}/output/lib"
thirdpartylibs="${core.dir}/thirdparty"/>
- <macro-deploy-spi
- spilibs="${spi.dir}/output/lib"
- thirdpartylibs="${spi.dir}/thirdparty"
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
jbosshome="${jboss40.home}"/>
</target>
@@ -125,6 +125,6 @@
<!-- Remove jbossws from jboss40 -->
<target name="undeploy-jboss40" depends="prepare" description="Remove jbossws from jboss40">
<macro-undeploy-native40/>
- <macro-undeploy-spi jbosshome="${jboss40.home}"/>
+ <macro-undeploy-wsf jbosshome="${jboss40.home}"/>
</target>
</project>
Modified: branches/tdiesler/trunk/integration/native/ant-import/build-testsuite.xml
===================================================================
--- branches/tdiesler/trunk/integration/native/ant-import/build-testsuite.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/native/ant-import/build-testsuite.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -27,7 +27,7 @@
<target name="tests-init" depends="tests-classpath">
<path id="ws.stack.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
Modified: branches/tdiesler/trunk/integration/native/ant-import/build-thirdparty.xml
===================================================================
--- branches/tdiesler/trunk/integration/native/ant-import/build-thirdparty.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/native/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -31,12 +31,13 @@
<target name="thirdparty-classpath" depends="thirdparty-init">
<path id="native.integration.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
- <pathelement location="${spi.dir}/thirdparty/activation.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/servlet-api.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/activation.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/dom4j.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jboss-common-core.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jboss-logging-spi.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/servlet-api.jar"/>
<pathelement location="${core.dir}/output/lib/jbossws-core.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
Modified: branches/tdiesler/trunk/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- branches/tdiesler/trunk/integration/native/ant-import/macros-deploy-native.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/native/ant-import/macros-deploy-native.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -18,7 +18,7 @@
<!-- ================================================================== -->
<macrodef name="macro-deploy-native50">
- <attribute name="spilibs"/>
+ <attribute name="wsflibs"/>
<attribute name="jbosslibs"/>
<attribute name="corelibs"/>
<attribute name="stacklibs"/>
@@ -127,7 +127,7 @@
</macrodef>
<macrodef name="macro-deploy-native42">
- <attribute name="spilibs"/>
+ <attribute name="wsflibs"/>
<attribute name="jbosslibs"/>
<attribute name="corelibs"/>
<attribute name="stacklibs"/>
@@ -233,7 +233,7 @@
</macrodef>
<macrodef name="macro-deploy-native40">
- <attribute name="spilibs"/>
+ <attribute name="wsflibs"/>
<attribute name="jbosslibs"/>
<attribute name="corelibs"/>
<attribute name="stacklibs"/>
Modified: branches/tdiesler/trunk/integration/native/build.xml
===================================================================
--- branches/tdiesler/trunk/integration/native/build.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/native/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -277,7 +277,7 @@
defaultexcludes="yes">
<classpath>
<pathelement path="${native.integration.classpath}"/>
- <fileset dir="${spi.dir}/thirdparty">
+ <fileset dir="${framework.dir}/thirdparty">
<include name="**/*.jar"/>
</fileset>
<fileset dir="${core.dir}/thirdparty">
@@ -289,7 +289,7 @@
<include name="org/jboss/wsf/**"/>
<include name="org/jboss/ws/**"/>
</packageset>
- <packageset dir="${spi.dir}/src/main/java">
+ <packageset dir="${framework.dir}/src/main/java">
<include name="org/jboss/wsf/**"/>
<include name="org/jboss/ws/**"/>
</packageset>
Modified: branches/tdiesler/trunk/integration/native/src/main/etc/bin-dist-build.xml
===================================================================
--- branches/tdiesler/trunk/integration/native/src/main/etc/bin-dist-build.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/native/src/main/etc/bin-dist-build.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -95,6 +95,7 @@
<target name="tests-init" depends="prepare,tests-classpath">
<path id="ws.stack.classpath">
+ <pathelement location="${lib.dir}/jbossws-framework.jar"/>
<pathelement location="${lib.dir}/jbossws-spi.jar"/>
<pathelement location="${lib.dir}/jboss-jaxrpc.jar"/>
<pathelement location="${lib.dir}/jboss-jaxws.jar"/>
Modified: branches/tdiesler/trunk/integration/spi/ant-import/build-release.xml
===================================================================
--- branches/tdiesler/trunk/integration/spi/ant-import/build-release.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/spi/ant-import/build-release.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -21,13 +21,13 @@
<property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
<mkdir dir="${jboss.repository.dir}/jbossws/${repository.id}/lib"/>
<copy todir="${jboss.repository.dir}/jbossws-spi/${repository.id}/lib" overwrite="true">
- <fileset dir="${spi.output.lib.dir}">
- <include name="jbossws-spi.jar"/>
- <include name="jbossws-spi-src.zip"/>
- <include name="jbossws-spi-scripts.zip"/>
+ <fileset dir="${framework.output.lib.dir}">
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-framework-src.zip"/>
+ <include name="jbossws-framework-scripts.zip"/>
</fileset>
</copy>
- <copy tofile="${jboss.repository.dir}/jbossws-spi/${repository.id}/component-info.xml" file="${spi.etc.dir}/component-info.xml" filtering="true" overwrite="true">
+ <copy tofile="${jboss.repository.dir}/jbossws-spi/${repository.id}/component-info.xml" file="${framework.etc.dir}/component-info.xml" filtering="true" overwrite="true">
<filterset>
<filtersfile file="${build.dir}/version.properties"/>
</filterset>
Modified: branches/tdiesler/trunk/integration/spi/ant-import/build-thirdparty.xml
===================================================================
--- branches/tdiesler/trunk/integration/spi/ant-import/build-thirdparty.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/spi/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -21,7 +21,7 @@
<target name="thirdparty-init" depends="prepare">
- <property name="thirdparty.dir" value="${spi.dir}/thirdparty"/>
+ <property name="thirdparty.dir" value="${framework.dir}/thirdparty"/>
<checksum file="${build.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/>
<condition property="force.thirdparty">
<or>
@@ -48,6 +48,7 @@
<get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/gnu-getopt/${gnu-getopt}/lib/getopt.jar" dest="${thirdparty.dir}/getopt.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/>
@@ -87,6 +88,7 @@
<pathelement location="${thirdparty.dir}/jboss-javaee.jar"/>
<pathelement location="${thirdparty.dir}/jboss-microcontainer.jar"/>
<pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/>
Deleted: branches/tdiesler/trunk/integration/spi/ant-import/macros-deploy-spi.xml
===================================================================
--- branches/tdiesler/trunk/integration/spi/ant-import/macros-deploy-spi.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/spi/ant-import/macros-deploy-spi.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project>
-
- <macrodef name="macro-deploy-spi">
- <attribute name="spilibs"/>
- <attribute name="thirdpartylibs"/>
- <attribute name="jbosshome"/>
- <sequential>
-
- <!-- BIN SCRIPTS -->
- <unzip dest="@{jbosshome}/bin" src="@{spilibs}/jbossws-spi-scripts.zip"/>
- <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/>
-
- <!-- CLIENT JARS-->
- <copy todir="@{jbosshome}/client">
- <fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <include name="wsdl4j.jar"/>
- </fileset>
- </copy>
-
- <!-- SERVER JARS-->
- <copy todir="@{jbosshome}/server/${jboss.server.instance}/lib">
- <fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <macrodef name="macro-undeploy-spi">
- <attribute name="jbosshome"/>
- <sequential>
- <delete>
- <!-- BIN SCRIPTS -->
- <fileset dir="@{jbosshome}/bin">
- <include name="wsconsume.*"/>
- <include name="wsprovide.*"/>
- </fileset>
-
- <!-- CLIENT JARS-->
- <fileset dir="@{jbosshome}/client">
- <include name="jbossws-spi.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
-
- <!-- SERVER JARS-->
- <fileset dir="@{jbosshome}/server/${jboss.server.instance}/lib">
- <include name="jbossws-spi.jar"/>
- </fileset>
- </delete>
- </sequential>
- </macrodef>
-
-</project>
\ No newline at end of file
Added: branches/tdiesler/trunk/integration/spi/ant-import/macros-deploy-wsf.xml
===================================================================
--- branches/tdiesler/trunk/integration/spi/ant-import/macros-deploy-wsf.xml (rev 0)
+++ branches/tdiesler/trunk/integration/spi/ant-import/macros-deploy-wsf.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id: macros-deploy-spi.xml 3620 2007-06-18 20:39:56Z heiko.braun(a)jboss.com $ -->
+
+<project>
+
+ <macrodef name="macro-deploy-wsf">
+ <attribute name="wsflibs"/>
+ <attribute name="thirdpartylibs"/>
+ <attribute name="jbosshome"/>
+ <sequential>
+
+ <!-- BIN SCRIPTS -->
+ <unzip dest="@{jbosshome}/bin" src="@{wsflibs}/jbossws-framework-scripts.zip"/>
+ <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/>
+
+ <!-- CLIENT JARS-->
+ <copy todir="@{jbosshome}/client">
+ <fileset dir="@{wsflibs}">
+ <include name="jbossws-framework.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-spi.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- SERVER JARS-->
+ <copy todir="@{jbosshome}/server/${jboss.server.instance}/lib">
+ <fileset dir="@{wsflibs}">
+ <include name="jbossws-framework.jar"/>
+ </fileset>
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-undeploy-wsf">
+ <attribute name="jbosshome"/>
+ <sequential>
+ <delete>
+ <!-- BIN SCRIPTS -->
+ <fileset dir="@{jbosshome}/bin">
+ <include name="wsconsume.*"/>
+ <include name="wsprovide.*"/>
+ </fileset>
+
+ <!-- CLIENT JARS-->
+ <fileset dir="@{jbosshome}/client">
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-spi.jar"/>
+ <include name="wsdl4j.jar"/>
+ </fileset>
+
+ <!-- SERVER JARS-->
+ <fileset dir="@{jbosshome}/server/${jboss.server.instance}/lib">
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-spi.jar"/>
+ </fileset>
+ </delete>
+ </sequential>
+ </macrodef>
+
+</project>
\ No newline at end of file
Modified: branches/tdiesler/trunk/integration/spi/build.xml
===================================================================
--- branches/tdiesler/trunk/integration/spi/build.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/spi/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -15,22 +15,22 @@
<import file="${basedir}/build/ant-import/build-setup.xml"/>
- <import file="${spi.dir}/ant-import/build-release.xml"/>
- <import file="${spi.dir}/ant-import/build-thirdparty.xml"/>
+ <import file="${framework.dir}/ant-import/build-release.xml"/>
+ <import file="${framework.dir}/ant-import/build-thirdparty.xml"/>
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
- <property name="spi.src.dir" value="${spi.dir}/src/main"/>
- <property name="spi.etc.dir" value="${spi.src.dir}/etc"/>
- <property name="spi.java.dir" value="${spi.src.dir}/java"/>
- <property name="spi.resources.dir" value="${spi.src.dir}/resources"/>
- <property name="spi.output.dir" value="${spi.dir}/output"/>
- <property name="spi.output.apidocs.dir" value="${spi.output.dir}/apidocs"/>
- <property name="spi.output.etc.dir" value="${spi.output.dir}/etc"/>
- <property name="spi.output.classes.dir" value="${spi.output.dir}/classes"/>
- <property name="spi.output.lib.dir" value="${spi.output.dir}/lib"/>
+ <property name="framework.src.dir" value="${framework.dir}/src/main"/>
+ <property name="framework.etc.dir" value="${framework.src.dir}/etc"/>
+ <property name="framework.java.dir" value="${framework.src.dir}/java"/>
+ <property name="framework.resources.dir" value="${framework.src.dir}/resources"/>
+ <property name="framework.output.dir" value="${framework.dir}/output"/>
+ <property name="framework.output.apidocs.dir" value="${framework.output.dir}/apidocs"/>
+ <property name="framework.output.etc.dir" value="${framework.output.dir}/etc"/>
+ <property name="framework.output.classes.dir" value="${framework.output.dir}/classes"/>
+ <property name="framework.output.lib.dir" value="${framework.output.dir}/lib"/>
<!-- ================================================================== -->
<!-- Initialization -->
@@ -58,8 +58,8 @@
<target name="compile-classes" depends="init">
<!-- Compile spi classes with jdk1.5 -->
- <mkdir dir="${spi.output.classes.dir}"/>
- <javac srcdir="${spi.java.dir}" sourcepath="" destdir="${spi.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ <mkdir dir="${framework.output.classes.dir}"/>
+ <javac srcdir="${framework.java.dir}" sourcepath="" destdir="${framework.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5">
<include name="org/jboss/wsf/**"/>
<classpath refid="spi.thirdparty.classpath"/>
@@ -68,9 +68,9 @@
<!-- Compile etc files (manifests and such) -->
<target name="compile-etc" depends="init">
- <mkdir dir="${spi.output.etc.dir}"/>
- <copy todir="${spi.output.etc.dir}" filtering="yes">
- <fileset dir="${spi.etc.dir}"/>
+ <mkdir dir="${framework.output.etc.dir}"/>
+ <copy todir="${framework.output.etc.dir}" filtering="yes">
+ <fileset dir="${framework.etc.dir}"/>
<filterset>
<filter token="java.vm.version" value="${java.vm.version}"/>
<filter token="java.vm.vendor" value="${java.vm.vendor}"/>
@@ -97,9 +97,9 @@
<target name="module-jars">
<!-- Build jbossws-framework.jar -->
- <mkdir dir="${spi.output.lib.dir}"/>
- <jar jarfile="${spi.output.lib.dir}/jbossws-framework.jar" manifest="${spi.output.etc.dir}/default.mf">
- <fileset dir="${spi.output.classes.dir}">
+ <mkdir dir="${framework.output.lib.dir}"/>
+ <jar jarfile="${framework.output.lib.dir}/jbossws-framework.jar" manifest="${framework.output.etc.dir}/default.mf">
+ <fileset dir="${framework.output.classes.dir}">
<include name="org/jboss/wsf/common/**"/>
<include name="org/jboss/wsf/framework/**"/>
<include name="org/jboss/wsf/test/**"/>
@@ -107,20 +107,20 @@
</jar>
<!-- Build jbossws-spi-scripts.zip -->
- <zip zipfile="${spi.output.lib.dir}/jbossws-spi-scripts.zip" >
- <fileset dir="${spi.output.etc.dir}">
+ <zip zipfile="${framework.output.lib.dir}/jbossws-framework-scripts.zip" >
+ <fileset dir="${framework.output.etc.dir}">
<include name="wsconsume.bat"/>
<include name="wsprovide.bat"/>
</fileset>
- <zipfileset dir="${spi.output.etc.dir}" filemode="755">
+ <zipfileset dir="${framework.output.etc.dir}" filemode="755">
<include name="wsconsume.sh"/>
<include name="wsprovide.sh"/>
</zipfileset>
</zip>
<!-- Build jbossws-spi-src.zip -->
- <zip zipfile="${spi.output.lib.dir}/jbossws-spi-src.zip" >
- <fileset dir="${spi.java.dir}"/>
+ <zip zipfile="${framework.output.lib.dir}/jbossws-framework-src.zip" >
+ <fileset dir="${framework.java.dir}"/>
</zip>
</target>
@@ -132,10 +132,10 @@
<!-- Generate the JavaDoc -->
<target name="javadoc" depends="init" description="Generate the Javadoc">
- <mkdir dir="${spi.output.apidocs.dir}"/>
- <javadoc destdir="${spi.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
+ <mkdir dir="${framework.output.apidocs.dir}"/>
+ <javadoc destdir="${framework.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
<classpath refid="spi.thirdparty.classpath"/>
- <packageset dir="${spi.java.dir}" defaultexcludes="yes">
+ <packageset dir="${framework.java.dir}" defaultexcludes="yes">
<include name="org/jboss/wsf/**"/>
</packageset>
<doctitle><![CDATA[<h1>JBoss Web Service Framework - SPI</h1>]]></doctitle>
@@ -144,11 +144,11 @@
</target>
<target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${spi.output.dir}"/>
+ <delete dir="${framework.output.dir}"/>
</target>
<target name="clobber" depends="clean" description="Cleans up all generated files.">
- <delete dir="${spi.dir}/thirdparty"/>
+ <delete dir="${framework.dir}/thirdparty"/>
</target>
<target name="main" description="Executes the default target (most)." depends="most"/>
Modified: branches/tdiesler/trunk/integration/spi/src/main/etc/component-info.xml
===================================================================
--- branches/tdiesler/trunk/integration/spi/src/main/etc/component-info.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/spi/src/main/etc/component-info.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -1,28 +1,18 @@
-<project name="jboss/jbossws-spi">
+<project name="jboss/jbossws-framework">
- <component id="jboss/jbossws-spi"
+ <component id="jboss/jbossws-framework"
description="JBossWS SPI"
version="@repository.id@"
licenseType="lgpl">
- <artifact id="jbossws-spi.jar"/>
- <artifact id="jbossws-spi-scripts.zip"/>
+ <artifact id="jbossws-framework.jar"/>
+ <artifact id="jbossws-framework-scripts.zip"/>
- <import componentref="sun-jaxb">
- <compatible version="@sun-jaxb@"/>
+ <import componentref="jbossws-spi">
+ <compatible version="@jbossws-spi@"/>
</import>
- <import componentref="sun-jaxws">
- <compatible version="@sun-jaxws@"/>
- </import>
-
- <import componentref="woodstox">
- <compatible version="@woodstox@"/>
- <compatible version="@woodstox@-brew"/>
- </import>
-
<export>
- <include input="jbossws-spi.jar"/>
</export>
</component>
Modified: branches/tdiesler/trunk/integration/sunri/ant-import/build-bin-dist.xml
===================================================================
--- branches/tdiesler/trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/sunri/ant-import/build-bin-dist.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -61,7 +61,7 @@
<fileset dir="${int.sunri.dir}/ant-import">
<include name="macros-deploy-sunri.xml"/>
</fileset>
- <fileset dir="${spi.dir}/ant-import">
+ <fileset dir="${framework.dir}/ant-import">
<include name="macros-deploy-spi.xml"/>
</fileset>
<fileset dir="${int.xfire.dir}/ant-import">
@@ -73,7 +73,7 @@
</copy>
<copy todir="${bindist.bin.dir}">
- <fileset dir="${spi.dir}/src/main/etc">
+ <fileset dir="${framework.dir}/src/main/etc">
<include name="*.sh"/>
<include name="*.bat"/>
</fileset>
@@ -94,11 +94,12 @@
<!-- lib -->
<copy todir="${bindist.lib.dir}" overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
+ <fileset dir="${framework.dir}/output/lib">
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-framework-scripts.zip"/>
+ </fileset>
+ <fileset dir="${framework.dir}/thirdparty">
<include name="jbossws-spi.jar"/>
- <include name="jbossws-spi-scripts.zip"/>
- </fileset>
- <fileset dir="${spi.dir}/thirdparty">
<include name="getopt.jar"/>
<include name="wsdl4j.jar"/>
</fileset>
Modified: branches/tdiesler/trunk/integration/sunri/ant-import/build-deploy.xml
===================================================================
--- branches/tdiesler/trunk/integration/sunri/ant-import/build-deploy.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/sunri/ant-import/build-deploy.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -14,7 +14,7 @@
<project>
<import file="${int.sunri.dir}/ant-import/macros-deploy-sunri.xml"/>
- <import file="${spi.dir}/ant-import/macros-deploy-spi.xml"/>
+ <import file="${framework.dir}/ant-import/macros-deploy-wsf.xml"/>
<!-- ================================================================== -->
<!-- Deployment -->
@@ -25,21 +25,21 @@
<ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<macro-deploy-sunri50
- spilibs="${spi.dir}/output/lib"
+ wsflibs="${framework.dir}/output/lib"
jbosslibs="${int.jboss50.dir}/output/lib"
stacklibs="${int.sunri.dir}/output/lib"
thirdpartylibs="${int.sunri.dir}/thirdparty"/>
- <macro-deploy-spi
- spilibs="${spi.dir}/output/lib"
- thirdpartylibs="${spi.dir}/thirdparty"
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
jbosshome="${jboss50.home}"/>
</target>
<!-- Remove from jboss50 -->
<target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50">
<macro-undeploy-sunri50/>
- <macro-undeploy-spi jbosshome="${jboss50.home}"/>
+ <macro-undeploy-wsf jbosshome="${jboss50.home}"/>
</target>
<!-- Deploy to jboss42 -->
@@ -47,21 +47,21 @@
<ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<macro-deploy-sunri42
- spilibs="${spi.dir}/output/lib"
+ wsflibs="${framework.dir}/output/lib"
jbosslibs="${int.jboss42.dir}/output/lib"
stacklibs="${int.sunri.dir}/output/lib"
thirdpartylibs="${int.sunri.dir}/thirdparty"/>
- <macro-deploy-spi
- spilibs="${spi.dir}/output/lib"
- thirdpartylibs="${spi.dir}/thirdparty"
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
jbosshome="${jboss42.home}"/>
</target>
<!-- Remove from jboss42 -->
<target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/sunri from jboss42">
<macro-undeploy-sunri42/>
- <macro-undeploy-spi jbosshome="${jboss42.home}"/>
+ <macro-undeploy-wsf jbosshome="${jboss42.home}"/>
</target>
</project>
Modified: branches/tdiesler/trunk/integration/sunri/ant-import/build-testsuite.xml
===================================================================
--- branches/tdiesler/trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/sunri/ant-import/build-testsuite.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -27,7 +27,8 @@
<target name="tests-init" depends="tests-classpath">
<path id="ws.stack.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${int.sunri.dir}/thirdparty/jbossws-spi.jar"/>
<pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/>
<pathelement location="${int.sunri.dir}/thirdparty/http.jar"/>
<pathelement location="${int.sunri.dir}/thirdparty/jaxws-api.jar"/>
Modified: branches/tdiesler/trunk/integration/sunri/ant-import/build-thirdparty.xml
===================================================================
--- branches/tdiesler/trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/sunri/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -43,6 +43,7 @@
<mkdir dir="${thirdparty.dir}"/>
<get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/>
@@ -56,7 +57,6 @@
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-impl.jar" dest="${thirdparty.dir}/saaj-impl.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/sjsxp.jar" dest="${thirdparty.dir}/sjsxp.jar" usetimestamp="true" verbose="true"/>
-
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-rt.jar" dest="${thirdparty.dir}/jaxws-rt.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-tools.jar" dest="${thirdparty.dir}/jaxws-tools.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/stax-ex.jar" dest="${thirdparty.dir}/stax-ex.jar" usetimestamp="true" verbose="true"/>
@@ -65,7 +65,6 @@
<get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
-
<checksum file="${int.sunri.dir}/version.properties" fileext=".md5"/>
</target>
@@ -73,17 +72,18 @@
<!-- The compile classpath for jboss50 integration -->
<path id="sunri.integration.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.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="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/dom4j.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jboss-common-core.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jboss-logging-spi.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jboss-javaee.jar"/>
<pathelement location="${thirdparty.dir}/http.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-xjc.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-rt.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/jsr181-api.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
</path>
Modified: branches/tdiesler/trunk/integration/sunri/build.xml
===================================================================
--- branches/tdiesler/trunk/integration/sunri/build.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/sunri/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -41,7 +41,7 @@
<!-- ================================================================== -->
<target name="init" depends="prepare,thirdparty">
- <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/>
<mkdir dir="${sunri.output.apidocs.dir}"/>
</target>
@@ -165,7 +165,7 @@
<include name="jbossws-context.war"/>
</fileset>
- <fileset dir="${spi.dir}/thirdparty">
+ <fileset dir="${framework.dir}/thirdparty">
<include name="jaxrpc-api.jar"/>
</fileset>
<fileset dir="${thirdparty.dir}">
@@ -214,7 +214,7 @@
<fileset dir="${sunri.output.lib.dir}">
<include name="jbossws-context.war"/>
</fileset>
- <fileset dir="${spi.dir}/thirdparty">
+ <fileset dir="${framework.dir}/thirdparty">
<include name="jaxrpc-api.jar"/>
</fileset>
<fileset dir="${int.jboss42.dir}/output/lib">
@@ -261,7 +261,7 @@
<classpath>
<pathelement path="${sunri50.integration.classpath}"/>
<pathelement path="${sunri.integration.classpath}"/>
- <fileset dir="${spi.dir}/thirdparty">
+ <fileset dir="${framework.dir}/thirdparty">
<include name="**/*.jar"/>
</fileset>
</classpath>
@@ -272,7 +272,7 @@
<packageset dir="${sunri.output.dir}/thirdparty-sources" defaultexcludes="yes">
<include name="com/sun/**"/>
</packageset>
- <packageset dir="${spi.dir}/src/main/java">
+ <packageset dir="${framework.dir}/src/main/java">
<include name="org/jboss/wsf/**"/>
<include name="org/jboss/ws/**"/>
</packageset>
Modified: branches/tdiesler/trunk/integration/sunri/src/main/etc/bin-dist-build.xml
===================================================================
--- branches/tdiesler/trunk/integration/sunri/src/main/etc/bin-dist-build.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/sunri/src/main/etc/bin-dist-build.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -78,6 +78,7 @@
<target name="tests-init" depends="prepare,tests-classpath">
<path id="ws.stack.classpath">
+ <pathelement location="${lib.dir}/jbossws-framework.jar"/>
<pathelement location="${lib.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/FastInfoset.jar"/>
<pathelement location="${thirdparty.dir}/http.jar"/>
Modified: branches/tdiesler/trunk/integration/xfire/ant-import/build-bin-dist.xml
===================================================================
--- branches/tdiesler/trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/xfire/ant-import/build-bin-dist.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -62,7 +62,7 @@
<fileset dir="${int.sunri.dir}/ant-import">
<include name="macros-deploy-sunri.xml"/>
</fileset>
- <fileset dir="${spi.dir}/ant-import">
+ <fileset dir="${framework.dir}/ant-import">
<include name="macros-deploy-spi.xml"/>
</fileset>
<fileset dir="${int.xfire.dir}/ant-import">
@@ -74,7 +74,7 @@
</copy>
<copy todir="${bindist.bin.dir}">
- <fileset dir="${spi.dir}/src/main/etc">
+ <fileset dir="${framework.dir}/src/main/etc">
<include name="*.sh"/>
<include name="*.bat"/>
</fileset>
@@ -95,11 +95,12 @@
<!-- lib -->
<copy todir="${bindist.lib.dir}" overwrite="true">
- <fileset dir="${spi.dir}/output/lib">
+ <fileset dir="${framework.dir}/output/lib">
+ <include name="jbossws-framework.jar"/>
+ <include name="jbossws-framework-scripts.zip"/>
+ </fileset>
+ <fileset dir="${framework.dir}/thirdparty">
<include name="jbossws-spi.jar"/>
- <include name="jbossws-spi-scripts.zip"/>
- </fileset>
- <fileset dir="${spi.dir}/thirdparty">
<include name="getopt.jar"/>
<include name="wsdl4j.jar"/>
</fileset>
Modified: branches/tdiesler/trunk/integration/xfire/ant-import/build-deploy.xml
===================================================================
--- branches/tdiesler/trunk/integration/xfire/ant-import/build-deploy.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/xfire/ant-import/build-deploy.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -14,7 +14,7 @@
<project>
<import file="${int.xfire.dir}/ant-import/macros-deploy-xfire.xml"/>
- <import file="${spi.dir}/ant-import/macros-deploy-spi.xml"/>
+ <import file="${framework.dir}/ant-import/macros-deploy-wsf.xml"/>
<!-- ================================================================== -->
<!-- Deployment -->
@@ -25,21 +25,21 @@
<ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/>
<macro-deploy-xfire50
- spilibs="${spi.dir}/output/lib"
+ wsflibs="${framework.dir}/output/lib"
jbosslibs="${int.jboss50.dir}/output/lib"
stacklibs="${int.xfire.dir}/output/lib"
thirdpartylibs="${int.xfire.dir}/thirdparty"/>
- <macro-deploy-spi
- spilibs="${spi.dir}/output/lib"
- thirdpartylibs="${spi.dir}/thirdparty"
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
jbosshome="${jboss50.home}"/>
</target>
<!-- Remove from jboss50 -->
<target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/xfire from jboss50">
<macro-undeploy-xfire50/>
- <macro-undeploy-spi jbosshome="${jboss50.home}"/>
+ <macro-undeploy-wsf jbosshome="${jboss50.home}"/>
</target>
<!-- Deploy to jboss42 -->
@@ -47,21 +47,21 @@
<ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/>
<macro-deploy-xfire42
- spilibs="${spi.dir}/output/lib"
+ wsflibs="${framework.dir}/output/lib"
jbosslibs="${int.jboss42.dir}/output/lib"
stacklibs="${int.xfire.dir}/output/lib"
thirdpartylibs="${int.xfire.dir}/thirdparty"/>
- <macro-deploy-spi
- spilibs="${spi.dir}/output/lib"
- thirdpartylibs="${spi.dir}/thirdparty"
+ <macro-deploy-wsf
+ wsflibs="${framework.dir}/output/lib"
+ thirdpartylibs="${framework.dir}/thirdparty"
jbosshome="${jboss42.home}"/>
</target>
<!-- Remove from jboss42 -->
<target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/xfire from jboss42">
<macro-undeploy-xfire42/>
- <macro-undeploy-spi jbosshome="${jboss42.home}"/>
+ <macro-undeploy-wsf jbosshome="${jboss42.home}"/>
</target>
</project>
Modified: branches/tdiesler/trunk/integration/xfire/ant-import/build-testsuite.xml
===================================================================
--- branches/tdiesler/trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -27,7 +27,8 @@
<target name="tests-init" depends="tests-classpath">
<path id="ws.stack.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${int.xfire.dir}/thirdparty/jbossws-spi.jar"/>
<pathelement location="${int.xfire.dir}/thirdparty/cxf-incubator.jar"/>
<pathelement location="${int.xfire.dir}/thirdparty/geronimo-javamail.jar"/>
<pathelement location="${int.xfire.dir}/thirdparty/geronimo-ws-metadata.jar"/>
Modified: branches/tdiesler/trunk/integration/xfire/ant-import/build-thirdparty.xml
===================================================================
--- branches/tdiesler/trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/xfire/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -58,6 +58,7 @@
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j.jar" dest="${thirdparty.dir}/wsdl4j.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/ibm-wsdl4j/${ibm-wsdl4j}/lib/wsdl4j-src.jar" dest="${thirdparty.dir}/wsdl4j-src.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/>
@@ -71,14 +72,15 @@
<target name="thirdparty-classpath" depends="thirdparty-init">
<path id="xfire.integration.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.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="${framework.dir}/output/lib/jbossws-framework.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/dom4j.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jboss-common-core.jar"/>
+ <pathelement location="${framework.dir}/thirdparty/jboss-logging-spi.jar"/>
<pathelement location="${thirdparty.dir}/cxf-incubator.jar"/>
<pathelement location="${thirdparty.dir}/geronimo-ws-metadata.jar"/>
<pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
<pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/saaj-api.jar"/>
<pathelement location="${thirdparty.dir}/saaj-impl.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
Modified: branches/tdiesler/trunk/integration/xfire/ant-import/macros-deploy-xfire.xml
===================================================================
--- branches/tdiesler/trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/xfire/ant-import/macros-deploy-xfire.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -29,12 +29,13 @@
<!-- CLIENT JARS -->
<copy todir="${jboss50.home}/client" overwrite="true">
<fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
+ <include name="jbossws-framework.jar"/>
</fileset>
<fileset dir="@{jbosslibs}">
<include name="jbossws-jboss50.jar"/>
</fileset>
<fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-spi.jar"/>
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
@@ -77,6 +78,7 @@
<!-- CLIENT JARS -->
<fileset dir="${jboss50.home}/client">
+ <include name="jbossws-framework.jar"/>
<include name="jbossws-spi.jar"/>
<include name="jbossws-jboss50.jar"/>
</fileset>
@@ -110,12 +112,13 @@
<!-- CLIENT JARS -->
<copy todir="${jboss42.home}/client" overwrite="true">
<fileset dir="@{spilibs}">
- <include name="jbossws-spi.jar"/>
+ <include name="jbossws-framework.jar"/>
</fileset>
<fileset dir="@{jbosslibs}">
<include name="jbossws-jboss42.jar"/>
</fileset>
<fileset dir="@{thirdpartylibs}">
+ <include name="jbossws-spi.jar"/>
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
Modified: branches/tdiesler/trunk/integration/xfire/build.xml
===================================================================
--- branches/tdiesler/trunk/integration/xfire/build.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/xfire/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -41,7 +41,7 @@
<!-- ================================================================== -->
<target name="init" depends="prepare,thirdparty">
- <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/>
<mkdir dir="${xfire.output.apidocs.dir}"/>
</target>
@@ -151,7 +151,7 @@
<include name="jbossws-context.war"/>
</fileset>
- <fileset dir="${spi.dir}/thirdparty">
+ <fileset dir="${framework.dir}/thirdparty">
<include name="jaxrpc-api.jar"/>
</fileset>
<fileset dir="${thirdparty.dir}">
@@ -205,7 +205,7 @@
<fileset dir="${xfire.output.lib.dir}">
<include name="jbossws-context.war"/>
</fileset>
- <fileset dir="${spi.dir}/thirdparty">
+ <fileset dir="${framework.dir}/thirdparty">
<include name="jaxrpc-api.jar"/>
</fileset>
<fileset dir="${int.jboss42.dir}/output/lib">
@@ -254,7 +254,7 @@
<javadoc destdir="${xfire.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API ${version.id} ">
<classpath>
<pathelement path="${xfire.integration.classpath}"/>
- <fileset dir="${spi.dir}/thirdparty">
+ <fileset dir="${framework.dir}/thirdparty">
<include name="**/*.jar"/>
</fileset>
</classpath>
@@ -264,7 +264,7 @@
<packageset dir="${xfire.output.dir}/thirdparty-sources" defaultexcludes="yes">
<include name="org/codehaus/**"/>
</packageset>
- <packageset dir="${spi.dir}/src/main/java">
+ <packageset dir="${framework.dir}/src/main/java">
<include name="org/jboss/wsf/**"/>
<include name="org/jboss/ws/**"/>
</packageset>
Modified: branches/tdiesler/trunk/integration/xfire/src/main/etc/bin-dist-build.xml
===================================================================
--- branches/tdiesler/trunk/integration/xfire/src/main/etc/bin-dist-build.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/integration/xfire/src/main/etc/bin-dist-build.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -79,6 +79,7 @@
<target name="tests-init" depends="prepare,tests-classpath">
<path id="ws.stack.classpath">
+ <pathelement location="${lib.dir}/jbossws-framework.jar"/>
<pathelement location="${lib.dir}/jbossws-spi.jar"/>
<pathelement location="${lib.dir}/cxf-incubator.jar"/>
<pathelement location="${lib.dir}/geronimo-javamail.jar"/>
Modified: branches/tdiesler/trunk/jbossws-core/ant-import/build-thirdparty.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -82,6 +82,7 @@
<get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx.jar" dest="${thirdparty.dir}/jbosssx.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-src.zip" dest="${thirdparty.dir}/jbosssx-src.zip" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" />
<get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/>
<get src="${jboss.repository}/qdox/${qdox}/lib/qdox.jar" dest="${thirdparty.dir}/qdox.jar" usetimestamp="true" verbose="true"/>
@@ -115,7 +116,7 @@
<!-- The compile classpath for jbossws core -->
<path id="thirdparty.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
<pathelement location="${thirdparty.dir}/ant.jar"/>
@@ -136,6 +137,7 @@
<pathelement location="${thirdparty.dir}/jboss-remoting.jar"/>
<pathelement location="${thirdparty.dir}/jboss-xml-binding.jar"/>
<pathelement location="${thirdparty.dir}/jbosssx.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/mail.jar"/>
<pathelement location="${thirdparty.dir}/policy.jar"/>
<pathelement location="${thirdparty.dir}/servlet-api.jar"/>
Modified: branches/tdiesler/trunk/jbossws-core/ant-import-tests/build-testsuite.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -28,12 +28,13 @@
<target name="tests-init" depends="thirdparty-classpath,tests-classpath">
<path id="ws.stack.classpath">
- <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
<pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
<pathelement location="${core.dir}/output/lib/jbossws-core.jar"/>
<pathelement location="${core.dir}/output/lib/jbossws-client.jar"/>
+ <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar"/>
<pathelement location="${core.dir}/thirdparty/policy.jar"/>
<pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/>
<pathelement location="${core.dir}/thirdparty/wstx.jar"/>
Modified: branches/tdiesler/trunk/jbossws-core/build.xml
===================================================================
--- branches/tdiesler/trunk/jbossws-core/build.xml 2007-08-02 09:01:26 UTC (rev 4079)
+++ branches/tdiesler/trunk/jbossws-core/build.xml 2007-08-02 09:09:47 UTC (rev 4080)
@@ -33,7 +33,7 @@
<property name="core.output.lib.dir" value="${core.output.dir}/lib"/>
<target name="init" depends="prepare,thirdparty-get">
- <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/>
+ <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/>
</target>
<!-- ================================================================== -->
17 years, 4 months
- 1
- 0
JBossWS SVN: r4079 - trunk/integration/xfire/src/test/resources.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-08-02 05:01:26 -0400 (Thu, 02 Aug 2007)
New Revision: 4079
Modified:
trunk/integration/xfire/src/test/resources/test-excludes-jboss42.txt
Log:
really exclude jaxws/tools tests for xfire
Modified: trunk/integration/xfire/src/test/resources/test-excludes-jboss42.txt
===================================================================
--- trunk/integration/xfire/src/test/resources/test-excludes-jboss42.txt 2007-08-02 07:16:49 UTC (rev 4078)
+++ trunk/integration/xfire/src/test/resources/test-excludes-jboss42.txt 2007-08-02 09:01:26 UTC (rev 4079)
@@ -55,5 +55,5 @@
org/jboss/test/ws/jaxws/samples/xop/**
# [JBWS-1774] Provide a tools implementation for CXF (WSContractProvider and WSContractConsumer)
-org/jboss/test/ws/jaxws/tools
+org/jboss/test/ws/jaxws/tools/**
17 years, 4 months
- 1
- 0
JBossWS SVN: r4078 - spi/trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-08-02 03:16:49 -0400 (Thu, 02 Aug 2007)
New Revision: 4078
Removed:
spi/trunk/ant.properties
Log:
Ignore ant.properties
Deleted: spi/trunk/ant.properties
===================================================================
--- spi/trunk/ant.properties 2007-08-02 06:43:23 UTC (rev 4077)
+++ spi/trunk/ant.properties 2007-08-02 07:16:49 UTC (rev 4078)
@@ -1,20 +0,0 @@
-#
-# A sample ant properties file
-#
-# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
-
-# JBoss Repository
-jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
-#jboss.repository=http://repository.jboss.org
-
-# JBossWS Release
-jboss.local.repository=/home/tdiesler/svn/jboss.local.repository
-
-# Force thirdparty HTTP get
-#force.thirdparty.get=true
-
-# Java Compiler options
-javac.debug=yes
-javac.deprecation=no
-javac.fail.onerror=yes
-javac.verbose=no
17 years, 4 months
- 1
- 0