Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
===================================================================
diff -u -rafbd2486f479295afe9a177d7bd3f9dcb71927a8 -r0055799135c002681cf6504a386e061e318df494
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	(.../Activity.java)	(revision afbd2486f479295afe9a177d7bd3f9dcb71927a8)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	(.../Activity.java)	(revision 0055799135c002681cf6504a386e061e318df494)
@@ -67,16 +67,8 @@
 	public static final int CATEGORY_ASSESSMENT = 3;
 	public static final int CATEGORY_CONTENT = 4;
 	public static final int CATEGORY_SPLIT = 5;
-	/******************************************************************/
+    /*******************************************************************/
 	
-	/**
-	 * static final variables indicating the grouping_support of activities
-	 *******************************************************************/
-	public static final int GROUPING_SUPPORT_NONE = 1;
-	public static final int GROUPING_SUPPORT_OPTIONAL = 2;
-	public static final int GROUPING_SUPPORT_REQUIRED = 3;
-	/******************************************************************/
-	
 	/** WDDX packet specific attribute created to identify the
 	 * type of object being passed.*/
 	public static final String OBJECT_TYPE ="Activity";
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java
===================================================================
diff -u -r8bbaae4777d25bac513a7adc0b42b2d8480e05cc -r0055799135c002681cf6504a386e061e318df494
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java	(.../Grouping.java)	(revision 8bbaae4777d25bac513a7adc0b42b2d8480e05cc)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java	(.../Grouping.java)	(revision 0055799135c002681cf6504a386e061e318df494)
@@ -18,6 +18,7 @@
  */
 public abstract class Grouping implements Serializable
 {
+    
     /** Grouping type id of random grouping */
     public static final Integer RANDOM_GROUPING_TYPE = new Integer(1);
     
@@ -45,7 +46,17 @@
     
     /** non-persistent field */
     protected Set learners;
+
+    /**
+     * static final variables indicating the grouping_support of activities
+     *******************************************************************/
+    public static final int GROUPING_SUPPORT_NONE = 1;
     
+    public static final int GROUPING_SUPPORT_OPTIONAL = 2;
+
+    public static final int GROUPING_SUPPORT_REQUIRED = 3;
+    /******************************************************************/
+    
     /** full constructor */
     public Grouping(Long groupingId, Set groups, Set activities)
     {