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

Update to upstream 1.5.

Browse Source
This commit is contained in:
Alexander Kurtakov 2011-08-08 07:02:15 +03:00
parent bff78648e0
commit 6a4a88ba1c
4 changed files with 16 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -3,3 +3,5 @@ modello-1.0.1-src.tar.gz
modello-1.1-src.tar.gz
modello-1.4-src.tar.xz
modello-1.4.1-source-release.zip
modello-1.5-source-release.zip
/.project

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

@ -1,109 +0,0 @@
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

45
modello.spec
View File

@ -29,8 +29,8 @@
#
Name: modello
Version: 1.4.1
Release: 2%{?dist}
Version: 1.5
Release: 1%{?dist}
Epoch: 0
Summary: Modello Data Model toolkit
License: MIT
@ -40,13 +40,12 @@ Source0: http://repo2.maven.org/maven2/org/codehaus/%{name}/%{name}/%{ver
Source2: %{name}-jpp-depmap.xml
Patch0: 0001-Use-public-function-for-component-lookup.patch
BuildArch: noarch
BuildRequires: ant >= 0:1.6
BuildRequires: jpackage-utils >= 0:1.7.2
BuildRequires: maven2 >= 2.0.4-9
BuildRequires: maven
BuildRequires: maven-assembly-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
@ -114,24 +113,13 @@ Requires: jpackage-utils
API documentation for %{name}.
%prep
%setup -q -n %{name}-%{version}
# fix test compilation failure with new plexus-containers
# not really needed now because we are skipping tests for other
# problems...
#%%patch0 -p1
%setup -q
%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} \
mvn-rpmbuild \
-Dmaven.local.depmap.file=%{SOURCE2} \
-Dmaven.test.skip=true \
install javadoc:aggregate
@ -147,7 +135,7 @@ for i in `find . -name pom.xml -not -path ./pom.xml -not -path "*src/it/*"`; do
done
cp -p pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.modello-modello.pom
%add_to_maven_depmap org.codehaus.modello modello %{version} JPP/%{name} modello
%add_maven_depmap JPP.modello-modello.pom
# script
install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
@ -161,29 +149,22 @@ for jar in $(find -type f -name "*-%{version}.jar" | grep -E target/.*.jar); do
done
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
(cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})
%post
%update_maven_depmap
%postun
%update_maven_depmap
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files
%defattr(-,root,root,-)
%{_mavenpomdir}/*
%{_javadir}/%{name}
%{_bindir}/*
%config(noreplace) %{_mavendepmapfragdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
* Mon Aug 8 2011 Alexander Kurtakov <akurtako@redhat.com> 0:1.5-1
- Update to upstream 1.5.
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
18347f7285c7206736c0f0ddbfa3b81b modello-1.4.1-source-release.zip
3743d1c44419f78c761d9e2d6898ac1d modello-1.5-source-release.zip