Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimAttachmentDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/Attic/IDimdimAttachmentDAO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimAttachmentDAO.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimAttachmentDAO.java	19 Sep 2008 06:18:09 -0000	1.2
@@ -20,7 +20,7 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-/* $$Id$$ */
+/* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.dao;
 
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimConfigDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/Attic/IDimdimConfigDAO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimConfigDAO.java	15 Sep 2008 11:06:40 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimConfigDAO.java	19 Sep 2008 06:18:09 -0000	1.2
@@ -20,14 +20,14 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-/* $$Id$$ */
+/* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.dao;
 
 import org.lamsfoundation.lams.dao.IBaseDAO;
 
 /**
- * DAO for accessing the Dimdim objects - interface defining methods to be
+ * DAO for accessing the DimdimConfig objects - interface defining methods to be
  * implemented by the Hibernate or other implementation.
  */
 public interface IDimdimConfigDAO extends IBaseDAO {
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/Attic/IDimdimDAO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimDAO.java	15 Sep 2008 11:06:40 -0000	1.2
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimDAO.java	19 Sep 2008 06:18:09 -0000	1.3
@@ -20,7 +20,7 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-/* $$Id$$ */
+/* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.dao;
 
@@ -31,5 +31,5 @@
  * implemented by the Hibernate or other implementation.
  */
 public interface IDimdimDAO extends IBaseDAO {
-	
+
 }
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimSessionDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/Attic/IDimdimSessionDAO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimSessionDAO.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimSessionDAO.java	19 Sep 2008 06:18:09 -0000	1.2
@@ -20,7 +20,7 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-/* $$Id$$ */
+/* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.dao;
 
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimUserDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/Attic/IDimdimUserDAO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimUserDAO.java	20 Aug 2008 05:55:52 -0000	1.2
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/IDimdimUserDAO.java	19 Sep 2008 06:18:09 -0000	1.3
@@ -20,7 +20,7 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-/* $$Id$$ */
+/* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.dao;
 
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimAttachmentDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/Attic/DimdimAttachmentDAO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimAttachmentDAO.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimAttachmentDAO.java	19 Sep 2008 06:18:09 -0000	1.2
@@ -20,7 +20,7 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-/* $$Id$$ */
+/* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.dao.hibernate;
 
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimConfigDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/Attic/DimdimConfigDAO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimConfigDAO.java	15 Sep 2008 11:06:40 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimConfigDAO.java	19 Sep 2008 06:18:09 -0000	1.2
@@ -20,16 +20,16 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-/* $$Id$$ */
+/* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.dao.hibernate;
 
 import org.lamsfoundation.lams.dao.hibernate.BaseDAO;
 import org.lamsfoundation.lams.tool.dimdim.dao.IDimdimConfigDAO;
 
 /**
- * DAO for accessing the Dimdim objects - Hibernate specific code.
+ * DAO for accessing the DimdimConfig objects - Hibernate specific code.
  */
 public class DimdimConfigDAO extends BaseDAO implements IDimdimConfigDAO {
-	
+
 }
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/Attic/DimdimDAO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimDAO.java	20 Aug 2008 05:55:52 -0000	1.2
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimDAO.java	19 Sep 2008 06:18:09 -0000	1.3
@@ -20,7 +20,7 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-/* $$Id$$ */
+/* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.dao.hibernate;
 
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimSessionDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/Attic/DimdimSessionDAO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimSessionDAO.java	20 Aug 2008 05:55:52 -0000	1.2
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimSessionDAO.java	19 Sep 2008 06:18:09 -0000	1.3
@@ -20,7 +20,7 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-/* $$Id$$ */
+/* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.dao.hibernate;
 
@@ -31,4 +31,5 @@
  * DAO for accessing the DimdimSession objects - Hibernate specific code.
  */
 public class DimdimSessionDAO extends BaseDAO implements IDimdimSessionDAO {
+
 }
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimUserDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/Attic/DimdimUserDAO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimUserDAO.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dao/hibernate/DimdimUserDAO.java	19 Sep 2008 06:18:09 -0000	1.2
@@ -20,7 +20,7 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-/* $$Id$$ */
+/* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.dao.hibernate;
 
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/AttachmentDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/Attic/AttachmentDTO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/AttachmentDTO.java	20 Aug 2008 05:55:52 -0000	1.2
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/AttachmentDTO.java	19 Sep 2008 06:18:09 -0000	1.3
@@ -20,7 +20,6 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-
 /* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.dto;
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/NotebookEntryDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/Attic/NotebookEntryDTO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/NotebookEntryDTO.java	20 Aug 2008 05:55:52 -0000	1.2
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/NotebookEntryDTO.java	19 Sep 2008 06:18:09 -0000	1.3
@@ -1,3 +1,27 @@
+/****************************************************************
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+/* $Id$ */
+
 package org.lamsfoundation.lams.tool.dimdim.dto;
 
 import java.util.Date;
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/SessionDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/Attic/SessionDTO.java,v
diff -u -r1.2 -r1.3
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/SessionDTO.java	20 Aug 2008 05:55:52 -0000	1.2
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/SessionDTO.java	19 Sep 2008 06:18:09 -0000	1.3
@@ -20,7 +20,6 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-
 /* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.dto;
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/UserDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/Attic/UserDTO.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/UserDTO.java	20 Aug 2008 05:55:52 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/UserDTO.java	19 Sep 2008 06:18:09 -0000	1.2
@@ -20,7 +20,6 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-
 /* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.dto;
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimAttachment.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/Attic/DimdimAttachment.java,v
diff -u -r1.2 -r1.3
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimAttachment.java	20 Aug 2008 05:55:52 -0000	1.2
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimAttachment.java	19 Sep 2008 06:18:09 -0000	1.3
@@ -20,7 +20,7 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-/* $$Id$$ */
+/* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.model;
 
@@ -46,7 +46,7 @@
 			.getLogger(DimdimAttachment.class);
 
 	// Fields
-	
+
 	private Long uid;
 
 	private Long fileVersionId;
@@ -158,6 +158,7 @@
 
 	/**
 	 * @hibernate.many-to-one not-null="true"
+	 *                        foreign-key="fk_laddim10_dimdim_attachment_to_dimdim"
 	 * @hibernate.column name="dimdim_uid"
 	 * 
 	 */
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimConfig.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/Attic/DimdimConfig.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimConfig.java	15 Sep 2008 11:06:40 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimConfig.java	19 Sep 2008 06:18:09 -0000	1.2
@@ -20,7 +20,7 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-/* $$ */
+/* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.model;
 
@@ -32,20 +32,20 @@
 	private Long uid;
 
 	private String key;
-	
+
 	private String value;
-	
+
 	/**
 	 * @hibernate.id generator-class="native" type="java.lang.Long" column="uid"
 	 */
 	public Long getUid() {
 		return uid;
 	}
-	
+
 	public void setUid(Long uid) {
 		this.uid = uid;
 	}
-	
+
 	/**
 	 * @hibernate.property column="config_key"
 	 * @return
@@ -57,7 +57,7 @@
 	public void setKey(String key) {
 		this.key = key;
 	}
-	
+
 	/**
 	 * @hibernate.property column="config_value"
 	 * @return
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimSession.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/Attic/DimdimSession.java,v
diff -u -r1.4 -r1.5
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimSession.java	15 Sep 2008 11:06:40 -0000	1.4
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimSession.java	19 Sep 2008 06:18:09 -0000	1.5
@@ -20,7 +20,7 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-/* $$Id$$ */
+/* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.model;
 
@@ -44,7 +44,7 @@
 	private static final long serialVersionUID = 4407078136514639026L;
 
 	// Fields
-	
+
 	private Long uid;
 
 	private Date sessionEndDate;
@@ -60,13 +60,13 @@
 	private Dimdim dimdim;
 
 	private Set<DimdimUser> dimdimUsers;
-	
+
 	private String topic;
 
 	private String meetingKey;
 
 	private Integer maxAttendeeMikes;
-	
+
 	// Constructors
 
 	/** default constructor */
@@ -167,6 +167,7 @@
 
 	/**
 	 * @hibernate.many-to-one not-null="true"
+	 *                        foreign-key="fk_laddim10_dimdim_session_to_dimdim"
 	 * @hibernate.column name="dimdim_uid"
 	 * 
 	 */
@@ -182,7 +183,8 @@
 	/**
 	 * @hibernate.set lazy="true" inverse="true" cascade="none"
 	 * @hibernate.collection-key column="dimdim_session_uid"
-	 * @hibernate.collection-one-to-many class="org.lamsfoundation.lams.tool.dimdim.model.DimdimUser"
+	 * @hibernate.collection-one-to-many 
+	 *                                   class="org.lamsfoundation.lams.tool.dimdim.model.DimdimUser"
 	 * 
 	 */
 
@@ -229,7 +231,7 @@
 	public void setMaxAttendeeMikes(Integer maxAttendeeMikes) {
 		this.maxAttendeeMikes = maxAttendeeMikes;
 	}
-	
+
 	/**
 	 * toString
 	 * 
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimUser.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/Attic/DimdimUser.java,v
diff -u -r1.2 -r1.3
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimUser.java	20 Aug 2008 05:55:52 -0000	1.2
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/model/DimdimUser.java	19 Sep 2008 06:18:09 -0000	1.3
@@ -20,7 +20,7 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-/* $$Id$$ */
+/* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.model;
 
@@ -40,7 +40,7 @@
 	private static final long serialVersionUID = -3701664859818409197L;
 
 	// Persistent Fields
-	
+
 	private Long uid;
 
 	private Long userId;
@@ -154,6 +154,7 @@
 
 	/**
 	 * @hibernate.many-to-one not-null="true"
+	 *                        foreign-key="fk_laddim10_dimdim_user_to_dimdim_session"
 	 * @hibernate.column name="dimdim_session_uid"
 	 * 
 	 */
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimServiceProxy.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/Attic/DimdimServiceProxy.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimServiceProxy.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimServiceProxy.java	19 Sep 2008 06:18:09 -0000	1.2
@@ -20,7 +20,7 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-/* $$Id$$ */
+/* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.service;
 
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/Attic/IDimdimService.java,v
diff -u -r1.3 -r1.4
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java	16 Sep 2008 14:18:47 -0000	1.3
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java	19 Sep 2008 06:18:09 -0000	1.4
@@ -20,7 +20,7 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-/* $$Id$$ */
+/* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.service;
 
@@ -167,23 +167,24 @@
 	 * @param value
 	 */
 	void saveOrUpdateConfigEntry(DimdimConfig dimdimConfig);
-	
+
 	/**
 	 * 
 	 * @param userDTO
 	 * @param meetingKey
 	 * @param topic
 	 * @return
 	 */
-	String getDimdimStartConferenceURL(UserDTO userDTO, String meetingKey, String topic) throws Exception;
-	
+	String getDimdimStartConferenceURL(UserDTO userDTO, String meetingKey,
+			String topic) throws Exception;
+
 	/**
 	 * 
 	 * @param userDTOm
 	 * @param meetingKey
 	 * @return
 	 */
-	String getDimdimJoinConferenceURL(UserDTO userDTO, String meetingKey) throws Exception;
-	
-	
+	String getDimdimJoinConferenceURL(UserDTO userDTO, String meetingKey)
+			throws Exception;
+
 }
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Attic/Constants.java,v
diff -u -r1.4 -r1.5
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java	16 Sep 2008 01:55:38 -0000	1.4
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java	19 Sep 2008 06:18:09 -0000	1.5
@@ -20,16 +20,16 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-/* $$Id$$ */
+/* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.util;
 
 public interface Constants {
 	public static final String TOOL_SIGNATURE = "laddim10";
-	
+
 	// Config keys
 	public static final String CONFIG_SERVER_URL = "server_url";
-	
+
 	// Authoring SessionMap key names
 	public static final String KEY_TOOL_CONTENT_ID = "toolContentID";
 	public static final String KEY_CONTENT_FOLDER_ID = "contentFolderID";
@@ -48,7 +48,7 @@
 	public static final String ATTR_USER_DTO = "userDTO";
 	public static final String ATTR_CONFERENCE_URL = "conferenceURL";
 	public static final String ATTR_SAVE_SUCCESS = "saveSuccess";
-	
+
 	// Parameter names
 	public static final String PARAM_USER_UID = "userUID";
 	public static final String ATTR_CONFERENCE_OPEN = "conferenceOpen";
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimException.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Attic/DimdimException.java,v
diff -u -r1.2 -r1.3
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimException.java	20 Aug 2008 05:55:52 -0000	1.2
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimException.java	19 Sep 2008 06:18:09 -0000	1.3
@@ -20,7 +20,7 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-/* $$Id$$ */
+/* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.util;
 
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimToolContentHandler.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Attic/DimdimToolContentHandler.java,v
diff -u -r1.1 -r1.2
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimToolContentHandler.java	15 Aug 2008 08:42:42 -0000	1.1
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimToolContentHandler.java	19 Sep 2008 06:18:09 -0000	1.2
@@ -20,7 +20,7 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-/* $$Id$$ */
+/* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.util;
 
@@ -49,7 +49,8 @@
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.lamsfoundation.lams.contentrepository.client.ToolContentHandler#getRepositoryWorkspaceName()
+	 * @seeorg.lamsfoundation.lams.contentrepository.client.ToolContentHandler#
+	 * getRepositoryWorkspaceName()
 	 */
 	public String getRepositoryWorkspaceName() {
 		return repositoryWorkspaceName;
@@ -58,7 +59,8 @@
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.lamsfoundation.lams.contentrepository.client.ToolContentHandler#getRepositoryUser()
+	 * @seeorg.lamsfoundation.lams.contentrepository.client.ToolContentHandler#
+	 * getRepositoryUser()
 	 */
 	public String getRepositoryUser() {
 		return repositoryUser;
@@ -67,7 +69,8 @@
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.lamsfoundation.lams.contentrepository.client.ToolContentHandler#getRepositoryId()
+	 * @seeorg.lamsfoundation.lams.contentrepository.client.ToolContentHandler#
+	 * getRepositoryId()
 	 */
 	public char[] getRepositoryId() {
 		return repositoryId;
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Attic/DimdimUtil.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimUtil.java	19 Sep 2008 06:18:09 -0000	1.1
@@ -0,0 +1,35 @@
+/****************************************************************
+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+/* $Id: */
+
+package org.lamsfoundation.lams.tool.dimdim.util;
+
+import java.util.Random;
+
+public class DimdimUtil {
+
+	public static String generateMeetingKey() {
+		return new Long(System.currentTimeMillis()).toString() + "-"
+				+ (new Random().nextInt());
+	}
+}
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AdminAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/Attic/AdminAction.java,v
diff -u -r1.3 -r1.4
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AdminAction.java	15 Sep 2008 11:06:40 -0000	1.3
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AdminAction.java	19 Sep 2008 06:18:09 -0000	1.4
@@ -20,14 +20,13 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-/* $$Id$$ */
+/* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.web.actions;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
@@ -55,7 +54,7 @@
 
 	private IDimdimService dimdimService;
 
-	private static final Logger logger = Logger.getLogger(AdminAction.class);
+	// private static final Logger logger = Logger.getLogger(AdminAction.class);
 
 	@Override
 	public ActionForward execute(ActionMapping mapping, ActionForm form,
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/ClearSessionAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/Attic/ClearSessionAction.java,v
diff -u -r1.2 -r1.3
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/ClearSessionAction.java	20 Aug 2008 05:55:52 -0000	1.2
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/ClearSessionAction.java	19 Sep 2008 06:18:09 -0000	1.3
@@ -20,8 +20,8 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-
 /* $Id$ */
+
 package org.lamsfoundation.lams.tool.dimdim.web.actions;
 
 import javax.servlet.http.HttpSession;
@@ -35,7 +35,7 @@
  * 
  * @author Steve.Ni
  * 
- * ----------------XDoclet Tags--------------------
+ *         ----------------XDoclet Tags--------------------
  * 
  * @struts:action path="/clearsession" validate="false"
  * 
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AdminForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/Attic/AdminForm.java,v
diff -u -r1.3 -r1.4
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AdminForm.java	15 Sep 2008 11:06:40 -0000	1.3
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AdminForm.java	19 Sep 2008 06:18:09 -0000	1.4
@@ -20,7 +20,6 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-
 /* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.web.forms;
@@ -35,7 +34,6 @@
 /**
  * @struts.form name="adminForm"
  * @author Anthony Sukkar
-
  */
 public class AdminForm extends ActionForm {
 
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/LearningForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/Attic/LearningForm.java,v
diff -u -r1.2 -r1.3
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/LearningForm.java	20 Aug 2008 05:55:52 -0000	1.2
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/LearningForm.java	19 Sep 2008 06:18:09 -0000	1.3
@@ -20,7 +20,6 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-
 /* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.web.forms;
@@ -38,7 +37,7 @@
 	private static final long serialVersionUID = -4728946254882237144L;
 
 	// Fields
-	
+
 	private String title;
 
 	private String instructions;
Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/servlets/ExportServlet.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/servlets/Attic/ExportServlet.java,v
diff -u -r1.3 -r1.4
--- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/servlets/ExportServlet.java	16 Sep 2008 00:11:05 -0000	1.3
+++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/servlets/ExportServlet.java	19 Sep 2008 06:18:09 -0000	1.4
@@ -20,7 +20,6 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ****************************************************************
  */
-
 /* $Id$ */
 
 package org.lamsfoundation.lams.tool.dimdim.web.servlets;
@@ -31,21 +30,13 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
-import org.lamsfoundation.lams.tool.dimdim.dto.ContentDTO;
-import org.lamsfoundation.lams.tool.dimdim.dto.NotebookEntryDTO;
-import org.lamsfoundation.lams.tool.dimdim.dto.SessionDTO;
-import org.lamsfoundation.lams.tool.dimdim.dto.UserDTO;
 import org.lamsfoundation.lams.tool.dimdim.model.Dimdim;
 import org.lamsfoundation.lams.tool.dimdim.model.DimdimSession;
-import org.lamsfoundation.lams.tool.dimdim.model.DimdimUser;
 import org.lamsfoundation.lams.tool.dimdim.service.DimdimServiceProxy;
 import org.lamsfoundation.lams.tool.dimdim.service.IDimdimService;
-import org.lamsfoundation.lams.tool.dimdim.util.Constants;
 import org.lamsfoundation.lams.tool.dimdim.util.DimdimException;
 import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet;
-import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 
 public class ExportServlet extends AbstractExportPortfolioServlet {