48982ced4a
Fix up version number in manifests; reformat code; tidy xml and tweak
2012-03-21 16:39:55 +11:00
5b98ee4e1d
Fix manifest versions.
2012-03-09 15:38:44 +11:00
2e61650264
merge from master and adjust osgi bits
2012-03-08 20:32:20 -06:00
b77ad34ef0
Fix versions in manifests, fix typo in jetty-osgi-default.xml, ensure Required-TldBundles are on the classpath.
...
Still doesn't work with version of jsp in jetty-7.6, as the jsp compiler cannot load the class org.glassfish.jsp.api.ResourceInjector, still trying to figure that out.
2012-03-09 11:40:52 +11:00
4f8cff8ccd
bug 367548 the nested package must not be imported twice in jetty-osgi-boot
2011-12-27 07:59:13 +08:00
89afbdf31d
360245 OSGi: javax.servlet packages version refactored 3.0 -> 2.6
2011-12-02 17:27:26 +08:00
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
17e907c2fb
git diff 54e885d967 remotes/origin/jetty-8-historical | patch -p1 ; git add -A
2011-07-07 18:18:24 +10:00
8d18642311
Better error messages when web-buindles fail to start cleanly.
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3392 7e9141cc-0065-0410-87d8-b60c137991c4
2011-06-17 04:14:08 +00:00
831e84d114
Don't use Require-Bundle
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3350 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-30 10:30:56 +00:00
59d60f33b8
bug 346027 Add required-bundles and fragment's required bundles to the pacckages where META-INF/web-fragments.xml and META-INF/resources are discovered.
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3202 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-18 05:13:17 +00:00
2585b4cd94
bug 346027 support for META-INF/web-fragment.xml and META-INF/resources/ inside fragments of a web-bundle
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3200 7e9141cc-0065-0410-87d8-b60c137991c4
2011-05-18 03:55:13 +00:00
70cd112ab1
bug 341736 Extend the NestedConnector to hook cleanly into the equinox BridgeServlet
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3045 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-30 05:52:04 +00:00
6746c79e71
update the development environment to the current version.
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3025 7e9141cc-0065-0410-87d8-b60c137991c4
2011-04-20 08:24:11 +00:00
7656b37934
switch trunk to 7.3.x
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2614 7e9141cc-0065-0410-87d8-b60c137991c4
2010-12-21 10:22:53 +00:00
e6c26b383e
bug #329571 don't use the lazy activation policy for jetty.osgi.boot.
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2471 7e9141cc-0065-0410-87d8-b60c137991c4
2010-11-05 17:54:47 +00:00
786f0d2299
update the versions to 7.2.1 in our clumsy build system
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2382 7e9141cc-0065-0410-87d8-b60c137991c4
2010-10-21 11:59:38 +00:00
11d03a6f0b
fix broken osgi build, update filter targets to 7.2 (which we ought to just standardize so we don't have to change filters based on minor version and found source of issue being an unquoted version in DynamicImport in boot osgi
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2200 7e9141cc-0065-0410-87d8-b60c137991c4
2010-07-30 17:30:49 +00:00
e8ed78c866
add the Bundle-Classpath: . to be able to import this library with the sources in eclipse. workaround for a PDE bug
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1989 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-10 23:13:00 +00:00
05b2d9cfa7
bug 315004 explicitly import org.xml.sax and org.xml.sax.helpers to help with paxrunner
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1925 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-04 20:58:53 +00:00
6b6c790efd
bug 315004 add system.bundle to the dependencies of jetty.osgi to workaround some potential issues with execution profiles
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1922 7e9141cc-0065-0410-87d8-b60c137991c4
2010-06-04 18:14:09 +00:00
52d8ac5321
7.0.2 -> 7.1.0 for hard coded references
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1687 7e9141cc-0065-0410-87d8-b60c137991c4
2010-05-04 14:25:41 +00:00
11a5d3674e
fix the version imports of the jstl library: 1.2.0; not 2.5.0; remove the imports of packages that belong to the jdk5 and more
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1375 7e9141cc-0065-0410-87d8-b60c137991c4
2010-03-10 06:39:19 +00:00
f03dce5432
cleanup of jndi setup. update the version number to 7.0.2. fix some dependencies
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1284 7e9141cc-0065-0410-87d8-b60c137991c4
2010-02-23 20:52:46 +00:00
219c9dd740
updated to patch from 20091210
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1145 7e9141cc-0065-0410-87d8-b60c137991c4
2009-12-11 03:27:18 +00:00
7e74c61989
294154 Patched jetty-osgi
...
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1039 7e9141cc-0065-0410-87d8-b60c137991c4
2009-11-09 01:20:48 +00:00
Jan Bartel
Jesse McConnell
hmalphettes
Jan Bartel
Greg Wilkins
Greg Wilkins