You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2019/04/25 19:48:52 UTC
[tomee] 19/26: Update JNDI
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch tomee-1.7.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 6d007d805369650e28fd1cbb64221d5b89d792a2
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Mon Feb 25 17:04:58 2019 +0000
Update JNDI
---
examples/ejb-remote-call-2/pom.xml | 20 +++++++++++---------
.../src/test/java/org/superbiz/remote/App.java | 2 +-
examples/ejb-remote-call/pom.xml | 20 +++++++++++---------
3 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/examples/ejb-remote-call-2/pom.xml b/examples/ejb-remote-call-2/pom.xml
index 1c31c59..2a7693d 100644
--- a/examples/ejb-remote-call-2/pom.xml
+++ b/examples/ejb-remote-call-2/pom.xml
@@ -25,10 +25,12 @@
<groupId>org.superbiz</groupId>
<artifactId>ejb-remote-call-2</artifactId>
<packaging>war</packaging>
- <version>8.0.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<name>OpenEJB :: Web Examples :: EJB Remote Call</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <tomee.version>1.7.6-SNAPSHOT</tomee.version>
+ <openejb.version>4.7.6-SNAPSHOT</openejb.version>
</properties>
<repositories>
<repository>
@@ -55,14 +57,14 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.tomee.maven</groupId>
+ <groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>8.0.0-SNAPSHOT</version>
+ <version>${tomee.version}</version>
<configuration>
<args>-Xmx512m -XX:PermSize=256m</args>
<config>${project.basedir}/src/test/conf</config>
@@ -72,15 +74,15 @@
</build>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>8.0</version>
+ <version>6.0-6</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
- <version>${project.version}</version>
+ <version>${openejb.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/examples/ejb-remote-call-2/src/test/java/org/superbiz/remote/App.java b/examples/ejb-remote-call-2/src/test/java/org/superbiz/remote/App.java
index 42839ea..e82f217 100644
--- a/examples/ejb-remote-call-2/src/test/java/org/superbiz/remote/App.java
+++ b/examples/ejb-remote-call-2/src/test/java/org/superbiz/remote/App.java
@@ -29,7 +29,7 @@ public class App {
properties.put(Context.PROVIDER_URL, "http://localhost:8080/tomee/ejb");
Context ctx = new InitialContext(properties);
- Object ref = ctx.lookup("global/ejb_remote_call_2_war/Greetings!org.superbiz.remote.Greetings");
+ Object ref = ctx.lookup("global/ejb-remote-call-2-1.1.1-SNAPSHOT/Greetings!org.superbiz.remote.Greetings");
Greetings greetings = Greetings.class.cast(ref);
System.out.println(greetings.hello("Ada"));
diff --git a/examples/ejb-remote-call/pom.xml b/examples/ejb-remote-call/pom.xml
index 60af4ba..7a58e53 100644
--- a/examples/ejb-remote-call/pom.xml
+++ b/examples/ejb-remote-call/pom.xml
@@ -25,10 +25,12 @@
<groupId>org.superbiz</groupId>
<artifactId>ejb-remote-call</artifactId>
<packaging>war</packaging>
- <version>8.0.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
<name>OpenEJB :: Web Examples :: EJB Remote Call</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <tomee.version>1.7.6-SNAPSHOT</tomee.version>
+ <openejb.version>4.7.6-SNAPSHOT</openejb.version>
</properties>
<repositories>
<repository>
@@ -55,14 +57,14 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.tomee.maven</groupId>
+ <groupId>org.apache.openejb.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>8.0.0-SNAPSHOT</version>
+ <version>${tomee.version}</version>
<configuration>
<args>-Xmx512m -XX:PermSize=256m</args>
<config>${project.basedir}/src/test/conf</config>
@@ -72,15 +74,15 @@
</build>
<dependencies>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>8.0</version>
+ <version>6.0-6</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.tomee</groupId>
+ <groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
- <version>${project.version}</version>
+ <version>${openejb.version}</version>
<scope>test</scope>
</dependency>
<dependency>