rpms/modello
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to latest upstream version (1.4)

Browse Source 
Re-enable javadoc generation
Remove old workarounds/patches
This commit is contained in:
Stanislav Ochotnicky 2010-07-30 14:57:51 +02:00
parent 53f55da377
commit b1568b72a3
5 changed files with 186 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
modello-1.0-alpha-15-src.tar.gz
modello-1.0.1-src.tar.gz
modello-1.1-src.tar.gz
modello-1.4-src.tar.xz

109
0001-Use-public-function-for-component-lookup.patch Normal file
View File

@ -0,0 +1,109 @@
From f2b1ab1a8981da2799a81bf91b2e876eb83502df Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Tue, 20 Jul 2010 15:04:13 +0200
Subject: [PATCH] Use public function for component lookup
---
.../modello/plugin/dom4j/Dom4jGeneratorTest.java | 2 +-
.../xml/stax/AbstractStaxGeneratorTestCase.java | 2 +-
.../modello/plugin/xdoc/XdocGeneratorTest.java | 2 +-
.../modello/plugins/xml/XmlModelloPluginTest.java | 2 +-
.../generator/xml/xpp3/_AbstractElementTest.java | 2 +-
.../plugin/xsd/ChangesXsdGeneratorTest.java | 2 +-
.../modello/plugin/xsd/XsdGeneratorTest.java | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/Dom4jGeneratorTest.java b/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/Dom4jGeneratorTest.java
index f57f4c3..2d5ff83 100644
--- a/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/Dom4jGeneratorTest.java
+++ b/modello-plugins/modello-plugin-dom4j/src/test/java/org/codehaus/modello/plugin/dom4j/Dom4jGeneratorTest.java
@@ -49,7 +49,7 @@ public class Dom4jGeneratorTest
public void testDom4jGenerator()
throws Throwable
{
- ModelloCore modello = (ModelloCore) container.lookup( ModelloCore.ROLE );
+ ModelloCore modello = (ModelloCore) getContainer().lookup( ModelloCore.ROLE );
Model model = modello.loadModel( getXmlResourceReader( "/maven.mdo" ) );
diff --git a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/AbstractStaxGeneratorTestCase.java b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/AbstractStaxGeneratorTestCase.java
index e3d573b..85c6c9c 100644
--- a/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/AbstractStaxGeneratorTestCase.java
+++ b/modello-plugins/modello-plugin-stax/src/test/java/org/codehaus/modello/generator/xml/stax/AbstractStaxGeneratorTestCase.java
@@ -45,7 +45,7 @@ public abstract class AbstractStaxGeneratorTestCase
{
super.setUp();
- modello = (ModelloCore) container.lookup( ModelloCore.ROLE );
+ modello = (ModelloCore) getContainer().lookup( ModelloCore.ROLE );
}
protected void verifyModel( Model model, String className )
diff --git a/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java b/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java
index 62f86c4..b8a71e4 100644
--- a/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java
+++ b/modello-plugins/modello-plugin-xdoc/src/test/java/org/codehaus/modello/plugin/xdoc/XdocGeneratorTest.java
@@ -70,7 +70,7 @@ public class XdocGeneratorTest
private void checkMavenXdocGenerator()
throws Exception
{
- ModelloCore modello = (ModelloCore) container.lookup( ModelloCore.ROLE );
+ ModelloCore modello = (ModelloCore) getContainer().lookup( ModelloCore.ROLE );
Model model = modello.loadModel( getXmlResourceReader( "/maven.mdo" ) );
diff --git a/modello-plugins/modello-plugin-xml/src/test/java/org/codehaus/modello/plugins/xml/XmlModelloPluginTest.java b/modello-plugins/modello-plugin-xml/src/test/java/org/codehaus/modello/plugins/xml/XmlModelloPluginTest.java
index d9a2113..ab737bc 100644
--- a/modello-plugins/modello-plugin-xml/src/test/java/org/codehaus/modello/plugins/xml/XmlModelloPluginTest.java
+++ b/modello-plugins/modello-plugin-xml/src/test/java/org/codehaus/modello/plugins/xml/XmlModelloPluginTest.java
@@ -55,7 +55,7 @@ public class XmlModelloPluginTest
public void testXmlPlugin()
throws Exception
{
- ModelloCore modello = (ModelloCore) container.lookup( ModelloCore.ROLE );
+ ModelloCore modello = (ModelloCore) getContainer().lookup( ModelloCore.ROLE );
Model model = modello.loadModel( getTestFile( "src/test/resources/model.mdo" ) );
diff --git a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/_AbstractElementTest.java b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/_AbstractElementTest.java
index dcb0c21..7b8d6d3 100644
--- a/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/_AbstractElementTest.java
+++ b/modello-plugins/modello-plugin-xpp3/src/test/java/org/codehaus/modello/generator/xml/xpp3/_AbstractElementTest.java
@@ -44,7 +44,7 @@ public class _AbstractElementTest
public void testAbstract()
throws Throwable
{
- ModelloCore modello = (ModelloCore) container.lookup( ModelloCore.ROLE );
+ ModelloCore modello = (ModelloCore) getContainer().lookup( ModelloCore.ROLE );
Model model = modello.loadModel( getXmlResourceReader( "/abstract.mdo" ) );
diff --git a/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/ChangesXsdGeneratorTest.java b/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/ChangesXsdGeneratorTest.java
index 6749623..30e499b 100755
--- a/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/ChangesXsdGeneratorTest.java
+++ b/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/ChangesXsdGeneratorTest.java
@@ -43,7 +43,7 @@ public class ChangesXsdGeneratorTest
public void testXsdGenerator()
throws Throwable
{
- ModelloCore modello = (ModelloCore) container.lookup( ModelloCore.ROLE );
+ ModelloCore modello = (ModelloCore) getContainer().lookup( ModelloCore.ROLE );
Model model = modello.loadModel( getXmlResourceReader( "/changes.mdo" ) );
diff --git a/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/XsdGeneratorTest.java b/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/XsdGeneratorTest.java
index 4cd0fea..c0a1386 100644
--- a/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/XsdGeneratorTest.java
+++ b/modello-plugins/modello-plugin-xsd/src/test/java/org/codehaus/modello/plugin/xsd/XsdGeneratorTest.java
@@ -48,7 +48,7 @@ public class XsdGeneratorTest
public void testXsdGenerator()
throws Throwable
{
- ModelloCore modello = (ModelloCore) container.lookup( ModelloCore.ROLE );
+ ModelloCore modello = (ModelloCore) getContainer().lookup( ModelloCore.ROLE );
Model model = modello.loadModel( getXmlResourceReader( "/maven.mdo" ) );
--
1.7.1.1

121
modello-jpp-depmap.xml
View File

@ -1,4 +1,16 @@
<dependencies>
<dependency>
<maven>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.1</version>
</maven>
<jpp>
<groupId>JPP/jaxme</groupId>
<artifactId>jaxme2</artifactId>
<version>0.5.1</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>wutka</groupId>
@ -12,115 +24,12 @@
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-api</artifactId>
<version>1.0-alpha-15</version>
</maven>
<jpp>
<groupId>JPP/plexus</groupId>
<artifactId>container-default</artifactId>
<version>1.0-alpha-8</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.codehaus.plexus</groupId>
<artifactId>containers-containers-default</artifactId>
<version>1.0-alpha-15</version>
</maven>
<jpp>
<groupId>JPP/plexus</groupId>
<artifactId>container-default</artifactId>
<version>1.0-alpha-8</version>
</jpp>
</dependency>
<dependency>
<maven>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interactivity-api</artifactId>
<version>1.0-alpha-4</version>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<version>3.2.0</version>
</maven>
<jpp>
<groupId>JPP/plexus</groupId>
<artifactId>interactivity-api</artifactId>
<version>1.0-alpha-1</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>
<!-- jars needed for test only, that we don't have yet in Fedora -->
<dependency>
<maven>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.1.3.1</version>
</maven>
</dependency>
<dependency>
<maven>
<groupId>jpox</groupId>
<artifactId>jpox-enhancer</artifactId>
<version>1.1.1</version>
</maven>
</dependency>
<dependency>
<maven>
<groupId>jpox</groupId>
<artifactId>jpox</artifactId>
<version>1.1.1</version>
</maven>
</dependency>
<dependency>
<maven>
<groupId>net.java.dev.stax-utils</groupId>
<artifactId>stax-utils</artifactId>
<version>20060502</version>
</maven>
</dependency>
<dependency>
<maven>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<version>3.2.0</version>
</maven>
</dependency>
<dependency>
<maven>
<groupId>org.codehaus.plexus.registry</groupId>
<artifactId>plexus-registry-commons</artifactId>
<version>1.0-alpha-2</version>
</maven>
</dependency>
</dependencies>

131
modello.spec
View File

@ -27,48 +27,44 @@
# (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 repo_dir .m2/repository
%define namedversion 1.1
%define maven_settings_file %{_builddir}/%{name}-%{namedversion}/settings.xml
%define __jar_repack %{nil}
Name: modello
Version: 1.1
Release: 2%{?dist}
Version: 1.4
Release: 1%{?dist}
Epoch: 0
Summary: Modello Data Model toolkit
License: MIT
Group: Development/Java
License: MIT
Group: Development/Libraries
URL: http://modello.codehaus.org/
Source0: %{name}-%{namedversion}-src.tar.gz
# svn export https://svn.codehaus.org/modello/tags/modello-1.1/
# tar czf modello-1.1-src.tar.gz modello-1.1/
# svn export https://svn.codehaus.org/modello/tags/modello-1.4
# tar czf modello-1.4-src.tar.xz modello-1.4
Source0: %{name}-%{version}-src.tar.xz
Source1: modello.script
Source2: %{name}-jpp-depmap.xml
Source2: %{name}-jpp-depmap.xml
Patch0: 0001-Use-public-function-for-component-lookup.patch
#Patch0: modello-hibernateold-artifactid-fix.patch
#Patch1: modello-build-all-plugins.patch
#Patch2: modello-use-old-pdcontainer.patch
BuildArch: noarch
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-assembly
BuildRequires: maven2-plugin-compiler
BuildRequires: maven2-plugin-install
BuildRequires: maven2-plugin-jar
BuildRequires: maven-assembly-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven2-plugin-resources
BuildRequires: maven2-plugin-surefire
BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-maven-plugin
BuildRequires: maven-site-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven2-plugin-plugin
BuildRequires: maven-dependency-plugin
BuildRequires: maven-plugin-plugin
BuildRequires: maven-shared-reporting-impl
BuildRequires: maven-shared-invoker
BuildRequires: classworlds >= 0:1.1
BuildRequires: dtdparser
BuildRequires: plexus-container-default
@ -78,8 +74,11 @@ BuildRequires: velocity
BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
BuildRequires: maven-doxia-tools
BuildRequires: tomcat5
BuildRequires: plexus-build-api
BuildRequires: ws-jaxme
BuildRequires: xmlunit
BuildRequires: jpa_api = 3.0
BuildRequires: geronimo-parent-poms
Requires: classworlds >= 0:1.1
Requires: dtdparser
@ -89,18 +88,18 @@ Requires: plexus-utils
Requires: plexus-velocity
Requires: velocity
Requires: jpackage-utils >= 0:1.7.2
Requires(post): jpackage-utils >= 0:1.7.2
Requires(postun): jpackage-utils >= 0:1.7.2
Requires: jpackage-utils
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
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
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
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).
@ -113,52 +112,41 @@ Java model to [JPOX|http://www.jpox.org/] Mapping.
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
Group: Documentation
Requires: jpackage-utils
%description javadoc
Javadoc for %{name}.
API documentation for %{name}.
%prep
%setup -q -n %{name}-%{namedversion}
#%patch0 -b .sav
#%patch1 -b .sav
#%patch2 -b .sav
%setup -q -n %{name}-%{version}
find . -name release-pom.xml -exec rm -f '{}' \;
# fix test compilation failure with new plexus-containers
# not really needed now because we are skipping tests for other
# problems...
%patch0 -p1
#Fixme: got error of Unrecognised tag: 'menu'
find . -name site.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
# skip tests because we have too old xmlunit in Fedora now (1.0.8)
mvn-jpp \
-e \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-Dmaven2.jpp.depmap.file=%{SOURCE2} \
-Dmaven.test.failure.ignore=true \
-Dmaven.test.skip=true \
install
# javadoc:javadoc
install javadoc:aggregate
%install
rm -rf $RPM_BUILD_ROOT
# poms
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
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
cp -p $i $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.`basename \`dirname $i\``.pom
done
# Depmap fragments
@ -166,11 +154,11 @@ for i in `find . -name pom.xml | grep -v \\\./pom.xml | grep -v modello-plugins
# 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
%add_to_maven_depmap org.codehaus.modello modello-$artifactname %{version} 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
cp -p pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.modello-modello.pom
%add_to_maven_depmap org.codehaus.modello modello %{version} JPP/%{name} modello
# script
install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
@ -179,21 +167,16 @@ 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
for jar in $(find -type f -name "*-%{version}.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)
(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
for target in $(find -type d -name target); do
if [ -d $target/site/apidocs ]; then
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`
fi
done
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
(cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})
%clean
rm -rf $RPM_BUILD_ROOT
@ -206,16 +189,22 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%{_datadir}/maven2
%{_mavenpomdir}/*
%{_javadir}/%{name}
%attr(755,root,root) %{_bindir}/*
%{_mavendepmapfragdir}
%{_bindir}/*
%config(noreplace) %{_mavendepmapfragdir}/*
%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/*
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
* Tue Jul 20 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.4-1
- Update to latest upstream version
- Re-enable javadoc generation
- Remove old workarounds/patches
* Mon May 24 2010 Yong Yang <yyang@redhat.com> 1.1-2
- Fix JPP pom name
- Disable javadoc:javadoc due to the failure of maven-doxia
@ -244,7 +233,7 @@ rm -rf $RPM_BUILD_ROOT
* Tue Mar 13 2007 Matt Wringe <mwringe@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
- fix various rpmlint issues
* Mon Feb 26 2007 Tania Bento <tbento@redhat.com> 0:1.0-0.1.a8.4jpp.1
- Fixed %%Release.

4
sources
View File

@ -1,3 +1 @@
9642d452add138cffe2f494ad94fa99c modello-1.0-alpha-15-src.tar.gz
894fc81563aafa8443f1b5cec2118c28 modello-1.0.1-src.tar.gz
dbd6c621285f68e6667fe1d6ac8db4d3 modello-1.1-src.tar.gz
8b06b96d892e34563efa8d7eb46d7607 modello-1.4-src.tar.xz