diff --git a/JDK8-support.patch b/JDK8-support.patch new file mode 100644 index 0000000..026c828 --- /dev/null +++ b/JDK8-support.patch @@ -0,0 +1,26 @@ +From f038592a60a50cdf263875c6ebc440a322f1c543 Mon Sep 17 00:00:00 2001 +From: Marek Goldmann +Date: Mon, 7 Jul 2014 12:43:24 +0200 +Subject: [PATCH] JDK8 support + +--- + src/org/jacorb/security/sas/GSSUPCredentialSpi.java | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/org/jacorb/security/sas/GSSUPCredentialSpi.java b/src/org/jacorb/security/sas/GSSUPCredentialSpi.java +index efc8833..da5cb4c 100644 +--- a/src/org/jacorb/security/sas/GSSUPCredentialSpi.java ++++ b/src/org/jacorb/security/sas/GSSUPCredentialSpi.java +@@ -97,4 +97,9 @@ public final class GSSUPCredentialSpi implements GSSCredentialSpi + { + return myMechOid; + } ++ ++ public GSSCredentialSpi impersonate(GSSNameSpi name) throws GSSException ++ { ++ throw new GSSException(GSSException.FAILURE, -1, "Not supported yet"); ++ } + } +-- +1.9.3 + diff --git a/jacorb-2.3.1-Implement-a-few-methods-in-GSSUPContextSpi-to-make-i.patch b/jacorb-2.3.1-Implement-a-few-methods-in-GSSUPContextSpi-to-make-i.patch new file mode 100644 index 0000000..7bd76c0 --- /dev/null +++ b/jacorb-2.3.1-Implement-a-few-methods-in-GSSUPContextSpi-to-make-i.patch @@ -0,0 +1,42 @@ +From 42081daacf0cc13cdc1b60b626d1284f6646d055 Mon Sep 17 00:00:00 2001 +From: Marek Goldmann +Date: Wed, 29 Aug 2012 12:09:09 +0200 +Subject: [PATCH] Implement a few methods in GSSUPContextSpi to make it work + with JDK 7 + +--- + src/org/jacorb/security/sas/GSSUPContextSpi.java | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/src/org/jacorb/security/sas/GSSUPContextSpi.java b/src/org/jacorb/security/sas/GSSUPContextSpi.java +index ab070ae..1812680 100644 +--- a/src/org/jacorb/security/sas/GSSUPContextSpi.java ++++ b/src/org/jacorb/security/sas/GSSUPContextSpi.java +@@ -33,6 +33,7 @@ import org.ietf.jgss.Oid; + import sun.security.jgss.spi.GSSContextSpi; + import sun.security.jgss.spi.GSSCredentialSpi; + import sun.security.jgss.spi.GSSNameSpi; ++import com.sun.security.jgss.InquireType; + + /** + * This is the GSS-API Sercurity Provider Interface (SPI) for the GSSUP Context +@@ -310,4 +311,19 @@ public final class GSSUPContextSpi + { + return false; + } ++ ++ public boolean getDelegPolicyState() ++ { ++ return false; ++ } ++ ++ public void requestDelegPolicy(boolean state) ++ { ++ throw new RuntimeException("Method not implemented"); ++ } ++ ++ public Object inquireSecContext(InquireType type) ++ { ++ throw new RuntimeException("Method not implemented"); ++ } + } diff --git a/jacorb-2.3.1-Removed-Class-Path-entry-from-MANIFEST.MF.patch b/jacorb-2.3.1-Removed-Class-Path-entry-from-MANIFEST.MF.patch new file mode 100644 index 0000000..5d45da1 --- /dev/null +++ b/jacorb-2.3.1-Removed-Class-Path-entry-from-MANIFEST.MF.patch @@ -0,0 +1,12 @@ +diff -Naur etc/jacorb_jar.manifest etc_new/jacorb_jar.manifest +--- etc/jacorb_jar.manifest 2013-05-27 11:47:38.931078552 +0200 ++++ etc_new/jacorb_jar.manifest 2013-05-27 11:48:01.496241861 +0200 +@@ -1,8 +1,3 @@ + Manifest-Version: 1.0 +-Class-Path: +- slf4j-api-1.5.6.jar +- slf4j-jdk14-1.5.6.jar +- concurrent-1.3.2.jar +- antlr-2.7.2.jar + + diff --git a/jacorb-2.3.1-Set-encoding-to-UTF-8-when-generating-javadoc.patch b/jacorb-2.3.1-Set-encoding-to-UTF-8-when-generating-javadoc.patch new file mode 100644 index 0000000..1b74448 --- /dev/null +++ b/jacorb-2.3.1-Set-encoding-to-UTF-8-when-generating-javadoc.patch @@ -0,0 +1,23 @@ +From 2d224ff14b13ba8518c084816bcc781d417818c8 Mon Sep 17 00:00:00 2001 +From: Marek Goldmann +Date: Wed, 29 Aug 2012 19:50:52 +0200 +Subject: [PATCH] Set encoding to UTF-8 when generating javadoc + +--- + build.xml | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/build.xml b/build.xml +index 596b9c5..1389e0a 100644 +--- a/build.xml ++++ b/build.xml +@@ -264,7 +264,8 @@ using VERSION_INFO: ${jacorb_version_info} + + + +- 0 && ++ csmList.mechanism_list[0].transport_mech.tag == ++ TAG_TLS_SEC_TRANS.value) ++ { ++ byte[] tlsSecTransData = ++ csmList.mechanism_list[0].transport_mech.component_data; ++ CDRInputStream in = ++ new CDRInputStream((org.omg.CORBA.ORB)null, tlsSecTransData); ++ try ++ { ++ in.openEncapsulatedArray(); ++ TLS_SEC_TRANS tls = TLS_SEC_TRANSHelper.read(in); ++ return (tls.target_requires & minimum_options) != 0; ++ } ++ catch ( Exception ex ) ++ { ++ throw new INTERNAL(ex.toString()); ++ } ++ } ++ return false; ++ } ++ + private TaggedProfile createMultipleComponentsProfile + (TaggedComponentList components) + { diff --git a/jacorb-2.3.1-read_boolean.patch b/jacorb-2.3.1-read_boolean.patch new file mode 100644 index 0000000..177f946 --- /dev/null +++ b/jacorb-2.3.1-read_boolean.patch @@ -0,0 +1,95 @@ +# read_boolean() now only adjusts positions if the chunk_end_pos == pos, no longer calling +# handle_chunking(). The problem with handle_chunking() is that it aligns the current position +# and this can cause CDRInputStream to "skip" valid boolean values, as those are not padded. + +--- src/org/jacorb/orb/CDRInputStream.java 2009-05-03 18:35:54.000000000 -0300 ++++ src/org/jacorb/orb/CDRInputStream.java 2009-07-27 21:43:13.654728303 -0300 +@@ -460,51 +460,52 @@ + + private final void handle_chunking() + { +- int remainder = 4 - (index % 4); +- int aligned_pos = (remainder != 4) ? pos + remainder : pos; ++ int remainder = 4 - (this.index % 4); ++ int aligned_pos = (remainder != 4) ? this.pos + remainder : this.pos; + +- if (chunk_end_pos >= pos && chunk_end_pos <= aligned_pos) ++ if (this.chunk_end_pos >= pos && this.chunk_end_pos <= aligned_pos) + { +- chunk_end_pos = -1; +- int saved_pos = pos; +- int saved_index = index; +- int tag = read_long(); ++ this.adjust_positions(); ++ } ++ } + +- if (tag < 0) { ++ private final void adjust_positions() ++ { ++ this.chunk_end_pos = -1; ++ int saved_pos = this.pos; ++ int saved_index = this.index; ++ int tag = this.read_long(); + ++ if (tag < 0) ++ { + // tag is an end tag +- +- if (-tag > valueNestingLevel) ++ if (-tag > this.valueNestingLevel) + { + throw new INTERNAL + ( + "received end tag " + tag + + " with value nesting level " + +- valueNestingLevel ++ this.valueNestingLevel + ); + } +- valueNestingLevel = -tag; +- valueNestingLevel--; +- +- if (valueNestingLevel > 0) ++ this.valueNestingLevel = -tag; ++ this.valueNestingLevel--; ++ if (this.valueNestingLevel > 0) + { +- chunk_end_pos = pos; +- handle_chunking(); ++ this.chunk_end_pos = pos; ++ this.handle_chunking(); + } + } + else if (tag > 0 && tag < 0x7fffff00) + { + // tag is the chunk size tag of another chunk +- +- chunk_end_pos = pos + tag; ++ this.chunk_end_pos = this.pos + tag; + } + else // (tag == 0 || tag >= 0x7fffff00) + { + // tag is the null value tag or the value tag of a nested value +- +- pos = saved_pos; // "unread" the tag +- index = saved_index; +- } ++ this.pos = saved_pos; // "unread" the tag ++ this.index = saved_index; + } + } + +@@ -711,7 +712,11 @@ + + public final boolean read_boolean() + { +- handle_chunking(); ++ // handle_chunking(); ++ if (this.chunk_end_pos == this.pos) ++ { ++ this.adjust_positions(); ++ } + index++; + byte value = buffer[pos++]; + diff --git a/jacorb-2.3.1-src.zip b/jacorb-2.3.1-src.zip new file mode 100644 index 0000000..a719279 Binary files /dev/null and b/jacorb-2.3.1-src.zip differ diff --git a/jacorb-2.3.1-version.patch b/jacorb-2.3.1-version.patch new file mode 100644 index 0000000..8e1d4ee --- /dev/null +++ b/jacorb-2.3.1-version.patch @@ -0,0 +1,13 @@ +--- src/org/jacorb/util/Version.java.orig 2009-07-29 15:55:13.000000000 -0400 ++++ src/org/jacorb/util/Version.java 2009-07-29 15:56:08.000000000 -0400 +@@ -28,8 +28,8 @@ + */ + public final class Version + { +- public static final String version = "2.3.1"; +- public static final String date = "27-May-2009"; ++ public static final String version = "2.3.1 (JBoss patch01)"; ++ public static final String date = "29-Jul-2009"; + public static final String longVersion = version + ", " + date; + public static final String yearString = "1997-2009"; + } diff --git a/jacorb-2.3.1.pom b/jacorb-2.3.1.pom new file mode 100644 index 0000000..f001f19 --- /dev/null +++ b/jacorb-2.3.1.pom @@ -0,0 +1,80 @@ + + + + org.jacorb + jacorb-parent + 2.3.1 + + + 4.0.0 + org.jacorb + jacorb + 2.3.1 + JacORB :: Core + + jar + + 1.2 + + + + + + tanukisoft + wrapper + 3.2.3 + compile + + + + antlr + antlr + 2.7.7 + compile + + + + picocontainer + picocontainer + 1.2 + compile + + + + nanocontainer + nanocontainer + 1.0 + compile + + + + nanocontainer + nanocontainer-remoting + 1.0-RC-1 + compile + + + + org.beanshell + bsh + 1.3.0 + compile + + + + backport-util-concurrent + backport-util-concurrent + 3.1 + provided + + + + org.slf4j + slf4j-api + 1.5.6 + provided + + + + + diff --git a/jacorb-idl-compiler-2.3.1.pom b/jacorb-idl-compiler-2.3.1.pom new file mode 100644 index 0000000..b2e3e73 --- /dev/null +++ b/jacorb-idl-compiler-2.3.1.pom @@ -0,0 +1,33 @@ + + + + org.jacorb + jacorb-parent + 2.3.1 + + + 4.0.0 + org.jacorb + jacorb-idl-compiler + 2.3.1 + JacORB :: IDL + + jar + + + + + org.apache.ant + ant + 1.7.0 + compile + + + avalon + avalon-logkit + 1.2 + compile + + + + diff --git a/jacorb-parent-2.3.1.pom b/jacorb-parent-2.3.1.pom new file mode 100644 index 0000000..f7e3c71 --- /dev/null +++ b/jacorb-parent-2.3.1.pom @@ -0,0 +1,259 @@ + + + 4.0.0 + org.jacorb + jacorb-parent + 2.3.1 + JacORB + JacORB + http://www.jacorb.org/ + + + JacORB team + jacorb-developer@lists.spline.inf.fu-berlin.de + + + + + + GNU LESSER GENERAL PUBLIC LICENSE Version 2 + http://www.gnu.org/copyleft/lesser.html + + + + pom + + + + + + idl-src + core-src + + + + install + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.6 + + + org.apache.maven.plugins + maven-assembly-plugin + 2.2.1 + + + gnu + + + + org.apache.maven.plugins + maven-clean-plugin + 2.4.1 + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + + org.apache.maven.plugins + maven-dependency-plugin + 2.2 + + + org.apache.maven.plugins + maven-deploy-plugin + 2.6 + + + org.apache.maven.plugins + maven-shade-plugin + 1.4 + + + org.apache.maven.plugins + maven-enforcer-plugin + 1.0 + + + org.apache.maven.plugins + maven-help-plugin + 2.1.1 + + + org.apache.maven.plugins + maven-install-plugin + 2.3.1 + + + org.apache.maven.plugins + maven-invoker-plugin + 1.5 + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.1 + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.8 + + + org.apache.maven.plugins + maven-one-plugin + 1.2 + + + org.apache.maven.plugins + maven-plugin-plugin + 2.8 + + + org.apache.maven.plugins + maven-release-plugin + 2.1 + + + org.apache.maven.plugins + maven-remote-resources-plugin + 1.2 + + + org.apache.maven.plugins + maven-repository-plugin + 2.3.1 + + + org.apache.maven.plugins + maven-resources-plugin + 2.5 + + + org.apache.maven.plugins + maven-scm-plugin + 1.5 + + + org.apache.maven.plugins + maven-site-plugin + 3.0-beta-3 + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.9 + + + org.apache.maven.plugins + maven-surefire-report-plugin + 2.8.1 + + + org.apache.maven.plugins + maven-verifier-plugin + 1.0 + + + + + + + + + maven-compiler-plugin + true + + UTF-8 + 1.5 + 1.5 + + + + + org.apache.maven.plugins + maven-resources-plugin + + UTF-8 + + + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + attach-sources + + jar-no-fork + + + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.7 + + + attach-javadocs + + jar + + + + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + 1.1 + + + sign-artifacts + verify + + sign + + + + + + + + + + + + + + scm:svn:cvs://www.jacorb.org/cvs + scm:svn:cvs+ssh://${maven.username}@www.jacorb.org/cvs + http://www.jacorb.org/download.html + + + diff --git a/jacorb.spec b/jacorb.spec new file mode 100644 index 0000000..71ca11b --- /dev/null +++ b/jacorb.spec @@ -0,0 +1,73 @@ +Name: jacorb +Version: 2.3.1 +Release: 1 +Summary: The Java implementation of the OMG's CORBA standard +License: LGPLv2 +URL: http://www.jacorb.org/index.html +Source0: http://www.jacorb.org/releases/%{version}/jacorb-%{version}-src.zip +Source1: https://repo1.maven.org/maven2/org/jacorb/jacorb/%{version}/jacorb-parent-%{version}.pom +Source2: https://repo1.maven.org/maven2/org/jacorb/jacorb/%{version}/jacorb-%{version}.pom +Source3: https://repo1.maven.org/maven2/org/jacorb/jacorb-idl-compiler/%{version}/jacorb-idl-compiler-%{version}.pom +Patch0: jacorb-2.3.1-Implement-a-few-methods-in-GSSUPContextSpi-to-make-i.patch +Patch1: jacorb-2.3.1-version.patch +Patch2: jacorb-2.3.1-Set-encoding-to-UTF-8-when-generating-javadoc.patch +Patch3: jacorb-2.3.1-Removed-Class-Path-entry-from-MANIFEST.MF.patch +Patch4: jacorb-2.3.1-primaddress_port.patch +Patch5: jacorb-2.3.1-read_boolean.patch +Patch6: JDK8-support.patch +BuildArch: noarch +BuildRequires: javapackages-local java-devel ant antlr-tool avalon-logkit bsh slf4j +%description +This package contains the Java implementation of the OMG's CORBA standard + +%package javadoc +Summary: Javadocs for %{name} +Requires: jpackage-utils +%description javadoc +This package contains the API documentation for %{name}. + +%prep +%setup -q -n jacorb-%{version} +cp %{SOURCE1} jacorb-parent.pom +cp %{SOURCE2} jacorb.pom +cp %{SOURCE3} jacorb-idl-compiler.pom +find -name '*.class' -exec rm -f '{}' \; +find -name '*.jar' -exec rm -f '{}' \; +find -name '*.zip' -exec rm -f '{}' \; +%patch0 -p1 +%patch1 -p0 +%patch2 -p1 +%patch3 -p0 +%patch4 -p0 +%patch5 -p0 +%patch6 -p1 +sed -i 's|,notification||' src/org/jacorb/build.xml +ln -s $(build-classpath antlr) lib/antlr-2.7.2.jar +ln -s $(build-classpath slf4j/api) lib/slf4j-api-1.5.6.jar +%mvn_alias "org.jacorb:" "jacorb:" + +%build +export CLASSPATH=$(build-classpath avalon-logkit slf4j/api) +sed -i "s|>avalon<|>avalon-logkit<|g" jacorb-idl-compiler.pom +%pom_remove_dep "tanukisoft:wrapper" jacorb.pom +%pom_remove_dep "picocontainer:picocontainer" jacorb.pom +%pom_remove_dep "nanocontainer:nanocontainer" jacorb.pom +%pom_remove_dep "nanocontainer:nanocontainer-remoting" jacorb.pom +ant all doc + +%install +%mvn_artifact jacorb-parent.pom +%mvn_artifact jacorb.pom lib/jacorb.jar +%mvn_artifact jacorb-idl-compiler.pom lib/idl.jar +%mvn_install -J doc/api + +%files -f .mfiles +%dir %{_javadir}/%{name} +%doc doc/LICENSE + +%files javadoc -f .mfiles-javadoc +%doc doc/LICENSE + +%changelog +* Wed Sep 2 2020 Ge Wang - 2.3.1-1 +- Package init diff --git a/jacorb.yaml b/jacorb.yaml new file mode 100644 index 0000000..00bbaf0 --- /dev/null +++ b/jacorb.yaml @@ -0,0 +1,4 @@ +version_control: NA +src_repo: NA +tag_prefix: NA +seperator: NA