rpms/modello/devel modello-use-old-pdcontainer.patch, NONE, 1.1.2.1 .cvsignore, 1.2, 1.2.2.1 modello-build-all-plugins.patch, 1.1, 1.1.2.1 modello-jpp-depmap.xml, 1.1, 1.1.2.1 modello.script, 1.1, 1.1.2.1 modello.spec, 1.4, 1.4.2.1 sources, 1.2, 1.2.2.1
Fernando Nasser
fnasser at fedoraproject.org
Wed May 20 16:49:50 UTC 2009
Author: fnasser
Update of /cvs/extras/rpms/modello/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12270
Modified Files:
Tag: private-newmaven-branch
.cvsignore modello-build-all-plugins.patch
modello-jpp-depmap.xml modello.script modello.spec sources
Added Files:
Tag: private-newmaven-branch
modello-use-old-pdcontainer.patch
Log Message:
Upgrade but to pre-bootstrap release
modello-use-old-pdcontainer.patch:
--- NEW FILE modello-use-old-pdcontainer.patch ---
diff -up modello-core/src/main/java/org/codehaus/modello/Modello.java.sav modello-1.0-alpha-15/modello-core/src/main/java/org/codehaus/modello/Modello.java
--- modello-core/src/main/java/org/codehaus/modello/Modello.java.sav 2008-06-20 16:34:47.000000000 -0400
+++ modello-core/src/main/java/org/codehaus/modello/Modello.java 2008-06-20 16:36:02.000000000 -0400
@@ -30,8 +30,6 @@ import org.codehaus.modello.core.Modello
import org.codehaus.modello.model.Model;
import org.codehaus.modello.model.ModelValidationException;
import org.codehaus.plexus.embed.Embedder;
-import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.DefaultPlexusContainer;
/**
* @author <a href="mailto:jason at maven.org">Jason van Zyl</a>
@@ -40,7 +38,7 @@ import org.codehaus.plexus.DefaultPlexus
*/
public class Modello
{
- PlexusContainer container;
+ Embedder embedder = new Embedder();
ModelloCore core;
@@ -49,9 +47,9 @@ public class Modello
{
try
{
- container = new DefaultPlexusContainer();
+ embedder.start();
- core = (ModelloCore) container.lookup( ModelloCore.ROLE );
+ core = (ModelloCore) embedder.lookup( ModelloCore.ROLE );
}
catch( Exception ex )
{
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/modello/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -p -r1.2 -r1.2.2.1
--- .cvsignore 20 Mar 2007 07:07:55 -0000 1.2
+++ .cvsignore 20 May 2009 16:49:19 -0000 1.2.2.1
@@ -1 +1 @@
-modello-1.0-alpha-8-src.tar.gz
+modello-1.0-alpha-15-src.tar.gz
modello-build-all-plugins.patch:
Index: modello-build-all-plugins.patch
===================================================================
RCS file: /cvs/extras/rpms/modello/devel/modello-build-all-plugins.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -p -r1.1 -r1.1.2.1
--- modello-build-all-plugins.patch 20 Mar 2007 07:07:55 -0000 1.1
+++ modello-build-all-plugins.patch 20 May 2009 16:49:19 -0000 1.1.2.1
@@ -1,20 +1,22 @@
---- ./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>
+diff -up ./modello-plugins-sandbox/pom.xml.sav ./modello-plugins-sandbox/pom.xml
+--- ./modello-plugins-sandbox/pom.xml.sav 2008-06-18 17:06:26.000000000 -0400
++++ ./modello-plugins-sandbox/pom.xml 2008-06-18 17:06:37.000000000 -0400
+@@ -21,6 +21,7 @@
</dependencies>
<modules>
-+ <module>modello-plugin-dom4j</module>
- <module>modello-plugin-hibernate-old</module>
+ <module>modello-plugin-ojb</module>
++ <module>modello-plugin-prevayler</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-plugin-velocity</module>
+diff -up ./pom.xml.sav ./pom.xml
+--- ./pom.xml.sav 2008-06-18 17:06:01.000000000 -0400
++++ ./pom.xml 2008-06-18 17:06:18.000000000 -0400
+@@ -157,6 +157,7 @@
+ <module>modello-db-keywords</module>
<module>modello-test</module>
<module>modello-plugins</module>
-+ <module>modello-plugins-sandbox</module>
++ <module>modello-plugins-sandbox</module>
</modules>
- <dependencies>
- <dependency>
+ <repositories>
+ <repository>
Index: modello-jpp-depmap.xml
===================================================================
RCS file: /cvs/extras/rpms/modello/devel/modello-jpp-depmap.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -p -r1.1 -r1.1.2.1
--- modello-jpp-depmap.xml 20 Mar 2007 07:07:55 -0000 1.1
+++ modello-jpp-depmap.xml 20 May 2009 16:49:19 -0000 1.1.2.1
@@ -12,6 +12,69 @@
</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>
+ </maven>
+ <jpp>
+ <groupId>JPP/plexus</groupId>
+ <artifactId>interactivity-api</artifactId>
+ <version>1.0-alpha-1</version>
+ </jpp>
+ </dependency>
+ <dependency>
+ <maven>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ <scope>test</scope>
+ </maven>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>stax_api</artifactId>
+ <version>1.0</version>
+ </jpp>
+ </dependency>
+ <dependency>
+ <maven>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>1.2.0</version>
+ <scope>test</scope>
+ </maven>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>bea-stax-api</artifactId>
+ <version>1.2.0</version>
+ </jpp>
+ </dependency>
<!-- unnecessary jars -->
<dependency>
<maven>
@@ -37,5 +100,54 @@
</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>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>
Index: modello.script
===================================================================
RCS file: /cvs/extras/rpms/modello/devel/modello.script,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -p -r1.1 -r1.1.2.1
--- modello.script 20 Mar 2007 07:07:55 -0000 1.1
+++ modello.script 20 May 2009 16:49:19 -0000 1.1.2.1
@@ -1,3 +1,3 @@
#!/bin/sh
-export CLASSPATH=$(build-classpath modello/core modello/plugin-xpp3 modello/plugin-xml plexus/container-default plexus/utils classworlds)
+export CLASSPATH=$(build-classpath modello/core modello/plugin-xpp3 modello/plugin-xml plexus/container-default plexus/containers-container-default plexus/utils plexus/classworlds)
${JAVA_HOME}/bin/java org.codehaus.modello.ModelloCli $@
Index: modello.spec
===================================================================
RCS file: /cvs/extras/rpms/modello/devel/modello.spec,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -p -r1.4 -r1.4.2.1
--- modello.spec 26 Feb 2009 02:16:26 -0000 1.4
+++ modello.spec 20 May 2009 16:49:19 -0000 1.4.2.1
@@ -29,31 +29,33 @@
#
%define _without_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 namedversion 1.0-alpha-15
%define maven_settings_file %{_builddir}/%{name}-%{namedversion}/settings.xml
Name: modello
Version: 1.0
-Release: 0.2.a8.4.4%{?dist}
+Release: 0.2.a15.5%{?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/
+# svn export https://svn.codehaus.org/modello/tags/modello-1.0-alpha-15/
+# tar czf modello-1.0-alpha-15-src.tar.gz modello-1.0-alpha-15/
Source1: modello.script
Source2: %{name}-jpp-depmap.xml
Patch0: modello-hibernateold-artifactid-fix.patch
Patch1: modello-build-all-plugins.patch
+Patch2: modello-use-old-pdcontainer.patch
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
Requires(post): java-gcj-compat
@@ -67,20 +69,28 @@ BuildRoot: %{_tmppath}/%{name}-%{ve
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: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-release
BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-surefire
+BuildRequires: maven2-plugin-surefire = 2.3
+BuildRequires: maven-surefire-provider-junit = 2.3
+BuildRequires: maven-doxia
+BuildRequires: maven-doxia-sitetools
BuildRequires: maven2-plugin-plugin
+BuildRequires: plexus-containers-component-api >= 1.0-0.a34
BuildRequires: classworlds >= 0:1.1
BuildRequires: dtdparser
BuildRequires: plexus-container-default
BuildRequires: plexus-utils
BuildRequires: plexus-velocity
BuildRequires: velocity
+BuildRequires: excalibur-avalon-framework
+#BuildRequires: stax_1_0_1_api
+#BuildRequires: stax-utils
+
Requires: classworlds >= 0:1.1
Requires: dtdparser
@@ -88,6 +98,9 @@ Requires: plexus-container-default
Requires: plexus-utils
Requires: plexus-velocity
Requires: velocity
+#Requires: stax_1_0_1_api
+#Requires: stax-utils
+
Requires(post): jpackage-utils >= 0:1.7.2
Requires(postun): jpackage-utils >= 0:1.7.2
@@ -113,20 +126,21 @@ Java model to [JPOX|http://www.jpox.org/
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
-# for /bin/rm and /bin/ln
-Requires(post): coreutils
-Requires(postun): coreutils
+Requires(post): /bin/rm,/bin/ln
+Requires(postun): /bin/rm
%description javadoc
Javadoc for %{name}.
%prep
%setup -q -n %{name}-%{namedversion}
-%patch0 -b .sav
+#%patch0 -b .sav
%patch1 -b .sav
+%patch2 -b .sav
find . -name release-pom.xml -exec rm -f '{}' \;
+#ObjStateFactoryModeeneratorTest renamed to ObjStateFactoryModelloGeneratorTest
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 \
@@ -137,16 +151,44 @@ for i in modello-plugins-sandbox/modello
done
%build
+ls -lR /usr/share/java/*stax*
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.repo.local=$MAVEN_REPO_LOCAL \
+ -Dmaven2.jpp.depmap.file=%{SOURCE2} \
-Dmaven.test.failure.ignore=true \
- install javadoc:javadoc
+ install
+
+# Manual iteration should not be needed, but there is a bug in the javadoc
+# plugin which makes this necessary. See:
+# http://jira.codehaus.org/browse/MJAVADOC-157
+for dir in modello-*; do
+ pushd $dir
+ mvn-jpp \
+ -e \
+ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+ -Dmaven2.jpp.depmap.file=%{SOURCE2} \
+ -Dmaven.test.failure.ignore=true \
+ javadoc:javadoc
+ popd
+done
+
+for dir in modello-plugins/modello-plugin-*; do
+ pushd $dir
+ mvn-jpp \
+ -e \
+ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+ -Dmaven2.jpp.depmap.file=%{SOURCE2} \
+ -Dmaven.test.failure.ignore=true \
+ javadoc:javadoc
+ popd
+done
+
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -191,11 +233,16 @@ 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)
+# Prevayler is in a sandbox and has a different version
+ln -s plugin-prevayler-1.0-alpha-12-SNAPSHOT.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/plugin-prevayler.jar
+
# 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`
+ 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}
@@ -228,7 +275,6 @@ fi
%files
%defattr(-,root,root,-)
%{_datadir}/maven2
-%dir %{_javadir}/%{name}
%{_javadir}/%{name}
%attr(755,root,root) %{_bindir}/*
%{_mavendepmapfragdir}
@@ -236,20 +282,35 @@ fi
%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
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.2.a8.4.4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Tue Apr 28 2009 Yong Yang <yyang at redhat.com> 1.0-0.2.a15.5
+- rebuild with new maven2 2.0.8 built in non-bootstrap mode
+
+* Mon Mar 16 2009 Yong Yang <yyang at redhat.com> 1.0-0.2.a15.4
+- rebuild with new maven2 2.0.8 built in bootstrap mode
+
+* Fri Mar 06 2009 Yong Yang <yyang at redhat.com> 1.0-0.2.a15.3
+- Fix version
+- Remove (B)Rs: stax_1_0_1_api stax-utils
+
+* Thu Feb 05 2009 Yong Yang <yyang at redhat.com> 1.0-0.2.a15.2
+- fix testcase fileename error
+
+* Wed Jan 14 2009 Yong Yang <yyang at redhat.com> 1.0-0.2.a15.1jpp.2
+- re-build with gcj
+
+* Tue Jan 13 2009 Yong Yang <yyang at redhat.com> 1.0-0.2.a15.1jpp.1
+- Import from dbhole's maven 2.0.8 packages, initial building
+- Add BR stax-api, add JPP depmap
+- Update to alpha 15
-* Wed Jul 9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0:1.0-0.1.a8.4.4
-- drop repotag
+* Tue Apr 08 2008 Deepak Bhole <dbhole at redhat.com> 1.0-0.2.a10.0jpp.1
+- Update to alpha 10
* Tue Mar 20 2007 Matt Wringe <wringe at redhat.com> 0:1.0-0.1.a8.4jpp.3
- disable gcj support
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/modello/devel/sources,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -p -r1.2 -r1.2.2.1
--- sources 20 Mar 2007 07:07:55 -0000 1.2
+++ sources 20 May 2009 16:49:19 -0000 1.2.2.1
@@ -1 +1 @@
-343dd17dd1cf37d619d72186c0769e7d modello-1.0-alpha-8-src.tar.gz
+9642d452add138cffe2f494ad94fa99c modello-1.0-alpha-15-src.tar.gz
More information about the scm-commits
mailing list