Fixed a Windows path handling bug related to #180, see Changelist

.gitignore

@@ -23,7 +23,7 @@ hs_err_pid*
 /deploy/Thumbs.d?
 /docs/_site/
 /.idea/workspace.xm?
-/mock/bin/ELS.ja?
+/mock/bin/
 /mock/datastore/
 /mock/datastore-backup/
 /mock/ELS-Navigator*

ELS.iml

@@ -35,8 +35,8 @@
       <library name="JUnit4" type="repository">
         <properties maven-id="junit:junit:4.13.1" />
         <CLASSES>
-          <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.13.1/junit-4.13.1.jar!/" />
-          <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
+          <root url="jar://C:/home/trh/.m2/repository/junit/junit/4.13.1/junit-4.13.1.jar!/" />
+          <root url="jar://C:/home/trh/.m2/repository/junit/junit/4.13.1/hamcrest-core-1.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />

build/changes.html

@@ -13,6 +13,12 @@ <h3>Known Bugs</h3>
 
 <hr/>
 
+<h3>28 February 2025</h3>
+<ul>
+    <li>Fixed a Windows path handling bug related to #180.</li>
+    <li>Adjusted project for compilation on Windows and Linux.</li>
+</ul>
+
 <h3>24 February 2025</h3>
 <ul>
     <li>Fixed a bug related to restarting & reopening a remote subscriber.</li>

els.xml

@@ -74,7 +74,7 @@
             <include name="**/*.java"/>
         </javac>
         <!-- Merge annotation-generate Log4j2Plugins.dat with those found in lib Jar files -->
-        <exec executable="/usr/bin/java">
+        <exec executable="java">
             <arg value="-jar"/>
             <arg value="artifacts/bin/MergeLog4j2Plugins.jar"/>
             <arg value="--dat"/>
@@ -217,7 +217,7 @@
             <include name="**/*.java"/>
         </javac>
         <!-- Merge annotation-generate Log4j2Plugins.dat with those found in lib Jar files -->
-        <exec executable="/usr/bin/java">
+        <exec executable="java">
             <arg value="-jar"/>
             <arg value="artifacts/bin/MergeLog4j2Plugins.jar"/>
             <arg value="--dat"/>

mock/copy-only_windows-base/libraries/Hint Server.json

@@ -5,7 +5,7 @@
         "host": "localhost:40100",
         "listen": "localhost:40200",
         "timeout": 0,
-        "flavor": "Linux",
+        "flavor": "Windows",
         "case_sensitive": false,
         "temp_dated": false,
         "temp_location": "output",

mock/copy-only_windows-base/libraries/Publisher.json

@@ -1,11 +1,11 @@
 {
     "libraries": {
         "description": "Publisher",
-        "key": "aa1673d4-5284-4a7d-86c9-3df20adace46",
+        "key": "ea30da9c-1823-4d33-b316-d66f6c892c3c",
         "host": "localhost:40700",
         "listen": "localhost:40800",
         "timeout": 0,
-        "flavor": "Linux",
+        "flavor": "Windows",
         "case_sensitive": false,
         "temp_dated": false,
         "temp_location": "output",
@@ -19,30 +19,30 @@
         ],
         "locations": [
             {
-                "location": "test/publisher",
+                "location": "media/publisher/media",
                 "minimum": "40GB"
             },
             {
-                "location": "test/subscriber-one/media/TV Shows",
+                "location": "media/publisher/more-media/TV Shows",
                 "minimum": "40GB"
             }
         ],
         "bibliography": [
             {
                 "name": "Movies",
                 "sources": [
-                    "test/publisher/media/Movies"
+                    "media/publisher/media/Movies"
                 ],
                 "items": null
             },
             {
                 "name": "TV Shows",
                 "sources": [
-                    "test/publisher/media/TV Shows",
-                    "test/publisher/more-media/TV Shows"
+                    "media/publisher/media/TV Shows",
+                    "media/publisher/more-media/TV Shows"
                 ],
                 "items": null
             }
         ]
     }
-}
+}

mock/copy-only_windows-base/libraries/Subscriber One.json

@@ -2,8 +2,8 @@
     "libraries": {
         "description": "Subscriber One",
         "key": "bb12a499-97a6-44e1-8a91-4cc898e45849",
-        "host": "localhost:40300",
-        "listen": "localhost:40400",
+        "host": "10.101.10.21:40300",
+        "listen": "10.101.10.21:40400",
         "timeout": 0,
         "flavor": "Linux",
         "case_sensitive": false,

src/com/corionis/els/repository/Repositories.java

@@ -125,9 +125,11 @@ public RepoMeta findMetaPath(String path)
         {
             if (metaList != null)
             {
+                path = Utils.pipe(path);
                 for (RepoMeta m : metaList)
                 {
-                    if (m.path.endsWith(path))
+                    String mPath = Utils.pipe(m.path);
+                    if (mPath.endsWith(path))
                     {
                         repoMeta = m;
                         break;

src/com/corionis/els/repository/Repository.java

@@ -787,7 +787,7 @@ public void scan(String libraryName) throws MungeException
      * @param directory the directory
      * @throws MungeException the els exception
      */
-    public int scanDirectory(Library library, String base, String directory) throws MungeException
+    private int scanDirectory(Library library, String base, String directory) throws MungeException
     {
         int count = 0;
         Item item = null;

src/com/corionis/els/resources/version.info

@@ -1,6 +1,6 @@
 4.0.0-development
-2502271441
-27 February 2025, 14:41 MST
-ELS-4.0.0-development-2502271441
-ELS_Updater-4.0.0-development-2502271441
+2502281546
+28 February 2025, 15:46 MST
+ELS-4.0.0-development-2502281546
+ELS_Updater-4.0.0-development-2502281546
 https://raw.githubusercontent.com/Corionis/ELS/Version-4.0.0/deploy/changes.html