Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 00:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,194 Commits 55 Branches 466 Tags
Commit Graph

431 Commits

Author SHA1 Message Date
Joakim Erdfelt
0a88090586 Revert "Moving jetty-version-maven-plugin to profile due to NPE on some people's machines" 
This reverts commit 683d78aa181c4ea2e6f7538e90662bb972d49a0b.
 2011-08-18 14:35:12 -07:00
Joakim Erdfelt
683d78aa18 Moving jetty-version-maven-plugin to profile due to NPE on some people's machines 2011-08-18 14:23:56 -07:00
Joakim Erdfelt
87b76672eb Updating to released jetty-version-maven-plugin 2011-08-18 13:41:56 -07:00
Joakim Erdfelt
52243514d6 Adding jetty-version-maven-plugin to build (on branch) 2011-08-16 15:31:37 -07:00
Michael Gorovoy
fa7364ac1b 276670 SLF4J loggers show correct location information 2011-08-16 16:25:51 -04: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
Jan Bartel
050cb83b35 Merge remote-tracking branch 'origin/master' into jetty-8 
Conflicts:
	jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/console/EquinoxConsoleWebSocketServlet.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterTest.java
	jetty-websocket/pom.xml
 2011-08-12 18:43:15 +10:00
Jesse McConnell
7aade2d726 resolve test issues with jetty-websocket stemming from the 
boundschecking being enabled in the surefire plugin.  tests would pass
in eclipse because the bounds checking was turned off and the usage of
the ByteArrayBuffer in WebSocketClient to wrap a string would create an
immutable buffer...and when flush() is called if this property is true
an exception is thrown breaking the unit tests.  so I am commenting out
the property that triggers this for greg to sort out the correct usage
with regards to that test.
 2011-08-02 16:48:03 -05:00
Jan Bartel
02a66a00fb Merge remote-tracking branch 'origin/master' into jetty-8 
Conflicts:
	VERSION.txt
	jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-equinoxtools/src/main/java/org/eclipse/jetty/osgi/equinoxtools/WebEquinoxToolsActivator.java
	pom.xml
 2011-08-01 14:39:39 +10:00
Jesse McConnell
2ead7a83fe [Bug 351516] support nosql sessions 2011-07-26 15:00:49 -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
Michael Gorovoy
0cc914c4bb 352684 Implemented spinning thread analyzer 2011-07-20 19:30:44 -04:00
Greg Wilkins
70d7d3c9a5 reverted version 2011-07-18 09:15:31 +10:00
Greg Wilkins
a26ddd5933 created performance version 2011-07-14 15:38:25 +10: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 54e885d9670548c12cf9ffbd58702b73d373c186 remotes/origin/jetty-8-historical | patch -p1 ; git add -A 2011-07-07 18:18:24 +10:00
Jesse McConnell
6ed9d4c394 update scm.url 
Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
 2011-07-06 13:33:16 -05:00
Jesse McConnell
42c129a78f set new parent version and update scm info 
Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
 2011-07-06 13:20:44 -05: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
Jesse McConnell
ba34537bc4 update jetty-test-helper to 1.6 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3383 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-06-10 13:16:10 +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
Joakim Erdfelt
e68c6ce9fb Using released version of jetty-test-helper 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3266 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-05-25 23:05:31 +00:00
Joakim Erdfelt
d77ac8acb4 Using new jetty-test-helper 1.5-SNAPSHOT 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3265 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-05-25 23:05:29 +00:00
Jesse McConnell
297d4cb49b resolve some mvn warnings 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3215 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-05-19 14:32:49 +00:00
Hugues Malphettes
5b7811ca76 This directive for the Export-Package does make the osgi test pass again. 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3196 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-05-18 01:52:37 +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
275a0da64d Change the instructions for the maven-bundle-plugin to try to make it work for the new version 2.3.4. The osgi test is not passing yet though. 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3166 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-05-17 14:26:30 +00:00
Jesse McConnell
898470696c updating to parent-17-snapshot and various changes to work with updated maven plugins 
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3164 7e9141cc-0065-0410-87d8-b60c137991c4
 2011-05-17 13:41:15 +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