Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,4 @@ mcp/**/node_modules/
*.tfstate
*.tfstate.*
.terraform.lock.hcl
.flattened-pom.xml
28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,34 @@ and this project uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html)

## [Unreleased]

### Changed

- **Maven coordinates move to `com.pointbluetech` for Maven Central:** DirXMLDev is
`com.pointbluetech.dirxml:dirxml-dev`, and it depends on `com.pointbluetech.dirxml:dirxml-simulator`.
Java packages do not change. `bin/idm`, `bin/idm.cmd`, `require-engine.sh` and `doctor` look for the
simulator under `~/.m2/repository/com/pointbluetech/dirxml/`. **After updating, run `bin/install-deps`**:
it installs the pinned simulator (1.8.0) under the new groupId. `doctor` reads a simulator jar's version
under either groupId.
- The installed (and published) pom is flattened: it names no engine jar and no `systemPath`, only
JLDAP, PostgreSQL and the trace parser.
- `bin/install-deps` takes each library's groupId from the pom that pins it, and skips a version that is
on Maven Central (Maven fetches it).
- `docs/install.md` §2.0: `dirxml-dev` comes before `console-auth`, which builds on it; §2.0.1 is
Maven Central.

### Added

- **`bin/publish-central`:** publishes a release of a Point Blue library to Maven Central. It builds the
checkout's `central` profile (sources, javadoc, signatures), refuses the bundle when any file in it
names something on the publish blocklist (kept outside every repository), and uploads that same
bundle. The token comes from the Keychain and the signing key from gpg-agent. A `central` profile in
this pom.

### Fixed

- A client name in a source comment and in `docs/designer-new-project.md` (an example driver's name)
is gone.

## [0.69.0] - 2026-11-11

### Added
Expand Down
6 changes: 3 additions & 3 deletions bin/idm
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
set -e
HERE="$(cd "$(dirname "$0")/.." && pwd)"
SIM_VER="${IDM_SIM_VERSION:-1.8.0}"
SIM_JAR="$HOME/.m2/repository/com/pointblue/dirxml/dirxml-simulator/$SIM_VER/dirxml-simulator-$SIM_VER.jar"
SIM_JAR="$HOME/.m2/repository/com/pointbluetech/dirxml/dirxml-simulator/$SIM_VER/dirxml-simulator-$SIM_VER.jar"
# the PostgreSQL JDBC driver for the event store (the version the pom names; `mvn package` fetches it)
PG_VER=$(sed -n 's#.*<postgresql.version>\([^<]*\)</postgresql.version>.*#\1#p' "$HERE/pom.xml" | head -1)
PG_JAR="$HOME/.m2/repository/org/postgresql/postgresql/$PG_VER/postgresql-$PG_VER.jar"
Expand Down Expand Up @@ -97,7 +97,7 @@ doctor_shell() {
fi

sim_ok=0
sim_detail="Install the DirXML Simulator and run 'mvn install' in that repo so $SIM_JAR exists (version $SIM_VER, the pin in pom.xml). See docs/install.md section 2."
sim_detail="Run bin/install-deps (or 'mvn install' in the DirXMLSimulator repo at that version) so $SIM_JAR exists (version $SIM_VER, the pin in pom.xml). See docs/install.md section 2."
if [ -f "$SIM_JAR" ]; then
sim_ok=1
sim_detail="dirxml-simulator $SIM_VER is on disk; the Java doctor reads its version once target/classes is built."
Expand Down Expand Up @@ -177,7 +177,7 @@ if [ -z "$JH" ]; then
fi

if [ ! -f "$SIM_JAR" ] && [ "$CMD" != "doctor" ]; then
echo "ERROR: simulator jar $SIM_VER not installed; run 'mvn install' in the DirXMLSimulator repo" >&2
echo "ERROR: simulator jar $SIM_VER not installed; run bin/install-deps" >&2
exit 1
fi

Expand Down
6 changes: 3 additions & 3 deletions bin/idm.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ if not "%JV:~0,3%"=="21." (
)
set "SIM_VER=%IDM_SIM_VERSION%"
if "%SIM_VER%"=="" set "SIM_VER=1.8.0"
set "SIM_JAR=%USERPROFILE%\.m2\repository\com\pointblue\dirxml\dirxml-simulator\%SIM_VER%\dirxml-simulator-%SIM_VER%.jar"
set "SIM_JAR=%USERPROFILE%\.m2\repository\com\pointbluetech\dirxml\dirxml-simulator\%SIM_VER%\dirxml-simulator-%SIM_VER%.jar"
if not exist "%SIM_JAR%" (
if /I "%CMD%"=="doctor" (
if not exist "%HERE%\target\classes\com\pointblue\dirxml\dev\Cli.class" (
echo DirXML Dev — doctor
echo simulator: FAIL %SIM_VER% missing
echo Run "mvn install" in the DirXMLSimulator repo so %SIM_JAR% exists. See docs/install.md section 2.
echo Run bin/install-deps from Git Bash, or "mvn install" in the DirXMLSimulator repo, so %SIM_JAR% exists. See docs/install.md section 2.
echo cli: FAIL Java doctor did not start
echo DOCTOR: PROBLEMS FOUND
exit /b 1
)
) else (
echo ERROR: simulator jar %SIM_VER% not installed; run "mvn install" in the DirXMLSimulator repo 1>&2
echo ERROR: simulator jar %SIM_VER% not installed; run bin/install-deps from Git Bash, or "mvn install" in the DirXMLSimulator repo 1>&2
exit /b 1
)
)
Expand Down
45 changes: 31 additions & 14 deletions bin/install-deps
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#!/usr/bin/env bash
# Installs the Point Blue libraries that DirXMLDev and DirXMLDevWeb build against, at the
# versions a pom pins, from their GitHub releases into the local Maven repository. None of
# them is on Maven Central, so without this each one has to be built from a checkout of the
# right tag, in the right order (DirXMLDev docs/install.md §2.0).
# versions a pom pins, from their GitHub releases into the local Maven repository. A version
# that is on Maven Central is skipped: Maven fetches it by itself. Older versions are only on
# GitHub releases; without this each one has to be built from a checkout of the right tag, in
# the right order (DirXMLDev docs/install.md §2.0).
#
# bin/install-deps # what this checkout's pom pins
# bin/install-deps --pom path/pom.xml # what another pom pins
Expand All @@ -15,8 +16,10 @@
# dirxml-dev dirxmldev.version PointBlueTechnology/DirXMLDev
# console-auth console.version PointBlueTechnology/directory-console
#
# A version already in the local repository is left alone, so a jar you built yourself from
# a checkout wins; --force replaces it with the release jar. The NetIQ/OpenText engine jars
# The groupId is the one the pom names for that library (com.pointbluetech.* from the Maven
# Central releases, com.pointblue.* before). A version already in the local repository is
# left alone, so a jar you built yourself from a checkout wins; --force replaces it with the
# release jar. The NetIQ/OpenText engine jars
# are proprietary and are never downloaded: copy them into lib/ yourself (DirXMLDev docs/install.md).
# Needs curl and mvn. M2_REPO installs into another local repository than ~/.m2/repository.
# The same script is in DirXMLDev and DirXMLDevWeb (bin/install-deps); keep the two identical.
Expand Down Expand Up @@ -45,19 +48,27 @@ done
REPO=${M2_REPO:-$HOME/.m2/repository}
ALL="trace-core simulator console-auth dirxml-dev"

# name -> "property groupId artifactId owner/repo"
# name -> "property artifactId owner/repo"
spec() {
case "$1" in
trace-core) echo "tracecore.version com.pointbluetech dirxml-trace-core PointBlueTechnology/DirXMLTraceViewer" ;;
simulator) echo "simulator.version com.pointblue.dirxml dirxml-simulator PointBlueTechnology/DirXMLSimulator" ;;
console-auth) echo "console.version com.pointblue.console console-auth PointBlueTechnology/directory-console" ;;
dirxml-dev) echo "dirxmldev.version com.pointblue.dirxml dirxml-dev PointBlueTechnology/DirXMLDev" ;;
trace-core) echo "tracecore.version dirxml-trace-core PointBlueTechnology/DirXMLTraceViewer" ;;
simulator) echo "simulator.version dirxml-simulator PointBlueTechnology/DirXMLSimulator" ;;
console-auth) echo "console.version console-auth PointBlueTechnology/directory-console" ;;
dirxml-dev) echo "dirxmldev.version dirxml-dev PointBlueTechnology/DirXMLDev" ;;
*) return 1 ;;
esac
}

pinned() { sed -n "s#.*<$1>\([^<]*\)</$1>.*#\1#p" "$POM" | head -1; }

# The groupId the pom gives a dependency on that artifactId: the last <groupId> before it.
group_of() {
awk -v a="$1" '
/<groupId>/ { g = $0; sub(/.*<groupId>[[:space:]]*/, "", g); sub(/[[:space:]]*<\/groupId>.*/, "", g) }
/<artifactId>/ { x = $0; sub(/.*<artifactId>[[:space:]]*/, "", x); sub(/[[:space:]]*<\/artifactId>.*/, "", x)
if (x == a && g != "") { print g; exit } }' "$POM"
}

# The pom installed with each jar. The jars' own poms name parents and system-scoped engine
# jars a consumer does not have, so a flat one is written instead. Only trace-core needs a
# dependency carried along (JLDAP, on Maven Central); the projects that use the others
Expand Down Expand Up @@ -87,22 +98,28 @@ echo "pins from $POM"
status=0
for n in $NAMES; do
set -- $(spec "$n")
prop=$1 group=$2 artifact=$3 gh=$4
prop=$1 artifact=$2 gh=$3
v=$(pinned "$prop")
if [ -z "$v" ]; then
if [ "$explicit" = 1 ]; then echo " $n: the pom does not pin it (no <$prop>)" >&2; status=1; fi
group=$(group_of "$artifact")
if [ -z "$v" ] || [ -z "$group" ]; then
if [ "$explicit" = 1 ]; then echo " $n: the pom does not pin it (no <$prop>, or no dependency on $artifact)" >&2; status=1; fi
continue
fi
jar="$REPO/$(echo "$group" | tr . /)/$artifact/$v/$artifact-$v.jar"
have=0; [ -f "$jar" ] && have=1
if [ "$LIST" = 1 ]; then
if [ "$have" = 1 ]; then echo " $n $v installed"; else echo " $n $v missing"; fi
if [ "$have" = 1 ]; then echo " $n $v installed ($group)"; else echo " $n $v missing ($group)"; fi
continue
fi
if [ "$have" = 1 ] && [ "$FORCE" = 0 ]; then
echo " $n $v already installed (--force replaces it with the release jar)"
continue
fi
central="https://repo1.maven.org/maven2/$(echo "$group" | tr . /)/$artifact/$v/$artifact-$v.pom"
if [ "$FORCE" = 0 ] && curl -fsI -o /dev/null "$central" 2>/dev/null; then
echo " $n $v on Maven Central ($group): Maven fetches it, nothing to install"
continue
fi
url="https://github.com/$gh/releases/download/v$v/$artifact-$v.jar"
if [ "$DRY" = 1 ]; then echo " $n $v would install from $url"; continue; fi
echo " $n $v from $url"
Expand Down
105 changes: 105 additions & 0 deletions bin/publish-central
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
#!/usr/bin/env bash
# Publishes a Point Blue library to Maven Central from a release checkout: builds the signed bundle
# with the checkout's `central` profile, refuses it if any file in it names something on the
# publish blocklist, and uploads that same bundle to the Central Portal.
#
# bin/publish-central ~/IdeaProjects/DirXMLSimulator
# bin/publish-central --module trace-core ~/IdeaProjects/DirXMLTraceViewer
# bin/publish-central --check-only ~/IdeaProjects/DirXMLDev # build and check, no upload
#
# Central never deletes a release, so the check comes first and nothing is uploaded without it.
# blocklist PUBLISH_BLOCKLIST, default ~/.config/pointblue/publish-blocklist: one name per line
# (client names, their domains), matched case-insensitively as whole words in every file
# of the bundle, class files and the jars inside it included ("acme" does not match
# "acmetric"). A line "substring:acme" matches anywhere, "AcmeDriver" too. Kept outside
# every repository: the list itself must never be published. Missing or empty: refused.
# token the Central Portal user token, from the macOS Keychain: service maven-central,
# account = the token's user name, password = the token's password.
# signing gpg's default key, or PUBLISH_GPG_KEY; the passphrase is gpg-agent's (pinentry).
#
# The checkout must be clean and at the annotated tag v<version> of its pom's release version.
# --hold uploads for review: publish it at https://central.sonatype.com/publishing/deployments.
set -euo pipefail

usage() { sed -n '2,21p' "$0" | sed 's/^# \{0,1\}//'; }

MODULE=""
CHECK_ONLY=0
HOLD=0
while [ $# -gt 0 ]; do
case "$1" in
--module) [ $# -ge 2 ] || { echo "publish-central: --module needs a name" >&2; exit 2; }; MODULE=$2; shift 2 ;;
--check-only) CHECK_ONLY=1; shift ;;
--hold) HOLD=1; shift ;;
-h|--help) usage; exit 0 ;;
-*) echo "publish-central: unknown option $1 (see --help)" >&2; exit 2 ;;
*) break ;;
esac
done
[ $# -eq 1 ] || { usage >&2; exit 2; }
DIR=$(cd "$1" && pwd)
die() { echo "publish-central: $*" >&2; exit 1; }

BLOCKLIST=${PUBLISH_BLOCKLIST:-$HOME/.config/pointblue/publish-blocklist}
[ -s "$BLOCKLIST" ] || die "no blocklist at $BLOCKLIST (one name per line). Nothing is published without it."
TMP=$(mktemp -d)
trap 'rm -rf "$TMP"' EXIT
WORDS="$TMP/words" SUBS="$TMP/substrings"
grep -v '^[[:space:]]*\(#\|$\)' "$BLOCKLIST" | sed 's/[[:space:]]*$//' > "$TMP/all" || true
[ -s "$TMP/all" ] || die "the blocklist at $BLOCKLIST has no names in it"
grep -v '^substring:' "$TMP/all" > "$WORDS" || true
sed -n 's/^substring://p' "$TMP/all" > "$SUBS"

# The release: a clean checkout at the tag of a non-SNAPSHOT version.
cd "$DIR"
[ -z "$(git status --porcelain)" ] || die "$DIR has uncommitted changes"
POM=pom.xml
[ -n "$MODULE" ] && POM="$MODULE/pom.xml"
VERSION=$(mvn -B -q -f "$POM" help:evaluate -Dexpression=project.version -DforceStdout 2>/dev/null)
case "$VERSION" in ''|*-SNAPSHOT) die "the version is '$VERSION': release versions only" ;; esac
TAG=$(git describe --exact-match --tags HEAD 2>/dev/null || true)
[ "$TAG" = "v$VERSION" ] || die "HEAD is not at tag v$VERSION (it is at '${TAG:-no tag}')"

# Build and sign the bundle. The profile stops short of uploading (skipUpload).
ARGS=(-B -Pcentral deploy)
[ -n "$MODULE" ] && ARGS+=(-pl "$MODULE")
[ -n "${PUBLISH_GPG_KEY:-}" ] && ARGS+=("-Dgpg.keyname=$PUBLISH_GPG_KEY")
echo "building the bundle for $(basename "$DIR") ${MODULE:+$MODULE }$VERSION"
mvn -q "${ARGS[@]}"
BUNDLE="$DIR/${MODULE:+$MODULE/}target/central-publishing/central-bundle.zip"
[ -f "$BUNDLE" ] || die "no bundle at $BUNDLE (does the pom have the central profile?)"

# Check every file in the bundle, and every file inside each jar in it.
mkdir -p "$TMP/b"
unzip -q "$BUNDLE" -d "$TMP/b"
find "$TMP/b" -name '*.jar' | while read -r j; do mkdir -p "$j.x" && unzip -q "$j" -d "$j.x"; done
[ -n "$(find "$TMP/b" -name '*.asc' | head -1)" ] || die "the bundle has no signatures (.asc)"
HITS=$( { [ -s "$WORDS" ] && grep -rilawF -f "$WORDS" "$TMP/b"; [ -s "$SUBS" ] && grep -rilaF -f "$SUBS" "$TMP/b"; } | sort -u || true)
if [ -n "$HITS" ]; then
echo "publish-central: REFUSED: these files name something on the blocklist:" >&2
echo "$HITS" | sed "s#^$TMP/b/# #" >&2
exit 1
fi
echo "checked: $(find "$TMP/b" -type f | wc -l | tr -d ' ') files, none names anything on the blocklist"
[ "$CHECK_ONLY" = 1 ] && { echo "--check-only: not uploaded ($BUNDLE)"; exit 0; }

# Upload that same bundle.
ACCT=$(security find-generic-password -s maven-central 2>/dev/null | sed -n 's/.*"acct"<blob>="\(.*\)"/\1/p')
[ -n "$ACCT" ] || die "no maven-central item in the Keychain (security add-generic-password -s maven-central -a <user> -w)"
AUTH=$(printf '%s:%s' "$ACCT" "$(security find-generic-password -s maven-central -a "$ACCT" -w)" | base64)
TYPE=AUTOMATIC; [ "$HOLD" = 1 ] && TYPE=USER_MANAGED
NAME="$(basename "$DIR")${MODULE:+-$MODULE}-$VERSION"
ID=$(curl -fsS -X POST -H "Authorization: Bearer $AUTH" -F "bundle=@$BUNDLE" \
"https://central.sonatype.com/api/v1/publisher/upload?publishingType=$TYPE&name=$NAME")
echo "uploaded $NAME: deployment $ID"
while :; do
sleep 10
STATUS=$(curl -fsS -X POST -H "Authorization: Bearer $AUTH" "https://central.sonatype.com/api/v1/publisher/status?id=$ID")
STATE=$(printf '%s' "$STATUS" | sed -n 's/.*"deploymentState" *: *"\([A-Z_]*\)".*/\1/p')
case "$STATE" in
PENDING|VALIDATING|PUBLISHING) printf ' %s\n' "$STATE" ;;
VALIDATED) echo "validated, held for review: publish it at https://central.sonatype.com/publishing/deployments"; exit 0 ;;
PUBLISHED) echo "published. Search shows it within the hour; resolving works within minutes."; exit 0 ;;
*) echo "publish-central: deployment $ID is $STATE" >&2; printf '%s\n' "$STATUS" >&2; exit 1 ;;
esac
done
8 changes: 4 additions & 4 deletions bin/require-engine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if [ "${1:-}" = "--inform" ]; then
fi
HERE=$(cd "$(dirname "$0")/.." && pwd)
SIM_VER="${IDM_SIM_VERSION:-1.8.0}"
SIM_JAR="${HOME}/.m2/repository/com/pointblue/dirxml/dirxml-simulator/${SIM_VER}/dirxml-simulator-${SIM_VER}.jar"
SIM_JAR="${HOME}/.m2/repository/com/pointbluetech/dirxml/dirxml-simulator/${SIM_VER}/dirxml-simulator-${SIM_VER}.jar"

missing=""
links=""
Expand Down Expand Up @@ -78,9 +78,9 @@ Setup (docs/install.md, section 2):
or a Designer install. Do not commit them.
Do not use: ln -s /path/to/DirXMLSimulator/lib lib
Do not symlink the individual jars into lib/. Neither passes requireFilesExist.
2. Build the simulator and install it into the local Maven repository:
cd /path/to/DirXMLSimulator && mvn install
Expected artifact: com.pointblue.dirxml:dirxml-simulator:${SIM_VER}
2. Install the simulator into the local Maven repository: bin/install-deps
(or build it: cd /path/to/DirXMLSimulator && git checkout v${SIM_VER} && mvn install)
Expected artifact: com.pointbluetech.dirxml:dirxml-simulator:${SIM_VER}
(IDM_SIM_VERSION overrides that pin only when you mean to select another build).
3. Re-run: mvn -B test
Without the jars, doctor and the write-gate tests still run:
Expand Down
6 changes: 3 additions & 3 deletions docs/agent-assisted-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ Clone https://github.com/PointBlueTechnology/DirXMLSimulator into
~/IdeaProjects/DirXMLSimulator (or another directory I name). Copy the ten
jars into that repo's lib/. With JAVA_HOME pointed at JDK 21, run
mvn install. That must produce
~/.m2/repository/com/pointblue/dirxml/dirxml-simulator/1.8.0/dirxml-simulator-1.8.0.jar
~/.m2/repository/com/pointbluetech/dirxml/dirxml-simulator/1.8.0/dirxml-simulator-1.8.0.jar
(on Windows, under %USERPROFILE%\.m2). DirXMLDev pins 1.8.0. A release zip
of the simulator is not a substitute. Set IDM_SIM_VERSION only if I asked.

Expand Down Expand Up @@ -401,7 +401,7 @@ when that Java is 21, /usr/lib/jvm/*21*, and java on PATH when that java is
21. On Windows, bin\idm.cmd uses only IDM_JAVA_HOME or JAVA_HOME.

Simulator: this repo pins dirxml-simulator 1.8.0. doctor looks for
~/.m2/repository/com/pointblue/dirxml/dirxml-simulator/1.8.0/dirxml-simulator-1.8.0.jar
~/.m2/repository/com/pointbluetech/dirxml/dirxml-simulator/1.8.0/dirxml-simulator-1.8.0.jar
(bin\idm.cmd uses %USERPROFILE%\.m2\...). Produce it with mvn install in the
DirXMLSimulator repo, run with JDK 21, or with bin/install-deps simulator in
DirXMLDev, which installs the release jar. If mvn install succeeded and doctor
Expand Down Expand Up @@ -497,7 +497,7 @@ show me DOCTOR: OK, or the next failure that is not a symlink.
|---|---|---|---|---|
| **macOS** | `/usr/libexec/java_home -v 21` finds it; Homebrew or a Temurin JDK installs it (the agent asks first). Run Maven with the same `JAVA_HOME` | `bin/idm` | The Keychain. An item added with `security` is read without a prompt; one made in Keychain Access asks once (choose Always Allow). A missing item's error names the command to run | `chmod 600` both properties files; the tool warns once per run when either is readable by others |
| **Linux** | `IDM_JAVA_HOME`, else a `JAVA_HOME` that is 21, else `/usr/lib/jvm/*21*`, else `java` on `PATH` when it is 21. The distro's OpenJDK 21 (`openjdk-21-jdk` on Debian and Ubuntu, `java-21-openjdk-devel` on Fedora and RHEL) and Maven 3.9 or newer are enough | `bin/idm` | `passwordCommand=` or `passwordEnv=` | `chmod 600` as on macOS; `XDS.jar` must keep its capitals on a case-sensitive filesystem |
| **Windows** | `IDM_JAVA_HOME` or `JAVA_HOME` only; no search. The simulator jar is under `%USERPROFILE%\.m2\repository\com\pointblue\dirxml\dirxml-simulator\1.8.0\` | `bin\idm.cmd`; Git Bash or WSL can run `bin/idm`, which has the fuller search and reads `$HOME/.m2` — use one home directory for Maven and the launcher | `passwordCommand=` or `passwordEnv=`; there is no Keychain | The mode-600 warning is a POSIX check; keep the two properties files out of git and out of shared folders |
| **Windows** | `IDM_JAVA_HOME` or `JAVA_HOME` only; no search. The simulator jar is under `%USERPROFILE%\.m2\repository\com\pointbluetech\dirxml\dirxml-simulator\1.8.0\` | `bin\idm.cmd`; Git Bash or WSL can run `bin/idm`, which has the fuller search and reads `$HOME/.m2` — use one home directory for Maven and the launcher | `passwordCommand=` or `passwordEnv=`; there is no Keychain | The mode-600 warning is a POSIX check; keep the two properties files out of git and out of shared folders |

A fresh Designer project from a vault, without Designer connecting, is a
later task: [howto-fresh-designer-project.md](howto-fresh-designer-project.md).
Expand Down
Loading
Loading