rpms/modello/devel modello-build-all-plugins.patch, NONE, 1.1 modello-hibernateold-artifactid-fix.patch, NONE, 1.1 modello-jpp-depmap.xml, NONE, 1.1 modello.script, NONE, 1.1 modello.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Matt Wringe (mwringe)
fedora-extras-commits at redhat.com
Tue Mar 20 07:08:28 UTC 2007
Author: mwringe
Update of /cvs/extras/rpms/modello/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12759/devel
Modified Files:
.cvsignore sources
Added Files:
modello-build-all-plugins.patch
modello-hibernateold-artifactid-fix.patch
modello-jpp-depmap.xml modello.script modello.spec
Log Message:
auto-import modello-1.0-0.1.a8.4jpp.2 on branch devel from modello-1.0-0.1.a8.4jpp.2.src.rpm
modello-build-all-plugins.patch:
--- NEW FILE modello-build-all-plugins.patch ---
--- ./modello-plugins-sandbox/pom.xml.sav 2006-06-13 17:26:21.000000000 -0400
+++ ./modello-plugins-sandbox/pom.xml 2006-06-13 17:26:33.000000000 -0400
@@ -20,6 +20,7 @@
</dependency>
</dependencies>
<modules>
+ <module>modello-plugin-dom4j</module>
<module>modello-plugin-hibernate-old</module>
<module>modello-plugin-jdbc</module>
<module>modello-plugin-ojb</module>
--- ./pom.xml.sav 2006-01-11 22:40:51.000000000 -0500
+++ ./pom.xml 2006-06-13 17:26:12.000000000 -0400
@@ -161,6 +161,7 @@
<module>modello-core</module>
<module>modello-test</module>
<module>modello-plugins</module>
+ <module>modello-plugins-sandbox</module>
</modules>
<dependencies>
<dependency>
modello-hibernateold-artifactid-fix.patch:
--- NEW FILE modello-hibernateold-artifactid-fix.patch ---
--- ./modello-plugins-sandbox/modello-plugin-hibernate-old/pom.xml.sav 2006-06-13 16:02:05.000000000 -0400
+++ ./modello-plugins-sandbox/modello-plugin-hibernate-old/pom.xml 2006-06-13 16:02:17.000000000 -0400
@@ -5,7 +5,7 @@
<artifactId>modello-plugins-sandbox</artifactId>
<version>1.0-alpha-4-SNAPSHOT</version>
</parent>
- <artifactId>modello-plugin-hibernate</artifactId>
+ <artifactId>modello-plugin-hibernate-old</artifactId>
<version>1.0-alpha-4-SNAPSHOT</version>
<name>Modello Hibernate Plugin</name>
<dependencies>
--- NEW FILE modello-jpp-depmap.xml ---
<dependencies>
<dependency>
<maven>
<groupId>wutka</groupId>
<artifactId>dtdparser</artifactId>
<version>1.21</version>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>dtdparser</artifactId>
<version>1.21</version>
</jpp>
</dependency>
<!-- unnecessary jars -->
<dependency>
<maven>
<groupId>hibernate</groupId>
<artifactId>hibernate</artifactId>
<version>2.0.3</version>
</maven>
</dependency>
<dependency>
<maven>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.7.2.2</version>
</maven>
</dependency>
<dependency>
<maven>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>7.4.1-jdbc3</version>
</maven>
</dependency>
</dependencies>
--- NEW FILE modello.script ---
#!/bin/sh
export CLASSPATH=$(build-classpath modello/core modello/plugin-xpp3 modello/plugin-xml plexus/container-default plexus/utils classworlds)
${JAVA_HOME}/bin/java org.codehaus.modello.ModelloCli $@
--- NEW FILE modello.spec ---
# 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 _with_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 repo_dir .m2/repository
%define namedversion 1.0-alpha-8
%define maven_settings_file %{_builddir}/%{name}-%{namedversion}/settings.xml
Name: modello
Version: 1.0
Release: 0.1.a8.4jpp.2%{?dist}
Epoch: 0
Summary: Modello Data Model toolkit
License: MIT
Group: Development/Java
URL: http://modello.codehaus.org/
Source0: %{name}-%{namedversion}-src.tar.gz
# svn export svn://svn.modello.codehaus.org/modello/tags/modello-1.0-alpha-8/
# tar czf modello-1.0-alpha-8-src.tar.gz modello-1.0-alpha-8/
Source1: modello.script
Source2: %{name}-jpp-depmap.xml
Patch0: modello-hibernateold-artifactid-fix.patch
Patch1: modello-build-all-plugins.patch
%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}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant >= 0:1.6
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: maven2 >= 2.0.4-9
BuildRequires: maven2-plugin-compiler
BuildRequires: maven2-plugin-install
BuildRequires: maven2-plugin-jar
BuildRequires: maven2-plugin-javadoc
BuildRequires: maven2-plugin-release
BuildRequires: maven2-plugin-resources
BuildRequires: maven2-plugin-surefire
BuildRequires: maven2-plugin-plugin
BuildRequires: classworlds >= 0:1.1
BuildRequires: dtdparser
BuildRequires: plexus-container-default
BuildRequires: plexus-utils
BuildRequires: plexus-velocity
BuildRequires: velocity
Requires: classworlds >= 0:1.1
Requires: dtdparser
Requires: plexus-container-default
Requires: plexus-utils
Requires: plexus-velocity
Requires: velocity
Requires(post): jpackage-utils >= 0:1.7.2
Requires(postun): jpackage-utils >= 0:1.7.2
Provides: modello-maven-plugin = %{epoch}:%{version}-%{release}
Obsoletes: modello-maven-plugin < 0:1.0-0.a8.3jpp
%description
Modello is a Data Model toolkit in use by the
http://maven.apache.org/maven2.
It all starts with the Data Model. Once a data model is defined,
the toolkit can be used to generate any of the following at compile
time.
Java POJOs of the model.
Java POJOs to XML Writer (provided via xpp3 or dom4j).
XML to Java Pojos Reader (provided via xpp3 or dom4j).
XDoc documentation of the data model.
Java model to [Prevayler|http://www.prevayler.org/] Store.
Java model to [JPOX|http://www.jpox.org/] Store.
Java model to [JPOX|http://www.jpox.org/] Mapping.
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
Requires(post): /bin/rm,/bin/ln
Requires(postun): /bin/rm
%description javadoc
Javadoc for %{name}.
%prep
%setup -q -n %{name}-%{namedversion}
%patch0 -b .sav
%patch1 -b .sav
find . -name release-pom.xml -exec rm -f '{}' \;
for i in modello-plugins-sandbox/modello-plugin-ldap/src/test/java/org/codehaus/modello/plugin/ldap/ObjStateFactoryModelloGeneratorTest.java \
modello-plugins-sandbox/modello-plugin-ldap/src/test/java/org/codehaus/modello/plugin/ldap/LdapSchemaGeneratorTest.java \
modello-plugins-sandbox/modello-plugin-ojb/src/test/java/org/codehaus/modello/plugin/ojb/OjbModelloGeneratorTest.java \
modello-plugins-sandbox/modello-plugin-stash/src/test/java/org/codehaus/modello/plugin/stash/StashModelloGeneratorTest.java \
modello-plugins-sandbox/modello-plugin-hibernate-store/src/test/java/org/codehaus/modello/plugin/hibernate/HibernateModelloGeneratorTest.java; do
sed -i -e s:org.codehaus.modello.ModelloGeneratorTest:org.codehaus.modello.AbstractModelloGeneratorTest:g $i
sed -i -e s:"extends ModelloGeneratorTest":"extends AbstractModelloGeneratorTest":g $i
done
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
mvn-jpp \
-e \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-Dmaven2.jpp.depmap.file=%{SOURCE2} \
-Dmaven.test.failure.ignore=true \
install javadoc:javadoc
%install
rm -rf $RPM_BUILD_ROOT
# poms
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
for i in `find . -name pom.xml | grep -v \\\./pom.xml`; do
cp -p $i $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.`basename \`dirname $i\``.pom
done
# Depmap fragments
for i in `find . -name pom.xml | grep -v \\\./pom.xml | grep -v modello-plugins-sandbox`; do
# i is in format ..../artifactid/pom.xml
artifactname=`basename \`dirname $i\` | sed -e s:^modello-::g`
%add_to_maven_depmap org.codehaus.modello modello-$artifactname %{namedversion} JPP/%{name} $artifactname
done
# sandbox plugins are a different version
for i in `find . -name pom.xml | grep modello-plugins-sandbox`; do
# i is in format ..../artifactid/pom.xml
artifactname=`basename \`dirname $i\` | sed -e s:^modello-::g`
%add_to_maven_depmap org.codehaus.modello modello-$artifactname 1.0-alpha-4-SNAPSHOT JPP/%{name} $artifactname
done
cp -p pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.modello-modello.pom
%add_to_maven_depmap org.codehaus.modello modello %{namedversion} JPP/%{name} modello
# script
install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
for jar in $(find -type f -name "*.jar" | grep -E target/.*.jar); do
install -m 644 $jar $RPM_BUILD_ROOT%{_javadir}/%{name}/`basename $jar |sed -e s:modello-::g`
done
(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{namedversion}*; do ln -sf ${jar} `echo $jar| sed "s|-%{namedversion}||g"`; done)
# Do it again for sandbox plugins, which have a different version
(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-1.0-alpha-4-SNAPSHOT*; do ln -sf ${jar} `echo $jar| sed "s|-1.0-alpha-4-SNAPSHOT||g"`; done)
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
for target in $(find -type d -name target); do
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/`basename \`dirname $target\` | sed -e s:modello-::g`
cp -pr $target/site/apidocs/* $jar $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/`basename \`dirname $target\` | sed -e s:modello-::g`
done
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%if %{gcj_support}
%{_bindir}/aot-compile-rpm
%endif
%clean
rm -rf $RPM_BUILD_ROOT
%post
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%update_maven_depmap
%postun
%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%update_maven_depmap
%files
%defattr(-,root,root,-)
%{_datadir}/maven2
%dir %{_javadir}/%{name}
%{_javadir}/%{name}
%attr(755,root,root) %{_bindir}/*
%{_mavendepmapfragdir}
%if %{gcj_support}
%attr(-,root,root) %dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/*.jar.*
%endif
%config(noreplace) /etc/maven/fragments/modello
%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/*
%changelog
* Tue Mar 13 2007 Matt Wringe <mwringe at redhat.com> 0:1.0-0.1.a8.4jpp.2
- Change license to MIT to reflex the actual license specified in the
source headers.
- fix various rpmlint issues
* Mon Feb 26 2007 Tania Bento <tbento at redhat.com> 0:1.0-0.1.a8.4jpp.1
- Fixed %%Release.
- Fixed %%License.
- Fixed %%BuildRoot.
- Removed %%Vendor.
- Removed %%Distribution.
- Defined _with_gcj_support and gcj_support.
- Fixed instructions on how to generate the source drop.
* Fri Dec 01 2006 Deepak Bhole <dbhole at redhat.com> 1.0-0.a8.4jpp
- Added an obsoletes for older versions of the plugin
* Thu Oct 19 2006 Deepak Bhole <dbhole at redhat.com> 1.0-0.a8.3jpp
- Update for maven2 9jpp
- Merge maven-plugin subpackage into the main one
* Mon Sep 11 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a8.2jpp
- Add gcj_support option
- Add post/postun Requires for javadoc
- Don't omit maven-plugin upload
* Fri Jun 23 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.0-0.a8.1jpp
- Upgrade to 1.0-alpha-8
- Remove ant build, add maven2 build
* Thu Jun 01 2006 Fernando Nasser <fnasser at redhat.com> - 0:1.0-0.a4.2jpp
- First JPP 1.7 build
* Mon Nov 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a4.1jpp
- First JPackage build
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/modello/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 14 Mar 2007 19:18:34 -0000 1.1
+++ .cvsignore 20 Mar 2007 07:07:55 -0000 1.2
@@ -0,0 +1 @@
+modello-1.0-alpha-8-src.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/modello/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 14 Mar 2007 19:18:34 -0000 1.1
+++ sources 20 Mar 2007 07:07:55 -0000 1.2
@@ -0,0 +1 @@
+343dd17dd1cf37d619d72186c0769e7d modello-1.0-alpha-8-src.tar.gz
More information about the fedora-extras-commits
mailing list