[CDI2] Use new package structure for CDI2

Author: mpkorstanje

cdi2/README.adoc renamed to cdi2/README.md

@@ -1,45 +1,44 @@
-= Cucumber CDI 2
+Cucumber CDI 2
+==============
 
 This module relies on CDI Standalone Edition (CDI SE) API to start/stop a CDI container
 and customize it - adding steps. It looks up the beans/steps in CDI and if not available
 it instantiates it as POJO with CDI injection support - unmanaged bean.
 
-== Setup
+## Setup
 
 To use it, it is important to provide your CDI SE implementation - likely Weld or Apache OpenWebBeans.
 
 For Apache OpenWebBeans the dependency is:
 
-[source,xml]
-----
+```xml
 <dependency>
   <groupId>org.apache.openwebbeans</groupId>
   <artifactId>openwebbeans-se</artifactId>
   <version>2.0.10</version>
   <scope>test</scope>
 </dependency>
-----
+
+```
 
 And for Weld it is:
 
-[source,xml]
-----
+```xml
 <dependency>
   <groupId>org.jboss.weld.se</groupId>
   <artifactId>weld-se-core</artifactId>
   <version>3.1.1.Final</version>
   <scope>test</scope>
 </dependency>
-----
+```
 
 To ensure the module is compatible with all implementations and future API version, it does not transitively bring the API.
 If you don't know which one to use, you can import the following one but if you develop CDI code you should already have one provided:
 
-[source,xml]
-----
+```xml
 <dependency>
   <groupId>javax.enterprise</groupId>
   <artifactId>cdi-api</artifactId>
   <version>2.0</version>
 </dependency>
-----
+```

cdi2/src/main/java/cucumber/runtime/java/cdi2/Cdi2Factory.java renamed to cdi2/src/main/java/io/cucumber/cdi2/Cdi2Factory.java

@@ -1,4 +1,4 @@
-package cucumber.runtime.java.cdi2;
+package io.cucumber.cdi2;
 
 import io.cucumber.core.backend.ObjectFactory;
 
@@ -9,10 +9,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class Cdi2Factory implements ObjectFactory {
+public final class Cdi2Factory implements ObjectFactory {
 
-    protected SeContainerInitializer initializer;
-    protected SeContainer container;
+    private SeContainerInitializer initializer;
+    private SeContainer container;
     private final Map<Class<?>, Unmanaged.UnmanagedInstance<?>> standaloneInstances = new HashMap<>();
 
     @Override

cdi2/src/main/resources/META-INF/services/io.cucumber.core.backend.ObjectFactory

@@ -1 +1 @@
-cucumber.runtime.java.cdi2.Cdi2Factory
+io.cucumber.cdi2.Cdi2Factory

cdi2/src/test/java/cucumber/runtime/java/cdi2/Belly.java renamed to cdi2/src/test/java/io/cucumber/cdi2/Belly.java

@@ -1,4 +1,4 @@
-package cucumber.runtime.java.cdi2;
+package io.cucumber.cdi2;
 
 import javax.enterprise.context.ApplicationScoped;
 

cdi2/src/test/java/cucumber/runtime/java/cdi2/BellyStepdefs.java renamed to cdi2/src/test/java/io/cucumber/cdi2/BellyStepdefs.java

@@ -1,4 +1,4 @@
-package cucumber.runtime.java.cdi2;
+package io.cucumber.cdi2;
 
 import cucumber.api.java.en.Given;
 

cdi2/src/test/java/cucumber/runtime/java/cdi2/CDIBellyStepdefs.java renamed to cdi2/src/test/java/io/cucumber/cdi2/CDIBellyStepdefs.java

@@ -1,4 +1,4 @@
-package cucumber.runtime.java.cdi2;
+package io.cucumber.cdi2;
 
 import cucumber.api.java.en.Then;
 

cdi2/src/test/java/cucumber/runtime/java/cdi2/Cdi2FactoryTest.java renamed to cdi2/src/test/java/io/cucumber/cdi2/Cdi2FactoryTest.java

@@ -1,4 +1,4 @@
-package cucumber.runtime.java.cdi2;
+package io.cucumber.cdi2;
 
 import io.cucumber.core.backend.ObjectFactory;
 import org.junit.Test;

cdi2/src/test/java/cucumber/runtime/java/cdi2/RunCukesTest.java renamed to cdi2/src/test/java/io/cucumber/cdi2/RunCukesTest.java

@@ -1,4 +1,4 @@
-package cucumber.runtime.java.cdi2;
+package io.cucumber.cdi2;
 
 import cucumber.api.junit.Cucumber;
 import org.junit.runner.RunWith;

cdi2/src/test/java/cucumber/runtime/java/cdi2/UnusedGlue.java renamed to cdi2/src/test/java/io/cucumber/cdi2/UnusedGlue.java

@@ -1,4 +1,4 @@
-package cucumber.runtime.java.cdi2;
+package io.cucumber.cdi2;
 
 import cucumber.api.java.Before;
 import cucumber.api.java.en.Given;