Author: ffang
Date: Thu Dec 16 04:51:41 2010
New Revision: 1049783
URL: http://svn.apache.org/viewvc?rev=1049783&view=rev
Log:
[CXF-3192]extract GZIP Interceptors/Feature from http transport to
transport-common module
Added:
cxf/trunk/rt/transports/common/
cxf/trunk/rt/transports/common/pom.xml
cxf/trunk/rt/transports/common/src/
cxf/trunk/rt/transports/common/src/main/
cxf/trunk/rt/transports/common/src/main/java/
cxf/trunk/rt/transports/common/src/main/java/org/
cxf/trunk/rt/transports/common/src/main/java/org/apache/
cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/
cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/
cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/
cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/
cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java
- copied, changed from r1049770,
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/gzip/GZIPFeature.java
cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPInInterceptor.java
- copied, changed from r1049770,
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/gzip/GZIPInInterceptor.java
cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java
- copied, changed from r1049770,
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/gzip/GZIPOutInterceptor.java
cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/Messages.properties
- copied unchanged from r1049770,
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/gzip/Messages.properties
cxf/trunk/rt/transports/common/src/test/
cxf/trunk/rt/transports/common/src/test/java/
cxf/trunk/rt/transports/common/src/test/java/org/
cxf/trunk/rt/transports/common/src/test/java/org/apache/
cxf/trunk/rt/transports/common/src/test/java/org/apache/cxf/
cxf/trunk/rt/transports/common/src/test/java/org/apache/cxf/transport/
cxf/trunk/rt/transports/common/src/test/java/org/apache/cxf/transport/common/
cxf/trunk/rt/transports/common/src/test/java/org/apache/cxf/transport/common/gzip/
cxf/trunk/rt/transports/common/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
- copied, changed from r1049770,
cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/gzip/GZIPAcceptEncodingTest.java
Removed:
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/gzip/GZIPFeature.java
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/gzip/GZIPInInterceptor.java
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/gzip/GZIPOutInterceptor.java
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/gzip/Messages.properties
cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/gzip/GZIPAcceptEncodingTest.java
Modified:
cxf/trunk/rt/pom.xml
cxf/trunk/rt/transports/http/pom.xml
cxf/trunk/rt/transports/jms/pom.xml
Modified: cxf/trunk/rt/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/pom.xml?rev=1049783&r1=1049782&r2=1049783&view=diff
==============================================================================
--- cxf/trunk/rt/pom.xml (original)
+++ cxf/trunk/rt/pom.xml Thu Dec 16 04:51:41 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>
Added: cxf/trunk/rt/transports/common/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/common/pom.xml?rev=1049783&view=auto
==============================================================================
--- cxf/trunk/rt/transports/common/pom.xml (added)
+++ cxf/trunk/rt/transports/common/pom.xml Thu Dec 16 04:51:41 2010
@@ -0,0 +1,64 @@
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-common</artifactId>
+ <packaging>jar</packaging>
+ <version>2.4.0-SNAPSHOT</version>
+ <name>Apache CXF Runtime Transport Common Used Classes</name>
+ <url>http://cxf.apache.org</url>
+
+ <parent>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-parent</artifactId>
+ <version>2.4.0-SNAPSHOT</version>
+ <relativePath>../../../parent/pom.xml</relativePath>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-testutils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Copied:
cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java
(from r1049770,
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/gzip/GZIPFeature.java)
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java?p2=cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java&p1=cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/gzip/GZIPFeature.java&r1=1049770&r2=1049783&rev=1049783&view=diff
==============================================================================
---
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/gzip/GZIPFeature.java
(original)
+++
cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPFeature.java
Thu Dec 16 04:51:41 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.transport.http.gzip;
+package org.apache.cxf.transport.common.gzip;
import java.util.List;
Copied:
cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPInInterceptor.java
(from r1049770,
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/gzip/GZIPInInterceptor.java)
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPInInterceptor.java?p2=cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPInInterceptor.java&p1=cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/gzip/GZIPInInterceptor.java&r1=1049770&r2=1049783&rev=1049783&view=diff
==============================================================================
---
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/gzip/GZIPInInterceptor.java
(original)
+++
cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPInInterceptor.java
Thu Dec 16 04:51:41 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.transport.http.gzip;
+package org.apache.cxf.transport.common.gzip;
import java.io.IOException;
import java.io.InputStream;
Copied:
cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java
(from r1049770,
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/gzip/GZIPOutInterceptor.java)
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java?p2=cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java&p1=cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/gzip/GZIPOutInterceptor.java&r1=1049770&r2=1049783&rev=1049783&view=diff
==============================================================================
---
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/gzip/GZIPOutInterceptor.java
(original)
+++
cxf/trunk/rt/transports/common/src/main/java/org/apache/cxf/transport/common/gzip/GZIPOutInterceptor.java
Thu Dec 16 04:51:41 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.transport.http.gzip;
+package org.apache.cxf.transport.common.gzip;
import java.io.IOException;
import java.io.OutputStream;
Copied:
cxf/trunk/rt/transports/common/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
(from r1049770,
cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/gzip/GZIPAcceptEncodingTest.java)
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/common/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java?p2=cxf/trunk/rt/transports/common/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java&p1=cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/gzip/GZIPAcceptEncodingTest.java&r1=1049770&r2=1049783&rev=1049783&view=diff
==============================================================================
---
cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/gzip/GZIPAcceptEncodingTest.java
(original)
+++
cxf/trunk/rt/transports/common/src/test/java/org/apache/cxf/transport/common/gzip/GZIPAcceptEncodingTest.java
Thu Dec 16 04:51:41 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.transport.http.gzip;
+package org.apache.cxf.transport.common.gzip;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -39,7 +39,7 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.cxf.transport.http.gzip.GZIPOutInterceptor.UseGzip.*;
+import static
org.apache.cxf.transport.common.gzip.GZIPOutInterceptor.UseGzip.*;
/**
* Test for the parsing of Accept-Encoding by the GZIPOutInterceptor. For
Modified: cxf/trunk/rt/transports/http/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/pom.xml?rev=1049783&r1=1049782&r2=1049783&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/pom.xml (original)
+++ cxf/trunk/rt/transports/http/pom.xml Thu Dec 16 04:51:41 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/trunk/rt/transports/jms/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/pom.xml?rev=1049783&r1=1049782&r2=1049783&view=diff
==============================================================================
--- cxf/trunk/rt/transports/jms/pom.xml (original)
+++ cxf/trunk/rt/transports/jms/pom.xml Thu Dec 16 04:51:41 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>
