From d3f056fa3c2e385b62f90ecb00740b61e187a725 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann@gmail.com>
Date: Fri, 9 Aug 2013 13:13:40 +0200
Subject: [PATCH] Added jandex index files to all jars

---
 resteasy.spec | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/resteasy.spec b/resteasy.spec
index 2e107e7..83e0deb 100644
--- a/resteasy.spec
+++ b/resteasy.spec
@@ -3,7 +3,7 @@
 
 Name:       resteasy
 Version:    3.0.1
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Framework for RESTful Web services and Java applications
 License:    ASL 2.0 and CDDL
 URL:        http://www.jboss.org/resteasy
@@ -112,6 +112,7 @@ This package contains the API documentation for %{name}.
 %pom_disable_module keystone/keystone-as7-modules jaxrs/security/pom.xml
 
 %pom_disable_module async-http-servlet-3.0-test jaxrs/async-http-servlet-3.0/pom.xml
+# HV 4.3
 %pom_disable_module resteasy-hibernatevalidator-provider jaxrs/providers/pom.xml
 
 # Replace 2.5 servlet with the jboss-servlet-2.5-api provides
@@ -120,8 +121,6 @@ for m in jaxrs/tjws; do
 %pom_add_dep "org.jboss.spec.javax.servlet:jboss-servlet-api_2.5_spec" ${m}/pom.xml
 done
 
-%pom_add_dep "javax.validation:validation-api:1" jaxrs/providers/resteasy-validator-provider-11/pom.xml
-
 # Need to be patched to work with Jetty 9
 rm jaxrs/resteasy-spring/src/main/java/org/jboss/resteasy/springmvc/JettyLifecycleManager.java
 
@@ -145,17 +144,31 @@ done
 %build
 %mvn_build -f
 
+# Create Jandex index file(s)
+# Not all files are required by WildFly, but let's create indexes for all of them
+find -name 'resteasy-*-%{namedversion}.jar' | while read f; do
+  java -cp $(build-classpath jandex) org.jboss.jandex.Main -j ${f}
+done
+
 %install
 %mvn_install
 
+find -name "resteasy-*-jandex.jar" | while read f; do
+  install -pm 644 ${f} %{buildroot}%{_javadir}/%{name}/$(basename $f)
+done
+
 %files -f .mfiles
 %dir %{_javadir}/%{name}
+%{_javadir}/%{name}/*jandex.jar
 %doc jaxrs/License.html jaxrs/README.html
 
 %files javadoc -f .mfiles-javadoc
 %doc jaxrs/License.html
 
 %changelog
+* Fri Aug 09 2013 Marek Goldmann <mgoldman@redhat.com> - 3.0.1-2
+- Added jandex index files to all jars
+
 * Fri Aug 09 2013 Marek Goldmann <mgoldman@redhat.com> - 3.0.1-1
 - Upstream release 3.0.1.Final
 - Using xmvn