From b1568b72a32b13d048fdb9467a33fc0f4a3f2edb Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Jul 30 2010 12:57:51 +0000 Subject: Update to latest upstream version (1.4) Re-enable javadoc generation Remove old workarounds/patches --- diff --git a/.gitignore b/.gitignore index 545e4cc..b86ad14 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/0001-Use-public-function-for-component-lookup.patch b/0001-Use-public-function-for-component-lookup.patch new file mode 100644 index 0000000..a5e2d83 --- /dev/null +++ b/0001-Use-public-function-for-component-lookup.patch @@ -0,0 +1,109 @@ +From f2b1ab1a8981da2799a81bf91b2e876eb83502df Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky +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 + diff --git a/modello-jpp-depmap.xml b/modello-jpp-depmap.xml index 79306ad..8dbb682 100644 --- a/modello-jpp-depmap.xml +++ b/modello-jpp-depmap.xml @@ -1,126 +1,35 @@ - wutka - dtdparser - 1.21 + javax.xml.bind + jaxb-api + 2.1 - JPP - dtdparser - 1.21 + JPP/jaxme + jaxme2 + 0.5.1 - - org.codehaus.plexus - plexus-component-api - 1.0-alpha-15 + wutka + dtdparser + 1.21 - JPP/plexus - container-default - 1.0-alpha-8 + JPP + dtdparser + 1.21 - - org.codehaus.plexus - containers-containers-default - 1.0-alpha-15 - - - JPP/plexus - container-default - 1.0-alpha-8 - - - - org.codehaus.plexus - plexus-interactivity-api - 1.0-alpha-4 + org.codehaus.woodstox + wstx-asl + 3.2.0 - - JPP/plexus - interactivity-api - 1.0-alpha-1 - - - - - - hibernate - hibernate - 2.0.3 - - - - - - hsqldb - hsqldb - 1.7.2.2 - - - - - - postgresql - postgresql - 7.4.1-jdbc3 - - - - - - - org.apache.derby - derby - 10.1.3.1 - - - - - - jpox - jpox-enhancer - 1.1.1 - - - - - - jpox - jpox - 1.1.1 - - - - - - net.java.dev.stax-utils - stax-utils - 20060502 - - - - - - org.codehaus.woodstox - wstx-asl - 3.2.0 - - - - - - org.codehaus.plexus.registry - plexus-registry-commons - 1.0-alpha-2 - diff --git a/modello.spec b/modello.spec index b41a727..3768ff8 100644 --- a/modello.spec +++ b/modello.spec @@ -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 - 0:1.4-1 +- Update to latest upstream version +- Re-enable javadoc generation +- Remove old workarounds/patches + * Mon May 24 2010 Yong Yang 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 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 0:1.0-0.1.a8.4jpp.1 - Fixed %%Release. diff --git a/sources b/sources index 05d33a2..1b704ea 100644 --- a/sources +++ b/sources @@ -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