Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
===================================================================
diff -u -r32e8a3903d8a5280c7c0201243d412e65ef4feb4 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	(.../McAppConstants.java)	(revision 32e8a3903d8a5280c7c0201243d412e65ef4feb4)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	(.../McAppConstants.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc;
 
 /**
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McApplicationException.java
===================================================================
diff -u -r25a3cd766f44f20c25042ad630f87b5b79a53671 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McApplicationException.java	(.../McApplicationException.java)	(revision 25a3cd766f44f20c25042ad630f87b5b79a53671)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McApplicationException.java	(.../McApplicationException.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc;
 
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAttachmentDTO.java
===================================================================
diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAttachmentDTO.java	(.../McAttachmentDTO.java)	(revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAttachmentDTO.java	(.../McAttachmentDTO.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc;
 
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McComparator.java
===================================================================
diff -u -r25a3cd766f44f20c25042ad630f87b5b79a53671 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McComparator.java	(.../McComparator.java)	(revision 25a3cd766f44f20c25042ad630f87b5b79a53671)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McComparator.java	(.../McComparator.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc;
 
 import java.io.Serializable;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McMonitoredAnswersDTO.java
===================================================================
diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McMonitoredAnswersDTO.java	(.../McMonitoredAnswersDTO.java)	(revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McMonitoredAnswersDTO.java	(.../McMonitoredAnswersDTO.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc;
 
 import java.util.List;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McMonitoredUserDTO.java
===================================================================
diff -u -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McMonitoredUserDTO.java	(.../McMonitoredUserDTO.java)	(revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McMonitoredUserDTO.java	(.../McMonitoredUserDTO.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,6 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc;
 
 import java.util.Map;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McStringComparator.java
===================================================================
diff -u -raf327b6e5e72a853aa811ce8b120b7d1eceac170 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McStringComparator.java	(.../McStringComparator.java)	(revision af327b6e5e72a853aa811ce8b120b7d1eceac170)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McStringComparator.java	(.../McStringComparator.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc;
 
 import java.io.Serializable;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java
===================================================================
diff -u -rd6ae87fb77d39f2c6d07636d8405f61fe87ecc01 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	(.../McUtils.java)	(revision d6ae87fb77d39f2c6d07636d8405f61fe87ecc01)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	(.../McUtils.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc;
 
 import java.text.DateFormat;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Nullable.java
===================================================================
diff -u -rb7e4d4f379a4a90d25f4af4a5d421310cb6bf8e3 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Nullable.java	(.../Nullable.java)	(revision b7e4d4f379a4a90d25f4af4a5d421310cb6bf8e3)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/Nullable.java	(.../Nullable.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc;
 
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcContentDAO.java
===================================================================
diff -u -r20ace80303ee4b073668858cc7b41525375e241b -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcContentDAO.java	(.../IMcContentDAO.java)	(revision 20ace80303ee4b073668858cc7b41525375e241b)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcContentDAO.java	(.../IMcContentDAO.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.dao;
 
 import java.util.List;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java
===================================================================
diff -u -r20ace80303ee4b073668858cc7b41525375e241b -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java	(.../IMcOptionsContentDAO.java)	(revision 20ace80303ee4b073668858cc7b41525375e241b)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java	(.../IMcOptionsContentDAO.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.dao;
 
 import java.util.List;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java
===================================================================
diff -u -r20ace80303ee4b073668858cc7b41525375e241b -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java	(.../IMcQueContentDAO.java)	(revision 20ace80303ee4b073668858cc7b41525375e241b)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java	(.../IMcQueContentDAO.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.dao;
 
 import java.util.List;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcSessionDAO.java
===================================================================
diff -u -rc68cf6aaed1c830c53afaf8838133b2dbd6647ee -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcSessionDAO.java	(.../IMcSessionDAO.java)	(revision c68cf6aaed1c830c53afaf8838133b2dbd6647ee)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcSessionDAO.java	(.../IMcSessionDAO.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.dao;
 
 import java.util.List;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUploadedFileDAO.java
===================================================================
diff -u -r20ace80303ee4b073668858cc7b41525375e241b -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUploadedFileDAO.java	(.../IMcUploadedFileDAO.java)	(revision 20ace80303ee4b073668858cc7b41525375e241b)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUploadedFileDAO.java	(.../IMcUploadedFileDAO.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -3,7 +3,7 @@
  *
  *This program is free software; you can redistribute it and/or modify
  *it under the terms of the GNU General Public License as published by
- *the Free Software Foundation; either version 2 of the License, or
+ *the Free Software Foundation.
  *(at your option) any later version.
  *
  *This program is distributed in the hope that it will be useful,
@@ -18,6 +18,7 @@
  *
  *http://www.gnu.org/licenses/gpl.txt
  */
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.dao;
 
 import java.util.List;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
===================================================================
diff -u -rb906b787d752b2c5c40be062ab5e58c091bb820f -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java	(.../IMcUserDAO.java)	(revision b906b787d752b2c5c40be062ab5e58c091bb820f)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java	(.../IMcUserDAO.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.dao;
 
 import java.util.List;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
===================================================================
diff -u -r34c1bce668671732f9d2ef4e5a1082bc657fd151 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java	(.../IMcUsrAttemptDAO.java)	(revision 34c1bce668671732f9d2ef4e5a1082bc657fd151)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java	(.../IMcUsrAttemptDAO.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.dao;
 
 import java.util.List;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java
===================================================================
diff -u -re6e465484a7f3bee830878cedbba18ff6189d5c1 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java	(.../McContentDAO.java)	(revision e6e465484a7f3bee830878cedbba18ff6189d5c1)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java	(.../McContentDAO.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.dao.hibernate;
 
 import java.util.List;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java
===================================================================
diff -u -r5edcac2c42a04ecb1da20e9b4eeefd795c79892d -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java	(.../McOptionsContentDAO.java)	(revision 5edcac2c42a04ecb1da20e9b4eeefd795c79892d)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java	(.../McOptionsContentDAO.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,6 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.dao.hibernate;
 
 import java.util.Iterator;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
===================================================================
diff -u -r0e2f509aad8e59e029d46d7e8d28b81b4d89d238 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java	(.../McQueContentDAO.java)	(revision 0e2f509aad8e59e029d46d7e8d28b81b4d89d238)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java	(.../McQueContentDAO.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,6 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.dao.hibernate;
 
 import java.util.Iterator;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java
===================================================================
diff -u -rc68cf6aaed1c830c53afaf8838133b2dbd6647ee -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java	(.../McSessionDAO.java)	(revision c68cf6aaed1c830c53afaf8838133b2dbd6647ee)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java	(.../McSessionDAO.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.dao.hibernate;
 
 import java.util.List;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUploadedFileDAO.java
===================================================================
diff -u -r0e2f509aad8e59e029d46d7e8d28b81b4d89d238 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUploadedFileDAO.java	(.../McUploadedFileDAO.java)	(revision 0e2f509aad8e59e029d46d7e8d28b81b4d89d238)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUploadedFileDAO.java	(.../McUploadedFileDAO.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.dao.hibernate;
 
 import java.util.Iterator;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
===================================================================
diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java	(.../McUserDAO.java)	(revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java	(.../McUserDAO.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,6 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.dao.hibernate;
 
 import java.util.List;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
===================================================================
diff -u -r81d8376371adce355c1dbe6944dafb290434fd3e -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java	(.../McUsrAttemptDAO.java)	(revision 81d8376371adce355c1dbe6944dafb290434fd3e)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java	(.../McUsrAttemptDAO.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.dao.hibernate;
 
 import java.util.List;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java
===================================================================
diff -u -re8579f8f7b5afa49dc060d9534683cdaa649cb2b -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java	(.../McContent.java)	(revision e8579f8f7b5afa49dc060d9534683cdaa649cb2b)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java	(.../McContent.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.pojos;
 
 import java.io.Serializable;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.java
===================================================================
diff -u -rdf74c2ae9ad3fd2a2e559fdc6ab92593204c7090 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.java	(.../McOptsContent.java)	(revision df74c2ae9ad3fd2a2e559fdc6ab92593204c7090)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.java	(.../McOptsContent.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.pojos;
 
 import java.io.Serializable;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.java
===================================================================
diff -u -re8579f8f7b5afa49dc060d9534683cdaa649cb2b -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.java	(.../McQueContent.java)	(revision e8579f8f7b5afa49dc060d9534683cdaa649cb2b)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.java	(.../McQueContent.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.pojos;
 
 import java.io.Serializable;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueUsr.java
===================================================================
diff -u -rdf74c2ae9ad3fd2a2e559fdc6ab92593204c7090 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueUsr.java	(.../McQueUsr.java)	(revision df74c2ae9ad3fd2a2e559fdc6ab92593204c7090)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueUsr.java	(.../McQueUsr.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.pojos;
 
 import java.io.Serializable;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McSession.java
===================================================================
diff -u -rc215962e5ad947b556b51a222c65893d31580f29 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McSession.java	(.../McSession.java)	(revision c215962e5ad947b556b51a222c65893d31580f29)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McSession.java	(.../McSession.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.pojos;
 
 import java.io.Serializable;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McUploadedFile.java
===================================================================
diff -u -rb2b31f02ced62fb1b949dfab4baf1ce962172bd6 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McUploadedFile.java	(.../McUploadedFile.java)	(revision b2b31f02ced62fb1b949dfab4baf1ce962172bd6)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McUploadedFile.java	(.../McUploadedFile.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,23 +1,26 @@
-/*
- *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- *
- *This program is free software; you can redistribute it and/or modify
- *it under the terms of the GNU General Public License as published by
- *the Free Software Foundation; either version 2 of the License, or
- *(at your option) any later version.
- *
- *This program is distributed in the hope that it will be useful,
- *but WITHOUT ANY WARRANTY; without even the implied warranty of
- *MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *GNU General Public License for more details.
- *
- *You should have received a copy of the GNU General Public License
- *along with this program; if not, write to the Free Software
- *Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
- *USA
- *
- *http://www.gnu.org/licenses/gpl.txt
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
  */
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.pojos;
 
 import java.io.Serializable;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McUsrAttempt.java
===================================================================
diff -u -rdf74c2ae9ad3fd2a2e559fdc6ab92593204c7090 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McUsrAttempt.java	(.../McUsrAttempt.java)	(revision df74c2ae9ad3fd2a2e559fdc6ab92593204c7090)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McUsrAttempt.java	(.../McUsrAttempt.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.pojos;
 
 import java.io.Serializable;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
===================================================================
diff -u -rc68cf6aaed1c830c53afaf8838133b2dbd6647ee -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	(.../IMcService.java)	(revision c68cf6aaed1c830c53afaf8838133b2dbd6647ee)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	(.../IMcService.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.service;
 
 import java.io.InputStream;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
diff -u -rc68cf6aaed1c830c53afaf8838133b2dbd6647ee -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision c68cf6aaed1c830c53afaf8838133b2dbd6647ee)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.service;
 import java.io.InputStream;
 import java.util.Date;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServiceProxy.java
===================================================================
diff -u -r25a3cd766f44f20c25042ad630f87b5b79a53671 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServiceProxy.java	(.../McServiceProxy.java)	(revision 25a3cd766f44f20c25042ad630f87b5b79a53671)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServiceProxy.java	(.../McServiceProxy.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.service;
 
 import javax.servlet.ServletContext;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/McToolContentHandler.java
===================================================================
diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/McToolContentHandler.java	(.../McToolContentHandler.java)	(revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/McToolContentHandler.java	(.../McToolContentHandler.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.util;
 
 import org.lamsfoundation.lams.contentrepository.client.ToolContentHandler;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
===================================================================
diff -u -re8579f8f7b5afa49dc060d9534683cdaa649cb2b -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision e8579f8f7b5afa49dc060d9534683cdaa649cb2b)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.web;
 
 import java.io.FileNotFoundException;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/CustomStrutsExceptionHandler.java
===================================================================
diff -u -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/CustomStrutsExceptionHandler.java	(.../CustomStrutsExceptionHandler.java)	(revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/CustomStrutsExceptionHandler.java	(.../CustomStrutsExceptionHandler.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.web;
 
 import javax.servlet.http.HttpServletRequest;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java
===================================================================
diff -u -r5d587b470e038e789d179856f8359e9ad8a221a1 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java	(.../LearningUtil.java)	(revision 5d587b470e038e789d179856f8359e9ad8a221a1)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java	(.../LearningUtil.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,6 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.web;
 
 import java.util.Date;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -rd6ae87fb77d39f2c6d07636d8405f61fe87ecc01 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision d6ae87fb77d39f2c6d07636d8405f61fe87ecc01)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,6 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.web;
 
 import java.io.IOException;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java
===================================================================
diff -u -r32e8a3903d8a5280c7c0201243d412e65ef4feb4 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java	(.../McAuthoringForm.java)	(revision 32e8a3903d8a5280c7c0201243d412e65ef4feb4)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java	(.../McAuthoringForm.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,6 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.web;
 
 import org.lamsfoundation.lams.tool.mc.web.McLearningForm; 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McDLStarterAction.java
===================================================================
diff -u -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McDLStarterAction.java	(.../McDLStarterAction.java)	(revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McDLStarterAction.java	(.../McDLStarterAction.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -68,6 +68,7 @@
 	</action>    
   
 */
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.web;
 import java.io.IOException;
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportAction.java
===================================================================
diff -u -rd6ae87fb77d39f2c6d07636d8405f61fe87ecc01 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportAction.java	(.../McExportAction.java)	(revision d6ae87fb77d39f2c6d07636d8405f61fe87ecc01)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportAction.java	(.../McExportAction.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,6 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.web;
 
 import javax.servlet.http.HttpServletRequest;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportForm.java
===================================================================
diff -u -rd6ae87fb77d39f2c6d07636d8405f61fe87ecc01 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportForm.java	(.../McExportForm.java)	(revision d6ae87fb77d39f2c6d07636d8405f61fe87ecc01)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportForm.java	(.../McExportForm.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,6 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.web;
 
 import org.apache.log4j.Logger;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportServlet.java
===================================================================
diff -u -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportServlet.java	(.../McExportServlet.java)	(revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportServlet.java	(.../McExportServlet.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.web;
 
 import javax.servlet.http.Cookie;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
===================================================================
diff -u -r5d587b470e038e789d179856f8359e9ad8a221a1 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	(.../McLearningAction.java)	(revision 5d587b470e038e789d179856f8359e9ad8a221a1)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	(.../McLearningAction.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,6 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.web;
 
 import java.io.IOException;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java
===================================================================
diff -u -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java	(.../McLearningForm.java)	(revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java	(.../McLearningForm.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,6 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.web;
 
 import org.apache.struts.action.ActionForm;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
===================================================================
diff -u -r8d0b1de3acd411878ccc28b222e49c4fe4641aa7 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	(.../McLearningStarterAction.java)	(revision 8d0b1de3acd411878ccc28b222e49c4fe4641aa7)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	(.../McLearningStarterAction.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,6 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.web;
 
 import java.io.IOException;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
===================================================================
diff -u -r84d364960525ae0d69e5ab5af327e2a3ce99a7c9 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	(.../McMonitoringAction.java)	(revision 84d364960525ae0d69e5ab5af327e2a3ce99a7c9)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	(.../McMonitoringAction.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,6 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.web;
 
 import java.io.IOException;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringForm.java
===================================================================
diff -u -rdef2dd6db95cbaa6ae8116e6a63e948db2c403f5 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringForm.java	(.../McMonitoringForm.java)	(revision def2dd6db95cbaa6ae8116e6a63e948db2c403f5)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringForm.java	(.../McMonitoringForm.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,6 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.web;
 
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java
===================================================================
diff -u -rd6ae87fb77d39f2c6d07636d8405f61fe87ecc01 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java	(.../McMonitoringStarterAction.java)	(revision d6ae87fb77d39f2c6d07636d8405f61fe87ecc01)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java	(.../McMonitoringStarterAction.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,6 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.web;
 
 import java.io.IOException;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
===================================================================
diff -u -r94789b14d5f0b1d8bf8e680bb6ef66742e5a27ec -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision 94789b14d5f0b1d8bf8e680bb6ef66742e5a27ec)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -131,7 +131,7 @@
 */
 
 /* TO DO: enable show feedback on questions.*/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.web;
 import java.io.IOException;
 import java.util.Date;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java
===================================================================
diff -u -rc68cf6aaed1c830c53afaf8838133b2dbd6647ee -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java	(.../MonitoringUtil.java)	(revision c68cf6aaed1c830c53afaf8838133b2dbd6647ee)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java	(.../MonitoringUtil.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,6 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.web;
 
 import java.util.Iterator;
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/AbstractMcTestCase.java
===================================================================
diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/AbstractMcTestCase.java	(.../AbstractMcTestCase.java)	(revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/AbstractMcTestCase.java	(.../AbstractMcTestCase.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc;
 
 import junit.framework.TestCase;
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java
===================================================================
diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java	(.../McDataAccessTestCase.java)	(revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java	(.../McDataAccessTestCase.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc;
 
 import java.util.HashSet;
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java
===================================================================
diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java	(.../TestMcContent.java)	(revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java	(.../TestMcContent.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,7 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc;
 
 
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java
===================================================================
diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java	(.../TestMcOptionsContent.java)	(revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java	(.../TestMcOptionsContent.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc;
 
 import java.util.Iterator;
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueContent.java
===================================================================
diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueContent.java	(.../TestMcQueContent.java)	(revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueContent.java	(.../TestMcQueContent.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc;
 
 
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueUsr.java
===================================================================
diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueUsr.java	(.../TestMcQueUsr.java)	(revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueUsr.java	(.../TestMcQueUsr.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc;
 
 import java.util.HashSet;
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcSession.java
===================================================================
diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcSession.java	(.../TestMcSession.java)	(revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcSession.java	(.../TestMcSession.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc;
 
 import org.lamsfoundation.lams.tool.mc.pojos.McSession;
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcUsrAttempt.java
===================================================================
diff -u -ra819720ed4933e91d93b0eb4a8a9801d31a6cb45 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcUsrAttempt.java	(.../TestMcUsrAttempt.java)	(revision a819720ed4933e91d93b0eb4a8a9801d31a6cb45)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcUsrAttempt.java	(.../TestMcUsrAttempt.java)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,11 +1,11 @@
 /***************************************************************************
  * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
  * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +19,7 @@
  * 
  * http://www.gnu.org/licenses/gpl.txt
  * ***********************************************************************/
-
-
+/* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc;
 
 import java.util.Date;
Index: lams_tool_lamc/web/WEB-INF/tiles/tiles-defs.xml
===================================================================
diff -u -r21c22cf6617e27cf126f319f08be6e0fc7a3377c -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision 21c22cf6617e27cf126f319f08be6e0fc7a3377c)
+++ lams_tool_lamc/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -5,26 +5,6 @@
    "http://jakarta.apache.org/struts/dtds/tiles-config.dtd">
 
 
-<!--
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-USA
-
-http://www.gnu.org/licenses/gpl.txt
--->
  
 <tiles-definitions>
 <!-- ============= template Definitions ====================== -->
Index: lams_tool_lamc/web/WEB-INF/web.xml
===================================================================
diff -u -r84d364960525ae0d69e5ab5af327e2a3ce99a7c9 -rc9531327d15636b54f293077ee1cd9f60195381b
--- lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision 84d364960525ae0d69e5ab5af327e2a3ce99a7c9)
+++ lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision c9531327d15636b54f293077ee1cd9f60195381b)
@@ -1,26 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <web-app  xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
- <!--
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
-USA
-
-http://www.gnu.org/licenses/gpl.txt
--->
 	<context-param>
 		<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
   	<param-value>org.lamsfoundation.lams.tool.mc.web.McResources</param-value>