Merge branch 'develop' of github.com:bendisposto/prob into develop

de.prob.core/META-INF/MANIFEST.MF

@@ -63,4 +63,4 @@ Eclipse-BuddyPolicy: registered
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: .,
  lib/probcliparser.jar,
- lib/commons-lang-2.4.jar
+ lib/dependencies/commons-lang-2.4.jar

de.prob.core/build.gradle

+apply plugin: 'java'
+
+repositories {
+	maven {
+	  name "cobra"
+	  url "http://cobra.cs.uni-duesseldorf.de/artifactory/repo"
+	}
+}
+
+
+def parser_version = '2.4.8-SNAPSHOT'
+
+dependencies {
+ compile group: "de.prob", name: "answerparser", version: parser_version , changing: true
+ compile group: "de.prob", name: "bparser", version: parser_version , changing: true
+ compile group: "de.prob", name: "cliparser", version: parser_version , changing: true
+ compile group: "de.prob", name: "ltlparser", version: parser_version , changing: true
+ compile group: "de.prob", name: "parserbase", version: parser_version , changing: true
+ compile group: "de.prob", name: "prologlib", version: parser_version , changing: true
+ compile group: "de.prob", name: "unicode", version: parser_version , changing: true
+ compile 'jgrapht:jgrapht:0.8.3'
+ compile 'commons-lang:commons-lang:2.6'
+}
\ No newline at end of file

de.prob.core/build.properties

@@ -4,6 +4,6 @@ bin.includes = META-INF/,\
                plugin.xml,\
                .,\
                lib/probcliparser.jar,\
-               lib/commons-lang-2.4.jar,\
+               lib/dependencies/commons-lang-2.4.jar,\
                prob/
 

de.prob.releng/build.gradle

 
 targetRepositories = ["http://cobra.cs.uni-duesseldorf.de/prob_dev_target/","http://download.eclipse.org/releases/indigo/"]	
 
-apply from: 'http://cobra.cs.uni-duesseldorf.de/artifactory//plugins-snapshot-local/tycho_build-SNAPSHOT.gradle'
+apply from: 'tycho_build.gradle'
 
 // Local tasks
+
+project(':de.prob.core') {
+
+	repositories {
+	    mavenCentral()
+	}
+	dependencies {
+		compile group: 'commons-lang', name: 'commons-lang', version: '2.4'
+	}	
+	
+}
+
+
 def download(address,target) {
 	    def file = new FileOutputStream(target)
 	    def out = new BufferedOutputStream(file)

de.prob.releng/tycho_build.gradle

@@ -10,6 +10,13 @@ try{
 	workspacePath = "../"
 }
 
+
+try{
+	dependencyFolder = dependencyFolder
+}catch(MissingPropertyException e){
+	dependencyFolder = "lib/dependencies/"			// Folder in each subproject where 
+}
+
 try{
 	groupID = groupID
 }catch(MissingPropertyException e){
@@ -114,6 +121,8 @@ def groupId(){
 */
 
 
+
+
 /////////////////////////////////////////////////////////////////////////////////////////
 //		--	!!! 				DEFINING SUB PROJECTS 							!!!	-- //
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -121,11 +130,22 @@ def groupId(){
 subprojects {
 	
 	apply plugin: 'base'
+	apply plugin: 'java'
 	
 	task deleteArtifacts(type: Delete) {
   		delete 'target','pom.xml'
 	}
 	
+	/////				Copy Dependencies into subprojects DependencyFolder 				///// 
+	task collectDependencies(type: Copy){
+
+		   	from configurations.compile
+	   	
+			into "../"+workspacePath+project.name+"/${dependencyFolder}" 					
+			
+	}
+	////////////////////////////////////////////////////////////////////////////////////////////	
+	
 	task deploy() <<{
 		description = "\tGenerating the Tycho Poms. Please remember to add a '.qualifier' to the version numbers!"
 
@@ -295,6 +315,12 @@ task install(dependsOn: [createPoms] , type:Exec) {
 	commandLine 'mvn', 'install', '-f', workspacePath+parentID+'/pom.xml'
 }
 
+task completeInstall(dependsOn: [subprojects.collectDependencies, createPoms], type:Exec ){
+	
+	description = "\tCopies dependencies into dependencyFolder of each subproject and executes a 'mvn install' of the parent pom.xml and auto-generates Tycho Poms"
+	commandLine 'mvn', 'install', '-f', workspacePath+parentID+'/pom.xml'
+}
+
 
 //---     Defining Tycho POM parts			--//