Jan Bartel
|
93cc111a02
|
Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
VERSION.txt
jetty-io/src/main/java/org/eclipse/jetty/io/nio/IndirectNIOBuffer.java
|
2011-07-25 17:42:30 +10:00 |
hmalphettes
|
5e94077ba3
|
bug 350785 Support for felix-3.2
|
2011-07-15 12:09:49 +08:00 |
|
Jan Bartel
|
86f7e76c4d
|
Merge of jetty-7 into jetty-8
Conflicts:
VERSION.txt
example-jetty-embedded/pom.xml
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-all/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-plus/pom.xml
jetty-aggregate/jetty-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp-2.1/pom.xml
jetty-nested/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-logback/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java
jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleContinuationServlet.java
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-servletbridge/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-policy/pom.xml
jetty-rewrite/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
jetty-start/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation-jetty6/pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-webapp/pom.xml
tests/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
|
2011-07-11 12:05:58 +10:00 |
Jesse McConnell
|
39674f8a8e
|
[maven-release-plugin] prepare for next development iteration
|
2011-07-07 18:43:56 -05:00 |
|
Jesse McConnell
|
5aa94f502e
|
[maven-release-plugin] prepare release jetty-7.4.4.v20110707
|
2011-07-07 18:43:50 -05:00 |
Greg Wilkins
|
17e907c2fb
|
git diff 54e885d967 remotes/origin/jetty-8-historical | patch -p1 ; git add -A
|
2011-07-07 18:18:24 +10:00 |
|
Jesse McConnell
|
6190961f31
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3454 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-07-01 11:12:45 +00:00 |
|
Jesse McConnell
|
db9f79eaff
|
[maven-release-plugin] prepare release jetty-7.4.3.v20110701
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3452 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-07-01 11:12:33 +00:00 |
Greg Wilkins
|
baabacfe95
|
reverted to 7.4.4-SNAPSHOT
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3448 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-07-01 02:22:56 +00:00 |
|
Jesse McConnell
|
b9fffcb9a0
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3447 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-07-01 00:54:20 +00:00 |
|
Jesse McConnell
|
ea23a83bb3
|
[maven-release-plugin] prepare release jetty-7.4.3.v20110630
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3445 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-07-01 00:54:07 +00:00 |
|
Jesse McConnell
|
b1ca45e709
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3441 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-06-30 19:49:20 +00:00 |
|
Jesse McConnell
|
5f5cb8ea53
|
[maven-release-plugin] prepare release jetty-7.4.3.v20110630
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3439 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-06-30 19:39:23 +00:00 |
|
Hugues Malphettes
|
1b2189a488
|
Better error messages when web-buindles fail to start cleanly.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3393 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-06-17 04:14:55 +00:00 |
|
Hugues Malphettes
|
8d18642311
|
Better error messages when web-buindles fail to start cleanly.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3392 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-06-17 04:14:08 +00:00 |
|
Hugues Malphettes
|
a90071355a
|
fix some trivial issues when building the lookup path of a webbundle.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3388 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-06-15 09:56:39 +00:00 |
|
Hugues Malphettes
|
61d572b037
|
Fix a trivial mistake on the use of the OSGiWebappConstants.JETTY_WAR_FRAGMENT_FOLDER_PATH
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3384 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-06-10 18:00:47 +00:00 |
|
Hugues Malphettes
|
71ce6291d2
|
bug 347889
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3372 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-06-01 09:01:20 +00:00 |
|
Hugues Malphettes
|
c084756951
|
clean up the redirection.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3371 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-06-01 08:59:32 +00:00 |
|
Hugues Malphettes
|
183417af1c
|
fix the regressions introduced by the support for dynamically installing bundles
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3357 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-31 02:56:26 +00:00 |
|
Hugues Malphettes
|
c77624a544
|
fix the regressions introduced by the support for dynamically installing bundles
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3356 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-31 02:55:46 +00:00 |
|
Hugues Malphettes
|
c1086a2e52
|
bug 347617 fix the trivial mistake
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3351 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-30 10:31:51 +00:00 |
|
Hugues Malphettes
|
831e84d114
|
Don't use Require-Bundle
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3350 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-30 10:30:56 +00:00 |
|
Hugues Malphettes
|
d031732aec
|
bug 347617 Dynamically install/update/remove OSGi bundles discovered in the contexts folder
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3349 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-30 09:58:18 +00:00 |
|
Hugues Malphettes
|
8e744c0595
|
clean up the exported packages
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3348 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-30 08:21:25 +00:00 |
|
Hugues Malphettes
|
b4a75c7633
|
update to the latest version.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3347 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-30 08:20:21 +00:00 |
|
Jesse McConnell
|
54e885d967
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3289 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-26 12:20:58 +00:00 |
|
Jesse McConnell
|
e35f16bae5
|
[maven-release-plugin] prepare release jetty-7.4.2.v20110526
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3287 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-26 12:14:37 +00:00 |
|
Jesse McConnell
|
64cbf74b09
|
reset poms for release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3286 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-26 11:59:36 +00:00 |
|
Greg Wilkins
|
92c1a7bc5d
|
[maven-release-plugin] prepare release jetty-7.4.2.v20110526
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3277 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-26 08:51:01 +00:00 |
|
Hugues Malphettes
|
b40d6ea5a3
|
clean up for 7.4.2 (not important)
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3248 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-24 07:33:28 +00:00 |
|
Hugues Malphettes
|
8425cf6b5d
|
Not useful for the maven build: add equinoxconsole to the folders packaged in the bundle
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3230 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-21 05:07:20 +00:00 |
|
Hugues Malphettes
|
30c9de57ab
|
bug 34605 Clean-up
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3229 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-21 04:13:11 +00:00 |
|
Hugues Malphettes
|
cd21c56d4b
|
bug 34605 Export the package as x-internal for other bundles to be able tp extend those eventually.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3228 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-21 03:56:11 +00:00 |
|
Hugues Malphettes
|
850170ba5f
|
bug 346605 commit the demo of jetty's continuation and webscoket to 'chat with the equinox console
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3221 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-20 08:33:57 +00:00 |
|
Hugues Malphettes
|
d722830f0b
|
Compilation error when building against older versions of OSGi.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3203 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-18 06:00:42 +00:00 |
|
Hugues Malphettes
|
59d60f33b8
|
bug 346027 Add required-bundles and fragment's required bundles to the pacckages where META-INF/web-fragments.xml and META-INF/resources are discovered.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3202 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-18 05:13:17 +00:00 |
Michael Gorovoy
|
0967a439f3
|
Added test-jetty-osgi module back to the build
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3201 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-18 05:02:46 +00:00 |
|
Hugues Malphettes
|
2585b4cd94
|
bug 346027 support for META-INF/web-fragment.xml and META-INF/resources/ inside fragments of a web-bundle
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3200 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-18 03:55:13 +00:00 |
|
Jesse McConnell
|
51f6df9871
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3184 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-17 19:57:00 +00:00 |
|
Jesse McConnell
|
28e63af76b
|
[maven-release-plugin] prepare release jetty-project-7.4.2.vTEST
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3182 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-17 19:56:45 +00:00 |
|
Jesse McConnell
|
0793141d2c
|
[maven-release-plugin] rollback the release of jetty-project-7.4.2.vTEST
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3181 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-17 19:39:59 +00:00 |
|
Jesse McConnell
|
be9da35ef4
|
set for test
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3180 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-17 19:39:17 +00:00 |
|
Jesse McConnell
|
f4daeaedef
|
busting build to test release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3178 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-17 19:33:05 +00:00 |
|
Hugues Malphettes
|
3bea3fec87
|
more changes to the BND directive to get the proper version exported.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3168 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-17 15:32:33 +00:00 |
|
Jesse McConnell
|
01c43b0ffe
|
remove bad awt import
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3156 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-16 20:48:17 +00:00 |
|
Hugues Malphettes
|
4a6f14f2a6
|
ABility to use an equinox hook to load the javax.servlet packages from the bootstrapping webapp.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3147 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-15 14:30:29 +00:00 |
|
Greg Wilkins
|
f8dc394adb
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3137 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-13 04:48:47 +00:00 |
|
Greg Wilkins
|
6e0649ab3f
|
[maven-release-plugin] prepare release jetty-7.4.1.v20110513
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3135 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-13 04:48:21 +00:00 |
|
Jesse McConnell
|
314a59192d
|
[maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3131 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-12 19:57:07 +00:00 |