diff --git a/README.md b/README.md index bca11d87..061eef8b 100755 --- a/README.md +++ b/README.md @@ -132,7 +132,7 @@ Based on this I am through the JDK6 provided Instrumentation-API implementation #### Provides a plug-and-play module management container -In order to realize the dynamic hot-swapping of the sandbox module, the container client and the sandbox dynamic pluggable container communicate with the HTTP protocol. The bottom layer uses Jetty6 as the HTTP server. +In order to realize the dynamic hot-swapping of the sandbox module, the container client and the sandbox dynamic pluggable container communicate with the HTTP protocol. The bottom layer uses Jetty8 as the HTTP server. ### What can the JVM-SANDBOX do? diff --git a/doc/JVM-SANDBOX-ReadMe-Chineies.md b/doc/JVM-SANDBOX-ReadMe-Chineies.md index fc26d4c9..ee9e800b 100644 --- a/doc/JVM-SANDBOX-ReadMe-Chineies.md +++ b/doc/JVM-SANDBOX-ReadMe-Chineies.md @@ -29,7 +29,7 @@ 基于此我通过JDK6所提供的Instrumentation-API实现了利用HotSwap技术在不重启JVM的情况下实现对任意方法的AOP增强。而且性能开销还在可以接受的范围之内。 #####2. 动态可插拔容器 -为了实现沙箱模块的动态热插拔,容器客户端和沙箱动态可插拔容器采用HTTP协议进行通讯,底层用Jetty6作为HTTP服务器。 +为了实现沙箱模块的动态热插拔,容器客户端和沙箱动态可插拔容器采用HTTP协议进行通讯,底层用Jetty8作为HTTP服务器。 #### What can the JVM-SANDBOX do? diff --git a/doc/JVM-SANDBOX-ReadMe-English.md b/doc/JVM-SANDBOX-ReadMe-English.md index 4fc0ed3f..39b6f36c 100644 --- a/doc/JVM-SANDBOX-ReadMe-English.md +++ b/doc/JVM-SANDBOX-ReadMe-English.md @@ -38,7 +38,7 @@ Based on this I am through the JDK6 provided Instrumentation-API implementation ##### Provides a plug-and-play module management container -In order to realize the dynamic hot-swapping of the sandbox module, the container client and the sandbox dynamic pluggable container communicate with the HTTP protocol. The bottom layer uses Jetty6 as the HTTP server. +In order to realize the dynamic hot-swapping of the sandbox module, the container client and the sandbox dynamic pluggable container communicate with the HTTP protocol. The bottom layer uses Jetty8 as the HTTP server. #### What can the JVM-SANDBOX do? diff --git a/pom.xml b/pom.xml index 59bda87e..e5e1da73 100755 --- a/pom.xml +++ b/pom.xml @@ -177,17 +177,17 @@ org.ow2.asm asm - 5.0.3 + 6.0 org.ow2.asm asm-commons - 5.0.3 + 6.0 org.ow2.asm asm-util - 5.0.3 + 6.0 org.apache.commons @@ -202,6 +202,12 @@ 1.7.0 + + javax.annotation + javax.annotation-api + 1.3.1 + + diff --git a/sandbox-core/pom.xml b/sandbox-core/pom.xml index fbe21eb8..82f6c2bc 100755 --- a/sandbox-core/pom.xml +++ b/sandbox-core/pom.xml @@ -123,5 +123,9 @@ ant ant + + javax.annotation + javax.annotation-api + diff --git a/sandbox-core/src/main/java/com/alibaba/jvm/sandbox/core/classloader/ModuleClassLoader.java b/sandbox-core/src/main/java/com/alibaba/jvm/sandbox/core/classloader/ModuleClassLoader.java index 2dc2ef52..4d35353c 100755 --- a/sandbox-core/src/main/java/com/alibaba/jvm/sandbox/core/classloader/ModuleClassLoader.java +++ b/sandbox-core/src/main/java/com/alibaba/jvm/sandbox/core/classloader/ModuleClassLoader.java @@ -52,7 +52,8 @@ private ModuleClassLoader(final File moduleJarFile, new Routing( sandboxClassLoader, "^com\\.alibaba\\.jvm\\.sandbox\\.api\\..*", - "^javax\\.servlet\\..*" + "^javax\\.servlet\\..*", + "^javax\\.annotation\\.Resource*$" ) ); this.checksumCRC32 = FileUtils.checksumCRC32(moduleJarFile); diff --git a/sandbox-debug-module/pom.xml b/sandbox-debug-module/pom.xml index 86d30439..5dc0179e 100755 --- a/sandbox-debug-module/pom.xml +++ b/sandbox-debug-module/pom.xml @@ -73,6 +73,11 @@ commons-collections commons-collections + + javax.annotation + javax.annotation-api + provided + diff --git a/sandbox-mgr-module/pom.xml b/sandbox-mgr-module/pom.xml index 6e824936..f4c1667f 100755 --- a/sandbox-mgr-module/pom.xml +++ b/sandbox-mgr-module/pom.xml @@ -61,6 +61,11 @@ org.apache.commons commons-lang3 + + javax.annotation + javax.annotation-api + provided +