6.5beta fix bugs

rejoady · Sep 26, 2011 · fc2d566 · fc2d566
1 parent 54f9562
commit fc2d566
Show file tree

Hide file tree

Showing 67 changed files with 342 additions and 477 deletions.
diff --git a/.classpath b/.classpath
@@ -10,7 +10,6 @@
 	<classpathentry kind="lib" path="lib/commons-pool-1.5.1.jar"/>
 	<classpathentry kind="lib" path="lib/disruptor-2.0.2.jar"/>
 	<classpathentry kind="lib" path="lib/ehcache-1.6.2.jar"/>
-	<classpathentry kind="lib" path="lib/hessian-3.1.6.jar"/>
 	<classpathentry kind="lib" path="lib/jakarta-regexp-1.1.jar"/>
 	<classpathentry kind="lib" path="lib/jdom.jar"/>
 	<classpathentry kind="lib" path="lib/junit.jar"/>

diff --git a/examples/Hazelcast.rar → JdonAccessory/Hazelcast.rar b/examples/Hazelcast.rar → JdonAccessory/Hazelcast.rar
diff --git a/JdonAccessory/JdonAccessory-Source.rar b/JdonAccessory/JdonAccessory-Source.rar
diff --git a/JdonAccessory/JdonAccessorySource.zip b/JdonAccessory/JdonAccessorySource.zip
diff --git a/JdonAccessory/jdon-hibernate3x.jar b/JdonAccessory/jdon-hibernate3x.jar
diff --git a/JdonAccessory/jdon-jdbcTemp.jar b/JdonAccessory/jdon-jdbcTemp.jar
diff --git a/JdonAccessory/jdon-remote-hessian.jar b/JdonAccessory/jdon-remote-hessian.jar
diff --git a/JdonAccessory/jdon-struts1x.jar b/JdonAccessory/jdon-struts1x.jar
diff --git a/JdonAccessory/jdonAccessory.jar b/JdonAccessory/jdonAccessory.jar
diff --git a/dist/jdonFramework.jar b/dist/jdonFramework.jar
diff --git a/examples/Hazelcast/HazelcastProvider.java b/examples/Hazelcast/HazelcastProvider.java
diff --git a/examples/Hazelcast/hazelcast.xml b/examples/Hazelcast/hazelcast.xml
diff --git a/examples/Hazelcast/hibernate.cfg.xml b/examples/Hazelcast/hibernate.cfg.xml
diff --git a/examples/Hazelcast/¹ØÓÚHazelcastµÄJF¸ü¸Ä.txt b/examples/Hazelcast/¹ØÓÚHazelcastµÄJF¸ü¸Ä.txt
diff --git a/examples/tesWeb/.classpath b/examples/tesWeb/.classpath
@@ -3,15 +3,16 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/servlet-api.jar"/>
-	<classpathentry kind="lib" path="D:/javasource/JdonComponent/jdonframework/dist/scannotation-1.0.2.jar"/>
-	<classpathentry kind="lib" path="D:/javasource/JdonComponent/jdonframework/dist/commons-pool-1.5.1.jar"/>
-	<classpathentry kind="lib" path="D:/javasource/JdonComponent/jdonframework/dist/hessian-3.1.6.jar"/>
-	<classpathentry kind="lib" path="D:/javasource/JdonComponent/jdonframework/dist/jdom.jar"/>
-	<classpathentry kind="lib" path="D:/javasource/JdonComponent/jdonframework/dist/jdonFramework.jar"/>
-	<classpathentry kind="lib" path="D:/javasource/JdonComponent/jdonframework/dist/jdon-hibernate3x.jar"/>
-	<classpathentry kind="lib" path="D:/javasource/JdonComponent/jdonframework/dist/jdon-remote-hessian.jar"/>
-	<classpathentry kind="lib" path="D:/javasource/JdonComponent/jdonframework/dist/jdon-struts1x.jar"/>
-	<classpathentry kind="lib" path="D:/javasource/JdonComponent/jdonframework/dist/log4j.jar"/>
-	<classpathentry kind="lib" path="D:/javasource/JdonComponent/jdonframework/dist/picocontainer-1.1.jar"/>
+	<classpathentry kind="lib" path="D:/javasource/jdonframework/dist/aopalliance-1.0.jar"/>
+	<classpathentry kind="lib" path="D:/javasource/jdonframework/dist/cglib.jar"/>
+	<classpathentry kind="lib" path="D:/javasource/jdonframework/dist/commons-pool-1.5.1.jar"/>
+	<classpathentry kind="lib" path="D:/javasource/jdonframework/dist/disruptor-2.0.2.jar"/>
+	<classpathentry kind="lib" path="D:/javasource/jdonframework/dist/ehcache-1.6.2.jar"/>
+	<classpathentry kind="lib" path="D:/javasource/jdonframework/dist/hessian-3.1.6.jar"/>
+	<classpathentry kind="lib" path="D:/javasource/jdonframework/dist/jdom.jar"/>
+	<classpathentry kind="lib" path="D:/javasource/jdonframework/dist/jdonFramework.jar"/>
+	<classpathentry kind="lib" path="D:/javasource/jdonframework/dist/log4j.jar"/>
+	<classpathentry kind="lib" path="D:/javasource/jdonframework/dist/picocontainer-1.2.jar"/>
+	<classpathentry kind="lib" path="D:/javasource/jdonframework/dist/scannotation-1.0.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/examples/tesWeb/build.xml b/examples/tesWeb/build.xml
@@ -1,9 +1,7 @@
+<?xml version="1.0"?>
 <project name="Annotation Test" default="all" basedir="./">
 
 	<target name="all" depends="war">
-		<!-- 
-		<copy file="myweb.war" todir="E:\training\jboss-4.2.2.GA\server\default\deploy" overwrite="true"/>
-   -->
 	</target>
 
 	<path id="master-classpath">
@@ -28,6 +26,7 @@
 		</copy>
 		<copy todir="myweb/WEB-INF//lib" overwrite="true">
             <fileset dir="../../dist"/>
+
 		</copy>		
 		<jar destfile="myweb.war" >
 			<fileset dir="myweb">

diff --git a/examples/tesWeb/myweb.war b/examples/tesWeb/myweb.war
diff --git a/examples/tesWeb/myweb/WEB-INF/classes/sample/MyServlet.class b/examples/tesWeb/myweb/WEB-INF/classes/sample/MyServlet.class
diff --git a/examples/tesWeb/myweb/WEB-INF/classes/sample/repository/PublisherRole.class b/examples/tesWeb/myweb/WEB-INF/classes/sample/repository/PublisherRole.class
diff --git a/examples/tesWeb/myweb/WEB-INF/classes/sample/repository/PublisherRoleImp.class b/examples/tesWeb/myweb/WEB-INF/classes/sample/repository/PublisherRoleImp.class
diff --git a/examples/tesWeb/myweb/WEB-INF/classes/sample/repository/UserRepositoryInMEM.class b/examples/tesWeb/myweb/WEB-INF/classes/sample/repository/UserRepositoryInMEM.class
diff --git a/examples/tesWeb/myweb/WEB-INF/classes/sample/service/HelloService.class b/examples/tesWeb/myweb/WEB-INF/classes/sample/service/HelloService.class
diff --git a/examples/tesWeb/myweb/WEB-INF/classes/sample/service/HelloServiceImpl.class b/examples/tesWeb/myweb/WEB-INF/classes/sample/service/HelloServiceImpl.class
diff --git a/examples/tesWeb/myweb/WEB-INF/lib/aopalliance-1.0.jar b/examples/tesWeb/myweb/WEB-INF/lib/aopalliance-1.0.jar
diff --git a/examples/tesWeb/myweb/WEB-INF/lib/cglib.jar b/examples/tesWeb/myweb/WEB-INF/lib/cglib.jar
diff --git a/examples/tesWeb/myweb/WEB-INF/lib/commons-pool-1.5.1.jar b/examples/tesWeb/myweb/WEB-INF/lib/commons-pool-1.5.1.jar
diff --git a/examples/tesWeb/myweb/WEB-INF/lib/disruptor-2.0.2.jar b/examples/tesWeb/myweb/WEB-INF/lib/disruptor-2.0.2.jar
diff --git a/examples/tesWeb/myweb/WEB-INF/lib/ehcache-1.6.2.jar b/examples/tesWeb/myweb/WEB-INF/lib/ehcache-1.6.2.jar
diff --git a/dist/hessian-3.1.6.jar → ...esWeb/myweb/WEB-INF/lib/hessian-3.1.6.jar b/dist/hessian-3.1.6.jar → ...esWeb/myweb/WEB-INF/lib/hessian-3.1.6.jar
diff --git a/examples/tesWeb/myweb/WEB-INF/lib/jdom.jar b/examples/tesWeb/myweb/WEB-INF/lib/jdom.jar
diff --git a/examples/tesWeb/myweb/WEB-INF/lib/jdonFramework.jar b/examples/tesWeb/myweb/WEB-INF/lib/jdonFramework.jar
diff --git a/examples/tesWeb/myweb/WEB-INF/lib/log4j.jar b/examples/tesWeb/myweb/WEB-INF/lib/log4j.jar
diff --git a/examples/tesWeb/myweb/WEB-INF/lib/picocontainer-1.2.jar b/examples/tesWeb/myweb/WEB-INF/lib/picocontainer-1.2.jar
diff --git a/examples/tesWeb/myweb/WEB-INF/lib/scannotation-1.0.2.jar b/examples/tesWeb/myweb/WEB-INF/lib/scannotation-1.0.2.jar
diff --git a/examples/tesWeb/myweb/index.jsp b/examples/tesWeb/myweb/index.jsp
@@ -11,7 +11,7 @@
 
 <form action="/myweb/myServlet" method="get">
 enter your name:
-<input type="text" name="myname" id="mynameId" value="999">
+<input type="text" name="myname" id="mynameId" value="jdon">
 <input type="submit"/>
 </form>
 

diff --git a/examples/tesWeb/readme.txt b/examples/tesWeb/readme.txt
@@ -2,7 +2,6 @@ this sample show how simply developing javaEE program by jdonfamework.
 
 1. only need two annotations:
 
-@Poolable
 @Service(name="helloService")
 public class HelloServiceImpl implements HelloService 
 ..
@@ -17,9 +16,6 @@ HelloService helloService = (HelloService) WebAppUtil.getService("helloService",
 String result = helloService.hello(myname);
 
 
-Using ant compiling this project.
-
-deploy jdonremote.war to your server,such as tomcat: copy the file to tomcat/webapp
 
 http://localhost:8080/myweb/
 
diff --git a/examples/tesWeb/readme_cn.txt b/examples/tesWeb/readme_cn.txt
diff --git a/examples/tesWeb/src/sample/MyServlet.java b/examples/tesWeb/src/sample/MyServlet.java
@@ -7,6 +7,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import sample.domain.User;
 import sample.service.HelloService;
 
 import com.jdon.controller.WebAppUtil;
@@ -19,10 +20,14 @@ protected void service(HttpServletRequest req, HttpServletResponse resp) throws
 		String myname = req.getParameter("myname");
 		System.out.println("doGet active :" + myname);
 		HelloService helloService = (HelloService) WebAppUtil.getService("helloService", req);
-		String result = helloService.hello(myname);
+		User user = new User();
+		user.setName(myname);
+		user.setUserId("999");
+		helloService.save(user);
+
+		String result = helloService.hello("999");
 
 		resp.getWriter().print("server say hello to:" + result);
 		resp.getWriter().close();
 	}
-
 }