[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[jetty-commit] [Git@Eclipse] Jetty: primary project repository branch jetty-8 updated. jetty-8.1.2.v20120308-120-g325c484

The branch, jetty-8 has been updated
       via  325c484950e51a858af9944b127688c5fc7acc60 (commit)
       via  b5e9de1cd868eb0d78492cd14ea122f3bd0f3f52 (commit)
       via  9cc43c5f937fdf125dd09762d32699be2a9423cc (commit)
       via  436743e7d5ad268b9a32311af31bcef4928098cc (commit)
       via  a565c72adbd52184537af54492f7710787b362b6 (commit)
       via  ee2d289f63366a78f582233b09fba983368cbcbd (commit)
       via  c9ce3eb108a1362b73ed54a4c6d24fa47edd002f (commit)
       via  d98f699bea4a8ee62e01a3c32d0f8feda4e1fc62 (commit)
       via  08573701efc447fb95da22bfc711f79b6908a60e (commit)
       via  543d2a18caf3d10c2b3a91014d8fe93124ce7f69 (commit)
       via  5ddaa6246922252d5332643f1f74f87749bb74a7 (commit)
       via  04b37f02ed39272c7a19809455c33265b8c3e9bf (commit)
       via  972087d0684fa46341e7c6ef32dcd95c407400c1 (commit)
       via  942c8a19f56d31a9f7305b31ca3bd714518723b7 (commit)
       via  a1fd229cc6694cd6b92212271cf153252a7e52f1 (commit)
       via  5b7fe58593b3250b4f70ea6bc6c9d51a35c9b635 (commit)
       via  47c1587166a7951343a20c248da5b074dd70699c (commit)
       via  20a3d3c12ec8f4cb5f30747304f1ff7d4eaf1be8 (commit)
       via  4412d311a9a440572fd15663cc00392754467b79 (commit)
       via  f81ea123202a1e96c0738184e101b41dfa1347be (commit)
       via  9dfa9f9937baa85c26f475b60b554f1ba6398679 (commit)
       via  6ec159401010469008ca58ba5b04d2ed3ad55213 (commit)
       via  eaacd69ede679f836873a44a367b20516f449191 (commit)
       via  d47d4b15ea09f7a0b33ea9121198717bc00cc512 (commit)
       via  50f545b29a0227cbd78e05d9b8b10ca2c4e985b4 (commit)
       via  911643b783619b831cf0bbf229f41c8d62a13c46 (commit)
       via  792b1016398759080c6c4bb6bfb475cd05217072 (commit)
       via  5b668fd6f123ffc0517c1ffe6ccd92fbafc79f14 (commit)
       via  6c464238b789c7b2f44b5472fe6a465d5067386c (commit)
       via  83a4bb71a3551c634257ef151ace95d0e7e2ec82 (commit)
       via  b2b4b2733b6bc829c7730f8b48f57ce5b6b3ae32 (commit)
       via  71091da2c4ba8a25072d3b8761a7dee8a1eef4ed (commit)
       via  eea06004f5a0a234b20f3ee8259f33b5b6967372 (commit)
       via  9521e1f124d1648e63fccee268fcd2e6604e0470 (commit)
       via  5b2d703a042c4e99dad062803340d0e909717481 (commit)
       via  98658a2873bd86f9123e8e9212bb88df79173479 (commit)
       via  d231b5714494107e31018a91680f45ed459b9870 (commit)
       via  2b83d9d9545a148eacca3fc5461eec27a502b1e2 (commit)
       via  30adf7cd18d3611cace9a5a2da63d979847caa2d (commit)
       via  b44fe2094fc2bcfd3a9d83cccb5983329c69681a (commit)
       via  bd0cc72439c27d3ace6e22e90314d07f033931cf (commit)
       via  cc1bef6f2e43f120e417e9771976e992ba73d7f0 (commit)
       via  bb429a7f186d3812e3305e88d15a139800f210ef (commit)
       via  00b31b6577e1419fa5fe84d55c92e31297ea7627 (commit)
       via  fff059f7a99ba53c8aaa2ea9837ac47868362afc (commit)
       via  830557f018d63e4883068119dc1bcfb267670e4a (commit)
       via  b0a3d031aaf2e91b3ef0dff2337054bacc044dca (commit)
       via  2a44fa5c220b911b5dc54b51239b8f91e5bca008 (commit)
      from  62713fda2fbe324e0480ab77c45db8caad44fa43 (commit)


- Log -----------------------------------------------------------------
commit 325c484950e51a858af9944b127688c5fc7acc60
Author: Greg Wilkins <gregw@xxxxxxxxxxx>
Date:   Thu Apr 12 17:16:45 2012 +1000

    fixed merge issues

commit b5e9de1cd868eb0d78492cd14ea122f3bd0f3f52
Merge: ee2d289 9cc43c5
Author: Greg Wilkins <gregw@xxxxxxxxxxx>
Date:   Thu Apr 12 17:16:22 2012 +1000

    Merge remote-tracking branch 'origin/master' into jetty-8

commit ee2d289f63366a78f582233b09fba983368cbcbd
Merge: 62713fd c9ce3eb
Author: Greg Wilkins <gregw@xxxxxxxxxxx>
Date:   Thu Apr 12 16:02:34 2012 +1000

    Merge remote-tracking branch 'origin/master' into jetty-8
    
    Conflicts:
    	jetty-npn/pom.xml
    	jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF
    	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/WebappRegistrationCustomizerImpl.java
    	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
    	jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
    	jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF
    	jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
    	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
    	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleTrackerCustomizer.java
    	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultFileLocatorHelper.java
    	jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
    	jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF
    	jetty-spdy/spdy-jetty-http-webapp/pom.xml
    	jetty-spdy/spdy-jetty-http/pom.xml
    	jetty-spdy/spdy-jetty/pom.xml

-----------------------------------------------------------------------

Summary of changes:
 .../java/org/eclipse/jetty/client/HttpClient.java  |    4 +-
 .../org/eclipse/jetty/client/HttpDestination.java  |    8 +-
 .../client/security/DigestAuthentication.java      |    6 +-
 .../java/org/eclipse/jetty/http/HttpParser.java    |    9 -
 .../jetty/http/gzip/AbstractCompressedStream.java  |    4 +-
 .../org/eclipse/jetty/io/bio/StringEndPoint.java   |    8 +-
 jetty-npn/pom.xml                                  |   26 +-
 .../PluggableWebAppRegistrationCustomizerImpl.java |  170 ++++----
 .../jasper/WebappRegistrationCustomizerImpl.java   |  239 +++++-----
 .../jetty/osgi/boot/jsp/FragmentActivator.java     |   25 +-
 .../osgi/boot/jsp/TagLibOSGiConfiguration.java     |  199 ++++-----
 .../osgi/boot/warurl/WarUrlStreamHandler.java      |   55 ++-
 .../boot/warurl/internal/WarURLConnection.java     |    2 +
 .../jetty/osgi/boot/JettyBootstrapActivator.java   |  179 ++++----
 .../eclipse/jetty/osgi/boot/OSGiAppProvider.java   |    6 +-
 .../DefaultJettyAtJettyHomeHelper.java             |   15 +-
 .../webapp/JettyContextHandlerServiceTracker.java  |  205 ++++-----
 .../internal/webapp/OSGiWebappClassLoader.java     |    4 +-
 .../internal/webapp/WebBundleDeployerHelper.java   |  464 ++++++++++----------
 .../webapp/WebBundleTrackerCustomizer.java         |  233 +++++-----
 .../utils/internal/DefaultFileLocatorHelper.java   |  273 +++++++------
 .../jetty-osgi-httpservice/META-INF/MANIFEST.MF    |    1 +
 .../jetty/rewrite/handler/RegexTargetHandler.java  |  149 -------
 .../jetty/rewrite/handler/RewriteRegexRule.java    |   19 +-
 .../rewrite/handler/RegexTargetHandlerTest.java    |  214 ---------
 .../rewrite/handler/RewriteRegexRuleTest.java      |   60 ++-
 .../org/eclipse/jetty/server/ResponseTest.java     |    5 +-
 .../eclipse/jetty/server/ssl/SSLEngineTest.java    |   17 +-
 .../org/eclipse/jetty/servlet/ServletHandler.java  |    2 +-
 .../org/eclipse/jetty/servlets/GzipFilter.java     |   52 ++-
 .../jetty/servlets/IncludableGzipFilter.java       |    3 +-
 .../eclipse/jetty/servlets/MultiPartFilter.java    |    2 +-
 .../jetty/servlets/GzipFilterDefaultTest.java      |   91 ++++-
 jetty-spdy/pom.xml                                 |   10 +-
 jetty-spdy/spdy-core/pom.xml                       |    5 +-
 .../main/java/org/eclipse/jetty/spdy/IStream.java  |    3 +-
 .../org/eclipse/jetty/spdy/StandardSession.java    |  178 +++++---
 .../org/eclipse/jetty/spdy/StandardStream.java     |  120 ++++-
 .../jetty/spdy/api/SessionFrameListener.java       |    6 +-
 .../jetty/spdy/generator/SettingsGenerator.java    |    2 +-
 .../jetty/spdy/parser/GoAwayBodyParser.java        |    8 +
 .../java/org/eclipse/jetty/spdy/parser/Parser.java |    6 +-
 .../org/eclipse/jetty/spdy/AsyncTimeoutTest.java   |   11 +-
 jetty-spdy/spdy-jetty-http-webapp/pom.xml          |  121 +++---
 .../src/main/config/etc/jetty-spdy.xml             |    7 -
 jetty-spdy/spdy-jetty-http/pom.xml                 |  147 +++----
 .../spdy/http/ServerHTTPSPDYAsyncConnection.java   |   62 ++-
 .../http/ServerHTTPSPDYAsyncConnectionFactory.java |   48 ++-
 .../jetty/spdy/http/ServerHTTPSPDYTest.java        |    9 +-
 jetty-spdy/spdy-jetty/pom.xml                      |  158 +++----
 .../eclipse/jetty/spdy/SPDYAsyncConnection.java    |    8 +-
 .../eclipse/jetty/spdy/SPDYServerConnector.java    |    6 +-
 .../org/eclipse/jetty/spdy/FlowControlTest.java    |    2 +-
 .../eclipse/jetty/spdy/ProtocolViolationsTest.java |  164 +++++++
 .../org/eclipse/jetty/spdy/ResetStreamTest.java    |    2 +
 .../jetty/spdy/SynDataReplyDataLoadTest.java       |   36 +-
 .../java/org/eclipse/jetty/spdy/SynReplyTest.java  |   35 --
 .../main/java/org/eclipse/jetty/util/MultiMap.java |   20 +-
 .../eclipse/jetty/util/MultiPartOutputStream.java  |   13 +-
 .../jetty/util/RolloverFileOutputStream.java       |    1 +
 .../main/java/org/eclipse/jetty/util/TypeUtil.java |   20 +-
 .../main/java/org/eclipse/jetty/util/URIUtil.java  |  138 +++++--
 .../java/org/eclipse/jetty/util/ajax/JSON.java     |    4 +-
 .../jetty/util/ajax/JSONObjectConvertor.java       |    1 -
 .../jetty/util/ajax/JSONPojoConvertorFactory.java  |    4 +-
 .../java/org/eclipse/jetty/util/log/Slf4jLog.java  |   12 +-
 .../java/org/eclipse/jetty/util/log/StdErrLog.java |   18 +-
 .../eclipse/jetty/webapp/WebInfConfiguration.java  |    3 +-
 .../org/eclipse/jetty/xml/XmlConfiguration.java    |    7 +-
 pom.xml                                            |    1 -
 70 files changed, 2151 insertions(+), 1994 deletions(-)
 delete mode 100644 jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/RegexTargetHandler.java
 delete mode 100644 jetty-rewrite/src/test/java/org/eclipse/jetty/rewrite/handler/RegexTargetHandlerTest.java
 create mode 100644 jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/ProtocolViolationsTest.java


hooks/post-receive
-- 
Jetty: primary project repository