[prev in list] [next in list] [prev in thread] [next in thread]
List: jpackage-announce
Subject: [JPackage-announce] [RPM (5.0)] modello-1.0-0.a17.1jpp
From: Ralph Apel <jpackage () zarb ! org>
Date: 2008-01-23 16:06:33
Message-ID: 20080123160633.370703F618 () ryu ! zarb ! org
[Download RAW message or body]
Name : modello Relocations: (not relocatable)
Version : 1.0 Vendor: JPackage Project
Release : 0.a17.1jpp Build Date: Wed 23 Jan 2008 04:48:51 PM \
CET Install Date: (not installed) Build Host: altair.localdomain
Group : Development/Java Source RPM: (none)
Size : 442966 License: Open Source
Signature : (none)
Packager : Ralph Apel <r.apel@r-apel.de>
URL : http://modello.codehaus.org/
Summary : Modello Data Model toolkit
Description :
Modello is a Data Model toolkit in use by the Maven 2 Project.
What it does.
It all starts with the DataModel.
Once a DataModel is defined, the toolkit can be used to
generate any of the following at compile time.
* Java Pojos of the DataModel.
* Java Pojos to XML Writer. (provided via xpp3, stax, jdom
or dom4j)
* XML to Java Pojos Reader. (provided via xpp3, stax or
dom4j)
* XDOC documentation of the DataModel.
* XML Schema to validate the DataModel.
* Java Model to Prevayler Store (actually this plugin is in
the sandbox).
* Java Model to JPOX Store.
* Java Model to JPOX Mapping.
---------------
Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a17.1jpp
- 1.0-alpha-17
---------------
W: modello non-standard-group Development/Java
W: modello invalid-license Open Source
---------------
Index: modello-LdapSchemaGeneratorTest.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/modello/modello-LdapSchemaGeneratorTest.patch,v
retrieving revision 1.2
diff -u -r1.2 modello-LdapSchemaGeneratorTest.patch
--- modello-LdapSchemaGeneratorTest.patch 3 Dec 2007 20:22:49 -0000 1.2
+++ modello-LdapSchemaGeneratorTest.patch 23 Jan 2008 16:06:30 -0000
@@ -1,13 +1,28 @@
---- modello-plugins-sandbox/modello-plugin-ldap/src/test/java/org/codehaus/modello/plugin/ldap/LdapSchemaGeneratorTest.java.sav 2007-08-22 \
16:51:00.000000000 +0200
-+++ modello-plugins-sandbox/modello-plugin-ldap/src/test/java/org/codehaus/modello/plugin/ldap/LdapSchemaGeneratorTest.java 2007-08-22 \
16:51:44.000000000 +0200
-@@ -29,9 +29,9 @@
+--- modello-plugins-sandbox/modello-plugin-ldap/src/test/java/org/codehaus/modello/plugin/ldap/LdapSchemaGeneratorTest.java.sav17 2007-07-17 \
20:50:39.000000000 +0200 ++++ \
modello-plugins-sandbox/modello-plugin-ldap/src/test/java/org/codehaus/modello/plugin/ldap/LdapSchemaGeneratorTest.java 2008-01-06 \
17:45:11.000000000 +0100 +@@ -24,13 +24,14 @@
- import org.codehaus.modello.AbstractModelloGeneratorTest;
+ import java.util.Properties;
+ import java.io.File;
++import java.io.FileReader;
+ import java.io.BufferedReader;
+
+-import org.codehaus.modello.ModelloGeneratorTest;
++import org.codehaus.modello.AbstractModelloGeneratorTest;
import org.codehaus.modello.ModelloParameterConstants;
-import org.codehaus.modello.FileUtils;
import org.codehaus.modello.model.Model;
import org.codehaus.modello.core.ModelloCore;
+import org.codehaus.plexus.util.FileUtils;
+ import org.codehaus.plexus.util.ReaderFactory;
/**
- * @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
+@@ -38,7 +39,7 @@
+ * @version $Id: LdapSchemaGeneratorTest.java 840 2007-07-17 18:50:39Z hboutemy $
+ */
+ public class LdapSchemaGeneratorTest
+- extends ModelloGeneratorTest
++ extends AbstractModelloGeneratorTest
+ {
+ public LdapSchemaGeneratorTest()
+ {
Index: modello-LdapSchemaModelloGenerator.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/modello/modello-LdapSchemaModelloGenerator.patch,v
retrieving revision 1.2
diff -u -r1.2 modello-LdapSchemaModelloGenerator.patch
--- modello-LdapSchemaModelloGenerator.patch 3 Dec 2007 20:22:49 -0000 1.2
+++ modello-LdapSchemaModelloGenerator.patch 23 Jan 2008 16:06:30 -0000
@@ -1,5 +1,5 @@
---- modello-plugins-sandbox/modello-plugin-ldap/src/main/java/org/codehaus/modello/plugin/ldap/LdapSchemaModelloGenerator.java.sav 2007-08-22 \
16:26:33.000000000 +0200
-+++ modello-plugins-sandbox/modello-plugin-ldap/src/main/java/org/codehaus/modello/plugin/ldap/LdapSchemaModelloGenerator.java 2007-08-22 \
16:27:11.000000000 +0200 +--- \
modello-plugins-sandbox/modello-plugin-ldap/src/main/java/org/codehaus/modello/plugin/ldap/LdapSchemaModelloGenerator.java.sav 2008-01-06 \
16:46:45.000000000 +0100 ++++ \
modello-plugins-sandbox/modello-plugin-ldap/src/main/java/org/codehaus/modello/plugin/ldap/LdapSchemaModelloGenerator.java 2008-01-06 \
16:47:10.000000000 +0100 @@ -35,7 +35,6 @@
import java.util.Properties;
@@ -13,6 +13,6 @@
import org.codehaus.modello.plugin.ldap.model.ObjectClass;
import org.codehaus.modello.plugin.ldap.metadata.LdapFieldMetadata;
+import org.codehaus.plexus.util.StringUtils;
+ import org.codehaus.plexus.util.WriterFactory;
/**
- * @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
Index: modello-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/modello/modello-jpp-depmap.xml,v
retrieving revision 1.2
diff -u -r1.2 modello-jpp-depmap.xml
--- modello-jpp-depmap.xml 3 Dec 2007 20:22:49 -0000 1.2
+++ modello-jpp-depmap.xml 23 Jan 2008 16:06:30 -0000
@@ -209,8 +209,20 @@
</maven>
<jpp>
<groupId>JPP</groupId>
- <artifactId>servletapi5</artifactId>
- <version>2.4</version>
+ <artifactId>servletapi4</artifactId>
+ <version>2.3</version>
+ </jpp>
+ </dependency>
+ <dependency>
+ <maven>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ </maven>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>servletapi4</artifactId>
+ <version>2.3</version>
</jpp>
</dependency>
@@ -251,4 +263,17 @@
</jpp>
</dependency>
+ <dependency>
+ <maven>
+ <groupId>javax.resource</groupId>
+ <artifactId>connector</artifactId>
+ <version>1.0</version>
+ </maven>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>j2ee_connector_api</artifactId>
+ <version>1.0</version>
+ </jpp>
+ </dependency>
+
</dependencies>
Index: modello.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/modello/modello.spec,v
retrieving revision 1.2
diff -u -r1.2 modello.spec
--- modello.spec 3 Dec 2007 20:22:50 -0000 1.2
+++ modello.spec 23 Jan 2008 16:06:30 -0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2007, JPackage Project
+# Copyright (c) 2000-2008, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -40,12 +40,12 @@
%define section free
%define repo_dir .m2/repository
-%define namedversion 1.0-alpha-15
+%define namedversion 1.0-alpha-17
%define maven_settings_file %{_builddir}/%{name}-%{namedversion}/settings.xml
Name: modello
Version: 1.0
-Release: 0.a15.2jpp
+Release: 0.a17.1jpp
Epoch: 0
Summary: Modello Data Model toolkit
License: Open Source
@@ -53,54 +53,41 @@
Vendor: JPackage Project
Distribution: JPackage
URL: http://modello.codehaus.org/
-Source0: %{name}-%{namedversion}-src.tar.gz
-# svn export svn://svn.modello.codehaus.org/modello/tags/modello-1.0-alpha-15
+Source0: %{name}-%{namedversion}.tar.gz
+# svn export svn://svn.modello.codehaus.org/modello/tags/modello-1.0-alpha-17
Source1: modello.script
Source2: %{name}-jpp-depmap.xml
-Source3: %{name}-core-build.xml
-Source4: %{name}-db-keywords-build.xml
-Source5: %{name}-plugin-converters-build.xml
-Source6: %{name}-plugin-dom4j-build.xml
-Source7: %{name}-plugin-hibernate-store-build.xml
-Source8: %{name}-plugin-jdbc-build.xml
-Source9: %{name}-plugin-jdom-build.xml
-Source10: %{name}-plugin-jpox-build.xml
-Source11: %{name}-plugin-ojb-build.xml
-Source12: %{name}-plugin-stash-build.xml
-Source13: %{name}-plugin-stax-build.xml
-Source14: %{name}-plugin-store-build.xml
-Source15: %{name}-plugin-velocity-build.xml
-Source16: %{name}-plugin-xdoc-build.xml
-Source17: %{name}-plugin-xml-build.xml
-Source18: %{name}-plugin-xpp3-build.xml
-Source19: %{name}-plugin-xsd-build.xml
-Source20: %{name}-test-build.xml
+Source3: %{name}-autogenerated-files.tar.gz
#Patch0: modello-plugins-pom_xml.patch
Patch1: modello-plugin-jpox-pom_xml.patch
#Patch0: modello-hibernateold-artifactid-fix.patch
Patch2: modello-plugin-jpox-JPoxJdoMappingModelloGeneratorPrefixedTest.patch
Patch3: modello-plugin-jpox-JPoxJdoMappingModelloGeneratorTest.patch
-Patch4: modello-plugin-stax-StaxVerifierParts.patch
-Patch5: modello-plugin-stax-StaxVerifierVersionInField.patch
-Patch6: modello-plugin-stax-StaxVerifierVersionInNamespace.patch
+#Patch4: modello-plugin-stax-StaxVerifierParts.patch
+#Patch5: modello-plugin-stax-StaxVerifierVersionInField.patch
+#Patch6: modello-plugin-stax-StaxVerifierVersionInNamespace.patch
Patch7: modello-plugin-stax-StaxVerifierVersionReaderDelegate.patch
-Patch8: modello-plugin-stax-StaxVerifierWrongVersionNamespace.patch
-Patch9: modello-plugin-stax-StaxVerifierWrongVersion.patch
+#Patch8: modello-plugin-stax-StaxVerifierWrongVersionNamespace.patch
+#Patch9: modello-plugin-stax-StaxVerifierWrongVersion.patch
Patch10: modello-plugin-converters-ConvertersVerifier.patch
-Patch11: modello-plugin-xpp3-Xpp3Verifier.patch
-Patch12: modello-maven-plugin-pom_xml.patch
+#Patch11: modello-plugin-xpp3-Xpp3Verifier.patch
+#Patch12: modello-maven-plugin-pom_xml.patch
Patch13: modello-build-all-plugins.patch
# the following patch is required for plexus-container-default = 1.0-alpha-8
-Patch14: modello-old-plexus-container.patch
+#Patch14: modello-old-plexus-container.patch
Patch15: modello-ObjStateFactoryModelloGenerator.patch
Patch16: modello-LdapSchemaModelloGenerator.patch
Patch17: modello-LdapSchemaGeneratorTest.patch
Patch18: modello-site_xml.patch
-Patch19: modello-plugin-plexus-registry-pom.patch
-Patch20: modello-db-keywords-pom.patch
+#Patch19: modello-plugin-plexus-registry-pom.patch
+#Patch20: modello-db-keywords-pom.patch
+Patch21: modello-plugin-velocity-VelocityGenerator.patch
+Patch22: modello-ObjStateFactoryModelloGeneratorTest.patch
+
+Patch99: modello-temp-AbstractVelocityModelloGenerator.patch
%if %{gcj_support}
@@ -116,8 +103,10 @@
BuildRequires: java-devel >= 0:1.5.0
BuildRequires: jpackage-utils >= 0:1.7.3
BuildRequires: ant >= 0:1.6.5
+BuildRequires: jmock
%if %{with_maven}
-BuildRequires: maven2 >= 2.0.4
+BuildRequires: maven2 >= 2.0.7
+BuildRequires: maven2-plugin-ant
BuildRequires: maven2-plugin-assembly
BuildRequires: maven2-plugin-compiler
BuildRequires: maven2-plugin-install
@@ -125,10 +114,11 @@
BuildRequires: maven2-plugin-javadoc
BuildRequires: maven2-plugin-plugin
BuildRequires: maven2-plugin-project-info-reports
-BuildRequires: maven2-plugin-release
+BuildRequires: maven-release
BuildRequires: maven2-plugin-resources
BuildRequires: maven2-plugin-site
BuildRequires: maven2-plugin-surefire
+BuildRequires: maven-surefire-junit
BuildRequires: maven2-default-skin
%endif
BuildRequires: apache-jdo-2.0-api
@@ -136,6 +126,7 @@
BuildRequires: derby
BuildRequires: dtdparser
BuildRequires: excalibur-avalon-framework
+BuildRequires: geronimo-jta-1.0.1B-api
BuildRequires: jakarta-slide-webdavclient
BuildRequires: jaxen
BuildRequires: jetty5
@@ -157,8 +148,8 @@
Requires: dtdparser
Requires: jaxen
-Requires: jpox-core
-Requires: jpox-enhancer
+Requires: jpox-core >= 0:1.1.1-2jpp
+Requires: jpox-enhancer >= 0:1.1.1-2jpp
Requires: log4j
Requires: plexus-classworlds
Requires: plexus-containers-component-api
@@ -227,42 +218,29 @@
%patch1 -b .sav1
%patch2 -b .sav2
%patch3 -b .sav3
-%patch4 -b .sav4
-%patch5 -b .sav5
-%patch6 -b .sav6
+#%patch4 -b .sav4
+#%patch5 -b .sav5
+#%patch6 -b .sav6
%patch7 -b .sav7
-%patch8 -b .sav8
-%patch9 -b .sav9
+#%patch8 -b .sav8
+#%patch9 -b .sav9
%patch10 -b .sav10
-%patch11 -b .sav11
-%patch12 -b .sav12
+#%patch11 -b .sav11
+#%patch12 -b .sav12
%patch13 -b .sav13
-%patch14 -b .sav14
+#%patch14 -b .sav14
%patch15 -b .sav15
%patch16 -b .sav16
%patch17 -b .sav17
%patch18 -b .sav18
-%patch19 -b .sav19
-%patch20 -b .sav20
+#%patch19 -b .sav19
+#%patch20 -b .sav20
+%patch21 -b .sav21
+%patch22 -b .sav22
+
+%patch99 -b .sav99
-cp %{SOURCE3} modello-core/build.xml
-cp %{SOURCE4} modello-db-keywords/build.xml
-cp %{SOURCE5} modello-plugins/modello-plugin-converters/build.xml
-cp %{SOURCE6} modello-plugins/modello-plugin-dom4j/build.xml
-cp %{SOURCE7} modello-plugins-sandbox/modello-plugin-hibernate-store/build.xml
-cp %{SOURCE8} modello-plugins-sandbox/modello-plugin-jdbc/build.xml
-cp %{SOURCE9} modello-plugins/modello-plugin-jdom/build.xml
-cp %{SOURCE10} modello-plugins/modello-plugin-jpox/build.xml
-cp %{SOURCE11} modello-plugins-sandbox/modello-plugin-ojb/build.xml
-cp %{SOURCE12} modello-plugins-sandbox/modello-plugin-stash/build.xml
-cp %{SOURCE13} modello-plugins/modello-plugin-stax/build.xml
-cp %{SOURCE14} modello-plugins/modello-plugin-store/build.xml
-cp %{SOURCE15} modello-plugins-sandbox/modello-plugin-velocity/build.xml
-cp %{SOURCE16} modello-plugins/modello-plugin-xdoc/build.xml
-cp %{SOURCE17} modello-plugins/modello-plugin-xml/build.xml
-cp %{SOURCE18} modello-plugins/modello-plugin-xpp3/build.xml
-cp %{SOURCE19} modello-plugins/modello-plugin-xsd/build.xml
-cp %{SOURCE20} modello-test/build.xml
+gzip -dc %{SOURCE3} | tar xf -
find . -name release-pom.xml -exec rm -f '{}' \;
@@ -281,21 +259,21 @@
%if %{with_maven}
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL
-
+mkdir -p modello-site/target/site
mvn-jpp \
-e \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-Dmaven2.jpp.depmap.file=%{SOURCE2} \
-Dmaven.test.failure.ignore=true \
- install javadoc:javadoc
+ ant:ant install javadoc:javadoc
-pushd modello-site
-mvn-jpp \
- -e \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- -Dmaven2.jpp.depmap.file=%{SOURCE2} \
- site
-popd
+#pushd modello-site
+#mvn-jpp \
+# -e \
+# -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+# -Dmaven2.jpp.depmap.file=%{SOURCE2} \
+# site
+#popd
%else
pushd modello-core
@@ -309,6 +287,7 @@
popd
pushd modello-plugins/modello-plugin-xml
+rm -rf src/test/java/*
export CLASSPATH=$(build-classpath \
plexus/classworlds \
plexus/containers-component-api \
@@ -316,7 +295,6 @@
plexus/utils \
)
CLASSPATH=$CLASSPATH:../../modello-core/target/modello-core-%{namedversion}.jar
-CLASSPATH=$CLASSPATH:target/classes:target/test-classes
ant -Dbuild.sysclasspath=only jar javadoc
popd
@@ -390,13 +368,13 @@
popd
pushd modello-db-keywords
+rm -rf src/test/java/*
export CLASSPATH=$(build-classpath \
plexus/classworlds \
plexus/containers-component-api \
plexus/containers-container-default \
plexus/utils \
)
-CLASSPATH=$CLASSPATH:target/classes:target/test-classes
ant -Dbuild.sysclasspath=only jar javadoc
popd
@@ -637,6 +615,13 @@
%endif
%changelog
+* Mon Jan 07 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a17.1jpp
+- 1.0-alpha-17
+
+* Mon Jan 07 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a15.3jpp
+- Assure plexus' components.xml in non-maven build
+- Include plexus-registry in plexus-maven-plugin
+
* Mon Dec 03 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.0-0.a15.2jpp
- Separate -maven-plugin subpackage
- Fix versionless symlink for plugin-prevayler
_______________________________________________
JPackage-announce mailing list
JPackage-announce@zarb.org
https://www.zarb.org/mailman/listinfo/jpackage-announce
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic