[Jpackage-commits] dist/jboss-common/devel .cvsignore, 1.1, 1.2 jboss-common-build-compile.patch, NONE, 1.1 jboss-common-build.patch, NONE, 1.1 jboss-common.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Wed May 28 20:38:56 CEST 2008


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

Modified Files:
	.cvsignore sources 
Added Files:
	jboss-common-build-compile.patch jboss-common-build.patch 
	jboss-common.spec 
Log Message:
Import from JPP 5.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jboss-common/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 18:38:35 -0000	1.1
--- .cvsignore	28 May 2008 18:38:54 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ jboss-common-1.2.1-src.tar.gz

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jboss-common/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 18:38:35 -0000	1.1
--- sources	28 May 2008 18:38:54 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ dff62dcf11e70508fafc3214e76ce010  jboss-common-1.2.1-src.tar.gz

--- NEW FILE: jboss-common-build.patch ---
--- build.xml.sav1	2006-09-27 00:54:15.000000000 +0200
+++ build.xml	2007-11-02 16:08:16.000000000 +0100
@@ -86,6 +86,12 @@
       <ant antfile="build-compile.xml" target="compile-classes"/>
   </target>
 
+  <target name="apidocs"
+          description="reate all docs."
+          depends="compile">
+      <ant antfile="build-compile.xml" target="apidocs"/>
+  </target>
+
   <!-- ================================================================== -->
   <!-- Archives                                                           -->
   <!-- ================================================================== -->

--- NEW FILE: jboss-common.spec ---
# Copyright (c) 2000-2007, 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 section free
%define jbcname jboss-common

Summary:        JBoss Common
URL:            http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossCommonProject
Source0:        jboss-common-1.2.1-src.tar.gz
# svn export http://anonsvn.jboss.org/repos/common/common-old/tags/JBossCommon_1_2_1_GA/ jboss-common-1.2.1-src

Patch0:         jboss-common-build-compile.patch
Patch1:         jboss-common-build.patch

Name:           jboss-common
Version:        1.2.1
Release:        1jpp
Epoch:          0
License:        LGPL
Group:          Development/Java
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
BuildArch:      noarch
BuildRequires:  java-devel >= 0:1.5.0
BuildRequires:  jpackage-utils >= 0:1.7.3
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  ant-nodeps
BuildRequires:  jboss4-buildmagic-tasks
BuildRequires:  concurrent
BuildRequires:  dtdparser
BuildRequires:  jakarta-commons-httpclient
BuildRequires:  jakarta-slide-webdavclient
BuildRequires:  log4j
BuildRequires:  ws-jaxme
BuildRequires:  xerces-j2
BuildRequires:  xml-commons-jaxp-1.3-apis
BuildRequires:  xml-commons-resolver11
Requires:       jpackage-utils >= 0:1.7.3
Requires:       jbossxb = 0:1.0.0.1
Requires:       concurrent
Requires:       dtdparser
Requires:       jakarta-commons-httpclient
Requires:       jakarta-slide-webdavclient
Requires:       log4j
Requires:       ws-jaxme
Requires:       xerces-j2
Requires:       xml-commons-jaxp-1.3-apis
Requires:       xml-commons-resolver11
Provides:       jboss-common-bootstrap = %{epoch}:%{version}-%{release}
Obsoletes:      jboss-common-bootstrap = %{epoch}:%{version}-%{release}
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

%description
The common module in JBossAS has been promoted
to a standalone project.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation
Requires(post): /bin/rm /bin/ln
Requires(postun): /bin/rm

%description javadoc
%{summary}

%package src
Summary:        Source jar for %{name}
Group:          Development/Java
Requires:       %{name} = %{epoch}:%{version}-%{release}

%description src
%{summary}

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

pushd tools/lib
ln -sf $(build-classpath jboss4/jboss4-buildmagic-tasks) buildmagic-tasks.jar
popd

mkdir -p thirdparty/apache-slide/client/lib
pushd thirdparty/apache-slide/client/lib
ln -sf $(build-classpath commons-httpclient)
ln -sf $(build-classpath slide/slide-webdavclient-webdavlib) webdavlib.jar
popd

mkdir -p thirdparty/apache-jaxme/lib
pushd thirdparty/apache-jaxme/lib
ln -sf $(build-classpath jaxme/jaxmexs)
popd

mkdir -p thirdparty/oswego-concurrent/lib
pushd thirdparty/oswego-concurrent/lib
ln -sf $(build-classpath concurrent)
popd

mkdir -p thirdparty/wutka-dtdparser/lib
pushd thirdparty/wutka-dtdparser/lib
ln -sf $(build-classpath dtdparser) dtdparser121.jar
popd

mkdir -p thirdparty/apache-log4j/lib
pushd thirdparty/apache-log4j/lib
ln -sf $(build-classpath log4j)
popd

mkdir -p thirdparty/apache-xerces/lib
pushd thirdparty/apache-xerces/lib
ln -sf $(build-classpath xml-commons-apis) xml-apis.jar
ln -sf $(build-classpath xml-commons-resolver) resolver.jar
ln -sf $(build-classpath xerces-j2) xercesImpl.jar
popd

%build
export JAVA_HOME=/usr/lib/jvm/java-1.5.0
export OPT_JAR_LIST="ant/ant-nodeps"
ant jars
rm -rf src/main/org/apache
rm -rf src/main/org/jboss/xb/
rm -rf src/main/org/jboss/xml/
ant apidocs

%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/jboss-common

install -p -m 0644 output/lib/%{jbcname}.jar $RPM_BUILD_ROOT%{_javadir}/jboss-common/%{jbcname}-%{version}.jar
install -p -m 0644 output/lib/%{jbcname}-client.jar $RPM_BUILD_ROOT%{_javadir}/jboss-common/%{jbcname}-client-%{version}.jar
install -p -m 0644 output/lib/%{jbcname}-sources.jar $RPM_BUILD_ROOT%{_javadir}/jboss-common/%{jbcname}-sources-%{version}.jar
install -p -m 0644 output/lib/namespace.jar $RPM_BUILD_ROOT%{_javadir}/jboss-common/%{jbcname}-namespace-%{version}.jar
install -p -m 0644 output/lib/testsuite-support.jar $RPM_BUILD_ROOT%{_javadir}/jboss-common/%{jbcname}-testsuite-support-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir}/jboss-common && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

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

%clean
rm -rf $RPM_BUILD_ROOT

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

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

%files
%defattr(-,root,root,-)
%dir %{_javadir}/jboss-common
%{_javadir}/jboss-common/%{jbcname}-%{version}.jar
%{_javadir}/jboss-common/%{jbcname}.jar
%{_javadir}/jboss-common/%{jbcname}-client*.jar
%{_javadir}/jboss-common/%{jbcname}-namespace*.jar
%{_javadir}/jboss-common/%{jbcname}-testsuite-support*.jar

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

%files src
%defattr(-,root,root,-)
%{_javadir}/jboss-common/%{jbcname}-sources*.jar

%changelog
* Mon Nov 05 2007 Ralph Apel <r.apel at r-apel.de> 0:1.2.1-1jpp
- First standalone build


--- NEW FILE: jboss-common-build-compile.patch ---
--- build-compile.xml.sav0	2006-09-20 23:11:05.000000000 +0200
+++ build-compile.xml	2007-11-02 16:19:06.000000000 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE project [
    <!ENTITY buildmagic SYSTEM "tools/etc/buildmagic/buildmagic.ent">
-   <!ENTITY libraries SYSTEM "thirdparty/libraries.ent">
+   <!ENTITY libraries SYSTEM "tools/etc/buildmagic/libraries.ent">
    <!ENTITY targets SYSTEM "tools/etc/buildmagic/targets.ent">   
 ]>
 
@@ -29,9 +29,14 @@
   <target name="compile-classes"
     depends="_default:compile-classes"/>
 
+  <target name="apidocs"
+    depends="init,docs"/>
+
 
 <target name="copyjar">
 <!-- Use jboss-xml-binding.jar from the repository -->
+<!--
     <copy todir="${build.lib}" file="${jboss.jbossxb.lib}/jboss-xml-binding.jar"/>
+-->
 </target>
 </project>




More information about the JPackage-commits mailing list