Merge dev to master for v1.0.0-beta7 release (#134)

* Add worker.config.json (#132)
* Updating version to 1.1.0-beta7 (#133)

Author: pragnagopa

.gitignore

@@ -261,4 +261,4 @@ target/
 dependency-reduced-pom.xml
 /functions-coffee-order-demo/src/main/functions/functions-coffee-order.jar
 /functions-coffee-order-demo/src/main/arduino/.build/
-.pkg/
+pkg/

appveyor.yml

@@ -21,9 +21,6 @@ install:
   - ps: Get-Command nuget
 
 build_script:
-  - mvn clean install -DskipTests
-  - ps: mkdir .pkg
-  - ps: Get-ChildItem -Path .\target\* -Include 'azure*' -Exclude '*shaded.jar' | %{ Copy-Item $_.FullName .\.pkg\azure-functions-java-worker.jar }
   - ps: |
       $buildNumber = 0      
       if($env:APPVEYOR_REPO_TAG -eq "true") {
@@ -34,10 +31,10 @@ build_script:
        $buildNumber = "-$env:APPVEYOR_BUILD_NUMBER"
        Write-Host “git tag not found. Setting package suffix to '$buildNumber'"
       }     
-      nuget pack ./tools/AzureFunctionsJavaWorker.nuspec -Properties versionsuffix=$buildNumber
+      .\package.ps1 -buildNumber $buildNumber
 
 artifacts:
-  - path: '*.nupkg'
-  - path: 'azure-functions-java-worker/target/**.jar'
+- path: 'pkg/*.nupkg'
+
 cache:
   - C:\maven\

package.ps1

@@ -0,0 +1,16 @@
+param (
+  [string]$buildNumber = $env:APPVEYOR_BUILD_NUMBER
+)
+
+Write-Host "buildNumber: " $buildNumber
+Get-Command mvn
+Get-Command nuget
+mvn clean install -DskipTests
+remove-item pkg -Recurse -ErrorAction Ignore
+mkdir pkg
+Get-ChildItem -Path .\target\* -Include 'azure*' -Exclude '*shaded.jar' | %{ Copy-Item $_.FullName .\pkg\azure-functions-java-worker.jar }
+copy-item ./worker.config.json pkg
+copy-item ./tools/AzureFunctionsJavaWorker.nuspec pkg/
+set-location pkg
+nuget pack -Properties version=$buildNumber
+set-location ..

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.microsoft.azure.functions</groupId>
   <artifactId>azure-functions-java-worker</artifactId>
-  <version>1.1.0-beta6</version>
+  <version>1.1.0-beta7</version>
   <packaging>jar</packaging>
 
   <name>Microsoft Azure Functions Java Runtime</name>

src/main/java/com/microsoft/azure/functions/worker/handler/MessageHandler.java

@@ -50,7 +50,7 @@ public void handle() {
             status = StatusResult.Status.Failure;
             statusMessage = ex.getMessage();
             rpcException = RpcException.newBuilder().setMessage(ex.getMessage()).setStackTrace(ExceptionUtils.getStackTrace(ex)).build();
-            this.getLogger().log(Level.WARNING, statusMessage, ex);
+            this.getLogger().log(Level.SEVERE, statusMessage, ex);
         }
         if (this.responseStatusMarshaller != null) {
             StatusResult.Builder result = StatusResult.newBuilder().setStatus(status).setResult(statusMessage);

tools/AzureFunctionsJavaWorker.nuspec

@@ -4,7 +4,7 @@
     <id>Microsoft.Azure.Functions.JavaWorker</id>
     <title>Microsoft Azure Functions Java Worker</title>
     <tags>java azure-functions azure</tags>
-    <version>1.1.0-beta6$versionsuffix$</version>
+    <version>1.1.0-beta7$version$</version>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
     <projectUrl>https://github.com/Azure/azure-functions-java-worker</projectUrl>
@@ -18,6 +18,6 @@
     </contentFiles>
   </metadata>
   <files>
-    <file src="..\.pkg\**" target="contentFiles/any/any/workers/java" />
+    <file src="..\pkg\**" target="contentFiles/any/any/workers/java" />
   </files>
 </package>

tools/devdoc.md renamed to tools/README.md

@@ -14,8 +14,8 @@ To produce the build results locally, be sure you have Java, Maven, and NuGet in
 
 ```powershell
 mvn clean install -DskipTests
-mkdir .pkg
-Get-ChildItem -Path .\azure-functions-java-worker\target\* -Include 'azure*' -Exclude '*shaded.jar' | %{ Copy-Item $_.FullName .\.pkg\azure-functions-java-worker.jar }
+mkdir pkg
+Get-ChildItem -Path .\azure-functions-java-worker\target\* -Include 'azure*' -Exclude '*shaded.jar' | %{ Copy-Item $_.FullName .\pkg\azure-functions-java-worker.jar }
 nuget pack ./tools/AzureFunctionsJavaWorker.nuspec -Properties versionsuffix=LOCAL
 ```
 

worker.config.json

@@ -0,0 +1,9 @@
+{
+    "Description":{
+        "Language":"java",
+        "Extension":".jar",
+        "DefaultExecutablePath":"java",
+        "DefaultWorkerPath":"azure-functions-java-worker.jar",
+        "Arguments" : ["-jar"]
+    }
+}