Greg Wilkins
|
de005c68fd
|
Revert "Merge branch 'release-8'"
This reverts commit 9e72457941e98eb2ee1adf64f2bc53160b01e34d, reversing
changes made to df12605f0e3e549c07c96968eedfd382fd6f274e.
|
2011-11-30 16:27:30 +11:00 |
|
Jan Bartel
|
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 |
|
hmalphettes
|
fd911df740
|
Ability to start equinox in a different thread instead of blocking the servletbrdige webapp from starting until equinox has completed to start. this is useful for cloudfoundry that at the moment complains if the webapp does not start very quickly
|
2011-09-14 16:34:56 +08:00 |
|
hmalphettes
|
901f818cb6
|
Ability to start equinox in a different thread instead of blocking the servletbrdige webapp from starting until equinox has completed to start. this is useful for cloudfoundry that at the moment complains if the webapp does not start very quickly
|
2011-09-14 16:34:15 +08:00 |
|
hmalphettes
|
8d51bc05ac
|
update the example osgi servlet bridge webapp
|
2011-09-07 17:08:24 -07: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 |
|
Greg Wilkins
|
17e907c2fb
|
git diff 54e885d9670548c12cf9ffbd58702b73d373c186 remotes/origin/jetty-8-historical | patch -p1 ; git add -A
|
2011-07-07 18:18:24 +10:00 |
|
Hugues Malphettes
|
b4a75c7633
|
update to the latest version.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3347 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-30 08:20:21 +00:00 |
|
Hugues Malphettes
|
4a6f14f2a6
|
ABility to use an equinox hook to load the javax.servlet packages from the bootstrapping webapp.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3147 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-15 14:30:29 +00:00 |
|
Hugues Malphettes
|
d625f738ad
|
add a dump servlet to probe the webapp server in which we are running
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3097 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-09 05:46:12 +00:00 |
|
Hugues Malphettes
|
1f5933f89b
|
Support passing sys properties variable for the path to the logback configuration file.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3092 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-09 03:33:16 +00:00 |
|
Hugues Malphettes
|
4152e987cd
|
bug 341736 A few more options, take care of logback configuration too.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3083 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-06 06:12:51 +00:00 |
|
Hugues Malphettes
|
fd7a867dbc
|
bug 341736 cleaning up.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3077 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-05-05 06:08:10 +00:00 |
|
Hugues Malphettes
|
6caad913e4
|
bug 341736 Deploy the servletbridge extension bundle to pass the HttpServlet class from the bootstrapping webapp to equinox.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3047 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-04-30 13:08:23 +00:00 |
|
Hugues Malphettes
|
105f2e3d94
|
bug 341736 example webapp to bootstrap equinox with jetty-osgi. at the moment the equinox servletbridge jar cannot be found on maven central. so this build is using intalio.org to get going.
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3046 7e9141cc-0065-0410-87d8-b60c137991c4
|
2011-04-30 07:13:26 +00:00 |
|