This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
The following commit(s) were added to refs/heads/master by this push:
new d531bd9bc OWB-1446 move guess sample to cargo-m-p
d531bd9bc is described below
commit d531bd9bcfa6e072ba381dd364c535a7a02dc3d5
Author: Mark Struberg <[email protected]>
AuthorDate: Wed Oct 16 13:01:37 2024 +0200
OWB-1446 move guess sample to cargo-m-p
---
samples/guess/pom.xml | 23 ++++++++++++-----------
samples/pom.xml | 47 +++++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 57 insertions(+), 13 deletions(-)
diff --git a/samples/guess/pom.xml b/samples/guess/pom.xml
index df9992bc0..4503d9c82 100644
--- a/samples/guess/pom.xml
+++ b/samples/guess/pom.xml
@@ -21,7 +21,7 @@ under the License.
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>samples</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -29,6 +29,7 @@ under the License.
<groupId>org.apache.openwebbeans.samples</groupId>
<artifactId>guess</artifactId>
<packaging>war</packaging>
+
<name>Sample Guess Application</name>
<description>Simple login application</description>
@@ -40,8 +41,8 @@ under the License.
<finalName>guess</finalName>
<plugins>
<plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven3-plugin</artifactId>
</plugin>
</plugins>
</build>
@@ -57,8 +58,8 @@ under the License.
<!-- Servlet API -->
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-servlet-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -82,18 +83,18 @@ under the License.
<version>${project.version}</version>
</dependency>
- <!-- JSR-299 API -->
- <dependency>
- <groupId>jakarta.enterprise</groupId>
- <artifactId>jakarta.enterprise.cdi-api</artifactId>
- </dependency>
-
<!-- JSR-330 API -->
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</dependency>
+ <!-- JSR-299 API -->
+ <dependency>
+ <groupId>jakarta.enterprise</groupId>
+ <artifactId>jakarta.enterprise.cdi-api</artifactId>
+ </dependency>
+
<!-- JSR-250 API -->
<dependency>
<groupId>jakarta.annotation</groupId>
diff --git a/samples/pom.xml b/samples/pom.xml
index 50ca87752..0d564eaaa 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -31,8 +31,19 @@ under the License.
<name>OWB Samples</name>
<description>Apache OpenWebBeans Samples contains samples project for
openwebbeans.</description>
+ <!--
+ Start the samples with
+ $> mvn cargo:run
+
+ To debug an application please activate the 'cargoDebug' profile and
attach to port 8000
+
+ $> mvn cargo:run -PcargoDebug
+ -->
+
<properties>
<deploy.skip>false</deploy.skip>
+ <tomcat.port>8080</tomcat.port>
+ <cargo.debug.args></cargo.debug.args>
</properties>
<build>
@@ -42,10 +53,31 @@ under the License.
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven3-plugin</artifactId>
<configuration>
+ <container>
+ <containerId>tomcat10x</containerId>
+ <artifactInstaller>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat</artifactId>
+ <version>${tomcat.version}</version>
+ </artifactInstaller>
+ </container>
+ <deployables>
+ <deployable>
+ <type>war</type>
+
<location>${project.build.directory}/${project.build.finalName}.war</location>
+ <properties>
+
<context>/${project.build.finalName}</context>
+ </properties>
+ </deployable>
+ </deployables>
<configuration>
-
+ <properties>
+
<cargo.servlet.port>${tomcat.port}</cargo.servlet.port>
+
<cargo.start.jvmargs>${cargo.debug.args}</cargo.start.jvmargs>
+ </properties>
</configuration>
</configuration>
+
</plugin>
</plugins>
</pluginManagement>
@@ -106,12 +138,23 @@ under the License.
</build>
<modules>
<module>standalone-sample</module>
-<!--
<module>guess</module>
+<!--
<module>conversation-sample</module>
<module>jsf2sample</module>
<module>reservation</module>
<module>tomcat7-sample</module>
-->
</modules>
+
+ <profiles>
+ <profile>
+ <id>cargoDebug</id>
+ <properties>
+ <cargo.debug.args>
+ -Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000 -Xnoagent
+ </cargo.debug.args>
+ </properties>
+ </profile>
+ </profiles>
</project>
