Index: lams_admin/conf/xdoclet/filter-mappings.xml
===================================================================
diff -u -r62ffc2985a40f544eb48a69f2ad7f124b19a43fa -r89048e2eefb49bc832fbc5464c652150007c2808
--- lams_admin/conf/xdoclet/filter-mappings.xml	(.../filter-mappings.xml)	(revision 62ffc2985a40f544eb48a69f2ad7f124b19a43fa)
+++ lams_admin/conf/xdoclet/filter-mappings.xml	(.../filter-mappings.xml)	(revision 89048e2eefb49bc832fbc5464c652150007c2808)
@@ -1,23 +1,3 @@
-<!--
-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
--->
 <filter-mapping>
     <filter-name>SystemSessionFilter</filter-name>
      <url-pattern>/*</url-pattern>
Index: lams_admin/conf/xdoclet/filters.xml
===================================================================
diff -u -r62ffc2985a40f544eb48a69f2ad7f124b19a43fa -r89048e2eefb49bc832fbc5464c652150007c2808
--- lams_admin/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 62ffc2985a40f544eb48a69f2ad7f124b19a43fa)
+++ lams_admin/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 89048e2eefb49bc832fbc5464c652150007c2808)
@@ -1,23 +1,3 @@
-<!--
-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
--->
 <filter>
        <filter-name>SystemSessionFilter</filter-name>
          <filter-class>
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/util/AdminPreparer.java
===================================================================
diff -u -rc83e5b8bf2c9f0a192f91608c3dd8a0d1ede5c12 -r89048e2eefb49bc832fbc5464c652150007c2808
--- lams_admin/src/java/org/lamsfoundation/lams/admin/util/AdminPreparer.java	(.../AdminPreparer.java)	(revision c83e5b8bf2c9f0a192f91608c3dd8a0d1ede5c12)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/util/AdminPreparer.java	(.../AdminPreparer.java)	(revision 89048e2eefb49bc832fbc5464c652150007c2808)
@@ -1,8 +1,26 @@
-/*
- * Created on 2005-1-28
- *
- * Last modified on 2005-1-28
+/****************************************************************
+ * 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.admin.util;
 
 import java.util.HashSet;
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/util/ExcelUserImportFileParser.java
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -r89048e2eefb49bc832fbc5464c652150007c2808
--- lams_admin/src/java/org/lamsfoundation/lams/admin/util/ExcelUserImportFileParser.java	(.../ExcelUserImportFileParser.java)	(revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/util/ExcelUserImportFileParser.java	(.../ExcelUserImportFileParser.java)	(revision 89048e2eefb49bc832fbc5464c652150007c2808)
@@ -1,8 +1,26 @@
-/*
- * Created on 2005-1-18
- *
- * Last modified on 2005-1-18
+/****************************************************************
+ * 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.admin.util;
 
 import java.util.Set;
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/util/IUserImportFileParser.java
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -r89048e2eefb49bc832fbc5464c652150007c2808
--- lams_admin/src/java/org/lamsfoundation/lams/admin/util/IUserImportFileParser.java	(.../IUserImportFileParser.java)	(revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/util/IUserImportFileParser.java	(.../IUserImportFileParser.java)	(revision 89048e2eefb49bc832fbc5464c652150007c2808)
@@ -1,8 +1,26 @@
-/*
- * Created on 2005-1-19
- *
- * Last modified on 2005-1-19
+/****************************************************************
+ * 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.admin.util;
 
 import java.io.IOException;
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/AdminAction.java
===================================================================
diff -u -rc83e5b8bf2c9f0a192f91608c3dd8a0d1ede5c12 -r89048e2eefb49bc832fbc5464c652150007c2808
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/AdminAction.java	(.../AdminAction.java)	(revision c83e5b8bf2c9f0a192f91608c3dd8a0d1ede5c12)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/AdminAction.java	(.../AdminAction.java)	(revision 89048e2eefb49bc832fbc5464c652150007c2808)
@@ -1,3 +1,26 @@
+/****************************************************************
+ * 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.admin.web;
 
 import java.io.IOException;
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java
===================================================================
diff -u -r0e43e21301c93315b5e7959c30e892f93411787f -r89048e2eefb49bc832fbc5464c652150007c2808
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java	(.../OrganisationAction.java)	(revision 0e43e21301c93315b5e7959c30e892f93411787f)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java	(.../OrganisationAction.java)	(revision 89048e2eefb49bc832fbc5464c652150007c2808)
@@ -1,3 +1,26 @@
+/****************************************************************
+ * 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.admin.web;
 
 import java.io.IOException;
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationActionForm.java
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -r89048e2eefb49bc832fbc5464c652150007c2808
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationActionForm.java	(.../OrganisationActionForm.java)	(revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationActionForm.java	(.../OrganisationActionForm.java)	(revision 89048e2eefb49bc832fbc5464c652150007c2808)
@@ -1,3 +1,26 @@
+/****************************************************************
+ * 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.admin.web;
 
 import javax.servlet.http.HttpServletRequest;
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ScheduledJobDTO.java
===================================================================
diff -u -r52f3ab1ab2051d0d28ca7d7f96dd28ed08624aa8 -r89048e2eefb49bc832fbc5464c652150007c2808
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ScheduledJobDTO.java	(.../ScheduledJobDTO.java)	(revision 52f3ab1ab2051d0d28ca7d7f96dd28ed08624aa8)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ScheduledJobDTO.java	(.../ScheduledJobDTO.java)	(revision 89048e2eefb49bc832fbc5464c652150007c2808)
@@ -1,31 +1,32 @@
-/*
- *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.admin.web;
 
 import java.util.Date;
 /**
  * DTO class of quartz job object for displaying on screen.
  * @author Steve.Ni
- * 
- * @version $Revision$
  */
 public class ScheduledJobDTO {
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/ScheduledJobListAction.java
===================================================================
diff -u -r52f3ab1ab2051d0d28ca7d7f96dd28ed08624aa8 -r89048e2eefb49bc832fbc5464c652150007c2808
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/ScheduledJobListAction.java	(.../ScheduledJobListAction.java)	(revision 52f3ab1ab2051d0d28ca7d7f96dd28ed08624aa8)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/ScheduledJobListAction.java	(.../ScheduledJobListAction.java)	(revision 89048e2eefb49bc832fbc5464c652150007c2808)
@@ -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.admin.web;
 
 import java.io.IOException;
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java
===================================================================
diff -u -r0e43e21301c93315b5e7959c30e892f93411787f -r89048e2eefb49bc832fbc5464c652150007c2808
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	(.../UserAction.java)	(revision 0e43e21301c93315b5e7959c30e892f93411787f)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java	(.../UserAction.java)	(revision 89048e2eefb49bc832fbc5464c652150007c2808)
@@ -1,3 +1,26 @@
+/****************************************************************
+ * 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.admin.web;
 
 import java.io.IOException;
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserActionForm.java
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -r89048e2eefb49bc832fbc5464c652150007c2808
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserActionForm.java	(.../UserActionForm.java)	(revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserActionForm.java	(.../UserActionForm.java)	(revision 89048e2eefb49bc832fbc5464c652150007c2808)
@@ -1,3 +1,26 @@
+/****************************************************************
+ * 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.admin.web;
 
 import java.util.HashMap;
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UsersAddAction.java
===================================================================
diff -u -r0e43e21301c93315b5e7959c30e892f93411787f -r89048e2eefb49bc832fbc5464c652150007c2808
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UsersAddAction.java	(.../UsersAddAction.java)	(revision 0e43e21301c93315b5e7959c30e892f93411787f)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UsersAddAction.java	(.../UsersAddAction.java)	(revision 89048e2eefb49bc832fbc5464c652150007c2808)
@@ -1,3 +1,26 @@
+/****************************************************************
+ * 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.admin.web;
 
 import java.util.HashMap;
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UsersAddActionForm.java
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -r89048e2eefb49bc832fbc5464c652150007c2808
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UsersAddActionForm.java	(.../UsersAddActionForm.java)	(revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UsersAddActionForm.java	(.../UsersAddActionForm.java)	(revision 89048e2eefb49bc832fbc5464c652150007c2808)
@@ -1,3 +1,26 @@
+/****************************************************************
+ * 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.admin.web;
 
 import java.util.List;
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UsersRemoveAction.java
===================================================================
diff -u -r0e43e21301c93315b5e7959c30e892f93411787f -r89048e2eefb49bc832fbc5464c652150007c2808
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UsersRemoveAction.java	(.../UsersRemoveAction.java)	(revision 0e43e21301c93315b5e7959c30e892f93411787f)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UsersRemoveAction.java	(.../UsersRemoveAction.java)	(revision 89048e2eefb49bc832fbc5464c652150007c2808)
@@ -1,3 +1,26 @@
+/****************************************************************
+ * 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.admin.web;
 
 import javax.servlet.http.HttpServletRequest;
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UsersRemoveActionForm.java
===================================================================
diff -u -rf8845fdf880cec49384de0f55bd7a49400fcdf6f -r89048e2eefb49bc832fbc5464c652150007c2808
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UsersRemoveActionForm.java	(.../UsersRemoveActionForm.java)	(revision f8845fdf880cec49384de0f55bd7a49400fcdf6f)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UsersRemoveActionForm.java	(.../UsersRemoveActionForm.java)	(revision 89048e2eefb49bc832fbc5464c652150007c2808)
@@ -1,3 +1,26 @@
+/****************************************************************
+ * 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.admin.web;
 
 import java.util.ArrayList;
Index: lams_admin/src/java/org/lamsfoundation/lams/sysadmin/web/CacheAction.java
===================================================================
diff -u -rbfe9a3f1fab72deab8749ecce2f49ece2cee2db3 -r89048e2eefb49bc832fbc5464c652150007c2808
--- lams_admin/src/java/org/lamsfoundation/lams/sysadmin/web/CacheAction.java	(.../CacheAction.java)	(revision bfe9a3f1fab72deab8749ecce2f49ece2cee2db3)
+++ lams_admin/src/java/org/lamsfoundation/lams/sysadmin/web/CacheAction.java	(.../CacheAction.java)	(revision 89048e2eefb49bc832fbc5464c652150007c2808)
@@ -1,3 +1,26 @@
+/****************************************************************
+ * 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.sysadmin.web;
 
 import java.io.IOException;
Index: lams_admin/src/java/org/lamsfoundation/lams/sysadmin/web/CacheActionForm.java
===================================================================
diff -u -rbfe9a3f1fab72deab8749ecce2f49ece2cee2db3 -r89048e2eefb49bc832fbc5464c652150007c2808
--- lams_admin/src/java/org/lamsfoundation/lams/sysadmin/web/CacheActionForm.java	(.../CacheActionForm.java)	(revision bfe9a3f1fab72deab8749ecce2f49ece2cee2db3)
+++ lams_admin/src/java/org/lamsfoundation/lams/sysadmin/web/CacheActionForm.java	(.../CacheActionForm.java)	(revision 89048e2eefb49bc832fbc5464c652150007c2808)
@@ -1,3 +1,26 @@
+/****************************************************************
+ * 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.sysadmin.web;
 
 import javax.servlet.http.HttpServletRequest;
Index: lams_admin/web/WEB-INF/tiles/tiles-defs.xml
===================================================================
diff -u -r52f3ab1ab2051d0d28ca7d7f96dd28ed08624aa8 -r89048e2eefb49bc832fbc5464c652150007c2808
--- lams_admin/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision 52f3ab1ab2051d0d28ca7d7f96dd28ed08624aa8)
+++ lams_admin/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision 89048e2eefb49bc832fbc5464c652150007c2808)
@@ -1,26 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!--
-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>
 
 	<definition name=".admin.error" path="/template.jsp">
Index: lams_admin/web/WEB-INF/web.xml
===================================================================
diff -u -r52f3ab1ab2051d0d28ca7d7f96dd28ed08624aa8 -r89048e2eefb49bc832fbc5464c652150007c2808
--- lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision 52f3ab1ab2051d0d28ca7d7f96dd28ed08624aa8)
+++ lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision 89048e2eefb49bc832fbc5464c652150007c2808)
@@ -23,26 +23,6 @@
 	</param-value>
 </context-param>
 
-  <!--
-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
--->
 <filter>
        <filter-name>SystemSessionFilter</filter-name>
          <filter-class>
@@ -68,26 +48,6 @@
 	</init-param>
 </filter>
 
-  <!--
-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
--->
 <filter-mapping>
     <filter-name>SystemSessionFilter</filter-name>
      <url-pattern>/*</url-pattern>
Index: lams_build/common.properties
===================================================================
diff -u -r3fe021104934c6fcc41a99e6f64f67e91362378e -r89048e2eefb49bc832fbc5464c652150007c2808
--- lams_build/common.properties	(.../common.properties)	(revision 3fe021104934c6fcc41a99e6f64f67e91362378e)
+++ lams_build/common.properties	(.../common.properties)	(revision 89048e2eefb49bc832fbc5464c652150007c2808)
@@ -1,3 +1,22 @@
+#   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 
+
 # project-wide properties 
 project=LAMS
 project_version=1.1
Index: lams_build/unix.properties
===================================================================
diff -u -rca8058f36eb477a54e5986078526e2a1f643ba44 -r89048e2eefb49bc832fbc5464c652150007c2808
--- lams_build/unix.properties	(.../unix.properties)	(revision ca8058f36eb477a54e5986078526e2a1f643ba44)
+++ lams_build/unix.properties	(.../unix.properties)	(revision 89048e2eefb49bc832fbc5464c652150007c2808)
@@ -1,9 +1,9 @@
 #   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
Index: lams_build/windows.properties
===================================================================
diff -u -rca8058f36eb477a54e5986078526e2a1f643ba44 -r89048e2eefb49bc832fbc5464c652150007c2808
--- lams_build/windows.properties	(.../windows.properties)	(revision ca8058f36eb477a54e5986078526e2a1f643ba44)
+++ lams_build/windows.properties	(.../windows.properties)	(revision 89048e2eefb49bc832fbc5464c652150007c2808)
@@ -1,9 +1,9 @@
 #   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
@@ -35,5 +35,5 @@
 jboss.server=${jboss.home}server/
 jboss.server.instance=${jboss.server}default
 
-j2eelibs=D:/Program Files/MyEclipse/eclipse/plugins/com.genuitec.eclipse.j2eedt.core_4.0.1/data/libraryset/1.4
+j2eelibs=C:/Program Files/MyEclipse/eclipse/plugins/com.genuitec.eclipse.j2eedt.core_4.1.1/data/libraryset/1.4