From 0f82448726cb0de66d621e3703a93c17023bf5e6 Mon Sep 17 00:00:00 2001
From: Ivan Migalev <ivan.migalev@jetbrains.com>
Date: Sun, 17 Nov 2019 18:02:01 +0700
Subject: [PATCH] Move JNA library to the com.microsoft.tfs.jni module

---
 build/modules/clc/build.xml                         |   1 +
 build/modules/sdk/build.xml                         |   1 +
 source/com.microsoft.tfs.core/.classpath            |   2 --
 source/com.microsoft.tfs.core/META-INF/MANIFEST.MF  |   2 --
 source/com.microsoft.tfs.core/build.properties      |   2 --
 source/com.microsoft.tfs.jni/.classpath             |   2 ++
 source/com.microsoft.tfs.jni/META-INF/MANIFEST.MF   |   4 +++-
 source/com.microsoft.tfs.jni/build.properties       |   2 ++
 .../libs/jna/jna-4.2.1.jar                          | Bin
 .../libs/jna/jna-platform-4.2.1.jar                 | Bin
 10 files changed, 9 insertions(+), 7 deletions(-)
 rename source/{com.microsoft.tfs.core => com.microsoft.tfs.jni}/libs/jna/jna-4.2.1.jar (100%)
 rename source/{com.microsoft.tfs.core => com.microsoft.tfs.jni}/libs/jna/jna-platform-4.2.1.jar (100%)

diff --git a/build/modules/clc/build.xml b/build/modules/clc/build.xml
index dc5e54cac..f39aae47c 100644
--- a/build/modules/clc/build.xml
+++ b/build/modules/clc/build.xml
@@ -127,6 +127,7 @@
 			<fileset dir="${dir.global.build.source}/com.microsoft.tfs.core/libs" includes="**/*.jar" />
 			<fileset dir="${dir.global.build.source}/com.microsoft.tfs.core.httpclient/libs" includes="**/*.jar" />
 			<fileset dir="${dir.global.build.source}/com.microsoft.tfs.logging/lib" includes="**/*.jar" />
+			<fileset dir="${dir.global.build.source}/com.microsoft.tfs.jni/libs" includes="**/*.jar" />
 		</copy>
 
 		<!-- copy plugin jars -->
diff --git a/build/modules/sdk/build.xml b/build/modules/sdk/build.xml
index 20868e7e3..f3327b23d 100644
--- a/build/modules/sdk/build.xml
+++ b/build/modules/sdk/build.xml
@@ -20,6 +20,7 @@
         <!-- copy core dependency jars -->
         <copy todir="${dir.binaries}/${name.dist-directory.sdk}/redist/lib" flatten="true">
             <fileset dir="${dir.global.build.output.plugins}/com.microsoft.tfs.core/libs" includes="**/*.jar" />
+            <fileset dir="${dir.global.build.output.plugins}/com.microsoft.tfs.jni/libs" includes="**/*.jar" />
         </copy>
 
         <!-- copy dependent plugin jars -->
diff --git a/source/com.microsoft.tfs.core/.classpath b/source/com.microsoft.tfs.core/.classpath
index 04e725587..74e9b2f6e 100644
--- a/source/com.microsoft.tfs.core/.classpath
+++ b/source/com.microsoft.tfs.core/.classpath
@@ -40,8 +40,6 @@
 			<attribute name="javadoc_location" value="jar:platform:/resource/com.microsoft.tfs.core/libs_src/jackson-core-2.4.1/jackson-databind-2.4.1-javadoc.jar!/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="libs/jna/jna-4.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/jna/jna-platform-4.2.1.jar"/>
 	<classpathentry kind="lib" path="libs/jsr305-1.3.9/jsr305-1.3.9.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/oauth2-useragent/oauth2-useragent-0.11.2.jar" sourcepath="libs/oauth2-useragent/oauth2-useragent-0.11.2-sources.jar"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/source/com.microsoft.tfs.core/META-INF/MANIFEST.MF b/source/com.microsoft.tfs.core/META-INF/MANIFEST.MF
index 8abc8c89e..fc3fedfdf 100644
--- a/source/com.microsoft.tfs.core/META-INF/MANIFEST.MF
+++ b/source/com.microsoft.tfs.core/META-INF/MANIFEST.MF
@@ -25,8 +25,6 @@ Bundle-ClassPath: com.microsoft.tfs.core.jar,
  libs/jackson-core-2.4.1/jackson-core-2.4.1.jar,
  libs/jackson-core-2.4.1/jackson-databind-2.4.1.jar,
  libs/annotation-detector-3.0.4/annotation-detector-3.0.4.jar,
- libs/jna/jna-4.2.1.jar,
- libs/jna/jna-platform-4.2.1.jar,
  libs/slf4j/slf4j-api-1.7.19.jar,
  libs/slf4j/slf4j-log4j12-1.7.19.jar,
  libs/oauth2-useragent/oauth2-useragent-0.11.2.jar,
diff --git a/source/com.microsoft.tfs.core/build.properties b/source/com.microsoft.tfs.core/build.properties
index 5cfb6866c..67892b32a 100644
--- a/source/com.microsoft.tfs.core/build.properties
+++ b/source/com.microsoft.tfs.core/build.properties
@@ -17,8 +17,6 @@ bin.includes = META-INF/,\
                libs/jackson-core-2.4.1/jackson-core-2.4.1.jar,\
                libs/jackson-core-2.4.1/jackson-databind-2.4.1.jar,\
                libs/annotation-detector-3.0.4/annotation-detector-3.0.4.jar,\
-               libs/jna/jna-4.2.1.jar,\
-               libs/jna/jna-platform-4.2.1.jar,\
                libs/slf4j/slf4j-api-1.7.19.jar,\
                libs/slf4j/slf4j-log4j12-1.7.19.jar,\
                libs/oauth2-useragent/oauth2-useragent-0.11.2.jar,\
diff --git a/source/com.microsoft.tfs.jni/.classpath b/source/com.microsoft.tfs.jni/.classpath
index 50e024a7b..7af277077 100644
--- a/source/com.microsoft.tfs.jni/.classpath
+++ b/source/com.microsoft.tfs.jni/.classpath
@@ -6,5 +6,7 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+    <classpathentry exported="true" kind="lib" path="libs/jna/jna-4.2.1.jar"/>
+    <classpathentry exported="true" kind="lib" path="libs/jna/jna-platform-4.2.1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/source/com.microsoft.tfs.jni/META-INF/MANIFEST.MF b/source/com.microsoft.tfs.jni/META-INF/MANIFEST.MF
index de62f64ec..44c90bbfc 100644
--- a/source/com.microsoft.tfs.jni/META-INF/MANIFEST.MF
+++ b/source/com.microsoft.tfs.jni/META-INF/MANIFEST.MF
@@ -29,4 +29,6 @@ Export-Package: com.microsoft.tfs.jni,
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: com.microsoft.tfs.logging,
  com.microsoft.tfs.util
-Bundle-ClassPath: com.microsoft.tfs.jni.jar
+Bundle-ClassPath: com.microsoft.tfs.jni.jar,
+ libs/jna/jna-4.2.1.jar,
+ libs/jna/jna-platform-4.2.1.jar
diff --git a/source/com.microsoft.tfs.jni/build.properties b/source/com.microsoft.tfs.jni/build.properties
index 80b45312c..aad90eb7a 100644
--- a/source/com.microsoft.tfs.jni/build.properties
+++ b/source/com.microsoft.tfs.jni/build.properties
@@ -1,5 +1,7 @@
 bin.includes = META-INF/,\
                os/,\
                com.microsoft.tfs.jni.jar,\
+               libs/jna/jna-4.2.1.jar,\
+               libs/jna/jna-platform-4.2.1.jar,\
                plugin.properties
 source.com.microsoft.tfs.jni.jar = src/
diff --git a/source/com.microsoft.tfs.core/libs/jna/jna-4.2.1.jar b/source/com.microsoft.tfs.jni/libs/jna/jna-4.2.1.jar
similarity index 100%
rename from source/com.microsoft.tfs.core/libs/jna/jna-4.2.1.jar
rename to source/com.microsoft.tfs.jni/libs/jna/jna-4.2.1.jar
diff --git a/source/com.microsoft.tfs.core/libs/jna/jna-platform-4.2.1.jar b/source/com.microsoft.tfs.jni/libs/jna/jna-platform-4.2.1.jar
similarity index 100%
rename from source/com.microsoft.tfs.core/libs/jna/jna-platform-4.2.1.jar
rename to source/com.microsoft.tfs.jni/libs/jna/jna-platform-4.2.1.jar