[weld-commits] [weld/core] 9035d2: Merge in servlet to core

[noreply at github.com]

Branch: refs/heads/master
Home:   http://github.com/weld/core

Commit: 9035d20e786a2beb4a6c111b8d460f2b34f41602
    http://github.com/weld/core/commit/9035d20e786a2beb4a6c111b8d460f2b34f41602
Author: Pete Muir <pmuir at bleepbleep.org.uk>
Date:   2010-08-05 (Thu, 05 Aug 2010)

Changed paths:
  A extensions/servlet/build.properties
  A extensions/servlet/build/pom.xml
  A extensions/servlet/int/pom.xml
  A extensions/servlet/int/src/etc/header.txt
  A extensions/servlet/int/src/main/java/org/jboss/weld/environment/jetty/JettyWeldInjector.java
  A extensions/servlet/int/src/main/java/org/jboss/weld/environment/jetty/WeldServletHandler.java
  A extensions/servlet/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java
  A extensions/servlet/int/src/main/java/org/jboss/weld/environment/servlet/deployment/AbstractScanner.java
  A extensions/servlet/int/src/main/java/org/jboss/weld/environment/servlet/deployment/Scanner.java
  A extensions/servlet/int/src/main/java/org/jboss/weld/environment/servlet/deployment/ServletDeployment.java
  A extensions/servlet/int/src/main/java/org/jboss/weld/environment/servlet/deployment/URLScanner.java
  A extensions/servlet/int/src/main/java/org/jboss/weld/environment/servlet/deployment/WebAppBeanDeploymentArchive.java
  A extensions/servlet/int/src/main/java/org/jboss/weld/environment/servlet/inject/AbstractInjector.java
  A extensions/servlet/int/src/main/java/org/jboss/weld/environment/servlet/jsf/ForwardingApplication.java
  A extensions/servlet/int/src/main/java/org/jboss/weld/environment/servlet/jsf/ForwardingApplicationFactory.java
  A extensions/servlet/int/src/main/java/org/jboss/weld/environment/servlet/jsf/WeldApplication.java
  A extensions/servlet/int/src/main/java/org/jboss/weld/environment/servlet/jsf/WeldApplicationFactory.java
  A extensions/servlet/int/src/main/java/org/jboss/weld/environment/servlet/services/ServletResourceInjectionServices.java
  A extensions/servlet/int/src/main/java/org/jboss/weld/environment/servlet/services/ServletServicesImpl.java
  A extensions/servlet/int/src/main/java/org/jboss/weld/environment/servlet/util/ForwardingELResolver.java
  A extensions/servlet/int/src/main/java/org/jboss/weld/environment/servlet/util/Reflections.java
  A extensions/servlet/int/src/main/java/org/jboss/weld/environment/servlet/util/Servlets.java
  A extensions/servlet/int/src/main/java/org/jboss/weld/environment/servlet/util/TransparentELResolver.java
  A extensions/servlet/int/src/main/java/org/jboss/weld/environment/tomcat/ForwardingAnnotationProcessor.java
  A extensions/servlet/int/src/main/java/org/jboss/weld/environment/tomcat/WeldAnnotationProcessor.java
  A extensions/servlet/int/src/main/java/org/jboss/weld/environment/tomcat/WeldForwardingAnnotationProcessor.java
  A extensions/servlet/int/src/main/resources/META-INF/faces-config.xml
  A extensions/servlet/pom.xml
  A extensions/servlet/tests/pom.xml
  A extensions/servlet/tests/src/etc/header.txt
  A extensions/servlet/tests/src/test/debug-resources/META-INF/jboss-test-harness.properties
  A extensions/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/discovery/ServletWeldDiscoveryTest.java
  A extensions/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/examples/ExampleTest.java
  A extensions/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/examples/Game.java
  A extensions/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/examples/Generator.java
  A extensions/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/examples/MockExampleTest.java
  A extensions/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/examples/MockSentenceTranslator.java
  A extensions/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/examples/Random.java
  A extensions/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/examples/SentenceParser.java
  A extensions/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/examples/SentenceTranslator.java
  A extensions/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/examples/TextTranslator.java
  A extensions/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/examples/Translator.java
  A extensions/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/lookup/BatListener.java
  A extensions/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/lookup/BatServlet.java
  A extensions/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/lookup/CatFilter.java
  A extensions/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/lookup/FilterInjectionTest.java
  A extensions/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/lookup/ListenerInjectionTest.java
  A extensions/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/lookup/LookupTest.java
  A extensions/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/lookup/Mouse.java
  A extensions/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/lookup/RatServlet.java
  A extensions/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/lookup/ServletInjectionTest.java
  A extensions/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/lookup/Sewer.java
  A extensions/servlet/tests/src/test/java/org/jboss/weld/test/tomcat/lookup/Vole.java
  A extensions/servlet/tests/src/test/resources/META-INF/beans.xml
  A extensions/servlet/tests/src/test/resources/META-INF/jboss-test-harness.properties
  A extensions/servlet/tests/src/test/resources/org/jboss/testharness/impl/packaging/jsr299/default/beans.xml
  A extensions/servlet/tests/src/test/resources/org/jboss/testharness/impl/packaging/war/custom-web.xml
  A extensions/servlet/tests/src/test/resources/org/jboss/weld/test/tomcat/examples/beans.xml
  A extensions/servlet/tests/src/test/resources/org/jboss/weld/test/tomcat/lookup/context-servlet-injection.xml
  A extensions/servlet/tests/src/test/resources/org/jboss/weld/test/tomcat/lookup/context.xml
  A extensions/servlet/tests/src/test/resources/org/jboss/weld/test/tomcat/lookup/web-filter-injection.xml
  A extensions/servlet/tests/src/test/resources/org/jboss/weld/test/tomcat/lookup/web-listener-injection.xml
  A extensions/servlet/tests/src/test/resources/org/jboss/weld/test/tomcat/lookup/web-servlet-injection.xml
  A extensions/servlet/tests/unit-tests.xml

Log Message:
-----------
Merge in servlet to core


Commit: 14f578f71ed92833b26a6c463c30ac5ca1cfd270
    http://github.com/weld/core/commit/14f578f71ed92833b26a6c463c30ac5ca1cfd270
Author: Pete Muir <pmuir at bleepbleep.org.uk>
Date:   2010-08-05 (Thu, 05 Aug 2010)

Changed paths:
  A environments/se/pom.xml
  A environments/se/src/etc/header.txt
  A environments/se/src/main/java/org/jboss/weld/environment/se/ShutdownManager.java
  A environments/se/src/main/java/org/jboss/weld/environment/se/StartMain.java
  A environments/se/src/main/java/org/jboss/weld/environment/se/Weld.java
  A environments/se/src/main/java/org/jboss/weld/environment/se/WeldContainer.java
  A environments/se/src/main/java/org/jboss/weld/environment/se/WeldSEBeanRegistrant.java
  A environments/se/src/main/java/org/jboss/weld/environment/se/beans/InstanceManager.java
  A environments/se/src/main/java/org/jboss/weld/environment/se/beans/ParametersFactory.java
  A environments/se/src/main/java/org/jboss/weld/environment/se/bindings/Parameters.java
  A environments/se/src/main/java/org/jboss/weld/environment/se/contexts/ThreadContext.java
  A environments/se/src/main/java/org/jboss/weld/environment/se/contexts/ThreadScoped.java
  A environments/se/src/main/java/org/jboss/weld/environment/se/discovery/AbstractWeldSEBeanDeploymentArchive.java
  A environments/se/src/main/java/org/jboss/weld/environment/se/discovery/AbstractWeldSEDeployment.java
  A environments/se/src/main/java/org/jboss/weld/environment/se/discovery/ImmutableBeanDeploymentArchive.java
  A environments/se/src/main/java/org/jboss/weld/environment/se/discovery/MutableBeanDeploymentArchive.java
  A environments/se/src/main/java/org/jboss/weld/environment/se/discovery/url/ClasspathScanningException.java
  A environments/se/src/main/java/org/jboss/weld/environment/se/discovery/url/FileSystemURLHandler.java
  A environments/se/src/main/java/org/jboss/weld/environment/se/discovery/url/URLScanner.java
  A environments/se/src/main/java/org/jboss/weld/environment/se/discovery/url/WeldSEResourceLoader.java
  A environments/se/src/main/java/org/jboss/weld/environment/se/discovery/url/WeldSEUrlDeployment.java
  A environments/se/src/main/java/org/jboss/weld/environment/se/events/ContainerInitialized.java
  A environments/se/src/main/java/org/jboss/weld/environment/se/threading/RunnableDecorator.java
  A environments/se/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
  A environments/se/src/main/resources/log4j.xml
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/DecoratorsTest.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/EventsTest.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/InterceptorsTest.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/ScopesTest.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/StartMainTest.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/ThreadContextTest.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/WeldMainTest.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/beans/CustomEvent.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/beans/InitObserverTestBean.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/beans/InterceptorTestBean.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/beans/MainTestBean.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/beans/ObserverTestBean.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/beans/ParametersTestBean.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/beans/threading/Counter.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/beans/threading/SingletonCounter.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/beans/threading/ThreadCounter.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/beans/threading/ThreadRunner.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/decorators/AbstractDoor.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/decorators/CarDoor.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/decorators/CarDoorAlarm.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/decorators/Door.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/decorators/HouseDoor.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/events/Bar.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/events/EventQualifier1.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/events/EventQualifier2.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/events/Foo.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/Aggregated.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/AggregatingInterceptor.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/Recorded.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/RecordingInterceptor.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/interceptors/Tracked.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/scopes/Bar.java
  A environments/se/src/test/java/org/jboss/weld/environment/se/test/scopes/Foo.java
  A environments/se/src/test/resources/META-INF/beans.xml
  A environments/se/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension

Log Message:
-----------
Merge branch 'master' of github.com:weld/core