Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-23 16:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,658 Commits 55 Branches 466 Tags
Commit Graph

410 Commits

Author SHA1 Message Date
Jan Bartel
6832d8805a Ensure each context that is deployed also is registered as an osgi service, taking care that contexts that were already registered as services are not re-registered. 2012-05-31 11:27:05 +02:00
Jan Bartel
3e18545844 Merge remote-tracking branch 'origin/master' into osgi_refactor 2012-05-30 14:38:24 +02:00
Jesse McConnell
30e8e40ef2 [maven-release-plugin] prepare for next development iteration 2012-05-24 15:41:45 -05:00
Jesse McConnell
667cf9a643 [maven-release-plugin] prepare release jetty-8.1.4.v20120524 2012-05-24 15:41:38 -05:00
Jesse McConnell
d23a3c90b5 [maven-release-plugin] prepare for next development iteration 2012-05-24 15:40:47 -05:00
Jesse McConnell
57c73283d8 [maven-release-plugin] prepare release jetty-7.6.4.v20120524 2012-05-24 15:40:35 -05:00
Jesse McConnell
e45a89694a [maven-release-plugin] prepare for next development iteration 2012-05-24 09:30:58 -05:00
Jesse McConnell
36fc6fe890 [maven-release-plugin] prepare release jetty-8.1.4.v20120524 2012-05-24 09:30:52 -05:00
Jesse McConnell
035e16aedc [maven-release-plugin] prepare for next development iteration 2012-05-24 09:27:27 -05:00
Jesse McConnell
f8c629026d [maven-release-plugin] prepare release jetty-7.6.4.v20120524 2012-05-24 09:27:21 -05:00
Jesse McConnell
c7a9adaa32 reset for release 2012-05-24 08:33:44 -05:00
Jesse McConnell
c8fe38733f reset versions for release 2012-05-24 08:30:26 -05:00
Jesse McConnell
ea176f0586 [maven-release-plugin] prepare for next development iteration 2012-05-22 15:14:05 -05:00
Jesse McConnell
3fdda881d8 [maven-release-plugin] prepare release jetty-8.1.4.v20120522 2012-05-22 15:13:56 -05:00
Jesse McConnell
300a37319a [maven-release-plugin] prepare for next development iteration 2012-05-22 14:34:10 -05:00
Jesse McConnell
9ccd059375 [maven-release-plugin] prepare release jetty-7.6.4.v20120522 2012-05-22 14:33:59 -05:00
Jan Bartel
34954bc617 Merge remote-tracking branch 'origin/master' into jetty-8 2012-05-22 17:28:40 +02:00
Jan Bartel
050db55f1b NullPointer fix 2012-05-17 16:41:01 +02:00
Jan Bartel
4a312f7cb6 More refactoring. 2012-05-17 14:48:30 +02:00
Jan Bartel
98cda498cb More refactoring. 2012-05-16 12:25:19 +02:00
Jan Bartel
b2998c2c4d Refactoring 2012-05-14 18:46:21 +02:00
Jan Bartel
9773113a47 After discussion with original author Hugues, decided to remove this implementation in favour of using only JettyServerServiceTracker. 2012-05-10 14:54:42 +02:00
Jan Bartel
b281b037dd 379015 Use factored jetty xml config files for defaults 2012-05-10 11:27:58 +02:00
Jan Bartel
9aa5f49df5 379015 Use factored jetty xml config files for defaults 2012-05-09 18:28:28 +02:00
Jan Bartel
3618be23cd Cosmetic changes: typos, javadocs, comments, indenting 2012-05-09 16:47:45 +02:00
Jan Bartel
eae1b01122 Reformat and reindent code. 2012-05-09 09:33:44 +02:00
Jan Bartel
2131a40559 Merge remote-tracking branch 'origin/master' into jetty-8 2012-05-07 13:54:30 +02:00
Jan Bartel
ac2c07db56 377492 NPE if jsp taglibs bundle not deployed 2012-05-07 10:46:53 +02:00
Jan Bartel
1634ac1fce 377391 Bundle-Version for org.eclipse.jetty.osgi.* is not correct 2012-04-27 08:06:41 +10:00
Jan Bartel
1871b0036f Update version after release 2012-04-25 15:57:01 +10:00
Jan Bartel
c4416e2ed7 377492 NPE when deploying a Web Application Bundle with unresolved Require-TldBundle 2012-04-25 09:54:39 +10:00
Jan Bartel
734f2bcae1 371853 Support bundleentry: protocol for webapp embedded as directory in osgi bundle 2012-04-24 18:16:11 +10:00
Jesse McConnell
b64909900c [maven-release-plugin] prepare for next development iteration 2012-04-13 15:31:47 -05:00
Jesse McConnell
2c0a35d430 [maven-release-plugin] prepare release jetty-8.1.3.v20120413 2012-04-13 15:31:38 -05:00
Jesse McConnell
b963840d40 [maven-release-plugin] prepare for next development iteration 2012-04-13 15:29:14 -05:00
Jesse McConnell
a652ee7396 [maven-release-plugin] prepare release jetty-7.6.3.v20120413 2012-04-13 15:29:05 -05:00
Simone Bordet
72040202d4 Reverted release back to 8.1.3-SNAPSHOT. 2012-04-13 17:27:37 +02:00
Simone Bordet
85710fb9ea Reverted release back to 7.6.3-SNAPSHOT. 2012-04-13 16:59:06 +02:00
Jesse McConnell
3b87e91cbe [maven-release-plugin] prepare for next development iteration 2012-04-12 10:29:30 -05:00
Jesse McConnell
308b010744 [maven-release-plugin] prepare release jetty-8.1.3.v20120412 2012-04-12 10:29:20 -05:00
Jesse McConnell
cdcc0922c3 [maven-release-plugin] prepare for next development iteration 2012-04-12 09:49:52 -05:00
Jesse McConnell
5966c86571 [maven-release-plugin] prepare release jetty-7.6.3.v20120412 2012-04-12 09:49:46 -05:00
Greg Wilkins
325c484950 fixed merge issues 2012-04-12 17:16:45 +10:00
Greg Wilkins
ee2d289f63 Merge remote-tracking branch 'origin/master' into jetty-8 
Conflicts:
	jetty-npn/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/WebappRegistrationCustomizerImpl.java
	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
	jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleTrackerCustomizer.java
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultFileLocatorHelper.java
	jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF
	jetty-spdy/spdy-jetty-http-webapp/pom.xml
	jetty-spdy/spdy-jetty-http/pom.xml
	jetty-spdy/spdy-jetty/pom.xml
 2012-04-12 16:02:34 +10:00
Jan Bartel
d47d4b15ea Added ability to use a META-INF/jetty-webapp-context.xml file to apply a context configuration file to a webapp. 
Replaced more printStackTrace with log calls; more formatting.
 2012-04-05 17:34:00 +10:00
Jan Bartel
911643b783 Reformat src code; ensure url caching is controlled by jetty Resource.setDefaultUseCaches 2012-04-04 15:13:33 +10:00
Jan Bartel
792b101639 Update version in MANIFESTs 2012-04-04 15:13:02 +10:00
Jan Bartel
17269583fb Merge remote-tracking branch 'origin/master' into jetty-8 2012-03-30 12:05:46 +11:00
Jan Bartel
72951403d3 375096 If starting a server instance fails in osgi it is cleaned up. 2012-03-26 22:48:50 +11:00
Jan Bartel
48982ced4a Fix up version number in manifests; reformat code; tidy xml and tweak 2012-03-21 16:39:55 +11:00