Commit Graph

750 Commits

Author SHA1 Message Date
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
Jesse McConnell 3705b424c8 [maven-release-plugin] prepare release jetty-8.1.1.v20120215 2012-02-15 14:29:28 -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
Jesse McConnell 6b079ae3d8 merge from master 2012-02-01 17:25:08 -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 6e44f4db5f [maven-release-plugin] prepare for next development iteration 2012-01-27 08:15:45 -06:00
Jesse McConnell 9d1ca3593e [maven-release-plugin] prepare release jetty-8.1.0.v20120127 2012-01-27 08:15:38 -06: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 f2d0fd3cc8 revert back to 8.1.0-SNAPSHOT 2012-01-26 10:45:06 -06:00
Jesse McConnell 7ac9eb585f revert back to 7.6.0-SNAPSHOT 2012-01-26 10:42:11 -06:00
Jesse McConnell e98ae91ca6 [maven-release-plugin] prepare for next development iteration 2012-01-25 11:16:11 -06:00
Jesse McConnell fb30166a7f [maven-release-plugin] prepare release jetty-8.1.0.v20120125 2012-01-25 11:16:05 -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 ec731e691d [maven-release-plugin] prepare for next development iteration 2012-01-20 12:28:31 -06:00
Jesse McConnell 6004fd4553 [maven-release-plugin] prepare release jetty-8.1.0.RC5 2012-01-20 12:28:24 -06: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
Greg Wilkins 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
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 fae4f3fda9.
2012-01-18 15:16:34 -06:00
Jesse McConnell 90184ab3c3 Latest merge from master 2012-01-17 13:36:44 -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
Jan Bartel 691efcc7ca Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-11 16:35:57 +11:00
Jesse McConnell 49b3239aa6 clear up the last of the maven warnings I see 2012-01-10 13:45:39 -06:00
Jan Bartel 1fbec51c8a Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-10 16:08:59 +11: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
hmalphettes 4f8cff8ccd bug 367548 the nested package must not be imported twice in jetty-osgi-boot 2011-12-27 07:59:13 +08:00
Jan Bartel c3643d9937 Merge remote-tracking branch 'origin/master' into jetty-8 2011-12-21 12:37:23 +11:00
Jan Bartel 0b1becf58d 364936 use Resource for opening URL streams 2011-12-08 12:16:36 +11:00
Jesse McConnell 26b5d5e589 update versions of orbit dependencies and fix a naming issue in test-jetty-osgi 2011-12-06 14:20:10 -06:00
hmalphettes 96eb1a6f92 workaround to fix the test error. did not find why those packages that are imported in osgi-boot-jsp still can't be resolved by felix. 2011-12-06 20:49:31 +08:00
hmalphettes f31f4150d8 workaround to fix the test error. did not find why those packages that are imported in osgi-boot-jsp still can't be resolved by felix. 2011-12-06 20:45:57 +08:00
hmalphettes a08f58634e latest orbit libraries 2011-12-06 20:45:01 +08:00
hmalphettes 89afbdf31d 360245 OSGi: javax.servlet packages version refactored 3.0 -> 2.6 2011-12-02 17:27:26 +08: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
Jesse McConnell 1f576b96a8 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2725 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-02 14:43:14 +00:00
Jesse McConnell ab06234807 [maven-release-plugin] prepare release jetty-7.3.0.v20110202
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2723 7e9141cc-0065-0410-87d8-b60c137991c4
2011-02-02 14:42:58 +00:00
Joakim Erdfelt acc4f230fc Merging back /branches/jetty-bug-296978 revs 2674:HEAD
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2709 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-28 18:58:47 +00:00
Greg Wilkins cfd2c0e7d2 revert to 7.3.0-SNAPSHOT
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2703 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-28 01:16:38 +00:00
Michael Gorovoy d6923903cb 331803: Update XML configuration files to use proper arguments for startup commands in examples
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2698 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-26 16:24:35 +00:00
Jesse McConnell c9365cb777 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2684 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-24 19:48:29 +00:00
Jesse McConnell 4127ce5430 [maven-release-plugin] prepare release jetty-7.3.0.v20112401
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2682 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-24 19:48:11 +00:00
Hugues Malphettes 0cc109d772 #331045 small detail to deploy a WAB that does not have a web.xml through jetty-osgi
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2659 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-14 08:40:55 +00:00
Hugues Malphettes 4240756d46 bug #306971 support for taglibs for each WAB. the bundles that contain tlds for a WAB must be listed in the manifest header 'Require-TldBundle
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2658 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-14 03:33:56 +00:00
Hugues Malphettes b2ca97f056 #334062 support for locating file inside jarred up jetty.home.bundle for jetty-osgi
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2654 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-12 10:27:12 +00:00
Hugues Malphettes bf278d0487 make the import of org.eclipse.jetty.jmx and optional import in OSGi. re-enable the execution of the osgi pax tests.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2652 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-12 08:00:48 +00:00
Greg Wilkins 881e599860 333679 Refactored jetty-jmx. Moved mbeans to modules.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2629 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-06 18:04:58 +00:00
Greg Wilkins 7656b37934 switch trunk to 7.3.x
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2614 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-21 10:22:53 +00:00
Greg Wilkins 703aca3449 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2598 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-06 14:15:23 +00:00
Greg Wilkins 155d31e65e [maven-release-plugin] prepare release jetty-7.2.2.v20101205
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2596 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-06 14:14:59 +00:00
Greg Wilkins c73c4268e9 rolled back failed release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2595 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-06 11:08:57 +00:00
Greg Wilkins 65524be6d0 gpg use agent
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2592 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-06 10:27:02 +00:00
Jesse McConnell 0ee51e7844 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2587 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-03 16:28:52 +00:00
Jesse McConnell ef73282704 [maven-release-plugin] prepare release jetty-7.2.2.v20101203
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2585 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-03 16:28:37 +00:00
Jesse McConnell 28abc4cae5 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2581 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-03 15:48:00 +00:00
Jesse McConnell 8684dc5805 [maven-release-plugin] prepare release jetty-7.2.2.v20101203
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2579 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-03 15:47:47 +00:00
Jesse McConnell 127971ceee set eclipse plugin version
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2578 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-03 15:31:59 +00:00
Greg Wilkins ebf596b8a8 331703 Fixed failing OSGI test TestJettyOSGiBootWithJsp.java on MacOSX
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2575 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-03 09:53:47 +00:00
Jesse McConnell e4f078cec6 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2572 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-01 19:42:49 +00:00
Jesse McConnell fcab138ac8 [maven-release-plugin] prepare release jetty-7.2.2.v20101201
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2570 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-01 19:42:36 +00:00
Jesse McConnell 6fd44212e8 set eclipse plugin version
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2569 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-01 19:16:08 +00:00
Jesse McConnell 654544b5ec [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2563 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-30 20:06:11 +00:00
Jesse McConnell e79f494d79 [maven-release-plugin] prepare release jetty-7.2.2.v20101201
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2561 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-30 20:05:47 +00:00
Hugues Malphettes 1ab88841c8 fix bug 330098 The AppProvider was not indexing the ContextHandler that was deployed well enough
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2544 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-20 02:54:48 +00:00
Hugues Malphettes f0c09c1d56 use untyped APIs compatible with the previous version of OSGi and the new version
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2543 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-20 02:20:30 +00:00
Greg Wilkins 835751c2ef improved test harness timing
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2538 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-19 00:25:32 +00:00
Greg Wilkins 26e82ad779 moved port for test to 9876
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2537 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-18 05:46:29 +00:00
Jesse McConnell 62726cc4e2 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2498 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-11 16:20:20 +00:00
Jesse McConnell e0b27726c2 [maven-release-plugin] prepare release jetty-7.2.1.v20101111
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2496 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-11 16:19:58 +00:00
Jesse McConnell 678e364270 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2494 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-10 21:33:07 +00:00
Jesse McConnell d6b1040f69 [maven-release-plugin] prepare release jetty-7.2.1.v20101111
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2492 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-10 21:32:47 +00:00
Hugues Malphettes d3c5317c7f bug 329621 in case jetty.home is quoted, remove the quotes.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2480 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-08 03:29:37 +00:00
Hugues Malphettes e6c26b383e bug #329571 don't use the lazy activation policy for jetty.osgi.boot.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2471 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-05 17:54:47 +00:00
Greg Wilkins 543118f837 329410 Enforce XmlConfiguration properties as Map<String,String>
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2469 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-04 02:08:49 +00:00
Jan Bartel 9d901da82e JETTY-1295 Contexts mixed up when hot-deploying on virtual hosts
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2427 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-28 03:18:21 +00:00
Hugues Malphettes 5d5ec1f0f6 fix the compilation error as reported by the nightly build
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2398 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-25 01:20:20 +00:00
Hugues Malphettes 85517220fa cleanup some System.err
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2396 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-24 15:25:10 +00:00
Hugues Malphettes 26de00150a add jettylog for the jsp engine
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2392 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-24 14:43:45 +00:00
Hugues Malphettes 786f0d2299 update the versions to 7.2.1 in our clumsy build system
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2382 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-21 11:59:38 +00:00
Jesse McConnell 87f58a2863 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2379 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-20 19:49:47 +00:00
Jesse McConnell 1a9136f4f0 [maven-release-plugin] prepare release jetty-7.2.0.v20101020
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2377 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-20 19:49:33 +00:00
Jesse McConnell 5ab4634dfb [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2367 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-19 19:49:45 +00:00
Jesse McConnell 83d4febd1e [maven-release-plugin] prepare release jetty-7.2.0.v20101020
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2365 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-19 19:49:32 +00:00
Jesse McConnell d84b549aca reset version to remove RC# from version string to maintain support with osgi versioning
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2356 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-18 19:16:49 +00:00
Jesse McConnell 0fcbbbf1e9 reset version
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2355 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-18 18:47:42 +00:00
Jesse McConnell 9b07b75df7 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2354 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-15 20:33:58 +00:00
Jesse McConnell 933c065d1b [maven-release-plugin] prepare release jetty-7.2.0.RC1
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2352 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-15 20:33:45 +00:00
Jesse McConnell d389d12771 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2311 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-01 22:25:30 +00:00
Jesse McConnell 89bd58d11b [maven-release-plugin] prepare release jetty-7.2.0.RC0
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2309 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-01 22:25:18 +00:00
Hugues Malphettes 62df1762d2 remove the dependency on commons-codec tha should not have been there in te first place.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2281 7e9141cc-0065-0410-87d8-b60c137991c4
2010-09-16 01:38:06 +00:00
Hugues Malphettes a4b693a271 update the test-webapp web-bundle packaging to support the reference to QoSFilter and update the test project for jetty-osgi to load commons-codec in the OSGi runtime for the tests
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2279 7e9141cc-0065-0410-87d8-b60c137991c4
2010-09-15 18:36:53 +00:00
Hugues Malphettes f0fdcb065d bug 325184: setup the servlet session on the servlet that hosts the OSGi HttpService
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2277 7e9141cc-0065-0410-87d8-b60c137991c4
2010-09-15 01:06:44 +00:00
Jesse McConnell fd79db9081 slf4j -> 1.5.11
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2276 7e9141cc-0065-0410-87d8-b60c137991c4
2010-09-14 19:17:20 +00:00
Hugues Malphettes bc1fcba91d put back the proper versions. should never have been committed as 7.1.7
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2235 7e9141cc-0065-0410-87d8-b60c137991c4
2010-09-01 18:18:28 +00:00
Hugues Malphettes 41493a213e bug 324158. replace th jars downloaded from orbit by the one in the jetty download site.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2234 7e9141cc-0065-0410-87d8-b60c137991c4
2010-09-01 18:17:33 +00:00
Hugues Malphettes ae061725da bug 323497 put back logback fragment and add the package ch.qos.logback.access.jetty.v7 as an option
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2224 7e9141cc-0065-0410-87d8-b60c137991c4
2010-08-24 15:06:31 +00:00
Greg Wilkins aff6cfed53 updated orbit repo version
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2212 7e9141cc-0065-0410-87d8-b60c137991c4
2010-08-16 04:36:07 +00:00
Hugues Malphettes a93c6445e1 remove the unused copied configuration files. cleanup the default config file
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2201 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-31 00:35:22 +00:00
Jesse McConnell 11d03a6f0b fix broken osgi build, update filter targets to 7.2 (which we ought to just standardize so we don't have to change filters based on minor version and found source of issue being an unquoted version in DynamicImport in boot osgi
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2200 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-30 17:30:49 +00:00
Greg Wilkins 4110df9a06 fixed OSGi pom versions
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2199 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-30 08:43:04 +00:00
Jan Bartel e23d08749a Update OSGI build to use same Eclipse release as jetty-distribution - really needs more refactoring to share pom properties
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2194 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-29 02:13:04 +00:00
Hugues Malphettes de2e13a9e3 commit test-jetty-osgi
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2185 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-27 22:08:29 +00:00
Hugues Malphettes c044395a07 bug #310308 fix the javadoc
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2180 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-27 02:29:56 +00:00
Hugues Malphettes e7f7c3eea5 bugs #319306
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2179 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-27 02:24:22 +00:00
Greg Wilkins 16be43597f 319370 WebAppClassLoaderContext
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2088 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-09 11:42:19 +00:00
Greg Wilkins b02766dd53 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2078 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-05 14:10:04 +00:00
Greg Wilkins 82923e5197 [maven-release-plugin] prepare release jetty-7.1.5.v20100705
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2076 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-05 14:09:39 +00:00
Greg Wilkins 0fb891e968 rolled back r2014 because it is needed by codehaus release
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2074 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-05 13:50:26 +00:00
Greg Wilkins a4d25de6c4 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2073 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-05 12:43:19 +00:00
Greg Wilkins f2726d74d1 [maven-release-plugin] prepare release jetty-7.1.5.v20100705
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2071 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-05 12:42:53 +00:00
Hugues Malphettes 2c6e74d106 support for web-bundles that are zipped
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2053 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-28 09:51:12 +00:00
Hugues Malphettes 863cc0a757 bug 316909 cleanup and web-bundles don't need to be unzipped anymore. Jetty's standard WebInfConfiguration object takes care of unzipping wars on the fly as necessary to make the webapp consumable for JSPs.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2048 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-26 00:35:13 +00:00
Hugues Malphettes 3fabec8c5a bug 317231, bug 298703, bug 309250
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2042 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-23 23:38:08 +00:00
Hugues Malphettes 351feb4edc now that bug 317231 is fixed, we can support the default attribute in the <Property> instead of overriding it with some hardcodded values.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2038 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-22 17:15:41 +00:00
Hugues Malphettes 9b39c2f374 add the originId to make sure that the app deployer works well.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2036 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-22 04:41:18 +00:00
Hugues Malphettes f1588ced32 bug fixes after testing this
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2035 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-22 04:40:52 +00:00
Hugues Malphettes 5fcc270059 fix the httpservice deployment: the servlet was not started automatically at deployment time
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2034 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-22 04:39:42 +00:00
Hugues Malphettes b2f1594974 bug 317231 support the case where the jetty configuration files are inside a jarred fragment or if org.eclipse.jetty.osgi.boot is jarred up.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2033 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-21 21:49:37 +00:00
Hugues Malphettes 79c83a7184 more code in progress to support multiple instances of jetty
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2031 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-20 03:08:00 +00:00
Hugues Malphettes dacfcc8903 more code in progress to support multiple instances of jetty
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2030 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-20 02:45:41 +00:00
Hugues Malphettes 5e2110d894 in progress: support for multiple instances of jetty
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2029 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-20 01:39:24 +00:00
Hugues Malphettes 103bdc47c3 small cleanup no use to compute twice the jars with tlds.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2028 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-19 23:41:57 +00:00
Hugues Malphettes 1511c6e9cc refactor the BundleListner into a BundleTracker as it is the best practice
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2027 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-19 21:32:03 +00:00
Hugues Malphettes ce7a271f7d bug 317231 ability to define the jety configuration in a fragment that contains an etc/jetty.xml file
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2026 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-18 20:54:40 +00:00
Hugues Malphettes 1a82b62179 bug 317231 ability to define the jety configuration in a fragment that contains an etc/jetty.xml file
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2024 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-18 01:30:15 +00:00
Joakim Erdfelt 3e80a12185 Removing manual call to jar:jar and jar:test-jar.
jar:jar is part of the default lifecycle, no point declaring it again.
jar:test-jar isn't used by anything, no point generating, installing,
and deploying it.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2014 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-16 18:14:04 +00:00
Joakim Erdfelt 04d29783e3 Limiting scope of Findbugs run.
Configuring Reporting for PMD, Findbugs, JXR, JavaDoc.
Fixing PMD configuration inheritence bug with sub-projects.

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2013 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-16 17:21:50 +00:00
Greg Wilkins 0104b834b8 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1995 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-11 00:17:47 +00:00
Greg Wilkins 8193236dba [maven-release-plugin] prepare release jetty-7.1.4.v20100610
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1993 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-11 00:16:54 +00:00
Greg Wilkins c513f3ef00 316557 OSGi HttpService is not available because context handlers files are not deployed
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1991 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 23:37:43 +00:00
Hugues Malphettes e8ed78c866 add the Bundle-Classpath: . to be able to import this library with the sources in eclipse. workaround for a PDE bug
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1989 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 23:13:00 +00:00
Hugues Malphettes c50fc6a1db clean
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1988 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 22:55:47 +00:00
Greg Wilkins a70c798da6 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1987 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 06:20:13 +00:00
Greg Wilkins 5ee4d16dd2 [maven-release-plugin] prepare release jetty-7.1.4.v20100609
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1985 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 06:19:32 +00:00
Greg Wilkins 3ed02a05e7 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1979 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 01:54:22 +00:00
Greg Wilkins 14609bedfd [maven-release-plugin] prepare release jetty-7.1.4.v20090609
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1977 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 01:53:46 +00:00
Greg Wilkins 7c7630bc75 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1974 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 00:38:09 +00:00
Greg Wilkins 725c514706 [maven-release-plugin] prepare release jetty-7.1.4.v20100609
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1972 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 00:37:23 +00:00
Joakim Erdfelt 991a2b4077 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1961 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-09 19:05:57 +00:00
Joakim Erdfelt 0d5e373020 [maven-release-plugin] prepare release jetty-7.1.4.v20100609
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1959 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-09 19:05:43 +00:00
Hugues Malphettes 05b2d9cfa7 bug 315004 explicitly import org.xml.sax and org.xml.sax.helpers to help with paxrunner
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1925 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-04 20:58:53 +00:00
Hugues Malphettes 6b6c790efd bug 315004 add system.bundle to the dependencies of jetty.osgi to workaround some potential issues with execution profiles
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1922 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-04 18:14:09 +00:00
Michael Gorovoy f68610a2b9 309185 even more javadoc fixes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1901 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-27 03:55:16 +00:00
Joakim Erdfelt 533ae0950d [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1897 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-26 19:14:50 +00:00
Joakim Erdfelt e00a8d20d6 [maven-release-plugin] prepare release jetty-7.1.3.v20100526
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1895 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-26 19:14:23 +00:00
Greg Wilkins 610c20a37e [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1848 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-23 21:00:22 +00:00
Greg Wilkins e71c645b06 [maven-release-plugin] prepare release jetty-7.1.2.v20100523
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1846 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-23 20:59:52 +00:00
Greg Wilkins aa46212a2e [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1843 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-22 08:25:49 +00:00
Greg Wilkins f1f2846fe4 [maven-release-plugin] prepare release jetty-7.1.2.v20100522
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1841 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-22 08:25:26 +00:00
Jesse McConnell 2969e456a7 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1837 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-21 20:19:03 +00:00
Jesse McConnell 802eb30d74 [maven-release-plugin] prepare release jetty-7.1.2.v20100521
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1835 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-21 20:18:48 +00:00
Joakim Erdfelt a4473b746b [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1814 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-17 19:00:56 +00:00
Joakim Erdfelt 149e118699 [maven-release-plugin] prepare release jetty-7.1.1.v20100517
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1812 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-17 19:00:40 +00:00
Hugues Malphettes bcebcb329f add the forgotten default self-certificate for jetty-osgi default config
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1740 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-06 23:12:34 +00:00
Jesse McConnell d67252fe2e [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1735 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-05 20:27:56 +00:00
Jesse McConnell 718d0e94b3 [maven-release-plugin] prepare release jetty-7.1.0.v20100505
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1733 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-05 20:27:20 +00:00
Jesse McConnell 6e395884a6 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1700 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-04 21:42:37 +00:00
Jesse McConnell 3ad4b4bb18 [maven-release-plugin] prepare release jetty-7.1.0.RC1
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1698 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-04 21:38:31 +00:00
Jesse McConnell 0e541fcf2b [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1695 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-04 20:03:29 +00:00
Jesse McConnell 485bc3b2a6 [maven-release-plugin] prepare release jetty-7.1.0.RC1
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1693 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-04 20:03:09 +00:00
Hugues Malphettes dcd0a1cc88 use the latest version of the bundle-helper mojo that can deal with the version numbers we are using
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1691 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-04 19:03:01 +00:00
Jesse McConnell 52d8ac5321 7.0.2 -> 7.1.0 for hard coded references
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1687 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-04 14:25:41 +00:00
Joakim Erdfelt 5dc89af42e Moving -source.jar generation to 'osgi' profile, leaving default build without -source.jar
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1615 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-27 19:28:44 +00:00
Jesse McConnell a7fc4bf77a [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1609 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-27 16:11:20 +00:00
Jesse McConnell 88b8c01199 [maven-release-plugin] prepare release jetty-7.1.0.RC0
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1607 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-27 16:10:58 +00:00
Jesse McConnell 1eba7b979a [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1591 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-27 13:44:10 +00:00
Jesse McConnell a6a2cac78c [maven-release-plugin] prepare release jetty-7.1.0.RC0
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1589 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-27 13:43:40 +00:00
Hugues Malphettes 5948ea79eb helper method to resolve equinox 'resourcebundle' urls.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1559 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-24 01:13:50 +00:00
Hugues Malphettes fb450b822b make the webapp classloader impleemnt the BundleReference interface just like any other OSGi classloader
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1557 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-23 17:06:42 +00:00
Greg Wilkins 463b275cb7 310094 use only Property in xml configs
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1551 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-22 17:18:32 +00:00
Hugues Malphettes dbc2865260 enable the default ssl connection by default
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1451 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-03 00:38:17 +00:00
Hugues Malphettes e59406a987 fix a trivial mistake in the generation of the eclipse source bundle
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1450 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-03 00:37:38 +00:00
Jesse McConnell 50dd4c94b1 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1433 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-31 16:46:40 +00:00
Jesse McConnell ff7ae57f00 [maven-release-plugin] prepare release jetty-project-7.0.2.v20100331
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1431 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-31 16:46:26 +00:00
Hugues Malphettes 956c5ea73c bug #290658 generate an Eclipse-SourceBundle
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1426 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-30 18:45:31 +00:00
Hugues Malphettes 2dc0ae0546 fix the build sorry about that. missing dependency on jetty-deploy
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1415 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-27 18:55:44 +00:00
Hugues Malphettes 9e04c27078 bug 306971 better support for bundles that contain tld files
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1411 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-26 01:20:19 +00:00
Hugues Malphettes 1502bfe0e2 trivial error that had escaped until now
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1410 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-25 22:48:08 +00:00
Hugues Malphettes eceb7b6ec6 bug 306971 also replaced the require-bundle by pacakge imports
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1409 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-25 18:42:11 +00:00
Hugues Malphettes 11a5d3674e fix the version imports of the jstl library: 1.2.0; not 2.5.0; remove the imports of packages that belong to the jdk5 and more
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1375 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-10 06:39:19 +00:00
Hugues Malphettes fb1befb69d compatibility with spring-DM's webmvc
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1364 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-07 08:29:32 +00:00
Greg Wilkins e8d649bac5 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1351 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-05 21:14:22 +00:00
Hugues Malphettes 5f9b092fc0 add the default helpers as static objects as thy are quite useful to the outside world as it
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1338 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-05 02:26:29 +00:00
Hugues Malphettes 5421248333 imortant fix: resources necessary were not packaged with the build
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1335 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-03 19:56:10 +00:00
Hugues Malphettes 303a5639b9 the OSGIWebappClassLoader now looks in OSGi for resources; before it was only looking for classes.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1325 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-01 20:12:16 +00:00
Hugues Malphettes f03dce5432 cleanup of jndi setup. update the version number to 7.0.2. fix some dependencies
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1284 7e9141cc-0065-0410-87d8-b60c137991c4
2010-02-23 20:52:46 +00:00
Hugues Malphettes 9680fb9b99 latest jsp-glassifh version
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1222 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-28 06:03:08 +00:00
Hugues Malphettes 2e5bc754e4 bug #299733 tweak to support JSF taglibs. ability to register additional tag-libs directly in jetty
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1215 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-26 09:38:55 +00:00
Hugues Malphettes c706695eca add logback integration
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1212 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-25 04:35:24 +00:00
Greg Wilkins 59ed68cdde format
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1204 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-18 22:18:15 +00:00
Hugues Malphettes 0fe25eb3d7 reverted the wrong change to WebAppProvider. it was meant to be a change for OSGiAppProvider in fact.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1202 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-18 03:21:33 +00:00
Hugues Malphettes fdaa364ee4 cleaned the workaround now that bug 294799 is fixed. added to OSGiAppProvieder the same parameters that WebAppProvider for configuration of WebAppContext
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1201 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-18 03:13:27 +00:00
Hugues Malphettes 8cd60cd604 refactor AbstractAppProvider into ScanningAppProvider. support new deployment API for jetty OSGi. added some ways to extend the behavior of App and ScanningAppProvider
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1200 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-16 02:09:35 +00:00
Hugues Malphettes efdff3ecfe fix a trivial bug in the initialization of the jetty server.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1197 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-14 06:17:36 +00:00
Greg Wilkins eaab420027 298667 deployer cleanups
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1193 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-12 00:44:49 +00:00
Greg Wilkins acb98b34be work in progress for OSGi boot to use Deployment manager
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1178 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-05 00:59:52 +00:00
Greg Wilkins 6ba39e7fdf work in progress for OSGi boot to use Deployment manager
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1177 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-05 00:32:37 +00:00
Greg Wilkins 238cb5b5fc work in progress for OSGi boot to use Deployment manager
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1176 7e9141cc-0065-0410-87d8-b60c137991c4
2010-01-05 00:23:26 +00:00
Greg Wilkins 8e19d18057 298667 DeploymentManager improvements
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1173 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-30 23:45:16 +00:00
Greg Wilkins 63205b461c code formatting
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1168 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-29 05:53:35 +00:00
Greg Wilkins 88e2b54764 better defaults
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1167 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-29 05:51:33 +00:00
Greg Wilkins 988ff44fc9 osgi example
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1166 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-29 05:06:56 +00:00
Greg Wilkins 219c9dd740 updated to patch from 20091210
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1145 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-11 03:27:18 +00:00
Greg Wilkins 1b8913e75e empty
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1144 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-11 01:53:53 +00:00
Greg Wilkins 2545eed5fb empty
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1143 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-11 01:36:25 +00:00
Greg Wilkins e6f111389b empty
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1142 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-11 01:34:20 +00:00
Simone Bordet 6def823a49 Updated version to 7.0.2-SNAPSHOT otherwise the build fails.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1138 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-10 11:03:13 +00:00
Greg Wilkins 7e74c61989 294154 Patched jetty-osgi
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1039 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-09 01:20:48 +00:00
Greg Wilkins 4755af0996 294154 Patched jetty-osgi
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1033 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-07 14:14:47 +00:00
Greg Wilkins 060cf5a91d made jetty osgi boot compile
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1024 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-03 00:41:22 +00:00