final

sts/pom.xml

@@ -101,6 +101,46 @@
     	<artifactId>hibernate-entitymanager</artifactId>
     	<version>3.4.0.GA</version>
     </dependency>
+    <dependency>
+    	<groupId>ehcache</groupId>
+    	<artifactId>ehcache</artifactId>
+    	<version>1.2.3</version>
+    </dependency>
+    <dependency>
+    	<groupId>org.zengsource</groupId>
+    	<artifactId>zengsource-util</artifactId>
+    	<version>1.0</version>
+    </dependency>
+    <dependency>
+    	<groupId>commons-beanutils</groupId>
+    	<artifactId>commons-beanutils</artifactId>
+    	<version>1.7.0</version>
+    </dependency>
+    <dependency>
+    	<groupId>commons-fileupload</groupId>
+    	<artifactId>commons-fileupload</artifactId>
+    	<version>1.2</version>
+    </dependency>
+    <dependency>
+    	<groupId>commons-io</groupId>
+    	<artifactId>commons-io</artifactId>
+    	<version>2.0</version>
+    </dependency>
+    <dependency>
+    	<groupId>commons-logging</groupId>
+    	<artifactId>commons-logging</artifactId>
+    	<version>1.0.3</version>
+    </dependency>
+    <dependency>
+    	<groupId>org.zengsource</groupId>
+    	<artifactId>zengsource-mvc</artifactId>
+    	<version>1.0</version>
+    </dependency>
+    <dependency>
+    	<groupId>org.aspectj</groupId>
+    	<artifactId>aspectjweaver</artifactId>
+    	<version>1.6.8</version>
+    </dependency>
   </dependencies>
   <build>
     <finalName>umllearning</finalName>

sts/src/main/java/org/zengsource/umllearning/CoreAC.xml

@@ -23,21 +23,50 @@
 			<ref bean="sessionFactory" />
 		</property>
 	</bean>
-
 	<!-- hzucmj -->
 	<bean id="TaskDao" class="org.zengsource.umllearning.core.dao.orm.HibernateTaskDao">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory" />
 		</property>
 	</bean>
+	<bean id="commentDao" class="org.zengsource.umllearning.core.dao.orm.HibernateCommentDao">
+		<property name="sessionFactory">
+			<ref bean="sessionFactory" />
+		</property>
+	</bean>
+	<bean id="homeworkDao" class="org.zengsource.umllearning.core.dao.orm.HibernateHomeworkDao">
+		<property name="sessionFactory">
+			<ref bean="sessionFactory" />
+		</property>
+	</bean>
+	<bean id="registerDao" class="org.zengsource.umllearning.core.dao.orm.HibernateRegisterDao">
+		<property name="sessionFactory">
+			<ref bean="sessionFactory" />
+		</property>
+	</bean>
+	<bean id="authDao" class="org.zengsource.umllearning.core.dao.orm.HibernateAuthorityDao">
+		<property name="sessionFactory">
+			<ref bean="sessionFactory" />
+		</property>
+	</bean>
+	<bean id="webtopDao" class="org.zengsource.umllearning.core.dao.orm.HibernateWebtopDao">
+		<property name="sessionFactory">
+			<ref bean="sessionFactory" />
+		</property>
+	</bean>
+	<!-- swyma -->
+	<bean id="followDao" class="org.zengsource.umllearning.core.dao.orm.HibernateFollowDao">
+		<property name="sessionFactory">
+			<ref bean="sessionFactory"/>
+		</property>
+	</bean>
 
 	<!-- Services -->
 	<bean id="cacheService" class="org.jwebtop.core.service.CacheServiceWithEhcache">
 		<property name="ehcache">
 			<ref bean="jwEhcache" />
 		</property>
 	</bean>
-
 	<bean id="userService" class="org.jwebtop.core.service.UserServiceImpl">
 		<property name="userDao">
 			<ref bean="userDao" />
@@ -75,18 +104,48 @@
 
 	<bean id="configurationService" class="org.jwebtop.core.service.ConfigurationServiceImpl">
 	</bean>
-
 	<!-- hzucmj -->
 	<bean id="TaskService" class="org.zengsource.umllearning.core.service.TaskServiceImpl">
 		<property name="TaskDao">
 			<ref bean="TaskDao"/>
 		</property>
 	</bean>
+	<bean id="commentService" class="org.zengsource.umllearning.core.service.CommentServiceImpl">
+		<property name="commentDao">
+			<ref bean="commentDao" />
+		</property>
+	</bean>
+	<bean id="homeworkService" class="org.zengsource.umllearning.core.service.HomeworkServiceImpl">
+		<property name="homeworkDao">
+			<ref bean="homeworkDao" />
+		</property>
+	</bean>
+	<bean id="registerService" class="org.zengsource.umllearning.core.service.RegisterServiceImpl">
+		<property name="registerDao">
+			<ref bean="registerDao" />
+		</property>
+	</bean>
+	<bean id="authService" class="org.zengsource.umllearning.core.service.AuthorityServiceImpl">
+		<property name="authDao">
+			<ref bean="authDao" />
+		</property>
+	</bean>
+	<bean id="webtopService" class="org.zengsource.umllearning.core.service.WebtopServiceImpl">
+		<property name="webtopDao">
+			<ref bean="webtopDao" />
+		</property>
+	</bean>
+	<!-- swyma -->
+	<bean id="followService" class="org.zengsource.umllearning.core.service.FollowServiceImpl">
+		<property name="followDao">
+			<ref bean="followDao"/>
+		</property>
+	</bean>
 
 	<!-- Actions -->
-	<bean id="index" class="org.jwebtop.core.web.IndexAction">
+	<bean id="index" class="org.jwebtop.core.web.IndexAction" scope="prototype">
 		<property name="forward">
-			<value>/webtop.jsp</value>
+			<value>/webtop.jxp</value>
 		</property>
 		<property name="configurationService">
 			<ref bean="configurationService" />
@@ -99,17 +158,63 @@
 		</property>
 	</bean>
 
-	<bean id="webware" class="org.jwebtop.core.web.WebwareAction">
+	<bean id="webware" class="org.jwebtop.core.web.WebwareAction" scope="prototype">
 		<property name="webwareService">
 			<ref bean="webwareService" />
 		</property>
 	</bean>
-
 	<!-- hzucmj -->
 	<bean id="task" class="org.zengsource.umllearning.core.web.TaskAction">
 		<property name="TaskService">
 			<ref bean="TaskService" />
 		</property>
+		<property name="homeworkService">
+			<ref bean="homeworkService" />
+		</property>
+	</bean>
+	<bean id="savetask" class="org.zengsource.umllearning.core.web.SaveTaskAction" scope="prototype">
+		<property name="TaskService">
+			<ref bean="TaskService" />
+		</property>
+	</bean>
+	<bean id="comment" class="org.zengsource.umllearning.core.web.CommentAction">
+		<property name="commentService">
+			<ref bean="commentService" />
+		</property>
+	</bean>
+	<bean id="homework" class="org.zengsource.umllearning.core.web.HomeworkAction" scope="prototype">
+		<property name="homeworkService">
+			<ref bean="homeworkService" />
+		</property>
+	</bean>
+	<bean id="UpdateHomework" class="org.zengsource.umllearning.core.web.UpdateHomeworkAction">
+		<property name="homeworkService">
+			<ref bean="homeworkService" />
+		</property>
+	</bean>
+	<bean id="signon" class="org.zengsource.umllearning.core.web.RegisterAction" scope="prototype">
+		<property name="registerService">
+			<ref bean="registerService" />
+		</property>
+		<property name="authService">
+			<ref bean="authService" />
+		</property>
+	</bean>
+	<!-- swyma -->
+	<bean id="follow" class="org.zengsource.umllearning.core.web.FollowAction">
+		<property name="followService">
+			<ref bean="followService"/>
+		</property>
+	</bean>
+	<bean id="webtop" class="org.zengsource.umllearning.core.web.IndexAction">
+		<property name="webtopService">
+			<ref bean="webtopService"/>
+		</property>
+	</bean>
+	<bean id="webtopIndex" class="org.zengsource.umllearning.core.web.WebtopAction">
+		<property name="webtopService">
+			<ref bean="webtopService"/>
+		</property>
 	</bean>
 
 </beans>

sts/src/main/java/org/zengsource/umllearning/core/dao/AuthorityDao.java

@@ -0,0 +1,9 @@
+package org.zengsource.umllearning.core.dao;
+
+import org.zengsource.umllearning.core.model.Authority;
+
+public interface AuthorityDao {
+
+	public void save(Authority auth);
+
+}

sts/src/main/java/org/zengsource/umllearning/core/dao/CommentDao.java

@@ -0,0 +1,23 @@
+/**
+ * 
+ */
+package org.zengsource.umllearning.core.dao;
+
+import java.util.List;
+
+import org.zengsource.umllearning.core.model.Comment;
+
+/**
+ * @author hzucmj
+ *
+ */
+public interface CommentDao {
+
+	public void addComment(Comment c);
+
+	public List<Comment> queryAll(String hql, int start, int limit);
+
+	public Long queryCount(String hql);
+
+	public List<?> queryComment(String q, int start, int limit);
+}

sts/src/main/java/org/zengsource/umllearning/core/dao/FollowDao.java

@@ -0,0 +1,24 @@
+package org.zengsource.umllearning.core.dao;
+
+import java.util.List;
+
+import org.zengsource.umllearning.core.model.Follow;
+
+public interface FollowDao {
+	/**
+	 * @author swyma
+	 */
+
+
+	//取得总数
+	public Long getCount(String hql);
+
+	//分页取数据
+	public List<?> queryFollow(String hql,int start,int limit);
+
+	//addFollower
+	public void save(Follow follow);
+
+	//deleteFollower
+	public void delete(String hql);
+}

sts/src/main/java/org/zengsource/umllearning/core/dao/HomeworkDao.java

@@ -0,0 +1,21 @@
+/**
+ * 
+ */
+package org.zengsource.umllearning.core.dao;
+
+import org.zengsource.umllearning.core.model.Homework;
+import org.zengsource.umllearning.core.model.Task;
+
+/**
+ * @author hzucmj
+ *
+ */
+public interface HomeworkDao {
+
+	public Homework queryById(String id);
+
+	public void saveHomework(Homework h);
+
+	public void doTask(Task t, Homework h);
+
+}

sts/src/main/java/org/zengsource/umllearning/core/dao/RegisterDao.java

@@ -0,0 +1,19 @@
+package org.zengsource.umllearning.core.dao;
+
+import java.math.BigInteger;
+import java.util.List;
+
+import org.zengsource.umllearning.core.model.Register;
+
+public interface RegisterDao {
+
+	public void save(Register register);
+
+	public Object queryByName(String name);
+
+	public void update(Register register);
+
+	public List<?> queryAllUsers(String sql,int start,int limit);
+
+	public BigInteger count(String sql);
+}

sts/src/main/java/org/zengsource/umllearning/core/dao/TaskDao.java

@@ -1,11 +1,48 @@
-package org.zengsource.umllearning.core.dao;
-
-import org.zengsource.umllearning.core.model.Task;
-
-public interface TaskDao {
-
-	public Task queryById(String id);
-
-	public void saveTask(Task task);
-
-}
+package org.zengsource.umllearning.core.dao;
+
+import java.math.BigInteger;
+import java.util.List;
+
+import org.hibernate.criterion.Criterion;
+import org.zengsource.umllearning.core.model.Task;
+
+public interface TaskDao {
+
+	/**
+	 * 
+	 * @author hzucmj
+	 * 
+	 */
+
+	public Task queryById(String q);
+
+	public Integer queryByTitle(String title);
+
+	public void saveTask(Task task);
+
+	public void updateTask(Task task);
+
+	public void delTask(Task task);
+
+	/**
+	 * 
+	 * @author swyma
+	 * 
+	 */
+	//取得总数
+	public Integer getCount(Criterion[] criterions);
+	//分页显示
+	public List<?> queryTask(Criterion[] criterions, int start, int limit);
+
+	//取得总数
+	public Long getCount(String hql);
+
+	//分页取数据
+	public List<?> queryTask(String hql,int start,int limit);
+
+	public List<?> query(String hql);
+
+	public List<?> querySql(String sql);
+
+	public BigInteger getCountSql(String sql);
+}