From df00dcc874ca7c172db63d34ad2d07d0f5762ff2 Mon Sep 17 00:00:00 2001
From: Michael Zhou <yizhi@taobao.com>
Date: Fri, 2 Nov 2012 13:48:59 -0600
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0common-servlet,=20webx-async?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=EF=BC=8C=E6=94=B9=E8=BF=9Bpom=E5=AF=B9?=
 =?UTF-8?q?=E4=BA=8Eservlet-api=E7=9A=84=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/encodings.xml      |  2 ++
 common/logconfig/pom.xml |  4 +++
 common/servlet/pom.xml   | 43 +++++++++++++++++++++++
 common/util/pom.xml      |  4 +++
 dist/test/pom.xml        | 15 ++++++++
 dist/webx/pom.xml        | 34 ++++++++++++++++--
 pom.xml                  | 75 +++++++++++++++-------------------------
 webx/async/pom.xml       | 42 ++++++++++++++++++++++
 8 files changed, 169 insertions(+), 50 deletions(-)
 create mode 100644 common/servlet/pom.xml
 create mode 100644 webx/async/pom.xml

diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 34722b55c..867fa328e 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -6,6 +6,7 @@
     <file url="file://$PROJECT_DIR$/common/generictype" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/common/hessian" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/common/logconfig" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/common/servlet" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/common/springext" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/common/util" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dist/test" charset="UTF-8" />
@@ -29,6 +30,7 @@
     <file url="file://$PROJECT_DIR$/service/velocity" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/test/util" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/test/webx" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/webx/async" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/webx/dev" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/webx/framework" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/webx/turbine" charset="UTF-8" />
diff --git a/common/logconfig/pom.xml b/common/logconfig/pom.xml
index 506461601..656faabfc 100644
--- a/common/logconfig/pom.xml
+++ b/common/logconfig/pom.xml
@@ -46,5 +46,9 @@
             <groupId>rhino</groupId>
             <artifactId>js</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>citrus-common-servlet</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/common/servlet/pom.xml b/common/servlet/pom.xml
new file mode 100644
index 000000000..a4aa77769
--- /dev/null
+++ b/common/servlet/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <parent>
+        <artifactId>citrus-parent</artifactId>
+        <groupId>com.alibaba.citrus</groupId>
+        <version>3.1.2</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>citrus-common-servlet</artifactId>
+    <name>Citrus Servlet API Dependencies</name>
+    <profiles>
+        <profile>
+            <id>servlet2</id>
+            <activation>
+                <property>
+                    <name>servlet2</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>servlet3</id>
+            <activation>
+                <property>
+                    <name>!servlet2</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+</project>
diff --git a/common/util/pom.xml b/common/util/pom.xml
index b5080223b..80a0aa376 100644
--- a/common/util/pom.xml
+++ b/common/util/pom.xml
@@ -24,5 +24,9 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>citrus-test-util</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>citrus-common-servlet</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/dist/test/pom.xml b/dist/test/pom.xml
index 2dee4781b..63599b2c9 100644
--- a/dist/test/pom.xml
+++ b/dist/test/pom.xml
@@ -103,6 +103,12 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>citrus-test-webx</artifactId>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>citrus-common-servlet</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -113,6 +119,10 @@
                     <groupId>ch.qos.logback</groupId>
                     <artifactId>logback-classic</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>citrus-common-servlet</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -164,5 +174,10 @@
             <artifactId>spring-test</artifactId>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/dist/webx/pom.xml b/dist/webx/pom.xml
index ef108f0e7..e61bee556 100644
--- a/dist/webx/pom.xml
+++ b/dist/webx/pom.xml
@@ -43,6 +43,9 @@
                             <dependencySourceIncludes>
                                 <dependencySourceInclude>${project.groupId}:*</dependencySourceInclude>
                             </dependencySourceIncludes>
+                            <dependencySourceExcludes>
+                                <dependencySourceExclude>*:citrus-common-servlet</dependencySourceExclude>
+                            </dependencySourceExcludes>
                             <excludePackageNames>com.alibaba.citrus.hessian:com.alibaba.citrus.burlap:freemarker
                             </excludePackageNames>
                         </configuration>
@@ -64,10 +67,12 @@
                                 <includes>
                                     <include>${project.groupId}:*</include>
                                 </includes>
+                                <excludes>
+                                    <exclude>*:citrus-common-servlet</exclude>
+                                </excludes>
                             </artifactSet>
                             <transformers>
-                                <transformer
-                                        implementation="com.alibaba.citrus.maven.util.AppendingTransformer">
+                                <transformer implementation="com.alibaba.citrus.maven.util.AppendingTransformer">
                                     <patterns>
                                         <pattern>META-INF/*.bean-definition-parsers</pattern>
                                         <pattern>META-INF/*.bean-definition-decorators</pattern>
@@ -94,6 +99,21 @@
         </plugins>
     </build>
     <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>citrus-common-servlet</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>citrus-common-logconfig</artifactId>
@@ -200,6 +220,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>citrus-webx-turbine</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>citrus-webx-async</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>citrus-webx-dev</artifactId>
@@ -207,6 +231,12 @@
         <dependency>
             <groupId>javax.mail</groupId>
             <artifactId>mail</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index c1cd54edd..9b19880ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,58 +62,11 @@
                 <gpg.skip>false</gpg.skip>
             </properties>
         </profile>
-        <profile>
-            <id>servlet2</id>
-            <activation>
-                <property>
-                    <name>servlet2</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </dependency>
-            </dependencies>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>servlet-api</artifactId>
-                        <version>2.5</version>
-                        <scope>provided</scope>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <profile>
-            <id>servlet3</id>
-            <activation>
-                <property>
-                    <name>!servlet2</name>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>javax.servlet-api</artifactId>
-                </dependency>
-            </dependencies>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>javax.servlet-api</artifactId>
-                        <version>3.0.1</version>
-                        <scope>provided</scope>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
     </profiles>
     <modules>
         <module>dist/webx</module>
         <module>dist/test</module>
+        <module>common/servlet</module>
         <module>common/expr</module>
         <module>common/logconfig</module>
         <module>common/util</module>
@@ -141,6 +94,7 @@
         <module>service/mail</module>
         <module>webx/framework</module>
         <module>webx/turbine</module>
+        <module>webx/async</module>
         <module>webx/dev</module>
     </modules>
     <dependencies>
@@ -169,6 +123,11 @@
                 <version>${webx-version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>citrus-common-servlet</artifactId>
+                <version>${webx-version}</version>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>citrus-common-logconfig</artifactId>
@@ -306,6 +265,11 @@
                 <artifactId>citrus-webx-turbine</artifactId>
                 <version>${webx-version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>citrus-webx-async</artifactId>
+                <version>${webx-version}</version>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>citrus-webx-dev</artifactId>
@@ -597,6 +561,21 @@
                 <version>${spring-version}</version>
                 <scope>test</scope>
             </dependency>
+            <!-- ======================================== -->
+            <!-- Servlet API依赖 -->
+            <!-- ======================================== -->
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>servlet-api</artifactId>
+                <version>2.5</version>
+                <scope>compile</scope>
+            </dependency>
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>3.0.1</version>
+                <scope>compile</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <build>
diff --git a/webx/async/pom.xml b/webx/async/pom.xml
new file mode 100644
index 000000000..304d3bf5d
--- /dev/null
+++ b/webx/async/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <parent>
+        <artifactId>citrus-parent</artifactId>
+        <groupId>com.alibaba.citrus</groupId>
+        <version>3.1.2</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>citrus-webx-async</artifactId>
+    <name>Servlet 3.0 Async Support</name>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>citrus-webx-turbine</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>citrus-common-servlet</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>citrus-test-webx</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>citrus-common-servlet</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- 强制依赖servlet 3.0 -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>