Jesse McConnell
1659d83978
[maven-release-plugin] prepare for next development iteration
2015-02-24 10:38:33 -06:00
Jesse McConnell
dc0c3f4c52
[maven-release-plugin] prepare release jetty-9.2.9.v20150224
2015-02-24 10:38:28 -06:00
Joakim Erdfelt
a32c9ed79c
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-start/src/main/java/org/eclipse/jetty/start/Module.java
2015-02-23 18:05:19 -07:00
Joakim Erdfelt
2141cc2dc3
459273 - Redundant license notices
...
+ Only showing license acknowledgement request screen
if [FILES] section contains content that does not (yet) exist
2015-02-23 16:49:07 -07:00
Joakim Erdfelt
7bb3127ee1
Making jetty-start test cases more aligned with real distro configuration
2015-02-19 16:23:40 -07:00
Joakim Erdfelt
4b6d024c85
Using webdefault.xml from jetty-distribution in test cases
2015-02-18 12:39:06 -07:00
Joakim Erdfelt
2c9edae231
459681 Remove Glassfish JSP in favor of Apache JSP
...
+ Fixed names in apache-jsp and apache-jstl modules
+ Updated jetty-start tests to better represent new distribution
structure.
2015-02-18 11:46:58 -07:00
Jesse McConnell
ce5db2ca55
[maven-release-plugin] prepare for next development iteration
2015-02-17 16:02:22 -06:00
Jesse McConnell
26b7597928
[maven-release-plugin] prepare release jetty-9.2.8.v20150217
2015-02-17 16:02:16 -06:00
Joakim Erdfelt
f7b9206b2e
Eliminating final protonego references
2015-02-12 10:14:01 -07:00
Joakim Erdfelt
cab76950e1
459655 - Remove SPDY and NPN
...
+ Removed src/test/resources/usecases/home
+ Updated src/test/resources/dist-home to represent current distribution
configuration for Jetty 9.3.0 without SPDY or NPN
+ Changed all test cases to use new dist-home
+ Refactored TestUseCases and TestBaseUseCases for @Parameterized and
consistent naming in src/test/resources/usecases/
2015-02-11 10:05:51 -07:00
Simone Bordet
b073e4f52c
Fixed URIs in NPN and ALPN *.mod files.
2015-01-30 16:18:10 +01:00
Simone Bordet
1ccd0d0dba
Merged branch 'jetty-9.2.x' into 'master'.
2015-01-30 12:08:27 +01:00
Simone Bordet
4c751e10e1
Updated ALPN and NPN versions.
...
NPN to version 1.1.10.v20150130 for OpenJDK 7u75 and 7u76.
ALPN to version 7.1.3.v20150130 for OpenJDK 7u75 and 7u76,
and to version 8.1.3.v20150130 for OpenJDK 8u31.
2015-01-30 11:55:28 +01:00
Jesse McConnell
aa22842c20
[maven-release-plugin] prepare for next development iteration
2015-01-16 17:48:29 -06:00
Jesse McConnell
8c58a9abc4
[maven-release-plugin] prepare release jetty-9.2.7.v20150116
2015-01-16 17:48:23 -06:00
Jesse McConnell
81bb8411d1
[maven-release-plugin] prepare for next development iteration
2015-01-16 12:06:36 -06:00
Jesse McConnell
7865f88b81
[maven-release-plugin] prepare release jetty-9.2.7.v20150116
2015-01-16 12:06:30 -06:00
Jesse McConnell
db991355a2
[maven-release-plugin] prepare for next development iteration
2015-01-16 10:41:45 -06:00
Jesse McConnell
6930abb8d3
[maven-release-plugin] prepare release jetty-9.2.7.v20140116
2015-01-16 10:41:39 -06:00
Jesse McConnell
9225b124a4
[maven-release-plugin] prepare for next development iteration
2015-01-16 08:21:35 -06:00
Jesse McConnell
ebd563e64d
[maven-release-plugin] prepare release 9.2.7.v20140116
2015-01-16 08:21:29 -06: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
Jan Bartel
bc22ba72dc
[maven-release-plugin] prepare for next development iteration
2014-12-05 16:45:12 +01:00
Jan Bartel
1cc075cf98
[maven-release-plugin] prepare release jetty-9.2.6.v20141205
2014-12-05 16:45:01 +01:00
Jesse McConnell
127b48c932
[maven-release-plugin] prepare for next development iteration
2014-12-03 09:00:57 -06:00
Jesse McConnell
028f4b9610
[maven-release-plugin] prepare release jetty-9.2.6.v20141203
2014-12-03 09:00:46 -06:00
Jesse McConnell
1263d1f3c8
[maven-release-plugin] prepare for next development iteration
2014-12-03 08:26:47 -06:00
Jesse McConnell
5c7f706496
[maven-release-plugin] prepare release jetty-9.2.6.v20141203
2014-12-03 08:26:35 -06:00
Simone Bordet
3fddabbba0
Updated ALPN version to 7.1.2.v20141202 and 8.1.2.v20141202 in *.mod files.
2014-12-02 17:49:31 +01:00
Simone Bordet
12b25b786e
Updated ALPN version to 7.1.2.v20141202 and 8.1.2.v20141202 in *.mod
...
files.
2014-12-02 17:42:51 +01:00
Joakim Erdfelt
1d12decce7
changing .getEnabled() to .getSelected()
2014-11-20 16:25:00 -07:00
Joakim Erdfelt
9ea0b74f73
Tweaking output of selected modules tree in --list-modules to be more clear
2014-11-20 16:25:00 -07:00
Joakim Erdfelt
69daa8d76d
Cleanup of no longer needed code.
...
+ Removing Modules.normalizeDependencies()
+ Using Modules.resolveNode() instead
+ Chaning Modules.resolveNode() to not throw Exception
2014-11-20 09:53:02 -07:00
Joakim Erdfelt
df9414eab2
Making test failure message more meaningful (including full stacktrace)
2014-11-20 09:52:33 -07:00
Joakim Erdfelt
2020e07243
Removing test noise
2014-11-20 09:52:10 -07:00
Joakim Erdfelt
1604cffc0b
Fixing HowUniquePredicate
2014-11-20 08:48:35 -07:00
Joakim Erdfelt
9bd0ce1938
452503 - Start.jar --add-to-start=jstl results in GraphException: Unable to expand property in name: jsp-impl/${jsp-impl}-jstl
...
+ Preserving [depend] declaration order by switching from Set to List
+ Switching from BFS based selection / resolve logic in node selection
to DFS based, to allow parent nodes to resolve completely before
attempting other parent nodes.
2014-11-20 08:32:55 -07:00
Joakim Erdfelt
466fce4b80
452329 - Transitive modules in start.jar --add-to-start(d) are not added if enabled already in tree
...
+ Modules can now be re-added.
based on the node.selection.how == name
and all other node selections must
be node.selection.explicit == false
2014-11-19 17:32:12 -07:00
Joakim Erdfelt
9d3852cb98
Fixing build
2014-11-19 17:00:48 -07:00
Joakim Erdfelt
7b5b81e76f
Ignoring failing test
2014-11-19 17:00:27 -07:00
Joakim Erdfelt
d786c4a57e
452322 - Restore progress messages for --add-to-start(d) use
2014-11-19 16:57:52 -07:00
Joakim Erdfelt
89baf907b6
452323 - Start --list-config makes no hint on transitive enabled modules
...
+ Eliminating lots of now dead code (#uncoding)
+ Making ambiguous add detection more sane.
2014-11-19 16:42:55 -07:00
Joakim Erdfelt
005b513653
452323 - Start --list-config makes no hint on transitive enabled modules
...
+ Refactoring out the Graph + Node logic into its own package
+ Changing Matcher to Predicate
+ Introducing new Node.selection Set which tracks how the various nodes
are selected, along with with ability to track directly selected (aka
explicit) vs transitive.
+ Module now extends from Node
+ Modules now extends from Graph<Module>
2014-11-19 15:59:54 -07:00
Joakim Erdfelt
1561de0f81
Cleaning up resolveEnabled() deprecation
2014-11-19 10:27:25 -07:00
Joakim Erdfelt
88900593de
Fixing 2 typos
2014-11-17 13:56:55 -07:00
Joakim Erdfelt
dbf6f2e644
451973 - Ambiguous module init location when mixing --add-to-start & --add-to-startd in the same exec
...
+ Cleaning up entire base buildout into BaseBuilder class
+ The management of the configuration is maintained in
- StartDirBuilder
- StartIniBuilder
+ The buildout of the directories from the [files] section is now
maintained by the BaseBuilder itself.
+ Using new FileInitializer system as well
+ Using new Licensing system as well
2014-11-17 13:21:01 -07:00
Joakim Erdfelt
61e480c2c1
451974 - Combine multiple start license acknowledgement into one
...
+ Initial work to combine licensing into a single event
Depends on work from bug #451973
2014-11-17 13:20:12 -07:00
Joakim Erdfelt
453ab6d5c7
Supporting optional use of maven local repository for download content
2014-11-14 12:15:07 -07:00
Joakim Erdfelt
ccaddc5d43
Working on utility to update maven refs
2014-11-14 09:53:18 -07:00
Joakim Erdfelt
15bf5b02f8
Updating Main.initFiles() to be extensible
2014-11-13 14:23:26 -07:00
Jesse McConnell
09846e324d
[maven-release-plugin] prepare for next development iteration
2014-11-12 17:13:19 -06:00
Jesse McConnell
97d2bd95a6
[maven-release-plugin] prepare release jetty-9.2.5.v20141112
2014-11-12 17:13:14 -06:00
Greg Wilkins
50b6391be1
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
VERSION.txt
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-server/pom.xml
jetty-alpn/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-cdi/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-fcgi/fcgi-client/pom.xml
jetty-fcgi/fcgi-server/pom.xml
jetty-fcgi/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/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/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/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-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-alpn-tests/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-client-transport/pom.xml
jetty-spdy/spdy-http-common/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-npn-tests/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/javax-websocket-client-impl/pom.xml
jetty-websocket/javax-websocket-server-impl/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-quickstart/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-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/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
2014-11-05 10:36:57 +11:00
Joakim Erdfelt
04fc803b0e
448446 - org.eclipse.jetty.start.Main create classloader duplicate
...
+ Reuse ClassLoader instead.
2014-11-04 15:04:30 -07:00
Jesse McConnell
5d0595cabd
[maven-release-plugin] prepare for next development iteration
2014-11-03 13:46:58 -06:00
Jesse McConnell
772ff0bfd4
[maven-release-plugin] prepare release jetty-9.2.4.v20141103
2014-11-03 13:46:52 -06:00
Joakim Erdfelt
1d88eab518
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
2014-11-03 10:19:49 -07:00
Joakim Erdfelt
214246061e
449291 - --create-files downloads without license
...
+ Adding dist-home replicationa real distribution
Adding RebuildTestResources.java to help rebuild this dist-home
occasionally. There is no need to keep this directory up to date
as religiously and frequently as the main distribution.
+ Adding LicenseTest.java to test various licensing scenarios
+ Added ability to ask for license via --create-files flows
2014-11-03 10:18:18 -07:00
Joakim Erdfelt
153dd4023e
Removing support for module [ini-template] use of --module=<name>
...
+ That form of use is not recommended during --add-to-start
+ Should encourage use of [depend] section instead
2014-11-03 09:19:05 -07:00
Joakim Erdfelt
83e3a29fbd
449003 - WARNING: Cannot enable requested module [protonego-impl]: not a valid module name
...
+ Making protonego-impl/(npn|alpn).mod not contain default configuration
2014-11-03 09:19:05 -07:00
Jesse McConnell
1c4a08b35b
[maven-release-plugin] prepare for next development iteration
2014-10-31 09:58:16 -05:00
Jesse McConnell
a4ff7bf841
[maven-release-plugin] prepare release jetty-9.2.4.v20141031
2014-10-31 09:58:10 -05:00
Joakim Erdfelt
43b3cd9f46
449003 - WARNING: Cannot enable requested module [protonego-impl]: not a valid module name
...
+ Making protonego-impl/(npn|alpn).mod not contain default configuration
2014-10-30 15:05:24 -07:00
Jesse McConnell
e1b73a64eb
[maven-release-plugin] prepare for next development iteration
2014-10-30 11:28:41 -05:00
Jesse McConnell
5770cc1179
[maven-release-plugin] prepare release jetty-9.2.4.v20141030
2014-10-30 11:28:35 -05:00
Greg Wilkins
a6e00bc642
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java
2014-10-30 14:36:50 +11:00
Joakim Erdfelt
7cbd3c0488
440925 - NPE when using relative paths for --start-log-file
2014-10-29 16:25:55 -07:00
Joakim Erdfelt
8899f6d360
Merge branch 'jetty-9.2.x'
...
Conflicts:
VERSION.txt
2014-10-29 15:52:05 -07:00
Joakim Erdfelt
733cc71791
Reworking jetty.home warning to be a module instead.
...
+ This will cause it to be logged using the configured logger as well.
2014-10-29 15:31:14 -07:00
Joakim Erdfelt
7c40c0e2be
Removing 2 second sleep
2014-10-29 14:33:46 -07:00
Joakim Erdfelt
8a72a153a1
Merge branch 'jetty-9.2.x'
2014-10-28 12:32:55 -07:00
Jesse McConnell
58eb6740ec
[maven-release-plugin] prepare for next development iteration
2014-10-28 14:20:30 -05:00
Jesse McConnell
19a44846cf
[maven-release-plugin] prepare release jetty-9.2.4.v20141028
2014-10-28 14:20:24 -05:00
Joakim Erdfelt
af5f9382a4
449001 - Remove start.d directory from JETTY_HOME
...
+ Reworking warning to be optional but still start Jetty also.
+ Leaving start.d out of {jetty.home} still.
2014-10-28 10:28:17 -07:00
Joakim Erdfelt
f4f600ff05
Code cleanup (post-merge)
2014-10-28 09:45:25 -07:00
Joakim Erdfelt
607a560ebd
Merge branch 'jetty-9.2.x' into cdi-testing
2014-10-28 09:36:34 -07:00
Joakim Erdfelt
653cb32ede
Adjusting start/run warning messages on missing file content.
...
+ Leaving behavior of missing directories alone.
+ See bug #427204 for old behavior bug
2014-10-28 09:35:11 -07:00
Joakim Erdfelt
9dd0db8eeb
449001 - Remove start.d directory from JETTY_HOME
...
+ Removed start.d from {jetty.home}
+ Removed most of start.ini content as well
+ DID NOT remove or alter start.d functionality from start.jar
+ DID NOT remove or alter demo-base/start.d/ example
+ Made running jetty from {jetty.home} simply show a warning message
+ DID NOT remove ability to run jetty from {jetty.home}
Just made it a manual process requiring intention on behalf of the
user
2014-10-28 09:04:25 -07:00
Simone Bordet
7cdcd69f44
Reverted version to 9.2.4-SNAPSHOT.
2014-10-28 11:52:00 +01:00
Jesse McConnell
3b745f06df
[maven-release-plugin] prepare for next development iteration
2014-10-27 16:16:24 -05:00
Jesse McConnell
4f0d78c91b
[maven-release-plugin] prepare release jetty-9.2.4.v20141027
2014-10-27 16:16:18 -05:00
Joakim Erdfelt
6ff43a0af1
Merge branch 'jetty-9.2.x' into cdi-testing
2014-10-27 13:42:30 -07:00
Simone Bordet
6268421dd0
Merged branch 'jetty-9.2.x' into 'master'.
2014-10-16 18:05:12 +02:00
Simone Bordet
6f42d21ed5
446063 - ALPN Fail SSL Handshake if no supported Application Protocols.
2014-10-16 15:31:24 +02:00
Simone Bordet
890d7a8d1f
Merged branch 'jetty-9.2.x' into 'master'.
2014-10-13 22:01:20 +02:00
Simone Bordet
9796457dfc
446672 - NPN Specification issue in the case no protocols are selected.
2014-10-13 21:27:11 +02:00
Greg Wilkins
758ce66c8d
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-websocket/pom.xml
tests/test-sessions/test-mongodb-sessions/pom.xml
2014-10-10 08:53:43 +11:00
Joakim Erdfelt
67db9e67de
Merge branch 'jetty-9.2.x' into cdi-testing
2014-10-09 12:42:14 -07:00
Joakim Erdfelt
2f696e87bd
445258 - STOP.WAIT is not really respected
...
Fixing stupid typo / copy / paste bug
2014-10-08 15:01:05 -07:00
Joakim Erdfelt
bf7637a2df
Reworking cdi-webapp-it to also use new cdi module
2014-09-26 17:16:35 -07:00
Joakim Erdfelt
9249ebb6ef
Using 9.2.4-SNAPSHOT for branch
2014-09-11 06:10:44 -07:00
Jesse McConnell
9bfeb2221f
[maven-release-plugin] prepare release jetty-9.2.3.v20140905
2014-09-05 09:19:23 -05:00
Greg Wilkins
5507e267ae
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/config/etc/jetty-https.xml
jetty-server/src/main/config/modules/ssl.mod
jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java
2014-08-29 15:49:25 +10:00
Greg Wilkins
69390954dc
435322 acceptor and selector configuration/priority
2014-08-29 15:36:19 +10:00
Greg Wilkins
b02cdc10c1
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-08-22 16:11:47 +10:00
Greg Wilkins
589d05afe0
Added 3rd party module licenses
2014-08-22 11:48:55 +10:00
Greg Wilkins
23eba39748
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-08-21 16:39:45 +10:00
Greg Wilkins
af27566d2b
fixed JSP issues
2014-08-21 11:42:21 +10:00
Greg Wilkins
c1b66a3ea3
Fixed start.jar property as properties issue
2014-08-21 10:45:28 +10:00
Joakim Erdfelt
7700d1ce53
Testcase is sensitive to System Property from other tests.
...
+ Making the testcase for PathFinderTest not discover jetty.base, as
this value can be obtained from System Property (set from another
test case) giving false success/failure based on run order.
2014-08-19 10:33:04 -07:00
Greg Wilkins
b47f9ef605
cleaned up OSGi manifest creation
2014-08-15 19:35:49 +10:00
Greg Wilkins
287e86b7aa
decomposed https,http2 and spdy modules to share ServerConnector
2014-08-07 12:58:12 +10:00
Joakim Erdfelt
cb42ef2167
[maven-release-plugin] prepare for next development iteration
2014-07-23 11:18:01 -07:00
Joakim Erdfelt
dc62cb5ac7
[maven-release-plugin] prepare release jetty-9.2.2.v20140723
2014-07-23 11:17:55 -07:00
Greg Wilkins
fa3d7d0f7e
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java
2014-07-23 16:53:13 +10:00
Greg Wilkins
3a6879d3e8
expanded tabs in indents
2014-07-23 16:49:05 +10:00
Greg Wilkins
a537fefd6b
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-18 15:28:54 +10:00
Joakim Erdfelt
e39adb337f
439672 support using Apache commons daemon for managing Jetty
...
Signed-off-by: marko asplund <marko.asplund@gmail.com>
2014-07-17 08:37:50 -07:00
Greg Wilkins
6eceb6bd99
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-06-29 08:11:41 +02:00
Joakim Erdfelt
6faf94e4c1
437462 - consistent test failure in jetty-start under windows
...
+ Fixing up logic to be more lenient for case insensitive nature of
microsoft windows (it was tripping up over C:\ vs c:\ difference)
2014-06-26 15:29:05 -07:00
Simone Bordet
e63ceabafe
Merged branch 'origin/master' into 'jetty-http2'.
2014-06-25 17:29:36 +02:00
Joakim Erdfelt
bad3165d8a
Fixing jdk 8 test failure
2014-06-25 08:24:24 -07:00
Joakim Erdfelt
e48cdb519b
437395 - Start / Properties in template sections should be default applied for enabled modules
...
+ Fixing typo in enableModule()
+ Fixing concurrent modification exception during walk of parents in
enableModule()
2014-06-23 21:23:17 +02:00
Joakim Erdfelt
d92f6c6fd3
437395 - Start / Properties in template sections should be default applied for enabled modules
...
+ Fixing typo in enableModule()
+ Fixing concurrent modification exception during walk of parents in
enableModule()
2014-06-19 10:18:51 -07:00
Simone Bordet
59deebeb9c
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-06-19 16:26:58 +02:00
Joakim Erdfelt
605f32b022
Adding extra tests for bad startup configurations
2014-06-18 10:32:38 -07:00
Joakim Erdfelt
4ba530b5ad
437395 - Start / Properties in template sections should be default applied for enabled modules
...
+ Adding test cases for jsp-impl usecase that triggered this bug.
2014-06-17 10:42:04 -07:00
Joakim Erdfelt
5fa564efa8
437395 - Start / Properties in template sections should be default applied for enabled modules
...
+ Initial edits to support loading of Module [INI-TEMPLATE] section
as default values for the enabled module.
2014-06-17 10:42:04 -07:00
Simone Bordet
334db9fe72
Updated version to 9.3.0-SNAPSHOT.
2014-06-16 21:33:03 +02:00
Simone Bordet
424e421439
Added JDK 7u60 files and configuration for NPN and ALPN.
2014-06-11 18:45:45 +02:00
Simone Bordet
330d8f9ea9
Added JDK 7u60 files for NPN and ALPN.
2014-06-11 18:44:54 +02:00
Greg Wilkins
5883123d07
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-06-10 09:01:21 +02:00
Jesse McConnell
c3ee0711ca
[maven-release-plugin] prepare for next development iteration
2014-06-09 13:37:54 -05:00
Jesse McConnell
06b494eeac
[maven-release-plugin] prepare release jetty-9.2.1.v20140609
2014-06-09 13:37:49 -05:00
Jesse McConnell
10b6c574ae
Merge branch 'master' into release-9
2014-06-09 13:07:22 -05:00
Joakim Erdfelt
7790ba9657
432192 - jetty-start / Allow JETTY_LOGS use for start-log-file
...
+ Internal initialization & validation of start-log-file is
done via BaseHome.getPath(String) to allow the path to be
anywhere on the filesystem, not just under ${jetty.base}
2014-06-06 12:33:57 -07:00
Joakim Erdfelt
646d85a68b
436388 - Allow case-insensitive STOP.KEY and STOP.PORT use
...
+ Internal (to start.jar) use of properties are now case-insensitive
2014-06-06 12:30:00 -07:00
Joakim Erdfelt
11b08b77e6
436524 - Start / Downloadable [files] references in modules cannot use ":" themselves
...
+ Updating usage.txt to indicate new use of "|"
2014-06-06 12:25:28 -07:00
Joakim Erdfelt
0c54ad2f20
432321 - jetty-start / Allow defining extra start directories for common configurations
...
+ Updating usage.txt
2014-06-06 08:40:52 -07:00
Joakim Erdfelt
5f8ed9519b
Restore Origin/Source information of raw arguments from ConfigSource(s)
...
+ Change will remember where each raw argument from a DirConfigSource
comes from (previously only remembered the origin of properties)
2014-06-04 15:48:58 -07:00
Joakim Erdfelt
7ee2f4e367
Fixing extraneous output and duplicate ${jetty.base}/${jetty.base} references when using --add-to-startd
2014-06-04 11:24:42 -07:00
Joakim Erdfelt
d31811f067
436520 - Start / Allow https and file urls in jetty-start's module download mechanism
...
+ Work to enable this mostly performed in Bug #436524
+ Some minor work to add more tests for this new syntax.
2014-06-04 11:14:35 -07:00
Greg Wilkins
bb4d42f139
Merge remote-tracking branch 'origin' into jetty-http2
2014-06-04 15:09:19 +02:00
Greg Wilkins
8f4aeeeb8d
updated version to 10.0.0-SNAPSHOT
2014-06-04 15:08:54 +02:00
Joakim Erdfelt
bbab2e7832
436524 - Start / Downloadable [files] references in modules cannot use ":" themselves
...
+ Switching out support for ":" to "|"
2014-06-03 17:09:48 -07:00
Jesse McConnell
2e859e4ae2
[maven-release-plugin] prepare for next development iteration
2014-05-26 12:04:15 -05:00
Jesse McConnell
71ad2114c5
[maven-release-plugin] prepare release jetty-9.2.0.v20140526
2014-05-26 12:04:08 -05:00
Jesse McConnell
8936b160c2
Merge branch 'master' into release-9
2014-05-26 10:46:39 -05:00
Joakim Erdfelt
bbd3774e38
Adjusting --exec to [exec]
2014-05-26 07:43:57 -07:00
Greg Wilkins
92ffcfc0f8
expand properties on command line for exec
2014-05-26 16:16:33 +02:00
Greg Wilkins
0d70ae87b2
turn off startlog redirect when starting
2014-05-26 00:46:32 +02:00
Greg Wilkins
5edf15241b
started mechanism uses Properties
...
list Properties in --dry-run
fix start log file
2014-05-25 22:54:15 +02:00
Jesse McConnell
d59dbe936b
[maven-release-plugin] prepare for next development iteration
2014-05-23 09:59:19 -05:00
Jesse McConnell
edc7646a4c
[maven-release-plugin] prepare release jetty-9.2.0.v20140523
2014-05-23 09:59:13 -05:00
Joakim Erdfelt
69e6701106
435086 - ${jetty.base}/resources not on classpath when using --module=resources
...
+ Adding test case for resource.mod
+ Fixing java.nio.file.PathMatcher use to not include trailing slash for
directory matches.
2014-05-16 09:55:36 -07:00
Greg Wilkins
51324a2786
434505 Allow property files on start.jar command line
...
Signed-off-by: Tom Zeller<tzeller@dragonacea.biz>
(cherry picked from commit d621df3c34
)
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/FS.java
jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
2014-05-13 12:31:06 +02:00
Joakim Erdfelt
b7b29ca4a3
432321 - jetty-start / Allow defining extra start directories for common configurations
...
+ renaming --extra-start-dir=<path> to
--include-jetty-dir=<path>
2014-05-08 15:05:28 -07:00
Joakim Erdfelt
5db6f65354
Increasing visibility for Ben
2014-05-08 14:08:13 -07:00
Joakim Erdfelt
5cc6833f50
433563 - Jetty fails to startup on windows - InvalidPathException
...
+ PathMatchers.isAbsolute() and .getSearchRoot() adjusted to not
rely on Path object behavior differences between Unix and Windows
+ Updated StartArgs processing of --lib to automatically expand
extra lib references prior to submitting them to the internal
BaseHome for processing as pattern for paths.
+ Updated test cases for new behavior.
2014-04-29 14:25:06 -07:00
Joakim Erdfelt
1de043d6c3
433563 - Jetty fails to startup on windows - InvalidPathException
...
+ Adjusted PathMatchers.isAbsolute() to only consider the
search root, and not the whole path.
2014-04-28 13:59:55 -07:00
Simone Bordet
60f2200184
Merged branch 'jetty-9.1.x' into 'master'.
2014-04-16 11:10:18 +02:00
Simone Bordet
40c82a99ab
Added profile in the main pom.xml to build with JDK 7u55.
...
Added new NPN module files for JDK 7u55, referencing the new NPN version required by JDK 7u55.
2014-04-16 11:06:50 +02:00
Joakim Erdfelt
348cd406c8
Removing deprecated methods
2014-04-15 14:54:19 -07:00
Joakim Erdfelt
e5314d4a3e
432321 - jetty-start / Allow defining extra start directories for common configurations
...
+ Adding Config Search order output to --list-config
2014-04-15 13:40:16 -07:00
Joakim Erdfelt
dc3362ba3c
Removing deprecated methods
2014-04-15 12:22:53 -07:00
Joakim Erdfelt
41ab91988b
432321 - jetty-start / Allow defining extra start directories for common configurations
...
+ Fixing jetty.base default detection to use user.dir instead of
jetty.home
2014-04-15 10:32:28 -07:00
Joakim Erdfelt
599595f544
FS utility class cleanup of unused code
2014-04-15 10:31:27 -07:00
Joakim Erdfelt
8f733169f5
432321 - jetty-start / Allow defining extra start directories for common configurations
...
+ Final work for unit testing happiness
+ BaseHome is now configured via ConfigSources (as intended)
+ StartArgs now parses the ConfigSources list (in reverse)
+ CommandLineConfigSource now does all of the ${jetty.base} and
${jetty.home} determination (from properties and env, with
fallbacks)
2014-04-11 14:26:35 -07:00
Joakim Erdfelt
eff78efe3c
432321 - jetty-start / Allow defining extra start directories for common configurations
...
+ Integration of ConfigSources with rest of startup.
2014-04-10 16:45:11 -07:00
Joakim Erdfelt
682a01792f
432321 - jetty-start / Allow defining extra start directories for common configurations
...
+ Introduction of ConfigSources (a properly ordered list of ConfigSource
impls) to aide in initial setup of configuration sources, prior to
being parsed by StartArgs for the final runtime configuration of
the jetty server.
2014-04-10 11:54:27 -07:00
Greg Wilkins
0e458c80f4
reverted version to SNAPSHOT
2014-04-10 16:37:25 +10:00
Joakim Erdfelt
1b9f0cb945
Cleanup of Main.moduleIni() to .buildIni() with better documentation
2014-04-09 10:02:28 -07:00
Joakim Erdfelt
5ecf564dfa
432321 - jetty-start / Allow defining extra start directories for common configurations
...
+ Identified test cases for extra-start-dir logic
+ Working on layered ConfigSource approach to handling extra-start-dir
2014-04-09 09:51:20 -07:00
Joakim Erdfelt
a9c01d3607
432321 - jetty-start / Allow defining extra start directories for common configurations
...
+ Initial impl of BaseHome with support for lookups on extra start dirs
2014-04-08 09:57:52 -07:00
Joakim Erdfelt
e793c85eb4
Cleanup and documentation of StartArgs in prep for extra-start-dirs
2014-04-08 06:45:04 -07:00
Joakim Erdfelt
87f2deed65
Squelching prior notified loop detection
2014-04-08 06:11:42 -07:00
Joakim Erdfelt
9d0143b704
Making searchDepth configurable via System property
2014-04-08 06:08:39 -07:00
Joakim Erdfelt
ce75625f0f
Preparing BaseHome for extra-start-dirs
2014-04-08 06:08:21 -07:00
Joakim Erdfelt
eb53a9ce6d
Minor fix for ConcurrentModificationException
2014-04-07 10:31:34 -07:00
Greg Wilkins
2b2d3ac762
Fixed start.jar handling of expanded modules during --add-to-start
2014-04-07 13:11:41 +10:00
Greg Wilkins
cf430665b5
Fixed start.jar handling of expanded modules during --add-to-start
2014-04-04 14:09:46 +11:00
Greg Wilkins
6e9879cc6b
removed debug
2014-04-03 19:12:49 +11:00
Greg Wilkins
303fa57eaf
improved protonego module structure to avoid ini files of parameterized modules
2014-04-03 16:50:33 +11:00
Greg Wilkins
157a54ec5c
430341 Use apache jsp/jstl by default in 9.2.0
2014-04-03 14:16:13 +11:00
Jesse McConnell
c616ece6c7
[maven-release-plugin] prepare release jetty-9.1.4.v20140401
2014-04-02 10:55:21 -05:00
Greg Wilkins
c5e1e249e7
set version for 9.2.x
2014-03-31 11:35:06 +11:00
Joakim Erdfelt
f3d312698f
425736 - jetty-start / Jetty 9 fails to startup with --exec option if Java path contain
...
+ Using .addRawArg() to avoid space escaping for Java Bin
2014-03-28 09:59:16 -07:00
Joakim Erdfelt
2f6f210174
430747 - jetty-start / Allow --lib and module [lib] to recursively add jars
...
+ --lib={pattern} now supported
+ regular searching rules (for BaseHome) apply
+ even supporting multiple lib pattern entries via File.pathSeparator
separation, resulting in support for command lines like this:
--lib=/opt/common/lib/**.jar:lib/db/*.jar
+ {pattern} can be any valid java.nio.file.PathMatcher of syntax "glob:"
(since we rely on File.pathSeparator to break apart the --lib line
the existence of that same char in "glob:" and "regex:" means that
supporting both syntaxes of (regex and glob) isn't going to make
writing this line easy for the user. opting for glob only seems
like a good compromise)
2014-03-26 19:22:20 -07:00
Joakim Erdfelt
dfbe5c92c6
426920 - jetty-start / BaseHome.listFilesRegex() and .recurseDir() do not detect filesystem loops
...
+ Using java.nio.files to walk directory tree and detect filesystem
loops
+ All standard PathMatching patterns now work. ("glob:" and "regex:")
2014-03-26 19:01:05 -07:00
Joakim Erdfelt
a52925efcc
431279 - jetty-start / Unable to start jetty if no properties are defined.
...
+ Removed spurious check for no properties set (as System Properties are
not part of that check, but should have been, which essentially means
that there is never no properties available)
2014-03-26 11:34:08 -07:00
Joakim Erdfelt
6600abd3f9
Adding more start debug for lib resolution steps
2014-03-26 11:34:06 -07:00
Joakim Erdfelt
a55ae9e58c
427204 - jetty-start / startup incorrectly requires directory in jetty.base
...
+ Removing start failure on missing [files] entries as this would
prevent startup when the user has configured to alternative files
locations. The modules directives for [files] are defaults,
best practice, not required content. It now warns only on
missing download directives.
2014-03-21 11:54:41 -07:00
Joakim Erdfelt
2afd16ec39
427368 - start.sh fails quietly on command line error
...
+ Correcting bad --daemon use
+ Adding start-log-file command line instead
+ Adding feedback about start-log-file use
2014-03-11 14:29:11 -07:00
Jesse McConnell
0ec0d452e9
[maven-release-plugin] prepare for next development iteration
2014-03-07 09:10:08 -06:00
Jesse McConnell
1e555567a9
[maven-release-plugin] prepare release jetty-9.1.3.v20140225
2014-03-07 09:10:08 -06:00
Jesse McConnell
eb0aea46ce
set versions.txt file to new version and fix mistaken developmentVersion
2014-02-10 13:48:29 -06:00
Jesse McConnell
f3d38dfb15
[maven-release-plugin] prepare for next development iteration
2014-02-10 11:17:14 -06:00
Jesse McConnell
8f6cbc9111
[maven-release-plugin] prepare release jetty-9.1.2.v20140210
2014-02-10 11:17:07 -06:00
Jesse McConnell
ba318ccbd3
[426003] active modules with missing dependencies fail accordingly, non-active with missing deps fail silently
2014-02-04 14:09:16 -06:00
Jesse McConnell
2db90757ed
Bug 426481 fix < java 1.7.0_10 npn files
2014-01-23 10:36:29 -06:00
Simone Bordet
e4cac732cf
Updated build profiles to JDK 7u51, along with NPN modules.
2014-01-14 22:51:18 +01:00
Joakim Erdfelt
dec67094bf
425696 - start.jar --add-to-start={module} results in error
2014-01-14 11:43:21 -07:00
Joakim Erdfelt
3a16944fd7
Fixing path based assertions to be OS neutral (windows)
2014-01-14 11:35:08 -07:00
Jesse McConnell
b82ec6e668
[maven-release-plugin] prepare for next development iteration
2014-01-08 16:47:09 -06:00
Jesse McConnell
b99623a21d
[maven-release-plugin] prepare release jetty-9.1.1.v20140108
2014-01-08 16:47:01 -06:00
Joakim Erdfelt
907eb6b03b
424598 - Module [npn] downloads wrong npn jar
...
+ Cleanup of --list-config output
2014-01-06 11:16:03 -07:00
Joakim Erdfelt
7af87b4a04
424598 - Module [npn] downloads wrong npn jar
...
+ Separating Module logical name from file system reference name
+ [depend] references in *.mod files are tried as file system reference
names, then logical names.
+ --module=<name> are tried only as logical names.
+ All of the npn/npn-${jvm.version}.mod files are defined as logical
name of npn-boot
2014-01-06 11:16:03 -07:00
Joakim Erdfelt
a12fd9ea03
Happy New Year - 2014!
2014-01-02 14:50:14 -07:00