[Java.Runtime.Environment] Move java-interop.jar provision responsibility

java-interop.jar MUST be within $CLASSPATH, or all manner of things
break (e.g. com.xamarin.android.ManagedPeer is required by
Java.Interop.ManagedPeer).

Previously the responsibility for providing java-interop.jar was done
whoever created JreVMBuilder, but this makes things annoying when
writing new utility programs (yet one more thing that needs to be
specified).

Change the Java.Runtime.Environment.csproj so it's a "normal" Library
project (PCL is getting annoying now), add a JreVMBuilder.ClassPath
collection property, and auto-add "java-interop.jar" to the
JreVMBuilder.ClassPath property.

For good measure, provide the *full path* to java-interop.jar as well,
so that the current working directory when running apps doesn't need
to be the bin/$(CONFIGURATION) directory (otherwise the JDK can't find
java-interop.jar).

Author: jonpryor

src/Java.Runtime.Environment/Java.Interop/JreVM.cs

@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 
@@ -25,9 +27,16 @@ public class JreVMBuilder : JavaVMOptions {
 		public  JniVersion  JniVersion                  {get; set;}
 		public  bool        IgnoreUnrecognizedOptions   {get; set;}
 
+		public  Collection<string>  ClassPath           {get; private set;}
+
 		public JreVMBuilder ()
 		{
 			JniVersion  = JniVersion.v1_2;
+			ClassPath   = new Collection<string> () {
+				Path.Combine (
+					Path.GetDirectoryName (typeof (JreVMBuilder).Assembly.Location),
+					"java-interop.jar"),
+			};
 		}
 
 		public JreVMBuilder AddOption (string option)
@@ -42,6 +51,8 @@ public JreVMBuilder AddSystemProperty (string name, string value)
 				throw new ArgumentNullException ("name");
 			if (value == null)
 				throw new ArgumentNullException ("value");
+			if (name == "java.class.path")
+				throw new ArgumentException ("Do not use AddSystemProperty() for the 'java.class.path' property. Add to the ClassPath collection instead.", "name");
 			Options.Add (string.Format ("-D{0}={1}", name, value));
 			return this;
 		}
@@ -108,13 +119,15 @@ static unsafe JreVMBuilder CreateJreVM (JreVMBuilder builder)
 
 			var args = new JavaVMInitArgs () {
 				version             = builder.JniVersion,
-				nOptions            = builder.Options.Count,
+				nOptions            = builder.Options.Count + 1,
 				ignoreUnrecognized  = builder.IgnoreUnrecognizedOptions ? (byte) 1 : (byte) 0,
 			};
-			var options = new JavaVMOption [builder.Options.Count];
+			var options = new JavaVMOption [builder.Options.Count + 1];
 			try {
-				for (int i = 0; i < options.Length; ++i)
+				for (int i = 0; i < builder.Options.Count; ++i)
 					options [i].optionString = Marshal.StringToHGlobalAnsi (builder.Options [i]);
+				var classPath   = Marshal.StringToHGlobalAnsi (string.Format ("-Djava.class.path={0}", string.Join (Path.PathSeparator.ToString (), builder.ClassPath)));
+				options [builder.Options.Count].optionString = classPath;
 				fixed (JavaVMOption* popts = options) {
 					args.options = (IntPtr) popts;
 					JavaVMSafeHandle            javavm;

src/Java.Runtime.Environment/Java.Runtime.Environment.csproj

@@ -6,12 +6,10 @@
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5887B410-D448-4257-A46B-EAC03C80BE93}</ProjectGuid>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <RootNamespace>Java.Interop</RootNamespace>
     <AssemblyName>Java.Runtime.Environment</AssemblyName>
-    <TargetFrameworkProfile>Profile6</TargetFrameworkProfile>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -39,7 +37,10 @@
     <Compile Include="Java.Interop\JniRuntime.cs" />
     <Compile Include="Java.Interop\JreVM.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <ProjectReference Include="..\Java.Interop\Java.Interop.csproj">
       <Project>{94BD81F7-B06F-4295-9636-F8A3B6BDC762}</Project>

tests/TestJVM/TestJVM.cs

@@ -221,10 +221,10 @@ public class TestJVM : JreVM {
 		static JreVMBuilder CreateBuilder (string[] jars)
 		{
 			var builder = new JreVMBuilder ();
-			var _jars   = new List<string> (jars ?? new string [0]) {
-				"java-interop.jar",
-			};
-			builder.AddSystemProperty ("java.class.path", string.Join (":", _jars));
+			if (jars != null) {
+				foreach (var jar in jars)
+					builder.ClassPath.Add (jar);
+			}
 
 			TextWriter  grefLog = null;
 			TextWriter  lrefLog = null;;