cloudstore-developers

diff --git a/.classpath b/.classpath
index 12591c2..4d69284 100644
--- a/.classpath
+++ b/.classpath
@@ -7,12 +7,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry including="**/*.java|**/*.xml" kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>

diff --git a/generate.sh b/generate.sh
old mode 100644
new mode 100755
index 0b870d6..cbba8db
--- a/generate.sh
+++ b/generate.sh
@@ -1,13 +1,14 @@
 #!/bin/bash
 
-if [ "$#" -ne 1 ]
+if [ "$#" -ne 2 ]
 then
 	echo "Illegal number of parameters"
-	echo "Usage: generate.sh <sql|mongodb>"
+	echo "Usage: generate.sh <sql> <number of items>"
 	exit 1
 fi
 
 DB_TYPE=$1
+NUM_ITEMS=$2
 
 echo "########################"
 echo "# Compiling CloudStore #"
@@ -23,10 +24,5 @@ cd src/main/java
 
 if [ $DB_TYPE == "sql" ]
 then
-	java -cp ../../../target/dependency/*:../../../target/classes/ -Deu.cloudscale.datasource=hibernate eu/cloudscale/showcase/generate/Generate sql
-fi
-
-if [ $DB_TYPE == "mongodb" ]
-then
-	java -cp ../../../target/dependency/*:../../../target/classes/ -Deu.cloudscale.datasource=mongodb eu/cloudscale/showcase/generate/Generate mongodb
+	java -cp ../../../target/dependency/*:../../../target/classes/ -Deu.cloudscale.datasource=hibernate eu/cloudscale/showcase/generate/Generate sql $NUM_ITEMS
 fi

diff --git a/src/main/java/eu/cloudscale/showcase/db/dao/mongo/impl/AddressDaoImpl.java b/src/main/java/eu/cloudscale/showcase/db/dao/mongo/impl/AddressDaoImpl.java
index f8c60f8..e2ff8d6 100755
--- a/src/main/java/eu/cloudscale/showcase/db/dao/mongo/impl/AddressDaoImpl.java
+++ b/src/main/java/eu/cloudscale/showcase/db/dao/mongo/impl/AddressDaoImpl.java
@@ -18,7 +18,6 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Repository;
 
-import eu.cloudscale.showcase.db.common.ContextHelper;
 import eu.cloudscale.showcase.db.dao.IAddressDao;
 import eu.cloudscale.showcase.db.model.IAddress;
 import eu.cloudscale.showcase.db.model.mongo.Address;

diff --git a/src/main/java/eu/cloudscale/showcase/db/dao/mongo/impl/ShoppingCartLineDaoImpl.java b/src/main/java/eu/cloudscale/showcase/db/dao/mongo/impl/ShoppingCartLineDaoImpl.java
index 29979ee..9fa35e7 100755
--- a/src/main/java/eu/cloudscale/showcase/db/dao/mongo/impl/ShoppingCartLineDaoImpl.java
+++ b/src/main/java/eu/cloudscale/showcase/db/dao/mongo/impl/ShoppingCartLineDaoImpl.java
@@ -46,7 +46,6 @@ public class ShoppingCartLineDaoImpl extends DaoImpl<IShoppingCartLine> implemen
 	@Override
     public void delete(IShoppingCartLine bySCandItem)
     {
-	    // TODO Auto-generated method stub
 	    
     }
 
@@ -59,7 +58,6 @@ public class ShoppingCartLineDaoImpl extends DaoImpl<IShoppingCartLine> implemen
 	@Override
     public List<Object[]> findBySCId(Integer shoppingId)
     {
-	    // TODO Auto-generated method stub
 	    return null;
     }
     

diff --git a/src/main/java/eu/cloudscale/showcase/db/services/AService.java b/src/main/java/eu/cloudscale/showcase/db/services/AService.java
index e5946b8..31ed893 100755
--- a/src/main/java/eu/cloudscale/showcase/db/services/AService.java
+++ b/src/main/java/eu/cloudscale/showcase/db/services/AService.java
@@ -384,7 +384,6 @@ public abstract class AService implements IService
 		order.setOShipType( shipping );
 		order.setOStatus( "PENDING" );
 		order.setOTotal( calculateTotal( sc ) );
-		// TODO: order.setOSubTotal( calculateSubTotal(sc) );
 
 		order.setOSubTotal( calculateTotal( sc ) );
 		ordersDao.shrani( order );

diff --git a/src/main/java/eu/cloudscale/showcase/db/services/MongoService.java b/src/main/java/eu/cloudscale/showcase/db/services/MongoService.java
index 9cbb9ad..cebf041 100755
--- a/src/main/java/eu/cloudscale/showcase/db/services/MongoService.java
+++ b/src/main/java/eu/cloudscale/showcase/db/services/MongoService.java
@@ -57,10 +57,8 @@ public class MongoService extends AService
 		order.setOShipType( shipping );
 		order.setOStatus( "PENDING" );
 		order.setOTotal( calculateTotal( sc ) );
-		// TODO: order.setOSubTotal( calculateSubTotal(sc) );
 
 		order.setOSubTotal( calculateTotal( sc ) );
-		//ordersDao.shrani( order );
 		
 		Set<IShoppingCartLine> res = sc.getShoppingCartLines();
 		
@@ -91,7 +89,6 @@ public class MongoService extends AService
     			
     			itemDao.shrani( item );
     
-    			// TODO: Update item IStock property
     		}
 		}
 

diff --git a/src/main/java/eu/cloudscale/showcase/generate/AGenerate.java b/src/main/java/eu/cloudscale/showcase/generate/AGenerate.java
index 9f04f32..2c1f6e4 100755
--- a/src/main/java/eu/cloudscale/showcase/generate/AGenerate.java
+++ b/src/main/java/eu/cloudscale/showcase/generate/AGenerate.java
@@ -83,22 +83,22 @@ public abstract class AGenerate implements IGenerate
 
 
 	// TODO: Move this to properties file
-	protected static final int    NUM_EBS       = 100;
+	protected static int    NUM_EBS       = 100;
 	
 	// TODO: Move this to properties file
-	protected static final int    NUM_ITEMS     = 10000;
+	protected static int    NUM_ITEMS     = 10000;
 	
 	// TODO: Move this to properties file
-	protected static final int    NUM_CUSTOMERS = NUM_EBS * 2880;
+	protected static int    NUM_CUSTOMERS = NUM_EBS * 2880;
 	
 	// TODO: Move this to properties file
-	protected static final int    NUM_ADDRESSES = 2 * NUM_CUSTOMERS;
+	protected static int    NUM_ADDRESSES = 2 * NUM_CUSTOMERS;
 	
 	// TODO: Move this to properties file
-	protected static final int    NUM_AUTHORS   = (int) ( .25 * NUM_ITEMS );
+	protected static int    NUM_AUTHORS   = (int) ( .25 * NUM_ITEMS );
 	
 	// TODO: Move this to properties file
-	protected static final int    NUM_ORDERS    = (int) ( .9 * NUM_CUSTOMERS );
+	protected static int    NUM_ORDERS    = (int) ( .9 * NUM_CUSTOMERS );
 
 	// TODO: Move this to properties file
 	protected static String[][]   tables        = {
@@ -128,7 +128,20 @@ public abstract class AGenerate implements IGenerate
 	public AGenerate()
 	{
 	}
+
+	public void setNumItems(int numItems) {
+		NUM_ITEMS = numItems;
+		reinitialize();
+	}
 	
+	private void reinitialize(){
+		NUM_CUSTOMERS = NUM_EBS * 2880;
+		NUM_ADDRESSES = 2 * NUM_CUSTOMERS;
+		NUM_AUTHORS   = (int) ( .25 * NUM_ITEMS );
+		NUM_ORDERS    = (int) ( .9 * NUM_CUSTOMERS );
+		
+		addresses = new ArrayList<IAddress>(NUM_ADDRESSES);
+	}
 	
 	protected String getRandomAString(int min, int max)
 	{

diff --git a/src/main/java/eu/cloudscale/showcase/generate/Generate.java b/src/main/java/eu/cloudscale/showcase/generate/Generate.java
index 622f303..bf1092b 100755
--- a/src/main/java/eu/cloudscale/showcase/generate/Generate.java
+++ b/src/main/java/eu/cloudscale/showcase/generate/Generate.java
@@ -23,9 +23,9 @@ public class Generate
 		
 	}
 
-	public void generate(IGenerate db)
+	public void generate(IGenerate db, int numItems)
 	{
-
+		db.setNumItems(numItems);
 		//db.dropTables( tables );
 		db.populateCountryTable();
 		db.populateAuthorTable();
@@ -40,16 +40,16 @@ public class Generate
 
 	public static void main(String[] args)
 	{
-		if( args.length < 1 )
+		if( args.length < 2 )
 		{
-			System.out.println("Usage: $ java Generate <sql|mongodb>");
+			System.out.println("Usage: $ java Generate <sql|mongodb> <number of items>");
 			System.exit(0);			
 		}
 
 		ApplicationContext context = new ClassPathXmlApplicationContext("classpath:app-context.xml");
 		
 	    Generate generate = context.getBean(Generate.class);
-    
+	    int numItems = Integer.parseInt(args[1]);
 	    IGenerate db = (IGenerate) context.getBean("generateMongo");
 	    String db_str = "Generating for MongoDB";
 	    if(args[0].equals("sql"))
@@ -58,6 +58,6 @@ public class Generate
 	    	db = (IGenerate) context.getBean("generateHibernate");
 	    }
 	    System.out.println(db_str);
-		generate.generate(db);
+		generate.generate(db, numItems);
 	}	
 }
\ No newline at end of file

diff --git a/src/main/java/eu/cloudscale/showcase/generate/GenerateMongo.java b/src/main/java/eu/cloudscale/showcase/generate/GenerateMongo.java
index 105367e..79ca309 100755
--- a/src/main/java/eu/cloudscale/showcase/generate/GenerateMongo.java
+++ b/src/main/java/eu/cloudscale/showcase/generate/GenerateMongo.java
@@ -169,4 +169,6 @@ public class GenerateMongo extends AGenerate
 		System.out.println( "" );
     }
 
+	
+
 }

diff --git a/src/main/java/eu/cloudscale/showcase/generate/IGenerate.java b/src/main/java/eu/cloudscale/showcase/generate/IGenerate.java
index d9e045d..ab418a8 100755
--- a/src/main/java/eu/cloudscale/showcase/generate/IGenerate.java
+++ b/src/main/java/eu/cloudscale/showcase/generate/IGenerate.java
@@ -24,4 +24,6 @@ public interface IGenerate
 	public void populateItemTable();
 	
 	public void populateOrdersAndCC_XACTSTable();
+
+	public void setNumItems(int numItems);
 }

diff --git a/src/main/java/eu/cloudscale/showcase/servlets/BuyConfirmController.java b/src/main/java/eu/cloudscale/showcase/servlets/BuyConfirmController.java
index 10de191..8c7d57a 100755
--- a/src/main/java/eu/cloudscale/showcase/servlets/BuyConfirmController.java
+++ b/src/main/java/eu/cloudscale/showcase/servlets/BuyConfirmController.java
@@ -67,7 +67,6 @@ public class BuyConfirmController extends AController
         }
         catch ( ParseException e )
         {
-	        // TODO Auto-generated catch block
 	        e.printStackTrace();
         }
 		String shipping = request.getParameter( "SHIPPING" );

diff --git a/src/main/java/eu/cloudscale/showcase/servlets/helpers/PaymentService.java b/src/main/java/eu/cloudscale/showcase/servlets/helpers/PaymentService.java
index 6a6ab1d..1ae9c78 100755
--- a/src/main/java/eu/cloudscale/showcase/servlets/helpers/PaymentService.java
+++ b/src/main/java/eu/cloudscale/showcase/servlets/helpers/PaymentService.java
@@ -40,18 +40,14 @@ public class PaymentService{
 			String body = IOUtils.toString(input, "UTF-8");
 			return new AsyncResult<String>(body);
 		} catch (MalformedURLException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		} 
 		catch (InterruptedException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		} 
 		catch (ExecutionException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		} catch (IOException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 		return null;

diff --git a/src/main/java/eu/cloudscale/showcase/servlets/PaymentController.java b/src/main/java/eu/cloudscale/showcase/servlets/PaymentController.java
index 8ea3ffd..a2c09fd 100755
--- a/src/main/java/eu/cloudscale/showcase/servlets/PaymentController.java
+++ b/src/main/java/eu/cloudscale/showcase/servlets/PaymentController.java
@@ -83,7 +83,6 @@ public class PaymentController extends AController
         }
         catch ( ParseException e )
         {
-	        // TODO Auto-generated catch block
 	        e.printStackTrace();
         }
 		String shipping = request.getParameter( "SHIPPING" );