From 0121bc588e93461bddd977cec86f9d4800d2346a Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 22 Aug 2017 13:15:28 +0200 Subject: [PATCH] Remove remnants of proto generation This README and shell script are no longer relevant, as we do not have any .proto files. Change-Id: If3f6204c5d9e607b66a5eed3ecea56e5b5294023 Signed-off-by: Robert Varga --- .../md-sal/sal-akka-raft/README-FIRST | 28 ------------- opendaylight/md-sal/sal-akka-raft/run.sh | 42 ------------------- .../sal-clustering-commons/README-FIRST | 32 -------------- .../md-sal/sal-clustering-commons/run.sh | 41 ------------------ 4 files changed, 143 deletions(-) delete mode 100644 opendaylight/md-sal/sal-akka-raft/README-FIRST delete mode 100755 opendaylight/md-sal/sal-akka-raft/run.sh delete mode 100644 opendaylight/md-sal/sal-clustering-commons/README-FIRST delete mode 100755 opendaylight/md-sal/sal-clustering-commons/run.sh diff --git a/opendaylight/md-sal/sal-akka-raft/README-FIRST b/opendaylight/md-sal/sal-akka-raft/README-FIRST deleted file mode 100644 index d0be2cbcbb..0000000000 --- a/opendaylight/md-sal/sal-akka-raft/README-FIRST +++ /dev/null @@ -1,28 +0,0 @@ -Instructions on generating the protocol buffer Java source files - -These instructions are developers who are planning to generate the protocolbuffer java source files. - -1. We are using protocol buffer version 2.5.0 - you need to install the exact same version on your box. -The download link is https://code.google.com/p/protobuf/downloads/list. Download .tar/zip based on -your OS. - -2. Once downloaded the tar/zip and extracted follow the README instructions to compile protoc on your -machine - -3. Create your .proto (IDL) file in resources folder. Give appropriate package name so that the source - get generation in proper packages. For more information check - https://developers.google.com/protocol-buffers/docs/javatutorial - - For detailed information https://developers.google.com/protocol-buffers/docs/reference/java-generated - -4. To generate the java source files execute in sal-protocolbuffer-encoding directory - just run.sh in sal-protocolbuffer-encoding or execute the following command - - protoc --proto_path=src/main/resources --java_out=src/main/java src/main/resources/*.proto - -5. Run mvn clean install & build the .jar - -6. !!!WARNING!!! - never edit the generated sources files of protocol buffer - -7. !!!NOTE!!! if you are planning to add new .proto file option java_package should begin with - org.opendaylight.controller.protobuff.messages to properly exclude from sonar. diff --git a/opendaylight/md-sal/sal-akka-raft/run.sh b/opendaylight/md-sal/sal-akka-raft/run.sh deleted file mode 100755 index 7c588f0922..0000000000 --- a/opendaylight/md-sal/sal-akka-raft/run.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -##################################################################################################### -#Instructions on generating the protocol buffer Java source files -# -#These instructions are developers who are planning to generate the protocolbuffer java source files. -# -#1. We are using protocol buffer version 2.5.0 - you need to install the exact same version on your box. -#The download link is https://code.google.com/p/protobuf/downloads/list. Download .tar/zip based on -#your OS. -# -#2. Once downloaded the tar/zip and extracted follow the README instructions to compile protoc on your -#machine -# -#3. Create your .proto (IDL) file in resources folder. Give appropriate package name so that the source -# get generation in proper packages. For more information check -# https://developers.google.com/protocol-buffers/docs/javatutorial -# -# For detailed information https://developers.google.com/protocol-buffers/docs/reference/java-generated -# -#4. To generate the java source files execute in sal-protocolbuffer-encoding execute ./run.sh i.e. this script -# or run command -# protoc --proto_path=src/main/resources --java_out=src/main/java src/main/resources/*.proto -# -#5. Run mvn clean install & build the .jar -# -#6 !!!WARNING!!!! never edit the source files generated -# -#7. !!!NOTE!!! if you are planning to add new .proto file option java_package should begin with -# org.opendaylight.controller.protobuff.messages to properly exclude from sonar. -######################################################################################################## - -protoc --proto_path=src/main/resources --java_out=src/main/java src/main/resources/*.proto - -protoc --proto_path=src/main/resources --proto_path=src/test/resources --java_out=src/test/java src/test/resources/*.proto - -echo "Done generating Java source files." - -#to remove trailing spaces in the code files -find src/main/java -type f -name '*.java' -exec sed --in-place 's/[[:space:]]\+$//' {} \+ - -find src/test/java -type f -name '*.java' -exec sed --in-place 's/[[:space:]]\+$//' {} \+ diff --git a/opendaylight/md-sal/sal-clustering-commons/README-FIRST b/opendaylight/md-sal/sal-clustering-commons/README-FIRST deleted file mode 100644 index 4791979c17..0000000000 --- a/opendaylight/md-sal/sal-clustering-commons/README-FIRST +++ /dev/null @@ -1,32 +0,0 @@ -Instructions on generating the protocol buffer Java source files - -These instructions are developers who are planning to generate the protocolbuffer java source files. - -1. We are using protocol buffer version 2.5.0 - you need to install the exact same version on your box. -The download link is https://code.google.com/p/protobuf/downloads/list. Download .tar/zip based on -your OS. - -2. Once downloaded the tar/zip and extracted follow the README instructions to compile protoc on your -machine - -3. Create your .proto (IDL) file in resources folder. Give appropriate package name so that the source - get generation in proper packages. For more information check - https://developers.google.com/protocol-buffers/docs/javatutorial - - For detailed information https://developers.google.com/protocol-buffers/docs/reference/java-generated - -4. To generate the java source files execute in sal-protocolbuffer-encoding directory - just run.sh in sal-protocolbuffer-encoding or execute the following command - - protoc --proto_path=src/main/resources --java_out=src/main/java src/main/resources/*.proto - -5. Run mvn clean install & build the .jar - -6. !!!WARNING!!! - never edit the generated sources files of protocol buffer - -7. !!!IMPORTANT!!! if you are planning to add new .proto file option java_package should begin with - org.opendaylight.controller.protobuff.messages to properly exclude from sonar. - -8. !!!IMPORTANT!!! for any new .proto file added you need to create corresponding version-compatibility-serialized-data - serialized test file under test/resources and a test case for one message in your .proto file. - Please follow the instruction in readme.txt in that folder diff --git a/opendaylight/md-sal/sal-clustering-commons/run.sh b/opendaylight/md-sal/sal-clustering-commons/run.sh deleted file mode 100755 index d3d0324fa0..0000000000 --- a/opendaylight/md-sal/sal-clustering-commons/run.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -##################################################################################################### -#Instructions on generating the protocol buffer Java source files -# -#These instructions are developers who are planning to generate the protocolbuffer java source files. -# -#1. We are using protocol buffer version 2.5.0 - you need to install the exact same version on your box. -#The download link is https://code.google.com/p/protobuf/downloads/list. Download .tar/zip based on -#your OS. -# -#2. Once downloaded the tar/zip and extracted follow the README instructions to compile protoc on your -#machine -# -#3. Create your .proto (IDL) file in resources folder. Give appropriate package name so that the source -# get generation in proper packages. For more information check -# https://developers.google.com/protocol-buffers/docs/javatutorial -# -# For detailed information https://developers.google.com/protocol-buffers/docs/reference/java-generated -# -#4. To generate the java source files execute in sal-protocolbuffer-encoding execute ./run.sh i.e. this script -# or run command -# protoc --proto_path=src/main/resources --java_out=src/main/java src/main/resources/*.proto -# -#5. Run mvn clean install & build the .jar -# -#6 !!!WARNING!!!! never edit the source files generated -# -#7. !!!NOTE!!! if you are planning to add new .proto file option java_package should begin with -# org.opendaylight.controller.protobuff.messages to properly exclude from sonar. -######################################################################################################## - -protoc --proto_path=src/main/resources --proto_path=../sal-akka-raft/src/main/resources --java_out=src/main/java src/main/resources/*.proto - -echo "Done generating Java source files." - -#to remove trailing spaces in the code files -find src/main/java -type f -name '*.java' -exec sed --in-place 's/[[:space:]]\+$//' {} \+ - -#to remove trailing spaces in the generated code on OSX -find src/main/java -type f -print0 |xargs -0 perl -pi -e 's/ +$//' -- 2.36.6