This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
The following commit(s) were added to refs/heads/main by this push:
new 9215fc24d OWB-1446 move more samples from tomcat7 to cargo with
tomcat10
9215fc24d is described below
commit 9215fc24d41baceb556d9df5714cedabf1196591
Author: Mark Struberg <[email protected]>
AuthorDate: Tue Dec 10 15:48:51 2024 +0100
OWB-1446 move more samples from tomcat7 to cargo with tomcat10
---
samples/conversation-sample/pom.xml | 6 +++---
samples/guess/pom.xml | 3 ++-
samples/jsf2sample/pom.xml | 23 ++++++++--------------
samples/pom.xml | 8 ++++----
samples/reservation/pom.xml | 23 +++++++++++-----------
samples/standalone-sample/pom.xml | 5 +++++
samples/{tomcat7-sample => tomcat-sample}/LICENSE | 0
samples/{tomcat7-sample => tomcat-sample}/NOTICE | 0
samples/{tomcat7-sample => tomcat-sample}/pom.xml | 8 ++++----
.../samples/tomcat/CurrentDateProvider.java | 0
.../webbeans/samples/tomcat/InjectorServlet.java | 0
.../apache/webbeans/samples/tomcat/MyFilter.java | 0
.../samples/tomcat/SampleContextObserver.java | 0
.../src/main/resources/META-INF/beans.xml | 0
.../src/main/tomcat/context.xml | 0
.../src/main/tomcat/tomcat-users.xml | 0
.../src/main/webapp/META-INF/MANIFEST.MF | 0
.../src/main/webapp/WEB-INF/beans.xml | 0
.../src/main/webapp/WEB-INF/web.xml | 0
.../src/main/webapp/index.jsp | 0
20 files changed, 37 insertions(+), 39 deletions(-)
diff --git a/samples/conversation-sample/pom.xml
b/samples/conversation-sample/pom.xml
index 2bca3291b..6311e9a20 100644
--- a/samples/conversation-sample/pom.xml
+++ b/samples/conversation-sample/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<artifactId>samples</artifactId>
<groupId>org.apache.openwebbeans</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -119,8 +119,8 @@ under the License.
<finalName>conversation-sample</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>
diff --git a/samples/guess/pom.xml b/samples/guess/pom.xml
index 4503d9c82..b3035345e 100644
--- a/samples/guess/pom.xml
+++ b/samples/guess/pom.xml
@@ -18,6 +18,8 @@ specific language governing permissions and 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/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>samples</artifactId>
@@ -25,7 +27,6 @@ under the License.
<relativePath>../pom.xml</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.openwebbeans.samples</groupId>
<artifactId>guess</artifactId>
<packaging>war</packaging>
diff --git a/samples/jsf2sample/pom.xml b/samples/jsf2sample/pom.xml
index 1140707c5..47c0f55e6 100644
--- a/samples/jsf2sample/pom.xml
+++ b/samples/jsf2sample/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<artifactId>samples</artifactId>
<groupId>org.apache.openwebbeans</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -43,12 +43,6 @@ under the License.
<artifactId>openwebbeans-impl</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-resource</artifactId>
- <version>${project.version}</version>
- </dependency>
<!-- Interceptor API -->
<dependency>
@@ -108,22 +102,21 @@ under the License.
<artifactId>openwebbeans-spi</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<!-- JSTL -->
<dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
- </dependency>
-
+ <groupId>jakarta.servlet.jsp.jstl</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+ <version>3.0.2</version>
+ </dependency>
</dependencies>
<build>
<finalName>jsf2sample</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>
diff --git a/samples/pom.xml b/samples/pom.xml
index 0d564eaaa..ee0e991a2 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -139,12 +139,12 @@ under the License.
<modules>
<module>standalone-sample</module>
<module>guess</module>
-<!--
<module>conversation-sample</module>
<module>jsf2sample</module>
- <module>reservation</module>
- <module>tomcat7-sample</module>
--->
+ <!--
+ <module>reservation</module>
+ <module>tomcat7-sample</module>
+ -->
</modules>
<profiles>
diff --git a/samples/reservation/pom.xml b/samples/reservation/pom.xml
index 35c5aa0ab..100c4fb1e 100644
--- a/samples/reservation/pom.xml
+++ b/samples/reservation/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>
@@ -58,9 +58,9 @@ under the License.
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jstl</artifactId>
- <version>1.2</version>
+ <groupId>jakarta.servlet.jsp.jstl</groupId>
+ <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+ <version>3.0.2</version>
</dependency>
<!-- CDI and atinject APIs -->
@@ -83,14 +83,13 @@ under the License.
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_2.2_spec</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-api</artifactId>
+ <version>${tomcat.version}</version>
</dependency>
<!-- OWB Impl -->
@@ -197,8 +196,8 @@ under the License.
</plugin>
<plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven3-plugin</artifactId>
</plugin>
</plugins>
diff --git a/samples/standalone-sample/pom.xml
b/samples/standalone-sample/pom.xml
index 9f7068836..542e3fa62 100644
--- a/samples/standalone-sample/pom.xml
+++ b/samples/standalone-sample/pom.xml
@@ -35,6 +35,11 @@ under the License.
<deploy.skip>true</deploy.skip>
</properties>
+ <description>
+ A standalone sample for showcasing the use of Apache OpenWebBeans in a
Swing application.
+ Start the application with the main method in
org.apache.webbeans.se.sample.Boot.class
+ </description>
+
<dependencies>
<dependency>
diff --git a/samples/tomcat7-sample/LICENSE b/samples/tomcat-sample/LICENSE
similarity index 100%
rename from samples/tomcat7-sample/LICENSE
rename to samples/tomcat-sample/LICENSE
diff --git a/samples/tomcat7-sample/NOTICE b/samples/tomcat-sample/NOTICE
similarity index 100%
rename from samples/tomcat7-sample/NOTICE
rename to samples/tomcat-sample/NOTICE
diff --git a/samples/tomcat7-sample/pom.xml b/samples/tomcat-sample/pom.xml
similarity index 98%
rename from samples/tomcat7-sample/pom.xml
rename to samples/tomcat-sample/pom.xml
index ae8f94ef6..9a4770347 100644
--- a/samples/tomcat7-sample/pom.xml
+++ b/samples/tomcat-sample/pom.xml
@@ -18,18 +18,18 @@ 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/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <description>Sample Tomcat7 Application</description>
+ <description>Sample Tomcat Application</description>
<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>
<groupId>org.apache.openwebbeans.samples</groupId>
- <artifactId>tomcat7-sample</artifactId>
+ <artifactId>tomcat-sample</artifactId>
<packaging>war</packaging>
- <name>Tomcat 7 Sample</name>
+ <name>Tomcat Sample</name>
<!--
How to start the sample.
diff --git
a/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/CurrentDateProvider.java
b/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/CurrentDateProvider.java
similarity index 100%
rename from
samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/CurrentDateProvider.java
rename to
samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/CurrentDateProvider.java
diff --git
a/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java
b/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java
similarity index 100%
rename from
samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java
rename to
samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/InjectorServlet.java
diff --git
a/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java
b/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java
similarity index 100%
rename from
samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java
rename to
samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/MyFilter.java
diff --git
a/samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/SampleContextObserver.java
b/samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/SampleContextObserver.java
similarity index 100%
rename from
samples/tomcat7-sample/src/main/java/org/apache/webbeans/samples/tomcat/SampleContextObserver.java
rename to
samples/tomcat-sample/src/main/java/org/apache/webbeans/samples/tomcat/SampleContextObserver.java
diff --git a/samples/tomcat7-sample/src/main/resources/META-INF/beans.xml
b/samples/tomcat-sample/src/main/resources/META-INF/beans.xml
similarity index 100%
rename from samples/tomcat7-sample/src/main/resources/META-INF/beans.xml
rename to samples/tomcat-sample/src/main/resources/META-INF/beans.xml
diff --git a/samples/tomcat7-sample/src/main/tomcat/context.xml
b/samples/tomcat-sample/src/main/tomcat/context.xml
similarity index 100%
rename from samples/tomcat7-sample/src/main/tomcat/context.xml
rename to samples/tomcat-sample/src/main/tomcat/context.xml
diff --git a/samples/tomcat7-sample/src/main/tomcat/tomcat-users.xml
b/samples/tomcat-sample/src/main/tomcat/tomcat-users.xml
similarity index 100%
rename from samples/tomcat7-sample/src/main/tomcat/tomcat-users.xml
rename to samples/tomcat-sample/src/main/tomcat/tomcat-users.xml
diff --git a/samples/tomcat7-sample/src/main/webapp/META-INF/MANIFEST.MF
b/samples/tomcat-sample/src/main/webapp/META-INF/MANIFEST.MF
similarity index 100%
rename from samples/tomcat7-sample/src/main/webapp/META-INF/MANIFEST.MF
rename to samples/tomcat-sample/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/samples/tomcat7-sample/src/main/webapp/WEB-INF/beans.xml
b/samples/tomcat-sample/src/main/webapp/WEB-INF/beans.xml
similarity index 100%
rename from samples/tomcat7-sample/src/main/webapp/WEB-INF/beans.xml
rename to samples/tomcat-sample/src/main/webapp/WEB-INF/beans.xml
diff --git a/samples/tomcat7-sample/src/main/webapp/WEB-INF/web.xml
b/samples/tomcat-sample/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from samples/tomcat7-sample/src/main/webapp/WEB-INF/web.xml
rename to samples/tomcat-sample/src/main/webapp/WEB-INF/web.xml
diff --git a/samples/tomcat7-sample/src/main/webapp/index.jsp
b/samples/tomcat-sample/src/main/webapp/index.jsp
similarity index 100%
rename from samples/tomcat7-sample/src/main/webapp/index.jsp
rename to samples/tomcat-sample/src/main/webapp/index.jsp
