[Jpackage-commits] dist/jboss-remoting/devel .cvsignore, 1.1, 1.2 jboss-remoting-1.4.1-OnewayThreadPoolForConfigurationTest.patch, NONE, 1.1 jboss-remoting-1.4.3-build_xml.patch, NONE, 1.1 jboss-remoting.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Wed May 28 20:49:34 CEST 2008


Update of /home/projects/jpackage/cvs/dist/jboss-remoting/devel
In directory ryu.zarb.org:/tmp/cvs-serv12879/devel

Modified Files:
	.cvsignore sources 
Added Files:
	jboss-remoting-1.4.1-OnewayThreadPoolForConfigurationTest.patch 
	jboss-remoting-1.4.3-build_xml.patch jboss-remoting.spec 
Log Message:
Import from JPP 5.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jboss-remoting/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 18:49:11 -0000	1.1
--- .cvsignore	28 May 2008 18:49:32 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ jboss-remoting-1.4.3-src.tar.gz

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jboss-remoting/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 18:49:11 -0000	1.1
--- sources	28 May 2008 18:49:32 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 5a25410c9678d073e0e3a59d06f497f2  jboss-remoting-1.4.3-src.tar.gz

--- NEW FILE: jboss-remoting-1.4.1-OnewayThreadPoolForConfigurationTest.patch ---
--- src/tests/org/jboss/test/remoting/configuration/OnewayThreadPoolForConfigurationTest.java.sav	2006-04-25 18:55:49.000000000 +0200
+++ src/tests/org/jboss/test/remoting/configuration/OnewayThreadPoolForConfigurationTest.java	2006-04-25 18:59:59.000000000 +0200
@@ -80,7 +80,7 @@
    {
 
       // FIXME TestOnewayThreadPool constructor
-      super(arg0, arg1);
+      super(arg0);
 
    }
 

--- NEW FILE: jboss-remoting-1.4.3-build_xml.patch ---
--- build.xml.sav	2006-05-12 11:16:41.000000000 -0400
+++ build.xml	2006-06-26 14:02:07.000000000 -0400
@@ -274,6 +274,7 @@
          </classpath>
          <!-- this is needed for the remoting.marshall.dynamic.remote.MarshallerLoadingServer -->
          <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
+         <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
          <formatter type="xml"/>
          <test fork="yes" todir="${output.tests.results}" name="${test}"/>
       </junit>
@@ -361,6 +362,7 @@
       <junit printsummary="true" fork="yes" includeantruntime="true">
          <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
          <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+         <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
          <classpath>
             <path refid="tests.classpath"/>
             <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
@@ -389,6 +391,7 @@
       <junit printsummary="true" fork="yes" includeantruntime="true">
          <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
          <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+         <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
          <classpath>
             <path refid="tests.classpath"/>
             <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
@@ -411,6 +414,7 @@
       <junit printsummary="true" fork="yes" includeantruntime="true">
          <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
          <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+         <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
          <classpath>
             <path refid="tests.classpath"/>
             <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
@@ -436,6 +440,7 @@
          </classpath>
          <!-- this is needed for the remoting.marshall.dynamic.remote.MarshallerLoadingServer -->
          <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
+         <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
          <formatter type="xml"/>
          <batchtest fork="yes" todir="${output.tests.results}"
                     haltonfailure="no">
@@ -477,6 +482,7 @@
       <junit printsummary="true" fork="yes" includeantruntime="true">
 
          <jvmarg value="-Dremoting.metadata=${metadata}"/>
+         <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
 
          <classpath>
             <path refid="tests.classpath"/>
@@ -508,6 +514,7 @@
          </classpath>
          <!-- this is needed for the remoting.marshall.dynamic.remote.MarshallerLoadingServer -->
          <jvmarg value="-Dloader.path=${output.lib.dir}/jboss-remoting-loading-tests.jar"/>
+         <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
          <formatter type="xml"/>
          <batchtest fork="yes" todir="${output.tests.results}"
                     haltonfailure="no">
@@ -525,6 +532,7 @@
       <mkdir dir="${output.tests.results}"/>
       <junit printsummary="true" fork="yes" includeantruntime="true">
          <jvmarg value="-Djvm.mx=256"/>
+         <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
          <classpath>
             <path refid="tests.classpath"/>
             <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
@@ -686,6 +694,7 @@
          <jvmarg value="-Dremoting.number_of_clients=1"/>
          <jvmarg value="-Dremoting.number_of_calls=5000"/>
          <jvmarg value="-Dremoting.payload.size=1024"/>
+         <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
          <classpath>
             <path refid="tests.classpath"/>
             <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
@@ -714,9 +723,10 @@
          <jvmarg value="-Dremoting.number_of_calls=50000"/>
          <jvmarg value="-Dremoting.payload.size=512"/>
          <jvmarg value="-Djvm.mx=256"/>
-         <!--<jvmarg value="-Djrunit.result_timeout=300000"/>-->
-         <!--<jvmarg value="-Djrunit.tear_down_timeout=300000"/>-->
-         <!--<jvmarg value="-Djrunit.run_test_timeout=300000"/>-->
+         <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
+         <jvmarg value="-Djrunit.result_timeout=900000"/>
+         <jvmarg value="-Djrunit.tear_down_timeout=900000"/>
+         <jvmarg value="-Djrunit.run_test_timeout=900000"/>
          <classpath>
             <path refid="tests.classpath"/>
             <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
@@ -875,11 +885,12 @@
          <jvmarg value="-Dremoting.number_of_calls=${numofcalls}"/>
          <jvmarg value="-Dremoting.payload.size=${payloadsize}"/>
          <jvmarg value="-Dremoting.serialization=${serialization}"/>
+         <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
          <!-- Following needed for multiplex -->
-         <!--<jvmarg value="-Djvm.mx=512"/>-->
-         <!--<jvmarg value="-Djrunit.result_timeout=900000"/>-->
-         <!--<jvmarg value="-Djrunit.tear_down_timeout=900000"/>-->
-         <!--<jvmarg value="-Djrunit.run_test_timeout=900000"/>-->
+         <jvmarg value="-Djvm.mx=512"/>-->
+         <jvmarg value="-Djrunit.result_timeout=900000"/>
+         <jvmarg value="-Djrunit.tear_down_timeout=900000"/>
+         <jvmarg value="-Djrunit.run_test_timeout=900000"/>
          <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
          <classpath>
             <path refid="tests.classpath"/>
@@ -914,6 +925,7 @@
          <jvmarg value="-Dremoting.payload.size=${payloadsize}"/>
          <jvmarg value="-Dremoting.serialization=${serialization}"/>
          <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+         <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
          <classpath>
             <path refid="tests.classpath"/>
             <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
@@ -943,6 +955,7 @@
          <jvmarg value="-Dremoting.payload.size=${payloadsize}"/>
          <jvmarg value="-Dremoting.serialization=${serialization}"/>
          <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+         <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
          <classpath>
             <path refid="tests.classpath"/>
             <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
@@ -1065,6 +1078,7 @@
          <jvmarg value="-Djrunit.tear_down_timeout=900000"/>
          <jvmarg value="-Djrunit.run_test_timeout=900000"/>
          <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+         <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
          <classpath>
             <path refid="tests.classpath"/>
             <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
@@ -1099,6 +1113,7 @@
          <jvmarg value="-Dremoting.payload.size=${payloadsize}"/>
          <jvmarg value="-Dremoting.serialization=${serialization}"/>
          <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+         <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
          <classpath>
             <path refid="tests.classpath"/>
             <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>
@@ -1129,6 +1144,7 @@
          <jvmarg value="-Dremoting.payload.size=${payloadsize}"/>
          <jvmarg value="-Dremoting.serialization=${serialization}"/>
          <jvmarg value="-D${remoting.metadata.key}=${metadata}"/>
+         <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
          <classpath>
             <path refid="tests.classpath"/>
             <pathelement location="${output.lib.dir}/jboss-remoting-tests.jar"/>

--- NEW FILE: jboss-remoting.spec ---
# Copyright (c) 2000-2005, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

# If you don't want to run the unit tests
# give rpmbuild option '--without tests'

%define with_tests %{!?_without_tests:1}%{?_without_tests:0}
%define without_tests %{?_without_tests:1}%{!?_without_tests:0}


%define section		free

Summary:	JBoss Remoting
URL:		http://labs.jboss.com/portal/jbossremoting/
Source0:	jboss-remoting-1.4.3-src.tar.gz
# cvs -d:pserver:anonymous at anoncvs.forge.jboss.com:/cvsroot/jboss export -r remoting_1_4_3_GA JBossRemoting
Patch0:		jboss-remoting-1.4.1-OnewayThreadPoolForConfigurationTest.patch
Patch1:		jboss-remoting-1.4.3-build_xml.patch

Name:		jboss-remoting
Version:	1.4.3
Release:	2jpp
Epoch:		0
License:	LGPL
Group:		Development/Java
Vendor:		JPackage Project
Distribution:	JPackage
BuildArch:	noarch
BuildRequires:	jpackage-utils >= 0:1.6
BuildRequires:	ant >= 0:1.6
BuildRequires:	junit
BuildRequires:	jboss-jrunit
BuildRequires:	batik
BuildRequires:	fop
BuildRequires:	saxon

BuildRequires:	concurrent
BuildRequires:	dom4j
BuildRequires:	jakarta-commons-httpclient
BuildRequires:	jakarta-commons-logging
BuildRequires:	log4j
BuildRequires:	tomcat5-server-lib >= 0:5.5.16-3jpp
BuildRequires:	tomcat5-servlet-2.4-api
BuildRequires:	jboss4-common
BuildRequires:	jboss4-jmx
BuildRequires:	jboss4-naming
BuildRequires:	jboss-serialization
BuildRequires:	jgroups
BuildRequires:	jcommon
BuildRequires:	jfreechart
BuildRequires:	gnu-trove
BuildRequires:	xml-commons-apis

Requires:	jpackage-utils >= 0:1.6
Requires:	jakarta-commons-httpclient
Requires:	log4j
Requires:	tomcat5-server-lib >= 0:5.5.16-3jpp
Requires:	tomcat5-servlet-2.4-api
Requires:	jboss4-common
Requires:	jboss4-jmx
Requires:	jboss4-naming
Requires:	jboss-serialization
Requires:	xml-commons-apis
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot

%description
The purpose of JBoss Remoting is to provide a single API for most 
network based invocations and related service that uses pluggable 
transports and data marshallers. The JBoss Remoting API provides 
the ability for making synchronous and asynchronous remote calls, 
push and pull callbacks, and automatic discovery of remoting servers. 
The intention is to allow for the addition of different transports 
to fit different needs, yet still maintain the same API for making 
the remote invocations and only requiring configuration changes, 
not code changes, to fit these different needs.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation

%description javadoc
%{summary}

%package manual
Summary:        Documents for %{name}
Group:          Development/Documentation

%description manual
%{summary}

%package demo
Summary:        Usage examples for %{name}
Group:          Development/Documentation

%description demo
%{summary}

%prep
%setup -q -n JBossRemoting-%{version}-src
chmod -R go=u-w *
for j in $(find . -name "*.jar"); do
    mv $j $j.no
done

%patch0 -b .sav
%patch1 -b .sav

%build
#docs/guide/support/support/lib/avalon-framework-cvs-20020806.jar.no
#docs/guide/support/support/lib/batik.jar.no
#docs/guide/support/support/lib/fop.jar.no
#docs/guide/support/support/lib/jai_codec.jar.no
#docs/guide/support/support/lib/jai_core.jar.no
#docs/guide/support/support/lib/rowan-0.1.jar.no
#docs/guide/support/support/lib/saxon-dbxsl-extensions.jar.no
#docs/guide/support/support/lib/saxon.jar.no
pushd docs/guide/support/support/lib
build-jar-repository -s -p . \
batik \
fop \
saxon
popd
#lib/apache-commons/lib/commons-httpclient.jar.no
#lib/apache-commons/lib/commons-logging-api.jar.no
pushd lib/apache-commons/lib
ln -sf $(build-classpath commons-httpclient) .
ln -sf $(build-classpath commons-logging-api) .
popd
#lib/apache-log4j/lib/log4j.jar.no
pushd lib/apache-log4j/lib
ln -sf $(build-classpath log4j) .
popd
#lib/apache-tomcat/tomcat-apr.jar.no
#lib/apache-tomcat/tomcat-coyote.jar.no
#lib/apache-tomcat/tomcat-http.jar.no
#lib/apache-tomcat/tomcat-util.jar.no
pushd lib/apache-tomcat
ln -sf $(build-classpath tomcat5/tomcat-apr) .
ln -sf $(build-classpath tomcat5/tomcat-coyote) .
ln -sf $(build-classpath tomcat5/tomcat-http) .
ln -sf $(build-classpath tomcat5/tomcat-util) .
popd
#lib/dom4j/lib/dom4j.jar.no
pushd lib/dom4j/lib
ln -sf $(build-classpath dom4j) .
popd
#lib/jboss/jboss-common.jar.no
#lib/jboss/jboss-jmx.jar.no
#lib/jboss/jboss-serialization.jar.no
#lib/jboss/jnpserver.jar.no
#lib/jboss/jrunit.jar.no
pushd lib/jboss
ln -sf $(build-classpath jboss4/jboss-common) .
ln -sf $(build-classpath jboss4/jboss-jmx) .
ln -sf $(build-classpath jboss4/jnpserver) .
ln -sf $(build-classpath jboss-jrunit) .
ln -sf $(build-classpath jboss-serialization) .
popd
#lib/jgroups/lib/jgroups.jar.no
pushd lib/jgroups/lib
ln -sf $(build-classpath jgroups) .
#mv jgroups.jar.no jgroups.jar
popd
#lib/jrunit-libs/lib/jcommon-1.0.0-rc1.jar.no
#lib/jrunit-libs/lib/jfreechart-1.0.0-rc1.jar.no
pushd lib/jrunit-libs/lib
ln -sf $(build-classpath jcommon) .
ln -sf $(build-classpath jfreechart) .
popd
#lib/junit/lib/junit.jar.no
pushd lib/junit/lib
ln -sf $(build-classpath junit) .
popd
#lib/oswego-concurrent/lib/concurrent.jar.no
pushd lib/oswego-concurrent/lib
ln -sf $(build-classpath concurrent) .
popd
#lib/sun-servlet/lib/servlet-api.jar.no
pushd lib/sun-servlet/lib
ln -sf $(build-classpath servletapi5) servlet-api.jar
popd
#lib/trove/lib/trove.jar.no
pushd lib/trove/lib
ln -sf $(build-classpath gnu-trove) trove.jar
popd
#################################################

export ANT_OPTS="-Djava.net.preferIPv4Stack=true -Xmx128m"
export OPT_JAR_LIST="ant/ant-junit junit xalan-j2-serializer"
%if %{with_tests}
ant jars javadoc docs.generate tests
%else
ant jars javadoc docs.generate
%endif

%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
install -p -m 0644 output/lib/jboss-remoting.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

# etc
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
cp -pr output/etc   $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
cp -pr output/lib/servlet-invoker.war   $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
cp -p docs/JBossRemotingPushCallbacks.sxd $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr output/doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink

# manual
install -d -m 0755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/guide
cp -pr docs/guide/build/en/*   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/guide
install -d -m 0755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/Multiplex
cp -pr docs/Multiplex/build/en/*   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/Multiplex
cp -p docs/multiplex.pdf   $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/Multiplex


%clean
rm -rf $RPM_BUILD_ROOT

%post javadoc
rm -f %{_javadocdir}/%{name}
ln -sf %{name}-%{version} %{_javadocdir}/%{name}

%postun javadoc
if [ "$1" = "0" ]; then
  rm -f %{_javadocdir}/%{name}
fi

%files
%defattr(-,root,root,-)
%{_javadir}/*
%{_datadir}/%{name}-%{version}/etc
%{_datadir}/%{name}-%{version}/servlet-invoker.war
%{_datadir}/%{name}-%{version}/JBossRemotingPushCallbacks.sxd

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%ghost %doc %{_javadocdir}/%{name}

%files manual
%defattr(0644,root,root,0755)
%doc %{_docdir}/%{name}-%{version}

%changelog
* Mon Jun 26 2006 Ralph Apel <r.apel at r-apel.de> 0:1.4.3-2jpp
- Fix (Build)Requires:
- Set -Djava.net.preferIPv4Stack=true everywhere 
- Fix manual generation and subpackage

* Mon Jun 12 2006 Ralph Apel <r.apel at r-apel.de> 0:1.4.3-1jpp
- First JPP-5.0 release

* Wed May 03 2006 Ralph Apel <r.apel at r-apel.de> 0:1.4.1-1jpp
- First JPP-1.7 release




More information about the JPackage-commits mailing list