rpms/mx4j/devel mx4j-3.0.1.patch, NONE, 1.1 mx4j-no-poa.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 mx4j-build.patch, 1.1, 1.2 mx4j-build.policy, 1.1, 1.2 mx4j.spec, 1.45, 1.46

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Jul 19 18:55:36 UTC 2006


Author: fnasser

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30605/devel

Modified Files:
	.cvsignore mx4j-build.patch mx4j-build.policy mx4j.spec 
Added Files:
	mx4j-3.0.1.patch mx4j-no-poa.patch 
Log Message:
auto-import mx4j-3.0.1-4jpp_1fc on branch devel from mx4j-3.0.1-4jpp_1fc.src.rpm

mx4j-3.0.1.patch:
 Resolver.java |   37 +!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 1 files changed, 1 insertion(+), 36 modifications(!)

--- NEW FILE mx4j-3.0.1.patch ---
*** src/core/mx4j/remote/resolver/iiop/Resolver.java.orig	2005-05-12 12:13:28.000000000 -0400
--- src/core/mx4j/remote/resolver/iiop/Resolver.java	2005-05-13 14:38:21.000000000 -0400
***************
*** 33,36 ****
--- 33,37 ----
  
     private ORB orb;
+    private static final String ORB_KEY = "java.naming.corba.orb";
  
  
***************
*** 111,127 ****
        if (orb == null)
        {
!          Properties props = new Properties();
!          // Using putAll() on a Properties is discouraged, since it expects only Strings
!          for (Iterator i = environment.entrySet().iterator(); i.hasNext();)
!          {
!             Map.Entry entry = (Map.Entry)i.next();
!             Object key = entry.getKey();
!             Object value = entry.getValue();
!             if (key instanceof String && value instanceof String)
!             {
!                props.setProperty((String)key, (String)value);
!             }
!          }
!          orb = ORB.init((String[])null, props);
        }
        return orb;
--- 112,138 ----
        if (orb == null)
        {
!           Object candidateORB = environment.get(ORB_KEY);
!           if (candidateORB != null)
!           {
!              // Throw as required by the spec
!              if (!(candidateORB instanceof ORB)) throw new IllegalArgumentException("Property " + ORB_KEY + " must specify a " + ORB.class.getName() + ", not " + candidateORB.getClass().getName());
!              orb = (ORB)candidateORB;
!           }
!           else
!           {
!              Properties props = new Properties();
!              // Using putAll() on a Properties is discouraged, since it expects only Strings
!              for (Iterator i = environment.entrySet().iterator(); i.hasNext();)
!              {
!                 Map.Entry entry = (Map.Entry)i.next();
!                 Object key = entry.getKey();
!                 Object value = entry.getValue();
!                 if (key instanceof String && value instanceof String)
!                 {
!                    props.setProperty((String)key, (String)value);
!                 }
!              }
!              orb = ORB.init((String[])null, props);
!            }
        }
        return orb;

mx4j-no-poa.patch:
 build.xml |   11 +----------
 1 files changed, 1 insertion(+), 10 deletions(-)

--- NEW FILE mx4j-no-poa.patch ---
--- build/build.xml.sav	2005-03-01 11:14:37.000000000 +0100
+++ build/build.xml	2006-03-10 16:45:56.000000000 +0100
@@ -249,16 +253,7 @@
       </jar>
    </target>
 
-   <target name="rmic.iiop.poa" description="RMI compiles the remote JMX (JSR 160) classes using the -poa option" if="jdk14.present">
-      <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIServerImpl" classpathref="classpath" debug="yes" iiop="yes">
-         <compilerarg value="-poa"/>
-      </rmic>
-      <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIConnectionImpl" classpathref="classpath" debug="yes" iiop="yes">
-         <compilerarg value="-poa"/>
-      </rmic>
-   </target>
-
-   <target name="rmic.iiop" description="RMI compiles the remote JMX (JSR 160) classes" unless="jdk14.present">
+   <target name="rmic.iiop" description="RMI compiles the remote JMX (JSR 160) classes" >
       <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIServerImpl" classpathref="classpath" debug="yes" iiop="yes"/>
       <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIConnectionImpl" classpathref="classpath" debug="yes" iiop="yes"/>
    </target>


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	20 Jun 2005 11:38:38 -0000	1.8
+++ .cvsignore	19 Jul 2006 18:55:34 -0000	1.9
@@ -1,4 +1 @@
 mx4j-3.0.1-src.tar.gz
-mx4j-3.0.1
-i386
-*.src.rpm

mx4j-build.patch:
 build.xml |   44 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 35 insertions(+), 9 deletions(-)

Index: mx4j-build.patch
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mx4j-build.patch	17 Jan 2005 12:19:46 -0000	1.1
+++ mx4j-build.patch	19 Jul 2006 18:55:34 -0000	1.2
@@ -1,5 +1,5 @@
---- mx4j/build/build.xml.orig	Thu Dec 23 18:35:27 2004
-+++ mx4j/build/build.xml	Thu Dec 23 19:52:49 2004
+--- build/build.xml.sav	2005-03-01 11:14:37.000000000 +0100
++++ build/build.xml	2006-03-10 16:45:56.000000000 +0100
 @@ -55,6 +55,9 @@
     <property name="rjmx.jar.file" value="${dist.lib.dir}/${name}-rjmx.jar"/>
     <property name="rimpl.jar.file" value="${dist.lib.dir}/${name}-rimpl.jar"/>
@@ -18,7 +18,7 @@
  
        <javac srcdir="${core.src.dir}" destdir="${core.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII">
           <patternset refid="mx4j.classes"/>
-@@ -270,6 +274,25 @@
+@@ -270,8 +265,29 @@
        </javac>
        <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIServerImpl" classpathref="classpath" debug="yes" stubversion="1.2"/>
        <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIConnectionImpl" classpathref="classpath" debug="yes" stubversion="1.2"/>
@@ -42,9 +42,13 @@
 +      </jar>
 +
        <antcall target="rmic.iiop"/>
++<!--
        <antcall target="rmic.iiop.poa"/>
++-->
  
-@@ -440,8 +463,7 @@
+       <jar jarfile="${rjmx.jar.file}" manifest="${etc.dir}/MANIFEST.MF">
+          <fileset dir="${core.classes.dir}">
+@@ -423,8 +439,7 @@
           author="true"
           version="true"
           use="true"
@@ -53,8 +57,8 @@
 +         windowtitle="MX4J API">
           <package name="mx4j.*"/>
  
-          <bottom><![CDATA[<center><small>Copyright © 2001-2003 MX4J Team. All Rights Reserved.</small></center>]]></bottom>
-@@ -454,8 +476,6 @@
+          <bottom><![CDATA[<center><small>Copyright © 2001-2005 The MX4J Contributors. All Rights Reserved.</small></center>]]></bottom>
+@@ -437,8 +452,6 @@
     </target>
  
     <target name="docs" description="Builds the MX4J documentation">
@@ -63,7 +67,7 @@
        <mkdir dir="${dist.docs.dir}"/>
  
        <style processor="trax"
-@@ -467,9 +487,6 @@
+@@ -450,9 +463,6 @@
           classpathref="lib.classpath"
           />
  
@@ -73,3 +77,42 @@
        <!-- Bug in Ant forces this move, since destdir of the style task does not work -->
        <move todir="${dist.docs.dir}">
           <fileset dir="${basedir}/build">
+@@ -583,7 +593,8 @@
+             <include name="wsdl4j.jar"/>
+             <include name="commons-discovery.jar"/>
+             <include name="org.mortbay.jetty.jar"/>
+-            <include name="hessian-3.0.8.jar"/>
++            <include name="hessian3.jar"/>
++            <include name="burlap3.jar"/>
+             <!-- Also jars downloaded apart -->
+             <include name="servlet.jar"/>
+             <include name="jython.jar"/>
+@@ -612,7 +623,9 @@
+ 
+    <target name="single-test" description="Executes the test class defined by the system property 'testname'" depends="tests">
+       <junit printsummary="withOutAndErr" fork="yes" dir="${basedir}" showoutput="yes">
+-         <!--sysproperty key="mx4j.log.priority" value="debug"/-->
++         <sysproperty key="mx4j.log.priority" value="debug"/>
++         <sysproperty key="java.security.manager" value=""/>
++         <sysproperty key="java.security.policy" value="${basedir}/build/mx4j-build.policy"/>
+          <!--sysproperty key="java.security.debug" value="access.failure"/-->
+          <formatter type="plain" usefile="no"/>
+          <test name="${testname}" if="testname" fork="yes"/>
+@@ -639,6 +652,8 @@
+ 
+       <junit printsummary="withOutAndErr" fork="yes" timeout="300000" dir="${basedir}" showoutput="yes">
+          <sysproperty key="mx4j.log.priority" value="warn"/>
++         <sysproperty key="java.security.manager" value=""/>
++         <sysproperty key="java.security.policy" value="${basedir}/build/mx4j-build.policy"/>
+          <!-- sysproperty key="java.security.debug" value="access.failure"/-->
+          <formatter type="xml"/>
+          <batchtest fork="yes" todir="${test.xml.dir}">
+@@ -687,6 +702,8 @@
+ 
+       <junit printsummary="withOutAndErr" fork="yes" timeout="300000" dir="${basedir}" showoutput="yes">
+          <sysproperty key="mx4j.log.priority" value="warn"/>
++         <sysproperty key="java.security.manager" value=""/>
++         <sysproperty key="java.security.policy" value="${basedir}/build/mx4j-build.policy"/>
+          <!-- sysproperty key="java.security.debug" value="access.failure"/-->
+          <formatter type="xml"/>
+          <batchtest fork="yes" todir="${test.xml.dir}">


Index: mx4j-build.policy
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j-build.policy,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mx4j-build.policy	17 Jan 2005 12:19:46 -0000	1.1
+++ mx4j-build.policy	19 Jul 2006 18:55:34 -0000	1.2
@@ -4,6 +4,12 @@
 grant {
 	permission java.util.PropertyPermission "*", "read";
 	permission java.io.FilePermission "/-", "read,write";
-	permission java.net.SocketPermission "*", "listen,accept,resolve,connect";
+	permission java.net.SocketPermission "*", "accept, connect, listen, resolve";
+	permission java.net.SocketPermission "127.0.0.1", "accept, connect, listen, resolve";
+	permission java.lang.RuntimePermission "createSecurityManager";
+	permission java.lang.RuntimePermission "setSecurityManager";
+	permission javax.management.MBeanPermission "*", "*";
+	permission javax.management.remote.SubjectDelegationPermission "*";
+	permission javax.security.auth.AuthPermission "getSubject";
 };
 


Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- mx4j.spec	12 Jul 2006 07:25:06 -0000	1.45
+++ mx4j.spec	19 Jul 2006 18:55:34 -0000	1.46
@@ -1,11 +1,42 @@
-%define name        mx4j
-%define version     3.0.1
-%define release     1jpp_10fc
+# 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.
+#
+
+%define _gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section     free
 
-Name:           %{name}
-Version:        %{version}
-Release: 	%{release}
+Name:           mx4j
+Version:        3.0.1
+Release:        4jpp_1fc
 Epoch:		1
 Summary:        Open source implementation of JMX Java API
 License:        Apache License
@@ -14,32 +45,40 @@
 Source1:        %{name}-build.policy
 Source2:        CatalogManager.properties
 Patch0:         mx4j-javaxssl.patch
+Patch1:         mx4j-%{version}.patch
 Patch2:         mx4j-build.patch
 Patch3:         mx4j-docbook.patch
+Patch4:         mx4j-no-poa.patch
 Patch5:         mx4j-caucho-build.patch
 Patch6:         mx4j-no-iiop.patch
 Url:            http://mx4j.sourceforge.net/
-BuildRequires:  jpackage-utils > 0:1.5
+BuildRequires:  jpackage-utils > 0:1.6
 BuildRequires:  ant >= 0:1.6
-BuildRequires:  ant-trax, ant-junit
+BuildRequires:  ant-trax
+#BuildRequires:  ant-junit
 BuildRequires:	jaf
 BuildRequires:	javamail >= 0:1.2-5jpp
 BuildRequires:	log4j >= 0:1.2.7
 BuildRequires:	jakarta-commons-logging >= 0:1.0.1
 BuildRequires:  xml-commons-apis
 BuildRequires:  bcel >= 0:5.0
-BuildRequires:	jsse
-BuildRequires:	jce
+BuildRequires:	jsse >= 0:1.0.2-6jpp
+BuildRequires:	jce >= 0:1.2.2
+#BuildRequires:	junit >= 0:3.7.1
 BuildRequires:  coreutils
 BuildRequires:  xjavadoc
 BuildRequires:  xdoclet
 BuildRequires:  axis >= 0:1.1
 BuildRequires:  wsdl4j
 BuildRequires:  jakarta-commons-discovery
-BuildRequires:  docbook-dtds >= 1.0
-BuildRequires:  docbook-style-xsl >= 1.61
+BuildRequires:  docbook-dtds >= 0:1.0
+BuildRequires:  docbook-style-xsl >= 0:1.61
 BuildRequires:  xml-commons-resolver
 BuildRequires:  xml-commons
+#BuildRequires:  xmlunit
+%if ! %{gcj_support}
+Buildarch:      noarch
+%endif
 Requires:       /usr/sbin/update-alternatives
 Requires:	jaf
 Requires:	javamail >= 0:1.2-5jpp
@@ -47,18 +86,20 @@
 Requires:	jakarta-commons-logging >= 0:1.0.1
 Requires:  	xml-commons-apis
 Requires:  	bcel >= 0:5.0
-Requires:	jsse
-Requires:	jce
+Requires:	jsse >= 0:1.0.2-6jpp
+Requires:	jce >= 0:1.2.2
 Requires:  	axis >= 0:1.1
 Requires:  	xml-commons-resolver
 Requires:  	xml-commons
 Buildroot:      %{_tmppath}/%{name}-%{version}-buildroot
 Obsoletes:      openjmx
 Provides:	jmxri
-# libgcj aot-compiled native libraries
-BuildRequires:    java-gcj-compat-devel >= 1.0.31
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 OpenJMX is an open source implementation of the
@@ -80,19 +121,28 @@
 Documentation for %{name}.
 
 %prep
+rm -rf $RPM_BUILD_ROOT
+
 %setup -q
 
+# FIXME To enable iiop when rmic becomes available
+# turn off patch6 and turn on patch4
+# Patch4 is a backport of upstream changes (MX4J) and may go
+# away on future releases
 %patch0 -p1
-%patch2 -p1
+%patch1 -p0
+%patch2 -b .sav
 %patch3 -p1
+#%patch4 -p0
 %patch5 -p1
 %patch6 -p1
 
 cp %{SOURCE1} build
-cp %{SOURCE2} build
+cp %{_sourcedir}/CatalogManager.properties %{_builddir}/%{name}-%{version}/build/
 
 pushd lib
-   ln -sf $(build-classpath junit) .
+#   ln -sf $(build-classpath junit) .
+#   ln -sf $(build-classpath xmlunit) .
    ln -sf $(build-classpath xml-commons-apis) xml-apis.jar
    ln -sf $(build-classpath xerces-j2) xercesImpl.jar
    ln -sf $(build-classpath xalan-j2) xalan.jar
@@ -105,25 +155,27 @@
    ln -sf $(build-classpath wsdl4j) .
    ln -sf $(build-classpath commons-discovery) .
    ln -sf $(build-classpath servletapi5) servlet.jar
+#   ln -sf $(build-classpath jython) .
    ln -sf $(build-classpath jsse) .
+   ln -sf $(build-classpath jsse/jcert) jcert.jar
+   ln -sf $(build-classpath jsse/jnet) jnet.jar
    ln -sf $(build-classpath jaas) .
+   ln -sf $(build-classpath javamail/mailapi) .
+   ln -sf $(build-classpath javamail/smtp) .
+   ln -sf $(build-classpath jaf) .
+   ln -sf $(build-classpath xml-commons-resolver) .
+   ln -sf $(build-classpath xdoclet/xdoclet) .
+   ln -sf $(build-classpath xdoclet/xdoclet-jmx-module) .
+   ln -sf $(build-classpath xdoclet/xdoclet-mx4j-module) .
 popd
 
 %build
-export ANT_OPTS="-Djava.security.manager -Djava.security.policy=$(pwd)/build/mx4j-build.policy"
-export CLASSPATH=$(build-classpath activation javamail/mailapi javamail/smtp \
-   jetty4 jython jakarta-commons-logging xml-commons-apis bcel jsse jaas jce \
-   log4j jaxp_transform_impl axis/axis axis/jaxrpc axis/saaj \
-   xml-commons-resolver xdoclet/xdoclet xdoclet/xdoclet-jmx-module \
-   xdoclet/xdoclet-mx4j-module)
-%ifarch x86_64
-export CLASSPATH=$(build-classpath jacorb/jacorb jonathan-rmi):$CLASSPATH
-%endif
+export OPT_JAR_LIST="ant/ant-junit junit xmlunit ant/ant-trax jaxp_transform_impl"
 
-export CLASSPATH=${CLASSPATH}:%{_builddir}/%{name}-%{version}/classes/core:%{_builddir}/%{name}-%{version}/build
 
 cd build
-ant compile.jmx compile.rjmx compile.tools javadocs docs
+#ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools tests-report javadocs docs
+ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools javadocs docs
 
 %install
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
@@ -149,7 +201,9 @@
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -r dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
-aot-compile-rpm
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -159,19 +213,44 @@
 
 %post
 /usr/sbin/update-alternatives --install %{_javadir}/jmxri.jar jmxri %{_javadir}/%{name}/%{name}-jmx.jar 0
-%{_bindir}/rebuild-gcj-db
+
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
 %postun
 if [ "$1" = "0" ]; then
 	/usr/sbin/update-alternatives --remove jmxri %{_javadir}/%{name}/%{name}-jmx.jar
 fi
-%{_bindir}/rebuild-gcj-db
 
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
 
 %files
 %defattr(-,root,root)
-%{_javadir}/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
+%dir %{_javadir}/%{name}
+%{_javadir}/%{name}/*.jar
+%{_javadir}/%{name}/boa/*.jar
+
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mx4j-3.0.1.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mx4j-tools-3.0.1.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/mx4j-remote-boa-3.0.1.jar.*
+%endif
 
 %files javadoc
 %defattr(-,root,root)
@@ -182,9 +261,32 @@
 %doc dist/docs/*
 
 %changelog
+* Wed Jul 19 2006 Fernando Nasser <fnasser at redhat.com> 0:3.0.1-4jpp_1fc
+- Merge with upstream
+- Do not use jython as it is not available on FC6
+- Do not use jetty4 as it is not available on FC6
+- Do not run tests as xmlunit not available on FC6 (FIXME)
+  so do not BR junit as well
+
+* Tue Jul 18 2006 Fernando Nasser <fnasser at redhat.com> 0:3.0.1-4jpp
+- Remove duplicate macros
+- Use unversioned burlap and hessian
+- Don't use jetty4 as it is not yet available on JPP 1.7
+- Re-add Epoch to the versions required
+- Split patch for removal of poa
+- Add AOT bits
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1:3.0.1-1jpp_10fc
 - rebuild
 
+* Tue Mar 14 2006 Fernando Nasser <fnasser at redhat.com> 0:3.0.1-3jpp
+- Remove dependencies on non-free JXM packages by building MX4J's own
+- Add (re-add?) "java.naming.corba.orb" patch, needed by JOnAS
+
+* Fri Mar 10 2006 Ralph Apel <r.apel at r-apel.de> 0:3.0.1-2jpp
+- Activate burlap and hessian support
+- Most unit tests now pass with java-1.4.2-sun-1.4.2.10-1jpp
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:3.0.1-1jpp_9fc
 - bump again for double-long bug on ppc(64)
 
@@ -247,6 +349,8 @@
 * Wed Apr 20 2005 Fernando Nasser <fnasser at redhat.com> 0:2.1.0-1jpp
 - Upgrade to 2.1.0
 - Do not build caucho part because of version incompatibilities
+  From Andrew Overholt <overholt at redhat.com>
+- add coreutils BuildRequires
 
 * Mon Mar 14 2005 Gary Benson <gbenson at redhat.com> 0:2.1.0-1jpp_2fc
 - Install mx4j.jar as the jmxri.jar alternative instead of
@@ -258,19 +362,6 @@
 * Mon Mar  7 2005 Gary Benson <gbenson at redhat.com> 0:2.1.0-1jpp_1fc
 - Build into Fedora.
 
-* Thu Dec 23 2004 Fernando Nasser <fnasser at redhat.com> 0:2.1.0-1jpp_1rh
-- Merge with upstream for upgrade
-
-* Wed Oct 27 2004 Fernando Nasser <fnasser at redhat.com> 0:2.0.1-2jpp_1rh
-- Merge with upstream for upgrade to 2.0.1
-- Correctly specify CatalogManager.properties as a source file
-- Deactivate jython- and jetty-related classes
-- Disable unit tests, therefore NOT BuildReq xmlunit
-- Disable compliance test, therefore NOT BuildReq jmx, jmxremote
-
-* Fri Oct 1 2004 Andrew Overholt <overholt at redhat.com> 1:1.1.1-4jpp_4rh
-- add coreutils BuildRequires
-
 * Fri Sep 24 2004 Ralph Apel <r.apel at r-apel.de> 0:2.0.1-2jpp
 - Require xml-commons (jpackage), not xml-common (linux)
 - Activate jython- and jetty-related classes
@@ -283,16 +374,6 @@
 - Updated to use mx4j-2.0.1
 - Rebuilt with Ant 1.6.2
 
-* Wed Mar 31 2004 Frank Ch. Eigler <fche at redhat.com> 1:1.1.1-4jpp_3rh
-- bump up epoch for RHUG upgrading
-
-* Fri Mar 26 2004 Frank Ch. Eigler <fche at redhat.com> 0:1.1.1-4jpp_2rh
-- add RHUG upgrade cleanup
-
-* Thu Mar 11 2004 Frank Ch. Eigler <fche at redhat.com: 0:1.1.1-4jpp_1rh
-- RH vacuuming
-- added mx4j-javaxssl.patch to use javax.net.* instead of com.sun.net.*
-
 * Mon Mar 24 2003 Nicolas Mailhot <Nicolas.Mailhot (at) JPackage.org> 1.1.1-4jpp
 - jmxri alternative
 




More information about the fedora-cvs-commits mailing list