Modernize project structure with Maven-style layout and Ivy dependency management

Major improvements to project organization and build system:

- Restructure to Maven/Gradle standard layout (src/main/java, src/test/java, src/main/resources)
- Replace bundled junit.jar with Apache Ivy dependency management
- Add ivy.xml and ivysettings.xml for automatic dependency resolution
- Build jDisco as standalone Maven library (separate module with POM)
- Update Ant build.xml for new directory structure and Ivy integration
- Reorganize test files to match source package structure
- Update Dockerfile for Ivy-based build with jDisco Maven install
- Update .gitignore for Maven/Ivy artifacts (lib/, .ivy2/)
- Update documentation (README.md, CLAUDE.md) with Ivy instructions

This modernization maintains Java 6 compatibility while adopting industry-standard
project structure and eliminating binary JAR files from version control.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

Author: bedaHovorka

.gitignore

@@ -42,7 +42,12 @@ artifacts/
 jdisco/target/
 .m2/
 
+# Ivy artifacts
+.ivy2/
+lib/
+
 # OS files
 .DS_Store
 Thumbs.db
-*~
+*~
+/out/

CLAUDE.md

@@ -8,20 +8,40 @@ Railway Interlocking Simulator - A BSc thesis project (2006/2007) from Brno Univ
 
 ## Build System
 
-This project uses Apache Ant for building. Java 6 is required (`javac 1.6`), with JUnit for testing.
+This project uses Apache Ant for building with Apache Ivy for dependency management. Java 6 is required (`javac 1.6`).
+
+### Dependency Management
+
+Dependencies are managed via Apache Ivy:
+- **jDisco 1.2.0** - Discrete event simulation library (from Maven local repository)
+- **JUnit 3.8.2** - Testing framework (from Maven Central)
+
+Ivy automatically downloads dependencies during the build. Configuration files:
+- `ivy.xml` - Dependency declarations
+- `ivysettings.xml` - Repository resolver configuration
 
 ### Common Build Commands
 
-**Clean build:**
+**Resolve dependencies:**
+```bash
+ant resolve
+```
+
+**Clean build (includes dependency resolution and test execution):**
 ```bash
 ant clean build
 ```
 
-**Build only:**
+**Build only (compiles main code, tests, and runs tests):**
 ```bash
 ant build
 ```
 
+**Run tests only:**
+```bash
+ant test
+```
+
 **Run simulation (pre-configured shunting loop example):**
 ```bash
 ant start
@@ -37,28 +57,44 @@ ant run
 ant doc
 ```
 
+**Clean everything including Ivy cache:**
+```bash
+ant clean-all
+```
+
+### Directory Structure
+
+The project follows Maven/Gradle standard directory layout:
+- `src/main/java/` - Main source code
+- `src/test/java/` - Test source code
+- `src/main/resources/` - Resource files (XML schemas, examples)
+- `build/main/` - Compiled main classes
+- `build/test/` - Compiled test classes
+- `lib/compile/` - Compile-time dependencies (jDisco)
+- `lib/test/` - Test dependencies (JUnit)
+
 ### Running Manually
 
-After building with `ant build`, run from the `build/` directory:
+After building with `ant build`, run from the project root:
 
 **Simulation mode:**
 ```bash
-java -ea cz.vutbr.fit.interlockSim.Main sim [xmlFile]
+java -ea -cp "build/main:lib/compile/*" cz.vutbr.fit.interlockSim.Main sim [xmlFile]
 ```
 
 **Editor mode:**
 ```bash
-java -ea cz.vutbr.fit.interlockSim.Main edit [xmlFile]
+java -ea -cp "build/main:lib/compile/*" cz.vutbr.fit.interlockSim.Main edit [xmlFile]
 ```
 
 **Built-in examples:**
 ```bash
-java -ea cz.vutbr.fit.interlockSim.Main example [exampleName] [endTime]
+java -ea -cp "build/main:lib/compile/*" cz.vutbr.fit.interlockSim.Main example [exampleName] [endTime]
 ```
 
 To list available examples, run:
 ```bash
-java -ea cz.vutbr.fit.interlockSim.Main example
+java -ea -cp "build/main:lib/compile/*" cz.vutbr.fit.interlockSim.Main example
 ```
 
 **Note:** Enable assertions with `-ea` flag. For memory-constrained environments, add `-Xmx300`.
@@ -127,11 +163,13 @@ docker compose build app
 ### Docker Architecture
 
 **Root Dockerfile (multi-stage build):**
-1. **Builder stage** - Uses `caninjas/jdk6` with Ant
-   - Compiles Java sources
-   - Runs tests
-   - Creates JAR with all dependencies
-2. **Runner stage** - JRE 6 with X11 libraries
+1. **Builder stage** - Uses Debian Buster with OpenJDK 11, Maven, and Ant
+   - Builds jDisco dependency (Maven install)
+   - Resolves dependencies via Apache Ivy (automatic download)
+   - Compiles Java sources (Java 6 compatibility mode)
+   - Runs all tests (build fails if tests fail)
+   - Creates uber JAR with all dependencies
+2. **Runner stage** - Debian Buster with OpenJDK 11 JRE and X11 libraries
    - Minimal runtime environment
    - X11 forwarding for GUI support
    - No build tools in final image
@@ -223,25 +261,32 @@ Both services copy build outputs to `/artifacts` inside the container, which is
 
 **XML Configuration:**
 - Railway networks defined in XML format
-- Schema: `src/cz/vutbr/fit/interlockSim/resource/data.xsd`
-- Example: `src/cz/vutbr/fit/interlockSim/resource/vyhybna.xml`
+- Schema: `src/main/resources/cz/vutbr/fit/interlockSim/resource/data.xsd`
+- Example: `src/main/resources/cz/vutbr/fit/interlockSim/resource/vyhybna.xml`
 - Elements include: RailSwitch, RailSemaphore, InOut (entry/exit points), track connections
 
 ### Package Structure
 
 ```
-cz.vutbr.fit.interlockSim/
-├── Main.java              - Application entry point
-├── context/               - Context management and factories
-├── gui/                   - Graphical editor
-├── objects/               - Domain model (tracks, paths, cells)
-├── sim/                   - Simulation scenarios
-├── test/                  - Unit tests (JUnit)
-├── util/                  - Utilities and reporting
-├── xml/                   - XML parsing and serialization
-└── resource/              - XML schemas and configuration files
-
-jDisco/                    - Third-party discrete event simulation library
+src/
+├── main/
+│   ├── java/cz/vutbr/fit/interlockSim/
+│   │   ├── Main.java              - Application entry point
+│   │   ├── context/               - Context management and factories
+│   │   ├── gui/                   - Graphical editor
+│   │   ├── objects/               - Domain model (tracks, paths, cells)
+│   │   ├── sim/                   - Simulation scenarios
+│   │   ├── util/                  - Utilities and reporting
+│   │   └── xml/                   - XML parsing and serialization
+│   └── resources/cz/vutbr/fit/interlockSim/
+│       └── resource/              - XML schemas and configuration files
+└── test/
+    └── java/cz/vutbr/fit/interlockSim/test/
+        ├── TestArray2DMap.java    - Array2DMap unit tests
+        ├── TestCell.java          - Cell unit tests
+        └── TestContext.java       - Context unit tests
+
+jdisco/                            - Third-party discrete event simulation library (separate module)
 ```
 
 ## Code Style
@@ -265,14 +310,22 @@ This is a working historical codebase from 2007. Stability and preservation are
 
 ## Testing
 
-JUnit tests located in `cz.vutbr.fit.interlockSim.test/`. The `junit.jar` library is included in the repository root.
+JUnit 3.8.2 tests located in `src/test/java/cz/vutbr/fit/interlockSim/test/`. JUnit is managed via Apache Ivy.
+
+**Current tests:**
+- `TestArray2DMap` - 10 tests for 2D array-based map implementation
+- `TestCell` - 2 tests for cell segment and direction logic
+- `TestContext` - 4 tests for railway network context operations
 
 **Run tests:**
 ```bash
+ant test
+# Or as part of build:
 ant build
-# Tests run during build
 ```
 
+Tests are automatically executed during the build process. The build will fail if any test fails (`haltonfailure="yes"`).
+
 ## Documentation
 
 LaTeX-based thesis documentation in `text/` directory.

Dockerfile

@@ -9,6 +9,7 @@
 #      Dockerization: 2025
 #
 #      Multi-stage build for interlockSim with GUI support
+#      Dependency management: Apache Ivy
 #
 
 # ============================================
@@ -43,22 +44,13 @@ WORKDIR /build/interlockSim
 # Copy source files and build configuration
 COPY src/ /build/interlockSim/src/
 COPY build.xml /build/interlockSim/
-COPY junit.jar /build/interlockSim/
+COPY ivy.xml /build/interlockSim/
+COPY ivysettings.xml /build/interlockSim/
 
-# Patch build.xml to add Java 6 source/target compatibility and ISO-8859-1 encoding
-# Note: jDisco library files use ISO-8859-1 encoding
-RUN sed -i 's|<javac destdir="build">|<javac destdir="build" source="1.6" target="1.6" encoding="ISO-8859-1" includeantruntime="false">|g' build.xml
-
-# Patch build.xml to add junit.jar to the classpath
-RUN sed -i 's|<path id="project.classpath">|<path id="project.classpath">\n        <pathelement location="junit.jar"/>|g' build.xml
-
-# Build the project (compiles code and resources)
+# Build the project (compiles code, runs tests)
+# Ivy downloads dependencies automatically during resolve phase
 RUN ant clean build
 
-# Run tests if they exist
-# Note: build.xml doesn't have explicit test target, but tests are in src
-RUN ant build
-
 # Create JAR with manifest
 RUN ant pack
 
@@ -104,7 +96,7 @@ WORKDIR /app
 COPY --from=builder /build/interlockSim/jar/interlockSim.jar /app/
 
 # Copy resources if needed at runtime (XML schemas, examples)
-COPY --from=builder /build/interlockSim/build/cz/vutbr/fit/interlockSim/resource/ \
+COPY --from=builder /build/interlockSim/build/main/cz/vutbr/fit/interlockSim/resource/ \
                     /app/resource/
 
 # Create artifacts directory for extraction
@@ -117,5 +109,5 @@ RUN cp /app/interlockSim.jar /artifacts/
 ENV DISPLAY=:0
 
 # Default command: run editor GUI
-# Users can override with: docker-compose run app java -ea -jar interlockSim.jar sim file.xml
-CMD ["java", "-ea", "-jar", "interlockSim.jar", "edit"]
+# Users can override with: docker compose run app java -ea -jar interlockSim.jar sim file.xml
+CMD ["java", "-ea", "-jar", "interlockSim.jar", "edit"]