Commit Graph

18903 Commits

Author SHA1 Message Date
olivier lamy 644aeca364 checkstyle report enabled
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:05:50 +10:00
olivier lamy 69b6160445 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-06-27 07:04:06 +10:00
olivier lamy 8a6d25fe25 suppression of generated files must work for ide as well
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
olivier lamy 943d123798 checkstyle will only check our source files and not generated jmh etc..
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
olivier lamy a1d292da58 only checkstyle:check no need of building site
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
olivier lamy b54dbcff63 fix merge
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
olivier lamy 2443423eff simplify checkstyle check with not using site generation but only check as jenkins only need checkstyle result
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
olivier lamy 484c7538d6 fix version of build-resources module
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
Joakim Erdfelt 0047740af6 Limiting target suppressions 2019-06-26 09:13:34 -05:00
olivier lamy 8cf00f7226 disable autobahn for every build
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-26 20:29:58 +10:00
Lachlan cc4304a0f6
WebSocket core autobahn and MessageHandler refactor (#3802)
* reworked WebSocket autobahn test code and the core MessageHandler

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* PR #3802 - changes from review

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-26 13:47:46 +10:00
olivier lamy 390033edfc Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-06-26 13:00:45 +10:00
olivier lamy eb64d2e9fd add missing checks attribute
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-26 11:03:19 +10:00
Joakim Erdfelt 94a0154be7 Adding supression on /target/ files 2019-06-25 19:07:26 -05:00
Joakim Erdfelt 9f49fa5da7 Adding supression on /target/ files 2019-06-25 19:02:44 -05:00
Joakim Erdfelt c97403fb0d Merge branch `jetty-9.4.x` into `jetty-10.0.x` 2019-06-25 16:01:02 -05:00
Joakim Erdfelt 7071c53bdd
Merge pull request #3814 from eclipse/jetty-9.4.x-checkstyle-suppress-tests
Adding CheckStyle suppression's for src/test/java
2019-06-25 16:00:36 -05:00
Joakim Erdfelt 8121f9773c Adding jetty-jmh to suppressions 2019-06-25 13:32:26 -05:00
Greg Wilkins 9c6c1990b4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-25 11:16:53 +02:00
Greg Wilkins a42ad99871 Misc minor checkstyle fixes
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-25 11:13:34 +02:00
Jan Bartel 0781e0af3d
Fix Eclipse java style for jetty (#3813)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-06-25 11:06:52 +02:00
Joakim Erdfelt fd952d42ff Removing redundant check
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-24 14:30:33 -05:00
Joakim Erdfelt 81894fb4ed Using property based lookup for Checkstyle suppressions filter.
+ This is to be maximally compatible across all plugins and scenarios
  where the Checkstyle suppressions filter can be used.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-24 13:58:23 -05:00
Joakim Erdfelt 16cf6a34e1 Adapting suppressions filter for various plugin's expectations.
Each plugin finds the suppressions in different ways.

+ Eclipse CS finds it via property ${config_loc}
+ Newest IntelliJ CS finds it via same property
+ Maven plugin finds it via classloader.getResource()

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-24 13:27:14 -05:00
Joakim Erdfelt 0cb56a8e21 Adding CheckStyle suppression's for src/test/java
+ No MethodNameCheck
+ No TypeNameCheck
+ No LocalVariableNameCheck

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-24 13:04:30 -05:00
Joakim Erdfelt 7b941098d0 Fixing version of build-resources 2019-06-24 11:12:47 -05:00
Greg Wilkins 1ae14b6ad4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-06-24 17:44:26 +02:00
Greg Wilkins b7a7a53a18
Jetty 10.0.x reformat (#3812)
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Removing Legacy Method Separators
* Restyling branch `jetty-10.0.x`
* Applying checkstyle changes
* Applying checkstyle changes
* Applying XML restyling
* Restyling XML in branch `jetty-10.0.x`
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Fixing XML restyling in branch `jetty-10.0.x`
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Revert "Restyling XML in branch `jetty-10.0.x`"

# Conflicts:
#	jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml
#	jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml

* Adding back build-resources
* Reformatting pom.xml files
* Disabling Checkstyle job
* fixed empty string on line wrap
* reformatted with latest intellij style
* misc checkstyle fixes

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-24 17:42:39 +02:00
Greg Wilkins 9706d70484
Jetty 9.4.x reformat (#3811)
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Applying XML restyling
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Reformatting pom.xml files
* Fixed empty string from line wraps
* Update intellij style to not do expression relative formatting. Reformatted code based on that.
* Increasing line split on Eclipse IDE Formatter to 512
* Restoring setting on internal default value.
+ IntelliJ will not export settings on things that set to their
  internal default values.
  We want to keep those values as a hedge against future default
  value changes in future releases of IntelliJ.
* Fixing intellij codestyle
* do not allow single line simple methods
* misc checkstyle fixes
* re-exported with correct name and all values

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-24 17:40:30 +02:00
Greg Wilkins 804419bf89 Minor cleanups
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-23 17:26:06 +02:00
Greg Wilkins e2193a303b Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-23 10:50:47 +02:00
Joakim Erdfelt 3030ccb2df Merge branch 'jetty-9.4.x-checkstyle' into jetty-9.4.x 2019-06-22 09:00:15 -05:00
Joakim Erdfelt 85f198419d Issue #3804 - Disabling CDI tests until Weld can be fixed
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-21 18:28:54 -05:00
Joakim Erdfelt c7b6110267 Merge branch `jetty-9.4.x` into `jetty-10.0.x`
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-21 16:05:17 -05:00
Joakim Erdfelt b9fc1f7362
Merge pull request #3777 from eclipse/jetty-9.4.x-3700-felix-webapp-testing
Issue #3700 - Adding felix webapp to test-distribution to help catch URLStreamHandler classloader issues earlier
2019-06-21 14:45:21 -05:00
Joakim Erdfelt 6ca87a0de1 Merge branch `jetty-9.4.x` into `jetty-9.4.x-3700-felix-webapp-testing`
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	tests/test-webapps/pom.xml
2019-06-21 14:44:56 -05:00
Joakim Erdfelt bb486c55cc
Merge pull request #3737 from eclipse/jetty-9.4.x-3731-cdi-testing
Issue #3731 - Testing various ways to use CDI
2019-06-21 14:37:30 -05:00
Joakim Erdfelt 77526a1518 Issue #3731 - Adding back cdi.mod pointing to cdi2.mod
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-21 14:35:46 -05:00
Joakim Erdfelt 479eb77f6a
Merge pull request #3797 from eclipse/jetty-10.0.x-remove-deprecated
Remove deprecated in Jetty 10.0.x
2019-06-21 14:27:34 -05:00
Greg Wilkins 87e6c434fc Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-21 21:06:08 +02:00
Greg Wilkins 343cf732b9
Issue #3789 XmlConfiguration Set Property (#3790)
Issue #3789 XmlConfiguration Set Property

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-21 21:04:53 +02:00
Greg Wilkins d2e4830d5c
Dumpable RewriteHandler (#3800)
RewriteHandler dumps it's rules

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-21 21:03:38 +02:00
Joakim Erdfelt af4dd0285f Issue #3798 - Prevent NPE on null or partial URI in ClasspathPattern
+ Not allowing URI to be null or non-absolute for location or
  module tests.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-21 07:05:55 -05:00
Joakim Erdfelt 1118750139 Issue #3700 - Fixing bad ClasspathPatternTest assumptions
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-21 06:55:59 -05:00
Greg Wilkins 7e5a87b923 Fixed test verbosity
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-21 09:19:06 +02:00
Lachlan 3ae6d41a18
WebSocket core cleanup (#3783)
* cleanups of WebSocket core

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* WebSocket ConfigurationCustomizer now extends ConfigurationHolder

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* adding isDebugEnabled checks

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-21 10:14:27 +10:00
Joakim Erdfelt 075333a627 Merge `jetty-9.4.x` into `jetty-9.4.x-3700-felix-webapp-testing`
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java
2019-06-20 15:37:48 -05:00
Joakim Erdfelt 8d59302978 Issue #3700 - Reworking getLocationOfClass()
+ Reverting commit against IncludeExcludeSet
+ TypeUtil.getLocationOfClass is now MethodHandle based
+ new ModuleLocation class provides Module behaviors for Java 9+
  Runtimes, and is used by new MethodHandle based getLocationOfClass
+ Jetty 10 doesn't need reflect complexity of ModuleLocation class
  and can be inlined as real code in TypeUtil
+ TypeUtil.getLocationOfClass is only guaranteed to return the
  URI to the container holding the location of the class, or null.
  - The JAR file - most common
  - The Directory - 2nd most common - a classpath dir entry
  - The jrt:// module reference - if a module reference
+ URLResource support for results of getLocationOfClass is deprecated
  (nothing was using it anyway)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-20 15:35:10 -05:00
Joakim Erdfelt fe051bf392 Removing deprecated methods in Jetty 10
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-20 11:41:42 -05:00
Joakim Erdfelt 0b972efc3f Removing deprecated methods in Jetty 10
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-20 11:25:32 -05:00