[FAB-9407]: Extract JavaCC shim protos

This commit moves out proto definition files out of the shim subproject
into indendepent subproject, while providing compile time dependcies to
link both subprojects. In addition rename shim subproject into
fabric-chaincode-shim to align with maven publishable artifact name,
thus supporting `./gradlew clean build install`, making it to push into
.m2 artifact with correct file name (same as nexus).

Change-Id: Id14152a6f60165805bc85c6b45cfeb571642b1ca
Signed-off-by: Artem Barger <bartem@il.ibm.com>

Author: C0rWin

.gitignore

@@ -1,8 +1,39 @@
-/.gradle/
 /.settings/
 /.project
-/.idea
-*.iml
 *.log
 *.swp
 .gradletasknamecache
+.classpath
+/bin/
+/build/
+build/*
+
+.gradle
+/build/
+out/
+!gradle/wrapper/gradle-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+
+local-config.yaml
+gradle.properties

build.gradle

@@ -8,28 +8,28 @@ apply plugin: 'idea'
 apply plugin: 'eclipse-wtp'
 
 allprojects {
-	repositories {
-                mavenLocal()
-		jcenter()
-	}
+    repositories {
+        mavenLocal()
+        jcenter()
+    }
 }
 
 subprojects {
-        apply plugin: 'java'
-        apply plugin: 'maven'
+    apply plugin: 'java'
+    apply plugin: 'maven'
 
-	group = "org.hyperledger.fabric"
-	version = '1.2.0-SNAPSHOT'
+    group = "org.hyperledger.fabric"
+    version = '1.2.0-SNAPSHOT'
 
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+    sourceCompatibility = 1.8
+    targetCompatibility = 1.8
 
-        dependencies {
-            compile 'commons-cli:commons-cli:1.4'
-            compile 'commons-logging:commons-logging:1.2'
+    dependencies {
+        compile 'commons-cli:commons-cli:1.4'
+        compile 'commons-logging:commons-logging:1.2'
 
-            testCompile 'junit:junit:4.12'
-            testCompile 'org.hamcrest:hamcrest-library:1.3'
-            testCompile 'org.mockito:mockito-core:2.+'
-        }
+        testCompile 'junit:junit:4.12'
+        testCompile 'org.hamcrest:hamcrest-library:1.3'
+        testCompile 'org.mockito:mockito-core:2.+'
+    }
 }

fabric-chaincode-protos/build.gradle

@@ -0,0 +1,60 @@
+/*
+ * Copyright IBM Corp. 2017 All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+apply plugin: 'com.google.protobuf'
+
+repositories {
+    maven { url "https://plugins.gradle.org/m2/" }
+}
+
+buildscript {
+    repositories {
+        maven { url "https://plugins.gradle.org/m2/" }
+    }
+    dependencies {
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.5'
+    }
+}
+
+dependencies {
+    compile 'com.google.protobuf:protobuf-java:3.0.0'
+    compile 'com.google.protobuf:protobuf-java-util:3.0.0'
+    compile 'io.grpc:grpc-netty:1.6.1'
+    compile 'io.grpc:grpc-protobuf:1.6.1'
+    compile 'io.grpc:grpc-stub:1.6.1'
+}
+
+protobuf {
+    protoc {
+        // download the protobuf compiler
+        artifact = 'com.google.protobuf:protoc:3.0.0'
+    }
+    plugins {
+        // define grpc plugin for the protobuf compiler
+        grpc {
+            artifact = 'io.grpc:protoc-gen-grpc-java:1.6.1'
+        }
+    }
+    generateProtoTasks {
+        all()*.plugins {
+            // apply the grpc plugin for the protobuf compiler
+            grpc {}
+        }
+    }
+
+    generatedFilesBaseDir = "$projectDir/src"
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs = ['src/main/java', 'src/main/grpc']
+        }
+        proto {
+            srcDirs 'src/main/proto'
+        }
+    }
+}