127a5af8d7
Merge remote-tracking branch 'origin/master' into jetty-8
2011-11-17 10:59:54 +11:00
168127857c
refactored password
2011-10-28 14:12:49 +11:00
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
b67d307ff3
[Bug 359675] Principal != String, fix for issue in property file login
...
manager
2011-10-03 17:50:35 -05:00
c17552ee50
[323311] apply 5th patch of thomas, also removed extra method on IdentityService since it appears not needed, moved behavior to loadUsers() method instead.
2011-09-20 10:11:26 -05:00
df0aab1f49
PropertyUserStore: Code Format
2011-09-20 10:11:26 -05:00
1e079f06c9
Merge remote-tracking branch 'origin/master' into jetty-8
2011-09-01 14:11:53 +10:00
3399242d83
293739 - Deprecate static Jetty Log usage in favor of named logs
...
+ Finished conversion of jetty-ajp, jetty-client, jetty-deploy,
jetty-jaspi, jetty-jndi, jetty-plus, jetty-webapp
2011-08-24 13:01:00 -07:00
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
9315e1896d
354466 - Typo in example config of jetty-plus.xml
2011-08-11 19:31:47 +10:00
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
56866b3e68
Bug 353465 - JAASLoginService ignores callbackHandlerClass
2011-08-01 12:55:32 +10:00
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
40e75f6068
[Bug 352133] fix warning related to 1.5
2011-07-15 12:25:01 -05:00
17e907c2fb
git diff 54e885d967 remotes/origin/jetty-8-historical | patch -p1 ; git add -A
2011-07-07 18:18:24 +10:00
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
2b79f06c78
fix javadoc
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2964 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-04 16:31:44 +00:00
6e62a61af3
341006 move inner enums out into separate files
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2913 7e9141cc-0065-0410-87d8-b60c137991c4
2011-03-25 21:04:39 +00:00
f3a2a575aa
Fixing broken javadoc and imports
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2673 7e9141cc-0065-0410-87d8-b60c137991c4
2011-01-21 20:49:28 +00:00
e10c14c77a
332937 Added Destroyable interface and reworked dependent lifecycles, specially of JNDI
...
Also added Dumpable interface to improve and standardize the output of nested structures while debugging
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2615 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-21 11:27:02 +00:00
796f444914
332703 Cleanup context scope JNDI at stop
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2610 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-16 10:35:07 +00:00
2b43ae931c
improved debugging of JNDI. own logger
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2608 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-15 08:57:14 +00:00
35c063fb95
Merge fixes from jetty-8: 330188, 330208
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2504 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-15 06:47:58 +00:00
e7fd61ed34
328008 - Handle update to Servlet Spec 3 Section 8.2.3.h.ii. Backport from jetty-8 for compatibility.
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2405 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-26 05:21:05 +00:00
f8bbd706a9
JETTY-1297
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2291 7e9141cc-0065-0410-87d8-b60c137991c4
2010-09-22 03:16:43 +00:00
097d770200
324377 Allow dispatch of ServletRequest and ServletResponse
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2243 7e9141cc-0065-0410-87d8-b60c137991c4
2010-09-03 07:05:14 +00:00
2e566b9248
Fix jetty-plus configuration names.
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2208 7e9141cc-0065-0410-87d8-b60c137991c4
2010-08-05 12:32:16 +00:00
bd272143e2
320073 ensure Decorators get called in reverse order of addition; refactor TagLibConfiguration and Descriptor classes
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2187 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-27 23:59:16 +00:00
b4f4c0ae36
320073 further improved configuration
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2175 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-26 09:40:47 +00:00
30996d5446
320073
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2173 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-26 08:00:55 +00:00
3ca0c6806a
320073
...
support decorator cloning for WebAppContext templates
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2171 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-22 06:33:54 +00:00
0443786d8e
320073 reconsile configuration mechanism
...
Reconsiled the jetty-8 configuration mechanism with the capability to share the MetaData between instances
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2168 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-22 03:20:41 +00:00
c5583b9ac2
Update to jetty-8-to-jetty-7-base-20100721-1
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2162 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-21 03:15:29 +00:00
32a89ffaf7
Backport from 7 to 8 of changes to reconciliation of webapp config mechanism. See bugzilla 320073
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2152 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-19 06:15:57 +00:00
314f94decc
320073 Reconcile jetty-8 and jetty-7 webapp configuration mechanisms
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2145 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-16 07:15:13 +00:00
2a37d805b3
Fix for #308858 (Update test suite to JUnit4 - Module jetty-plus).
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1754 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-11 15:52:12 +00:00
b7b067e7f3
309185 - Fix the over 300 Javadoc warnings
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1627 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-29 23:03:36 +00:00
6bc437c298
309185 - Fix the over 300 Javadoc warnings
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1626 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-29 23:03:04 +00:00
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
4fe6fa388f
310094 Improved start.jar usage and config files
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1548 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-22 12:59:40 +00:00
a42b954a26
308420 - convert jetty-plus.xml to use DeploymentManager
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1478 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-07 23:26:30 +00:00
e89eab77f3
jetty-plus.xml was not finished being ported to jetty-7 because it still referred to addLifeCycle instead of addBean. Also added AnnotationConfiguration in as part of plusConfig
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1477 7e9141cc-0065-0410-87d8-b60c137991c4
2010-04-07 20:04:37 +00:00
227fb5abec
numerous code cleanups
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1014 7e9141cc-0065-0410-87d8-b60c137991c4
2009-10-26 07:48:39 +00:00
35dfcc2d4b
remove printlns from jetty-plus.
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@977 7e9141cc-0065-0410-87d8-b60c137991c4
2009-10-07 04:10:02 +00:00
33399664b5
JETTY-1113
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@925 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-17 03:49:27 +00:00
d627905f4b
JETTY-780
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@859 7e9141cc-0065-0410-87d8-b60c137991c4
2009-09-10 11:51:11 +00:00
4ae850e9e5
JETTY-960 support ldaps
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@762 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-26 02:03:16 +00:00
ecc9b9b417
Remove context attributes in postConfigure() phase of configuration that are not needed during deconfigure().
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@649 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-06 03:41:56 +00:00
6e4f53cc3d
improved deferred authentication handling and fixed test harnesses
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@623 7e9141cc-0065-0410-87d8-b60c137991c4
2009-08-03 08:54:41 +00:00
0358f29479
Bring jetty-7 into line with new annotation parsing mechansim from jetty-8
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@575 7e9141cc-0065-0410-87d8-b60c137991c4
2009-07-22 00:51:14 +00:00
Jan Bartel
Greg Wilkins
Jesse McConnell
Thomas Becker
Joakim Erdfelt
Greg Wilkins
Joakim Erdfelt
Jan Bartel
Simone Bordet