junit.http: Extract AppServerBase to dedupe the EE8 AppServer overlay

The EE8 servlet bridge ships a hand-maintained
org.eclipse.jgit.junit.http.ee8 AppServer because the canonical
AppServer cannot be rewritten into its EE8 form automatically: the Jetty
security API (Constraint.Builder + ContextHandler juggling) differs
structurally from the Jetty EE8 one (ServletConstraint +
setSecurityHandler), which a jakarta->javax string rewrite cannot
bridge. The overlay was a 461-line copy; only ~40 lines diverge.

Split the common code into an abstract AppServerBase and reduce both
AppServers to the generation-specific part:

  AppServerBase            common server/context/login wiring plus the
                           protected abstract configureAuthentication()
                           method; transform-safe (only the
                           ServletContextHandler import renames ee10 ->
                           ee8).
  AppServer (canonical)    EE10: Constraint.Builder + setHandler.
  AppServer (ee8 overlay)  EE8: ServletConstraint + setSecurityHandler.
                           461 -> 103 lines.

Both toolchains pick AppServerBase up for free: the Bazel transform and
the Maven antrun copy both exclude only the file name AppServer.java, so
AppServerBase.java flows through the jakarta->javax / ee10->ee8 rewrite
while the hand-written EE8 AppServer.java stays the overlay. No BUILD or
pom changes. The class stays named AppServer in both worlds (separate
classpaths), so every "new AppServer(...)" site is untouched.

Moving the shared username/password constants into AppServerBase turns
the AppServer.username uses in the HTTP tests into an indirect static
access, which JGit's ecj settings escalate to a compile error (caught by
Maven, not by the Bazel javac build). Reference the declaring class
(AppServerBase.username) instead of re-declaring the constants on both
AppServers, which would reintroduce the duplication this change removes.

Alternative considered: renaming the EE8 overlay to EE8AppServer.
Rejected because a distinct name forces rewriting every
"new AppServer(...)" site in the transformed EE8 tests and couples the
transform to class names instead of imports.

Copyright is carried over unchanged from the split file.

Change-Id: I1d68bcc7d1d23668696ee91d8910f4940064bb37
5 files changed
tree: da54153b473bd31dd6ce8971bb32ebc569eccbf2
  1. .github/
  2. .mvn/
  3. .settings/
  4. Documentation/
  5. lib/
  6. org.eclipse.jgit/
  7. org.eclipse.jgit.ant/
  8. org.eclipse.jgit.ant.test/
  9. org.eclipse.jgit.archive/
  10. org.eclipse.jgit.benchmarks/
  11. org.eclipse.jgit.coverage/
  12. org.eclipse.jgit.gpg.bc/
  13. org.eclipse.jgit.gpg.bc.test/
  14. org.eclipse.jgit.http.apache/
  15. org.eclipse.jgit.http.server/
  16. org.eclipse.jgit.http.server.ee8/
  17. org.eclipse.jgit.http.test/
  18. org.eclipse.jgit.http.test.ee8/
  19. org.eclipse.jgit.junit/
  20. org.eclipse.jgit.junit.http/
  21. org.eclipse.jgit.junit.http.ee8/
  22. org.eclipse.jgit.junit.ssh/
  23. org.eclipse.jgit.lfs/
  24. org.eclipse.jgit.lfs.server/
  25. org.eclipse.jgit.lfs.server.ee8/
  26. org.eclipse.jgit.lfs.server.test/
  27. org.eclipse.jgit.lfs.server.test.ee8/
  28. org.eclipse.jgit.lfs.test/
  29. org.eclipse.jgit.packaging/
  30. org.eclipse.jgit.pgm/
  31. org.eclipse.jgit.pgm.test/
  32. org.eclipse.jgit.ssh.apache/
  33. org.eclipse.jgit.ssh.apache.agent/
  34. org.eclipse.jgit.ssh.apache.test/
  35. org.eclipse.jgit.ssh.jsch/
  36. org.eclipse.jgit.ssh.jsch.test/
  37. org.eclipse.jgit.test/
  38. org.eclipse.jgit.ui/
  39. tools/
  40. .bazelrc
  41. .bazelversion
  42. .gitattributes
  43. .gitignore
  44. .mailmap
  45. BUILD
  46. CODE_OF_CONDUCT.md
  47. CONTRIBUTING.md
  48. LICENSE
  49. MODULE.bazel
  50. pom.xml
  51. README.md
  52. SECURITY.md
  53. WORKSPACE
README.md

Java Git

An implementation of the Git version control system in pure Java.

This project is licensed under the EDL (Eclipse Distribution License).

JGit can be imported straight into Eclipse and built and tested from there. It can be built from the command line using Maven or Bazel. The CI builds use Maven and run on Jenkins.

  • org.eclipse.jgit

    A pure Java library capable of being run standalone, with no additional support libraries. It provides classes to read and write a Git repository and operate on a working directory.

    All portions of JGit are covered by the EDL. Absolutely no GPL, LGPL or EPL contributions are accepted within this package.

  • org.eclipse.jgit.ant

    Ant tasks based on JGit.

  • org.eclipse.jgit.archive

    Support for exporting to various archive formats (zip etc).

  • org.eclipse.jgit.http.apache

    Apache httpclient support.

  • org.eclipse.jgit.http.server

    Server for the smart and dumb Git HTTP protocol.

  • org.eclipse.jgit.lfs

    Support for LFS (Large File Storage).

  • org.eclipse.jgit.lfs.server

    Basic LFS server support.

  • org.eclipse.jgit.packaging

    Production of Eclipse features and p2 repository for JGit. See the JGit Wiki on why and how to use this module.

  • org.eclipse.jgit.pgm

    Command-line interface Git commands implemented using JGit (“pgm” stands for program).

  • org.eclipse.jgit.ssh.apache

    Client support for the SSH protocol based on Apache Mina sshd.

  • org.eclipse.jgit.ssh.apache.agent

    Optional support for SSH agents for org.eclipse.jgit.ssh.apache.

  • org.eclipse.jgit.ui

    Simple UI for displaying git log.

Tests

  • org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, org.eclipse.jgit.junit.ssh: Helpers for unit testing
  • org.eclipse.jgit.ant.test: Unit tests for org.eclipse.jgit.ant
  • org.eclipse.jgit.http.test: Unit tests for org.eclipse.jgit.http.server
  • org.eclipse.jgit.lfs.server.test: Unit tests for org.eclipse.jgit.lfs.server
  • org.eclipse.jgit.lfs.test: Unit tests for org.eclipse.jgit.lfs
  • org.eclipse.jgit.pgm.test: Unit tests for org.eclipse.jgit.pgm
  • org.eclipse.jgit.ssh.apache.test: Unit tests for org.eclipse.jgit.ssh.apache
  • org.eclipse.jgit.test: Unit tests for org.eclipse.jgit

Warnings/Caveats

  • Native symbolic links are supported, provided the file system supports them. For Windows you must use a non-administrator account and have the SeCreateSymbolicLinkPrivilege.

  • Only the timestamp of the index is used by JGit if the index is dirty.

  • JGit 6.0 and newer requires at least Java 11. Older versions require at least Java 1.8.

  • CRLF conversion is performed depending on the core.autocrlf setting, however Git for Windows by default stores that setting during installation in the “system wide” configuration file. If Git is not installed, use the global or repository configuration for the core.autocrlf setting.

  • The system wide configuration file is located relative to where C Git is installed. Make sure Git can be found via the PATH environment variable. When installing Git for Windows check the “Run Git from the Windows Command Prompt” option. There are other options like Eclipse settings that can be used for pointing out where C Git is installed. Modifying PATH is the recommended option if C Git is installed.

  • We try to use the same notation of $HOME as C Git does. On Windows this is often not the same value as the user.home system property.

Features

  • org.eclipse.jgit

    • Read loose and packed commits, trees, blobs, including deltafied objects.

    • Read objects from shared repositories

    • Write loose commits, trees, blobs.

    • Write blobs from local files or Java InputStreams.

    • Read blobs as Java InputStreams.

    • Copy trees to local directory, or local directory to a tree.

    • Lazily loads objects as necessary.

    • Read and write .git/config files.

    • Create a new repository.

    • Read and write refs, including walking through symrefs.

    • Read, update and write the Git index.

    • Checkout in dirty working directory if trivial.

    • Walk the history from a given set of commits looking for commits introducing changes in files under a specified path.

    • Object transport

      Fetch via ssh, git, http, Amazon S3 and bundles. Push via ssh, git, http, and Amazon S3. JGit does not yet deltify the pushed packs so they may be a lot larger than C Git packs.

    • Garbage collection

    • Merge

    • Rebase

    • And much more

  • org.eclipse.jgit.pgm

    • Assorted set of command line utilities. Mostly for ad-hoc testing of jgit log, glog, fetch etc.
  • org.eclipse.jgit.ant

    • Ant tasks
  • org.eclipse.jgit.archive

    • Support for Zip/Tar and other formats
  • org.eclipse.http

    • HTTP client and server support

Missing Features

There are some missing features:

  • signing push
  • shallow and partial cloning
  • support for remote helpers
  • support for credential helpers
  • support for multiple working trees (git-worktree)
  • using external diff tools
  • support for HTTPS client certificates
  • SHA-256 object IDs
  • git protocol V2 (client side): packfile-uris
  • multi-pack index
  • split index

Support

Post questions, comments or discussions to the jgit-dev@eclipse.org mailing list. You need to be subscribed to post. File bugs and enhancement requests in Bugzilla.

Contributing

See the EGit Contributor Guide.

About Git

More information about Git, its repository format, and the canonical C based implementation can be obtained from the Git website.