Fix CDI package names (#7715)

* Fix beans.xsd location for JavaEE 7

* Fix cdi2observers package names

cdi/src/main/java/com/baeldung/cdi2observers/application/BootstrappingApplication.java

@@ -1,6 +1,7 @@
-package com.baeldung.cdi.cdi2observers.application;
+package com.baeldung.cdi2observers.application;
+
+import com.baeldung.cdi2observers.events.ExampleEvent;
 
-import com.baeldung.cdi.cdi2observers.events.ExampleEvent;
 import javax.enterprise.inject.se.SeContainer;
 import javax.enterprise.inject.se.SeContainerInitializer;
 

cdi/src/main/java/com/baeldung/cdi2observers/events/ExampleEvent.java

@@ -1,4 +1,4 @@
-package com.baeldung.cdi.cdi2observers.events;
+package com.baeldung.cdi2observers.events;
 
 public class ExampleEvent {
     

cdi/src/main/java/com/baeldung/cdi2observers/events/ExampleEventSource.java

@@ -1,4 +1,4 @@
-package com.baeldung.cdi.cdi2observers.events;
+package com.baeldung.cdi2observers.events;
 
 import javax.enterprise.event.Event;
 import javax.inject.Inject;

cdi/src/main/java/com/baeldung/cdi2observers/observers/AnotherExampleEventObserver.java

@@ -1,6 +1,7 @@
-package com.baeldung.cdi.cdi2observers.observers;
+package com.baeldung.cdi2observers.observers;
+
+import com.baeldung.cdi2observers.events.ExampleEvent;
 
-import com.baeldung.cdi.cdi2observers.events.ExampleEvent;
 import javax.annotation.Priority;
 import javax.enterprise.event.Observes;
 

cdi/src/main/java/com/baeldung/cdi2observers/observers/ExampleEventObserver.java

@@ -1,7 +1,7 @@
-package com.baeldung.cdi.cdi2observers.observers;
+package com.baeldung.cdi2observers.observers;
 
-import com.baeldung.cdi.cdi2observers.events.ExampleEvent;
+import com.baeldung.cdi2observers.events.ExampleEvent;
-import com.baeldung.cdi.cdi2observers.services.TextService;
+import com.baeldung.cdi2observers.services.TextService;
 import javax.annotation.Priority;
 import javax.enterprise.event.Observes;
 

cdi/src/main/java/com/baeldung/cdi2observers/services/TextService.java

@@ -1,4 +1,4 @@
-package com.baeldung.cdi.cdi2observers.services;
+package com.baeldung.cdi2observers.services;
 
 public class TextService {
 

cdi/src/main/resources/META-INF/beans.xml

@@ -1,7 +1,8 @@
-<beans xmlns="http://java.sun.com/xml/ns/javaee"
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
-      http://java.sun.com/xml/ns/javaee/beans_1_2.xsd">
+       bean-discovery-mode="all">
     <interceptors>
         <class>com.baeldung.interceptor.AuditedInterceptor</class>
     </interceptors>

cdi/src/test/java/com/baeldung/test/cdi2observers/tests/TextServiceUnitTest.java

@@ -1,9 +1,10 @@
-package com.baeldung.cdi.cdi2observers.tests;
+package com.baeldung.test.cdi2observers.tests;
 
-import com.baeldung.cdi.cdi2observers.services.TextService;
+import com.baeldung.cdi2observers.services.TextService;
-import static org.assertj.core.api.Assertions.assertThat;
 import org.junit.Test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class TextServiceUnitTest {
 
     @Test

cdi/src/test/java/com/baeldung/test/dependencyinjection/TimeLoggerFactoryUnitTest.java

@@ -6,7 +6,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 import org.junit.Test;
 
 public class TimeLoggerFactoryUnitTest {
-    
     @Test
     public void givenTimeLoggerFactory_whenCalledgetTimeLogger_thenOneAssertion() {
         TimeLoggerFactory timeLoggerFactory = new TimeLoggerFactory();