Skip to content

Feature/package structure #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Feature/package structure #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f111f08
Branch 4.0.x re-added from old repo
bert-laverman Mar 18, 2019
fee9bb4
Removed the Abstract base classes from persistence.xml in the JEE exa…
Apr 16, 2019
051dd43
Update to version 4.1.1 of the Axon Framework
Jul 3, 2019
de3c316
Updated AxonFramework version to 4.1.2
abuijze Jul 11, 2019
6fc0176
[maven-release-plugin] prepare release axon-cdi-4.1-alpha1
abuijze Jul 11, 2019
c65e1de
[maven-release-plugin] prepare for next development iteration
abuijze Jul 11, 2019
a17f8f3
also pickup ResourceInjector producer during 'autoconfig'
koenverwimp Jul 19, 2019
be6dbe1
Merge pull request #2 from koenverwimp/pickup-resource-injector
Jul 25, 2019
735950f
Merge remote-tracking branch 'origin/axon-cdi-4.1.x' into axon-cdi-4.1.x
abuijze Aug 16, 2019
a174ce7
Created a new branch for Axon 4.2.x
Aug 20, 2019
d435de7
Reworked the package structure to conform to the current Axon extensi…
Sep 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ buildNumber.properties

# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
!/.mvn/wrapper/maven-wrapper.jar

# IntelliJ stuff
.idea/
*.iml
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ You can provide configuration overrides for the following Axon artifacts by crea
For more details on these objects and the Axon Framework, please consult the [Axon Framework Reference Guide](https://docs.axonframework.org).

### Aggregates
You can define aggregate roots by placing a simple annotation `org.axonframework.cdi.stereotype.Aggregate` on your class. It will be automatically collected by the CDI container and registered.
You can define aggregate roots by placing a simple annotation `org.axonframework.extensions.cdi.stereotype.Aggregate` on your class. It will be automatically collected by the CDI container and registered.

### Event Handlers and Query Handlers
Event handlers and query handlers must be CDI beans. They will be automatically registered with Axon for you.
Expand Down
92 changes: 16 additions & 76 deletions cdi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
~ limitations under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>axon-cdi-parent</artifactId>
Expand All @@ -27,84 +25,46 @@

<artifactId>axon-cdi</artifactId>

<name>Axon Framework CDI Extension</name>
<description>
This module contains components that integrate with CDI.
</description>

<packaging>jar</packaging>
<name>Axon Framework CDI Support</name>
<description>Provides official Axon support for the CDI programming model.</description>

<properties>
<logback.version>1.1.11</logback.version>
<deltaspike.version>1.8.2</deltaspike.version>
</properties>

<dependencies>

<dependency>
<groupId>org.axonframework</groupId>
<artifactId>axon-configuration</artifactId>
<version>${axon.version}</version>
</dependency>

<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
<groupId>org.axonframework</groupId>
<artifactId>axon-test</artifactId>
<scope>test</scope>
</dependency>

<!-- We use Apache DeltaSpike -->
<dependency>
<groupId>org.apache.deltaspike.core</groupId>
<artifactId>deltaspike-core-api</artifactId>
<version>${deltaspike.version}</version>
</dependency>
<dependency>
<groupId>org.apache.deltaspike.core</groupId>
<artifactId>deltaspike-core-impl</artifactId>
<version>${deltaspike.version}</version>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<scope>provided</scope>
</dependency>

<!-- Logging dependencies -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jul-to-slf4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
<artifactId>slf4j-api</artifactId>
</dependency>

<!-- Test -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

<!-- Test dependencies -->

<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se-core</artifactId>
Expand All @@ -115,26 +75,6 @@
<artifactId>weld-junit4</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.3.2</version>
<scope>test</scope>
</dependency>

</dependencies>

</project>
</project>
1 change: 0 additions & 1 deletion cdi/src/main/java/org/axonframework/extensions/cdi/AggregateDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.axonframework.extensions.cdi;

import org.axonframework.extensions.cdi.stereotype.Aggregate;
import org.axonframework.extensions.cdi.util.StringUtilities;

import java.lang.annotation.Annotation;
import java.util.Arrays;
Expand Down
Loading