You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2020/08/19 01:56:59 UTC
[cxf] branch master updated: Update samples to be buildable under
all supported JDKs (8+)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 113e426 Update samples to be buildable under all supported JDKs (8+)
113e426 is described below
commit 113e426f6b717925736433fe04a1b72f801dd574
Author: reta <dr...@gmail.com>
AuthorDate: Tue Aug 18 21:56:25 2020 -0400
Update samples to be buildable under all supported JDKs (8+)
---
.../src/main/java/corba/server/BankImpl.java | 29 ++++++++++++++--------
.../main/release/samples/corba/hello_world/pom.xml | 3 +--
distribution/src/main/release/samples/pom.xml | 9 ++++---
3 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/BankImpl.java b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/BankImpl.java
index 811a285..4866e96 100644
--- a/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/BankImpl.java
+++ b/distribution/src/main/release/samples/corba/bank_ws_addressing/src/main/java/corba/server/BankImpl.java
@@ -22,6 +22,7 @@ package corba.server;
import java.util.HashMap;
import java.util.Map;
+import org.omg.CORBA.portable.UnknownException;
import org.omg.PortableServer.POA;
import corba.common.Account;
@@ -57,11 +58,15 @@ public class BankImpl extends BankPOA {
//Ignore
}
- org.omg.CORBA.Object obj = poa_.create_reference_with_id(oid, AccountHelper.id());
- Account account = AccountHelper.narrow(obj);
-
- accountList.put(accountName, account);
- return account;
+ try {
+ org.omg.CORBA.Object obj = poa_.create_reference_with_id(oid, AccountHelper.id());
+ Account account = AccountHelper.narrow(obj);
+
+ accountList.put(accountName, account);
+ return account;
+ } catch (final Throwable ex) {
+ throw new UnknownException(ex);
+ }
}
public org.omg.CORBA.Object create_epr_account(String accountName) {
@@ -80,11 +85,15 @@ public class BankImpl extends BankPOA {
//Ignore
}
- org.omg.CORBA.Object obj = poa_.create_reference_with_id(oid, AccountHelper.id());
- Account account = AccountHelper.narrow(obj);
-
- accountList.put(accountName, account);
- return account;
+ try {
+ org.omg.CORBA.Object obj = poa_.create_reference_with_id(oid, AccountHelper.id());
+ Account account = AccountHelper.narrow(obj);
+
+ accountList.put(accountName, account);
+ return account;
+ } catch (final Throwable ex) {
+ throw new UnknownException(ex);
+ }
}
public Account get_account(String accountName) {
diff --git a/distribution/src/main/release/samples/corba/hello_world/pom.xml b/distribution/src/main/release/samples/corba/hello_world/pom.xml
index 8b24b92..409cf6b 100644
--- a/distribution/src/main/release/samples/corba/hello_world/pom.xml
+++ b/distribution/src/main/release/samples/corba/hello_world/pom.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -144,7 +143,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>idlj-maven-plugin</artifactId>
- <version>1.2.1</version>
+ <version>1.2.2</version>
<executions>
<execution>
<id>generate-sources-from-idl</id>
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 07c1d84..9c1da9e 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -197,7 +197,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>4.2.1</version>
+ <version>5.1.1</version>
</plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
@@ -255,7 +255,6 @@
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
- <version>1.3.5</version>
</dependency>
<dependency>
<groupId>jakarta.xml.ws</groupId>
@@ -281,7 +280,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
@@ -291,6 +289,11 @@
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-xjc</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.corba</groupId>
+ <artifactId>glassfish-corba-orb</artifactId>
+ <version>4.2.2</version>
+ </dependency>
</dependencies>
</profile>
</profiles>