Merge pull request #59 from aalexandrov/fix_dropin_libs

Fixed bad assembly of dropin libs in the stratosphere-bin shell scripts.

stratosphere-dist/src/main/stratosphere-bin/bin/nephele-jobmanager.sh

@@ -48,9 +48,10 @@ constructJobManagerClassPath() {
 		fi
 	done
 
-	for jarfile in $NEPHELE_LIB_DIR/dropins/*.jar ; do
+	for jarfile in $NEPHELE_LIB_DIR/dropin/*.jar ; do
 		NEPHELE_JM_CLASSPATH=$NEPHELE_JM_CLASSPATH:$jarfile
 	done
+	NEPHELE_JM_CLASSPATH=$NEPHELE_JM_CLASSPATH:$NEPHELE_LIB_DIR/dropin/
 
 	echo $NEPHELE_JM_CLASSPATH
 }

stratosphere-dist/src/main/stratosphere-bin/bin/nephele-taskmanager.sh

@@ -41,9 +41,10 @@ constructTaskManagerClassPath() {
 		fi
 	done
 
-	for jarfile in $NEPHELE_LIB_DIR/dropins/*.jar ; do
+	for jarfile in $NEPHELE_LIB_DIR/dropin/*.jar ; do
 		NEPHELE_TM_CLASSPATH=$NEPHELE_TM_CLASSPATH:$jarfile
 	done
+	NEPHELE_TM_CLASSPATH=$NEPHELE_TM_CLASSPATH:$NEPHELE_LIB_DIR/dropin/
 
 	echo $NEPHELE_TM_CLASSPATH
 }

stratosphere-dist/src/main/stratosphere-bin/bin/pact-client.sh

@@ -40,9 +40,10 @@ constructPactCLIClientClassPath() {
 		fi
 	done
 
-	for jarfile in $NEPHELE_LIB_DIR/dropins/*.jar ; do
+	for jarfile in $NEPHELE_LIB_DIR/dropin/*.jar ; do
 		PACT_CC_CLASSPATH=$PACT_CC_CLASSPATH:$jarfile
 	done
+	PACT_CC_CLASSPATH=$PACT_CC_CLASSPATH:$NEPHELE_LIB_DIR/dropin/
 	
 	for jarfile in $NEPHELE_LIB_CLIENTS_DIR/*.jar ; do
 		PACT_CC_CLASSPATH=$PACT_CC_CLASSPATH:$jarfile

stratosphere-dist/src/main/stratosphere-bin/bin/pact-webfrontend.sh

@@ -46,12 +46,13 @@ constructPactWebFrontendClassPath() {
 		fi
 	done
 
-	for jarfile in $NEPHELE_LIB_DIR/dropins/*.jar ; do
+	for jarfile in $NEPHELE_LIB_DIR/dropin/*.jar ; do
 		PACT_WF_CLASSPATH=$PACT_WF_CLASSPATH:$jarfile
 	done
+	PACT_WF_CLASSPATH=$PACT_WF_CLASSPATH:$NEPHELE_LIB_DIR/dropin/
 	
 	for jarfile in $NEPHELE_LIB_CLIENTS_DIR/*.jar ; do
-		PACT_CC_CLASSPATH=$PACT_CC_CLASSPATH:$jarfile
+		PACT_WF_CLASSPATH=$PACT_WF_CLASSPATH:$jarfile
 	done
 
 	echo $PACT_WF_CLASSPATH