up some fix

孙健 · 孙健 · commit 223cf1504630 · 2016-11-19T22:31:08.000+08:00
diff --git a/build.gradle b/build.gradle
@@ -32,8 +32,7 @@ dependencies {
 	
 	//log
 	//support old version
-	compile 'log4j:log4j:1.2.16'
-    compile 'org.slf4j:slf4j-log4j12:1.6.1'
+	//compile 'log4j:log4j:1.2.16'
   	//new version use log
     compile 'org.slf4j:slf4j-api:1.7.21'
     compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.6.2'
@@ -54,16 +53,19 @@ dependencies {
 	compile 'javax.inject:javax.inject:1'
 	compile 'javax:javaee-api:7.0'
 	compile 'io.netty:netty-all:4.1.2.Final'
+	compile 'org.eclipse.jetty:jetty-servlet:9.2.2.v20140723'
+
+	
  	
  	
     // web server
-   	providedCompile 'org.eclipse.jetty:jetty-webapp:9.2.2.v20140723'
+    providedCompile 'org.eclipse.jetty:jetty-webapp:9.2.2.v20140723'
     providedCompile 'org.eclipse.jetty:jetty-jsp:9.2.2.v20140723'
     providedCompile 'org.eclipse.jetty:jetty-continuation:9.2.2.v20140723'
     providedCompile 'org.eclipse.jetty.websocket:websocket-server:9.2.2.v20140723'
     providedCompile 'org.eclipse.jetty.websocket:javax-websocket-server-impl:9.2.2.v20140723'
 
-
+    
 	testCompile 'junit:junit:4.12'
 
 	war{
@@ -75,12 +77,6 @@ dependencies {
 		def schemaJarFile = project.configurations.providedCompile 
 		
 		schemaJarFile.each{source ->
-			println source 
-			if(source.name=='javax.servlet-api-3.1.0.jar'){
-    			from(source){
-    				into 'WEB-INF/lib'
-    			}
-    		}
 			from zipTree(source)
 			exclude("**/*.SF")
 		}
diff --git a/src/main/java/Bootstrap.java b/src/main/java/Bootstrap.java
@@ -20,7 +20,7 @@ public class Bootstrap {
 	private static final String PREFIX = "jcoder_";
 
 	public static void main(String[] args) throws Exception {
-
+		
 		for (String arg : args) {
 			if (arg.startsWith("-f")) {
 				if (arg.contains("=")) {
@@ -84,6 +84,11 @@ public static void main(String[] args) throws Exception {
 		context.setContextPath("/");
 		context.setServer(server);
 		context.setMaxFormContentSize(0);
+		context.setServerClasses(new String[] { 
+				"org.objectweb.asm.", // hide asm used by jetty
+				"org.eclipse.jdt.", // hide jdt used by jetty
+				"-org.eclipse.jetty." // hide other jetty classes
+		});
 
 		context.setWelcomeFiles(new String[] { "Home.jsp" });
 
diff --git a/src/main/java/org/nlpcn/jcoder/App.java b/src/main/java/org/nlpcn/jcoder/App.java
@@ -8,9 +8,8 @@
 import org.nutz.mvc.ioc.provider.ComboIocProvider;
 
 @Modules(packages = { "org.nlpcn.jcoder.controller" }, scanPackage = true)
-@IocBy(type = ComboIocProvider.class, args = {"*anno", "org.nlpcn.jcoder" })
+@IocBy(type = ComboIocProvider.class, args = { "*anno", "org.nlpcn.jcoder" })
 @Encoding(input = "UTF-8", output = "UTF-8")
 @SetupBy(SiteSetup.class)
 public class App {
-
 }
