Skip to content

Commit

Permalink
Fixed wrong namespaces
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-schnell committed Dec 28, 2023
1 parent 28a194d commit cabef56
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 21 deletions.
2 changes: 1 addition & 1 deletion java-se-cdi/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ There are several configuration classes used for CDI in the [app](src/main/java/

#### Sub package 'domain'
The view data will be stored in an in-memory HSQL database using JPA
* The [QryPerson](src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/domain/QryPerson.java) class is an [@javax.persistence.Entity](https://javaee.github.io/javaee-spec/javadocs/javax/persistence/Entity.html) class
* The [QryPerson](src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/domain/QryPerson.java) class is an [@jakarta.persistence.Entity](https://jakarta.ee/specifications/persistence/3.1/apidocs/jakarta.persistence/jakarta/persistence/entity) class
* The [QryPersonRepository](src/main/java/org/fuin/cqrs4j/example/javasecdi/qry/domain/QryPersonRepository.java) class is used for the [Apache DeltaSpike Data Module](https://deltaspike.apache.org/documentation/data.html) entity repository to simplifying the database access. (See [EntityRepository](https://deltaspike.apache.org/javadoc/1.7.2/index.html?org/apache/deltaspike/data/api/EntityRepository.html))

#### Sub package 'handler'
Expand Down
7 changes: 4 additions & 3 deletions java-se-cdi/src/main/resources/META-INF/beans.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<beans xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd" >
<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"
bean-discovery-mode="annotated">


<alternatives>
Expand Down
19 changes: 10 additions & 9 deletions java-se-cdi/src/main/resources/META-INF/persistence.xml
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
<persistence xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
version="2.0" xmlns="http://java.sun.com/xml/ns/persistence">

<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
version="3.0">

<persistence-unit name="QueryDb" transaction-type="RESOURCE_LOCAL">

<class>org.fuin.cqrs4j.example.javasecdi.qry.handler.QryPersonProjectionPosition</class>
<class>org.fuin.cqrs4j.example.javasecdi.qry.domain.QryPerson</class>
<exclude-unlisted-classes>true</exclude-unlisted-classes>

<properties>
<property name="javax.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver" />
<property name="javax.persistence.jdbc.url" value="jdbc:hsqldb:mem:querydb" />
<property name="javax.persistence.jdbc.user" value="sa" />
<property name="javax.persistence.jdbc.password" value="" />
<property name="javax.persistence.schema-generation.database.action" value="drop-and-create" />
<property name="jakarta.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver" />
<property name="jakarta.persistence.jdbc.url" value="jdbc:hsqldb:mem:querydb" />
<property name="jakarta.persistence.jdbc.user" value="sa" />
<property name="jakarta.persistence.jdbc.password" value="" />
<property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create" />

<property name="show_sql" value="true"/>

Expand Down
10 changes: 5 additions & 5 deletions quarkus/shared/src/main/resources/META-INF/beans.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<beans xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd" >
</beans>
<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"
bean-discovery-mode="annotated">
</beans>
7 changes: 4 additions & 3 deletions shared/src/main/resources/META-INF/beans.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<beans xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd" >
<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"
bean-discovery-mode="annotated">

</beans>

0 comments on commit cabef56

Please sign in to comment.