From 0d2aa21678d865217f32c9546ee07bf2f48b290f Mon Sep 17 00:00:00 2001
From: Oved Ourfali <ovedo@redhat.com>
Date: Sun, 12 Feb 2012 14:38:38 +0200
Subject: [PATCH] adding javax.validation + adding an apply for the different
 patches in the spec file.

---
 ...0006-adding-javax.validation-to-build.xml.patch |   38 ++++++++++++++++++++
 SPECS/jboss-as.spec                                |    5 +++
 2 files changed, 43 insertions(+), 0 deletions(-)
 create mode 100644 SOURCES/0006-adding-javax.validation-to-build.xml.patch

diff --git a/SOURCES/0006-adding-javax.validation-to-build.xml.patch b/SOURCES/0006-adding-javax.validation-to-build.xml.patch
new file mode 100644
index 0000000..f60d765
--- /dev/null
+++ b/SOURCES/0006-adding-javax.validation-to-build.xml.patch
@@ -0,0 +1,38 @@
+From 20ae21abaf03b080d2f360e1598f95d7fb5f7fb8 Mon Sep 17 00:00:00 2001
+From: Oved Ourfali <ovedo@redhat.com>
+Date: Sun, 12 Feb 2012 12:09:59 +0200
+Subject: [PATCH] adding javax.validation to build.xml
+
+---
+ build/build.xml |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/build/build.xml b/build/build.xml
+index 192119e..6714818 100644
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -113,6 +113,10 @@
+             <maven-resource group="org.jboss.spec.javax.transaction" artifact="jboss-transaction-api_1.1_spec"/>
+         </module-def>
+ 
++        <module-def name="javax.validation.api">
++            <maven-resource group="javax.validation" artifact="validation-api"/>
++        </module-def>
++
+         <module-def name="javax.xml.stream.api"/>
+ 
+         <module-def name="org.apache.log4j">
+@@ -398,10 +402,6 @@
+             <maven-resource group="org.jboss.spec.javax.servlet.jstl" artifact="jboss-jstl-api_1.2_spec"/>
+         </module-def>
+ 
+-        <module-def name="javax.validation.api">
+-            <maven-resource group="javax.validation" artifact="validation-api"/>
+-        </module-def>
+-
+         <module-def name="javax.ws.rs.api">
+             <maven-resource group="org.jboss.spec.javax.ws.rs" artifact="jboss-jaxrs-api_1.1_spec"/>
+         </module-def>
+-- 
+1.7.8.1
+
diff --git a/SPECS/jboss-as.spec b/SPECS/jboss-as.spec
index 35de0b4..072d77a 100644
--- a/SPECS/jboss-as.spec
+++ b/SPECS/jboss-as.spec
@@ -27,6 +27,8 @@ Patch1:           0002-Fix-initd-script.patch
 Patch2:           0003-Build-additional-modules.patch
 # Modifications here are purely temporary until we solve issues in the Right Way (tm)
 Patch3:           0004-Ugly-patch-nuff-said.patch
+Patch4:           0005-Adding-javax.transaction-to-the-minimal-build.patch
+Patch5:           0006-adding-javax.validation-to-build.xml.patch
 
 BuildArch:        noarch
 
@@ -130,6 +132,8 @@ This package contains the API documentation for %{name}.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 # We don't have packaged all test dependencies (jboss-test for example)
@@ -255,6 +259,7 @@ pushd $RPM_BUILD_ROOT%{homedir}
     ln -s $(build-classpath jboss/xnio-nio) org/jboss/xnio/nio/main/xnio-nio.jar
     ln -s $(build-classpath jboss/jboss-stdio) org/jboss/stdio/main/jboss-stdio.jar
     ln -s $(build-classpath jboss/staxmapper) org/jboss/staxmapper/main/staxmapper.jar
+    ln -s $(build-classpath geronimo-validation) javax/validation/api/main/geronimo-validation.jar
     ln -s $(build-classpath log4j) org/apache/log4j/main/log4j.jar
 
     # JBoss AS modules (without build-config and threads)
-- 
1.7.9