Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,653 Commits 72 Branches 465 Tags 369 MiB
Commit Graph

98 Commits

Author SHA1 Message Date
Jan Bartel 9af4334739 committing to save changes but does not yet compile 2013-02-20 09:26:30 +11:00
Simone Bordet 209d5bc12f 399721 - Change <Ref id= ...> to <Ref refid= ...> 2013-02-01 13:03:11 +01:00
Jan Bartel d5f03ea791 websocket-client should not be needed on osgi server test classpath 2013-02-01 11:27:38 +11:00
Thomas Becker 9ebea3938d 393385: Make hostname verification configurable in SslContextFactory and enable it by default (See http://www.ietf.org/rfc/rfc2818.txt section 3.1) 2013-01-17 10:28:15 +01: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
Simone Bordet c9f4513a89 Reworked HTTP client API, removing usage of Future. 2012-12-19 16:27:20 +01:00
Greg Wilkins 6f098dd69c jetty-9 use DateCache timer to set Date header once per second 2012-12-10 12:58:14 +11:00
Joakim Erdfelt 11cbe274af 395344 Move JSR-356 (Java WebSocket API) work off to Jetty 9.1.x 2012-11-28 16:55:13 -07:00
Joakim Erdfelt d229364f9d Fixing jetty-osgi for new websocket artifacts 2012-11-13 12:50:27 -07:00
Greg Wilkins 7ae264e30c jetty-9 corrections for documentation 2012-11-08 07:34:40 +11:00
Thomas Becker accc3b321a config fix 2012-11-02 17:16:13 +01:00
Thomas Becker 3d3e077509 393281: Add User-Agent filter to ReferrerPushStrategy 2012-11-02 13:21:42 +01:00
Greg Wilkins add3c2b381 392237 improved names and examples for documentation 2012-10-29 17:59:39 +11:00
Simone Bordet 605b0360e1 HTTP client: reviewed API. 
The API were inconsistent: sometimes using the C format for getters and setters
(e.g. String host(), void host(String)), sometimes using the JavaBeans format.

Now the API stick with the JavaBean format apart the "fluent" API in Request,
that is in the fluent format (i.e. C setter format, but returning this instead of void).
 2012-10-26 23:42:18 +02:00
Hugues Malphettes 3261318984 Add equinox-3.7.0 to the osgi frameworks tested 
3.7.0 is correctly cached by pax-exam unlike 3.7.1
3.7.2 is not supported with the current version of
pax-exam-2.x
 2012-10-19 23:51:29 +08:00
Hugues Malphettes 582de3e0f8 Avoid downloaded equinox for each test 
Somehow equinox-3.7.1 is downloaded by pax-exam on each testThat makes
the execution of the tests very slow.
This looks specific to equinox-3.7.1
Commenting it out until we find a better way.
 2012-10-19 23:46:01 +08:00
Hugues Malphettes 8253a31614 Re-enabling the SPDy test. Hopefully someone will point what was wrong 2012-10-16 11:48:54 +08:00
Jesse McConnell f22eedf6b8 comment out spdy osgi tests for m1 release 2012-10-15 11:18:10 -05:00
Hugues Malphettes 12ee234010 Adding the javadoc that seems to be expected 2012-10-06 21:03:48 +08: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
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 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 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
Jesse McConnell 6b079ae3d8 merge from master 2012-02-01 17:25:08 -06: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
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
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 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 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
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
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
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 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