Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-05-28Ensure jetty.home set as Server attribute on defaultJettyServer instanceJan Bartel1-0/+2
2013-05-28408910 META-INF/jetty-webapp-context.xml file should be able to refer to ↵Jan Bartel4-6/+18
bundle-relative locations
2013-05-28409228 Set jetty.home property so config files work even if deployed inside ↵Jan Bartel5-50/+102
a bundle
2013-05-24408923 Need to be able to configure the ThreadPool for the default jetty ↵Jan Bartel11-332/+289
server in osgi
2013-04-29406618 Jetty startup in OSGi Equinox fails when using option ↵Jan Bartel1-1/+1
jetty.home.bundle=org.eclipse.jetty.osgi.boot
2013-04-11Rename some jetty-osgi classes, add comments, organize imports.Jan Bartel8-30/+28
2013-04-11Prune unused code; add more comments; rename classes.Jan Bartel17-272/+188
2013-04-11405119 Tidy up comments and code formatting for osgiJan Bartel25-301/+236
2013-03-28404176 Jetty's AnnotationConfiguration class does not scan non-jar resources ↵Jan Bartel1-1/+1
on the container classpath
2013-02-28401966 Ensure OSGI WebApp as Service (WebAppContext) can be deployed only ↵Jan Bartel1-0/+3
through ServiceWebAppProvider
2013-02-21Removing accidental addJan Bartel24-6135/+0
2013-02-21Fixing buildJan Bartel6-366/+144
2013-02-19committing to save changes but does not yet compileJan Bartel57-692/+8199
2013-01-11merge from jetty-8 and update license blocks.Jesse McConnell24-24/+24
2013-01-11merge from 7 and update license blocks for 2013Jesse McConnell41-41/+41
2013-01-11update license blocks for 2013Jesse McConnell39-39/+39
2013-01-11jetty-9 organised imports. Cleaned up some TODOsGreg Wilkins3-6/+2
2012-11-23394294 Start web-bundles started before jettyHugues Malphettes2-5/+32
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-02Merge remote-tracking branch 'origin/jetty-8'Greg Wilkins2-2/+4
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-02393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase callsGreg Wilkins1-1/+2
2012-10-15jetty-9 removed context deployer and merged context and webapps directoryGreg Wilkins1-1/+2
2012-10-12Merge remote-tracking branch 'origin/jetty-8' into jetty-9Greg Wilkins2-11/+32
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-06Clean-up OSGi test; add spdy OSGi test; fix felixHugues Malphettes2-7/+138
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-09-24jetty-9 osgi supportHugues Malphettes6-324/+8
2012-09-14389452 if web-fragment metadata-complete==true still scan its related jar if ↵Jan Bartel1-11/+18
there there is a ServletContainerInitializer Also some refactoring to simplify scanning for annotations/classes.
2012-08-30Merge branch 'master' into jetty-8Jesse McConnell1-14/+17
2012-08-30388393 WebAppProvider doesn't work alongside OSGi deployerJan Bartel1-14/+17
2012-08-27Merge branch 'jetty-8' of ↵Jan Bartel41-491/+732
ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-8
2012-08-27Add a toString() method to TldLocatableURLClassloaderJan Bartel1-0/+14
2012-08-17standardize license headersJesse McConnell2-29/+34
2012-08-17Merge from jetty-8 to jetty-9 (license header standarization)Joakim Erdfelt24-306/+432
2012-08-17merge from master + license block standardizationJesse McConnell41-491/+732
2012-08-17standardize license header blocksJesse McConnell39-467/+697
2012-07-23Merge remote-tracking branch 'origin/master' into jetty-8Jan Bartel30-2185/+3231
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-20Merge remote-tracking branch 'origin/master' into osgi_refactorJan Bartel2-2/+0
Remove a few System.err.printlns
2012-06-06Emit Event Admin events, refactor to fix not knowing if DeploymentManager ↵Jan Bartel12-150/+433
actually deploys a webapp or not. TODO: stop issuing Events for context handlers that are not webapps.
2012-06-04Implement protecting OSGI-INF, OSGI-OPTS as per OSGi Enterprise Spec.Jan Bartel3-2/+39
2012-06-01Provide service properties and webapp attributes as specified by OSGi ↵Jan Bartel4-12/+71
enterprise spec r4
2012-05-31Ensure each context that is deployed also is registered as an osgi service, ↵Jan Bartel12-31/+148
taking care that contexts that were already registered as services are not re-registered.
2012-05-22Merge remote-tracking branch 'origin/master' into jetty-8Jan Bartel20-1249/+1008
2012-05-17NullPointer fixJan Bartel1-1/+1
2012-05-17More refactoring.Jan Bartel11-436/+594
2012-05-16More refactoring.Jan Bartel19-1638/+1627
2012-05-14RefactoringJan Bartel17-1083/+1489
2012-05-10After discussion with original author Hugues, decided to remove this ↵Jan Bartel3-262/+14
implementation in favour of using only JettyServerServiceTracker.
2012-05-10379015 Use factored jetty xml config files for defaultsJan Bartel1-3/+3
2012-05-09379015 Use factored jetty xml config files for defaultsJan Bartel1-6/+20
2012-05-09Cosmetic changes: typos, javadocs, comments, indentingJan Bartel12-119/+118
2012-05-09Reformat and reindent code.Jan Bartel18-1000/+993
2012-05-07Merge remote-tracking branch 'origin/master' into jetty-8Jan Bartel1-1/+4

Back to the top