Skip to content

Commit c72184c

Browse files
author
Tomáš Kraus
committed
Directory structure refactoring.
Signed-off-by: Tomáš Kraus <[email protected]>
1 parent eb68eb8 commit c72184c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+270
-310
lines changed

‎examples/data/se-imperative/README.md‎ renamed to ‎examples/data/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ mvn package
5151
2. Run the application:
5252

5353
```shell
54-
java -jar target/helidon-examples-data-se-imperative.jar
54+
java -jar target/helidon-examples-data.jar
5555
```
5656

5757
> **NOTE:** The default username and password from this example should never be used in a production environment!

‎examples/data/pom.xml‎

Lines changed: 97 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3+
34
Copyright (c) 2025 Oracle and/or its affiliates.
45
56
Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,30 +14,110 @@
1314
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1415
See the License for the specific language governing permissions and
1516
limitations under the License.
16-
-->
1717
18-
<project xmlns="http://maven.apache.org/POM/4.0.0"
19-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18+
-->
19+
20+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2021
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
2122
<modelVersion>4.0.0</modelVersion>
2223
<parent>
23-
<groupId>io.helidon.examples</groupId>
24-
<artifactId>helidon-examples-project</artifactId>
25-
<version>1.0.0-SNAPSHOT</version>
24+
<groupId>io.helidon.applications</groupId>
25+
<artifactId>helidon-se</artifactId>
26+
<version>4.3.0-SNAPSHOT</version>
27+
<relativePath/>
2628
</parent>
2729

28-
<groupId>io.helidon.examples.data</groupId>
29-
<artifactId>helidon-examples-data-project</artifactId>
30+
<groupId>io.helidon.examples</groupId>
31+
<artifactId>helidon-examples-data</artifactId>
3032
<version>1.0.0-SNAPSHOT</version>
31-
<name>Helidon Examples Data Repository</name>
33+
<name>Helidon Examples Data</name>
34+
3235
<description>
33-
Examples of Helidon Data Repository
36+
The example shows how to use Helidon Data in SE Imperative application.
3437
</description>
35-
<packaging>pom</packaging>
3638

37-
<modules>
38-
<module>se-declarative</module>
39-
<module>se-imperative</module>
40-
<module>mp</module>
41-
</modules>
39+
<properties>
40+
<mainClass>io.helidon.examples.data.Main</mainClass>
41+
</properties>
42+
43+
<dependencies>
44+
<dependency>
45+
<groupId>io.helidon.config</groupId>
46+
<artifactId>helidon-config-yaml</artifactId>
47+
</dependency>
48+
<dependency>
49+
<groupId>io.helidon.data</groupId>
50+
<artifactId>helidon-data</artifactId>
51+
</dependency>
52+
<dependency>
53+
<groupId>io.helidon.data.jakarta.persistence</groupId>
54+
<artifactId>helidon-data-jakarta-persistence</artifactId>
55+
</dependency>
56+
<dependency>
57+
<groupId>io.helidon.webserver</groupId>
58+
<artifactId>helidon-webserver</artifactId>
59+
</dependency>
60+
<dependency>
61+
<groupId>io.helidon.http.media</groupId>
62+
<artifactId>helidon-http-media-jsonb</artifactId>
63+
<scope>runtime</scope>
64+
</dependency>
65+
<dependency>
66+
<groupId>io.helidon.logging</groupId>
67+
<artifactId>helidon-logging-jul</artifactId>
68+
<scope>runtime</scope>
69+
</dependency>
70+
<dependency>
71+
<groupId>jakarta.persistence</groupId>
72+
<artifactId>jakarta.persistence-api</artifactId>
73+
</dependency>
74+
<dependency>
75+
<groupId>org.eclipse.persistence</groupId>
76+
<artifactId>org.eclipse.persistence.jpa</artifactId>
77+
<scope>runtime</scope>
78+
</dependency>
79+
<dependency>
80+
<groupId>org.eclipse.persistence</groupId>
81+
<artifactId>org.eclipse.persistence.core</artifactId>
82+
<scope>runtime</scope>
83+
</dependency>
84+
<dependency>
85+
<groupId>com.mysql</groupId>
86+
<artifactId>mysql-connector-j</artifactId>
87+
<scope>runtime</scope>
88+
</dependency>
89+
</dependencies>
90+
91+
<build>
92+
<plugins>
93+
<plugin>
94+
<groupId>org.apache.maven.plugins</groupId>
95+
<artifactId>maven-compiler-plugin</artifactId>
96+
<configuration>
97+
<annotationProcessorPaths>
98+
<path>
99+
<groupId>io.helidon.bundles</groupId>
100+
<artifactId>helidon-bundles-apt</artifactId>
101+
<version>${helidon.version}</version>
102+
</path>
103+
<path>
104+
<groupId>io.helidon.data.jakarta.persistence</groupId>
105+
<artifactId>helidon-data-jakarta-persistence-codegen</artifactId>
106+
<version>${helidon.version}</version>
107+
</path>
108+
</annotationProcessorPaths>
109+
</configuration>
110+
</plugin>
111+
<plugin>
112+
<groupId>org.apache.maven.plugins</groupId>
113+
<artifactId>maven-dependency-plugin</artifactId>
114+
<executions>
115+
<execution>
116+
<id>copy-libs</id>
117+
</execution>
118+
</executions>
119+
</plugin>
120+
</plugins>
121+
</build>
122+
42123
</project>

‎examples/data/se-imperative/pom.xml‎

Lines changed: 0 additions & 123 deletions
This file was deleted.

‎examples/data/se-imperative/src/main/java/io/helidon/examples/data/se/imperative/Main.java‎ renamed to ‎examples/data/src/main/java/io/helidon/examples/data/Main.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.helidon.examples.data.se.imperative;
16+
package io.helidon.examples.data;
1717

18-
import io.helidon.examples.data.se.imperative.service.BreedService;
19-
import io.helidon.examples.data.se.imperative.service.OwnerService;
20-
import io.helidon.examples.data.se.imperative.service.PetService;
18+
import io.helidon.examples.data.service.BreedService;
19+
import io.helidon.examples.data.service.OwnerService;
20+
import io.helidon.examples.data.service.PetService;
2121
import io.helidon.logging.common.LogConfig;
2222
import io.helidon.webserver.WebServer;
2323
import io.helidon.webserver.http.HttpRouting;

‎examples/data/mp/src/main/java/io/helidon/examples/data/mp/model/Breed.java‎ renamed to ‎examples/data/src/main/java/io/helidon/examples/data/model/Breed.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.helidon.examples.data.mp.model;
16+
package io.helidon.examples.data.model;
1717

1818
import jakarta.persistence.Column;
1919
import jakarta.persistence.Entity;

‎examples/data/mp/src/main/java/io/helidon/examples/data/mp/model/Owner.java‎ renamed to ‎examples/data/src/main/java/io/helidon/examples/data/model/Owner.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.helidon.examples.data.mp.model;
16+
package io.helidon.examples.data.model;
1717

1818
import jakarta.persistence.Column;
1919
import jakarta.persistence.Entity;

‎examples/data/mp/src/main/java/io/helidon/examples/data/mp/model/Pet.java‎ renamed to ‎examples/data/src/main/java/io/helidon/examples/data/model/Pet.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.helidon.examples.data.mp.model;
16+
package io.helidon.examples.data.model;
1717

1818
import java.time.LocalDate;
1919

‎examples/data/se-imperative/src/main/java/io/helidon/examples/data/se/imperative/model/package-info.java‎ renamed to ‎examples/data/src/main/java/io/helidon/examples/data/model/package-info.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
* <p>
2222
* The entity models provided include:
2323
* <ul>
24-
* <li>{@link io.helidon.examples.data.se.imperative.model.Pet} for representing pet data</li>
25-
* <li>{@link io.helidon.examples.data.se.imperative.model.Owner} for representing owner data</li>
26-
* <li>{@link io.helidon.examples.data.se.imperative.model.Breed} for representing breed data</li>
24+
* <li>{@link io.helidon.examples.data.model.Pet} for representing pet data</li>
25+
* <li>{@link io.helidon.examples.data.model.Owner} for representing owner data</li>
26+
* <li>{@link io.helidon.examples.data.model.Breed} for representing breed data</li>
2727
* </ul>
2828
*
29-
* @see io.helidon.examples.data.se.imperative.repository
30-
* @see io.helidon.examples.data.se.imperative.service
29+
* @see io.helidon.examples.data.repository
30+
* @see io.helidon.examples.data.service
3131
*/
32-
package io.helidon.examples.data.se.imperative.model;
32+
package io.helidon.examples.data.model;

‎examples/data/se-imperative/src/main/java/io/helidon/examples/data/se/imperative/package-info.java‎ renamed to ‎examples/data/src/main/java/io/helidon/examples/data/package-info.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
* <p>
2121
* The application provides REST services for managing pet, owner, and breed data.
2222
* <p>
23-
* The main entry point for the application is the {@link io.helidon.examples.data.se.imperative.Main} class.
23+
* The main entry point for the application is the {@link io.helidon.examples.data.Main} class.
2424
*
25-
* @see io.helidon.examples.data.se.imperative.Main
26-
* @see io.helidon.examples.data.se.imperative.service
25+
* @see io.helidon.examples.data.Main
26+
* @see io.helidon.examples.data.service
2727
*/
28-
package io.helidon.examples.data.se.imperative;
28+
package io.helidon.examples.data;

‎examples/data/mp/src/main/java/io/helidon/examples/data/mp/repository/BreedRepository.java‎ renamed to ‎examples/data/src/main/java/io/helidon/examples/data/repository/BreedRepository.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.helidon.examples.data.mp.repository;
16+
package io.helidon.examples.data.repository;
1717

1818
import java.util.List;
1919

2020
import io.helidon.data.Data;
21-
import io.helidon.examples.data.mp.model.Breed;
21+
import io.helidon.examples.data.model.Breed;
2222

2323
/**
2424
* {@link Breed} entity data repository interface.

0 commit comments

Comments
 (0)