JBossWS SVN: r12711 - stack/native/branches/jbossws-native-3.1.2/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-08-02 03:09:25 -0400 (Mon, 02 Aug 2010)
New Revision: 12711
Modified:
stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml
Log:
[JBPAPP-4359] Updating to final version of HornetQ in EAP 5.1.0
Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml
===================================================================
--- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2010-08-02 06:34:31 UTC (rev 12710)
+++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/pom.xml 2010-08-02 07:09:25 UTC (rev 12711)
@@ -25,7 +25,7 @@
<hibernate.version>3.2.4.sp1</hibernate.version>
<endpoint.servlet>org.jboss.wsf.stack.jbws.EndpointServlet</endpoint.servlet>
<jboss.javaee.version>5.0.1.GA</jboss.javaee.version>
- <hornetq.version>2.1.0.BETA3</hornetq.version>
+ <hornetq.version>2.1.1.Final</hornetq.version>
</properties>
<!-- Modules -->
14 years, 7 months
JBossWS SVN: r12710 - in thirdparty/cxf: tags and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-08-02 02:34:31 -0400 (Mon, 02 Aug 2010)
New Revision: 12710
Added:
thirdparty/cxf/branches/cxf-2.2.6/
Removed:
thirdparty/cxf/tags/cxf-2.2.6/
Log:
Moving cxf-2.2.6 tag to branches, as that should have been since the beginning
Copied: thirdparty/cxf/branches/cxf-2.2.6 (from rev 12709, thirdparty/cxf/tags/cxf-2.2.6)
14 years, 7 months
JBossWS SVN: r12709 - stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-08-02 02:15:12 -0400 (Mon, 02 Aug 2010)
New Revision: 12709
Removed:
stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java
stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java
Log:
Removing classes not used anymore
Deleted: stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java
===================================================================
--- stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java 2010-08-02 05:55:00 UTC (rev 12708)
+++ stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java 2010-08-02 06:15:12 UTC (rev 12709)
@@ -1,55 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.cxf.transport;
-
-import java.io.IOException;
-import java.util.logging.Logger;
-
-import org.apache.cxf.Bus;
-import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.transport.http.AbstractHTTPDestination;
-
-public class TomcatHTTPDestination extends AbstractHTTPDestination
-{
- private static final Logger LOG = LogUtils.getL7dLogger(TomcatHTTPDestination.class);
-
- private TomcatHTTPTransportFactory transportFactory;
-
- public TomcatHTTPDestination(Bus b, TomcatHTTPTransportFactory ci, EndpointInfo ei, boolean dp) throws IOException
- {
- super(b, ei, dp);
- this.transportFactory = ci;
- }
-
- @Override
- protected Logger getLogger()
- {
- return LOG;
- }
-
- @Override
- public void shutdown() {
- transportFactory.removeDestination(endpointInfo);
- super.shutdown();
- }
-}
Deleted: stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java
===================================================================
--- stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java 2010-08-02 05:55:00 UTC (rev 12708)
+++ stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPTransportFactory.java 2010-08-02 06:15:12 UTC (rev 12709)
@@ -1,76 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.wsf.stack.cxf.transport;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.cxf.service.model.EndpointInfo;
-import org.apache.cxf.transport.Destination;
-import org.apache.cxf.transport.DestinationFactory;
-import org.apache.cxf.transport.http.AbstractHTTPTransportFactory;
-
-public class TomcatHTTPTransportFactory extends AbstractHTTPTransportFactory implements DestinationFactory
-{
- private Map<String, TomcatHTTPDestination> destinations = new HashMap<String, TomcatHTTPDestination>();
-
- public TomcatHTTPTransportFactory()
- {
- super();
- }
-
- public Destination getDestination(EndpointInfo endpointInfo) throws IOException
- {
- String addr = endpointInfo.getAddress();
- TomcatHTTPDestination destination = destinations.get(addr);
- if (destination == null)
- {
- destination = createDestination(endpointInfo);
- }
-
- return destination;
- }
-
- private synchronized TomcatHTTPDestination createDestination(EndpointInfo endpointInfo) throws IOException
- {
-
- TomcatHTTPDestination destination = destinations.get(endpointInfo.getAddress());
- if (destination == null)
- {
- destination = new TomcatHTTPDestination(getBus(), this, endpointInfo, true);
-
- destinations.put(endpointInfo.getAddress(), destination);
-
- configure(destination);
- }
- return destination;
- }
-
- /**
- * This function removes the destination for a particular endpoint.
- */
- void removeDestination(EndpointInfo ei)
- {
- destinations.remove(ei.getAddress());
- }
-}
14 years, 7 months
JBossWS SVN: r12708 - in stack/cxf/branches/cxf-2.3: modules/server and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-08-02 01:55:00 -0400 (Mon, 02 Aug 2010)
New Revision: 12708
Modified:
stack/cxf/branches/cxf-2.3/modules/server/pom.xml
stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/HttpServletResponseExt.java
stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java
stack/cxf/branches/cxf-2.3/pom.xml
Log:
Moving to Apache CXF 2.3.0-SNAPSHOT
Modified: stack/cxf/branches/cxf-2.3/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/cxf-2.3/modules/server/pom.xml 2010-08-02 05:53:45 UTC (rev 12707)
+++ stack/cxf/branches/cxf-2.3/modules/server/pom.xml 2010-08-02 05:55:00 UTC (rev 12708)
@@ -27,8 +27,8 @@
<artifactId>ejb-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
</dependency>
<!-- jbossws dependencies -->
<dependency>
Modified: stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/HttpServletResponseExt.java
===================================================================
--- stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/HttpServletResponseExt.java 2010-08-02 05:53:45 UTC (rev 12707)
+++ stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/HttpServletResponseExt.java 2010-08-02 05:55:00 UTC (rev 12708)
@@ -23,6 +23,7 @@
import java.io.IOException;
import java.io.PrintWriter;
+import java.util.Collection;
import java.util.Locale;
import javax.servlet.ServletOutputStream;
@@ -221,5 +222,20 @@
{
delegate.setLocale(loc);
}
+
+ public String getHeader(String arg0)
+ {
+ return delegate.getHeader(arg0);
+ }
+
+ public Collection<String> getHeaderNames()
+ {
+ return delegate.getHeaderNames();
+ }
+
+ public Collection<String> getHeaders(String arg0)
+ {
+ return delegate.getHeaders(arg0);
+ }
}
Modified: stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java
===================================================================
--- stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-08-02 05:53:45 UTC (rev 12707)
+++ stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/NonSpringBusHolder.java 2010-08-02 05:55:00 UTC (rev 12708)
@@ -69,6 +69,7 @@
{
registerTransport(factory, s);
}
+ registerTransport(factory, "http://schemas.xmlsoap.org/soap/http");
}
/**
Modified: stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java
===================================================================
--- stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java 2010-08-02 05:53:45 UTC (rev 12707)
+++ stack/cxf/branches/cxf-2.3/modules/server/src/main/java/org/jboss/wsf/stack/cxf/transport/TomcatHTTPDestination.java 2010-08-02 05:55:00 UTC (rev 12708)
@@ -37,7 +37,7 @@
public TomcatHTTPDestination(Bus b, TomcatHTTPTransportFactory ci, EndpointInfo ei, boolean dp) throws IOException
{
- super(b, ci, ei, dp);
+ super(b, ei, dp);
this.transportFactory = ci;
}
Modified: stack/cxf/branches/cxf-2.3/pom.xml
===================================================================
--- stack/cxf/branches/cxf-2.3/pom.xml 2010-08-02 05:53:45 UTC (rev 12707)
+++ stack/cxf/branches/cxf-2.3/pom.xml 2010-08-02 05:55:00 UTC (rev 12708)
@@ -57,7 +57,7 @@
<jbossws.jboss601.version>3.2.1.GA</jbossws.jboss601.version>
-->
<!-- END -->
- <cxf.version>2.2.9-patch-01</cxf.version>
+ <cxf.version>2.3.0-SNAPSHOT</cxf.version>
<cxf.stax.version>1.0.1</cxf.stax.version>
<cxf.asm.version>2.2.3</cxf.asm.version>
<fastinfoset.api.version>1.2.7</fastinfoset.api.version>
@@ -405,7 +405,15 @@
<artifactId>geronimo-servlet_2.5_spec</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
</exclusion>
<exclusion>
@@ -1044,9 +1052,9 @@
<version>${jsr181.api.version}</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <groupId>org.jboss.spec.javax.servlet</groupId>
+ <artifactId>jboss-servlet-api_3.0_spec</artifactId>
+ <version>1.0.0.Beta2</version>
</dependency>
<!-- jboss provided -->
14 years, 7 months
JBossWS SVN: r12707 - stack/cxf/branches/cxf-2.3/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-08-02 01:53:45 -0400 (Mon, 02 Aug 2010)
New Revision: 12707
Modified:
stack/cxf/branches/cxf-2.3/src/main/scripts/assembly-deploy-artifacts.xml
Log:
Temporarly exclude jetty
Modified: stack/cxf/branches/cxf-2.3/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/branches/cxf-2.3/src/main/scripts/assembly-deploy-artifacts.xml 2010-08-01 16:46:09 UTC (rev 12706)
+++ stack/cxf/branches/cxf-2.3/src/main/scripts/assembly-deploy-artifacts.xml 2010-08-02 05:53:45 UTC (rev 12707)
@@ -43,7 +43,7 @@
<include>commons-beanutils:commons-beanutils:jar</include>
<include>commons-lang:commons-lang:jar</include>
<include>jboss.jaxbintros:jboss-jaxb-intros</include>
- <include>org.mortbay.jetty:jetty*</include>
+<!-- <include>org.mortbay.jetty:jetty*</include> -->
<include>stax:stax-api:jar</include>
<include>javax.jws:jsr181-api:jar</include>
</includes>
14 years, 7 months
JBossWS SVN: r12706 - common/trunk.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2010-08-01 12:46:09 -0400 (Sun, 01 Aug 2010)
New Revision: 12706
Modified:
common/trunk/.classpath
Log:
Do not force JDK 1.5 for jbossws-common in Eclipse
Modified: common/trunk/.classpath
===================================================================
--- common/trunk/.classpath 2010-07-30 17:04:24 UTC (rev 12705)
+++ common/trunk/.classpath 2010-08-01 16:46:09 UTC (rev 12706)
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <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"/>
</classpath>
14 years, 7 months