Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Abandoning JDK8 support #198

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Abandoning JDK8 support #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
565d3a8
Replaced deprecated methods and calls
dmatej Aug 17, 2024
b6b5649
Fixed Felix configuration
dmatej Aug 21, 2024
b2bf1fa
Removed redundant PFL version usages
dmatej Aug 21, 2024
634dc30
Removed JDK8 profiles
dmatej Aug 21, 2024
a545f6a
Upgrade to latest ORB dependencies
dmatej Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions csiv2-idl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Export-Package>com.sun.corba.ee.org.omg.*</Export-Package>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
1 change: 0 additions & 1 deletion exception-annotation-processor/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
<dependency>
<groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-basic</artifactId>
<version>${pfl-version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
38 changes: 1 addition & 37 deletions functional-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
<dependency>
<groupId>org.glassfish.external</groupId>
<artifactId>management-api</artifactId>
<version>3.2.3</version>
<version>3.3.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -237,42 +237,6 @@
</build>

<profiles>
<!-- add tools.jar to path when on Linux or Windows -->
<profile>
<id>tools.jar</id>
<activation>
<file>
<exists>${java.home}/../lib/tools.jar</exists>
</file>
</activation>
<dependencies>
<dependency>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
<version>1.6.0</version>
<scope>system</scope>
<systemPath>${java.home}/../lib/tools.jar</systemPath>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<dependencies>
<dependency>
<groupId>com.sun</groupId>
<artifactId>tools</artifactId>
<version>1.6.0</version>
<scope>system</scope>
<systemPath>${java.home}/../lib/tools.jar</systemPath>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>all-tests</id>
<build>
Expand Down
3 changes: 2 additions & 1 deletion functional-tests/src/test/idl/corba/poapolicies/Hello.idl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2024 Contributors to the Eclipse Foundation.
* Copyright (c) 1997, 2020 Oracle and/or its affiliates.
*
* This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -37,7 +38,7 @@ module Util {
// invocation path more extensively (example, ones that
// throw exceptions etc)

interface Factory {
interface ServantFactory {
Object create(in string intfName, in string implName, in CreationMethods how);
void overAndOut();
};
Expand Down
5 changes: 3 additions & 2 deletions functional-tests/src/test/java/corba/poapolicies/BasicObjectFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2024 Contributors to the Eclipse Foundation.
* Copyright (c) 1997, 2020 Oracle and/or its affiliates.
*
* This program and the accompanying materials are made available under the
Expand All @@ -20,11 +21,11 @@
package corba.poapolicies;

import Util.CreationMethods;
import Util.FactoryPOA;
import Util.ServantFactoryPOA;
import org.omg.PortableServer.POA;
import org.omg.PortableServer.Servant;

public class BasicObjectFactoryImpl extends FactoryPOA
public class BasicObjectFactoryImpl extends ServantFactoryPOA
{
final boolean useServantToReference = true;

Expand Down
7 changes: 4 additions & 3 deletions functional-tests/src/test/java/corba/poapolicies/HelloClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2024 Contributors to the Eclipse Foundation.
* Copyright (c) 1997, 2020 Oracle and/or its affiliates.
*
* This program and the accompanying materials are made available under the
Expand All @@ -22,10 +23,10 @@
import HelloStuff.Hello;
import HelloStuff.HelloHelper;
import Util.CreationMethods;
import Util.Factory;
import Util.ServantFactory;

public class HelloClient {
public static Hello createHello(CreationMethods c, Factory f) {
public static Hello createHello(CreationMethods c, ServantFactory f) {
System.out.println("createHello");
String id = HelloHelper.id();
System.out.println("id: " + id);
Expand Down Expand Up @@ -60,7 +61,7 @@ public static void main(String[] args) {
System.out.println("Client starting");

Utility u = new Utility(args);
Factory f = u.readFactory();
ServantFactory f = u.readFactory();

System.out.println("readFactory");

Expand Down
5 changes: 3 additions & 2 deletions functional-tests/src/test/java/corba/poapolicies/HelloServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2024 Contributors to the Eclipse Foundation.
* Copyright (c) 1997, 2020 Oracle and/or its affiliates.
*
* This program and the accompanying materials are made available under the
Expand All @@ -19,7 +20,7 @@

package corba.poapolicies;

import Util.FactoryHelper;
import Util.ServantFactoryHelper;
import org.omg.PortableServer.POA;

class Waiter extends Thread {
Expand Down Expand Up @@ -82,7 +83,7 @@ public static void main(String[] args) {

byte[] id = thePOA.activate_object(theFactory);

u.writeFactory(FactoryHelper.narrow(thePOA.servant_to_reference(theFactory)));
u.writeFactory(ServantFactoryHelper.narrow(thePOA.servant_to_reference(theFactory)));

thePOA.the_POAManager().activate();

Expand Down
9 changes: 5 additions & 4 deletions functional-tests/src/test/java/corba/poapolicies/Utility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2024 Contributors to the Eclipse Foundation.
* Copyright (c) 1997, 2020 Oracle and/or its affiliates.
*
* This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -76,12 +77,12 @@ public org.omg.CORBA.Object readObjref(String file) {
return null;
}

public void writeFactory(Util.Factory ref) {
writeObjref(ref, "Factory");
public void writeFactory(Util.ServantFactory ref) {
writeObjref(ref, "ServantFactory");
}

public Util.Factory readFactory() {
return Util.FactoryHelper.narrow(readObjref("Factory"));
public Util.ServantFactory readFactory() {
return Util.ServantFactoryHelper.narrow(readObjref("ServantFactory"));
}
}

5 changes: 3 additions & 2 deletions internal-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
<dependency>
<groupId>org.glassfish.pfl</groupId>
<artifactId>pfl-basic</artifactId>
<version>${pfl-version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -58,7 +57,9 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Export-Package>com.sun.corba.ee.spi.threadpool;version=1, com.sun.corba.ee.impl.threadpool;version=1, com.sun.corba.ee.spi.logex.stdcorba;version=1</Export-Package>
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
<!-- ThreadPoolImpl is used by glassfish-corba-orb -->
<Export-Package>*</Export-Package>
</instructions>
</configuration>
</plugin>
Expand Down
7 changes: 0 additions & 7 deletions omgapi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
<Export-Package>org.omg.*; version=1, com.sun.*;version=1, javax.rmi;version=1, javax.rmi.CORBA;version=1</Export-Package>
<Import-Package>!org.omg.PortableServer.ServantLocatorPackage</Import-Package>
<Fragment-Host>system.bundle; extension:=framework</Fragment-Host>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
Expand Down
35 changes: 18 additions & 17 deletions orbmain/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,27 +105,25 @@
<configuration>
<instructions>
<Export-Package>
!com.sun.corba.ee.spi.threadpool, !com.sun.corba.ee.spi.logex.stdcorba,
com.sun.corba.ee.spi.*; version=1,
com.sun.corba.ee.impl.corba; version=1,
com.sun.corba.ee.impl.encoding.*; version=1,
com.sun.corba.ee.impl.folb; version=1,
com.sun.corba.ee.impl.javax.*; version=1,
com.sun.corba.ee.impl.misc; version=1,
com.sun.corba.ee.impl.naming.*; version=1,
com.sun.corba.ee.impl.oa.*; version=1,
com.sun.corba.ee.impl.orb; version=1,
com.sun.corba.ee.impl.presentation.*; version=1,
com.sun.corba.ee.impl.txpoa; version=1,
com.sun.corba.ee.impl.util; version=1,
org.glassfish.jndi.*; version=1
com.sun.corba.ee.spi.*,
com.sun.corba.ee.impl.corba,
com.sun.corba.ee.impl.encoding.*,
com.sun.corba.ee.impl.folb,
com.sun.corba.ee.impl.javax.*,
com.sun.corba.ee.impl.misc,
com.sun.corba.ee.impl.naming.*,
com.sun.corba.ee.impl.oa.*,
com.sun.corba.ee.impl.orb,
com.sun.corba.ee.impl.presentation.*,
com.sun.corba.ee.impl.txpoa,
com.sun.corba.ee.impl.util,
org.glassfish.jndi.*
</Export-Package>
</instructions>
</configuration>
</plugin>

<!-- generate test idl -->

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>idlj-maven-plugin</artifactId>
Expand All @@ -140,7 +138,10 @@
<sources>
<source>
<packagePrefixes>
<packagePrefix><type>interceptors</type><prefix>com.sun.corba.ee.impl</prefix></packagePrefix>
<packagePrefix>
<type>interceptors</type>
<prefix>com.sun.corba.ee.impl</prefix>
</packagePrefix>
</packagePrefixes>
</source>
</sources>
Expand Down
Loading