[Jpackage-commits] rpms/free/jxta jxta-2.3.2-HttpMessageReceiver.patch, NONE, 1.1.4.2 jxta-2.3.2-build_xml.patch, NONE, 1.1.4.2 jxta-2.3.2.pom, NONE, 1.1.2.1 jxta.spec, NONE, 1.1.6.2 jxta_license.txt, NONE, 1.1.6.2

jpackage jpackage at ryu.zarb.org
Sat Feb 7 10:50:12 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/jxta
In directory ryu.zarb.org:/tmp/pRan3jefK3/rpms/free/jxta

Added Files:
      Tag: JPACKAGE-5_0
	jxta-2.3.2-HttpMessageReceiver.patch 
	jxta-2.3.2-build_xml.patch jxta-2.3.2.pom jxta.spec 
	jxta_license.txt 
Log Message:
2.3.2-3.jpp5

--- NEW FILE: jxta_license.txt ---
The Sun Project JXTA(TM) Software License (Based on the Apache Software License Version 1.1) 


Copyright (c) 2001-2004 Sun Microsystems, Inc. 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. The end-user documentation included with the redistribution, if any, must include the following acknowledgment: "This product includes software developed by Sun Microsystems, Inc. for JXTA(TM) technology." Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear.

4. The names "Sun", "Sun Microsystems, Inc.", "JXTA" and "Project JXTA" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact Project JXTA at http://www.jxta.org.

5. Products derived from this software may not be called "JXTA", nor may "JXTA" appear in their name, without prior written permission of Sun. 

THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 SUN MICROSYSTEMS OR ITS 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.

JXTA is a registered trademark of Sun Microsystems, Inc. in the United States and other countries.
 


--- NEW FILE: jxta-2.3.2.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>jxta</groupId>
  <artifactId>jxta</artifactId>
  <version>2.3.2</version>
</project>

--- NEW FILE: jxta-2.3.2-build_xml.patch ---
--- build.xml.sav	2004-12-07 22:14:28.000000000 +0100
+++ build.xml	2005-02-23 17:07:32.794569456 +0100
@@ -91,8 +91,8 @@
   <property name="build_contrib" value="${build}/contrib" />
   <property name="build_swingTools" value="${build}/swingTools" />
   <property name="dist" value="${basedir}/dist" />
-  <property name="apidoc" value="${jxtaroot}/platform/www/java/api" />
-  <property name="impldoc" value="${jxtaroot}/platform/www/java/impl" />
+  <property name="apidoc" value="${basedir}/www/java/api" />
+  <property name="impldoc" value="${basedir}/www/java/impl" />
   <property name="jnlp" value="${basedir}/jnlp" />
   <property name="rpm" value="${basedir}/rpm" />
   <property name="lib" value="${basedir}/lib" />
@@ -142,10 +142,10 @@
     <!-- JARs -->
     <property name="jxtajar" value="${dist}/jxta.jar" />
     <property name="jxtaextjar" value="${dist}/jxtaext.jar"/>
-    <property name="jxtashelljar" value="${jxtaroot}/shell/binding/java/dist/jxtashell.jar" />
+    <property name="jxtashelljar" value="${basedir}/binding/java/dist/jxtashell.jar" />
    
     <!-- Paths -->
-    <fileset id="shell.files" dir="${jxtaroot}/shell">
+    <fileset id="shell.files" dir="${basedir}/shell">
       <filename name="binding/java/dist/jxtashell.jar" />
     </fileset>
     
@@ -362,7 +362,7 @@
   <target name="jar" depends="compile" description="Creates Unsigned JXTA Platform and Extensions Jar file">
   
     <jar basedir="${build}" jarfile="${jxtajar}">
-      <fileset file="${jxtaroot}/platform/license.txt"/>
+      <fileset file="${basedir}/jxta_license.txt"/>
       <exclude name="kaffe/**" />
       <exclude name="com/**" />  <!-- may be too broad -->
       <exclude name="net/jxta/ext/**"/>
@@ -398,7 +398,7 @@
     </jar>
 
     <jar basedir="${build}" jarfile="${jxtaextjar}">
-      <fileset file="${jxtaroot}/platform/license.txt"/>
+      <fileset file="${basedir}/jxta_license.txt"/>
       <include name="net/jxta/ext/config/**"/>
       <include name="net/jxta/ext/http/**"/>
       <include name="**/*.xml"/>
@@ -588,7 +588,7 @@
     <mkdir dir="${tmp}/service"/>
     
     <jar jarfile="${tmp}/service/jxtaextservice.jar">
-      <fileset file="${jxtaroot}/platform/license.txt"/>
+      <fileset file="${basedir}/jxta_license.txt"/>
       <fileset dir="${build}">
         <include name="net/jxta/ext/service/reflection/**"/>
       </fileset>
@@ -647,6 +647,9 @@
       <link href="http://logging.apache.org/log4j/docs/api/" />
       <classpath>
         <path refid="compile.classpath" />
+        <fileset dir="${dist}">
+          <include name="*.jar"/>
+        </fileset>
       </classpath>
       <sourcepath>
         <pathelement location="${basedir}/api/src/" />
@@ -668,6 +671,9 @@
       <link href="http://platform.jxta.org/nonav/java/api/" offline="true" packagelistLoc="${apidoc}"/>
       <classpath>
         <path refid="ext.classpath" />
+        <fileset dir="${dist}">
+          <include name="*.jar"/>
+        </fileset>
       </classpath>
       <sourcepath>
         <pathelement location="${basedir}/api/src/" />
@@ -705,7 +711,7 @@
   
   <target name="lib-zip" depends="signjar" description="Creates zip file of libs">
     <zip destfile="${dist}/jxta-lib-${net.jxta.build.version}.zip" >
-      <fileset file="${jxtaroot}/platform/license.txt"/>
+      <fileset file="${basedir}/jxta_license.txt"/>
 
       <zipfileset dir="${lib}">
         <include name="**/*.jar" />
@@ -723,7 +729,7 @@
   <target name="lib-tgz" depends="signjar" description="creates tar.gz file of libs">
     <delete file="${dist}/jxta-lib-${net.jxta.build.version}.tar.gz" />
     <tar destfile="${dist}/jxta-lib-${net.jxta.build.version}.tar.gz" compression="gzip" longfile="gnu">
-       <tarfileset file="${jxtaroot}/platform/license.txt"/>
+       <tarfileset file="${basedir}/jxta_license.txt"/>
      
        <tarfileset dir="${lib}">
         <include name="**/*.jar" />
@@ -758,7 +764,7 @@
   
   <target name="jxtaSwing" depends="jxtaSwing-compile" description="Creates jxtaSwing.jar Jar file">
     <jar basedir="${build_swingTools}" jarfile="${dist}/jxtaSwing.jar">
-      <fileset file="${jxtaroot}/platform/license.txt"/>
+      <fileset file="${basedir}/jxta_license.txt"/>
       <manifest>
         <attribute name="Built-By" value="${user.name}" />
         <attribute name="Built-At" value="${DSTAMP}" />
@@ -773,7 +779,7 @@
     </jar>
   </target>
   
-  <target name="jxtaSwing-compile" depends="signjar" description="Builds the SwingTools">
+  <target name="jxtaSwing-compile" depends="jar" description="Builds the SwingTools">
     <!-- Compile the java code into ${build} -->      
 
     <echo message="jxtaSwing: ${build_swingTools}" />
@@ -955,14 +961,14 @@
     </java>
   </target>
   
-   <target name="runtest" depends="signjar" description="text mode test runner">
+   <target name="runtest" depends="jar" description="text mode test runner">
     <ant antfile="${ant}/test.xml" target="text" inheritRefs="true">
       <reference refid="lib.files" torefid="lib.files"/>
       <reference refid="ext.lib.files" torefid="ext.lib.files"/>
     </ant>
   </target>
   
-  <target name="runtestui" depends="signjar" description="ui mode test runner">
+  <target name="runtestui" depends="jar" description="ui mode test runner">
     <ant antfile="${ant}/test.xml" target="ui" inheritRefs="true">
       <reference refid="lib.files" torefid="lib.files"/>
       <reference refid="ext.lib.files" torefid="ext.lib.files"/>

--- NEW FILE: jxta-2.3.2-HttpMessageReceiver.patch ---
--- impl/src/net/jxta/impl/endpoint/servlethttp/HttpMessageReceiver.java.sav	2004-10-22 19:37:58.000000000 +0200
+++ impl/src/net/jxta/impl/endpoint/servlethttp/HttpMessageReceiver.java	2006-08-29 13:19:13.000000000 +0200
@@ -78,7 +78,7 @@
 import org.mortbay.http.handler.ResourceHandler;
 import org.mortbay.jetty.servlet.ServletHandler;
 import org.mortbay.util.InetAddrPort;
-import org.mortbay.util.Log;
+//import org.mortbay.util.Log;
 import org.mortbay.util.MultiException;
 
 import net.jxta.endpoint.EndpointAddress;
@@ -174,7 +174,7 @@
         }
         
         // Disabled Jetty Log
-        Log.instance().disableLog();
+        //Log.instance().disableLog();
 
         // Initialize the Jetty HttpServer
         InetAddrPort addrPort = new InetAddrPort(useInterface, port);
@@ -230,7 +230,7 @@
         try {
             server.start();
             handler.getServletContext().setAttribute("HttpMessageReceiver", this);
-        } catch (MultiException e) {
+        } catch (Exception e) {
             if (LOG.isEnabledFor(Level.ERROR)) {
                 LOG.error("Could not start server", e);
             }

--- NEW FILE: jxta.spec ---
# Copyright (c) 2000-2009, 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 %{?_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:           jxta
Summary:        JXTA P2P protocols
Url:            http://www.jxta.org/
Version:        2.3.2
Release:        3%{dist}
Epoch:          0
License:        Apache 1.1 -style License
Group:          Development/Libraries/Java
Source0:        http://download.jxta.org/build/release/2.3.2/jxta-src-2.3.2.tar.gz
Source1:        jxta_license.txt
Source2:        %{name}-%{version}.pom
Patch0:         jxta-2.3.2-build_xml.patch
Patch1:         jxta-2.3.2-HttpMessageReceiver.patch

BuildRequires:  jpackage-utils >= 0:1.7.5
BuildRequires:  java-devel >= 0:1.5.0
BuildRequires:  ant
BuildRequires:  bouncycastle
BuildRequires:  jaxen
BuildRequires:  jdom
BuildRequires:  jetty5
BuildRequires:  junit
BuildRequires:  log4j
BuildRequires:  servlet_2_4_api
BuildRequires:  swixml
BuildRequires:  xerces-j2
BuildRequires:  xml-commons-jaxp-1.3-apis
Requires:       java >= 0:1.5.0
Requires:       bouncycastle
Requires:       jaxen
Requires:       jdom
Requires:       jetty5
Requires:       log4j
Requires:       servlet_2_4_api
Requires:       swixml
Requires:       xerces-j2
Requires:       xml-commons-jaxp-1.3-apis

Requires(post):   jpackage-utils >= 0:1.7.5
Requires(postun): jpackage-utils >= 0:1.7.5

%if %{gcj_support}
BuildRequires:          java-gcj-compat-devel
Requires(post):         java-gcj-compat
Requires(postun):       java-gcj-compat
%endif
%if ! %{gcj_support}
BuildArch:      noarch
%endif
BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot

%description
JXTA(tm) technology is a set of open protocols that allow 
any connected device on the network ranging from cell 
phones and wireless PDAs to PCs and servers to communicate 
and collaborate in a P2P manner. 

JXTA peers create a virtual network where any peer can 
interact with other peers and resources directly even when 
some of the peers and resources are behind firewalls and 
NATs or are on different network transports.


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

%description javadoc
%{summary}.

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

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

%build
pushd lib
ln -sf $(build-classpath servletapi5) javax.servlet.jar
ln -sf $(build-classpath jetty5/jetty5) org.mortbay.jetty.jar
ln -sf $(build-classpath log4j) log4j.jar
#ln -sf $(build-classpath bouncycastle/bcprov) bcprov-jdk14.jar
ln -sf $(build-classpath bcprov) bcprov-jdk14.jar
popd
pushd ext/lib
ln -sf $(build-classpath jaxen) jaxen-core.jar
ln -sf $(build-classpath jaxen) saxpath.jar
ln -sf $(build-classpath jaxen) jaxen-jdom.jar
ln -sf $(build-classpath jdom)
ln -sf $(build-classpath swixml)
ln -sf $(build-classpath xerces-j2)
ln -sf $(build-classpath xml-commons-apis)
popd
pushd tools
ln -sf $(build-classpath junit) junit.jar
popd
ant jar javadoc service jxtaSwing runtest

%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 dist/jxta.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
install -m 644 dist/jxtaext.jar $RPM_BUILD_ROOT%{_javadir}/%{name}ext-%{version}.jar
install -m 644 dist/jxtaSwing.jar $RPM_BUILD_ROOT%{_javadir}/%{name}Swing-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
install -m 644 dist/jxtaextservice.war $RPM_BUILD_ROOT%{_datadir}/%{name}

install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}

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

%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%postun
%update_maven_depmap
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
  %{_bindir}/rebuild-gcj-db
fi
%endif

%files
%defattr(-,root,root)
%doc jxta_license.txt
%{_javadir}/*
%{_datadir}/%{name}
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}*%{version}.jar.*
%endif

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

%changelog
* Fri Feb 06 2009 Ralph Apel <r.apel at r-apel.de> 0:2.3.2-3.jpp5
- Rebuild for JPP-5 with current best practices

* Tue Oct 17 2006 Ralph Apel <r.apel at r-apel.de> 0:2.3.2-2jpp
- First JPP-1.7 release
- Add post/postun Requires for javadoc
- Add gcj_support option

* Tue Mar 01 2005 Ralph Apel <r.apel at r-apel.de> 0:2.3.2-1jpp
- First release





More information about the JPackage-commits mailing list