summaryrefslogtreecommitdiffstats
path: root/src/main/java/WEB-INF
Commit message (Collapse)AuthorAgeFilesLines
* Update weblogic.xmlBala Raman2017-01-161-2/+2
| | | Update to web app 3.0 xsd
* Update to web.xml, fix to #1132Bala Raman2017-01-151-4/+4
| | | | | Update to web.xml, fix to #1132 Fixes to namespace to fix xml parse error, where strict validation required
* use JEE 3.0 to allow cookie session trackingJoel Johnson2015-06-291-2/+5
|
* Removed beans.xmlJames Moger2014-07-031-10/+0
|
* Use Guice-Servlet rather than custom code and expose the InjectorJames Moger2014-07-031-2/+16
| | | | | | | | | | | | | | | This is a fairly functional variation of Gitblit with one notable exception: The security filters are not working properly. This is a design flaw in Guice that I have reported upstream [1]. The general idea is that Guice-Servlet filters are not properly wrapping the ServletRequest. This has historically been a problem for Guice-Servlet servlets but Google has fixed most of those issues. Unfortunately, all the same flaws reported against the servlet delegation also exist in Guice-Servlet filter delegation. :( [1]: https://code.google.com/p/google-guice/issues/detail?id=807
* Return of Servlet3 servlet and filter loadingJames Moger2014-07-032-360/+44
| | | | This is a quick return of the servlet3-style code which was reverted mid-December 2013. It is not completely tested, but a casual review was done and it's looks good. The next steps should be to restore `@Inject` annotations, simplify *DaggerModule* boilerplate, and run this on a JEE container with CDI - like JBoss AS 7.
* Switch to basic ant copy filter for web.xmlJames Moger2014-06-091-5/+1
|
* Add http request filter extension pointDavid Ostrovsky2014-05-051-1/+10
| | | | | To allow for integration of 3rd party server monitoring solutions, Gitblit needs to expose an extension point for collecting http data.
* Replace RawPage with RawServletJames Moger2014-05-051-15/+15
|
* Split pages servlet into a raw branch servlet and a gh-pages servletJames Moger2014-05-041-2/+34
|
* Add plugins/extension infrastructureDavid Ostrovsky2014-04-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Plugins are stored in `${baseFolder}/plugins` and are loaded during startup by the PluginManager. A plugin defines it's metadata in META-INF/MANIFEST.MF: Plugin-Class: com.gitblit.plugins.cookbook.CookbookPlugin Plugin-Dependencies: foo, bar Plugin-Id: gitblit-plugin Plugin-Provider: John Doe Plugin-Version: 1.0 Plugins can define extension points that can be implemented by other plugins and they can depend on other plugins: Plugin-Dependencies: foo, bar During the load phase, a directed acyclic graph is built and the loading order of the dependency chain is reversed using a topological sort; parent followed by children. The parent plugin classloader is the combined classloader of all parent plugins. Change-Id: I738821fa2bff02a5dbe339a944cc7e3c4dd8e299
* Ticket tracker with patchset contributionsJames Moger2014-03-031-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A basic issue tracker styled as a hybrid of GitHub and BitBucket issues. You may attach commits to an existing ticket or you can push a single commit to create a *proposal* ticket. Tickets keep track of patchsets (one or more commits) and allow patchset rewriting (rebase, amend, squash) by detecing the non-fast-forward update and assigning a new patchset number to the new commits. Ticket tracker -------------- The ticket tracker stores tickets as an append-only journal of changes. The journals are deserialized and a ticket is built by applying the journal entries. Tickets are indexed using Apache Lucene and all queries and searches are executed against this Lucene index. There is one trade-off to this persistence design: user attributions are non-relational. What does that mean? Each journal entry stores the username of the author. If the username changes in the user service, the journal entry will not reflect that change because the values are hard-coded. Here are a few reasons/justifications for this design choice: 1. commit identifications (author, committer, tagger) are non-relational 2. maintains the KISS principle 3. your favorite text editor can still be your administration tool Persistence Choices ------------------- **FileTicketService**: stores journals on the filesystem **BranchTicketService**: stores journals on an orphan branch **RedisTicketService**: stores journals in a Redis key-value datastore It should be relatively straight-forward to develop other backends (MongoDB, etc) as long as the journal design is preserved. Pushing Commits --------------- Each push to a ticket is identified as a patchset revision. A patchset revision may add commits to the patchset (fast-forward) OR a patchset revision may rewrite history (rebase, squash, rebase+squash, or amend). Patchset authors should not be afraid to polish, revise, and rewrite their code before merging into the proposed branch. Gitblit will create one ref for each patchset. These refs are updated for fast-forward pushes or created for rewrites. They are formatted as `refs/tickets/{shard}/{id}/{patchset}`. The *shard* is the last two digits of the id. If the id < 10, prefix a 0. The *shard* is always two digits long. The shard's purpose is to ensure Gitblit doesn't exceed any filesystem directory limits for file creation. **Creating a Proposal Ticket** You may create a new change proposal ticket just by pushing a **single commit** to `refs/for/{branch}` where branch is the proposed integration branch OR `refs/for/new` or `refs/for/default` which both will use the default repository branch. git push origin HEAD:refs/for/new **Updating a Patchset** The safe way to update an existing patchset is to push to the patchset ref. git push origin HEAD:refs/heads/ticket/{id} This ensures you do not accidentally create a new patchset in the event that the patchset was updated after you last pulled. The not-so-safe way to update an existing patchset is to push using the magic ref. git push origin HEAD:refs/for/{id} This push ref will update an exisitng patchset OR create a new patchset if the update is non-fast-forward. **Rebasing, Squashing, Amending** Gitblit makes rebasing, squashing, and amending patchsets easy. Normally, pushing a non-fast-forward update would require rewind (RW+) repository permissions. Gitblit provides a magic ref which will allow ticket participants to rewrite a ticket patchset as long as the ticket is open. git push origin HEAD:refs/for/{id} Pushing changes to this ref allows the patchset authors to rebase, squash, or amend the patchset commits without requiring client-side use of the *--force* flag on push AND without requiring RW+ permission to the repository. Since each patchset is tracked with a ref it is easy to recover from accidental non-fast-forward updates. Features -------- - Ticket tracker with status changes and responsible assignments - Patchset revision scoring mechanism - Update/Rewrite patchset handling - Close-on-push detection - Server-side Merge button for simple merges - Comments with Markdown syntax support - Rich mail notifications - Voting - Mentions - Watch lists - Querying - Searches - Partial miletones support - Multiple backend options
* Use multiple mappings for the git servlet instead of multiple instancesJames Moger2013-12-131-10/+2
| | | | Change-Id: I47adeaac142ca7ea5199a5c4c2164ffd9cc68551
* Fixed regression in /r/ security due to Servlet 2.5 rollbackJames Moger2013-12-121-0/+8
| | | | Change-Id: Id7e882cf48689ace8910718e0091207f8e8c6912
* Rollback to Servlet 2.5James Moger2013-12-111-0/+273
| | | | | | | | | | | | | | | | | Combining Dagger and Servlet 3 works really well on stock Tomcat and Jetty but it is a troublesome combination on JEE containers with their own ideas on how to instantiate classes. JBoss AS 7 has been particularly nasty and it is just simpler to scaleback and stay with Servlet 2.5 than it is to fight all permuations of containers. Instead of using constructor DI, the servlets and filters each have an inject(ObjectGaph) method which is automatically called during initialization. Each servlet or filter is responsible for retrieving the required dependency from the graph. The Dagger object graph is created in the context listener and stuffed into the context as an attribute. Change-Id: Ib5714584fe73e2a6b9c6fda12af080a43356cbda
* Instantiate and register all servlets and filters from code (servlet 3)James Moger2013-11-261-267/+0
| | | | Change-Id: I6009e8e157232feab40ec275547a59e2cea23950
* Switch web.xml baseFolder from context-param to env-entryJames Moger2013-10-021-4/+6
| | | | Change-Id: Id18077126e984a767725cf9e8d8eb531a14e1713
* Implemented a graph servlet based on EGit/JGit's PlotWalk (issue-194)James Moger2013-09-171-1/+12
| | | | | | | | | The graph is generated server-side and therefore requires that the commit table row height be fixed and match the row height of the servlet. There will be layout misalignment if remotes refs are displayed. Perhaps this can be improved in the future. Change-Id: I39d0ffc7b1c3679976ce8c198c772ff86238f1a5
* Implemented optional page cachingJames Moger2013-07-191-1/+1
|
* Support custom header logo images of 120x45 (issue 208)James Moger2013-06-261-1/+14
|
* Added SparkleShare invite url panelJames Moger2013-05-021-1/+17
| | | | | This will probably be merged into a refined, single multi-protocol url panel.
* Added Git Daemon supportJames Moger2013-04-031-1/+1
|
* Added weblogic.xml to WAR for deployment on WebLogic (issue 199)James Moger2013-03-281-0/+9
|
* Removed accidentally committed file and updated ignore fileJames Moger2013-03-281-1311/+0
|
* Reorganized to Apache Standard Directory Layout & integrated MoxieJames Moger2013-03-272-0/+1574
This is a massive commit which reorganizes the entire project structure (although it is still monolithic), removes the Build classes, and switches to Moxie, a smarter Ant build tookit based on the original Gitblit Build classes. The Ant build script will likely require additional fine-tuning, but this is big step forward.