Jan Bartel
d4c035a06f
417561 Refactor annotation related code to remove some deadwood
2013-09-19 15:43:38 +10:00
Jan Bartel
f44787075a
417382 - Upgrade to asm 4.1 and refactor annotation parsing
2013-09-17 13:12:54 +10:00
Mikhail Mazursky
767faece5c
[Bug 415999] Fix some of FindBugs warnings
...
Mostly not closed streams/DB resources are fixed. But also less
important things.
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-09-09 00:24:31 -04:00
Jan Bartel
c5bdc019a2
409801 Jetty should allow webdefault to be specified using a relative location when running in OSGi
2013-06-11 18:39:15 +10:00
Greg Wilkins
7bb3a7be28
409556 Resource files not closed
...
Made Resource a closeable so that it is easier to close in a try(){} block. Deprecated release() and made it close() instead.
FileResource no longer extends URLResource as it can more efficiently implement all the methods with pure File operations and have no
connections or streams that need to be release/closed
2013-06-03 18:21:11 +10:00
Jan Bartel
5df7ab401d
Fix errors from small osgi refactor; comment out some test code
2013-05-28 15:10:12 +10:00
Jan Bartel
82b0ae2c63
Ensure jetty.home set as Server attribute on defaultJettyServer instance
2013-05-28 14:58:21 +10:00
Jan Bartel
7e797d8eed
408910 META-INF/jetty-webapp-context.xml file should be able to refer to bundle-relative locations
2013-05-28 13:10:49 +10:00
Jan Bartel
20aeae5914
409228 Set jetty.home property so config files work even if deployed inside a bundle
2013-05-28 11:35:09 +10:00
Jan Bartel
5c97019be1
408923 Need to be able to configure the ThreadPool for the default jetty server in osgi
2013-05-24 16:26:13 +10:00
Jan Bartel
140419c097
406618 Jetty startup in OSGi Equinox fails when using option jetty.home.bundle=org.eclipse.jetty.osgi.boot
2013-04-29 15:48:46 +10:00
Jan Bartel
8a0ba267c1
Rename some jetty-osgi classes, add comments, organize imports.
2013-04-11 15:14:08 +10:00
Jan Bartel
6783975707
Prune unused code; add more comments; rename classes.
2013-04-11 15:14:08 +10:00
Jan Bartel
76df005c64
405119 Tidy up comments and code formatting for osgi
2013-04-11 10:23:20 +10:00
Jan Bartel
4951b1ccc4
404176 Jetty's AnnotationConfiguration class does not scan non-jar resources on the container classpath
2013-03-28 19:33:52 +11:00
Jan Bartel
0ed3638660
401966 Ensure OSGI WebApp as Service (WebAppContext) can be deployed only through ServiceWebAppProvider
2013-02-28 19:48:42 +11:00
Jan Bartel
f1daea663a
Removing accidental add
2013-02-21 20:15:26 +11:00
Jan Bartel
cec5f5e65a
Fixing build
2013-02-21 20:13:45 +11:00
Jan Bartel
9af4334739
committing to save changes but does not yet compile
2013-02-20 09:26:30 +11:00
Jesse McConnell
e1c516c7d1
merge from jetty-8 and update license blocks.
2013-01-11 17:04:53 -06:00
Jesse McConnell
863944873d
merge from 7 and update license blocks for 2013
2013-01-11 15:01:16 -06:00
Jesse McConnell
a4dbb5823c
update license blocks for 2013
2013-01-11 14:57:51 -06:00
Greg Wilkins
27c31fb403
jetty-9 organised imports. Cleaned up some TODOs
2013-01-11 16:37:32 +11:00
Hugues Malphettes
e999c45bad
394294 Start web-bundles started before jetty
...
A web-bundle started before jetty-osgi should be deployed
as a webapp when jetty-osgi starts.
Thanks to Constantine Nosovsky for the patch.
2012-11-23 18:29:07 +08:00
Greg Wilkins
52464a5ba6
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/SslSecurityListenerTest.java
jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java
jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ProxyRule.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-util/src/main/java/org/eclipse/jetty/util/Fields.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java
test-jetty-nested/src/main/java/org/eclipse/jetty/nested/Dump.java
test-jetty-webapp/src/main/java/com/acme/Dump.java
2012-11-02 14:08:05 +11:00
Greg Wilkins
e076e8a8f0
393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls
2012-11-02 13:19:07 +11:00
Greg Wilkins
f5d3fec4f8
jetty-9 removed context deployer and merged context and webapps directory
2012-10-15 22:05:33 +11:00
Greg Wilkins
fac580c374
Merge remote-tracking branch 'origin/jetty-8' into jetty-9
...
Conflicts:
VERSION.txt
example-async-rest/async-rest-jar/pom.xml
example-async-rest/async-rest-webapp/pom.xml
example-async-rest/pom.xml
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-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/jetty-websocket/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/src/main/java/org/eclipse/jetty/ajp/Ajp13Generator.java
jetty-annotations/pom.xml
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AbstractDiscoverableAnnotationHandler.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationConfiguration.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletContainerInitializerListener.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ServletSecurityAnnotationHandler.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotation.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/WebServletAnnotationHandler.java
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-http/src/main/java/org/eclipse/jetty/http/Generator.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
jetty-http/src/main/java/org/eclipse/jetty/http/MimeTypes.java
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
jetty-io/pom.xml
jetty-io/src/main/java/org/eclipse/jetty/io/AbstractBuffer.java
jetty-io/src/main/java/org/eclipse/jetty/io/Buffer.java
jetty-io/src/main/java/org/eclipse/jetty/io/BufferUtil.java
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java
jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java
jetty-jsp/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-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiDeployer.java
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/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-runner/pom.xml
jetty-security/pom.xml
jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/LoginAuthenticator.java
jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java
jetty-server/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/AsyncHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-server/src/main/java/org/eclipse/jetty/server/bio/SocketConnector.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpURITest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SelectChannelServerSslTest.java
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslSocketServerTest.java
jetty-server/src/test/resources/jetty-logging.properties
jetty-servlet/pom.xml
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DispatcherTest.java
jetty-servlets/pom.xml
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
jetty-spdy/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
jetty-start/pom.xml
jetty-start/src/test/java/org/eclipse/jetty/start/CommandLineBuilderTest.java
jetty-start/src/test/java/org/eclipse/jetty/start/MainTest.java
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
jetty-webapp/pom.xml
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
jetty-websocket/pom.xml
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketServletRFCTest.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/helper/MessageSender.java
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/UnitGenerator.java
jetty-xml/pom.xml
pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-webapp/pom.xml
test-jetty-webapp/src/main/webapp/WEB-INF/web.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-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2012-10-12 21:19:21 +11:00
Hugues Malphettes
3efefe37bc
Clean-up OSGi test; add spdy OSGi test; fix felix
...
Upgrade to the latest pax-exam
Support for felix-3.x and 4.x as tested
Fix the spdy MANIFEST.MF generations
Add an integration test for SPDY
Refactor the test code
Squashed commit of the following:
commit bd020ee1214992d8d21a11dc800e04dc5e9b2001
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Sat Oct 6 16:58:43 2012 +0800
Add spdy integration test for OSGi and clean-up
Refacor the pax-exam OSGi integration tests
Add an integration test for spdy.
Execute the test under 2 versions of felix and 2 versions of equinox.
commit f3151a272ab92560432f3b76f564bf06b19bc22b
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Sat Oct 6 16:28:51 2012 +0800
Fix the generated MANIFEST.MF
OSGi integration test in the next commit.
commit 3152aa2b5e39cf2d3b81f8400488c0672e922b8d
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Fri Oct 5 16:58:29 2012 +0800
Fix the startup of the servlet.
setInitOrder(0) was working in jetty-7 and jetty-8 but not in jetty-9
anymore. setInitOrder(1) is fine.
commit 8038d314f4f423e8608fd09dd42b840e101a0c13
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Thu Oct 4 17:53:28 2012 +0800
Upgrade to pax-exam-2.6
commit 7136fa88e2410ac345b6ae0657d882c7e9714c0b
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Thu Oct 4 17:53:07 2012 +0800
Support for felix-3.x and felix-4.x
commit 0bcc6b0d8ed5144150f90f578a90c558419349d1
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Thu Oct 4 17:53:28 2012 +0800
Upgrade to pax-exam-2.6
commit 2e17466624650df433b6c5f11abafb56539ee740
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Thu Oct 4 17:53:07 2012 +0800
Support for felix-3.x and felix-4.x
2012-10-06 17:26:14 +08:00
Hugues Malphettes
1cfa277c6c
jetty-9 osgi support
2012-09-24 13:04:57 +08:00
Jan Bartel
394c478b19
389452 if web-fragment metadata-complete==true still scan its related jar if there there is a ServletContainerInitializer
...
Also some refactoring to simplify scanning for annotations/classes.
2012-09-14 16:51:53 +10:00
Jesse McConnell
3a0e9e1733
Merge branch 'master' into jetty-8
2012-08-30 09:09:44 -05:00
Jan Bartel
1cdef414b4
388393 WebAppProvider doesn't work alongside OSGi deployer
2012-08-30 16:52:16 +10:00
Jan Bartel
ef17e69bd5
Merge branch 'jetty-8' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-8
2012-08-27 17:27:32 +10:00
Jan Bartel
c6cf4d4fb5
Add a toString() method to TldLocatableURLClassloader
2012-08-27 17:26:52 +10:00
Jesse McConnell
6ffaa478c4
standardize license headers
2012-08-17 16:09:49 -05:00
Joakim Erdfelt
3d1d76d214
Merge from jetty-8 to jetty-9 (license header standarization)
2012-08-17 13:44:22 -07:00
Jesse McConnell
5de0cee1eb
merge from master + license block standardization
2012-08-17 14:50:43 -05:00
Jesse McConnell
00ed549898
standardize license header blocks
2012-08-16 19:11:27 -05:00
Jan Bartel
8e0dc72b23
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
jetty-osgi/jetty-osgi-servletbridge/pom.xml
jetty-osgi/pom.xml
2012-07-23 13:24:57 +10:00
Jan Bartel
20ca9ad3ac
Merge remote-tracking branch 'origin/master' into osgi_refactor
...
Remove a few System.err.printlns
2012-07-20 15:01:58 +10:00
Jan Bartel
13f4c1fcb1
Emit Event Admin events, refactor to fix not knowing if DeploymentManager actually deploys a webapp or not. TODO: stop issuing Events for context handlers that are not webapps.
2012-06-06 10:24:07 +02:00
Jan Bartel
ccacf7c17c
Implement protecting OSGI-INF, OSGI-OPTS as per OSGi Enterprise Spec.
2012-06-04 17:19:38 +02:00
Jan Bartel
8cb131c7fd
Provide service properties and webapp attributes as specified by OSGi enterprise spec r4
2012-06-01 16:19:32 +02:00
Jan Bartel
6832d8805a
Ensure each context that is deployed also is registered as an osgi service, taking care that contexts that were already registered as services are not re-registered.
2012-05-31 11:27:05 +02:00
Jan Bartel
34954bc617
Merge remote-tracking branch 'origin/master' into jetty-8
2012-05-22 17:28:40 +02:00
Jan Bartel
050db55f1b
NullPointer fix
2012-05-17 16:41:01 +02:00
Jan Bartel
4a312f7cb6
More refactoring.
2012-05-17 14:48:30 +02:00
Jan Bartel
98cda498cb
More refactoring.
2012-05-16 12:25:19 +02:00
Jan Bartel
b2998c2c4d
Refactoring
2012-05-14 18:46:21 +02:00
Jan Bartel
9773113a47
After discussion with original author Hugues, decided to remove this implementation in favour of using only JettyServerServiceTracker.
2012-05-10 14:54:42 +02:00
Jan Bartel
b281b037dd
379015 Use factored jetty xml config files for defaults
2012-05-10 11:27:58 +02:00
Jan Bartel
9aa5f49df5
379015 Use factored jetty xml config files for defaults
2012-05-09 18:28:28 +02:00
Jan Bartel
3618be23cd
Cosmetic changes: typos, javadocs, comments, indenting
2012-05-09 16:47:45 +02:00
Jan Bartel
eae1b01122
Reformat and reindent code.
2012-05-09 09:33:44 +02:00
Jan Bartel
2131a40559
Merge remote-tracking branch 'origin/master' into jetty-8
2012-05-07 13:54:30 +02:00
Jan Bartel
ac2c07db56
377492 NPE if jsp taglibs bundle not deployed
2012-05-07 10:46:53 +02:00
Jan Bartel
c4416e2ed7
377492 NPE when deploying a Web Application Bundle with unresolved Require-TldBundle
2012-04-25 09:54:39 +10:00
Jan Bartel
734f2bcae1
371853 Support bundleentry: protocol for webapp embedded as directory in osgi bundle
2012-04-24 18:16:11 +10:00
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
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
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
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
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
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
Jan Bartel
1e079f06c9
Merge remote-tracking branch 'origin/master' into jetty-8
2011-09-01 14:11:53 +10: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
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
Greg Wilkins
17e907c2fb
git diff 54e885d967
remotes/origin/jetty-8-historical | patch -p1 ; git add -A
2011-07-07 18:18:24 +10: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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