svn commit: r1765613 - in /openwebbeans/microwave/trunk: ./ microwave-core/ microwave-core/src/main/java/org/apache/microwave/cxf/ microwave-core/src/main/java/org/apache/microwave/openwebbeans/ microwave-core/src/main/resources/META-INF/openwebbeans/ ...

[rmannibucau]

Author: rmannibucau
Date: Wed Oct 19 15:04:56 2016
New Revision: 1765613

URL: http://svn.apache.org/viewvc?rev=1765613&view=rev
Log:
JUnit integration

Removed:
    
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/cxf/BusInstance.java
    
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/cxf/JAXRSCdiResourceExtensionWorkaround.java
    
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/openwebbeans/MicrowaveLoader.java
    
openwebbeans/microwave/trunk/microwave-core/src/main/resources/META-INF/services/
Modified:
    openwebbeans/microwave/trunk/microwave-core/pom.xml
    
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/openwebbeans/BundleMetadataDiscovery.java
    
openwebbeans/microwave/trunk/microwave-core/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
    openwebbeans/microwave/trunk/pom.xml

Modified: openwebbeans/microwave/trunk/microwave-core/pom.xml
URL: 
http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-core/pom.xml?rev=1765613&r1=1765612&r2=1765613&view=diff
==============================================================================
--- openwebbeans/microwave/trunk/microwave-core/pom.xml (original)
+++ openwebbeans/microwave/trunk/microwave-core/pom.xml Wed Oct 19 15:04:56 2016
@@ -35,7 +35,7 @@
   <properties>
     <openwebbeans.version>1.7.0</openwebbeans.version>
     <tomcat.version>8.5.6</tomcat.version>
-    <cxf.version>3.1.8</cxf.version>
+    <cxf.version>3.1.9-SNAPSHOT</cxf.version>
     <johnzon.version>0.9.5</johnzon.version>
   </properties>
 

Modified: 
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/openwebbeans/BundleMetadataDiscovery.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/openwebbeans/BundleMetadataDiscovery.java?rev=1765613&r1=1765612&r2=1765613&view=diff
==============================================================================
--- 
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/openwebbeans/BundleMetadataDiscovery.java
 (original)
+++ 
openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/openwebbeans/BundleMetadataDiscovery.java
 Wed Oct 19 15:04:56 2016
@@ -249,8 +249,6 @@ public class BundleMetadataDiscovery ext
             included.add("org.apache.myfaces.cdi");
             // included.add("org.apache.myfaces.application.cdi");
             included.add("org.apache.myfaces.flow.cdi");
-            // the only actual bean we have, should be removed with cxf 3.1.9 
upgrade
-            included.add("org.apache.microwave.cxf.BusInstance");
 
             delegateSkip = new OptimizedExclusionFilter(excluded);
             delegateAccept = new OptimizedExclusionFilter(included);

Modified: 
openwebbeans/microwave/trunk/microwave-core/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL: 
http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-core/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=1765613&r1=1765612&r2=1765613&view=diff
==============================================================================
--- 
openwebbeans/microwave/trunk/microwave-core/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
 (original)
+++ 
openwebbeans/microwave/trunk/microwave-core/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
 Wed Oct 19 15:04:56 2016
@@ -16,7 +16,6 @@
 #under the License.
 configuration.ordinal=1000
 
org.apache.webbeans.spi.ScannerService=org.apache.microwave.openwebbeans.BundleMetadataDiscovery
-org.apache.webbeans.spi.LoaderService=org.apache.microwave.openwebbeans.MicrowaveLoader
 org.apache.webbeans.scanExclusionPaths=\
         /jre/lib, \
         /Contents/Home/, \

Modified: openwebbeans/microwave/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/pom.xml?rev=1765613&r1=1765612&r2=1765613&view=diff
==============================================================================
--- openwebbeans/microwave/trunk/pom.xml (original)
+++ openwebbeans/microwave/trunk/pom.xml Wed Oct 19 15:04:56 2016
@@ -41,6 +41,7 @@
     <module>microwave-core</module>
     <module>microwave-maven-plugin</module>
     <module>microwave-gradle-plugin</module>
+    <module>microwave-junit</module>
   </modules>
 
   <build>