Commit Graph

425 Commits

Author SHA1 Message Date
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 9e72457941, reversing
changes made to df12605f0e.
2011-11-30 16:27:30 +11:00
Greg Wilkins 631b0ba1b6 [maven-release-plugin] prepare for next development iteration 2011-11-30 13:16:54 +11:00
Greg Wilkins 9d3745f999 [maven-release-plugin] prepare release jetty-8.1.0.RC0 2011-11-30 13:16:41 +11:00
Jan Bartel 127a5af8d7 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 10:59:54 +11:00
Jesse McConnell d5320d95ba [maven-release-plugin] prepare for next development iteration 2011-10-24 15:02:30 -05:00
Jesse McConnell d02f74a50c [maven-release-plugin] prepare release jetty-8.0.4.v20111024 2011-10-24 15:02:23 -05:00
Greg Wilkins 5140a95144 refactored HttpConnection name 2011-10-20 15:12:19 +11:00
Jesse McConnell a38f2a9e68 [maven-release-plugin] prepare for next development iteration 2011-10-11 10:16:54 -05:00
Jesse McConnell 55a1be5435 [maven-release-plugin] prepare release jetty-8.0.3.v20111011 2011-10-11 10:16:47 -05:00
Jesse McConnell 7d10182034 [maven-release-plugin] prepare for next development iteration 2011-10-11 08:47:07 -05:00
Jesse McConnell b6ac542604 [maven-release-plugin] prepare release jetty-7.5.3.v20111011 2011-10-11 08:47:00 -05:00
Jesse McConnell b55ec9bac1 [maven-release-plugin] prepare for next development iteration 2011-10-06 17:59:52 -05:00
Jesse McConnell e32e8b1377 [maven-release-plugin] prepare release jetty-8.0.2.v20111006 2011-10-06 17:59:46 -05:00
Jesse McConnell 0c55c774d4 [maven-release-plugin] prepare for next development iteration 2011-10-06 17:25:38 -05:00
Jesse McConnell 4d822759de [maven-release-plugin] prepare release jetty-7.5.2.v20111006 2011-10-06 17:25:32 -05:00
Jesse McConnell b58006b4a4 [maven-release-plugin] prepare for next development iteration 2011-10-06 09:43:37 -05:00
Jesse McConnell 7eca345e8d [maven-release-plugin] prepare release jetty-7.5.2.v20111006 2011-10-06 09:43:31 -05:00
Jan Bartel 32dbb1bddb Merge remote-tracking branch 'origin/master' 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-deploy/src/main/config/etc/jetty-deploy.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-monitor/pom.xml
	jetty-nested/pom.xml
	jetty-nosql/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
	jetty-osgi/jetty-osgi-boot-logback/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-equinoxtools/pom.xml
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/jetty-osgi-servletbridge/pom.xml
	jetty-osgi/jetty-osgi-servletbridge/src/main/java/org/eclipse/jetty/osgi/servletbridge/FrameworkLauncherExtended.java
	jetty-osgi/jetty-osgi-servletbridge/src/main/webapp/WEB-INF/web.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-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	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-10-04 17:45:15 +11:00
hmalphettes ab6ff817a3 JETTY-1378 new sys property for the latest jsp-impl to force the use of the JDTCompiler when running in OSGi. 2011-10-03 09:37:53 +08:00
hmalphettes fd911df740 Ability to start equinox in a different thread instead of blocking the servletbrdige webapp from starting until equinox has completed to start. this is useful for cloudfoundry that at the moment complains if the webapp does not start very quickly 2011-09-14 16:34:56 +08:00
hmalphettes 901f818cb6 Ability to start equinox in a different thread instead of blocking the servletbrdige webapp from starting until equinox has completed to start. this is useful for cloudfoundry that at the moment complains if the webapp does not start very quickly 2011-09-14 16:34:15 +08:00
Jesse McConnell d5304b2cbc [maven-release-plugin] prepare for next development iteration 2011-09-08 12:20:15 -05:00
Jesse McConnell c33548d38a [maven-release-plugin] prepare release jetty-8.0.1.v20110908 2011-09-08 12:19:24 -05:00
Jesse McConnell ebdb89dc23 [maven-release-plugin] prepare for next development iteration 2011-09-08 12:00:16 -05:00
Jesse McConnell 932245a114 [maven-release-plugin] prepare release jetty-7.5.1.v20110908 2011-09-08 12:00:10 -05:00
Jesse McConnell 721c8ab682 updating version.txt and resetting pom version to 8.0.1-SNAPSHOT 2011-09-08 11:54:53 -05:00
Jesse McConnell 37d0f53b0a updating version.txt and resetting pom versions to 7.5.1-SNAPSHOT 2011-09-08 11:40:37 -05:00
Jesse McConnell 4a575d4958 Merge branch 'master' into release 2011-09-08 11:36:48 -05:00
hmalphettes 8d51bc05ac update the example osgi servlet bridge webapp 2011-09-07 17:08:24 -07:00
Jesse McConnell 4e47d6a7fa [maven-release-plugin] prepare for next development iteration 2011-09-07 18:16:58 -05:00
Jesse McConnell d77a12962b [maven-release-plugin] prepare release jetty-8.0.1.v20110907 2011-09-07 18:16:50 -05:00
Jesse McConnell 6b614a54f0 [maven-release-plugin] prepare for next development iteration 2011-09-07 18:12:16 -05:00
Jesse McConnell ce55c8c601 [maven-release-plugin] prepare release jetty-7.5.1.v20110907 2011-09-07 18:12:09 -05:00
Jesse McConnell 1744b5bce1 reset from release 2011-09-07 11:09:46 -05:00
Jesse McConnell ae86ad6d4e [maven-release-plugin] prepare for next development iteration 2011-09-07 10:03:16 -05:00
Jesse McConnell 86383afbd2 [maven-release-plugin] prepare release jetty-7.5.1.v20110907 2011-09-07 10:03:10 -05:00
Jesse McConnell 40dcb10ed8 [maven-release-plugin] prepare for next development iteration 2011-09-01 12:24:32 -05:00
Jesse McConnell db14b194fa [maven-release-plugin] prepare release jetty-8.0.0.v20110901 2011-09-01 12:24:24 -05:00
Jesse McConnell a728021edf [maven-release-plugin] prepare for next development iteration 2011-09-01 11:17:05 -05:00
Jesse McConnell 882308f781 [maven-release-plugin] prepare release jetty-7.5.0.c20110901 2011-09-01 11:16:58 -05:00
Jan Bartel 1e079f06c9 Merge remote-tracking branch 'origin/master' into jetty-8 2011-09-01 14:11:53 +10:00
Jesse McConnell 57e9045635 [maven-release-plugin] prepare for next development iteration 2011-08-31 14:17:32 -05:00
Jesse McConnell 317491a4d7 [maven-release-plugin] prepare release jetty-7.5.0.v20110901 2011-08-31 14:17:25 -05:00
Joakim Erdfelt e60df19490 [maven-release-plugin] prepare for next development iteration 2011-08-30 13:13:46 -07:00
Joakim Erdfelt 460c754e4e [maven-release-plugin] prepare release jetty-7.5.0.RC2 2011-08-30 13:13:39 -07:00
Joakim Erdfelt 7663a83616 [maven-release-plugin] rollback the release of jetty-7.5.0.RC2 2011-08-30 12:52:45 -07:00
Joakim Erdfelt 4c5c954d23 [maven-release-plugin] prepare release jetty-7.5.0.RC2 2011-08-30 12:47:42 -07:00
Joakim Erdfelt f6d45d5650 293739 - Deprecate static Jetty Log usage in favor of named logs
+ Finished conversion of the rest of jetty 7.x
2011-08-24 13:14:28 -07:00
Greg Wilkins e5a3cb9cef [maven-release-plugin] prepare for next development iteration 2011-08-19 22:17:46 +10:00
Greg Wilkins f0b4ffffda [maven-release-plugin] prepare release jetty-7.5.0.RC1 2011-08-19 22:17:33 +10:00
Jesse McConnell 4700979200 [maven-release-plugin] prepare for next development iteration 2011-08-16 09:26:56 -05:00
Jesse McConnell 3ae78dfbb2 [maven-release-plugin] prepare release jetty-8.0.0.RC0 2011-08-16 09:26:48 -05:00
Jesse McConnell 4d7ba354e1 [maven-release-plugin] prepare for next development iteration 2011-08-15 14:18:53 -05:00
Jesse McConnell 2175bae0a0 [maven-release-plugin] prepare release jetty-7.5.0.RC0 2011-08-15 14:18:42 -05:00
Jesse McConnell 7bc663dd49 Address broken build from 56866b3e68 2011-08-01 14:39:25 -05:00
Jesse McConnell 57e9966bd0 remove bogus @Override's 2011-07-27 09:40:46 -05:00
Jesse McConnell 9b4ab80ea6 [Bug 353210] align bundle version in MANIFEST.MF 2011-07-27 09:38:30 -05:00
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
Jesse McConnell fadbd0bdc5 [maven-release-plugin] prepare release jetty-7.4.1.v20110512
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3129 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 19:56:53 +00:00
Greg Wilkins 5d0f1b88f4 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3128 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 09:02:46 +00:00
Greg Wilkins 83b6c19cca [maven-release-plugin] prepare release jetty-7.4.1
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3126 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-12 09:02:19 +00:00
Hugues Malphettes d625f738ad add a dump servlet to probe the webapp server in which we are running
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3097 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-09 05:46:12 +00:00
Hugues Malphettes 1f5933f89b Support passing sys properties variable for the path to the logback configuration file.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3092 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-09 03:33:16 +00:00
Hugues Malphettes 4152e987cd bug 341736 A few more options, take care of logback configuration too.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3083 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-06 06:12:51 +00:00
Hugues Malphettes fd7a867dbc bug 341736 cleaning up.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3077 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-05 06:08:10 +00:00
Hugues Malphettes 9ca191cd4a bug 344529 Ability to customize the error handling of the OSGi HttpService
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3066 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 07:42:01 +00:00
Hugues Malphettes 25a7cc4ab7 bug 344529 Ability to customize the error handling of the OSGi HttpService
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3065 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 07:34:18 +00:00
Hugues Malphettes 9dfe601776 bug 341736 Use a lifecyclelistener instead of extending the Connector itself
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3062 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 03:57:24 +00:00
Hugues Malphettes cab968d649 bug 341736 Use a lifecyclelistener instead of extending the Connector itself
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3061 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 03:51:35 +00:00
Hugues Malphettes c8f531f699 missed one column when making jetty nested an optional dependency of jetty osgi boot
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3058 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 00:46:56 +00:00
Hugues Malphettes 3ccb505840 keep the dependency on jetty-nested optional
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3057 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-03 00:02:20 +00:00
Hugues Malphettes a8e35c0c4b Export the org.eclipse.jetty.osgi.nested package in case it is to be extended by someone
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3050 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-30 22:42:04 +00:00
Hugues Malphettes 918193c61a add a few dependencies
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3048 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-30 13:18:25 +00:00
Hugues Malphettes 6caad913e4 bug 341736 Deploy the servletbridge extension bundle to pass the HttpServlet class from the bootstrapping webapp to equinox.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3047 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-30 13:08:23 +00:00
Hugues Malphettes 105f2e3d94 bug 341736 example webapp to bootstrap equinox with jetty-osgi. at the moment the equinox servletbridge jar cannot be found on maven central. so this build is using intalio.org to get going.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3046 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-30 07:13:26 +00:00
Hugues Malphettes 70cd112ab1 bug 341736 Extend the NestedConnector to hook cleanly into the equinox BridgeServlet
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3045 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-30 05:52:04 +00:00
Hugues Malphettes 87fa4e717b bug 344067 support for web-bundles that are unpacked.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3041 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-28 07:06:18 +00:00
Hugues Malphettes 168658aec8 quick workaround for the regression in the jetty-osgi testunit
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3040 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-28 06:11:10 +00:00
Hugues Malphettes 3b39b91e58 quick workaround for the regression in the jetty-osgi testunit.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3039 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-28 06:10:13 +00:00
Hugues Malphettes 225d76bdd6 bug 344067 OSGi fragments can add static resources to a web-bundle.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3038 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-28 04:07:33 +00:00
Hugues Malphettes 496f9212a4 bug 344067 OSGi fragments can add static resources to a web-bundle.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3037 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-28 03:58:52 +00:00
Hugues Malphettes 6746c79e71 update the development environment to the current version.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3025 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-20 08:24:11 +00:00
Hugues Malphettes 511165b595 bug 343352
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3024 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-20 08:22:39 +00:00
Greg Wilkins 936b80dd46 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3018 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-14 02:22:30 +00:00
Greg Wilkins a01a1edd70 [maven-release-plugin] prepare release jetty-7.4.0.v20110414
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3016 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-14 02:22:04 +00:00
Greg Wilkins 793872d253 deprecated methods
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3000 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-12 03:51:51 +00:00
Greg Wilkins b43b2607ad [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2992 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-07 01:24:34 +00:00
Greg Wilkins b6d04cc349 [maven-release-plugin] prepare release jetty-7.4.0.RC0
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2990 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-07 01:24:08 +00:00
Greg Wilkins 50541649ca Get ready for 7.4 release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2952 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-01 03:42:09 +00:00
Hugues Malphettes 903dd14656 Don't use URL#toURI to transform a URL into a File; that does not work when spaces and other characters appear on the path.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2900 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-17 09:19:08 +00:00
Greg Wilkins c2bc7a5ddd [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2864 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-07 05:42:13 +00:00
Greg Wilkins 1d5a6de9c7 [maven-release-plugin] prepare release jetty-7.3.1.v20110307
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2862 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-07 05:41:43 +00:00
Greg Wilkins db438ca86f [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2854 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-04 03:58:46 +00:00
Greg Wilkins 70bd1c2085 [maven-release-plugin] prepare release jetty-7.3.1.v20110304
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2852 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-04 03:58:19 +00:00
Hugues Malphettes 788defff3e bug 329571: the lazy activation policy is still generated because of BND
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2768 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-10 00:35:05 +00:00
Greg Wilkins cdf2490336 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2739 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-03 11:46:23 +00:00
Greg Wilkins 8fddea6796 [maven-release-plugin] prepare release jetty-7.3.0.v20110203
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2737 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-03 11:45:58 +00:00
Jesse McConnell e9e2236760 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2732 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-02 20:52:37 +00:00
Jesse McConnell 30de087cdd [maven-release-plugin] prepare release jetty-7.3.0.20110202
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2730 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-02 20:52:24 +00:00