[velocity-tools] Initial import (#826645)
by gil
commit 025531dea76ecaaa07b3194b2c83c7a8acf813c8
Author: gil <puntogil(a)libero.it>
Date: Sun Jul 15 10:40:34 2012 +0200
Initial import (#826645)
.gitignore | 1 +
sources | 1 +
velocity-tools-2.0-depmap | 26 +++
velocity-tools-2.0-dont_copy_test_lib.patch | 38 +++++
velocity-tools-2.0-junit4.patch | 241 +++++++++++++++++++++++++++
velocity-tools-2.0-pom.patch | 17 ++
velocity-tools-2.0-servlet.patch | 11 ++
velocity-tools.spec | 129 ++++++++++++++
8 files changed, 464 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..b7a043b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/velocity-tools-2.0-src.tar.gz
diff --git a/sources b/sources
index e69de29..bcc705a 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+883ff873be49f55b53cae8eb0d115608 velocity-tools-2.0-src.tar.gz
diff --git a/velocity-tools-2.0-depmap b/velocity-tools-2.0-depmap
new file mode 100644
index 0000000..945ed7a
--- /dev/null
+++ b/velocity-tools-2.0-depmap
@@ -0,0 +1,26 @@
+<dependencies>
+<dependency>
+ <maven>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>7.0.27</version>
+ </maven>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>tomcat-servlet-3.0-api</artifactId>
+ <version>7.0.27</version>
+ </jpp>
+</dependency>
+<dependency>
+ <maven>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
+ <version>7.0.27</version>
+ </maven>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>tomcat-jsp-2.2-api</artifactId>
+ <version>7.0.27</version>
+ </jpp>
+</dependency>
+</dependencies>
\ No newline at end of file
diff --git a/velocity-tools-2.0-dont_copy_test_lib.patch b/velocity-tools-2.0-dont_copy_test_lib.patch
new file mode 100644
index 0000000..4580c5b
--- /dev/null
+++ b/velocity-tools-2.0-dont_copy_test_lib.patch
@@ -0,0 +1,38 @@
+diff -Nru velocity-tools-2.0-src/download.xml velocity-tools-2.0-src-gil/download.xml
+--- velocity-tools-2.0-src/download.xml 2008-11-30 17:51:06.000000000 +0100
++++ velocity-tools-2.0-src-gil/download.xml 2011-09-10 15:26:35.088480329 +0200
+@@ -352,8 +352,6 @@
+ <property name="download.version" value="${jar.js.version}" />
+ <property name="download.path" value="rhino/${download.groupId}/${download.version}" />
+ <antcall target="http-test-m1-download"/>
+- <!-- httpunit wants a file named 'js.jar' -->
+- <copy file="${test.lib.dir}/${download.groupId}-${download.version}.jar" tofile="${test.lib.dir}/js.jar"/>
+ </target>
+
+ <target name="junit-download">
+diff -Nru velocity-tools-2.0-src/examples.xml velocity-tools-2.0-src-gil/examples.xml
+--- velocity-tools-2.0-src/examples.xml 2008-11-17 21:11:23.000000000 +0100
++++ velocity-tools-2.0-src-gil/examples.xml 2011-09-10 15:26:35.089480329 +0200
+@@ -53,13 +53,6 @@
+ </target>
+ <target name="simple-dependencies">
+ <copy todir="${lib}" file="${dist.dir}/${view.id}.jar"/>
+- <copy todir="${lib}" file="${commons-beanutils.jar}"/>
+- <copy todir="${lib}" file="${commons-collections.jar}"/>
+- <copy todir="${lib}" file="${commons-digester.jar}"/>
+- <copy todir="${lib}" file="${commons-lang.jar}"/>
+- <copy todir="${lib}" file="${commons-logging.jar}"/>
+- <copy todir="${lib}" file="${oro.jar}"/>
+- <copy todir="${lib}" file="${velocity.jar}"/>
+ </target>
+
+ <target name="showcase-example">
+@@ -69,8 +62,6 @@
+ <antcall target="example-${target}"/>
+ </target>
+ <target name="showcase-dependencies" depends="simple-dependencies">
+- <copy todir="${lib}" file="${dom4j.jar}"/>
+- <copy todir="${lib}" file="${servlet.jar}"/>
+ </target>
+
+ <target name="struts-example">
diff --git a/velocity-tools-2.0-junit4.patch b/velocity-tools-2.0-junit4.patch
new file mode 100644
index 0000000..f7d1fb0
--- /dev/null
+++ b/velocity-tools-2.0-junit4.patch
@@ -0,0 +1,241 @@
+diff -Nru velocity-tools-2.0-src/src/test/java/org/apache/velocity/tools/generic/DisplayToolTests.java velocity-tools-2.0-src-gil/src/test/java/org/apache/velocity/tools/generic/DisplayToolTests.java
+--- velocity-tools-2.0-src/src/test/java/org/apache/velocity/tools/generic/DisplayToolTests.java 2009-05-12 00:24:52.000000000 +0200
++++ velocity-tools-2.0-src-gil/src/test/java/org/apache/velocity/tools/generic/DisplayToolTests.java 2011-09-10 15:29:12.534469474 +0200
+@@ -119,11 +119,11 @@
+ display.configure(conf);
+ assertEquals(";", display.getListDelimiter());
+ assertEquals(" und ", display.getListFinalDelimiter());
+- assertEquals(5, display.getTruncateLength());
++ assertEquals((double)5, display.getTruncateLength());
+ assertEquals(">", display.getTruncateSuffix());
+ assertEquals(true, display.getTruncateAtWord());
+ assertEquals("~", display.getCellSuffix());
+- assertEquals(4, display.getCellLength());
++ assertEquals((double)4, display.getCellLength());
+ assertEquals("n/a", display.getDefaultAlternate());
+ String[] tags = display.getAllowedTags();
+ assertNotNull(tags);
+@@ -142,14 +142,14 @@
+ assertNull(display.measure(null));
+ DisplayTool.Measurements dims = display.measure("");
+ assertNotNull(dims);
+- assertEquals(1, dims.getHeight());
+- assertEquals(0, dims.getWidth());
++ assertEquals((double)1, dims.getHeight());
++ assertEquals((double)0, dims.getWidth());
+ dims = display.measure("twelve chars");
+- assertEquals(12, dims.getWidth());
+- assertEquals(1, dims.getHeight());
++ assertEquals((double)12, dims.getWidth());
++ assertEquals((double)1, dims.getHeight());
+ dims = display.measure("one\ntwo\nthree");
+- assertEquals(5, dims.getWidth());
+- assertEquals(3, dims.getHeight());
++ assertEquals((double)5, dims.getWidth());
++ assertEquals((double)3, dims.getHeight());
+ }
+
+ public @Test void methodMessage_StringObjectVarArgs() throws Exception
+@@ -242,7 +242,7 @@
+ {
+ DisplayTool display = new DisplayTool();
+ display.setCellLength(10);
+- assertEquals(10, display.getCellLength());
++ assertEquals((double)10, display.getCellLength());
+ }
+
+ public @Test void methodSetCellSuffix_String() throws Exception
+@@ -277,7 +277,7 @@
+ {
+ DisplayTool display = new DisplayTool();
+ display.setTruncateLength(5);
+- assertEquals(5, display.getTruncateLength());
++ assertEquals((double)5, display.getTruncateLength());
+ }
+
+ public @Test void methodSetTruncateSuffix_String() throws Exception
+@@ -457,4 +457,4 @@
+ }
+ }
+
+-}
+\ Manca newline alla fine del file
++}
+diff -Nru velocity-tools-2.0-src/src/test/java/org/apache/velocity/tools/generic/LinkToolTests.java velocity-tools-2.0-src-gil/src/test/java/org/apache/velocity/tools/generic/LinkToolTests.java
+--- velocity-tools-2.0-src/src/test/java/org/apache/velocity/tools/generic/LinkToolTests.java 2009-05-12 00:24:52.000000000 +0200
++++ velocity-tools-2.0-src-gil/src/test/java/org/apache/velocity/tools/generic/LinkToolTests.java 2011-09-10 15:29:12.535469474 +0200
+@@ -248,7 +248,7 @@
+ LinkTool link = newInstance();
+ assertNull(link.getPort());
+ link = newInstance(LinkTool.PORT_KEY, 42);
+- assertEquals(42, link.getPort());
++ assertEquals(new Integer(42), link.getPort());
+ }
+
+ public @Test void methodPort_Object() throws Exception
+@@ -256,15 +256,15 @@
+ LinkTool link = newInstance();
+ assertNull(link.port(null).getPort());
+ assertNull(link.port(":asd").getPort());
+- assertEquals(1, link.port(1).getPort());
+- assertEquals(42, link.port("42").getPort());
++ assertEquals(new Integer(1), link.port(1).getPort());
++ assertEquals(new Integer(42), link.port("42").getPort());
+ }
+
+ public @Test void methodSetPort_Object() throws Exception
+ {
+ LinkTool link = newInstance();
+ link.setPort(42);
+- assertEquals(42, link.getPort());
++ assertEquals(new Integer(42), link.getPort());
+ }
+
+ public @Test void methodGetPath() throws Exception
+@@ -845,4 +845,4 @@
+ }
+
+ }
+-
+\ Manca newline alla fine del file
++
+diff -Nru velocity-tools-2.0-src/src/test/java/org/apache/velocity/tools/generic/LoopToolTests.java velocity-tools-2.0-src-gil/src/test/java/org/apache/velocity/tools/generic/LoopToolTests.java
+--- velocity-tools-2.0-src/src/test/java/org/apache/velocity/tools/generic/LoopToolTests.java 2009-05-12 00:24:52.000000000 +0200
++++ velocity-tools-2.0-src-gil/src/test/java/org/apache/velocity/tools/generic/LoopToolTests.java 2011-09-10 15:29:12.536469474 +0200
+@@ -323,45 +323,45 @@
+ {
+ LoopTool loop = new LoopTool();
+ Iterator i = loop.watch(ARRAY);
+- assertEquals(0, loop.getCount());
++ assertEquals(new Integer(0), loop.getCount());
+ assertNull(loop.getIndex());
+ i.next();
+- assertEquals(1, loop.getCount());
+- assertEquals(0, loop.getIndex());
++ assertEquals(new Integer(1), loop.getCount());
++ assertEquals(new Integer(0), loop.getIndex());
+ i.next();
+- assertEquals(2, loop.getCount());
+- assertEquals(1, loop.getIndex());
++ assertEquals(new Integer(2), loop.getCount());
++ assertEquals(new Integer(1), loop.getIndex());
+ i.next();
+- assertEquals(3, loop.getCount());
+- assertEquals(2, loop.getIndex());
++ assertEquals(new Integer(3), loop.getCount());
++ assertEquals(new Integer(2), loop.getIndex());
+ loop.pop();
+ // test that skipped iterations are still included
+ i = loop.watch(ARRAY);
+ loop.skip(2);
+- assertEquals(2, loop.getCount());
+- assertEquals(1, loop.getIndex());
++ assertEquals(new Integer(2), loop.getCount());
++ assertEquals(new Integer(1), loop.getIndex());
+ }
+
+ public @Test void methodGetCountOrGetIndex_String() throws Exception
+ {
+ LoopTool loop = new LoopTool();
+ Iterator i = loop.watch(ARRAY, "i");
+- assertEquals(0, loop.getCount("i"));
++ assertEquals(new Integer(0), loop.getCount("i"));
+ assertNull(loop.getIndex("i"));
+ i.next();
+- assertEquals(1, loop.getCount("i"));
+- assertEquals(0, loop.getIndex("i"));
++ assertEquals(new Integer(1), loop.getCount("i"));
++ assertEquals(new Integer(0), loop.getIndex("i"));
+ Iterator j = loop.watch(ARRAY, "j");
+ loop.skip(2);
+- assertEquals(2, loop.getCount("j"));
+- assertEquals(1, loop.getIndex("j"));
+- assertEquals(1, loop.getCount("i"));
+- assertEquals(0, loop.getIndex("i"));
++ assertEquals(new Integer(2), loop.getCount("j"));
++ assertEquals(new Integer(1), loop.getIndex("j"));
++ assertEquals(new Integer(1), loop.getCount("i"));
++ assertEquals(new Integer(0), loop.getIndex("i"));
+ // check short syntax too
+- assertEquals(2, loop.get("count_j"));
+- assertEquals(1, loop.get("index_j"));
+- assertEquals(1, loop.get("count_i"));
+- assertEquals(0, loop.get("index_i"));
++ assertEquals(new Integer(2), loop.get("count_j"));
++ assertEquals(new Integer(1), loop.get("index_j"));
++ assertEquals(new Integer(1), loop.get("count_i"));
++ assertEquals(new Integer(0), loop.get("index_i"));
+ }
+
+ public @Test void aliasMethods() throws Exception
+@@ -403,15 +403,15 @@
+ public @Test void method_getDepth() throws Exception
+ {
+ LoopTool loop = new LoopTool();
+- assertEquals(0, loop.getDepth());
++ assertEquals((double)0, loop.getDepth());
+ loop.watch(ARRAY);
+- assertEquals(1, loop.getDepth());
++ assertEquals((double)1, loop.getDepth());
+ loop.watch(ARRAY);
+- assertEquals(2, loop.getDepth());
++ assertEquals((double)2, loop.getDepth());
+ loop.pop();
+- assertEquals(1, loop.getDepth());
++ assertEquals((double)1, loop.getDepth());
+ loop.pop();
+- assertEquals(0, loop.getDepth());
++ assertEquals((double)0, loop.getDepth());
+ }
+
+ }
+diff -Nru velocity-tools-2.0-src/src/test/java/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java velocity-tools-2.0-src-gil/src/test/java/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java
+--- velocity-tools-2.0-src/src/test/java/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java 2008-12-02 17:45:13.000000000 +0100
++++ velocity-tools-2.0-src-gil/src/test/java/org/apache/velocity/tools/test/whitebox/GenericToolsTests.java 2011-09-10 15:29:12.533469474 +0200
+@@ -78,9 +78,9 @@
+ assertEquals(disp,dateTool.format(date));
+ assertEquals(disp2,dateTool.format("yyyy/MM/dd",date));
+ /* test parsing */
+- assertEquals(2007,dateTool.getYear(disp));
+- assertEquals(0,dateTool.getMonth(disp));
+- assertEquals(2,dateTool.getDay(disp));
++ assertEquals(new Integer(2007), dateTool.getYear(disp));
++ assertEquals(new Integer(0), dateTool.getMonth(disp));
++ assertEquals(new Integer(2), dateTool.getDay(disp));
+ }
+
+ public @Test void testEscapeTool() {
+@@ -147,24 +147,24 @@
+ assertNotNull(mathTool);
+ assertEquals(1,mathTool.abs(-1));
+ assertEquals(2,mathTool.add(1,1));
+- assertEquals(3,mathTool.ceil(2.5));
++ assertEquals(new Integer(3),mathTool.ceil(2.5));
+ assertEquals(4,mathTool.div(8,2));
+- assertEquals(5,mathTool.floor(5.1));
++ assertEquals(new Integer(5),mathTool.floor(5.1));
+ assertEquals(6,mathTool.getAverage(new long[] {5,6,7}));
+ /* getTotal() watches the type of its first argument, so assertEquals needs a long */
+ assertEquals((long)7,mathTool.getTotal(new long[] {2,2,3}));
+- assertEquals(8,mathTool.idiv(130,16));
++ assertEquals(new Integer(8),mathTool.idiv(130,16));
+ assertEquals(9,mathTool.max(9,-10));
+ assertEquals(10,mathTool.min(10,20));
+- assertEquals(11,mathTool.mod(37,13));
++ assertEquals(new Integer(11),mathTool.mod(37,13));
+ assertEquals(12,mathTool.mul(3,4));
+- assertEquals(13,mathTool.round(12.8));
+- assertEquals(14.2,mathTool.roundTo(1,14.18));
+- assertEquals(-5.0,mathTool.roundTo(2,-4.999));
++ assertEquals(new Integer(13),mathTool.round(12.8));
++ assertEquals(new Double(14.2),mathTool.roundTo(1,14.18));
++ assertEquals(new Double(-5.0),mathTool.roundTo(2,-4.999));
+ assertEquals(15,mathTool.sub(30,15));
+ assertEquals(16,mathTool.pow(4,2));
+- assertEquals(17,mathTool.toInteger("17"));
+- assertEquals(18.1,mathTool.toDouble("18.1"));
++ assertEquals(new Integer(17),mathTool.toInteger("17"));
++ assertEquals(new Double(18.1),mathTool.toDouble("18.1"));
+ }
+
+ public @Test void testNumberTool() {
diff --git a/velocity-tools-2.0-pom.patch b/velocity-tools-2.0-pom.patch
new file mode 100644
index 0000000..5d223da
--- /dev/null
+++ b/velocity-tools-2.0-pom.patch
@@ -0,0 +1,17 @@
+--- pom.xml 2010-04-12 19:07:00.000000000 +0200
++++ pom.xml-gil 2012-05-27 05:46:03.422196231 +0200
+@@ -418,7 +418,13 @@
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+- <version>2.3</version>
++ <version>7.0.27</version>
++ <scope>provided</scope>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.tomcat</groupId>
++ <artifactId>tomcat-jsp-api</artifactId>
++ <version>7.0.27</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
diff --git a/velocity-tools-2.0-servlet.patch b/velocity-tools-2.0-servlet.patch
new file mode 100644
index 0000000..a1f14c2
--- /dev/null
+++ b/velocity-tools-2.0-servlet.patch
@@ -0,0 +1,11 @@
+--- src/main/java/org/apache/velocity/tools/view/ParameterTool.java 2009-05-12 00:24:53.000000000 +0200
++++ src/main/java/org/apache/velocity/tools/view/ParameterTool.java-gil 2012-05-30 17:19:25.741937122 +0200
+@@ -174,7 +174,7 @@
+ Map source = super.getSource();
+ if (source == null)
+ {
+- source = expandSingletonArrays(getRequest().getParameterMap());
++ source = expandSingletonArrays((Map<String,Object>)(Object)getRequest().getParameterMap());
+ super.setSource(source);
+ }
+ return source;
diff --git a/velocity-tools.spec b/velocity-tools.spec
new file mode 100644
index 0000000..e429c22
--- /dev/null
+++ b/velocity-tools.spec
@@ -0,0 +1,129 @@
+Name: velocity-tools
+Version: 2.0
+Release: 1%{?dist}
+Summary: Collection of useful tools for Velocity template engine
+Group: Development/Libraries
+License: ASL 2.0
+Url: http://velocity.apache.org/tools/releases/2.0/
+Source0: http://www.apache.org/dist/velocity/tools/%{version}/%{name}-%{version}-s...
+# force tomcat 7.x apis
+Source1: velocity-tools-2.0-depmap
+Patch0: %{name}-%{version}-junit4.patch
+# add org.apache.tomcat tomcat-jsp-api 7.0.27
+Patch1: %{name}-%{version}-pom.patch
+Patch2: %{name}-%{version}-dont_copy_test_lib.patch
+# servlet 3.0 support thanks to mizdebsk
+Patch3: %{name}-%{version}-servlet.patch
+
+BuildRequires: java-devel
+BuildRequires: jpackage-utils
+
+BuildRequires: apache-commons-beanutils
+BuildRequires: apache-commons-chain
+BuildRequires: apache-commons-collections
+BuildRequires: apache-commons-digester
+BuildRequires: apache-commons-lang
+BuildRequires: apache-commons-logging
+BuildRequires: apache-commons-validator
+BuildRequires: jakarta-oro
+BuildRequires: dom4j
+BuildRequires: sslext
+# core taglib tiles
+BuildRequires: struts
+BuildRequires: tomcat-jsp-2.2-api
+BuildRequires: tomcat-servlet-3.0-api
+BuildRequires: velocity
+
+
+# test deps
+# httpunit httpunit 1.6.1
+# org.mortbay.jetty jetty-embedded 6.0.1
+# nekohtml nekohtml 0.9.5
+# rhino js 1.6R5
+# xerces xercesImpl 2.8.1
+# xerces xmlParserAPIs 2.6.2
+BuildRequires: junit
+
+BuildRequires: maven
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-surefire-plugin
+
+Requires: apache-commons-beanutils
+Requires: apache-commons-chain
+Requires: apache-commons-collections
+Requires: apache-commons-digester
+Requires: apache-commons-lang
+Requires: apache-commons-logging
+Requires: apache-commons-validator
+Requires: jakarta-oro
+Requires: dom4j
+Requires: sslext
+Requires: struts
+Requires: tomcat-jsp-2.2-api
+Requires: tomcat-servlet-3.0-api
+Requires: velocity
+
+Requires: java
+Requires: jpackage-utils
+BuildArch: noarch
+
+%description
+The VelocityTools project is a collection of useful Java classes (aka tools),
+as well as infrastructure to easily, automatically and transparently
+make these tools available to Velocity templates.
+
+Project include easy integration of Velocity into the view-layer of
+web applications (via the VelocityViewTag and
+VelocityViewServlet) and integration with Struts 1.x applications.
+
+%package javadoc
+Group: Documentation
+Summary: Javadoc for %{name}
+Requires: jpackage-utils
+
+%description javadoc
+This package contains javadoc for %{name}.
+
+%prep
+%setup -q -n %{name}-%{version}-src
+find . -name "*.jar" -delete
+find . -name "*.class" -delete
+%patch0 -p1
+%patch1 -p0
+%patch2 -p1
+%patch3 -p0
+sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt
+
+%build
+# tests skipped. cause: missing dependencies
+mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 -Dmaven.local.depmap.file="%{SOURCE1}" -Dmaven.test.skip=true install javadoc:aggregate
+
+%install
+
+mkdir -p %{buildroot}%{_javadir}
+install -pm 644 dist/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{name}:%{name},org.apache.velocity:%{name}-generic,%{name}:%{name}-generic,%{name}:%{name}-view,org.apache.velocity:%{name}-view"
+
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -pr dist/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+
+%files
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
+%doc CONTRIBUTORS LICENSE NOTICE README.txt STATUS WHY_THREE_JARS.txt
+
+%files javadoc
+%{_javadocdir}/%{name}
+%doc LICENSE NOTICE
+
+%changelog
+* Sun May 27 2012 gil cattaneo <puntogil(a)libero.it> 2.0-1
+- initial rpm
\ No newline at end of file
11 years, 11 months
[bval/f17] Don't use buildnumber-plugin, because jna is required and currently broken in f17
by gil
commit 5c1b56be18747df38a546e8da3906ed3ba47a869
Author: gil <puntogil(a)libero.it>
Date: Sat Jul 14 09:51:17 2012 +0200
Don't use buildnumber-plugin, because jna is required and currently broken in f17
bval-0.4-remove-buildnumber-maven-plugin.patch | 34 ++++++++++++++++++++++++
bval.spec | 3 ++
2 files changed, 37 insertions(+), 0 deletions(-)
---
diff --git a/bval-0.4-remove-buildnumber-maven-plugin.patch b/bval-0.4-remove-buildnumber-maven-plugin.patch
new file mode 100644
index 0000000..4554202
--- /dev/null
+++ b/bval-0.4-remove-buildnumber-maven-plugin.patch
@@ -0,0 +1,34 @@
+--- pom.xml 2012-07-12 15:28:39.355767744 +0200
++++ pom.xml-gil 2012-07-14 09:40:05.130197200 +0200
+@@ -524,11 +524,11 @@
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3.2</version>
+ </plugin-->
+- <plugin>
++ <!--plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.0-beta-4</version>
+- </plugin>
++ </plugin-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+@@ -573,7 +573,7 @@
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ </plugin-->
+- <plugin>
++ <!--plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <configuration>
+@@ -588,7 +588,7 @@
+ </goals>
+ </execution>
+ </executions>
+- </plugin>
++ </plugin-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
diff --git a/bval.spec b/bval.spec
index bd040de..f1c09a3 100644
--- a/bval.spec
+++ b/bval.spec
@@ -33,6 +33,8 @@ Patch5: %{name}-%{namedversion}-disable-guice.patch
Patch6: %{name}-%{namedversion}-extras-pom.patch
# fix koji build problems missing org.apache.geronimo.osgi.locator.ProviderLocator
Patch7: %{name}-%{namedversion}-jsr303-osgi-locator.patch
+# Don't use buildnumber-plugin, because jna is required and currently broken in f17
+Patch8: %{name}-%{namedversion}-remove-buildnumber-maven-plugin.patch
BuildRequires: java-devel >= 0:1.7.0
BuildRequires: jpackage-utils
@@ -121,6 +123,7 @@ find . -name "*.jar" -delete
%endif
%patch6 -p0
%patch7 -p0
+%patch8 -p0
# unavailable deps
# org.hibernate.jsr303.tck jsr303-tck 1.0.6.GA
11 years, 11 months
[serp/f17] Initial import (#823835)
by gil
Summary of changes:
8cf0018... Initial import (#823835) (*)
(*) This commit already existed in another branch; no separate mail sent
11 years, 11 months
[bval/f17] Initial import (#823862)
by gil
Summary of changes:
62b112d... Initial import (#823862) (*)
(*) This commit already existed in another branch; no separate mail sent
11 years, 11 months
[tuscany-sdo-java] Initial import (#809536)
by gil
commit 8520615abe9ab40cd703c569ffcea02e318639f8
Author: gil <puntogil(a)libero.it>
Date: Sat Jul 14 09:13:56 2012 +0200
Initial import (#809536)
.gitignore | 1 +
sources | 1 +
tuscany-sdo-java-1.1.1-pom.patch | 80 +++++++++++++++++++++++++++++
tuscany-sdo-java.spec | 105 ++++++++++++++++++++++++++++++++++++++
4 files changed, 187 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..e3c2b86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/apache-tuscany-sdo-1.1.1-src.tar.gz
diff --git a/sources b/sources
index e69de29..5151283 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+cb2c688470f6043963ffc74977ae1c3a apache-tuscany-sdo-1.1.1-src.tar.gz
diff --git a/tuscany-sdo-java-1.1.1-pom.patch b/tuscany-sdo-java-1.1.1-pom.patch
new file mode 100644
index 0000000..e6c8b15
--- /dev/null
+++ b/tuscany-sdo-java-1.1.1-pom.patch
@@ -0,0 +1,80 @@
+--- pom.xml 2008-07-10 14:54:10.000000000 +0200
++++ pom.xml-gil 2012-07-11 16:09:36.034690588 +0200
+@@ -77,12 +77,12 @@
+ </activation>
+ <modules>
+ <module>sdo-api</module>
+- <module>lib</module>
+- <module>impl</module>
+- <module>tools</module>
+- <module>plugin</module>
+- <module>sample</module>
+- <module>java5tools</module>
++ <!--module>lib</module-->
++ <!--module>impl</module-->
++ <!--module>tools</module-->
++ <!--module>plugin</module-->
++ <!--module>sample</module-->
++ <!--module>java5tools</module-->
+ </modules>
+ </profile>
+
+@@ -90,13 +90,13 @@
+ <id>distribution</id>
+ <modules>
+ <module>sdo-api</module>
+- <module>lib</module>
+- <module>impl</module>
+- <module>tools</module>
+- <module>plugin</module>
+- <module>sample</module>
+- <module>distribution</module>
+- <module>java5tools</module>
++ <!--module>lib</module-->
++ <!--module>impl</module-->
++ <!--module>tools</module-->
++ <!--module>plugin</module-->
++ <!--module>sample</module-->
++ <!--module>distribution</module-->
++ <!--module>java5tools</module-->
+ </modules>
+ </profile>
+
+@@ -104,12 +104,12 @@
+ <id>eclipse</id>
+ <modules>
+ <module>sdo-api</module>
+- <module>lib</module>
+- <module>impl</module>
+- <module>plugin</module>
+- <module>tools</module>
+- <module>sample</module>
+- <module>java5tools</module>
++ <!--module>lib</module-->
++ <!--module>impl</module-->
++ <!--module>plugin</module-->
++ <!--module>tools</module-->
++ <!--module>sample</module-->
++ <!--module>java5tools</module-->
+ </modules>
+ </profile>
+
+@@ -121,12 +121,12 @@
+
+ <modules>
+ <module>sdo-api</module>
+- <module>lib</module>
+- <module>impl</module>
+- <module>tools</module>
+- <module>plugin</module>
+- <module>sample</module>
+- <module>distribution</module>
++ <!--module>lib</module-->
++ <!--module>impl</module-->
++ <!--module>tools</module-->
++ <!--module>plugin</module-->
++ <!--module>sample</module-->
++ <!--module>distribution</module-->
+ </modules>
+ </profile>
+ </profiles>
diff --git a/tuscany-sdo-java.spec b/tuscany-sdo-java.spec
new file mode 100644
index 0000000..20a0a69
--- /dev/null
+++ b/tuscany-sdo-java.spec
@@ -0,0 +1,105 @@
+%global namedreltag %{nil}
+%global namedversion %{version}%{?namedreltag}
+%global api_version 2.1
+%global api_name tuscany-sdo-api-r%{api_version}
+
+Name: tuscany-sdo-java
+Version: 1.1.1
+Release: 1%{?dist}
+Summary: Service Data Objects 2.1 Java API spec
+Group: Development/Libraries
+License: ASL 2.0
+Url: http://tuscany.apache.org/sdo-java.html
+Source0: ftp://ftp.gbnet.net/pub/apache/dist/tuscany/java/sdo/%{version}/apache-tu...
+# disable some modules
+Patch0: tuscany-sdo-java-%{version}-pom.patch
+
+BuildRequires: jpackage-utils
+BuildRequires: java-devel
+
+BuildRequires: junit
+
+BuildRequires: maven
+BuildRequires: maven-assembly-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-plugin-bundle
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: maven-surefire-provider-junit4
+
+Requires: jpackage-utils
+Requires: java
+BuildArch: noarch
+
+%description
+SDO is a framework for data application development, which
+includes an architecture and API. SDO does the following:
+
+- Simplifies the J2EE data programming model
+- Abstracts data in a service oriented architecture (SOA)
+- Unifies data application development
+- Supports and integrates XML
+- Incorporates J2EE patterns and best practices
+
+With SDO, you do not need to be familiar with a
+technology-specific API in order to access and utilize data.
+You need to know only one API, the SDO API, which lets you
+work with data from multiple data sources, including
+relational databases, entity EJB components, XML pages, Web
+services, the Java Connector Architecture, JavaServer Pages
+pages, and more.
+
+This package contains only a Java API of SDO 2.1 spec.
+EclipseLink is a implementation of this spec.
+
+%package javadoc
+Summary: Javadocs for %{name}
+Group: Documentation
+Requires: jpackage-utils
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+%prep
+%setup -q -n tuscany-sdo-%{version}-src
+%patch0 -p0
+
+sed -i 's|<artifactId>tuscany-sdo-api-r${specVersion}</artifactId>|<artifactId>%{api_name}</artifactId>|' $( find . -iname "pom.xml")
+
+sed -i 's/\r//' LICENSE NOTICE README RELEASE_NOTES
+
+%build
+
+mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 install javadoc:aggregate
+
+%install
+
+mkdir -p %{buildroot}%{_javadir}
+install -pm 644 sdo-api/target/%{api_name}-%{namedversion}.jar %{buildroot}%{_javadir}/tuscany-sdo-api.jar
+
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-tuscany-sdo.pom
+install -pm 644 sdo-api/pom.xml %{buildroot}%{_mavenpomdir}/JPP-tuscany-sdo-api.pom
+
+%add_maven_depmap JPP-tuscany-sdo.pom
+%add_maven_depmap JPP-tuscany-sdo-api.pom tuscany-sdo-api.jar
+
+%files
+%{_javadir}/tuscany-sdo-api.jar
+%{_mavenpomdir}/JPP-*.pom
+%{_mavendepmapfragdir}/%{name}
+%doc LICENSE NOTICE README RELEASE_NOTES
+
+%files javadoc
+%{_javadocdir}/%{name}
+%doc LICENSE NOTICE
+
+%changelog
+* Wed Feb 01 2012 gil cattaneo <puntogil(a)libero.it> 1.1.1-1
+- initial rpm
\ No newline at end of file
11 years, 11 months
[serp] Initial import (#823835)
by gil
commit 8cf00185eabdf2bfde93c3d58edc31bdfe6371cf
Author: gil <puntogil(a)libero.it>
Date: Sat Jul 14 09:12:48 2012 +0200
Initial import (#823835)
.gitignore | 1 +
serp-1.13.1-pom_xml.patch | 24 ++++++++++++
serp.spec | 93 +++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
4 files changed, 119 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..c7a25ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/serp-1.14.2-20120406-src-cvs.tar.gz
diff --git a/serp-1.13.1-pom_xml.patch b/serp-1.13.1-pom_xml.patch
new file mode 100644
index 0000000..4b8b7c1
--- /dev/null
+++ b/serp-1.13.1-pom_xml.patch
@@ -0,0 +1,24 @@
+--- pom.xml 2007-07-25 19:16:23.000000000 +0200
++++ pom.xml-gil 2011-09-06 17:20:05.185202468 +0200
+@@ -113,8 +113,8 @@
+ <reporting>
+ <plugins>
+ <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>jxr-maven-plugin</artifactId>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-jxr-plugin</artifactId>
+ <configuration>
+ <aggregate>true</aggregate>
+ </configuration>
+@@ -137,8 +137,8 @@
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>surefire-report-maven-plugin</artifactId>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
diff --git a/serp.spec b/serp.spec
new file mode 100644
index 0000000..50c4dac
--- /dev/null
+++ b/serp.spec
@@ -0,0 +1,93 @@
+Name: serp
+Version: 1.14.2
+Release: 0.1.20120406cvs%{?dist}
+Summary: Bytecode manipulation framework
+Group: Development/Libraries
+License: BSD
+Url: http://serp.sourceforge.net/
+# cvs -d:pserver:anonymous@serp.cvs.sourceforge.net:/cvsroot/serp login
+# cvs -z3 -d:pserver:anonymous@serp.cvs.sourceforge.net:/cvsroot/serp export -r HEAD serp
+# tar czf serp-1.14.2-20120406-src-cvs.tar.gz serp
+Source0: serp-1.14.2-20120406-src-cvs.tar.gz
+# change
+# org.codehaus.mojo jxr-maven-plugin in org.apache.maven.plugins maven-jxr-plugin
+# org.codehaus.mojo surefire-report-maven-plugin in org.apache.maven.plugins >maven-surefire-report-plugin
+Patch0: serp-1.13.1-pom_xml.patch
+
+BuildRequires: java-devel
+BuildRequires: jpackage-utils
+
+BuildRequires: maven
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: maven-surefire-provider-junit4
+
+BuildRequires: junit
+
+Requires: junit
+
+Requires: java
+Requires: jpackage-utils
+BuildArch: noarch
+
+%description
+The goal of the serp bytecode framework is to tap the full
+power of bytecode modification while lowering its associated
+costs. The framework provides a set of high-level APIs for
+manipulating all aspects of bytecode, from large-scale
+structures like class member fields to the individual
+instructions that comprise the code of methods. While in
+order to perform any advanced manipulation, some understanding
+of the class file format and especially of the JVM instruction
+set is necessary, the framework makes it as easy as possible
+to enter the world of bytecode development.
+
+%package javadoc
+Group: Documentation
+Summary: Javadoc for %{name}
+Requires: jpackage-utils
+
+%description javadoc
+This package contains javadoc for %{name}.
+
+%prep
+%setup -q -n %{name}
+find . -name "*.class" -delete
+find . -name "*.jar" -delete
+
+%patch0 -p0
+sed -i "s|pom.version|project.version|" pom.xml
+
+%build
+
+mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 install javadoc:aggregate
+
+%install
+
+mkdir -p %{buildroot}%{_javadir}
+install -pm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{name}:%{name}"
+
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+
+%files
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
+%doc LICENSE.txt README.txt
+
+%files javadoc
+%{_javadocdir}/%{name}
+%doc LICENSE.txt
+
+%changelog
+* Fri Apr 06 2012 gil cattaneo <puntogil(a)libero.it> 1.14.2-0.1.20120406cvs
+- initial rpm
\ No newline at end of file
diff --git a/sources b/sources
index e69de29..6bef7c4 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+de045ead8836da02c45469bc2bf6ccf3 serp-1.14.2-20120406-src-cvs.tar.gz
11 years, 11 months
[bval] Initial import (#823862)
by gil
commit 62b112d7ca7c0e2920f4bbeb823f0a8724cc6633
Author: gil <puntogil(a)libero.it>
Date: Sat Jul 14 09:11:42 2012 +0200
Initial import (#823862)
.gitignore | 1 +
bval-0.3-incubating-core-FeaturesCapable.patch | 15 ++
bval-0.4-disable-guice.patch | 29 ++++
bval-0.4-extras-pom.patch | 16 ++
bval-0.4-guice-pom.patch | 16 ++
bval-0.4-jsr303-fix-jaxb-apis.patch | 62 ++++++++
bval-0.4-jsr303-osgi-locator.patch | 15 ++
bval-0.4-jsr303-pom.patch | 52 +++++++
bval-0.4-parent-pom.patch | 98 +++++++++++++
bval.spec | 181 ++++++++++++++++++++++++
sources | 1 +
11 files changed, 486 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..1828978 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/bval-parent-0.4-source-release.zip
diff --git a/bval-0.3-incubating-core-FeaturesCapable.patch b/bval-0.3-incubating-core-FeaturesCapable.patch
new file mode 100644
index 0000000..b1fd8d8
--- /dev/null
+++ b/bval-0.3-incubating-core-FeaturesCapable.patch
@@ -0,0 +1,15 @@
+--- bval-core/src/main/java/org/apache/bval/model/FeaturesCapable.java 2011-02-03 22:31:16.000000000 +0100
++++ bval-core/src/main/java/org/apache/bval/model/FeaturesCapable.java-gil 2012-03-05 18:32:58.807073393 +0100
+@@ -31,10 +31,10 @@
+ public abstract class FeaturesCapable implements Serializable {
+ private static final long serialVersionUID = -4045110242904814218L;
+
+- private ConcurrentMap<String, Object> features = createFeaturesMap();
++ protected ConcurrentMap<String, Object> features = createFeaturesMap();
+
+ /** key = validation id, value = the validation */
+- private Validation[] validations = new Validation[0];
++ protected Validation[] validations = new Validation[0];
+
+ private volatile boolean locking;
+ private ReentrantLock lock = new ReentrantLock(true);
diff --git a/bval-0.4-disable-guice.patch b/bval-0.4-disable-guice.patch
new file mode 100644
index 0000000..d41466d
--- /dev/null
+++ b/bval-0.4-disable-guice.patch
@@ -0,0 +1,29 @@
+--- pom.xml 2012-05-15 16:48:46.340076511 +0200
++++ pom.xml-gil 2012-05-15 16:48:54.563077167 +0200
+@@ -310,7 +310,7 @@
+ <version>2.3.15</version>
+ </dependency>
+ <!-- Optional - only used by bval-guice -->
+- <dependency>
++ <!--dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+@@ -324,7 +324,7 @@
+ <groupId>aopalliance</groupId>
+ <artifactId>aopalliance</artifactId>
+ <version>1.0</version>
+- </dependency>
++ </dependency-->
+ <!-- Added mainly for testing -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+@@ -616,7 +616,7 @@
+ <module>bval-jsr303</module>
+ <module>bundle</module>
+ <module>bval-json</module>
+- <module>bval-guice</module>
++ <!--module>bval-guice</module-->
+ <module>bval-tck</module>
+ <module>bval-extras</module>
+ </modules>
diff --git a/bval-0.4-extras-pom.patch b/bval-0.4-extras-pom.patch
new file mode 100644
index 0000000..e596e21
--- /dev/null
+++ b/bval-0.4-extras-pom.patch
@@ -0,0 +1,16 @@
+--- bval-extras/pom.xml 2012-04-09 22:00:38.000000000 +0200
++++ bval-extras/pom.xml-gil 2012-05-15 16:53:51.314100847 +0200
+@@ -39,7 +39,12 @@
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+- <artifactId>org.apache.bval.bundle</artifactId>
++ <artifactId>bval-core</artifactId>
++ <version>${project.version}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.bval</groupId>
++ <artifactId>bval-jsr303</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
diff --git a/bval-0.4-guice-pom.patch b/bval-0.4-guice-pom.patch
new file mode 100644
index 0000000..bae76e2
--- /dev/null
+++ b/bval-0.4-guice-pom.patch
@@ -0,0 +1,16 @@
+--- bval-guice/pom.xml 2012-04-09 22:00:38.000000000 +0200
++++ bval-guice/pom.xml-gil 2012-05-15 16:13:57.615909837 +0200
+@@ -39,7 +39,12 @@
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.bval</groupId>
+- <artifactId>org.apache.bval.bundle</artifactId>
++ <artifactId>bval-core</artifactId>
++ <version>${project.version}</version>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.bval</groupId>
++ <artifactId>bval-jsr303</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
diff --git a/bval-0.4-jsr303-fix-jaxb-apis.patch b/bval-0.4-jsr303-fix-jaxb-apis.patch
new file mode 100644
index 0000000..ed03bf2
--- /dev/null
+++ b/bval-0.4-jsr303-fix-jaxb-apis.patch
@@ -0,0 +1,62 @@
+diff -Nru bval-jsr303/src/main/java/org/apache/bval/jsr303/xml/ValidationMappingParser.java bval-jsr303/src/main/java/org/apache/bval/jsr303/xml-gil/ValidationMappingParser.java
+--- bval-jsr303/src/main/java/org/apache/bval/jsr303/xml/ValidationMappingParser.java 2012-04-09 22:00:34.000000000 +0200
++++ bval-jsr303/src/main/java/org/apache/bval/jsr303/xml-gil/ValidationMappingParser.java 2012-05-15 16:07:59.031881223 +0200
+@@ -311,8 +311,8 @@
+ }
+
+ List<Class<?>> groupList = new ArrayList<Class<?>>();
+- for (JAXBElement<String> groupClass : groupsType.getValue()) {
+- groupList.add(loadClass(groupClass.getValue(), defaultPackage));
++ for (String groupClass : groupsType.getValue()) {
++ groupList.add(loadClass(groupClass, defaultPackage));
+ }
+ return groupList.toArray(new Class[groupList.size()]);
+ }
+@@ -326,8 +326,8 @@
+ }
+
+ List<Class<? extends Payload>> payloadList = new ArrayList<Class<? extends Payload>>();
+- for (JAXBElement<String> groupClass : payloadType.getValue()) {
+- Class<?> payload = loadClass(groupClass.getValue(), defaultPackage);
++ for (String groupClass : payloadType.getValue()) {
++ Class<?> payload = loadClass(groupClass, defaultPackage);
+ if (!Payload.class.isAssignableFrom(payload)) {
+ throw new ValidationException("Specified payload class " + payload.getName() +
+ " does not implement javax.validation.Payload");
+@@ -343,8 +343,8 @@
+ if (groupSequenceType != null) {
+ Class<?>[] groupSequence = new Class<?>[groupSequenceType.getValue().size()];
+ int i=0;
+- for (JAXBElement<String> groupName : groupSequenceType.getValue()) {
+- Class<?> group = loadClass(groupName.getValue(), defaultPackage);
++ for (String groupName : groupSequenceType.getValue()) {
++ Class<?> group = loadClass(groupName, defaultPackage);
+ groupSequence[i++] = group;
+ }
+ return groupSequence;
+@@ -459,10 +459,10 @@
+ */
+ classes.addAll(findConstraintValidatorClasses(annotationClass));
+ }
+- for (JAXBElement<String> validatorClassName : validatedByType.getValue()) {
++ for (String validatorClassName : validatedByType.getValue()) {
+ Class<? extends ConstraintValidator<?, ?>> validatorClass;
+ validatorClass = (Class<? extends ConstraintValidator<?, ?>>)
+- loadClass(validatorClassName.getValue());
++ loadClass(validatorClassName);
+
+
+ if (!ConstraintValidator.class.isAssignableFrom(validatorClass)) {
+diff -Nru bval-jsr303/src/main/java/org/apache/bval/jsr303/xml/ValidationParser.java bval-jsr303/src/main/java/org/apache/bval/jsr303/xml-gil/ValidationParser.java
+--- bval-jsr303/src/main/java/org/apache/bval/jsr303/xml/ValidationParser.java 2012-04-09 22:00:34.000000000 +0200
++++ bval-jsr303/src/main/java/org/apache/bval/jsr303/xml-gil/ValidationParser.java 2012-05-15 15:55:41.502822371 +0200
+@@ -239,8 +239,7 @@
+
+ private void applyMappingStreams(ValidationConfigType xmlConfig,
+ ConfigurationImpl target) {
+- for (JAXBElement<String> mappingFileNameElement : xmlConfig.getConstraintMapping()) {
+- String mappingFileName = mappingFileNameElement.getValue();
++ for (String mappingFileName : xmlConfig.getConstraintMapping()) {
+ if (mappingFileName.startsWith("/")) {
+ // Classloader needs a path without a starting /
+ mappingFileName = mappingFileName.substring(1);
diff --git a/bval-0.4-jsr303-osgi-locator.patch b/bval-0.4-jsr303-osgi-locator.patch
new file mode 100644
index 0000000..5a8dfce
--- /dev/null
+++ b/bval-0.4-jsr303-osgi-locator.patch
@@ -0,0 +1,15 @@
+--- bval-jsr303/pom.xml 2012-05-22 10:41:17.875615639 +0200
++++ bval-jsr303/pom.xml-gil 2012-05-22 10:41:25.359615397 +0200
+@@ -161,6 +161,12 @@
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
++ <dependency>
++ <groupId>org.apache.geronimo.specs</groupId>
++ <artifactId>geronimo-osgi-locator</artifactId>
++ <version>1.0</version>
++ <scope>test</scope>
++ </dependency>
+ </dependencies>
+
+ <build>
diff --git a/bval-0.4-jsr303-pom.patch b/bval-0.4-jsr303-pom.patch
new file mode 100644
index 0000000..308b5c9
--- /dev/null
+++ b/bval-0.4-jsr303-pom.patch
@@ -0,0 +1,52 @@
+--- bval-jsr303/pom.xml 2012-04-09 22:00:36.000000000 +0200
++++ bval-jsr303/pom.xml-gil 2012-05-15 15:18:27.514644106 +0200
+@@ -65,8 +65,8 @@
+ </activation>
+ <dependencies>
+ <dependency>
+- <groupId>org.apache.geronimo.specs</groupId>
+- <artifactId>geronimo-validation_1.0_spec</artifactId>
++ <groupId>org.hibernate.javax.persistence</groupId>
++ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <!-- allow users to choose an API provider -->
+ <scope>provided</scope>
+ </dependency>
+@@ -144,8 +144,8 @@
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+- <groupId>org.apache.geronimo.specs</groupId>
+- <artifactId>geronimo-jpa_2.0_spec</artifactId>
++ <groupId>org.hibernate.javax.persistence</groupId>
++ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <!-- allow users to choose an API provider -->
+ <scope>provided</scope>
+ <optional>true</optional>
+@@ -179,19 +179,22 @@
+
+ <plugins>
+ <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>jaxb2-maven-plugin</artifactId>
+- <version>1.2</version>
++ <groupId>org.jvnet.jaxb2.maven2</groupId>
++ <artifactId>maven-jaxb22-plugin</artifactId>
++ <version>0.8.1</version>
+ <executions>
+ <execution>
+ <goals>
+- <goal>xjc</goal>
++ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+- <packageName>org.apache.bval.jsr303.xml</packageName>
+ <extension>true</extension>
++ <schemaDirectory>src/main/xsd</schemaDirectory>
++ <bindingDirectory>src/main/xjb</bindingDirectory>
++ <generatePackage>org.apache.bval.jsr303.xml</generatePackage>
++ <generateDirectory>${basedir}/target/generated-sources</generateDirectory>
+ </configuration>
+ </plugin>
+
diff --git a/bval-0.4-parent-pom.patch b/bval-0.4-parent-pom.patch
new file mode 100644
index 0000000..fc42336
--- /dev/null
+++ b/bval-0.4-parent-pom.patch
@@ -0,0 +1,98 @@
+--- pom.xml 2012-04-09 22:00:38.000000000 +0200
++++ pom.xml-gil 2012-05-15 15:23:01.081665935 +0200
+@@ -236,7 +236,7 @@
+ </reportSet>
+ </reportSets>
+ </plugin>
+- <plugin>
++ <!--plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jdepend-maven-plugin</artifactId>
+ <version>2.0-beta-2</version>
+@@ -245,7 +245,7 @@
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3.2</version>
+- </plugin>
++ </plugin-->
+ </plugins>
+ </reporting>
+
+@@ -268,8 +268,8 @@
+ </dependency>
+ <!-- JPA2 spec required for JPA TraversableResolver support -->
+ <dependency>
+- <groupId>org.apache.geronimo.specs</groupId>
+- <artifactId>geronimo-jpa_2.0_spec</artifactId>
++ <groupId>org.hibernate.javax.persistence</groupId>
++ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+@@ -415,11 +415,11 @@
+ </execution>
+ </executions>
+ </plugin>
+- <plugin>
++ <!--plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jdepend-maven-plugin</artifactId>
+ <version>2.0-beta-2</version>
+- </plugin>
++ </plugin-->
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+@@ -433,7 +433,7 @@
+ </instructions>
+ </configuration>
+ </plugin>
+- <plugin>
++ <!--plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <version>1.0-alpha-1</version>
+@@ -442,13 +442,13 @@
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+- <configuration>
++ <configuration-->
+ <!-- Fail the build if any artifacts are missing legal files -->
+- <strict>true</strict>
++ <!--strict>true</strict>
+ </configuration>
+ </execution>
+ </executions>
+- </plugin>
++ </plugin-->
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+@@ -519,11 +519,11 @@
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.12</version>
+ </plugin>
+- <plugin>
++ <!--plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.3.2</version>
+- </plugin>
++ </plugin-->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+@@ -569,10 +569,10 @@
+ <artifactId>apache-rat-plugin</artifactId>
+ <version>0.7</version>
+ </plugin>
+- <plugin>
++ <!--plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+- </plugin>
++ </plugin-->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
diff --git a/bval.spec b/bval.spec
new file mode 100644
index 0000000..bd040de
--- /dev/null
+++ b/bval.spec
@@ -0,0 +1,181 @@
+%global namedreltag %{nil}
+%global namedversion %{version}%{?namedreltag}
+# disable guice module for now
+%global with_guice 0
+Name: bval
+Version: 0.4
+Release: 2%{?dist}
+Summary: Apache Bean Validation
+Group: Development/Libraries
+License: ASL 2.0
+Url: http://bval.apache.org/
+Source0: http://www.apache.org/dist/%{name}/%{namedversion}/%{name}-parent-%{named...
+
+# remove
+# findbugs-maven-plugin
+# ianal-maven-plugin
+# jdepend-maven-plugin
+# change org.apache.geronimo.specs geronimo-jpa_2.0_spec 1.1 with org.hibernate.javax.persistence hibernate-jpa-2.0-api 1.0.1.Final
+Patch0: %{name}-%{namedversion}-parent-pom.patch
+Patch1: %{name}-0.3-incubating-core-FeaturesCapable.patch
+# change org.codehaus.mojo jaxb2-maven-plugin with maven-jaxb22-plugin
+# change org.apache.geronimo.specs geronimo-jpa_2.0_spec 1.1 with org.hibernate.javax.persistence hibernate-jpa-2.0-api 1.0.1.Final
+Patch2: %{name}-%{namedversion}-jsr303-pom.patch
+# fix jaxb 2.2 apis
+Patch3: %{name}-%{namedversion}-jsr303-fix-jaxb-apis.patch
+
+# replace bundle with core and jsr303
+Patch4: %{name}-%{namedversion}-guice-pom.patch
+# build failure bval-guice/src/main/java/org/apache/bval/guice/ValidationModule.java:[61,12] error: cannot find symbol
+Patch5: %{name}-%{namedversion}-disable-guice.patch
+
+# replace bundle with core and jsr303
+Patch6: %{name}-%{namedversion}-extras-pom.patch
+# fix koji build problems missing org.apache.geronimo.osgi.locator.ProviderLocator
+Patch7: %{name}-%{namedversion}-jsr303-osgi-locator.patch
+
+BuildRequires: java-devel >= 0:1.7.0
+BuildRequires: jpackage-utils
+
+BuildRequires: apache-commons-beanutils
+BuildRequires: apache-commons-lang3
+BuildRequires: bean-validation-api
+BuildRequires: freemarker
+BuildRequires: geronimo-validation
+BuildRequires: glassfish-jaxb
+BuildRequires: glassfish-jaxb-api
+BuildRequires: hibernate-jpa-2.0-api
+BuildRequires: slf4j
+BuildRequires: xstream
+
+%if %with_guice
+BuildRequires: aopalliance
+BuildRequires: atinject
+BuildRequires: google-guice
+Requires: aopalliance
+Requires: atinject
+Requires: google-guice
+%endif
+
+Requires: apache-commons-beanutils
+Requires: apache-commons-lang3
+Requires: bean-validation-api
+Requires: freemarker
+Requires: geronimo-validation
+Requires: glassfish-jaxb
+Requires: glassfish-jaxb-api
+Requires: hibernate-jpa-2.0-api
+Requires: slf4j
+Requires: xstream
+
+# test deps
+BuildRequires: geronimo-osgi-support
+BuildRequires: junit
+BuildRequires: mockito
+
+BuildRequires: apache-rat-plugin
+BuildRequires: buildnumber-maven-plugin
+BuildRequires: maven-antrun-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-enforcer-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-jaxb2-plugin
+BuildRequires: maven-plugin-bundle
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: maven-surefire-provider-junit4
+
+Requires: java
+Requires: jpackage-utils
+BuildArch: noarch
+
+%description
+Apache BVal delivers an implementation of the Bean Validation
+Specification (JSR303), which is TCK compliant and
+works on Java SE 5 or later. The initial codebase for the
+project was donated to the ASF by a SGA from Agimatec GmbH.
+
+%package javadoc
+Group: Documentation
+Summary: Javadoc for %{name}
+Requires: jpackage-utils
+
+%description javadoc
+This package contains javadoc for %{name}.
+
+%prep
+%setup -q -n %{name}-parent-%{namedversion}
+find . -name "*.class" -delete
+find . -name "*.jar" -delete
+
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
+%if %with_guice
+%patch4 -p0
+%else
+%patch5 -p0
+%endif
+%patch6 -p0
+%patch7 -p0
+
+# unavailable deps
+# org.hibernate.jsr303.tck jsr303-tck 1.0.6.GA
+# org.jboss.test-harness jboss-test-harness-jboss-as-51 1.0.0
+sed -i "s|<module>bval-tck</module>|<!--module>bval-tck</module-->|" pom.xml
+
+sed -i "s|<module>bundle</module>|<!--module>bundle</module-->|" pom.xml
+
+# fix non ASCII chars
+for s in bval-extras/src/main/java/org/apache/bval/extras/constraints/net/DomainValidator.java;do
+ native2ascii -encoding UTF8 ${s} ${s}
+done
+
+%build
+
+mvn-rpmbuild -Dri -Dproject.build.sourceEncoding=UTF-8 install javadoc:aggregate
+
+%install
+
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-parent.pom
+%add_maven_depmap JPP.%{name}-parent.pom
+
+# bundle guice tck
+mkdir -p %{buildroot}%{_javadir}/%{name}
+for m in core \
+ extras \
+ json \
+ jsr303 \
+ xstream;do
+ install -m 644 bval-${m}/target/bval-${m}-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}/${m}.jar
+ install -pm 644 bval-${m}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-${m}.pom
+ %add_maven_depmap JPP.%{name}-${m}.pom %{name}/${m}.jar
+done
+
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+
+%files
+%{_javadir}/%{name}/*.jar
+%{_mavenpomdir}/JPP.%{name}-*.pom
+%{_mavendepmapfragdir}/%{name}
+%doc CHANGES.txt LICENSE NOTICE README.txt
+
+%files javadoc
+%{_javadocdir}/%{name}
+%doc LICENSE NOTICE
+
+%changelog
+* Thu Jul 12 2012 gil cattaneo <puntogil(a)libero.it> 0.4-2
+- Installed NOTICE file in javadoc package
+- Fix preserve timestamps of installed POM files
+
+* Tue May 15 2012 gil cattaneo <puntogil(a)libero.it> 0.4-1
+- update to 0.4
+
+* Fri Apr 06 2012 gil cattaneo <puntogil(a)libero.it> 0.3-1
+- initial rpm
\ No newline at end of file
diff --git a/sources b/sources
index e69de29..8c263e4 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+5d5eae2cfacd9a988ff041985d9bbcbe bval-parent-0.4-source-release.zip
11 years, 11 months