DUBBO-366 修改工程结构，折叠子模块

git-svn-id: http://code.alibabatech.com/svn/dubbo/trunk@1662 1a56cb94-b969-4eaa-88fa-be21384802f2
McTony · May 7, 2012 · 6e3a356 · 6e3a356
1 parent b8c0a6e
commit 6e3a356
Show file tree

Hide file tree

Showing 49 changed files with 423 additions and 148 deletions.
diff --git a/dubbo-cluster/pom.xml b/dubbo-cluster/pom.xml
@@ -20,7 +20,6 @@
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
 		<version>2.2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>dubbo-cluster-api</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-common/pom.xml b/dubbo-common/pom.xml
@@ -20,7 +20,6 @@
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
 		<version>2.2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>dubbo-common</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-config/dubbo-config-api/pom.xml b/dubbo-config/dubbo-config-api/pom.xml
@@ -18,14 +18,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.alibaba</groupId>
-		<artifactId>dubbo-parent</artifactId>
+		<artifactId>dubbo-config</artifactId>
 		<version>2.2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>dubbo-config-api</artifactId>
 	<packaging>jar</packaging>
 	<name>${project.artifactId}</name>
-	<description>The config module of dubbo project</description>
+	<description>The config api module of dubbo project</description>
 	<properties>
 		<skip_maven_deploy>true</skip_maven_deploy>
 	</properties>

diff --git a/dubbo-config/dubbo-config-spring/pom.xml b/dubbo-config/dubbo-config-spring/pom.xml
@@ -18,9 +18,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.alibaba</groupId>
-		<artifactId>dubbo-parent</artifactId>
+		<artifactId>dubbo-config</artifactId>
 		<version>2.2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>dubbo-config-spring</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-config/pom.xml b/dubbo-config/pom.xml
@@ -0,0 +1,33 @@
+<!-- 
+ - Copyright 1999-2011 Alibaba Group.
+ -  
+ - Licensed 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>
+	<parent>
+		<groupId>com.alibaba</groupId>
+		<artifactId>dubbo-parent</artifactId>
+		<version>2.2.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>dubbo-config</artifactId>
+	<version>2.2.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<name>${project.artifactId}</name>
+	<description>The config module of dubbo project</description>
+	<modules>
+		<module>dubbo-config-api</module>
+		<module>dubbo-config-spring</module>
+	</modules>
+</project>
diff --git a/dubbo-container/dubbo-container-api/pom.xml b/dubbo-container/dubbo-container-api/pom.xml
@@ -18,9 +18,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.alibaba</groupId>
-		<artifactId>dubbo-parent</artifactId>
+		<artifactId>dubbo-container</artifactId>
 		<version>2.2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>dubbo-container-api</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-container/dubbo-container-jetty/pom.xml b/dubbo-container/dubbo-container-jetty/pom.xml
@@ -18,9 +18,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.alibaba</groupId>
-		<artifactId>dubbo-parent</artifactId>
+		<artifactId>dubbo-container</artifactId>
 		<version>2.2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>dubbo-container-jetty</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-container/dubbo-container-log4j/pom.xml b/dubbo-container/dubbo-container-log4j/pom.xml
@@ -18,9 +18,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.alibaba</groupId>
-		<artifactId>dubbo-parent</artifactId>
+		<artifactId>dubbo-container</artifactId>
 		<version>2.2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>dubbo-container-log4j</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-container/dubbo-container-spring/pom.xml b/dubbo-container/dubbo-container-spring/pom.xml
@@ -18,9 +18,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.alibaba</groupId>
-		<artifactId>dubbo-parent</artifactId>
+		<artifactId>dubbo-container</artifactId>
 		<version>2.2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>dubbo-container-spring</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-container/pom.xml b/dubbo-container/pom.xml
@@ -0,0 +1,35 @@
+<!-- 
+ - Copyright 1999-2011 Alibaba Group.
+ -  
+ - Licensed 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>
+	<parent>
+		<groupId>com.alibaba</groupId>
+		<artifactId>dubbo-parent</artifactId>
+		<version>2.2.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>dubbo-container</artifactId>
+	<version>2.2.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<name>${project.artifactId}</name>
+	<description>The container module of dubbo project</description>
+	<modules>
+		<module>dubbo-container-api</module>
+		<module>dubbo-container-spring</module>
+		<module>dubbo-container-jetty</module>
+		<module>dubbo-container-log4j</module>
+	</modules>
+</project>
diff --git a/dubbo-demo/dubbo-demo-api/pom.xml b/dubbo-demo/dubbo-demo-api/pom.xml
@@ -18,11 +18,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.alibaba</groupId>
-		<artifactId>dubbo-parent</artifactId>
+		<artifactId>dubbo-demo</artifactId>
 		<version>2.2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
 	</parent>
-	<artifactId>dubbo-demo</artifactId>
+	<artifactId>dubbo-demo-api</artifactId>
 	<packaging>jar</packaging>
 	<name>${project.artifactId}</name>
 	<description>The demo module of dubbo project</description>

diff --git a/dubbo-demo/dubbo-demo-consumer/pom.xml b/dubbo-demo/dubbo-demo-consumer/pom.xml
@@ -18,9 +18,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.alibaba</groupId>
-		<artifactId>dubbo-parent</artifactId>
+		<artifactId>dubbo-demo</artifactId>
 		<version>2.2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>dubbo-demo-consumer</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-demo/dubbo-demo-provider/dep.log b/dubbo-demo/dubbo-demo-provider/dep.log
@@ -0,0 +1,61 @@
+[INFO] Scanning for projects...
+[INFO] snapshot com.alibaba:dubbo-parent:2.2.0-SNAPSHOT: checking for updates from b2b-internal-snapshots
+[INFO] snapshot com.alibaba:dubbo-parent:2.2.0-SNAPSHOT: checking for updates from b2b-shared-repository
+[INFO] ------------------------------------------------------------------------
+[INFO] Building dubbo-demo-provider
+[INFO]    task-segment: [dependency:tree]
+[INFO] ------------------------------------------------------------------------
+[INFO] snapshot com.alibaba:dubbo-demo:2.2.0-SNAPSHOT: checking for updates from b2b-internal-snapshots
+[INFO] snapshot com.alibaba:dubbo-demo:2.2.0-SNAPSHOT: checking for updates from b2b-shared-repository
+[INFO] snapshot com.alibaba:dubbo-demo:2.2.0-SNAPSHOT: checking for updates from opensesame.snapshots
+[INFO] snapshot com.alibaba:dubbo:2.2.0-SNAPSHOT: checking for updates from b2b-internal-snapshots
+[INFO] snapshot com.alibaba:dubbo:2.2.0-SNAPSHOT: checking for updates from b2b-shared-repository
+[INFO] snapshot com.alibaba:dubbo:2.2.0-SNAPSHOT: checking for updates from opensesame.snapshots
+[WARNING] *** CHECKSUM FAILED - Checksum failed on download: local = '42e7df2282f92e69fae6722b3a179c8395ef107b'; remote = 'c37760db920c78e5f91fbcf7505e74b5eeebbf14' - RETRYING
+[WARNING] *** CHECKSUM FAILED - Checksum failed on download: local = '42e7df2282f92e69fae6722b3a179c8395ef107b'; remote = 'c37760db920c78e5f91fbcf7505e74b5eeebbf14' - IGNORING
+[INFO] [dependency:tree {execution: default-cli}]
+[INFO] com.alibaba:dubbo-demo-provider:jar:2.2.0-SNAPSHOT
+[INFO] +- com.alibaba:dubbo-demo:jar:2.2.0-SNAPSHOT:compile
+[INFO] +- com.alibaba:dubbo:jar:2.2.0-SNAPSHOT:compile
+[INFO] |  +- log4j:log4j:jar:1.2.16:compile
+[INFO] |  +- org.javassist:javassist:jar:3.15.0-GA:compile
+[INFO] |  +- org.springframework:spring:jar:2.5.6.SEC03:compile
+[INFO] |  +- commons-logging:commons-logging:jar:1.1.1:compile
+[INFO] |  \- org.jboss.netty:netty:jar:3.2.5.Final:compile
+[INFO] +- org.mortbay.jetty:jetty:jar:6.1.26:compile
+[INFO] |  +- org.mortbay.jetty:jetty-util:jar:6.1.26:compile
+[INFO] |  \- org.mortbay.jetty:servlet-api:jar:2.5-20081211:compile
+[INFO] +- org.apache.zookeeper:zookeeper:jar:3.3.3:compile
+[INFO] |  \- jline:jline:jar:0.9.94:compile
+[INFO] +- redis.clients:jedis:jar:2.0.0:compile
+[INFO] |  \- commons-pool:commons-pool:jar:1.5.5:compile
+[INFO] +- org.apache.mina:mina-core:jar:1.1.7:compile
+[INFO] |  \- org.slf4j:slf4j-api:jar:1.6.2:compile (version managed from 1.4.3)
+[INFO] +- org.glassfish.grizzly:grizzly-core:jar:2.1.4:compile
+[INFO] |  +- org.glassfish.grizzly:grizzly-framework:jar:2.1.4:compile
+[INFO] |  |  \- org.glassfish.gmbal:gmbal-api-only:jar:3.0.0-b023:compile
+[INFO] |  |     \- org.glassfish.external:management-api:jar:3.0.0-b012:compile
+[INFO] |  +- org.glassfish.grizzly:grizzly-portunif:jar:2.1.4:compile
+[INFO] |  \- org.glassfish.grizzly:grizzly-rcm:jar:2.1.4:compile
+[INFO] +- org.apache.httpcomponents:httpclient:jar:4.1.2:compile
+[INFO] |  +- org.apache.httpcomponents:httpcore:jar:4.1.2:compile
+[INFO] |  \- commons-codec:commons-codec:jar:1.4:compile
+[INFO] +- com.caucho:hessian:jar:4.0.7:compile
+[INFO] +- com.alibaba:fastjson:jar:1.1.8:compile
+[INFO] +- javax.validation:validation-api:jar:1.0.0.GA:compile
+[INFO] +- org.hibernate:hibernate-validator:jar:4.2.0.Final:compile
+[INFO] +- javax.cache:cache-api:jar:0.4:compile
+[INFO] +- junit:junit:jar:4.10:test
+[INFO] |  \- org.hamcrest:hamcrest-core:jar:1.1:test
+[INFO] +- org.easymock:easymock:jar:3.0:test
+[INFO] |  +- cglib:cglib-nodep:jar:2.2:test
+[INFO] |  \- org.objenesis:objenesis:jar:1.2:test
+[INFO] +- org.easymock:easymockclassextension:jar:3.0:test
+[INFO] \- com.googlecode.jmockit:jmockit:jar:0.999.8:test
+[INFO] ------------------------------------------------------------------------
+[INFO] BUILD SUCCESSFUL
+[INFO] ------------------------------------------------------------------------
+[INFO] Total time: 23 seconds
+[INFO] Finished at: Thu Mar 29 13:45:40 CST 2012
+[INFO] Final Memory: 17M/41M
+[INFO] ------------------------------------------------------------------------
diff --git a/dubbo-demo/dubbo-demo-provider/pom.xml b/dubbo-demo/dubbo-demo-provider/pom.xml
@@ -18,9 +18,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.alibaba</groupId>
-		<artifactId>dubbo-parent</artifactId>
+		<artifactId>dubbo-demo</artifactId>
 		<version>2.2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>dubbo-demo-provider</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-demo/pom.xml b/dubbo-demo/pom.xml
@@ -0,0 +1,34 @@
+<!-- 
+ - Copyright 1999-2011 Alibaba Group.
+ -  
+ - Licensed 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>
+	<parent>
+		<groupId>com.alibaba</groupId>
+		<artifactId>dubbo-parent</artifactId>
+		<version>2.2.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>dubbo-demo</artifactId>
+	<version>2.2.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<name>${project.artifactId}</name>
+	<description>The demo module of dubbo project</description>
+	<modules>
+		<module>dubbo-demo-api</module>
+		<module>dubbo-demo-provider</module>
+		<module>dubbo-demo-consumer</module>
+	</modules>
+</project>
diff --git a/dubbo-filter/dubbo-filter-cache/pom.xml b/dubbo-filter/dubbo-filter-cache/pom.xml
@@ -18,9 +18,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.alibaba</groupId>
-		<artifactId>dubbo-parent</artifactId>
+		<artifactId>dubbo-filter</artifactId>
 		<version>2.2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>dubbo-filter-cache</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-filter/dubbo-filter-validation/pom.xml b/dubbo-filter/dubbo-filter-validation/pom.xml
@@ -18,9 +18,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.alibaba</groupId>
-		<artifactId>dubbo-parent</artifactId>
+		<artifactId>dubbo-filter</artifactId>
 		<version>2.2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>dubbo-filter-validation</artifactId>
 	<packaging>jar</packaging>

diff --git a/...filter-validation/src/main/java/com/alibaba/dubbo/validation/filter/ValidationFilter.java b/...filter-validation/src/main/java/com/alibaba/dubbo/validation/filter/ValidationFilter.java
@@ -31,7 +31,7 @@
  * 
  * @author william.liangf
  */
-@Activate(group = { Constants.CONSUMER, Constants.PROVIDER }, value = Constants.VALIDATION_KEY)
+@Activate(group = { Constants.CONSUMER, Constants.PROVIDER }, value = Constants.VALIDATION_KEY, order = 1000)
 public class ValidationFilter implements Filter {
 
     private Validation validation;
@@ -41,7 +41,8 @@ public void setValidation(Validation validation) {
     }
 
     public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException {
-        if (validation != null && ConfigUtils.isNotEmpty(invoker.getUrl().getMethodParameter(invocation.getMethodName(), Constants.VALIDATION_KEY))) {
+        if (validation != null && ! invocation.getMethodName().startsWith("$") 
+                && ConfigUtils.isNotEmpty(invoker.getUrl().getMethodParameter(invocation.getMethodName(), Constants.VALIDATION_KEY))) {
             Validator validator = validation.getValidator(invoker.getUrl());
             if (validator != null) {
                 try {

diff --git a/dubbo-filter/pom.xml b/dubbo-filter/pom.xml
@@ -0,0 +1,33 @@
+<!-- 
+ - Copyright 1999-2011 Alibaba Group.
+ -  
+ - Licensed 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>
+	<parent>
+		<groupId>com.alibaba</groupId>
+		<artifactId>dubbo-parent</artifactId>
+		<version>2.2.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>dubbo-filter</artifactId>
+	<version>2.2.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<name>${project.artifactId}</name>
+	<description>The filter module of dubbo project</description>
+	<modules>
+		<module>dubbo-filter-cache</module>
+		<module>dubbo-filter-validation</module>
+	</modules>
+</project>
diff --git a/dubbo-monitor/dubbo-monitor-api/pom.xml b/dubbo-monitor/dubbo-monitor-api/pom.xml
@@ -18,9 +18,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.alibaba</groupId>
-		<artifactId>dubbo-parent</artifactId>
+		<artifactId>dubbo-monitor</artifactId>
 		<version>2.2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>dubbo-monitor-api</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-monitor/dubbo-monitor-default/pom.xml b/dubbo-monitor/dubbo-monitor-default/pom.xml
@@ -18,9 +18,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.alibaba</groupId>
-		<artifactId>dubbo-parent</artifactId>
+		<artifactId>dubbo-monitor</artifactId>
 		<version>2.2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>dubbo-monitor-default</artifactId>
 	<packaging>jar</packaging>