Merge pull request #25 from funfried/0.x

Updated PAX-WEB to from 4.2.0-SNAPSHOT to 4.2.3 (Apache Karaf 4.0.3) …
ops4j · Feb 29, 2016 · e33b740 · e33b740
2 parents 22f48bf + c4e5f6d
commit e33b740
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/pax-cdi-parent/pom.xml b/pax-cdi-parent/pom.xml
@@ -25,13 +25,13 @@
         <pax.jpa.version>0.3.0</pax.jpa.version>
         <pax.swissbox.version>1.8.0</pax.swissbox.version>
         <pax.url.version>2.2.0</pax.url.version>
-        <pax.web.version>4.2.0-SNAPSHOT</pax.web.version>
+        <pax.web.version>4.2.3</pax.web.version>
         <slf4j.version>1.6.4</slf4j.version>
         <weld.api.version>1.2.0.Beta1</weld.api.version>
         <weld.version>1.2.0.Beta1</weld.version>
         <weld2.version>2.2.12.Final</weld2.version>
         <xbean.version>4.1</xbean.version>
-        
+
         <servlet.spec.groupId>javax.servlet</servlet.spec.groupId>
 		<servlet.spec.artifactId>javax.servlet-api</servlet.spec.artifactId>
 		<servlet.spec.version>3.1.0</servlet.spec.version>

diff --git a/pax-cdi-web-openwebbeans/pom.xml b/pax-cdi-web-openwebbeans/pom.xml
@@ -14,7 +14,7 @@
     <properties>
         <bundle.symbolicName>org.ops4j.pax.cdi.web.openwebbeans</bundle.symbolicName>
         <bundle.namespace>org.ops4j.pax.cdi.web.openwebbeans</bundle.namespace>
-        <jetty.version>9.0.7.v20131107</jetty.version>
+		<jetty.version>9.2.10.v20150310</jetty.version>
     </properties>
 
     <dependencies>

diff --git a/...eb-openwebbeans/src/main/java/org/ops4j/pax/cdi/web/openwebbeans/impl/JettyDecorator.java b/...eb-openwebbeans/src/main/java/org/ops4j/pax/cdi/web/openwebbeans/impl/JettyDecorator.java
@@ -101,4 +101,15 @@ public void destroyFilterInstance(Filter filter) {
     public void destroyListenerInstance(EventListener listener) {
         getInjector().destroy(listener);
     }
+
+	@Override
+	public <T> T decorate(T o) {
+		getInjector().inject(o);
+		return o;
+	}
+
+	@Override
+	public void destroy(Object o) {
+		getInjector().destroy(o);
+	}
 }