Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,874 Commits 73 Branches 465 Tags 370 MiB
Commit Graph

1245 Commits

Author SHA1 Message Date
Greg Wilkins 804419bf89 Minor cleanups 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-06-23 17:26:06 +02: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
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
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
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
Greg Wilkins 90ea6f94e5 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-06-18 11:44:38 +02:00
Greg Wilkins 862e6d008e
Jetty 9.4.x 3755 annotation/jndi example cleanup (#3763) 
* Issue #3755 Annotation example cleanup

+ Created JettyDistribution class as common utility to locate a jetty distribution for examples.
+ Fixed ServerWithAnnotations to correctly use the test-spec-webapp
+ Added AttributeContainerMap as a better way to treat attribute values as beans. This avoids them appearing twice in a dump and always associates them with their key.
+ Added NamingDump and use it in EnvConfiguration and jetty-plus.xml so that a server dump will contain dumps of the server local tree and each contexts java:comp/env tree
+ Improved the dump format of NamingContext and WebAppContext
+ Improved the toString format of several associated classes

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-06-18 09:50:18 +02:00
Joakim Erdfelt 60d8661890 Merge `jetty-9.4.x` into `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java
#	jetty-ant/src/main/java/org/eclipse/jetty/ant/AntWebInfConfiguration.java
#	jetty-http/src/test/java/org/eclipse/jetty/http/QuotedCSVTest.java
#	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java
#	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionDataStore.java
#	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiWebInfConfiguration.java
#	jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/StringUtilTest.java
#	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebInfConfiguration.java
#	jetty-websocket/javax-websocket-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WSServer.java
#	tests/test-integration/src/test/java/org/eclipse/jetty/test/support/XmlBasedJettyServer.java
 2019-06-13 14:14:42 -05:00
Joakim Erdfelt 40e9e053b9
Merge pull request #3768 from eclipse/jetty-9.4.x-3708-stringutil-replace 
Issue #3708 - use StringUtil alternatives for known slow JVM impls.
 2019-06-13 14:01:35 -05:00
Simone Bordet 790051556f Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-06-13 10:03:54 +02:00
Joakim Erdfelt e81fdbd7c7 Issue #3736 - Give better exception when using bad classloader impl 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-12 13:38:45 -05:00
Joakim Erdfelt 877815e195 Issue #3708 - Adding new methods and converting codebase to use them 
+ StringUtil.replace(String, char, char)
+ StringUtil.strip(String, String)
+ URIUtil.encodeSpecific(String, String)
+ URIUtil.decodeSpecific(String, String)
+ TypeUtil.toClassReference(Class)
+ TypeUtil.toClassReference(String)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-12 09:56:41 -05:00
Joakim Erdfelt 33fe55c339 Issue #3708 - use StringUtil alternatives for known slow JVM impls. 
+ StringUtil.replace()
+ StringUtil.replaceFirst()
+ StringUtil.sanitizeFileSystemPath()

Change existing usages of String.replace() to either
use new StringUtil.replace() or other methods elsewhere
that better suit that specific need.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-11 11:25:50 -05:00
Joakim Erdfelt ae21126cad Updating to version 9.4.20-SNAPSHOT 2019-06-10 13:40:17 -05:00
Joakim Erdfelt 68a9498092 Merge branch `jetty-9.4.x` into `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-10 11:51:55 -05:00
Joakim Erdfelt afcf563148 Updating to version 9.4.19.v20190610 2019-06-10 11:17:56 -05:00
Simone Bordet 826d68e80a Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-06-10 11:41:47 +02:00
Greg Wilkins 043521ce26
Cleanup webappconfiguration (#3703) 
* Cleanup webappconfiguration
* formatting fix
* cleanup examples and OSGi
* disable classloader test until 9.4.19 is released with #3726 is fixed
* cleanup from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-06-05 11:53:56 +02:00
Greg Wilkins 2256c532be Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-22 10:30:25 +02:00
Michael Hausegger e8f11d3c7e Added small performance improvements 
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
 2019-05-22 08:27:53 +02:00
Greg Wilkins 2d5984da20 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-07 15:37:27 +02:00
Greg Wilkins 6c6646286d cleanup after review 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-03 15:25:05 +02:00
Greg Wilkins 1a76d487cc improved names and javadoc 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-03 15:25:05 +02:00
Greg Wilkins feb0333844 Fixed IncludeExclude combination logic 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-03 15:25:05 +02:00
Joakim Erdfelt 734be56938 Updating to version 9.4.19-SNAPSHOT 2019-04-29 16:27:23 -05:00
Joakim Erdfelt e1bc35120a Updating to version 9.4.18.v20190429 2019-04-29 15:40:33 -05:00
Greg Wilkins f28bfa9377 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-04-29 13:21:59 +02:00
Jan Bartel ab174d1015
Issue #3597 Fix session persistence classloading for deep structures (#3602) 
* Issue #3597 Fix session persistence classloading for deep structures with system classes.
 2019-04-29 12:05:34 +02:00
Joakim Erdfelt 05bb111580 Updating to version 9.4.18-SNAPSHOT 2019-04-18 15:59:49 -05:00
Joakim Erdfelt aa1c656c31 Updating to version 9.4.17.v20190418 2019-04-18 14:44:28 -05:00
Joakim Erdfelt 79537a5f51 Updating to version 9.4.17-SNAPSHOT 2019-04-11 11:00:24 -05:00
Joakim Erdfelt e0aa4ae4c0 Updating to version 9.4.16.v20190411 2019-04-11 10:01:26 -05:00
Simone Bordet 9c13cf3a52 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-04-02 17:37:56 +02:00
Joakim Erdfelt 73f7975189 Issue #3489 - Allowing JAR directory references on Windows 
+ Moving Resource.newResource() to later point

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-03-27 14:14:41 -07:00
Joakim Erdfelt 5658bf96f6 Issue #1676 - Removing Deprecated Resource.getURL() 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-03-01 10:21:42 -05:00
Joakim Erdfelt e476cec6d3 Issue #1676 - Removing deprecated methods and classes 
+ Changing usages of JVM deprecated classes / methods as well
+ Cleaning up test cases and javadoc
+ Removing test methods that rely on deprecated and now removed concepts

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-02-28 17:54:28 -05:00
Joakim Erdfelt 9cdb59d4d7 Updating to version 9.4.16-SNAPSHOT 2019-02-15 13:35:15 -05:00
Joakim Erdfelt eb70b24016 Updating to version 9.4.15.v20190215 2019-02-15 11:53:00 -05:00
Simone Bordet b9f89af847 Fixes #3320 - Review Jetty 10 module-info.java. 
Reviewed module-info.java files.
For those that have a "requires static" added a comment about
why the dependency is optional.
Rearranged directives in alphabetical order.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-08 17:30:27 +01:00
Simone Bordet e2506d4811
Merge pull request #3168 from eclipse/jetty-10.0.x-3162_jetty_servlet_api 
Issue #3162 - Use Jetty specific Servlet API jar.
 2019-02-07 17:33:14 +01:00
Jan Bartel 1d334d0f01 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-02-07 09:23:52 +11:00
Jan Bartel 9a25f2757e
Issue #3307 WebAppClassLoader.loadClass call resolveClass if resolve==true (#3328) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-02-07 09:22:42 +11:00
Jan Bartel 08f1969f64 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-02-06 17:58:23 +11:00
Tushar I cd304eb65b Issue #150: Ability to handle JAR directories in extraClasspath. (#3325) 
* Issue #150: Ability to handle JAR directories in extraClasspath. In keeping with Java conventions[0], any directory paths ending in /* should be considered a JAR directory and all jars in that directory will be added (non recursively) to the classpath.

[0] https://docs.oracle.com/javase/8/docs/technotes/tools/windows/classpath.html

Signed-off-by: Tushar Inamdar <tusharinamdar@hotmail.com>
 2019-02-06 17:56:54 +11:00
Joakim Erdfelt c30c8d4339 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3162_jetty_servlet_api 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-client/pom.xml
#	jetty-http/pom.xml
#	jetty-http2/http2-client/pom.xml
#	jetty-http2/http2-http-client-transport/pom.xml
#	jetty-http2/http2-server/pom.xml
#	jetty-osgi/test-jetty-osgi/pom.xml
#	jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml
#	jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithWebSocket.java
#	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
#	jetty-quickstart/pom.xml
#	jetty-servlets/pom.xml
#	jetty-util/pom.xml
#	jetty-websocket/javax-websocket-client/pom.xml
#	jetty-websocket/javax-websocket-server/pom.xml
#	jetty-websocket/jetty-websocket-server/pom.xml
#	pom.xml
 2019-01-30 11:56:58 -06:00
olivier lamy 63f2023e05 happy new year!! 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-01 12:17:53 +10:00
Olivier Lamy 9b7afd8a03
Happy new year!! (#3232) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-01 11:52:16 +10:00
Jan Bartel b46c3b0f1c
Issue #3213 Ensure MetaInfConfigurationTest is not disabled (#3215) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-12-27 16:44:53 +11:00