[jboss-rmi-1.0-api] First import after review (#806089)
Juan Hernandez
jhernand at fedoraproject.org
Fri Mar 23 13:18:19 UTC 2012
commit c2f1df45c3d5503ec764a810a648c25a2660cd47
Author: Juan Hernandez <juan.hernandez at redhat.com>
Date: Fri Mar 23 14:17:51 2012 +0100
First import after review (#806089)
.gitignore | 1 +
jboss-rmi-1.0-api-fix-fsf-address.patch | 13 +++
jboss-rmi-1.0-api-remove-implementation.patch | 101 ++++++++++++++++++++++++
jboss-rmi-1.0-api.spec | 103 +++++++++++++++++++++++++
sources | 1 +
5 files changed, 219 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..57858cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/jboss-rmi-1.0-api-1.0.4.Final.tar.xz
diff --git a/jboss-rmi-1.0-api-fix-fsf-address.patch b/jboss-rmi-1.0-api-fix-fsf-address.patch
new file mode 100644
index 0000000..d5430ff
--- /dev/null
+++ b/jboss-rmi-1.0-api-fix-fsf-address.patch
@@ -0,0 +1,13 @@
+diff --git a/src/main/resources/LICENSE b/src/main/resources/LICENSE
+index b40a0f4..c508b29 100644
+--- a/src/main/resources/LICENSE
++++ b/src/main/resources/LICENSE
+@@ -3,7 +3,7 @@ The GNU General Public License (GPL)
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+
+ Everyone is permitted to copy and distribute verbatim copies of this license
+ document, but changing it is not allowed.
diff --git a/jboss-rmi-1.0-api-remove-implementation.patch b/jboss-rmi-1.0-api-remove-implementation.patch
new file mode 100644
index 0000000..e4712bc
--- /dev/null
+++ b/jboss-rmi-1.0-api-remove-implementation.patch
@@ -0,0 +1,101 @@
+diff --git a/pom.xml b/pom.xml
+index f8b3770..8017ab1 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -36,49 +36,4 @@
+ <maven.compiler.target>1.5</maven.compiler.target>
+ </properties>
+
+- <build>
+- <plugins>
+- <plugin>
+- <artifactId>maven-compiler-plugin</artifactId>
+- <configuration>
+- <showDeprecation>false</showDeprecation>
+- <compilerArguments>
+- <endorseddirs>${project.build.directory}/endorsed</endorseddirs>
+- </compilerArguments>
+- </configuration>
+- </plugin>
+- <plugin>
+- <artifactId>maven-dependency-plugin</artifactId>
+- <executions>
+- <execution>
+- <phase>generate-sources</phase>
+- <goals>
+- <goal>copy</goal>
+- </goals>
+- <configuration>
+- <artifactItems>
+- <artifactItem>
+- <groupId>jacorb</groupId>
+- <artifactId>jacorb</artifactId>
+- <type>jar</type>
+- <overWrite>true</overWrite>
+- <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
+- </artifactItem>
+- </artifactItems>
+- </configuration>
+- </execution>
+- </executions>
+- </plugin>
+- </plugins>
+- </build>
+-
+- <dependencies>
+- <dependency>
+- <groupId>jacorb</groupId>
+- <artifactId>jacorb</artifactId>
+- <version>2.3.1jboss.patch01-brew</version>
+- <scope>provided</scope>
+- </dependency>
+- </dependencies>
+-
+ </project>
+diff --git a/src/main/java/javax/rmi/CORBA/Stub.java b/src/main/java/javax/rmi/CORBA/Stub.java
+index 4ac8a95..3be52a0 100644
+--- a/src/main/java/javax/rmi/CORBA/Stub.java
++++ b/src/main/java/javax/rmi/CORBA/Stub.java
+@@ -242,11 +242,6 @@ public abstract class Stub extends ObjectImpl implements java.io.Serializable
+ }
+ }
+
+- if (className == null)
+- {
+- return new org.jboss.com.sun.corba.se.impl.javax.rmi.CORBA.StubDelegateImpl();
+- }
+-
+ try
+ {
+ return loadDelegateClass(className).newInstance();
+diff --git a/src/main/java/javax/rmi/CORBA/Util.java b/src/main/java/javax/rmi/CORBA/Util.java
+index 0e65dc3..8575e21 100644
+--- a/src/main/java/javax/rmi/CORBA/Util.java
++++ b/src/main/java/javax/rmi/CORBA/Util.java
+@@ -381,11 +381,6 @@ public class Util
+ }
+ }
+
+- if (className == null)
+- {
+- return new org.jboss.com.sun.corba.se.impl.javax.rmi.CORBA.Util();
+- }
+-
+ try
+ {
+ return loadDelegateClass(className).newInstance();
+diff --git a/src/main/java/javax/rmi/PortableRemoteObject.java b/src/main/java/javax/rmi/PortableRemoteObject.java
+index cb0924c..feeebe8 100644
+--- a/src/main/java/javax/rmi/PortableRemoteObject.java
++++ b/src/main/java/javax/rmi/PortableRemoteObject.java
+@@ -199,10 +199,6 @@ public class PortableRemoteObject
+ className = props.getProperty(classKey);
+ }
+ }
+- if (className == null)
+- {
+- return new org.jboss.com.sun.corba.se.impl.javax.rmi.PortableRemoteObject();
+- }
+
+ try
+ {
diff --git a/jboss-rmi-1.0-api.spec b/jboss-rmi-1.0-api.spec
new file mode 100644
index 0000000..427ffa5
--- /dev/null
+++ b/jboss-rmi-1.0-api.spec
@@ -0,0 +1,103 @@
+%define namedreltag .Final
+%define namedversion %{version}%{?namedreltag}
+
+Name: jboss-rmi-1.0-api
+Version: 1.0.4
+Release: 1%{dist}
+Summary: Java Remote Method Invocation 1.0 API
+Group: Development/Libraries
+License: GPLv2 with exceptions
+URL: http://www.jboss.org
+
+# git clone https://github.com/jboss/jboss-rmi-api_spec
+# cd jboss-rmi-api_spec/ && git archive --format=tar --prefix=jboss-rmi-1.0-api-1.0.4.Final/ jboss-rmi-api_1.0_spec-1.0.4.Final | xz > jboss-rmi-1.0-api-1.0.4.Final.tar.xz
+Source0: %{name}-%{namedversion}.tar.xz
+
+# Remove the implementation, as it needs jacorb and we want the interface only
+# at the moment (the sources are removed as well before building):
+Patch0: %{name}-remove-implementation.patch
+
+# Fix the address of the FSF in the license file:
+Patch1: %{name}-fix-fsf-address.patch
+
+BuildRequires: java-devel
+BuildRequires: jboss-parent
+BuildRequires: jpackage-utils
+BuildRequires: maven
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+
+Requires: jpackage-utils
+Requires: java
+
+BuildArch:noarch
+
+
+%description
+Java Remote Method Invocation 1.0 API classes.
+
+
+%package javadoc
+Summary: Javadocs for %{name}
+Group: Documentation
+Requires: jpackage-utils
+
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+
+%prep
+
+# Unpack the sources:
+%setup -q -n %{name}-%{namedversion}
+
+# Apply the patches:
+%patch0 -p1
+%patch1 -p1
+
+# Remove all the implementation classes and resources as we want the interfaces
+# only at the moment:
+rm -rf src/main/resources/org
+rm -rf src/main/java/org
+
+
+%build
+mvn-rpmbuild install javadoc:aggregate
+
+
+%install
+
+# Jar files:
+install -d -m 755 %{buildroot}%{_javadir}
+install -pm 644 target/jboss-rmi-api_1.0_spec-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}.jar
+
+# POM files:
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+
+# Dependencies map:
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
+# Javadoc files:
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+
+
+%files
+%{_javadir}/*
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
+%doc src/main/resources/LICENSE
+
+
+%files javadoc
+%{_javadocdir}/%{name}
+%doc src/main/resources/LICENSE
+
+
+%changelog
+* Thu Mar 22 2012 Juan Hernandez <juan.hernandez at redhat.com> 1.0.4-1
+- Initial packaging
diff --git a/sources b/sources
index e69de29..e9488d4 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+77b9d418bf52ce0fbe44ba7e9931dea1 jboss-rmi-1.0-api-1.0.4.Final.tar.xz
More information about the scm-commits
mailing list