1ec8b2621b
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
2012-09-10 13:47:05 -05:00
4180d7e1f5
prepare for release
2012-09-10 12:59:04 -05:00
d37deeea74
[maven-release-plugin] prepare for next development iteration
2012-09-03 13:33:18 -05:00
b418b0dd57
[maven-release-plugin] prepare for next development iteration
2012-09-03 13:33:16 -05:00
41e9b1f6e2
[maven-release-plugin] prepare release jetty-7.6.6.v20120903
2012-09-03 13:33:10 -05:00
6c0b0af2fe
[maven-release-plugin] prepare release jetty-8.1.6.v20120903
2012-09-03 13:33:08 -05:00
3a0e9e1733
Merge branch 'master' into jetty-8
2012-08-30 09:09:44 -05:00
1cdef414b4
388393 WebAppProvider doesn't work alongside OSGi deployer
2012-08-30 16:52:16 +10:00
c7b9081a52
Merge remote-tracking branch 'origin/master' into jetty-8
2012-08-30 16:16:44 +10:00
6ab68f0dda
387943 Catch CNFE when no jstl jars are installed
2012-08-27 18:12:44 +10:00
ef17e69bd5
Merge branch 'jetty-8' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-8
2012-08-27 17:27:32 +10:00
c6cf4d4fb5
Add a toString() method to TldLocatableURLClassloader
2012-08-27 17:26:52 +10:00
6ffaa478c4
standardize license headers
2012-08-17 16:09:49 -05:00
3d1d76d214
Merge from jetty-8 to jetty-9 (license header standarization)
2012-08-17 13:44:22 -07:00
5de0cee1eb
merge from master + license block standardization
2012-08-17 14:50:43 -05:00
00ed549898
standardize license header blocks
2012-08-16 19:11:27 -05:00
136f7924fd
Jetty9 - Refactored usage of components that were using custom stop timeout to use the get/setStopTimeout() methods inherited from AbstractLifeCycle.
2012-08-10 19:02:16 +02:00
cdbec2c78b
Merge remote-tracking branch 'origin/master' into jetty-8
2012-07-26 19:05:51 +10:00
53105a689b
Synthax to load an inner class via introspection need to use a dolloar
2012-07-25 16:03:18 +08:00
d2a0cb5c50
Jetty9 - Fixed compilation problems.
2012-07-23 15:38:27 +02:00
8e0dc72b23
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
jetty-osgi/jetty-osgi-servletbridge/pom.xml
jetty-osgi/pom.xml
2012-07-23 13:24:57 +10:00
b1750c0aae
jetty-9 fixed bad merge of poms
2012-07-20 15:20:57 +10:00
20ca9ad3ac
Merge remote-tracking branch 'origin/master' into osgi_refactor
...
Remove a few System.err.printlns
2012-07-20 15:01:58 +10:00
136514948f
[maven-release-plugin] prepare for next development iteration
2012-07-16 13:24:49 -05:00
1bbc677a09
[maven-release-plugin] prepare release jetty-8.1.5.v20120716
2012-07-16 13:24:42 -05:00
f755d014cd
[maven-release-plugin] prepare for next development iteration
2012-07-16 13:23:59 -05:00
04b7e807a0
[maven-release-plugin] prepare release jetty-7.6.5.v20120716
2012-07-16 13:23:53 -05:00
c00bb2d6ca
reset for release
2012-07-16 12:55:22 -05:00
f59b2a0632
reset release
2012-07-16 12:54:36 -05:00
205e8f74f0
[maven-release-plugin] prepare for next development iteration
2012-07-13 10:20:48 -05:00
c3b5269d60
[maven-release-plugin] prepare release jetty-8.1.5.v20120713
2012-07-13 10:20:23 -05:00
12ecc10c6a
[maven-release-plugin] prepare for next development iteration
2012-07-13 09:35:08 -05:00
bf40110fb8
[maven-release-plugin] prepare release jetty-7.6.5.v20120713
2012-07-13 09:34:52 -05:00
13f4c1fcb1
Emit Event Admin events, refactor to fix not knowing if DeploymentManager actually deploys a webapp or not. TODO: stop issuing Events for context handlers that are not webapps.
2012-06-06 10:24:07 +02:00
ccacf7c17c
Implement protecting OSGI-INF, OSGI-OPTS as per OSGi Enterprise Spec.
2012-06-04 17:19:38 +02:00
8cb131c7fd
Provide service properties and webapp attributes as specified by OSGi enterprise spec r4
2012-06-01 16:19:32 +02:00
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
36518d618b
Update to 7.6.5
2012-05-31 11:25:33 +02:00
3e18545844
Merge remote-tracking branch 'origin/master' into osgi_refactor
2012-05-30 14:38:24 +02:00
30e8e40ef2
[maven-release-plugin] prepare for next development iteration
2012-05-24 15:41:45 -05:00
667cf9a643
[maven-release-plugin] prepare release jetty-8.1.4.v20120524
2012-05-24 15:41:38 -05:00
d23a3c90b5
[maven-release-plugin] prepare for next development iteration
2012-05-24 15:40:47 -05:00
57c73283d8
[maven-release-plugin] prepare release jetty-7.6.4.v20120524
2012-05-24 15:40:35 -05:00
e45a89694a
[maven-release-plugin] prepare for next development iteration
2012-05-24 09:30:58 -05:00
36fc6fe890
[maven-release-plugin] prepare release jetty-8.1.4.v20120524
2012-05-24 09:30:52 -05:00
035e16aedc
[maven-release-plugin] prepare for next development iteration
2012-05-24 09:27:27 -05:00
f8c629026d
[maven-release-plugin] prepare release jetty-7.6.4.v20120524
2012-05-24 09:27:21 -05:00
c7a9adaa32
reset for release
2012-05-24 08:33:44 -05:00
c8fe38733f
reset versions for release
2012-05-24 08:30:26 -05:00
ea176f0586
[maven-release-plugin] prepare for next development iteration
2012-05-22 15:14:05 -05:00
3fdda881d8
[maven-release-plugin] prepare release jetty-8.1.4.v20120522
2012-05-22 15:13:56 -05:00
300a37319a
[maven-release-plugin] prepare for next development iteration
2012-05-22 14:34:10 -05:00
9ccd059375
[maven-release-plugin] prepare release jetty-7.6.4.v20120522
2012-05-22 14:33:59 -05:00
34954bc617
Merge remote-tracking branch 'origin/master' into jetty-8
2012-05-22 17:28:40 +02:00
050db55f1b
NullPointer fix
2012-05-17 16:41:01 +02:00
4a312f7cb6
More refactoring.
2012-05-17 14:48:30 +02:00
98cda498cb
More refactoring.
2012-05-16 12:25:19 +02:00
b2998c2c4d
Refactoring
2012-05-14 18:46:21 +02:00
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
b281b037dd
379015 Use factored jetty xml config files for defaults
2012-05-10 11:27:58 +02:00
9aa5f49df5
379015 Use factored jetty xml config files for defaults
2012-05-09 18:28:28 +02:00
3618be23cd
Cosmetic changes: typos, javadocs, comments, indenting
2012-05-09 16:47:45 +02:00
eae1b01122
Reformat and reindent code.
2012-05-09 09:33:44 +02:00
d0f35d10fd
Updated version on pom
2012-05-08 15:23:23 +02:00
4926fa9bd5
Reformatted classes.
2012-05-08 15:21:43 +02:00
a5f96f21d0
Removing from jetty-8
2012-05-07 13:56:24 +02:00
2131a40559
Merge remote-tracking branch 'origin/master' into jetty-8
2012-05-07 13:54:30 +02:00
ac2c07db56
377492 NPE if jsp taglibs bundle not deployed
2012-05-07 10:46:53 +02:00
d0825239af
377391 Manifest updates to jetty-osgi-boot-logback
2012-05-02 14:47:31 +02:00
8f98d7976f
377391 Bundle-Version for org.eclipse.jetty.osgi.* is not correct
2012-04-29 09:32:26 +10:00
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
1634ac1fce
377391 Bundle-Version for org.eclipse.jetty.osgi.* is not correct
2012-04-27 08:06:41 +10:00
1871b0036f
Update version after release
2012-04-25 15:57:01 +10:00
c4416e2ed7
377492 NPE when deploying a Web Application Bundle with unresolved Require-TldBundle
2012-04-25 09:54:39 +10:00
734f2bcae1
371853 Support bundleentry: protocol for webapp embedded as directory in osgi bundle
2012-04-24 18:16:11 +10:00
b64909900c
[maven-release-plugin] prepare for next development iteration
2012-04-13 15:31:47 -05:00
2c0a35d430
[maven-release-plugin] prepare release jetty-8.1.3.v20120413
2012-04-13 15:31:38 -05:00
b963840d40
[maven-release-plugin] prepare for next development iteration
2012-04-13 15:29:14 -05:00
a652ee7396
[maven-release-plugin] prepare release jetty-7.6.3.v20120413
2012-04-13 15:29:05 -05:00
72040202d4
Reverted release back to 8.1.3-SNAPSHOT.
2012-04-13 17:27:37 +02:00
85710fb9ea
Reverted release back to 7.6.3-SNAPSHOT.
2012-04-13 16:59:06 +02:00
3b87e91cbe
[maven-release-plugin] prepare for next development iteration
2012-04-12 10:29:30 -05:00
308b010744
[maven-release-plugin] prepare release jetty-8.1.3.v20120412
2012-04-12 10:29:20 -05:00
cdcc0922c3
[maven-release-plugin] prepare for next development iteration
2012-04-12 09:49:52 -05:00
5966c86571
[maven-release-plugin] prepare release jetty-7.6.3.v20120412
2012-04-12 09:49:46 -05:00
325c484950
fixed merge issues
2012-04-12 17:16:45 +10:00
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
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
911643b783
Reformat src code; ensure url caching is controlled by jetty Resource.setDefaultUseCaches
2012-04-04 15:13:33 +10:00
792b101639
Update version in MANIFESTs
2012-04-04 15:13:02 +10:00
17269583fb
Merge remote-tracking branch 'origin/master' into jetty-8
2012-03-30 12:05:46 +11:00
72951403d3
375096 If starting a server instance fails in osgi it is cleaned up.
2012-03-26 22:48:50 +11:00
48982ced4a
Fix up version number in manifests; reformat code; tidy xml and tweak
2012-03-21 16:39:55 +11:00
b4985ad0d5
[maven-release-plugin] prepare for next development iteration
2012-03-08 23:53:50 -06:00
7a99af4ffe
[maven-release-plugin] prepare release jetty-8.1.2.v20120308
2012-03-08 23:53:42 -06:00
309a58647e
Fix package of org.glassfish.jsp
2012-03-09 16:30:13 +11:00
5b98ee4e1d
Fix manifest versions.
2012-03-09 15:38:44 +11:00
246e3ed756
[maven-release-plugin] prepare for next development iteration
2012-03-08 21:09:46 -06:00
a63b3fdc5e
[maven-release-plugin] prepare release jetty-7.6.2.v20120308
2012-03-08 21:09:37 -06:00
2e61650264
merge from master and adjust osgi bits
2012-03-08 20:32:20 -06:00
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
9f3834038c
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-03-07 12:15:33 +11:00
3e13a26ccd
Removing unnecessary stuff from poms and adding jetty-plus dep
2012-03-07 12:14:55 +11:00
50d92ec8ef
reset versions
2012-03-06 17:07:53 -06:00
f12e3c390c
reset versions
2012-03-06 17:06:10 -06:00
d1c8c477ea
[maven-release-plugin] prepare for next development iteration
2012-03-02 08:57:43 -06:00
b75868e84f
[maven-release-plugin] prepare release jetty-8.1.2.v20120302
2012-03-02 08:57:19 -06:00
51311d050e
[maven-release-plugin] prepare for next development iteration
2012-03-02 08:37:46 -06:00
a8296ec3d5
[maven-release-plugin] prepare release jetty-7.6.2.v20120302
2012-03-02 08:37:38 -06:00
409522bc64
Merge branch 'master' into jetty-8
2012-02-21 16:04:45 -06:00
7fe5454888
[Bug 372093] handle quotes in Require-Bundle manifest string
2012-02-21 16:03:32 -06:00
ac79497dee
[maven-release-plugin] prepare for next development iteration
2012-02-15 14:29:36 -06:00
3705b424c8
[maven-release-plugin] prepare release jetty-8.1.1.v20120215
2012-02-15 14:29:28 -06:00
efb6883cf0
[maven-release-plugin] prepare for next development iteration
2012-02-15 14:22:19 -06:00
baf2b94f77
[maven-release-plugin] prepare release jetty-7.6.1.v20120215
2012-02-15 14:22:12 -06:00
6b079ae3d8
merge from master
2012-02-01 17:25:08 -06:00
228ff32ab0
Cleaning up jetty-jsp dependencies to only arrive via jetty-jsp
2012-02-01 08:59:00 -07:00
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
6e3bd75d99
Setting failing jetty osgi + jsp test to @Ignore till I can get help
2012-01-31 14:01:44 -07:00
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
b2b8cf5dd5
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-01-30 09:11:11 -07:00
6e44f4db5f
[maven-release-plugin] prepare for next development iteration
2012-01-27 08:15:45 -06:00
9d1ca3593e
[maven-release-plugin] prepare release jetty-8.1.0.v20120127
2012-01-27 08:15:38 -06:00
ad6126553b
[maven-release-plugin] prepare for next development iteration
2012-01-27 08:13:06 -06:00
4e25f7bb05
[maven-release-plugin] prepare release jetty-7.6.0.v20120127
2012-01-27 08:13:00 -06:00
f2d0fd3cc8
revert back to 8.1.0-SNAPSHOT
2012-01-26 10:45:06 -06:00
7ac9eb585f
revert back to 7.6.0-SNAPSHOT
2012-01-26 10:42:11 -06:00
e98ae91ca6
[maven-release-plugin] prepare for next development iteration
2012-01-25 11:16:11 -06:00
fb30166a7f
[maven-release-plugin] prepare release jetty-8.1.0.v20120125
2012-01-25 11:16:05 -06:00
0c96fc40ea
[maven-release-plugin] prepare for next development iteration
2012-01-25 09:31:06 -06:00
b455b7d94e
[maven-release-plugin] prepare release jetty-7.6.0.v20120125
2012-01-25 09:30:55 -06:00
e9287677f0
Making paxexam a property in prep for upgrade
2012-01-20 14:17:51 -07:00
ec731e691d
[maven-release-plugin] prepare for next development iteration
2012-01-20 12:28:31 -06:00
6004fd4553
[maven-release-plugin] prepare release jetty-8.1.0.RC5
2012-01-20 12:28:24 -06:00
16833ca8c9
[maven-release-plugin] prepare for next development iteration
2012-01-20 10:50:24 -06:00
dd80d7e868
[maven-release-plugin] prepare release jetty-7.6.0.RC5
2012-01-20 10:50:14 -06:00
e1b12a633b
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-distribution/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
2012-01-20 13:00:32 +11:00
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 fae4f3fda9
2012-01-18 15:16:34 -06:00
90184ab3c3
Latest merge from master
2012-01-17 13:36:44 -06:00
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
45cf0552fc
[maven-release-plugin] prepare for next development iteration
2012-01-13 08:37:25 -06:00
ec589eed33
[maven-release-plugin] prepare release jetty-7.6.0.RC4
2012-01-13 08:37:19 -06:00
691efcc7ca
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-11 16:35:57 +11:00
49b3239aa6
clear up the last of the maven warnings I see
2012-01-10 13:45:39 -06:00
1fbec51c8a
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-10 16:08:59 +11:00
e0f117f2a8
resolve another maven warning
2012-01-09 15:16:59 -06:00
0fa4fa9b23
clean up some warnings from maven
2012-01-09 14:57:21 -06:00
4f8cff8ccd
bug 367548 the nested package must not be imported twice in jetty-osgi-boot
2011-12-27 07:59:13 +08:00
c3643d9937
Merge remote-tracking branch 'origin/master' into jetty-8
2011-12-21 12:37:23 +11:00
0b1becf58d
364936 use Resource for opening URL streams
2011-12-08 12:16:36 +11:00
Jesse McConnell
Jan Bartel
Joakim Erdfelt
Simone Bordet
hmalphettes
Greg Wilkins
Greg Wilkins
Alexander Kurtakov
Jan Bartel
hmalphettes