372 Commits

Author SHA1 Message Date
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
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
85710fb9ea Reverted release back to 7.6.3-SNAPSHOT. 2012-04-13 16:59:06 +02: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
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
72951403d3 375096 If starting a server instance fails in osgi it is cleaned up. 2012-03-26 22:48:50 +11:00
Jan Bartel
309a58647e Fix package of org.glassfish.jsp 2012-03-09 16:30:13 +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
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
f12e3c390c reset versions 2012-03-06 17:06:10 -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
7fe5454888 [Bug 372093] handle quotes in Require-Bundle manifest string 2012-02-21 16:03:32 -06:00
Jesse McConnell
efb6883cf0 [maven-release-plugin] prepare for next development iteration 2012-02-15 14:22:19 -06:00
Jesse McConnell
baf2b94f77 [maven-release-plugin] prepare release jetty-7.6.1.v20120215 2012-02-15 14:22:12 -06:00
Joakim Erdfelt
228ff32ab0 Cleaning up jetty-jsp dependencies to only arrive via jetty-jsp 2012-02-01 08:59:00 -07:00
Joakim Erdfelt
fdaad62b63 Migrating old javax.* deps to new org.eclipse.jetty.orbit deps
+ Removed old deps in javax.*, geronimo, and asm in favor of
  new org.eclipse.jetty.orbit deps
+ Added enforcer rule to prevent reintroducing the old deps.
2012-01-31 15:21:58 -07:00
Joakim Erdfelt
6e3bd75d99 Setting failing jetty osgi + jsp test to @Ignore till I can get help 2012-01-31 14:01:44 -07:00
Joakim Erdfelt
c4cf25f51b Raising new orbit deps to top level dependencyManagement, and wiring up jetty-osgi with new deps 2012-01-31 14:00:47 -07:00
Joakim Erdfelt
b2b8cf5dd5 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-01-30 09:11:11 -07:00
Jesse McConnell
ad6126553b [maven-release-plugin] prepare for next development iteration 2012-01-27 08:13:06 -06:00
Jesse McConnell
4e25f7bb05 [maven-release-plugin] prepare release jetty-7.6.0.v20120127 2012-01-27 08:13:00 -06:00
Jesse McConnell
7ac9eb585f revert back to 7.6.0-SNAPSHOT 2012-01-26 10:42:11 -06:00
Jesse McConnell
0c96fc40ea [maven-release-plugin] prepare for next development iteration 2012-01-25 09:31:06 -06:00
Jesse McConnell
b455b7d94e [maven-release-plugin] prepare release jetty-7.6.0.v20120125 2012-01-25 09:30:55 -06:00
Joakim Erdfelt
e9287677f0 Making paxexam a property in prep for upgrade 2012-01-20 14:17:51 -07:00
Jesse McConnell
16833ca8c9 [maven-release-plugin] prepare for next development iteration 2012-01-20 10:50:24 -06:00
Jesse McConnell
dd80d7e868 [maven-release-plugin] prepare release jetty-7.6.0.RC5 2012-01-20 10:50:14 -06:00
Jesse McConnell
ec7eb3348a Revert "Get rid of javax.activation."
this was not appropriate for jetty7 which needs to support java 1.5 which is not universally bundling javax.activation as previously understood.  The original commit should stand for jetty 8 though which will be handled during that merge

This reverts commit fae4f3fda93cbe2b0fe6dec42c1dec54a491c69a.
2012-01-18 15:16:34 -06:00
Alexander Kurtakov
fae4f3fda9 Get rid of javax.activation.
Java activation framework (JAF) or javax.activation:activation(maven) is an API that is integral part of
every Java 5 level virtual machine. As such there is no point in still referencing/downloading/including or making any other operation
with it. Simply removing references to it in build scripts makes it use the JVM provided one.

Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
2012-01-13 16:09:08 -06:00
Jesse McConnell
45cf0552fc [maven-release-plugin] prepare for next development iteration 2012-01-13 08:37:25 -06:00
Jesse McConnell
ec589eed33 [maven-release-plugin] prepare release jetty-7.6.0.RC4 2012-01-13 08:37:19 -06:00
Jesse McConnell
49b3239aa6 clear up the last of the maven warnings I see 2012-01-10 13:45:39 -06:00
Jesse McConnell
e0f117f2a8 resolve another maven warning 2012-01-09 15:16:59 -06:00
Jesse McConnell
0fa4fa9b23 clean up some warnings from maven 2012-01-09 14:57:21 -06:00
Jan Bartel
0b1becf58d 364936 use Resource for opening URL streams 2011-12-08 12:16:36 +11:00
Greg Wilkins
de005c68fd Revert "Merge branch 'release-8'"
This reverts commit 9e72457941e98eb2ee1adf64f2bc53160b01e34d, reversing
changes made to df12605f0e3e549c07c96968eedfd382fd6f274e.
2011-11-30 16:27:30 +11:00