JBossWS SVN: r9238 - stack/metro/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-05 09:39:00 -0500 (Thu, 05 Feb 2009)
New Revision: 9238
Modified:
stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
Copying stax-api.jar to endorsed dir on AS 4.2.x
Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-02-05 13:58:00 UTC (rev 9237)
+++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-02-05 14:39:00 UTC (rev 9238)
@@ -180,6 +180,20 @@
<!-- Deploy Lib Endorsed -->
<!-- ================================================================== -->
+ <macrodef name="macro-deploy-jbossws-endorsed42">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.lib.endorsed.patternset"/>
+ <include name="**/stax-api.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
<macrodef name="macro-deploy-jbossws-endorsed">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -557,7 +571,7 @@
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
<macro-deploy-jbossws-client42 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-endorsed42 targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
15 years, 10 months
JBossWS SVN: r9237 - in stack/cxf/trunk: modules/client and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-05 08:58:00 -0500 (Thu, 05 Feb 2009)
New Revision: 9237
Modified:
stack/cxf/trunk/modules/client/pom.xml
stack/cxf/trunk/modules/server/pom.xml
stack/cxf/trunk/pom.xml
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Using apache's version of stax-api
Modified: stack/cxf/trunk/modules/client/pom.xml
===================================================================
--- stack/cxf/trunk/modules/client/pom.xml 2009-02-05 13:55:07 UTC (rev 9236)
+++ stack/cxf/trunk/modules/client/pom.xml 2009-02-05 13:58:00 UTC (rev 9237)
@@ -120,8 +120,8 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.santuario</groupId>
Modified: stack/cxf/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/trunk/modules/server/pom.xml 2009-02-05 13:55:07 UTC (rev 9236)
+++ stack/cxf/trunk/modules/server/pom.xml 2009-02-05 13:58:00 UTC (rev 9237)
@@ -146,8 +146,8 @@
<artifactId>jaxrpc-api</artifactId>
</dependency>
<dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.santuario</groupId>
Modified: stack/cxf/trunk/pom.xml
===================================================================
--- stack/cxf/trunk/pom.xml 2009-02-05 13:55:07 UTC (rev 9236)
+++ stack/cxf/trunk/pom.xml 2009-02-05 13:58:00 UTC (rev 9237)
@@ -336,8 +336,8 @@
<version>${commons-lang.version}</version>
</dependency>
<dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
<version>${cxf.stax.version}</version>
</dependency>
<dependency>
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-05 13:55:07 UTC (rev 9236)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2009-02-05 13:58:00 UTC (rev 9237)
@@ -38,7 +38,6 @@
<include>org.springframework:spring-beans:jar</include>
<include>org.springframework:spring-context:jar</include>
<include>org.springframework:spring-core:jar</include>
- <include>stax:stax-api:jar</include>
<include>wsdl4j:wsdl4j:jar</include>
<include>xml-resolver:xml-resolver:jar</include>
<include>org.apache.ws.commons.schema:XmlSchema:jar</include>
@@ -58,6 +57,13 @@
</includes>
</dependencySet>
<dependencySet>
+ <outputFileNameMapping>stax-api.jar</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
<outputFileNameMapping>wstx.jar</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
15 years, 10 months
JBossWS SVN: r9236 - stack/cxf/trunk/modules/resources/src/main/resources/resources.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-05 08:55:07 -0500 (Thu, 05 Feb 2009)
New Revision: 9236
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
Log:
Copying stax-api.jar to endorsed dir on AS 4.2.x
Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-02-04 17:55:26 UTC (rev 9235)
+++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2009-02-05 13:55:07 UTC (rev 9236)
@@ -176,6 +176,20 @@
<!-- Deploy Lib Endorsed -->
<!-- ================================================================== -->
+ <macrodef name="macro-deploy-jbossws-endorsed42">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.lib.endorsed.patternset"/>
+ <include name="**/stax-api.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
<macrodef name="macro-deploy-jbossws-endorsed">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
@@ -556,7 +570,7 @@
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
<macro-deploy-jbossws-client42 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
- <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-endorsed42 targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-cxf42-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
15 years, 10 months
JBossWS SVN: r9235 - stack/cxf/trunk/modules/resources/src/main/resources/bin.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-04 12:55:26 -0500 (Wed, 04 Feb 2009)
New Revision: 9235
Modified:
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
Log:
[JBWS-1744] Fixing classpath for wsprovide script too
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2009-02-04 12:25:08 UTC (rev 9234)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.bat 2009-02-04 17:55:26 UTC (rev 9235)
@@ -74,6 +74,8 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/FastInfoset.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/geronimo-ws-metadata_2.0_spec.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jaxws-api.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-ejb3x.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/jboss-javaee.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/neethi.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-beans.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/spring-context.jar
@@ -83,6 +85,7 @@
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/stax-api.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/velocity.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/XmlSchema.jar
+set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/xml-resolver.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/wsdl4j.jar
set WSPROVIDE_CLASSPATH=%WSPROVIDE_CLASSPATH%;%JBOSS_HOME%/client/wstx.jar
Modified: stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh
===================================================================
--- stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2009-02-04 12:25:08 UTC (rev 9234)
+++ stack/cxf/trunk/modules/resources/src/main/resources/bin/wsprovide.sh 2009-02-04 17:55:26 UTC (rev 9235)
@@ -110,6 +110,8 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/FastInfoset.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/geronimo-ws-metadata_2.0_spec.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jaxws-api.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-ejb3x.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/jboss-javaee.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/neethi.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-beans.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/spring-context.jar"
@@ -119,6 +121,7 @@
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/stax-api.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/velocity.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/XmlSchema.jar"
+WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/xml-resolver.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/wsdl4j.jar"
WSPROVIDE_CLASSPATH="$WSPROVIDE_CLASSPATH:$LIBDIR/wstx.jar"
15 years, 10 months
JBossWS SVN: r9234 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-02-04 07:25:08 -0500 (Wed, 04 Feb 2009)
New Revision: 9234
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
Log:
[JBWS-2513] implementing proper exception handling
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2009-02-04 10:34:54 UTC (rev 9233)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/AbstractInvoker.java 2009-02-04 12:25:08 UTC (rev 9234)
@@ -18,7 +18,25 @@
* 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.
- */
+ */
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.jboss.wsf.stack.cxf;
import java.lang.reflect.InvocationTargetException;
@@ -34,16 +52,20 @@
import javax.xml.ws.WebServiceContext;
import javax.xml.ws.handler.MessageContext;
import javax.xml.ws.handler.MessageContext.Scope;
+import javax.xml.ws.soap.SOAPFaultException;
import org.apache.cxf.attachment.AttachmentImpl;
+import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.binding.soap.SoapMessage;
import org.apache.cxf.frontend.MethodDispatcher;
import org.apache.cxf.headers.Header;
import org.apache.cxf.helpers.CastUtils;
+import org.apache.cxf.interceptor.Fault;
import org.apache.cxf.jaxws.context.WebServiceContextImpl;
import org.apache.cxf.jaxws.context.WrappedMessageContext;
import org.apache.cxf.message.Attachment;
import org.apache.cxf.message.Exchange;
+import org.apache.cxf.message.FaultMode;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageContentsList;
import org.apache.cxf.service.Service;
@@ -59,7 +81,7 @@
* An abstract CXF invoker
*
* @author Thomas.Diesler(a)jboss.org
- * @since 06-Dec-2007
+ * @author richard.opalka(a)jboss.com
*/
public abstract class AbstractInvoker implements Invoker
{
@@ -93,11 +115,12 @@
Method m = md.getMethod(bop);
Object[] params = NO_ARGS;
+ List<Object> paramList = null;
if (m.getParameterTypes().length != 0)
{
if (o instanceof List<?>)
{
- List<Object> paramList = CastUtils.cast((List<?>)o);
+ paramList = CastUtils.cast((List<?>)o);
params = paramList.toArray();
}
else
@@ -121,26 +144,65 @@
{
invHandler.invoke(ep, inv);
retObj = inv.getReturnValue();
+ } catch (InvocationTargetException e) {
+ Throwable t = e.getCause();
+ if (t == null) {
+ t = e;
+ }
+ exchange.getInMessage().put(FaultMode.class, FaultMode.UNCHECKED_APPLICATION_FAULT);
+ for (Class<?> cl : m.getExceptionTypes()) {
+ if (cl.isInstance(t)) {
+ exchange.getInMessage().put(FaultMode.class,
+ FaultMode.CHECKED_APPLICATION_FAULT);
+ }
+ }
+
+ if (t instanceof Fault) {
+ exchange.getInMessage().put(FaultMode.class,
+ FaultMode.CHECKED_APPLICATION_FAULT);
+ throw (Fault)t;
+ }
+ throw createFault(t, m, paramList, true);
+ } catch (Fault f) {
+ exchange.getInMessage().put(FaultMode.class, FaultMode.UNCHECKED_APPLICATION_FAULT);
+ throw f;
+ } catch (Exception e) {
+ exchange.getInMessage().put(FaultMode.class, FaultMode.UNCHECKED_APPLICATION_FAULT);
+ throw createFault(e, m, paramList, false);
}
- catch (Exception ex)
- {
- handleException(ex);
- }
return retObj;
}
+
+ protected SOAPFaultException findSoapFaultException(Throwable ex) {
+ if (ex instanceof SOAPFaultException) {
+ return (SOAPFaultException)ex;
+ }
+ if (ex.getCause() != null) {
+ return findSoapFaultException(ex.getCause());
+ }
+ return null;
+ }
+
+ protected Fault createFault(Throwable ex, Method m, List<Object> params, boolean checked) {
+ //map the JAX-WS faults
+ SOAPFaultException sfe = findSoapFaultException(ex);
+ if (sfe != null) {
+ SoapFault fault = new SoapFault(sfe.getFault().getFaultString(),
+ ex,
+ sfe.getFault().getFaultCodeAsQName());
+ fault.setRole(sfe.getFault().getFaultActor());
+ fault.setDetail(sfe.getFault().getDetail());
+
+ return fault;
+ }
+
+ return new Fault(ex);
+ }
+
protected abstract WebServiceContext getWebServiceContext(MessageContext msgCtx);
- protected void handleException(Exception ex)
- {
- Throwable th = ex;
- if (ex instanceof InvocationTargetException)
- th = ((InvocationTargetException)ex).getTargetException();
-
- throw new RuntimeException(th);
- }
-
protected Map<String, Object> removeHandlerProperties(WrappedMessageContext ctx)
{
Map<String, Scope> scopes = CastUtils.cast((Map<?, ?>)ctx.get(WrappedMessageContext.SCOPES));
@@ -168,10 +230,10 @@
// Need to copy header only if the message is going out.
if (ctx.containsKey(Header.HEADER_LIST) && ctx.get(Header.HEADER_LIST) instanceof List<?>)
{
- List list = (List) ctx.get(Header.HEADER_LIST);
+ List<?> list = (List<?>) ctx.get(Header.HEADER_LIST);
if (list != null && !list.isEmpty()) {
SoapMessage sm = (SoapMessage) createResponseMessage(exchange);
- Iterator iter = list.iterator();
+ Iterator<?> iter = list.iterator();
while (iter.hasNext())
{
sm.getHeaders().add((Header) iter.next());
15 years, 11 months
JBossWS SVN: r9233 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-04 05:34:54 -0500 (Wed, 04 Feb 2009)
New Revision: 9233
Modified:
stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
Log:
Updating exclude comment
Modified: stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-02-04 10:34:25 UTC (rev 9232)
+++ stack/native/trunk/modules/testsuite/test-excludes-jboss500.txt 2009-02-04 10:34:54 UTC (rev 9233)
@@ -9,7 +9,7 @@
# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored
org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.*
-# [JBAS-5257] Cannot deploy through jax-ws endpoint API
+# [JBWS-1967] Implement in memory webapp deployment
org/jboss/test/ws/jaxws/endpoint/**
# [JBWS-2217] Fix BPEL jaxrpc samples
15 years, 11 months
JBossWS SVN: r9232 - in stack: metro/trunk and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-04 05:34:25 -0500 (Wed, 04 Feb 2009)
New Revision: 9232
Modified:
stack/cxf/trunk/.classpath
stack/metro/trunk/.classpath
stack/native/trunk/.classpath
Log:
Excluding resources from java build path in Eclipse
Modified: stack/cxf/trunk/.classpath
===================================================================
--- stack/cxf/trunk/.classpath 2009-02-04 10:31:27 UTC (rev 9231)
+++ stack/cxf/trunk/.classpath 2009-02-04 10:34:25 UTC (rev 9232)
@@ -2,11 +2,7 @@
<classpath>
<classpathentry kind="src" path="modules/testsuite/cxf-tests/src/test/java"/>
<classpathentry kind="src" output="modules/server/target/classes" path="modules/server/src/main/java"/>
- <classpathentry excluding="**" kind="src" output="modules/server/target/classes" path="modules/server/src/main/resources/jbossws-cxf-server.jar"/>
- <classpathentry excluding="**" kind="src" output="modules/server/target/classes" path="modules/server/src/main/resources/jbossws-cxf.sar"/>
<classpathentry kind="src" output="modules/client/target/classes" path="modules/client/src/main/java"/>
- <classpathentry excluding="**" kind="src" output="modules/client/target/classes" path="modules/client/src/main/resources"/>
- <classpathentry excluding="**" kind="src" output="modules/resources/target/classes" path="modules/resources/src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
Modified: stack/metro/trunk/.classpath
===================================================================
--- stack/metro/trunk/.classpath 2009-02-04 10:31:27 UTC (rev 9231)
+++ stack/metro/trunk/.classpath 2009-02-04 10:34:25 UTC (rev 9232)
@@ -3,10 +3,7 @@
<classpathentry kind="src" path="modules/testsuite/metro-tests/target/wsconsume/java"/>
<classpathentry kind="src" path="modules/testsuite/metro-tests/src/test/java"/>
<classpathentry kind="src" output="modules/server/target/classes" path="modules/server/src/main/java"/>
- <classpathentry excluding="**" kind="src" output="modules/server/target/classes" path="modules/server/src/main/resources/jbossws-metro-server.jar"/>
<classpathentry kind="src" output="modules/client/target/classes" path="modules/client/src/main/java"/>
- <classpathentry excluding="**" kind="src" output="modules/client/target/classes" path="modules/client/src/main/resources"/>
- <classpathentry excluding="**" kind="src" output="modules/resources/target/classes" path="modules/resources/src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
Modified: stack/native/trunk/.classpath
===================================================================
--- stack/native/trunk/.classpath 2009-02-04 10:31:27 UTC (rev 9231)
+++ stack/native/trunk/.classpath 2009-02-04 10:34:25 UTC (rev 9232)
@@ -3,15 +3,10 @@
<classpathentry kind="src" path="modules/testsuite/native-tests/target/wsconsume/java"/>
<classpathentry kind="src" path="modules/testsuite/native-tests/src/test/java"/>
<classpathentry kind="src" output="modules/saaj/target/classes" path="modules/saaj/src/main/java"/>
- <classpathentry excluding="**" kind="src" output="modules/saaj/target/classes" path="modules/saaj/src/main/resources"/>
<classpathentry kind="src" output="modules/jaxrpc/target/classes" path="modules/jaxrpc/src/main/java"/>
<classpathentry kind="src" output="modules/jaxws/target/classes" path="modules/jaxws/src/main/java"/>
- <classpathentry excluding="**" kind="src" output="modules/jaxws/target/classes" path="modules/jaxws/src/main/resources"/>
<classpathentry kind="src" output="modules/jaxws-ext/target/classes" path="modules/jaxws-ext/src/main/java"/>
<classpathentry kind="src" output="modules/core/target/classes" path="modules/core/src/main/java"/>
- <classpathentry excluding="**" kind="src" output="modules/core/target/classes" path="modules/core/src/main/resources"/>
- <classpathentry excluding="**" kind="src" output="modules/client/target/classes" path="modules/client/src/main/resources"/>
- <classpathentry excluding="**" kind="src" output="modules/resources/target/classes" path="modules/resources/src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
15 years, 11 months
JBossWS SVN: r9231 - framework/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-04 05:31:27 -0500 (Wed, 04 Feb 2009)
New Revision: 9231
Removed:
framework/branches/jaxws21/
Log:
Removing branch not used anymore
15 years, 11 months
JBossWS SVN: r9230 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2009-02-04 05:23:32 -0500 (Wed, 04 Feb 2009)
New Revision: 9230
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java
Log:
[JBWS-2493] fix NPE
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2009-02-04 10:10:52 UTC (rev 9229)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/ServletControllerExt.java 2009-02-04 10:23:32 UTC (rev 9230)
@@ -77,15 +77,6 @@
EndpointInfo endpointInfo = destination.getEndpointInfo();
String address = endpointInfo.getAddress();
- // Fix invalid leading slash
- /*
- if (address.startsWith("/http://"))
- {
- address = address.substring(1);
- endpointInfo.setAddress(address);
- }
- */
-
String path = address;
try
{
@@ -96,14 +87,17 @@
// ignore
}
- if (requestURI.equals(path))
+ if (path != null)
{
- return destination; // exact match
+ if (requestURI.equals(path))
+ {
+ return destination; // exact match
+ }
+ else if (requestURI.startsWith(path))
+ {
+ returnValue = destination; // fallback
+ }
}
- else if (requestURI.startsWith(path))
- {
- returnValue = destination; // fallback
- }
}
if (returnValue == null)
15 years, 11 months
JBossWS SVN: r9229 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2009-02-04 05:10:52 -0500 (Wed, 04 Feb 2009)
New Revision: 9229
Removed:
stack/native/branches/jaxws21/
Log:
Removing branch not required anymore
15 years, 11 months