diff --git a/.gitignore b/.gitignore
index 9c577f51ad..89c62e4730 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,4 +18,6 @@ out
build-local.properties
deps
/bin
+build
+.gradle
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000000..0a9240456a
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,215 @@
+/*
+ * Copyright 2015 Real Logic Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+apply plugin: 'java'
+apply plugin: 'maven'
+apply plugin: 'signing'
+apply plugin: 'checkstyle'
+apply plugin: 'eclipse'
+
+defaultTasks 'clean', 'build', 'install'
+
+group = 'uk.co.real-logic'
+version = '1.0.4-RC2-SNAPSHOT'
+
+ext {
+ if (!project.hasProperty('ossrhUsername'))
+ ossrhUsername = ''
+
+ if (!project.hasProperty('ossrhPassword'))
+ ossrhPassword = ''
+}
+
+repositories {
+ mavenCentral()
+}
+
+[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
+
+def generatedDir = "${project.buildDir}/generated"
+
+sourceSets {
+ main {
+ java {
+ srcDir 'main/java'
+ }
+ resources {
+ srcDir 'main/resources'
+ }
+ }
+
+ test {
+ java {
+ srcDir 'test/java'
+ }
+ resources {
+ srcDir 'test/resources'
+ }
+ }
+
+ generated.java.srcDir generatedDir
+
+ examples.java.srcDir 'examples/java'
+}
+
+dependencies {
+ testCompile 'org.hamcrest:hamcrest-all:1.3',
+ 'junit:junit:4.11',
+ 'org.mockito:mockito-all:1.9.5',
+ 'com.google.code.gson:gson:2.3.1'
+}
+
+sourceCompatibility = 1.7
+targetCompatibility = 1.7
+
+tasks.withType(JavaCompile) {
+ // Suppress warnings about using Unsafe and sun.misc
+ options.compilerArgs << '-XDignore.symbol.file' << '-Xlint:unchecked'
+ options.debug = true
+ options.fork = true
+ options.forkOptions.executable = 'javac'
+ options.warnings = false
+}
+
+compileGeneratedJava.dependsOn 'generateExampleCodecs'
+compileExamplesJava.dependsOn 'compileGeneratedJava'
+compileGeneratedJava.classpath += sourceSets.main.runtimeClasspath
+compileExamplesJava.classpath += sourceSets.generated.runtimeClasspath + sourceSets.main.runtimeClasspath
+
+task (generateExampleCodecs, dependsOn: 'test', type: JavaExec) {
+ main = 'uk.co.real_logic.sbe.SbeTool'
+ classpath = sourceSets.main.runtimeClasspath
+ systemProperties('sbe.output.dir': generatedDir,
+ 'sbe.target.language': 'Java',
+ 'sbe.validation.stop.on.error': 'true',
+ 'sbe.validation.xsd': 'main/resources/fpl/SimpleBinary1-0.xsd')
+ args 'examples/resources/example-schema.xml', 'examples/resources/example-extension-schema.xml'
+}
+
+task (runExampleUsingGeneratedStub, dependsOn: 'compileExamplesJava', type: JavaExec) {
+ classpath = sourceSets.examples.runtimeClasspath + compileExamplesJava.classpath
+ main = 'uk.co.real_logic.sbe.examples.ExampleUsingGeneratedStub'
+}
+
+task (runExampleUsingGeneratedStubExtension, dependsOn: 'compileExamplesJava', type: JavaExec) {
+ classpath = sourceSets.examples.runtimeClasspath + compileExamplesJava.classpath
+ main = 'uk.co.real_logic.sbe.examples.ExampleUsingGeneratedStubExtension'
+}
+
+task (runOtfExample, dependsOn: 'compileExamplesJava', type: JavaExec) {
+ classpath = sourceSets.examples.runtimeClasspath + compileExamplesJava.classpath
+ main = 'uk.co.real_logic.sbe.examples.OtfExample'
+}
+
+task runJavaExamples {
+ description 'Run Java Examples'
+ dependsOn 'runExampleUsingGeneratedStub', 'runExampleUsingGeneratedStubExtension', 'runOtfExample'
+}
+
+checkstyle {
+ configFile = new File(rootDir, 'config/checkstyle.xml')
+ toolVersion = 5.9
+}
+
+javadoc {
+ title = 'Simple Binary Encoding
'
+
+ options.bottom = 'Copyright © 2014-2015 Real Logic Ltd. All Rights Reserved.'
+ options.addStringOption('XDignore.symbol.file', '-quiet')
+}
+
+jar {
+ manifest.attributes('Main-Class': 'uk.co.real_logic.sbe.SbeTool')
+}
+
+task sourcesJar(type: Jar) {
+ classifier = 'sources'
+ from sourceSets.main.allSource
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+ classifier = 'javadoc'
+ from javadoc.destinationDir
+}
+
+signing {
+ sign configurations.archives
+}
+
+artifacts {
+ archives sourcesJar, javadocJar
+}
+
+uploadArchives {
+ repositories {
+ mavenDeployer {
+ beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+
+ repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+ authentication(userName: ossrhUsername, password: ossrhPassword)
+ }
+
+ snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
+ authentication(userName: ossrhUsername, password: ossrhPassword)
+ }
+
+ pom.project {
+ name = 'sbe'
+ packaging = 'jar'
+ // optionally artifactId can be defined here
+ description = 'FIX/SBE - OSI layer 6 presentation for encoding and decoding application messages in binary format for low-latency applications'
+ url = 'https://github.com/real-logic/simple-binary-encoding'
+
+ scm {
+ connection = 'scm:git:github.com/real-logic/simple-binary-encoding.git'
+ developerConnection = 'scm:git:github.com/real-logic/simple-binary-encoding.git'
+ url = 'github.com/real-logic/simple-binary-encoding.git'
+ }
+
+ licenses {
+ license {
+ name = 'The Apache License, Version 2.0'
+ url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+ }
+ }
+
+ developers {
+ developer {
+ id = 'tmontgomery'
+ name = 'Todd L. Montgomery'
+ email = 'tmont@nard.net'
+ url = 'https://github.com/tmontgomery'
+ }
+ developer {
+ id = 'mjpt777'
+ name = 'Martin Thompson'
+ email = 'mjpt777@gmail.com'
+ url = 'https://github.com/mjpt777'
+ }
+ developer {
+ id = 'odeheurles'
+ name = 'Olivier Deheurles'
+ email = 'olivier@weareadaptive.com'
+ url = 'https://github.com/odeheurles'
+ }
+ }
+ }
+ }
+ }
+}
+
+task wrapper(type: Wrapper) {
+ gradleVersion = '2.2'
+}
diff --git a/build.xml b/build.xml
index 2f49192e56..51c5e5b777 100644
--- a/build.xml
+++ b/build.xml
@@ -46,7 +46,7 @@
-
+
diff --git a/test/conf/checkstyle.xml b/config/checkstyle.xml
similarity index 100%
rename from test/conf/checkstyle.xml
rename to config/checkstyle.xml
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000..2322723c7e
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000..4f05564e9e
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Fri Jan 16 09:39:48 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2-bin.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000000..91a7e269e1
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000000..8a0b282aa6
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java b/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java
index 44701df8ed..3545a587fb 100644
--- a/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java
+++ b/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java
@@ -1003,7 +1003,7 @@ private CharSequence generateArrayProperty(
indent + " if (dstOffset < 0 || dstOffset > (dst.length - length))\n" +
indent + " {\n" +
indent + " throw new IndexOutOfBoundsException(" +
- indent + " \"dstOffset out of range for copy: offset=\" + dstOffset);\n" +
+ indent + "\"dstOffset out of range for copy: offset=\" + dstOffset);\n" +
indent + " }\n\n" +
"%s" +
indent + " CodecUtil.charsGet(buffer, this.offset + %d, dst, dstOffset, length);\n" +
@@ -1022,7 +1022,7 @@ private CharSequence generateArrayProperty(
indent + " if (srcOffset < 0 || srcOffset > (src.length - length))\n" +
indent + " {\n" +
indent + " throw new IndexOutOfBoundsException(" +
- indent + " \"srcOffset out of range for copy: offset=\" + srcOffset);\n" +
+ indent + "\"srcOffset out of range for copy: offset=\" + srcOffset);\n" +
indent + " }\n\n" +
indent + " CodecUtil.charsPut(buffer, this.offset + %d, src, srcOffset, length);\n" +
indent + " return this;\n" +
@@ -1076,8 +1076,8 @@ private CharSequence generateConstPropertyMethods(final String propertyName, fin
sb.append(String.format(
"\n" +
- indent + " private static final byte[] %sValue = {%s};\n",
- propertyName,
+ indent + " private static final byte[] %s_VALUE = {%s};\n",
+ propertyName.toUpperCase(),
values
));
@@ -1094,23 +1094,23 @@ private CharSequence generateConstPropertyMethods(final String propertyName, fin
sb.append(String.format(
indent + " public %s %s(final int index)\n" +
indent + " {\n" +
- indent + " return %sValue[index];\n" +
+ indent + " return %s_VALUE[index];\n" +
indent + " }\n\n",
javaTypeName,
propertyName,
- propertyName
+ propertyName.toUpperCase()
));
sb.append(String.format(
indent + " public int get%s(final byte[] dst, final int offset, final int length)\n" +
indent + " {\n" +
indent + " final int bytesCopied = Math.min(length, %d);\n" +
- indent + " System.arraycopy(%sValue, 0, dst, offset, bytesCopied);\n" +
+ indent + " System.arraycopy(%s_VALUE, 0, dst, offset, bytesCopied);\n" +
indent + " return bytesCopied;\n" +
indent + " }\n",
toUpperFirstChar(propertyName),
Integer.valueOf(constantValue.length),
- propertyName
+ propertyName.toUpperCase()
));
return sb;
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000000..1a2777c9ec
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'sbe'