Merge pull request #448 from OneBusAway/api-key-cli

Adds CLI for managing API keys

Author: aaronbrethorst

.claude/settings.json

@@ -0,0 +1,16 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(bin/build_bundle:*)",
+      "Bash(docker run:*)",
+      "Bash(docker compose exec:*)",
+      "Bash(docker compose:*)",
+      "Bash(java -jar:*)",
+      "Bash(tree:*)",
+      "Bash(git add:*)",
+      "Bash(git commit:*)",
+      "Bash(mvn test:*)",
+      "Bash(mvn package:*)"
+    ]
+  }
+}

.gitignore

@@ -24,4 +24,6 @@ build/*
 docker_app_server/bundle/*
 !docker_app_server/bundle/.gitkeep
 
-dependency-reduced-pom.xml
+dependency-reduced-pom.xml
+
+.claude/settings.local.json

CLAUDE.md

@@ -0,0 +1,118 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Project Overview
+
+OneBusAway Application Modules - a multi-module Maven project providing real-time public transit information. The suite powers REST APIs, web interfaces, and integrations for transit agencies worldwide.
+
+**Version:** 2.7.0
+**Java:** 11
+**Framework:** Spring 5.2.24 (not Spring Boot), Struts 2.5.33, Hibernate 5.4.24
+
+## Build Commands
+
+```bash
+# Full build (skip tests for speed)
+mvn clean install -DskipTests=true -Dmaven.javadoc.skip=true
+
+# Build with tests
+mvn clean install
+
+# Build single module with dependencies
+mvn clean package -pl onebusaway-api-key-cli -am
+
+# Run tests for a single module
+mvn test -pl onebusaway-api-webapp
+
+# Run a single test
+mvn test -Dtest=ConfigActionTest
+
+# Run a single test method
+mvn test -Dtest=ConfigActionTest#testIndex
+
+# Verify build (includes license checks)
+mvn verify
+```
+
+### Docker Development (Recommended)
+
+```bash
+docker compose up builder          # Start build container + MySQL
+
+# In another terminal:
+bin/make                           # Full Maven build
+bin/make --test                    # Build with tests
+bin/build_bundle                   # Create GTFS data bundle
+bin/copy_and_relaunch              # Deploy WARs to Tomcat
+bin/shell                          # Shell into container
+```
+
+**Access points when running:**
+- API: http://localhost:8080/onebusaway-api-webapp/api/where/config.json?key=test
+- Tomcat Manager: http://localhost:8080/manager/html (admin/admin)
+- Debug port: 5005
+
+## Module Architecture
+
+### Core Layers (bottom-up)
+
+**Infrastructure:**
+- `onebusaway-core` - Base classes, constants
+- `onebusaway-util` - General utilities
+- `onebusaway-container` - Spring context bootstrap
+- `onebusaway-geospatial` - GIS utilities
+
+**Data Layer:**
+- `onebusaway-transit-data` - Domain models (stops, routes, trips)
+- `onebusaway-gtfs-hibernate-spring` - GTFS database ORM
+- `onebusaway-gtfs-realtime-model` - GTFS-realtime parsing
+- `onebusaway-transit-data-federation` - Core data aggregation engine
+- `onebusaway-transit-data-federation-builder` - Builds data bundles from GTFS
+
+**Service Layer:**
+- `onebusaway-api-core` - REST API implementation logic
+- `onebusaway-realtime-api` - Real-time data interfaces
+- `onebusaway-users` - User management, API keys
+- `onebusaway-alerts-persistence` - Service alerts storage
+
+**Web Applications (WAR):**
+- `onebusaway-api-webapp` - Main REST API (most commonly modified)
+- `onebusaway-transit-data-federation-webapp` - Admin/federation UI
+- `onebusaway-gtfs-realtime-archiver` - Archives realtime data
+- `onebusaway-watchdog-webapp` - Monitoring endpoints
+
+**CLI Tools:**
+- `onebusaway-api-key-cli` - Command-line API key management
+
+### Data Flow
+
+1. GTFS static data → `federation-builder` → MySQL database
+2. GTFS-realtime feeds → `gtfs-realtime-model` → merged with static data
+3. API requests → `api-webapp` (Struts actions) → `api-core` → `transit-data-federation` → response
+
+## Key Configuration Files
+
+**GTFS Realtime sources:**
+`docker_app_server/config/onebusaway-transit-data-federation-webapp-data-sources.xml`
+- Configure `tripUpdatesUrl`, `vehiclePositionsUrl`, `alertsUrl`, `agencyId`
+
+**Docker environment:**
+`docker-compose.yml`
+- `GTFS_URL` - Static GTFS download URL
+- `TZ` - Timezone matching GTFS data
+
+## Testing
+
+- Unit tests: `src/test/java/`
+- Integration tests: `org.onebusaway.integration.*` (excluded by default)
+- Test database: HSQLDB (in-memory)
+- Test ports: 9900 (main), 9901 (AJP), 9902 (RMI)
+
+## Contributing Notes
+
+- Fork the repo and submit Pull Requests
+- Reference GitHub issue numbers in commits: `Issue #5: Description`
+- Run `mvn verify` before submitting to ensure license headers and tests pass
+- Code style: https://github.com/OneBusAway/onebusaway/wiki/Code-Style
+- License: Apache 2.0 (ICLA required for contributions)

Dockerfile

@@ -24,9 +24,9 @@ RUN CGO_ENABLED=0 go install github.com/patrickbr/gtfstidy@latest
 
 FROM tomcat:8.5.100-jdk11-temurin-focal AS server
 
-ARG MAVEN_VERSION=3.9.9
+ARG MAVEN_VERSION=12
 
-ARG OBA_VERSION=2.6.0
+ARG OBA_VERSION=2.7.0
 ENV OBA_VERSION=$OBA_VERSION
 
 ENV CATALINA_HOME="/usr/local/tomcat"
@@ -85,12 +85,11 @@ COPY ./docker_app_server/config/host-manager_context.xml $CATALINA_HOME/webapps/
 
 # MySQL Connector
 WORKDIR $CATALINA_HOME/lib
-RUN wget "https://cdn.mysql.com/Downloads/Connector-J/mysql-connector-j-8.4.0.tar.gz" \
-    && tar -zxvf mysql-connector-j-8.4.0.tar.gz \
-    && mv mysql-connector-j-8.4.0/mysql-connector-j-8.4.0.jar . \
-    && rm mysql-connector-j-8.4.0.tar.gz \
-    && rm -rf mysql-connector-j-8.4.0
-
+RUN wget "https://cdn.mysql.com/Downloads/Connector-J/mysql-connector-j-9.4.0.tar.gz" \
+    && tar -zxvf mysql-connector-j-9.4.0.tar.gz \
+    && mv mysql-connector-j-9.4.0/mysql-connector-j-9.4.0.jar . \
+    && rm mysql-connector-j-9.4.0.tar.gz \
+    && rm -rf mysql-connector-j-9.4.0
 # Put the user in the source code directory when they shell in
 WORKDIR /src
 

api-key-cli-data-source.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+        <property name="driverClassName" value="com.mysql.cj.jdbc.Driver"/>
+        <property name="url" value="jdbc:mysql://localhost:3306/oba_database?useSSL=false&amp;allowPublicKeyRetrieval=true"/>
+        <property name="username" value="oba_user"/>
+        <property name="password" value="oba_password"/>
+    </bean>
+</beans>

docker-compose.yml

@@ -20,7 +20,7 @@ services:
       context: .
       dockerfile: Dockerfile
       args:
-        MAVEN_VERSION: 3.9.9
+        MAVEN_VERSION: 3.9.12
     environment:
       - GTFS_URL=https://www.soundtransit.org/GTFS-KCM/google_transit.zip
       - TZ=America/Los_Angeles
@@ -44,7 +44,7 @@ services:
     tty: true
 
   database:
-    image: mysql:8.3
+    image: mysql:8.4
     container_name: database
     environment:
       MYSQL_ROOT_PASSWORD: Ins3cure!

docker_app_server/bundle_builder/build_bundle.sh

@@ -43,6 +43,7 @@ gtfstidy -OscRCSmeD gtfs_pristine.zip
 
 cd gtfs-out
 
+rm -f ../gtfs_tidied.zip
 zip ../gtfs_tidied.zip *
 
 cd ..

onebusaway-admin-webapp/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onebusaway</groupId>
         <artifactId>onebusaway-application-modules</artifactId>
-        <version>2.6.0</version>
+        <version>2.7.0</version>
     </parent>
     <artifactId>onebusaway-admin-webapp</artifactId>
     <packaging>war</packaging>

onebusaway-agency-metadata/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onebusaway</groupId>
     <artifactId>onebusaway-application-modules</artifactId>
-    <version>2.6.0</version>
+    <version>2.7.0</version>
   </parent>
   <artifactId>onebusaway-agency-metadata</artifactId>
   <packaging>jar</packaging>

onebusaway-alerts-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>onebusaway-application-modules</artifactId>
         <groupId>org.onebusaway</groupId>
-        <version>2.6.0</version>
+        <version>2.7.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>