[Jpackage-commits] dist/spring-beandoc/devel .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 spring-beandoc-jpp-depmap.xml, NONE, 1.1 spring-beandoc-pom.patch, NONE, 1.1 spring-beandoc-settings.xml, NONE, 1.1 spring-beandoc.spec, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Wed May 28 21:48:55 CEST 2008


Update of /home/projects/jpackage/cvs/dist/spring-beandoc/devel
In directory ryu.zarb.org:/tmp/cvs-serv24288/devel

Modified Files:
	.cvsignore sources 
Added Files:
	spring-beandoc-jpp-depmap.xml spring-beandoc-pom.patch 
	spring-beandoc-settings.xml spring-beandoc.spec 
Log Message:
Import from JPP 5.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/spring-beandoc/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 19:48:37 -0000	1.1
--- .cvsignore	28 May 2008 19:48:53 -0000	1.2
***************
*** 0 ****
--- 1,2 ----
+ spring-beandoc-0.8.1.tar.gz
+ spring-beandoc-autogenerated-files.tar.gz

--- NEW FILE: spring-beandoc-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>local</id>
					<layout>jpp</layout>
					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-maven</id>
					<name>plugins-maven</name>
					<layout>jpp</layout>
					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>

--- NEW FILE: spring-beandoc-jpp-depmap.xml ---
<dependencies>
  <dependency>
	<maven>
	  <groupId>net.sf.saxon</groupId>
	  <artifactId>saxon-dom</artifactId>
	  <version>8.9.0.3</version>
	</maven>
	<jpp>
	  <groupId>JPP</groupId>
	  <artifactId>saxon8-dom</artifactId>
	  <version>8.7</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>xalan</groupId>
	  <artifactId>xalan-serializer</artifactId>
	  <version>2.7.0</version>
	</maven>
	<jpp>
	  <groupId>JPP</groupId>
	  <artifactId>xalan-j2-serializer</artifactId>
	  <version>2.7.0</version>
	</jpp>
  </dependency>

</dependencies>

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/spring-beandoc/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 19:48:37 -0000	1.1
--- sources	28 May 2008 19:48:53 -0000	1.2
***************
*** 0 ****
--- 1,2 ----
+ 1331a2c87027cf4688404dc6ed913edb  spring-beandoc-0.8.1.tar.gz
+ 8a2db7542b2d6c2a0f6ec2214b50376d  spring-beandoc-autogenerated-files.tar.gz

--- NEW FILE: spring-beandoc-pom.patch ---
--- pom.xml.sav0	2007-11-06 02:03:23.000000000 +0100
+++ pom.xml	2008-04-09 15:43:40.000000000 +0200
@@ -259,6 +259,13 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan-serializer</artifactId>
+            <version>2.7.0</version>
+            <type>jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>1.2.14</version>
@@ -289,6 +296,7 @@
                 </reportSets>
                 <configuration>
                     <aggregate>true</aggregate>
+<!--
                     <groups>
                         <group>
                             <title>Spring BeanDoc</title>
@@ -297,12 +305,13 @@
                             </packages>
                         </group>
                     </groups>
+-->
                     <links>
                         <link>
                             http://java.sun.com/j2se/1.4.2/docs/api/
                         </link>
                         <link>
-                            http://www.springframework.org/docs/api/
+                            http://static.springframework.org/spring/docs/2.0.x/api/
                         </link>
                     </links>
                 </configuration>
@@ -320,4 +329,4 @@
         </plugins>
     </reporting>
 
-</project>
\ No newline at end of file
+</project>

--- NEW FILE: spring-beandoc.spec ---
# Copyright (c) 2000-2008, 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.
#

# If you don't want to build with maven, and use straight ant instead,
# give rpmbuild option '--without maven'

%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
%define without_maven %{?_without_maven:1}%{!?_without_maven:0}

%define section   free

Name:           spring-beandoc
Version:        0.8.1
Release:        1jpp
Epoch:          0
Summary:        Spring Beandoc

Group:          Development/Libraries/Java
License:        Apache Software License 2.0
URL:            http://spring-beandoc.sourceforge.net/
Source0:        %{name}-%{version}.tar.gz
# svn export http://spring-beandoc.svn.sourceforge.net/svnroot/spring-beandoc/tags/spring-beandoc-0.8.1/

Source1:        %{name}-settings.xml
Source2:        %{name}-jpp-depmap.xml
Source3:        %{name}-autogenerated-files.tar.gz
Patch0:         spring-beandoc-pom.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}

BuildArch:      noarch
BuildRequires:  jpackage-utils >= 0:1.7.4
BuildRequires:  java-devel = 0:1.5.0
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  ant-junit
BuildRequires:  junit
%if %{with_maven}
BuildRequires:  maven2 >= 0:2.0.7
BuildRequires:  maven2-plugin-ant
BuildRequires:  maven2-plugin-assembly
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-project-info-reports
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-surefire
BuildRequires:  mojo-maven2-plugin-cobertura
%endif
BuildRequires:  jaf_1_1_api
BuildRequires:  saxon8-dom
BuildRequires:  spring2-all
BuildRequires:  stax_1_0_api
Requires:  java >= 0:1.5.0
Requires:  jaf_1_1_api
Requires:  saxon8-dom
Requires:  spring2-all
Requires:  stax_1_0_api

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

%description
BeanDoc is the tool that facilitates documentation and 
graphing of Spring bean factories and application context 
files. Though very easy to use, it is designed to be 
flexible and extensible to meet most needs.

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

%description    javadoc
%{summary}.

%prep
%setup -q 
for j in $(find . -name "*.jar"); do
      mv $j $j.no
done
%patch0 -b .sav0
%if %{without_maven}
gzip -dc %{SOURCE3} | tar xf -
%endif

cp %{SOURCE1} settings.xml
sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" settings.xml
sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" settings.xml
%if %{without_maven}
gzip -dc %{SOURCE2} | tar xf -
%endif

%build
export JAVA_HOME=%{_jvmdir}/java-1.5.0
%if %{with_maven}

export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
mkdir -p $MAVEN_REPO_LOCAL

mkdir external_repo
ln -s %{_javadir} external_repo/JPP

export M2_SETTINGS=$(pwd)/settings.xml
mvn-jpp -e \
        -s $M2_SETTINGS \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
        ant:ant install javadoc:javadoc

%else
export OPT_JAR_LIST="ant/ant-junit junit"
export CLASSPATH=$(build-classpath \
commons-logging \
jdom \
spring2/beans \
spring2/context \
spring2/core \
)
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
%endif

%install
rm -rf $RPM_BUILD_ROOT
install -dm 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 target/%{name}-%{version}.jar \
  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
%add_to_maven_depmap org.springframework.beandoc %{name} %{version} JPP %{name}

#
install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
#
install -dm 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 COPYING $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/LICENSE.txt 

%clean
rm -rf $RPM_BUILD_ROOT

%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}

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

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}/LICENSE.txt
%{_javadir}/*.jar
%{_datadir}/maven2
%{_mavendepmapfragdir}

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

%changelog
* Tue Apr 22 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.2-1jpp
- 1.2
- Build with maven2 by default
- Validate build in mock

* Tue Mar 11 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.0-1jpp
- First release





More information about the JPackage-commits mailing list