rpms/jonas/devel jonas-endorseddirs.patch, NONE, 1.1 jonas-rmi-protocols.patch, NONE, 1.1 jonas.spec, 1.69, 1.70 jonas-no-iiop.patch, 1.1, NONE jonas-no-jrmp.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jun 23 12:32:58 UTC 2005
Author: gbenson
Update of /cvs/dist/rpms/jonas/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29507
Modified Files:
jonas.spec
Added Files:
jonas-endorseddirs.patch jonas-rmi-protocols.patch
Removed Files:
jonas-no-iiop.patch jonas-no-jrmp.patch
Log Message:
Get (some) stubs built
jonas-endorseddirs.patch:
LoaderManager.java | 5 +++++
1 files changed, 5 insertions(+)
--- NEW FILE jonas-endorseddirs.patch ---
All the scripts and things set java.endorsed.dirs like they assume
it'll end up on the classpath, but it doesn't seem to in libgcj.
--- jonas/src/org/objectweb/jonas/server/LoaderManager.java~ 2004-08-04 11:03:14.000000000 +0100
+++ jonas/src/org/objectweb/jonas/server/LoaderManager.java 2005-06-23 11:28:09.000000000 +0100
@@ -366,6 +366,11 @@
// Load $JONAS_ROOT/lib/commons/**/*.jar
jurls.add(jonasCommonsDir, ".jar");
+ // pick up endorsed classes too if running under libgcj
+ if (System.getProperty("java.vm.name").equals("GNU libgcj")) {
+ jurls.add(new File(System.getProperty("java.endorsed.dirs")), ".jar");
+ }
+
// add jonas.base/lib/ext only if jonas.base != jonas.root
// jonas.base/lib/ext is added before jonas.root/lib/ext
if (!System.getProperty("install.root").toLowerCase().equals(jonasBase.toLowerCase())) {
jonas-rmi-protocols.patch:
build.properties | 2 +-
build.xml | 4 ++++
src/conf/carol.properties | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
--- NEW FILE jonas-rmi-protocols.patch ---
The only RMI protocol we support is jeremie. GNU rmic can't generate
IIOP stubs, and JRMP in carol requires loads of sun.* classes.
--- jonas/src/conf/carol.properties~ 2005-03-07 14:51:23.000000000 +0000
+++ jonas/src/conf/carol.properties 2005-06-22 11:30:00.000000000 +0100
@@ -25,7 +25,7 @@
# jonas rmi activation (iiop, jrmp, jeremie, cmi)
# In case of multiprotocols, please keep the order defined above.
-carol.protocols=jrmp
+carol.protocols=jeremie
# RMI JRMP URL
carol.jrmp.url=rmi://localhost:1099
--- jonas/build.properties~ 2005-06-22 16:39:09.000000000 +0100
+++ jonas/build.properties 2005-06-22 16:47:38.000000000 +0100
@@ -34,4 +34,4 @@
# protocols for Carol (jrmp,jeremie,iiop,cmi) needed by the JOnAS ejbjar task
-protocols.names=jrmp,jeremie,iiop
+protocols.names=jeremie
--- jonas/build.xml~ 2004-12-13 10:15:50.000000000 +0000
+++ jonas/build.xml 2005-03-07 12:03:13.949996729 +0000
@@ -321,6 +321,7 @@
<!-- build stub and skeleton for the class given by arg classname -->
<target name="stub" unless="${done}">
+<!--
<echo message="doing stubs/skels ${classname} for rmi/jrmp and rmi/iiop" />
<rmic compiler="sun"
iiop="true"
@@ -330,6 +331,7 @@
base="classes/common">
<classpath refid="base.classpath" />
</rmic>
+-->
<echo message="doing stubs/skels ${classname} for rmi/jeremie" />
<java classname="org.objectweb.jeremie.tools.jrmic.JRMICompiler"
@@ -1114,7 +1116,9 @@
<property name="jonas.root" value="${jonas.root.dir}" />
<property name="jonas.base" value="${jonas.root.dir}" />
<property name="dist.dir" value="${jonas.root.dir}/examples/output" />
+<!--
<property name="protocols.names" value="jrmp,jeremie,iiop" />
+-->
</ant>
<!-- Delete dist.dir of examples -->
Index: jonas.spec
===================================================================
RCS file: /cvs/dist/rpms/jonas/devel/jonas.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- jonas.spec 22 Jun 2005 11:25:55 -0000 1.69
+++ jonas.spec 23 Jun 2005 12:32:56 -0000 1.70
@@ -129,11 +129,10 @@
Patch22: jonas-axis.patch
Patch23: jonas-gifencoder.patch
-# Stuff that libgcj can't do
-Patch30: jonas-no-jrmp.patch
+# Various libgcj workarounds
+Patch30: jonas-rmi-protocols.patch
Patch31: jonas-outputstream.patch
-Patch32: jonas-no-iiop.patch
-Patch52: jonas-gcj-03.patch
+Patch32: jonas-endorseddirs.patch
Patch55: jonas-gcj-06.patch
@@ -509,10 +508,9 @@
%patch21 -p2 -b .orig
%patch22 -p2 -b .orig
%patch23 -p2 -b .orig
-%patch30 -p2
+%patch30 -p1
%patch31 -p1 -b .orig
%patch32 -p1 -b .orig
-%patch52 -p1 -b .orig
%patch55 -p1 -b .orig
# Red Hat specific
@@ -995,7 +993,6 @@
build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/j2ee axis/saaj
build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/j2ee wsdl4j
build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/j2ee jacc
-build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/j2ee jonathan-rmi
# We now use mx4j instead of JMX
build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/mx4j mx4j/mx4j
@@ -1073,6 +1070,7 @@
# FIXME We need the jacorb package with OW patches applied
build-jar-repository $RPM_BUILD_ROOT%{libdir}/endorsed jacorb/jacorb.jar
build-jar-repository $RPM_BUILD_ROOT%{libdir}/endorsed jacorb/idl.jar
+build-jar-repository $RPM_BUILD_ROOT%{libdir}/endorsed jonathan-rmi
build-jar-repository $RPM_BUILD_ROOT%{libdir}/examples commons-validator
# FIXME Modify examples using oro to get it from tools
@@ -1527,7 +1525,7 @@
#%dir %{ejbjarsdir}
%doc %{ejbjarsdir}/README
%doc %{ejbjarsdir}/autoload/README
-#%{ejbjarsdir}/autoload/mejb.jar
+%{ejbjarsdir}/autoload/mejb.jar
%dir %{rarsdir}
%doc %{rarsdir}/README
@@ -1600,7 +1598,7 @@
%dir %{demodir}/ejbjars
%doc %{demodir}/ejbjars/README
%doc %{demodir}/ejbjars/autoload/README
-#%{demodir}/ejbjars/autoload/mejb.jar
+%{demodir}/ejbjars/autoload/mejb.jar
%dir %{demodir}/clients
%doc %{demodir}/clients/README
%dir %{demodir}/webapps
@@ -1623,16 +1621,16 @@
%{clientsdir}/jaasopclient1.jar
%{clientsdir}/jaasopclient2.jar
%{clientsdir}/jaasopclient3.jar
-#%{ejbjarsdir}/clusterDemo.jar
-#%{ejbjarsdir}/eb.jar
-#%{ejbjarsdir}/jaasop.jar
-#%{ejbjarsdir}/jms.jar
-#%{ejbjarsdir}/lb.jar
-#%{ejbjarsdir}/mailsb.jar
-#%{ejbjarsdir}/sampleappli.jar
-#%{ejbjarsdir}/samplemdb.jar
-#%{ejbjarsdir}/newsamplemdb.jar
-#%{ejbjarsdir}/sb.jar
+%{ejbjarsdir}/clusterDemo.jar
+%{ejbjarsdir}/eb.jar
+%{ejbjarsdir}/jaasop.jar
+%{ejbjarsdir}/jms.jar
+%{ejbjarsdir}/lb.jar
+%{ejbjarsdir}/mailsb.jar
+%{ejbjarsdir}/sampleappli.jar
+%{ejbjarsdir}/samplemdb.jar
+%{ejbjarsdir}/newsamplemdb.jar
+%{ejbjarsdir}/sb.jar
# Red Hat specific
%defattr(0644,postgres,postgres,0700)
--- jonas-no-iiop.patch DELETED ---
--- jonas-no-jrmp.patch DELETED ---
More information about the fedora-cvs-commits
mailing list