Jan Bartel
a2032701ef
Issue #2996 Preserve default-context-path for quickstart ( #3063 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-11-07 09:23:56 +01:00
Jan Bartel
fefc3db0ba
Remove unused field _preconfigProcessor; reformat src for
...
o.e.j.maven.plugin.JettyWebAppContext; fix comment header in
o.e.j.quickstart.ExtraXmlDescriptorProcessor.
2018-10-17 15:55:41 +11:00
Jan Bartel
45953651e6
Undo last commit on QuickStartGenerationConfiguration for listeners.
2018-10-11 13:38:49 +11:00
olivier lamy
45411b694f
fix wrong merge from c165d07492
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-26 12:52:15 +10:00
Jan Bartel
c165d07492
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-09-26 12:13:31 +10:00
Jan Bartel
5593e5b479
Jetty 9.4.x 2903 delay listener instantiation ( #2930 )
...
* Issue #2903 Ensure listeners not instantiated for quickstart gen
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-09-26 11:27:57 +10:00
olivier lamy
32912b922d
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-06 17:39:57 +10:00
olivier lamy
1504b7da93
Revert "Issue #2431 - Upgrade to Junit 5 ( #2436 )"
...
This reverts commit e24fc48539
.
2018-09-06 09:27:11 +10:00
Joakim Erdfelt
e24fc48539
Issue #2431 - Upgrade to Junit 5 ( #2436 )
...
+ Changes needed for new Junit 5
+ Migrating from Vintage junit API to Jupiter junit API
+ Relies on SNAPSHOT jetty-test-helper
- this will be a formal release once this issue has been
resolved satisfactory
+ Have jenkins always pull latest SNAPSHOT for each build
+ Adding jetty.snapshots repository
+ Using surefire 2.22.0 per advice from junit
+ Ensuring <reuseForks>true</reuseForks> to work around issue junit-team/junit5#801
+ Disabling <forkMode>always</forkMode> in maven-surefire-plugin
due to bug https://github.com/junit-team/junit5/issues/801
+ OSGi tests must remain at vintage due to PaxExam
+ Moving from vintage TestingDir to jupiter WorkDir
+ Fixing imports to use jupiter, not vintage
+ Migrating vintage ExpectedException to jupiter assertThrows
+ Migrating vintage TestName to jupiter TestInfo
+ Migrating @RunWith(Parameterized.class)
to @ParameterizedTest with Argument Sources
+ Migrating assertTrue(val.contains(needle))
to assertThat(val, containsString(needle))
+ Aligning junit versions per recommendations from @sormuras
+ Adjusting parameter order change for assertEquals()
+ Test LifeCycle Annotation Migration
junit 4 | junit 5 / jupiter
------------ | -----------
@Before | @BeforeEach
@After | @AfterEach
@BeforeClass | @BeforeAll
@AfterClass | @AfterAll
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-05 21:27:18 +10:00
Joakim Erdfelt
a3f1592c50
Issue #2431 - Upgrade to Junit 5 ( #2436 )
...
+ Changes needed for new Junit 5
+ Migrating from Vintage junit API to Jupiter junit API
+ Relies on SNAPSHOT jetty-test-helper
- this will be a formal release once this issue has been
resolved satisfactory
+ Have jenkins always pull latest SNAPSHOT for each build
+ Adding jetty.snapshots repository
+ Using surefire 2.22.0 per advice from junit
+ Ensuring <reuseForks>true</reuseForks> to work around issue junit-team/junit5#801
+ Disabling <forkMode>always</forkMode> in maven-surefire-plugin
due to bug https://github.com/junit-team/junit5/issues/801
+ OSGi tests must remain at vintage due to PaxExam
+ Moving from vintage TestingDir to jupiter WorkDir
+ Fixing imports to use jupiter, not vintage
+ Migrating vintage ExpectedException to jupiter assertThrows
+ Migrating vintage TestName to jupiter TestInfo
+ Migrating @RunWith(Parameterized.class)
to @ParameterizedTest with Argument Sources
+ Migrating assertTrue(val.contains(needle))
to assertThat(val, containsString(needle))
+ Aligning junit versions per recommendations from @sormuras
+ Adjusting parameter order change for assertEquals()
+ Test LifeCycle Annotation Migration
junit 4 | junit 5 / jupiter
------------ | -----------
@Before | @BeforeEach
@After | @AfterEach
@BeforeClass | @BeforeAll
@AfterClass | @AfterAll
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-05 10:07:17 +10:00
Joakim Erdfelt
0cd4dacbac
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# VERSION.txt
# aggregates/jetty-all-compact3/pom.xml
# aggregates/jetty-all/pom.xml
# apache-jsp/pom.xml
# apache-jstl/pom.xml
# examples/async-rest/async-rest-jar/pom.xml
# examples/async-rest/async-rest-webapp/pom.xml
# examples/async-rest/pom.xml
# examples/embedded/pom.xml
# examples/pom.xml
# jetty-alpn/jetty-alpn-client/pom.xml
# jetty-alpn/jetty-alpn-conscrypt-client/pom.xml
# jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
# jetty-alpn/jetty-alpn-java-client/pom.xml
# jetty-alpn/jetty-alpn-java-server/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-client/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-server/pom.xml
# jetty-alpn/jetty-alpn-server/pom.xml
# jetty-alpn/pom.xml
# jetty-annotations/pom.xml
# jetty-ant/pom.xml
# jetty-bom/pom.xml
# jetty-cdi/cdi-2/pom.xml
# jetty-cdi/cdi-core/pom.xml
# jetty-cdi/cdi-full-servlet/pom.xml
# jetty-cdi/cdi-servlet/pom.xml
# jetty-cdi/cdi-websocket/pom.xml
# jetty-cdi/pom.xml
# jetty-cdi/test-cdi-webapp/pom.xml
# jetty-client/pom.xml
# jetty-continuation/pom.xml
# jetty-deploy/pom.xml
# jetty-distribution/pom.xml
# jetty-documentation/pom.xml
# jetty-fcgi/fcgi-client/pom.xml
# jetty-fcgi/fcgi-server/pom.xml
# jetty-fcgi/pom.xml
# jetty-gcloud/jetty-gcloud-session-manager/pom.xml
# jetty-gcloud/pom.xml
# jetty-hazelcast/pom.xml
# jetty-home/pom.xml
# jetty-http-spi/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-http2/http2-client/pom.xml
# jetty-http2/http2-common/pom.xml
# jetty-http2/http2-hpack/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-http2/http2-server/pom.xml
# jetty-http2/pom.xml
# jetty-infinispan/pom.xml
# jetty-io/pom.xml
# jetty-jaas/pom.xml
# jetty-jaspi/pom.xml
# jetty-jmx/pom.xml
# jetty-jndi/pom.xml
# jetty-jspc-maven-plugin/pom.xml
# jetty-maven-plugin/pom.xml
# jetty-memcached/jetty-memcached-sessions/pom.xml
# jetty-memcached/pom.xml
# jetty-nosql/pom.xml
# jetty-osgi/jetty-osgi-alpn/pom.xml
# jetty-osgi/jetty-osgi-boot-jsp/pom.xml
# jetty-osgi/jetty-osgi-boot-warurl/pom.xml
# jetty-osgi/jetty-osgi-boot/pom.xml
# jetty-osgi/jetty-osgi-httpservice/pom.xml
# jetty-osgi/pom.xml
# jetty-osgi/test-jetty-osgi-context/pom.xml
# jetty-osgi/test-jetty-osgi-fragment/pom.xml
# jetty-osgi/test-jetty-osgi-server/pom.xml
# jetty-osgi/test-jetty-osgi-webapp/pom.xml
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-plus/pom.xml
# jetty-proxy/pom.xml
# jetty-quickstart/pom.xml
# jetty-rewrite/pom.xml
# jetty-runner/pom.xml
# jetty-security/pom.xml
# jetty-server/pom.xml
# jetty-server/src/main/config/etc/jetty-http.xml
# jetty-server/src/main/config/etc/jetty-ssl.xml
# jetty-servlet/pom.xml
# jetty-servlets/pom.xml
# jetty-spring/pom.xml
# jetty-start/pom.xml
# jetty-unixsocket/pom.xml
# jetty-util-ajax/pom.xml
# jetty-util/pom.xml
# jetty-util/src/main/java/org/eclipse/jetty/util/MultiException.java
# jetty-util/src/test/java/org/eclipse/jetty/util/MultiExceptionTest.java
# jetty-webapp/pom.xml
# jetty-websocket/javax-websocket-client-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/AnnotatedServerEndpointConfig.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TrackingSocket.java
# jetty-websocket/pom.xml
# jetty-websocket/websocket-api/pom.xml
# jetty-websocket/websocket-client/pom.xml
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientCloseTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java
# jetty-websocket/websocket-common/pom.xml
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulator.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/WebSocketRemoteEndpointTest.java
# jetty-websocket/websocket-server/pom.xml
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketUpgradeFilterTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/misbehaving/MisbehavingClassTest.java
# jetty-websocket/websocket-servlet/pom.xml
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/extensions/FragmentExtensionTest.java
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/sockets/pong/PongContextListener.java
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/ConfiguratorTest.java
# jetty-xml/pom.xml
# pom.xml
# tests/pom.xml
# tests/test-continuation/pom.xml
# tests/test-http-client-transport/pom.xml
# tests/test-integration/pom.xml
# tests/test-jmx/jmx-webapp-it/pom.xml
# tests/test-jmx/jmx-webapp/pom.xml
# tests/test-jmx/pom.xml
# tests/test-loginservice/pom.xml
# tests/test-quickstart/pom.xml
# tests/test-sessions/pom.xml
# tests/test-sessions/test-file-sessions/pom.xml
# tests/test-sessions/test-gcloud-sessions/pom.xml
# tests/test-sessions/test-hazelcast-sessions/pom.xml
# tests/test-sessions/test-infinispan-sessions/pom.xml
# tests/test-sessions/test-jdbc-sessions/pom.xml
# tests/test-sessions/test-memcached-sessions/pom.xml
# tests/test-sessions/test-mongodb-sessions/pom.xml
# tests/test-sessions/test-sessions-common/pom.xml
# tests/test-webapps/pom.xml
# tests/test-webapps/test-http2-webapp/pom.xml
# tests/test-webapps/test-jaas-webapp/pom.xml
# tests/test-webapps/test-jetty-webapp/pom.xml
# tests/test-webapps/test-jndi-webapp/pom.xml
# tests/test-webapps/test-mock-resources/pom.xml
# tests/test-webapps/test-proxy-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/pom.xml
# tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
# tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
# tests/test-webapps/test-webapp-rfc2616/pom.xml
2018-06-12 11:11:38 -05:00
Greg Wilkins
e59d6fa2c0
Support root base or home for quickstart #2446 ( #2447 )
...
* Support root base or home for quickstart #2446
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Issue #2446 - Root as base for quickstart
+ Adding more tests for differences we have to resolve
with windows vs linux root path differences.
and URI's that have an authority vs those without an authority.
without authority examples:
file:/code/
file:/C:/code/
with authority examples:
file:///code/
file:///C:/code/
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Using the canonical URI passes all the tests on linux, but I still have some concerns with the whole approach
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* minor cleanups
Signed-off-by: Greg Wilkins <gregw@webtide.com>
* Handle windows URIs
Because a windows like `file:///F:/` has a path of `/F:/`, then it is OK to strip the trailing `/`, so the
expected normalized value can be `file:///F:`.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-03 09:56:08 +10:00
Joakim Erdfelt
1c04f9838d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed
2018-03-22 16:42:42 -05:00
WalkerWatch
534b8ea38b
Add edit warning for .mod files. Resolves #173
2018-03-15 13:23:42 -04:00
Joakim Erdfelt
d5a0878019
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-09 10:08:30 -06:00
Joakim Erdfelt
41ed9f29f4
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2018-01-09 09:37:25 -06:00
Joakim Erdfelt
fa4c7b0ca9
Issue #2108 - Updating license headers for year 2018
2018-01-09 08:39:37 -06:00
Joakim Erdfelt
067fc5d2d8
Issue #2108 - Upgrade licenses for 2018
2018-01-09 07:42:06 -06:00
Greg Wilkins
45e3abbdcf
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-09 13:17:32 +01:00
olivier lamy
b48364c298
more javadoc fixes #2056
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-01-08 19:54:09 +11:00
olivier lamy
083c8045e8
more javadoc fixes #2056
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-01-08 16:10:52 +11:00
Greg Wilkins
978fe59957
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-18 15:38:50 +11:00
Greg Wilkins
1dab620fe4
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-10-18 15:38:05 +11:00
Greg Wilkins
8ea8295a4c
javadoc
2017-10-18 15:37:41 +11:00
Jan Bartel
2555f7a65b
Issue #1852
2017-09-27 14:32:14 +10:00
Greg Wilkins
b5a3eb1f70
removed Configuration marker classes
2017-05-11 11:32:23 +02:00
Greg Wilkins
1fc046fb3d
renamed for clarity
2017-05-09 09:52:20 +02:00
Simone Bordet
cab1ec77ad
Merged branch 'jetty-9.4.x' into 'master'.
2017-05-02 10:03:30 +02:00
Greg Wilkins
5493c9e596
Refactor ServletHandler to add getMappedServlet method ( #1519 )
2017-05-01 16:38:55 +02:00
Greg Wilkins
68caf72835
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-01 13:30:41 +02:00
Jan Bartel
8885f24ccb
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-04-12 11:26:09 +10:00
Jan Bartel
daafc8fed1
Issue #877
...
Add test case
2017-04-12 11:08:07 +10:00
Jan Bartel
976ffb7ecd
Issue #877
...
And also #1117
2017-03-23 11:24:22 +11:00
Greg Wilkins
9ea4f128d4
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-03-09 15:59:58 +11:00
Joakim Erdfelt
6cf0663fe8
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2017-03-08 17:47:27 -07:00
Joakim Erdfelt
298de714f6
More windows build fixes
2017-03-08 15:29:54 -07:00
Simone Bordet
cef2ff9522
Happy New Year 2017.
2017-01-19 19:31:53 +01:00
Simone Bordet
0c8273f2ca
Happy New Year 2017.
2017-01-19 19:26:41 +01:00
Simone Bordet
07838b057f
Happy New Year 2017.
2017-01-19 18:54:03 +01:00
Simone Bordet
347c48d657
Revert "resolve merge and update license headers"
...
This reverts commit 53b31b03dd
, reversing
changes made to 4565c186d7
.
2017-01-19 18:26:43 +01:00
Jesse McConnell
53b31b03dd
resolve merge and update license headers
2017-01-19 09:33:16 -06:00
Jesse McConnell
ce3e6dafec
update license headers to 2017
2017-01-19 09:30:00 -06:00
Jan Bartel
d33f42fbab
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-01-19 10:26:11 +11:00
Jan Bartel
255ae29e2a
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-01-19 10:25:13 +11:00
Jan Bartel
eeae3bfdad
Issue #1274
2017-01-19 10:24:31 +11:00
Jan Bartel
4d7a629e1b
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-12-01 12:07:07 +11:00
Jan Bartel
ce6054391c
Issue #877
2016-12-01 11:57:54 +11:00
Jan Bartel
79c364368d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-11-24 15:51:06 +11:00
Jan Bartel
40d9e56d92
Issue #1117
2016-11-24 14:04:37 +11:00
Joakim Erdfelt
fa6d9029fc
Merge branch 'jetty-9.4.x'
2016-11-15 14:30:19 -07:00
Greg Wilkins
eda0cff90a
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-10-28 10:55:03 +11:00
Greg Wilkins
9f430ae7f7
Issue #1038 i
...
Handle resources as URIs
Avoid unneccessary trailing /
2016-10-28 10:50:39 +11:00
Greg Wilkins
6e1994641b
Issue #1038
...
Readded sorting of attributes by length
added .uri attributes
support WAR.path and WAR.uri in preference to WAR
updated for latest unit test
2016-10-28 10:31:22 +11:00
Greg Wilkins
b17dafc2ad
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-10-27 16:34:44 +11:00
Greg Wilkins
0f7028e9fa
Quickstart attribute normilazation #1038
...
Removed a lot of bad tests that incorrection assumed it was OK to mix Paths and URIs like:
jar:file:${jetty.base}/webapps/some.war!/some/path
refactored to keep PathAttributes and URIAttributes separate
2016-10-27 16:29:52 +11:00
Joakim Erdfelt
55c6514a2e
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-10-26 16:42:42 -07:00
Joakim Erdfelt
7256d75e9c
Issue #1038 - fixes for MS Windows
2016-10-26 16:09:12 -07:00
Joakim Erdfelt
ca5e075ba0
Issue #1038 - treating ${WAR} as a URI always, not a Path
...
+ Still needs testing on MS Windows
2016-10-26 15:30:34 -07:00
Joakim Erdfelt
ebc8983721
Issue #1038 - correcting "file:" and double "//" behavior
2016-10-26 14:25:20 -07:00
Joakim Erdfelt
a7ac269027
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-10-26 11:42:49 -07:00
Joakim Erdfelt
c4a8e684c8
Fixes #1039 - AttributeNormalizer should not track null paths
2016-10-26 10:31:12 -07:00
Joakim Erdfelt
7328742ae5
Fixes #1038 - ${WAR} should be favored over other attributes, like ${jetty.base}
2016-10-26 10:23:58 -07:00
Jan Bartel
b1d0661655
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-07-01 18:33:29 +10:00
Jan Bartel
aeda5a40a2
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-07-01 18:31:39 +10:00
Jan Bartel
29e6c6c4a4
Issue #682
2016-07-01 17:48:32 +10:00
Greg Wilkins
a5ad291add
Squashed commit of the following: ( #528 )
...
commit 4bf6b7c951
Merge: a50e882
301fc12
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Apr 27 12:12:08 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit a50e8825a3
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Apr 23 09:38:00 2016 +1000
work in progress
commit 4e286266c0
Merge: 5ae7da0
f550fcd
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Apr 21 16:34:12 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit 5ae7da049b
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Apr 21 12:12:24 2016 +1000
Work in progress on Features
commit adfc430ad4
Author: Jan Bartel <janb@webtide.com>
Date: Wed Apr 20 22:05:55 2016 +1000
Refactor Configurations.isEnabledByDefault, enable all configurations by default.
commit 70cca692cc
Author: Jan Bartel <janb@webtide.com>
Date: Wed Apr 20 17:32:22 2016 +1000
Fix features for jsp with osgi
commit 22d2b251e9
Merge: 571d503
2c4cdbe
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Apr 14 16:19:43 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit 571d50315e
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Apr 13 15:36:36 2016 +1000
code comment
commit d9b229f298
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Apr 9 21:24:22 2016 +1000
fixed quickstart validation
commit 154d58bf62
Merge: 8e54aad
ef92338
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Apr 8 18:25:17 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit 8e54aad414
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Apr 8 18:21:30 2016 +1000
general cleanup of Configuration and ClasspathPattern usage
commit 65f8e5dbd0
Merge: ea1deda
2fb9b55
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Apr 8 09:15:28 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit ea1deda4f9
Merge: cfe9c83
f92588c
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Mar 15 18:21:56 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit cfe9c83691
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Mar 15 17:57:23 2016 +1100
work in progress
commit 725be8c051
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Mar 15 10:11:49 2016 +1100
work in progress
commit 61d2c07534
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 14:01:00 2016 +1100
progress on OSGi
commit a977536c7d
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 12:52:33 2016 +1100
Fixed plugin
commit f08b84ba0e
Merge: f19bd2c
8a24798
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 12:21:55 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit f19bd2c65a
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 12:21:06 2016 +1100
work in progress... all but OSGi
commit 2f15c3e4f9
Merge: 36b5687
7b1486b
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Mar 10 16:52:43 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 36b5687329
Merge: 13d914a
e7081d7
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Mar 10 07:20:05 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 13d914aa7c
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Mar 10 04:41:30 2016 +1100
Work in progress on Features
Moved jar discovery to META-INF
commit d41bd264ad
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Mar 5 17:48:15 2016 +0100
Work in progress towards new quickstart arch
commit c5c23698c4
Merge: fd34007
692aae0
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Mar 5 11:29:18 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit fd34007c3d
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Mar 5 11:04:35 2016 +0100
Work in progress on Features for QuickStart
commit c5f0c80cd2
Merge: 0e6d886
b61c5ff
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 4 16:05:23 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 0e6d886b01
Merge: d150405
2b67e04
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Mar 2 17:32:36 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit d1504055de
Merge: 22a6cd0
3300d54
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Mar 2 15:21:20 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 22a6cd05b7
Author: Greg Wilkins <gregw@webtide.com>
Date: Mon Feb 29 20:53:17 2016 +0100
Features work in progress
convert more server/system classes to Configurations
commit 037e04bfe5
Merge: add9876
bb08b65
Author: Greg Wilkins <gregw@webtide.com>
Date: Mon Feb 29 17:11:04 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit add9876f83
Merge: 5263f15
eb5e25c
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Feb 25 10:11:08 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 5263f15acd
Merge: 89803ae
21fdaf5
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 23 14:35:31 2016 +0100
Merge remote-tracking branch 'origin/master' into jetty-9.4.x-Feature
commit 89803aec95
Merge: 5fed7c7
779317d
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 16 16:09:38 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 5fed7c713f
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 16 11:21:13 2016 +0100
fixed merge
commit ec22a1ba0b
Merge: 4c8257d
d0541e5
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 16 10:53:16 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 4c8257d23b
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Dec 17 09:34:28 2015 +1100
Do not default quickstart
commit 57ce87770a
Merge: 14bde1f
96e4d72
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Dec 16 17:16:14 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 14bde1f696
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Dec 4 16:26:58 2015 +1100
work in progress on Configurations as services
commit 46ce2aef3a
Merge: 9e82fa0
ae9dc79
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Dec 4 10:11:09 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 9e82fa0a22
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Dec 4 08:52:37 2015 +1100
work in progress to Configurations as ServiceLoader
commit 6e11f22de4
Merge: 120e330
5afa348
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Dec 3 18:16:14 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 120e33034f
Merge: 6c5b95d
384caf0
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Dec 3 14:20:52 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 6c5b95d6b8
Merge: 722eb60
5e40bf2
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Dec 2 11:16:37 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 722eb60ce5
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Nov 27 13:58:16 2015 +1100
Configurations can add server/system classes
commit 2972354db7
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Nov 27 11:47:03 2015 +1100
Self ordering WebApp Configurations
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2016-05-02 17:55:54 +10:00
Jan Bartel
d28dffb16e
Remove SessionManager; refactor names of session classes; add start modules for new session arch
2016-04-15 11:08:46 +10:00
Joakim Erdfelt
5353aeb573
Merge branch 'jetty-9.3.x'
2016-03-25 10:14:41 -07:00
Joakim Erdfelt
5d882d12ab
Fixing AttributeNormalizerTest to use real 'user.home'
...
+ Removing many debug lines
+ Resolving System.getProperty("user.home") to real system path
before using it in the test case
2016-03-24 11:04:13 -07:00
Joakim Erdfelt
81c8708c52
Attempting to ascertain what's going on with AttributeNormalizer on CI
2016-03-24 10:13:39 -07:00
Joakim Erdfelt
3628e105e9
Fixing QuickStart / AttributeNormalizer test failures
...
+ Adding more noise to test cases to help determine what's going on in
CI builds for test-quickstart
2016-03-23 21:28:27 -07:00
Jan Bartel
4ca9e3b149
Merge remote-tracking branch 'origin/jetty-9.3.x'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionManager.java
tests/test-quickstart/src/test/java/org/eclipse/jetty/quickstart/AttributeNormalizerTest.java
2016-03-24 11:38:44 +11:00
Joakim Erdfelt
36f559b483
Issue #446 - jetty-quickstart path normalization uses improper paths on Windows
...
Using URI syntax everywhere in AttributeNormalizer
2016-03-21 15:40:42 -07:00
Simone Bordet
f727e2bac3
Merged branch 'jetty9.3.x' into 'master'.
2016-02-13 11:32:53 +01:00
Joakim Erdfelt
30b5fe1c96
AttributeNormalizer.normalize() now supports URI
2016-02-12 09:29:49 -07:00
Joakim Erdfelt
bc59c0853d
Adjusting quickstart AttributeNormalizer to treat 'WAR' as a URI, not a Path
2016-02-12 09:11:19 -07:00
Simone Bordet
2ac465a343
Merged branch 'jetty-9.3.x' into 'master'.
2016-02-09 18:14:07 +01:00
Simone Bordet
6306f06e2f
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-02-09 18:12:04 +01:00
Simone Bordet
145e4bee71
487511 - Jetty HTTP won't work on turkish systems.
...
Fixed usages of toLowerCase() and toUpperCase() to use Locale.ENGLISH.
2016-02-09 17:50:26 +01:00
Greg Wilkins
df79ad689a
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-02-04 07:00:13 +01:00
Joakim Erdfelt
7d50167ec1
486674 - Quickstart path attribute normalization should be based on longest path match
...
+ Adding weight to individual PathAttribute's to allow specific
keys to win in the situation where more than 1 key is the same path value
2016-02-02 10:00:55 -07:00
Joakim Erdfelt
83bc83a99d
486674 - Quickstart path attribute normalization should be based on longest path match
2016-01-27 11:55:08 -07:00
Greg Wilkins
c5cbc64e77
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-01-14 11:00:06 +11:00
Greg Wilkins
682f09bebb
485712 - Quickstart web.xml is absolute
2016-01-13 15:17:58 +11:00
Greg Wilkins
e2a0794d91
485712 - Quickstart web.xml is absolute
2016-01-13 12:47:25 +11:00
Joakim Erdfelt
ac24196b0d
Happy New Year 2016
2016-01-04 14:34:20 -07:00
Joakim Erdfelt
cd39fd84fe
Happy New Year 2016
2016-01-04 14:31:22 -07:00
Joakim Erdfelt
b5db18378d
Happy New Year 2016
2016-01-04 14:21:26 -07:00
Greg Wilkins
ff0d1b4c14
481903 Module Descriptions
2015-11-12 10:48:04 +11:00
Jan Bartel
75640039fd
471272 ArrayIndexOutOfBoundsException in org.eclipse.jetty.quickstart.PreconfigureQuickStartWar
2015-07-01 15:06:04 +10:00
Jan Bartel
3ac6a727cf
470803 If a webapp is not fully started do not fully stop it
2015-06-25 18:29:51 +10:00
Joakim Erdfelt
7c737a587b
Removing [version] sections in modules
2015-06-12 09:14:34 -07:00
Joakim Erdfelt
916efd6aa7
469860 - Add module metadata versioning to support backwards compat
...
+ Adding [version] section to all existing jetty 9.3 distro modules
+ Updating testcases in jetty-start with new [version] sections too
+ Adding extra testcases for versioned modules
2015-06-10 10:59:18 -07:00
Greg Wilkins
5d041ad54f
466645 Allow XmlConfiguration Properties to use Elements or Attributes
2015-05-07 16:24:11 +10:00
Joakim Erdfelt
4db2784354
464727 - Update Javadoc for Java 8 DocLint
2015-04-22 16:54:50 -07:00
Greg Wilkins
1cb0449be3
Organised imports
2015-03-26 12:32:15 +11:00
Joakim Erdfelt
e92bcccc84
Using new Decorator
2015-03-12 10:09:53 -07:00
Joakim Erdfelt
a3201a3c81
Happy New Year 2015
2015-01-07 17:06:59 -07:00
Joakim Erdfelt
6a0668b7a1
Happy New Year 2015
2015-01-07 17:03:30 -07:00
Greg Wilkins
41e95bfa5a
added TLD to quickstart example
2014-09-23 11:33:44 +02:00