Author: ffang
Date: Thu Dec 16 06:07:58 2010
New Revision: 1049790
URL: http://svn.apache.org/viewvc?rev=1049790&view=rev
Log:
Merged revisions 1049783 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1049783 | ffang | 2010-12-16 12:51:41 +0800 (四, 16 12 2010) | 1 line
[CXF-3192]extract GZIP Interceptors/Feature from http transport to
transport-common module
........
Added:
cxf/branches/2.3.x-fixes/rt/transports/common/
- copied from r1049783, cxf/trunk/rt/transports/common/
cxf/branches/2.3.x-fixes/rt/transports/common/pom.xml
- copied, changed from r1049783, cxf/trunk/rt/transports/common/pom.xml
cxf/branches/2.3.x-fixes/rt/transports/common/src/
- copied from r1049783, cxf/trunk/rt/transports/common/src/
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/
- copied from r1049783, cxf/trunk/rt/transports/common/src/main/
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/
- copied from r1049783, cxf/trunk/rt/transports/common/src/main/java/
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/
- copied from r1049783, cxf/trunk/rt/transports/common/src/main/java/org/
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/
- copied from r1049783,
cxf/trunk/rt/transports/common/src/main/java/org/apache/
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/
- copied from r1049783,
cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/
- copied from r1049783,
cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/
- copied from r1049783,
cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/
- copied from r1049783,
cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java
- copied unchanged from r1049783,
cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPInInterceptor.java
- copied unchanged from r1049783,
cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPInInterceptor.java
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java
- copied unchanged from r1049783,
cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java
cxf/branches/2.3.x-fixes/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/Messages.properties
- copied unchanged from r1049783,
cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/Messages.properties
cxf/branches/2.3.x-fixes/rt/transports/common/src/test/
- copied from r1049783, cxf/trunk/rt/transports/common/src/test/
cxf/branches/2.3.x-fixes/rt/transports/common/src/test/java/
- copied from r1049783, cxf/trunk/rt/transports/common/src/test/java/
cxf/branches/2.3.x-fixes/rt/transports/common/src/test/java/org/
- copied from r1049783, cxf/trunk/rt/transports/common/src/test/java/org/
cxf/branches/2.3.x-fixes/rt/transports/common/src/test/java/org/apache/
- copied from r1049783,
cxf/trunk/rt/transports/common/src/test/java/org/apache/
cxf/branches/2.3.x-fixes/rt/transports/common/src/test/java/org/apache/cxf/
- copied from r1049783,
cxf/trunk/rt/transports/common/src/test/java/org/apache/cxf/
cxf/branches/2.3.x-fixes/rt/transports/common/src/test/java/org/apache/cxf/transport/
- copied from r1049783,
cxf/trunk/rt/transports/common/src/test/java/org/apache/cxf/transport/
cxf/branches/2.3.x-fixes/rt/transports/common/src/test/java/org/apache/cxf/transport/common/
- copied from r1049783,
cxf/trunk/rt/transports/common/src/test/java/org/apache/cxf/transport/common/
cxf/branches/2.3.x-fixes/rt/transports/common/src/test/java/org/apache/cxf/transport/common/gzip/
- copied from r1049783,
cxf/trunk/rt/transports/common/src/test/java/org/apache/cxf/transport/common/gzip/
cxf/branches/2.3.x-fixes/rt/transports/common/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
- copied unchanged from r1049783,
cxf/trunk/rt/transports/common/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java
cxf/branches/2.3.x-fixes/rt/pom.xml
cxf/branches/2.3.x-fixes/rt/transports/http/pom.xml
cxf/branches/2.3.x-fixes/rt/transports/jms/pom.xml
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java?rev=1049790&r1=1049789&r2=1049790&view=diff
==============================================================================
---
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java
(original)
+++
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/service/factory/AnnotationsFactoryBeanListener.java
Thu Dec 16 06:07:58 2010
@@ -242,7 +242,7 @@ public class AnnotationsFactoryBeanListe
if (annotation != null) {
try {
Class<?> cls = ClassLoaderUtils
-
.loadClass("org.apache.cxf.transport.http.gzip.GZIPFeature",
+
.loadClass("org.apache.cxf.transport.common.gzip.GZIPFeature",
this.getClass());
AbstractFeature feature = (AbstractFeature)cls.newInstance();
Modified: cxf/branches/2.3.x-fixes/rt/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/pom.xml?rev=1049790&r1=1049789&r2=1049790&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/pom.xml Thu Dec 16 06:07:58 2010
@@ -44,6 +44,7 @@
<module>frontend/jaxws</module>
<module>frontend/jaxrs</module>
<module>frontend/js</module>
+ <module>transports/common</module>
<module>transports/http</module>
<module>transports/http-jetty</module>
<module>transports/http-osgi</module>
Copied: cxf/branches/2.3.x-fixes/rt/transports/common/pom.xml (from r1049783,
cxf/trunk/rt/transports/common/pom.xml)
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/common/pom.xml?p2=cxf/branches/2.3.x-fixes/rt/transports/common/pom.xml&p1=cxf/trunk/rt/transports/common/pom.xml&r1=1049783&r2=1049790&rev=1049790&view=diff
==============================================================================
--- cxf/trunk/rt/transports/common/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/transports/common/pom.xml Thu Dec 16 06:07:58
2010
@@ -21,7 +21,7 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-common</artifactId>
<packaging>jar</packaging>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.3.2-SNAPSHOT</version>
<name>Apache CXF Runtime Transport Common Used Classes</name>
<url>http://cxf.apache.org</url>
Modified: cxf/branches/2.3.x-fixes/rt/transports/http/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http/pom.xml?rev=1049790&r1=1049789&r2=1049790&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/http/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/transports/http/pom.xml Thu Dec 16 06:07:58 2010
@@ -50,6 +50,11 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-core</artifactId>
<version>${project.version}</version>
</dependency>
Modified: cxf/branches/2.3.x-fixes/rt/transports/jms/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/jms/pom.xml?rev=1049790&r1=1049789&r2=1049790&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/jms/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/transports/jms/pom.xml Thu Dec 16 06:07:58 2010
@@ -55,6 +55,11 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
<version>${project.version}</version>
</dependency>
