[Jpackage-commits] dist/p2psockets/devel .cvsignore, 1.1, 1.2 jxta_license.txt, NONE, 1.1 p2psockets-1_1_4-build.patch, NONE, 1.1 p2psockets-1_2-build_xml.patch, NONE, 1.1 p2psockets-core-1.1.4.pom, NONE, 1.1 p2psockets.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Sat Feb 7 11:26:05 CET 2009


Update of /home/projects/jpackage/cvs/dist/p2psockets/devel
In directory ryu.zarb.org:/tmp/cvs-serv32386/devel

Modified Files:
	.cvsignore sources 
Added Files:
	jxta_license.txt p2psockets-1_1_4-build.patch 
	p2psockets-1_2-build_xml.patch p2psockets-core-1.1.4.pom 
	p2psockets.spec 
Log Message:
Import p2psockets into devel

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/p2psockets/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	7 Feb 2009 10:14:52 -0000	1.1
--- .cvsignore	7 Feb 2009 10:26:02 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ p2psockets-1_1_4.zip

--- NEW FILE: p2psockets-1_1_4-build.patch ---
--- build.xml.sav	2009-01-18 19:47:17.000000000 +0100
+++ build.xml	2009-01-18 19:48:07.000000000 +0100
@@ -157,6 +157,7 @@
 		<delete dir="${p2psockets.docs.javadoc}"/>
 		<mkdir dir="${p2psockets.docs.javadoc}"/>
 		<javadoc sourcepath="${p2psockets.src.java}" destdir="${p2psockets.docs.javadoc}"
+				 source="1.4"
 				 packagenames="*" author="true"
 				 excludepackagenames="gnu.rex.*"
 				 version="true" windowtitle="P2P Sockets, Extensions API, and Custom Ant Tasks">
@@ -534,4 +535,4 @@
 	<echo message="file in this directory for details"/>
   </target>
   
-</project>
\ No newline at end of file
+</project>

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/p2psockets/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	7 Feb 2009 10:14:52 -0000	1.1
--- sources	7 Feb 2009 10:26:03 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ e13bc148a3e18eb257f306a82312a789  p2psockets-1_1_4.zip

--- NEW FILE: p2psockets-core-1.1.4.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>p2psockets</groupId>
  <artifactId>p2psockets-core</artifactId>
  <version>1.1.2</version>
</project>
--- NEW FILE: p2psockets.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:           p2psockets
Summary:        A reimplementation of standard Java sockets on top of JXTA
Url:            http://p2psockets.jxta.org/
Version:        1.1.4
Release:        4%{dist}
Epoch:          0
License:        Apache 1.1 -style License
Group:          Development/Libraries/Java
Source0:        http://p2psockets.jxta.org/releases/unstable/p2psockets-1_1_4.zip
Source1:        jxta_license.txt
Source2:        p2psockets-core-1.1.4.pom
Patch0:         p2psockets-1_2-build_xml.patch
Patch1:         p2psockets-1_1_4-build.patch

BuildRequires:  jpackage-utils >= 0:1.7.5
BuildRequires:  ant >= 0:1.6
BuildRequires:  ant-contrib
BuildRequires:  java-devel >= 0:1.5.0
BuildRequires:  junit

BuildRequires:  bouncycastle
BuildRequires:  cryptix
BuildRequires:  cryptix-asn1
BuildRequires:  gnu-regexp
BuildRequires:  jakarta-commons-httpclient
BuildRequires:  jakarta-commons-logging
BuildRequires:  jaxen
BuildRequires:  jdom
BuildRequires:  jetty5
BuildRequires:  jxta
BuildRequires:  mx4j
BuildRequires:  log4j
BuildRequires:  servlet_2_4_api
BuildRequires:  tomcat5-jasper
BuildRequires:  xerces-j2
BuildRequires:  xmlrpc2
BuildRequires:  xml-commons-jaxp-1.3-apis
Requires:       java >= 0:1.5.0
Requires:       bouncycastle
Requires:       cryptix
Requires:       cryptix-asn1
Requires:       gnu-regexp
Requires:       jakarta-commons-httpclient
Requires:       jakarta-commons-logging
Requires:       jaxen
Requires:       jdom
Requires:       jetty5
Requires:       jxta
Requires:       mx4j
Requires:       log4j
Requires:       servlet_2_4_api
Requires:       tomcat5-jasper
Requires:       xerces-j2
Requires:       xmlrpc2
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
P2P Sockets makes it easy to write peer-to-peer 
applications based on JXTA. P2P Sockets allows 
programmers to gain much of the power of JXTA, such 
as NAT and firewall traversal, without being exposed 
to its complexity. It does this through ports of 
popular software projects, such as a web server and 
web services stack, to work on the JXTA peer-to-peer 
network. This includes a web server (Jetty) that can 
receive requests and serve content over the peer-to-peer 
network; a servlet and JSP engine (Jetty and Jasper) that 
allows existing servlets and JSPs to serve P2P clients; 
an XML-RPC client and server (Apache XML-RPC) for 
accessing and exposing P2P XML-RPC endpoints; an HTTP/1.1 
client (Apache Commons HTTP-Client) that can access P2P 
web servers; a gateway (Smart Cache) to make it possible 
for existing browsers to access P2P web sites; and a 
WikiWiki (JSPWiki) that can be used to host WikiWikis on 
your local machine that other peers can access and edit 
through the P2P network. P2P Sockets also introduces 
implementations of java.net.Socket and 
java.net.ServerSocket that can work on the JXTA network 
as well as a simple, light-weight, distributed, 
human-friendly, and non-secure DNS system. 


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

%description javadoc
%{summary}.

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

%description manual
%{summary}.

%prep
%setup -q -n %{name}
chmod -R go=u-w *
cp %{SOURCE1} jxta_license.txt
find . -name "*.jar" -exec rm {} \;

%patch0 -b .sav0
%patch1 -b .sav1

%build
pushd lib
ln -sf $(build-classpath ant-contrib) .
ln -sf $(build-classpath ant) .
ln -sf $(build-classpath xmlrpc2) .
#ln -sf $(build-classpath bouncycastle/bcprov) .
ln -sf $(build-classpath bcprov) .
ln -sf $(build-classpath commons-httpclient) .
ln -sf $(build-classpath commons-logging) .
ln -sf $(build-classpath cryptix) .
ln -sf $(build-classpath cryptix-asn1) .
ln -sf $(build-classpath gnu.regexp) .
ln -sf $(build-classpath jasper5-compiler) .
ln -sf $(build-classpath jasper5-runtime) .
ln -sf $(build-classpath servlet_2_4_api) .
ln -sf $(build-classpath jaxen) .
ln -sf $(build-classpath jsse) .
ln -sf $(build-classpath jdom) .
ln -sf $(build-classpath mx4j/mx4j) .
ln -sf $(build-classpath mx4j/mx4j-tools) .
#jnet.jar
#jogg-0.0.5.jar
#jorbis-0.0.12.jar
ln -sf $(build-classpath junit) .
#jxtacms.jar
ln -sf $(build-classpath jxtaSwing) .
ln -sf $(build-classpath jxtaext) .
ln -sf $(build-classpath jxta) .
#jxtaptls.jar
#jxtasecurity.jar
#jxtashell.jar
ln -sf $(build-classpath log4j) .
ln -sf $(build-classpath jetty5/jetty5) .
#p2psockets-ant-custom.jar
ln -sf $(build-classpath xerces-j2) .
ln -sf $(build-classpath xml-commons-jaxp-1.3-apis) .
popd
export p2psockets_home=$(pwd)
export OPT_JAR_LIST="ant-contrib"
ant build jar javadoc 


%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -m 644 dist/lib/%{name}-apache-httpclient.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-httpclient-%{version}.jar
install -m 644 dist/lib/%{name}-apache-xmlrpc.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-apache-xmlrpc-%{version}.jar
install -m 644 dist/lib/%{name}-core.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-core-%{version}.jar
install -m 644 dist/lib/%{name}-examples.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-examples-%{version}.jar
install -m 644 dist/lib/%{name}-jetty.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jetty-%{version}.jar
install -m 644 dist/lib/%{name}-scache.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-scache-%{version}.jar
install -m 644 dist/lib/%{name}-tests.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-tests-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in %{name}-*-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|%{name}-||g"`; done)
(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && 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 jxta_license.txt $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}-%{name}-core.pom
%add_to_maven_depmap %{name} %{name}-core %{version} JPP/%{name} %{name}-core

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

# manual
install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr www/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

%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)
%{_javadir}/*
%{_datadir}/%{name}
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/*-%{version}.jar.*
%attr(-,root,root) %{_libdir}/debug%{_libdir}/gcj/%{name}/*-%{version}.jar.*
%endif

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

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

%changelog
* Fri Feb 06 2009 Ralph Apel <r.apel at r-apel.de> 0:1.1.4-4.jpp5
- Rebuild for JPP5 with current best practices

* Mon Aug 06 2007 Ralph Apel <r.apel at r-apel.de> 0:1.1.4-3jpp
- Change dependency from xmlrpc to xmlrpc2

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

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


--- 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: p2psockets-1_2-build_xml.patch ---
--- build_common.xml.sav	2005-02-23 20:44:22.374812640 +0100
+++ build_common.xml	2005-02-23 20:46:47.424761696 +0100
@@ -44,13 +44,13 @@
 	
   <!-- core-libs jar names properties -->
   
-  	<property name="ant-contrib.jar"        		   value="${p2psockets.lib.dir}/ant-contrib-0.6.jar"/>  
+  	<property name="ant-contrib.jar"        		   value="${p2psockets.lib.dir}/ant-contrib.jar"/>  
   	<property name="cryptix-asn1.jar"        		   value="${p2psockets.lib.dir}/cryptix-asn1.jar"/>
-  	<property name="cryptix32.jar"             		   value="${p2psockets.lib.dir}/cryptix32.jar"/>
-	<property name="bcprov-jdk14.jar"				   value="${p2psockets.lib.dir}/bcprov-jdk14.jar"/>
-  	<property name="javax.servlet.jar"       		   value="${p2psockets.lib.dir}/javax.servlet.jar"/>
-	<property name="jaxen-core.jar"					   value="${p2psockets.lib.dir}/jaxen-core.jar"/>
-	<property name="jaxen-jdom.jar"					   value="${p2psockets.lib.dir}/jaxen-jdom.jar"/>
+  	<property name="cryptix32.jar"             		   value="${p2psockets.lib.dir}/cryptix.jar"/>
+	<property name="bcprov-jdk14.jar"				   value="${p2psockets.lib.dir}/bcprov.jar"/>
+  	<property name="javax.servlet.jar"       		   value="${p2psockets.lib.dir}/servletapi4.jar"/>
+	<property name="jaxen-core.jar"					   value="${p2psockets.lib.dir}/jaxen.jar"/>
+	<property name="jaxen-jdom.jar"					   value="${p2psockets.lib.dir}/jaxen.jar"/>
 	<property name="jdom.jar"					       value="${p2psockets.lib.dir}/jdom.jar"/>
   	<property name="jsse.jar"                		   value="${p2psockets.lib.dir}/jsse.jar"/>
   	<property name="jxta.jar"                		   value="${p2psockets.lib.dir}/jxta.jar"/>
@@ -60,24 +60,24 @@
   	<property name="jxtashell.jar"           		   value="${p2psockets.lib.dir}/jxtashell.jar"/>
 	<property name="jxtaSwing.jar"					   value="${p2psockets.lib.dir}/jxtaSwing.jar"/>
   	<property name="log4j.jar"               		   value="${p2psockets.lib.dir}/log4j.jar"/>
-  	<property name="org.mortbay.jetty.jar"   		   value="${p2psockets.lib.dir}/org.mortbay.jetty.jar"/> 
-	<property name="saxpath.jar"					   value="${p2psockets.lib.dir}/saxpath.jar"/> 	  	  	  	  	  	  	  	
+  	<property name="org.mortbay.jetty.jar"   		   value="${p2psockets.lib.dir}/jetty4.jar"/> 
+	<property name="saxpath.jar"					   value="${p2psockets.lib.dir}/jaxen.jar"/> 	  	  	  	  	  	  	  	
   	
   <!-- ext-libs jar names properties -->  	
   
   	<property name="ant.jar" 			     		   value="${p2psockets.lib.dir}/ant.jar"/>
-  	<property name="apache-xmlrpc.jar"       		   value="${p2psockets.lib.dir}/apache-xmlrpc.jar"/>
+  	<property name="apache-xmlrpc.jar"       		   value="${p2psockets.lib.dir}/xmlrpc.jar"/>
   	<property name="commons-logging.jar"     		   value="${p2psockets.lib.dir}/commons-logging.jar"/> 
   	<property name="httpclient.jar" 				   value="${p2psockets.lib.dir}/commons-httpclient.jar"/> 
-  	<property name="jasper-compiler.jar" 	 		   value="${p2psockets.lib.dir}/jasper-compiler.jar"/> 
-  	<property name="jasper-runtime.jar" 	 		   value="${p2psockets.lib.dir}/jasper-runtime.jar"/>
-  	<property name="jcert.jar"          	 		   value="${p2psockets.lib.dir}/jcert.jar"/>
+  	<property name="jasper-compiler.jar" 	 		   value="${p2psockets.lib.dir}/jasper4-compiler.jar"/> 
+  	<property name="jasper-runtime.jar" 	 		   value="${p2psockets.lib.dir}/jasper4-runtime.jar"/>
+  	<property name="jcert.jar"          	 		   value="${p2psockets.lib.dir}/jsse.jar"/>
   	<property name="jmxri.jar"          	 		   value="${p2psockets.lib.dir}/jmxri.jar"/>
   	<property name="jmxtools.jar"        	 		   value="${p2psockets.lib.dir}/jmxtools.jar"/>
-  	<property name="jnet.jar"           	 		   value="${p2psockets.lib.dir}/jnet.jar"/>
-  	<property name="xercesImpl.jar"        	 		   value="${p2psockets.lib.dir}/xercesImpl.jar"/> 
-  	<property name="xml-apis.jar"          	 		   value="${p2psockets.lib.dir}/xml-apis.jar"/> 
-  	<property name="xmlParserAPIs.jar"       		   value="${p2psockets.lib.dir}/xmlParserAPIs.jar"/>
+  	<property name="jnet.jar"           	 		   value="${p2psockets.lib.dir}/jsse.jar"/>
+  	<property name="xercesImpl.jar"        	 		   value="${p2psockets.lib.dir}/xerces-j2.jar"/> 
+  	<property name="xml-apis.jar"          	 		   value="${p2psockets.lib.dir}/xml-commons-apis.jar"/> 
+  	<property name="xmlParserAPIs.jar"       		   value="${p2psockets.lib.dir}/xml-commons-apis.jar"/>
 
   <!-- ant extension jar names properties -->
 




More information about the JPackage-commits mailing list