1
0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-19 13:06:06 +00:00

466 Commits

Author SHA1 Message Date
Jan Bartel
eae1b01122 Reformat and reindent code. 2012-05-09 09:33:44 +02:00
Jan Bartel
d0f35d10fd Updated version on pom 2012-05-08 15:23:23 +02:00
Jan Bartel
4926fa9bd5 Reformatted classes. 2012-05-08 15:21:43 +02:00
Jan Bartel
a5f96f21d0 Removing from jetty-8 2012-05-07 13:56:24 +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
d0825239af 377391 Manifest updates to jetty-osgi-boot-logback 2012-05-02 14:47:31 +02:00
Jan Bartel
8f98d7976f 377391 Bundle-Version for org.eclipse.jetty.osgi.* is not correct 2012-04-29 09:32:26 +10:00
Jan Bartel
b684bfa05c 373620 Add ch.qos.logback.access.jetty to the Import-Package for jetty-osgi-boot-logback bundle 2012-04-27 13:36:40 +10: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
Jesse McConnell
b4985ad0d5 [maven-release-plugin] prepare for next development iteration 2012-03-08 23:53:50 -06:00
Jesse McConnell
7a99af4ffe [maven-release-plugin] prepare release jetty-8.1.2.v20120308 2012-03-08 23:53:42 -06:00
Jan Bartel
309a58647e Fix package of org.glassfish.jsp 2012-03-09 16:30:13 +11:00
Jan Bartel
5b98ee4e1d Fix manifest versions. 2012-03-09 15:38:44 +11:00
Jesse McConnell
246e3ed756 [maven-release-plugin] prepare for next development iteration 2012-03-08 21:09:46 -06:00
Jesse McConnell
a63b3fdc5e [maven-release-plugin] prepare release jetty-7.6.2.v20120308 2012-03-08 21:09:37 -06:00
Jesse McConnell
2e61650264 merge from master and adjust osgi bits 2012-03-08 20:32:20 -06:00
Jan Bartel
b77ad34ef0 Fix versions in manifests, fix typo in jetty-osgi-default.xml, ensure Required-TldBundles are on the classpath.
Still doesn't work with version of jsp in jetty-7.6, as the jsp compiler cannot load the class org.glassfish.jsp.api.ResourceInjector, still trying to figure that out.
2012-03-09 11:40:52 +11:00
Jan Bartel
9f3834038c Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-03-07 12:15:33 +11:00
Jan Bartel
3e13a26ccd Removing unnecessary stuff from poms and adding jetty-plus dep 2012-03-07 12:14:55 +11:00
Jesse McConnell
50d92ec8ef reset versions 2012-03-06 17:07:53 -06:00
Jesse McConnell
f12e3c390c reset versions 2012-03-06 17:06:10 -06:00
Jesse McConnell
d1c8c477ea [maven-release-plugin] prepare for next development iteration 2012-03-02 08:57:43 -06:00
Jesse McConnell
b75868e84f [maven-release-plugin] prepare release jetty-8.1.2.v20120302 2012-03-02 08:57:19 -06:00
Jesse McConnell
51311d050e [maven-release-plugin] prepare for next development iteration 2012-03-02 08:37:46 -06:00
Jesse McConnell
a8296ec3d5 [maven-release-plugin] prepare release jetty-7.6.2.v20120302 2012-03-02 08:37:38 -06:00
Jesse McConnell
409522bc64 Merge branch 'master' into jetty-8 2012-02-21 16:04:45 -06:00
Jesse McConnell
7fe5454888 [Bug 372093] handle quotes in Require-Bundle manifest string 2012-02-21 16:03:32 -06:00
Jesse McConnell
ac79497dee [maven-release-plugin] prepare for next development iteration 2012-02-15 14:29:36 -06:00