Skip to content

Commit c32d50a

Browse files
committed
Support for Java compact1 profile (use MPC feature full_jre=0)
1 parent b4ac096 commit c32d50a

19 files changed

+156
-2
lines changed

MPC/config/idl2jni.mpb

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
feature(!full_jre) : java {
2+
javacflags += -classpath $(DDS_ROOT)/lib/i2jrt_compact.jar
3+
}
14

25
project: taolib_with_idl, portableserver, java, dds_macros {
36

java/dds/dcps_java.mpc

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ project: idl2jni, dcpslib, optional_jni_check, dcps_java_optional, dcps_tcp, dcp
6464
DDS/DATAREADER_QOS_DEFAULT.java << DDS/DataReaderQos.java
6565
DDS/DATAWRITER_QOS_USE_TOPIC_QOS.java << DDS/DataWriterQos.java
6666
DDS/DATAREADER_QOS_USE_TOPIC_QOS.java << DDS/DataReaderQos.java
67-
DDS/WaitSet.java << DDS/_WaitSetInterfTAOPeer.java
67+
DDS/WaitSet.java << DDS/_WaitSetInterfTAOPeer.java DDS/ConditionSeqHolder.java
6868
DDS/GuardCondition.java << DDS/_GuardConditionInterfTAOPeer.java
6969
OpenDDS/DCPS/transport/TheTransportRegistry.java << DDS/Entity.java
7070
OpenDDS/DCPS/transport/ConfigurationConflictException.java

java/idl2jni/compact/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/classes
+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
project: java, dds_macros, install {
2+
3+
avoids += full_jre
4+
5+
libout = $(DDS_ROOT)/lib
6+
7+
specific {
8+
jarname = i2jrt_compact
9+
}
10+
11+
Java_Files {
12+
org/omg/CORBA
13+
}
14+
15+
verbatim(gnuace, postinstall) {
16+
" cp $(DDS_ROOT)/lib/i2jrt_compact.jar $(INSTALL_PREFIX)/lib"
17+
}
18+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package org.omg.CORBA;
2+
3+
public final class BAD_INV_ORDER extends SystemException {
4+
5+
public BAD_INV_ORDER() {
6+
this("");
7+
}
8+
9+
public BAD_INV_ORDER(String s) {
10+
this(s, 0, CompletionStatus.COMPLETED_NO);
11+
}
12+
13+
public BAD_INV_ORDER(int i, CompletionStatus c) {
14+
this("", i, c);
15+
}
16+
17+
public BAD_INV_ORDER(String s, int i, CompletionStatus c) {
18+
super(s, i, c);
19+
}
20+
21+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package org.omg.CORBA;
2+
3+
public final class CompletionStatus {
4+
5+
public static final int _COMPLETED_YES = 0,
6+
_COMPLETED_NO = 1,
7+
_COMPLETED_MAYBE = 2;
8+
9+
public static final CompletionStatus COMPLETED_YES =
10+
new CompletionStatus(_COMPLETED_YES);
11+
public static final CompletionStatus COMPLETED_NO =
12+
new CompletionStatus(_COMPLETED_NO);
13+
public static final CompletionStatus COMPLETED_MAYBE =
14+
new CompletionStatus(_COMPLETED_MAYBE);
15+
16+
public int value() { return value_; }
17+
private CompletionStatus(int value) { value_ = value; }
18+
private final int value_;
19+
20+
public static final CompletionStatus from_int(int i) {
21+
switch (i) {
22+
case _COMPLETED_YES: return COMPLETED_YES;
23+
case _COMPLETED_NO: return COMPLETED_NO;
24+
case _COMPLETED_MAYBE: return COMPLETED_MAYBE;
25+
default: throw new BAD_PARAM(25, COMPLETED_MAYBE);
26+
}
27+
}
28+
29+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package org.omg.CORBA;
2+
3+
public interface Context {
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package org.omg.CORBA;
2+
3+
public interface ContextList {
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package org.omg.CORBA;
2+
3+
public interface DomainManager {
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package org.omg.CORBA;
2+
3+
public interface ExceptionList {
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package org.omg.CORBA;
2+
3+
public interface NVList {
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package org.omg.CORBA;
2+
3+
public interface NamedValue {
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package org.omg.CORBA;
2+
3+
public interface Object {
4+
boolean _is_a(String Identifier);
5+
boolean _is_equivalent(org.omg.CORBA.Object that);
6+
boolean _non_existent();
7+
int _hash(int maximum);
8+
org.omg.CORBA.Object _duplicate();
9+
void _release();
10+
org.omg.CORBA.Object _get_interface_def();
11+
Request _request(String s);
12+
Request _create_request(Context ctx, String operation,
13+
NVList arg_list, NamedValue result);
14+
Request _create_request(Context ctx, String operation, NVList arg_list,
15+
NamedValue result, ExceptionList exclist,
16+
ContextList ctxlist);
17+
Policy _get_policy(int policy_type);
18+
DomainManager[] _get_domain_managers();
19+
org.omg.CORBA.Object _set_policy_override(Policy[] policies,
20+
SetOverrideType set_add);
21+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package org.omg.CORBA;
2+
3+
public interface Policy {
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package org.omg.CORBA;
2+
3+
public interface Request {
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package org.omg.CORBA;
2+
3+
public interface SetOverrideType {
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package org.omg.CORBA;
2+
3+
public final class StringSeqHolder {
4+
5+
public String[] value;
6+
public StringSeqHolder() {}
7+
public StringSeqHolder(String[] initial) {
8+
value = initial;
9+
}
10+
11+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package org.omg.CORBA;
2+
3+
public abstract class SystemException extends RuntimeException {
4+
5+
public int minor;
6+
public CompletionStatus completed;
7+
8+
protected SystemException(String s, int i, CompletionStatus c) {
9+
super(s);
10+
minor = i;
11+
completed = c;
12+
}
13+
14+
}

lib/.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
/OpenDDS_DCPS.jar
22
/tao_java.jar
3-
/i2jrt.jar
3+
/i2jrt*.jar

0 commit comments

Comments
 (0)