[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.5.v20120716-31-g8e0dc72

The branch, jetty-8 has been updated
       via  8e0dc72b233efc1067cb3483e1df7fc750f9dc96 (commit)
       via  20ca9ad3ac05f137f4b872c12f4cdf012c17c46e (commit)
       via  60b90591aa3a278c60b5e56ab304e8641d26536d (commit)
       via  ea1033dddc37764df3a644fb5e2859cd000b997b (commit)
       via  3c6a6fa8e02699a9b09d34a344d41fc210bda6f4 (commit)
       via  999f66b6a816e9e88d7615e95d787330c87b3eca (commit)
       via  e274379a7f1b6df0db6e0fc6bc3e35790c1de1a3 (commit)
       via  13f4c1fcb18b54fe3fc466a2d901694438f169b8 (commit)
       via  63792e9c14b866bad9de69f71d486188c994662d (commit)
       via  ccacf7c17cbdda0531d881be1e3646584e8b9a8f (commit)
       via  1f1c2c7d170ca256414ce046133ba7078a045ef3 (commit)
       via  8cb131c7fd2579718e3a878b0b6f0091a3fcb975 (commit)
       via  6832d8805a15dbce919d98cbf62d30f7e268ab59 (commit)
       via  36518d618b901965b2eccdff2de935e961809dc6 (commit)
       via  3e18545844a970c3b93831dc89024eebe26d21fc (commit)
       via  050db55f1bb86e3071ce50dbd69b2023efaaa44c (commit)
       via  d70f8b2012d2cd06977429abb9567143131daf69 (commit)
       via  4a312f7cb6247b34fdf09ef1ce563d84e9ea2530 (commit)
       via  98cda498cbdd9a168b1fd3b6fa1dc58e12cede96 (commit)
       via  b2998c2c4d4771eb01daae5d82d35872959551a7 (commit)
      from  29fda3a7d87fdeb0aa0413e488d73cd261ed7ce1 (commit)


- Log -----------------------------------------------------------------
commit 8e0dc72b233efc1067cb3483e1df7fc750f9dc96
Merge: 29fda3a 20ca9ad
Author: Jan Bartel <janb@xxxxxxxxxxx>
Date:   Mon Jul 23 13:24:57 2012 +1000

    Merge remote-tracking branch 'origin/master' into jetty-8
    
    Conflicts:
    	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
    	jetty-osgi/jetty-osgi-servletbridge/pom.xml
    	jetty-osgi/pom.xml

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

Summary of changes:
 LICENSE-CONTRIBUTOR/cla-tbecker.txt                |  145 ++++
 .../ExpirationWithLimitedConnectionsTest.java      |    3 +-
 jetty-osgi/jetty-osgi-boot-jsp/pom.xml             |    7 +-
 .../PluggableWebAppRegistrationCustomizerImpl.java |   33 +-
 .../jasper/WebappRegistrationCustomizerImpl.java   |   15 +-
 .../jetty/osgi/boot/jsp/FragmentActivator.java     |   21 +-
 .../osgi/boot/jsp/TagLibOSGiConfiguration.java     |    3 +-
 .../jettyhome/etc/jetty-deployer.xml               |   30 +-
 jetty-osgi/jetty-osgi-boot/pom.xml                 |    2 +-
 .../jetty/osgi/boot/AbstractContextProvider.java   |  355 ++++++++
 .../eclipse/jetty/osgi/boot/AbstractOSGiApp.java   |  114 +++
 .../jetty/osgi/boot/AbstractWebAppProvider.java    |  548 ++++++++++++
 .../jetty/osgi/boot/BundleContextProvider.java     |  163 ++++
 .../eclipse/jetty/osgi/boot/BundleProvider.java    |   22 +
 .../jetty/osgi/boot/BundleWebAppProvider.java      |  232 +++++
 .../jetty/osgi/boot/JettyBootstrapActivator.java   |   11 +-
 .../eclipse/jetty/osgi/boot/OSGiAppProvider.java   |  728 ----------------
 .../org/eclipse/jetty/osgi/boot/OSGiDeployer.java  |   55 ++
 .../jetty/osgi/boot/OSGiMetaInfConfiguration.java  |  110 +++
 .../jetty/osgi/boot/OSGiServerConstants.java       |   32 +
 .../eclipse/jetty/osgi/boot/OSGiUndeployer.java    |   41 +
 .../jetty/osgi/boot/OSGiWebInfConfiguration.java   |  267 ++++++
 .../jetty/osgi/boot/OSGiWebappConstants.java       |   66 ++-
 .../jetty/osgi/boot/ServiceContextProvider.java    |  168 ++++
 .../eclipse/jetty/osgi/boot/ServiceProvider.java   |   23 +
 .../jetty/osgi/boot/ServiceWebAppProvider.java     |  230 +++++
 .../DefaultJettyAtJettyHomeHelper.java             |   99 +--
 .../serverfactory/ServerInstanceWrapper.java       |  206 +++--
 .../webapp/BundleFileLocatorHelperFactory.java     |   53 ++
 .../webapp/JettyContextHandlerServiceTracker.java  |  380 +++------
 .../internal/webapp/OSGiWebappClassLoader.java     |    5 +-
 .../internal/webapp/WebBundleDeployerHelper.java   |  905 --------------------
 .../webapp/WebBundleTrackerCustomizer.java         |  211 ++---
 .../boot/utils/BundleClassLoaderHelperFactory.java |   56 ++
 .../osgi/boot/utils/BundleFileLocatorHelper.java   |   26 +
 .../eclipse/jetty/osgi/boot/utils/EventSender.java |   85 ++
 .../jetty/osgi/boot/utils/OSGiClassLoader.java     |  215 +++++
 .../boot/utils/WebappRegistrationCustomizer.java   |    5 +-
 .../utils/internal/DefaultFileLocatorHelper.java   |    5 +-
 jetty-osgi/pom.xml                                 |    2 +
 jetty-osgi/test-jetty-osgi-context/pom.xml         |  133 +++
 .../src/main/context/acme.xml                      |   36 +
 .../src/main/java/com/acme/osgi/Activator.java     |   58 ++
 .../src/main/resources/static/index.html           |    6 +
 jetty-osgi/test-jetty-osgi-webapp/pom.xml          |  129 +++
 .../src/main/java/com/acme/osgi/Activator.java     |   60 ++
 .../src/main/resources/index.html                  |    6 +
 jetty-osgi/test-jetty-osgi/pom.xml                 |   26 +-
 .../src/test/config/etc/jetty-deployer.xml         |   43 +
 .../src/test/config}/etc/jetty-selector.xml        |    0
 .../src/test/config}/etc/jetty.xml                 |    0
 .../osgi/boot/JettyOSGiBootContextAsService.java   |  177 ++++
 .../jetty/osgi/boot/TestJettyOSGiBootCore.java     |   23 +-
 .../boot/TestJettyOSGiBootWebAppAsService.java     |  181 ++++
 .../jetty/osgi/boot/TestJettyOSGiBootWithJsp.java  |   37 +-
 .../jetty/server/AbstractHttpConnection.java       |    2 +-
 56 files changed, 4366 insertions(+), 2228 deletions(-)
 create mode 100644 LICENSE-CONTRIBUTOR/cla-tbecker.txt
 create mode 100644 jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractContextProvider.java
 create mode 100644 jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractOSGiApp.java
 create mode 100644 jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/AbstractWebAppProvider.java
 create mode 100644 jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleContextProvider.java
 create mode 100644 jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleProvider.java
 create mode 100644 jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/BundleWebAppProvider.java
 delete mode 100644 jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java
 create mode 100644 jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiDeployer.java
 create mode 100644 jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiMetaInfConfiguration.java
 create mode 100644 jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiUndeployer.java
 create mode 100644 jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiWebInfConfiguration.java
 create mode 100644 jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceContextProvider.java
 create mode 100644 jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceProvider.java
 create mode 100644 jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/ServiceWebAppProvider.java
 create mode 100644 jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/BundleFileLocatorHelperFactory.java
 delete mode 100644 jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
 create mode 100644 jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/BundleClassLoaderHelperFactory.java
 create mode 100644 jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/EventSender.java
 create mode 100644 jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/OSGiClassLoader.java
 create mode 100644 jetty-osgi/test-jetty-osgi-context/pom.xml
 create mode 100644 jetty-osgi/test-jetty-osgi-context/src/main/context/acme.xml
 create mode 100644 jetty-osgi/test-jetty-osgi-context/src/main/java/com/acme/osgi/Activator.java
 create mode 100644 jetty-osgi/test-jetty-osgi-context/src/main/resources/static/index.html
 create mode 100644 jetty-osgi/test-jetty-osgi-webapp/pom.xml
 create mode 100644 jetty-osgi/test-jetty-osgi-webapp/src/main/java/com/acme/osgi/Activator.java
 create mode 100644 jetty-osgi/test-jetty-osgi-webapp/src/main/resources/index.html
 create mode 100644 jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-deployer.xml
 copy jetty-osgi/{jetty-osgi-boot/jettyhome => test-jetty-osgi/src/test/config}/etc/jetty-selector.xml (100%)
 copy jetty-osgi/{jetty-osgi-boot/jettyhome => test-jetty-osgi/src/test/config}/etc/jetty.xml (100%)
 create mode 100644 jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/JettyOSGiBootContextAsService.java
 create mode 100644 jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootWebAppAsService.java


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