From d421bc058497b409616f696a69b068c702526376 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Wed, 2 Oct 2024 00:47:33 +0200
Subject: [PATCH] Review DataDistributionManagerJava name and location

---
 examples/java/TransmitterReceiver/.classpath  |  2 +-
 src/documentation/articles/manual_build.md    | 48 +++++++++----------
 src/documentation/docfx.json                  |  2 +-
 .../maven/datadistributionmanager.iml         | 12 ++---
 src/packaging/maven/pom.xml                   |  6 +--
 tests/ManagerTestJava/.classpath              |  2 +-
 6 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/examples/java/TransmitterReceiver/.classpath b/examples/java/TransmitterReceiver/.classpath
index 153a6e99..813ba54e 100644
--- a/examples/java/TransmitterReceiver/.classpath
+++ b/examples/java/TransmitterReceiver/.classpath
@@ -6,7 +6,7 @@
 			<accessrule kind="accessible" pattern="javafx/**"/>
 		</accessrules>
 	</classpathentry>
-	<classpathentry kind="lib" path="datadistributionmanager.jar" sourcepath="/DataDistributionManagerJava/src">
+	<classpathentry kind="lib" path="datadistributionmanager.jar" sourcepath="/jvm/src">
 		<attributes>
 			<attribute name="javadoc_location" value="jar:file:datadistributionmanager.docs.jar"/>
 		</attributes>
diff --git a/src/documentation/articles/manual_build.md b/src/documentation/articles/manual_build.md
index 03e2898b..28a5b334 100644
--- a/src/documentation/articles/manual_build.md
+++ b/src/documentation/articles/manual_build.md
@@ -20,37 +20,37 @@ git.exe submodule update --init
 * Build the OpenDDS libraries:
 
 ```
-cd third_party\OpenDDS
+cd src\3rdparty\\OpenDDS
 
 configure
 
 msbuild -p:Configuration=Release,Platform=x64 -m DDS_TAOv2.sln
 
-xcopy .\lib\*.dll ..\..\Output\x64\
-xcopy .\lib\*.pdb ..\..\Output\pdb64\
-xcopy .\lib\*.lib ..\..\Output\lib64\
-xcopy .\bin\*.exe ..\..\Output\bin64\
-xcopy .\bin\*.pdb ..\..\Output\pdb64\
-xcopy .\ACE_wrappers\lib\*.dll ..\..\Output\x64\
-xcopy .\ACE_wrappers\lib\*.pdb ..\..\Output\pdb64\
-xcopy .\ACE_wrappers\lib\*.lib ..\..\Output\lib64\
-xcopy .\ACE_wrappers\bin\*.exe ..\..\Output\bin64\
-xcopy .\ACE_wrappers\bin\*.pdb ..\..\Output\pdb64\
+xcopy .\lib\*.dll ..\..\..\Output\x64\
+xcopy .\lib\*.pdb ..\..\..\Output\pdb64\
+xcopy .\lib\*.lib ..\..\..\Output\lib64\
+xcopy .\bin\*.exe ..\..\..\Output\bin64\
+xcopy .\bin\*.pdb ..\..\..\Output\pdb64\
+xcopy .\ACE_wrappers\lib\*.dll ..\..\..\Output\x64\
+xcopy .\ACE_wrappers\lib\*.pdb ..\..\..\Output\pdb64\
+xcopy .\ACE_wrappers\lib\*.lib ..\..\..\Output\lib64\
+xcopy .\ACE_wrappers\bin\*.exe ..\..\..\Output\bin64\
+xcopy .\ACE_wrappers\bin\*.pdb ..\..\..\Output\pdb64\
 
 msbuild -p:Configuration=Release,Platform=Win32 -m DDS_TAOv2.sln
 
-xcopy .\lib\*.dll ..\..\Output\x86\
-xcopy .\lib\*.pdb ..\..\Output\pdb32\
-xcopy .\lib\*.lib ..\..\Output\lib32\
-xcopy .\bin\*.exe ..\..\Output\bin32\
-xcopy .\bin\*.pdb ..\..\Output\pdb32\
-xcopy .\ACE_wrappers\lib\*.dll ..\..\Output\x86\
-xcopy .\ACE_wrappers\lib\*.pdb ..\..\Output\pdb32\
-xcopy .\ACE_wrappers\lib\*.lib ..\..\Output\lib32\
-xcopy .\ACE_wrappers\bin\*.exe ..\..\Output\bin32\
-xcopy .\ACE_wrappers\bin\*.pdb ..\..\Output\pdb32\
-
-cd ..\..
+xcopy .\lib\*.dll ..\..\..\Output\x86\
+xcopy .\lib\*.pdb ..\..\..\Output\pdb32\
+xcopy .\lib\*.lib ..\..\..\Output\lib32\
+xcopy .\bin\*.exe ..\..\..\Output\bin32\
+xcopy .\bin\*.pdb ..\..\..\Output\pdb32\
+xcopy .\ACE_wrappers\lib\*.dll ..\..\..\Output\x86\
+xcopy .\ACE_wrappers\lib\*.pdb ..\..\..\Output\pdb32\
+xcopy .\ACE_wrappers\lib\*.lib ..\..\..\Output\lib32\
+xcopy .\ACE_wrappers\bin\*.exe ..\..\..\Output\bin32\
+xcopy .\ACE_wrappers\bin\*.pdb ..\..\..\Output\pdb32\
+
+cd ..\..\..
 ```
 
 * Generate the projects related to OpenDDS transport:
@@ -85,7 +85,7 @@ msbuild /m -p:Configuration=Release,Platform=Win32 src\DataDistributionManager.s
 > NOTE: a JDK must be installed in the build machine:
 
 ```
-cd src\DataDistributionManagerJava
+cd src\jvm
 set JDK_ROOT_FOLDER=C:\Program Files\Java\jdk-13.0.2+8
 CreateJars.bat
 cd ..\..
diff --git a/src/documentation/docfx.json b/src/documentation/docfx.json
index 11caaf6c..48d13160 100644
--- a/src/documentation/docfx.json
+++ b/src/documentation/docfx.json
@@ -42,7 +42,7 @@
         "files": [
           "javadoc/**"
         ],
-		"src": "../DataDistributionManagerJava"
+		"src": "../jvm"
       },
       {
         "files": [
diff --git a/src/packaging/maven/datadistributionmanager.iml b/src/packaging/maven/datadistributionmanager.iml
index 7bff5164..833a1d3b 100644
--- a/src/packaging/maven/datadistributionmanager.iml
+++ b/src/packaging/maven/datadistributionmanager.iml
@@ -3,19 +3,19 @@
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
     <output url="file://$MODULE_DIR$/${project.build.directory}/classes" />
     <output-test url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
-    <content url="file://$MODULE_DIR$/../../OutputJava/windows_x64">
-      <sourceFolder url="file://$MODULE_DIR$/../../OutputJava/windows_x64" type="java-resource" />
+    <content url="file://$MODULE_DIR$/../../../OutputJava/windows_x64">
+      <sourceFolder url="file://$MODULE_DIR$/../../../OutputJava/windows_x64" type="java-resource" />
     </content>
-    <content url="file://$MODULE_DIR$/../../OutputJava/windows_x86">
-      <sourceFolder url="file://$MODULE_DIR$/../../OutputJava/windows_x86" type="java-resource" />
+    <content url="file://$MODULE_DIR$/../../../OutputJava/windows_x86">
+      <sourceFolder url="file://$MODULE_DIR$/../../../OutputJava/windows_x86" type="java-resource" />
     </content>
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/classes" />
       <excludeFolder url="file://$MODULE_DIR$/${project.build.directory}/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
-    <content url="file://$MODULE_DIR$/../../src/DataDistributionManagerJava/src">
-      <sourceFolder url="file://$MODULE_DIR$/../../src/DataDistributionManagerJava/src" isTestSource="false" />
+    <content url="file://$MODULE_DIR$/../../../src/jvm/src">
+      <sourceFolder url="file://$MODULE_DIR$/../../../src/jvm/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/src/packaging/maven/pom.xml b/src/packaging/maven/pom.xml
index eb111080..8ef54d06 100644
--- a/src/packaging/maven/pom.xml
+++ b/src/packaging/maven/pom.xml
@@ -51,15 +51,15 @@
 		</repository>
 	</distributionManagement>
 	<build>
-		<sourceDirectory>../../src/DataDistributionManagerJava/src</sourceDirectory>
+		<sourceDirectory>../../../src/jvm/src</sourceDirectory>
 		<resources>
 			<resource>
-				<directory>../../OutputJava/windows_x86</directory>
+				<directory>../../../OutputJava/windows_x86</directory>
 				<filtering>false</filtering>
 				<targetPath>org/mases/datadistributionmanager/windows_x86</targetPath>
 			</resource>
 			<resource>
-				<directory>../../OutputJava/windows_x64</directory>
+				<directory>../../../OutputJava/windows_x64</directory>
 				<filtering>false</filtering>
 				<targetPath>org/mases/datadistributionmanager/windows_x64</targetPath>
 			</resource>
diff --git a/tests/ManagerTestJava/.classpath b/tests/ManagerTestJava/.classpath
index 8fc31f00..2f66a2eb 100644
--- a/tests/ManagerTestJava/.classpath
+++ b/tests/ManagerTestJava/.classpath
@@ -6,7 +6,7 @@
 			<accessrule kind="accessible" pattern="javafx/**"/>
 		</accessrules>
 	</classpathentry>
-	<classpathentry kind="lib" path="../../Output/datadistributionmanager.jar" sourcepath="../../DataDistributionManagerJava/src">
+	<classpathentry kind="lib" path="../../Output/datadistributionmanager.jar" sourcepath="../../src/jvm/src">
 		<attributes>
 			<attribute name="javadoc_location" value="jar:file:/../../Output/datadistributionmanager.docs.jar"/>
 		</attributes>