版本修改成2.8.4.3

kuangcao · Apr 9, 2016 · b90c684 · b90c684
1 parent 0d2eca9
commit b90c684
Show file tree

Hide file tree

Showing 66 changed files with 105 additions and 100 deletions.
diff --git a/dubbo-admin/pom.xml b/dubbo-admin/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-admin</artifactId>
 	<packaging>war</packaging>

diff --git a/dubbo-cluster/pom.xml b/dubbo-cluster/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-cluster</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-common/pom.xml b/dubbo-common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.alibaba</groupId>
         <artifactId>dubbo-parent</artifactId>
-        <version>2.8.4.2</version>
+        <version>2.8.4.3</version>
     </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
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-config</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-config-api</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-config/dubbo-config-guice/pom.xml b/dubbo-config/dubbo-config-guice/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dubbo-config</artifactId>
         <groupId>com.alibaba</groupId>
-        <version>2.8.4.2</version>
+        <version>2.8.4.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...o-config/dubbo-config-guice/src/main/java/com/alibaba/dubbo/config/guice/DubboModule.java b/...o-config/dubbo-config-guice/src/main/java/com/alibaba/dubbo/config/guice/DubboModule.java
@@ -256,45 +256,50 @@ private static Set<String> getClassNamesFromPackage(String packName) throws IOEx
         URL packageURL;
         Set<String> names = new HashSet<String>();
         String packageName = packName.replace(".", "/");
-        packageURL = classLoader.getResource(packageName);
-
-        if (packageURL.getProtocol().equals("jar")) {
-            String jarFileName;
-            JarFile jf;
-            Enumeration<JarEntry> jarEntries;
-            String entryName;
-
-            // build jar file name, then loop through zipped entries
-            jarFileName = URLDecoder.decode(packageURL.getFile(), "UTF-8");
-            jarFileName = jarFileName.substring(5, jarFileName.indexOf("!"));
-            System.out.println(">" + jarFileName);
-            jf = new JarFile(jarFileName);
-            jarEntries = jf.entries();
-            while (jarEntries.hasMoreElements()) {
-                entryName = jarEntries.nextElement().getName();
-                if (entryName.startsWith(packageName) && entryName.length() > packageName.length() + 5) {
-
-                    if (entryName.lastIndexOf('.') != -1) {
-                        entryName = entryName.substring(0, entryName.lastIndexOf('.'));
+
+        Enumeration<URL> packageUrls = classLoader.getResources(packageName);
+        while (packageUrls.hasMoreElements()) {
+            packageURL = packageUrls.nextElement();
+            if (packageURL.getProtocol().equals("jar")) {
+                String jarFileName;
+                JarFile jf;
+                Enumeration<JarEntry> jarEntries;
+                String entryName;
+
+                // build jar file name, then loop through zipped entries
+                jarFileName = URLDecoder.decode(packageURL.getFile(), "UTF-8");
+                jarFileName = jarFileName.substring(5, jarFileName.indexOf("!"));
+                System.out.println(">" + jarFileName);
+                jf = new JarFile(jarFileName);
+                jarEntries = jf.entries();
+                while (jarEntries.hasMoreElements()) {
+                    entryName = jarEntries.nextElement().getName();
+                    if (entryName.startsWith(packageName) && entryName.length() > packageName.length() + 5) {
+                        if (entryName.lastIndexOf(".class") != -1) {
+                            entryName = entryName.substring(0, entryName.lastIndexOf('.'));
+                            names.add(entryName);
+                        }
                     }
-                    names.add(entryName);
                 }
-            }
 
-            // loop through files in classpath
-        } else {
-            URI uri = new URI(packageURL.toString());
-            File folder = new File(uri.getPath());
-            // won't work with path which contains blank (%20)
-            // File folder = new File(packageURL.getFile());
-            File[] contenuti = folder.listFiles();
-            String entryName;
-            for (File actual : contenuti) {
-                entryName = actual.getName();
-                if (entryName.lastIndexOf(".class") != -1) {
-                    entryName = packName + "." + entryName.substring(0, entryName.lastIndexOf(".class"));
+                // loop through files in classpath
+            } else {
+                URI uri = new URI(packageURL.toString());
+                File folder = new File(uri.getPath());
+                // won't work with path which contains blank (%20)
+                // File folder = new File(packageURL.getFile());
+                File[] contenuti = folder.listFiles();
+                String entryName;
+                for (File actual : contenuti) {
+                    if (actual.isDirectory()) {
+                        continue;
+                    }
+                    entryName = actual.getName();
+                    if (entryName.lastIndexOf(".class") != -1) {
+                        entryName = packName + "." + entryName.substring(0, entryName.lastIndexOf(".class"));
+                        names.add(entryName);
+                    }
                 }
-                names.add(entryName);
             }
         }
         return names;

diff --git a/dubbo-config/dubbo-config-spring/pom.xml b/dubbo-config/dubbo-config-spring/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-config</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-config-spring</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-config/pom.xml b/dubbo-config/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-config</artifactId>
 	<packaging>pom</packaging>

diff --git a/dubbo-container/dubbo-container-api/pom.xml b/dubbo-container/dubbo-container-api/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-container</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-container-api</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-container/dubbo-container-javaconfig/pom.xml b/dubbo-container/dubbo-container-javaconfig/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>com.alibaba</groupId>
     <artifactId>dubbo-container</artifactId>
-    <version>2.8.4.2</version>
+    <version>2.8.4.3</version>
   </parent>
   <artifactId>dubbo-container-javaconfig</artifactId>
   <packaging>jar</packaging>

diff --git a/dubbo-container/dubbo-container-jetty/pom.xml b/dubbo-container/dubbo-container-jetty/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-container</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</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
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-container</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-container-log4j</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-container/dubbo-container-logback/pom.xml b/dubbo-container/dubbo-container-logback/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-container</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-container-logback</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-container/dubbo-container-spring/pom.xml b/dubbo-container/dubbo-container-spring/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-container</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-container-spring</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-container/pom.xml b/dubbo-container/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-container</artifactId>
 	<packaging>pom</packaging>

diff --git a/dubbo-demo/dubbo-demo-api/pom.xml b/dubbo-demo/dubbo-demo-api/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.alibaba</groupId>
         <artifactId>dubbo-demo</artifactId>
-        <version>2.8.4.2</version>
+        <version>2.8.4.3</version>
     </parent>
     <artifactId>dubbo-demo-api</artifactId>
     <packaging>jar</packaging>

diff --git a/dubbo-demo/dubbo-demo-consumer/pom.xml b/dubbo-demo/dubbo-demo-consumer/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.alibaba</groupId>
         <artifactId>dubbo-demo</artifactId>
-        <version>2.8.4.2</version>
+        <version>2.8.4.3</version>
     </parent>
     <artifactId>dubbo-demo-consumer</artifactId>
     <packaging>jar</packaging>

diff --git a/dubbo-demo/dubbo-demo-provider/pom.xml b/dubbo-demo/dubbo-demo-provider/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.alibaba</groupId>
         <artifactId>dubbo-demo</artifactId>
-        <version>2.8.4.2</version>
+        <version>2.8.4.3</version>
     </parent>
     <artifactId>dubbo-demo-provider</artifactId>
     <packaging>war</packaging>

diff --git a/dubbo-demo/pom.xml b/dubbo-demo/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-demo</artifactId>
 	<packaging>pom</packaging>

diff --git a/dubbo-filter/dubbo-filter-cache/pom.xml b/dubbo-filter/dubbo-filter-cache/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-filter</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</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
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-filter</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-filter-validation</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-filter/pom.xml b/dubbo-filter/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-filter</artifactId>
 	<packaging>pom</packaging>

diff --git a/dubbo-guice/pom.xml b/dubbo-guice/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dubbo-parent</artifactId>
         <groupId>com.alibaba</groupId>
-        <version>2.8.4.2</version>
+        <version>2.8.4.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dubbo-monitor/dubbo-monitor-api/pom.xml b/dubbo-monitor/dubbo-monitor-api/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-monitor</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</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
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-monitor</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-monitor-default</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-monitor/pom.xml b/dubbo-monitor/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-monitor</artifactId>
 	<packaging>pom</packaging>

diff --git a/dubbo-registry/dubbo-registry-api/pom.xml b/dubbo-registry/dubbo-registry-api/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-registry</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-registry-api</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-registry/dubbo-registry-default/pom.xml b/dubbo-registry/dubbo-registry-default/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-registry</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-registry-default</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-registry/dubbo-registry-multicast/pom.xml b/dubbo-registry/dubbo-registry-multicast/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-registry</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-registry-multicast</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-registry/dubbo-registry-redis/pom.xml b/dubbo-registry/dubbo-registry-redis/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-registry</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-registry-redis</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-registry/dubbo-registry-zookeeper/pom.xml b/dubbo-registry/dubbo-registry-zookeeper/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-registry</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-registry-zookeeper</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-registry/pom.xml b/dubbo-registry/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-parent</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-registry</artifactId>
 	<packaging>pom</packaging>

diff --git a/dubbo-remoting/dubbo-remoting-api/pom.xml b/dubbo-remoting/dubbo-remoting-api/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-remoting</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-remoting-api</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-remoting/dubbo-remoting-grizzly/pom.xml b/dubbo-remoting/dubbo-remoting-grizzly/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-remoting</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-remoting-grizzly</artifactId>
 	<packaging>jar</packaging>

diff --git a/dubbo-remoting/dubbo-remoting-http/pom.xml b/dubbo-remoting/dubbo-remoting-http/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>com.alibaba</groupId>
 		<artifactId>dubbo-remoting</artifactId>
-		<version>2.8.4.2</version>
+		<version>2.8.4.3</version>
 	</parent>
 	<artifactId>dubbo-remoting-http</artifactId>
 	<packaging>jar</packaging>