Skip to content

Commit

Permalink
添加common-servlet, webx-async项目，改进pom对于servlet-api的依赖
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Zhou committed Nov 2, 2012
1 parent f19d8a4 commit df00dcc
Show file tree
Hide file tree
Showing 8 changed files with 169 additions and 50 deletions.
2 changes: 2 additions & 0 deletions .idea/encodings.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions common/logconfig/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,9 @@
<groupId>rhino</groupId>
<artifactId>js</artifactId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>citrus-common-servlet</artifactId>
</dependency>
</dependencies>
</project>
43 changes: 43 additions & 0 deletions common/servlet/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 4 additions & 0 deletions common/util/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
15 changes: 15 additions & 0 deletions dist/test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
34 changes: 32 additions & 2 deletions dist/webx/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -200,13 +220,23 @@
<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>
</dependency>
<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>
75 changes: 27 additions & 48 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
42 changes: 42 additions & 0 deletions webx/async/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit df00dcc

Please sign in to comment.