Sophie

Sophie

distrib > Mageia > 3 > i586 > media > core-release-src > by-pkgid > c46c6ec10b1066d253e4b0b8806a1466 > files > 3

ironjacamar-1.0.9-5.mga3.src.rpm

diff -Naur ironjacamar-1.0.9.Final/ivy.settings.xml ironjacamar-1.0.9.Final-work/ivy.settings.xml
--- ironjacamar-1.0.9.Final/ivy.settings.xml	2010-10-04 11:42:11.802762000 -0500
+++ ironjacamar-1.0.9.Final-work/ivy.settings.xml	2012-03-25 15:32:32.087130994 -0500
@@ -22,12 +22,14 @@
 <ivysettings>
   <property name="ivy.checksums" value="" override="true"/>
   <settings defaultResolver="default"/>
-  <caches defaultCacheDir="${user.home}/.ivy2/cache"
+  <caches defaultCacheDir="${basedir}/.ivy2/cache"
           artifactPattern="[organisation]/[module]/[type]s/[artifact]-[revision](-[classifier]).[ext]"/>
   <resolvers>
     <filesystem name="local">
       <ivy pattern="${ivy.cache.dir}/[module]/ivy-[revision].xml"/>
-      <artifact pattern="${ivy.cache.dir}/[module]/[artifact]-[revision](-[classifier]).[ext]"/>
+      <artifact pattern="/usr/share/java/[artifact].[ext]" />
+      <artifact pattern="/usr/share/java/[artifact]/[artifact].[ext]" />
+      <artifact pattern="/usr/share/java/jboss/[artifact].[ext]" />
     </filesystem>
     <ibiblio name="jboss" m2compatible="true" usepoms="false" root="${jboss.repo}"
              pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
@@ -39,10 +41,6 @@
              pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
     <chain name="default" returnFirst="true">
       <resolver ref="local"/>
-      <resolver ref="jboss"/>
-      <resolver ref="snapshots"/>
-      <resolver ref="central"/>
-      <resolver ref="fungal"/>
     </chain>
   </resolvers>
 </ivysettings>
diff -Naur ironjacamar-1.0.9.Final/ivy.xml ironjacamar-1.0.9.Final-work/ivy.xml
--- ironjacamar-1.0.9.Final/ivy.xml	2011-07-12 22:16:38.674128000 -0500
+++ ironjacamar-1.0.9.Final-work/ivy.xml	2012-03-25 15:38:15.189130835 -0500
@@ -98,7 +98,6 @@
   <dependencies>
     <!-- Maven doesn't handle dependencies well, so logging has to be first -->
     <dependency org="org.jboss.logging" name="jboss-logging" rev="${version.jboss.logging}" conf="common,ironjacamar-common-impl,ironjacamar-common-impl-papaki,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-common,ironjacamar-deployers-fungal,brew"/>
-    <dependency org="org.jboss.logging" name="jboss-logging-generator" rev="${version.jboss.logging-generator}" conf="common,brew"/>
     <dependency org="org.jboss.logging" name="jboss-logging-processor" rev="${version.jboss.logging-processor}" conf="common,brew"/>
     <dependency org="org.jboss.logmanager" name="jboss-logmanager" rev="${version.jboss.logmanager}" conf="common,ironjacamar-depchain,brew"/>
 
@@ -111,10 +110,10 @@
     <dependency org="javax.activation" name="activation" rev="${version.activation}" conf="rhq"/>
     <dependency org="javax.mail" name="mail" rev="${version.mail-api}" conf="mail"/>
     <dependency org="javax.persistence" name="persistence-api" rev="${version.jpa}" conf="rhq"/>
-    <dependency org="javax.validation" name="validation-api" rev="${version.validation-api}" conf="common,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-fungal,brew"/>
+    <dependency org="javax.validation" name="geronimo-validation" rev="${version.validation-api}" conf="common,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-fungal,brew"/>
     <dependency org="javax.xml" name="jaxb-api" rev="${version.jaxb.api}" conf="rhq"/>
     <dependency org="javax.xml" name="jaxb-impl" rev="${version.jaxb.impl}" conf="rhq"/>
-    <dependency org="jdepend" name="jdepend" rev="${version.jdepend}" conf="tools"/>
+    <dependency org="jdepend" name="jdepend" rev="${version.jdepend}" conf="tools,brew"/>
     <dependency org="junit" name="junit" rev="${version.junit}" conf="test"/>
     <dependency org="log4j" name="log4j" rev="${version.apache-log4j}" conf="common,ironjacamar-depchain"/>
     <dependency org="org.apache" name="jasper" rev="${version.jasper}" conf="jetty"/>
@@ -175,8 +174,8 @@
     <dependency org="org.jboss.shrinkwrap" name="shrinkwrap-spi" rev="${version.jboss.shrinkwrap}" conf="embedded,ironjacamar-depchain"/>
     <dependency org="org.jboss.slf4j" name="slf4j-jboss-logmanager" rev="${version.jboss.slf4j.logmanager}" conf="common,ironjacamar-depchain"/>
     <dependency org="org.jboss.spec.javax.jms" name="jboss-jms-api_1.1_spec" rev="${version.jboss.jms.api}" conf="hornetq,ironjacamar-depchain"/>
-    <dependency org="org.jboss.spec.javax.security.auth.message" name="jboss-jaspi-api_1.0_spec" rev="${version.jboss.jaspi.api}" conf="common,ironjacamar-core-impl,ironjacamar-depchain,brew"/>
-    <dependency org="org.jboss.spec.javax.transaction" name="jboss-transaction-api_1.1_spec" rev="${version.transaction.api}" conf="common,ironjacamar-core-api,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-fungal,ironjacamar-spec-api,ironjacamar-jdbc,brew"/>
+    <dependency org="org.jboss.spec.javax.security.auth.message" name="jboss-jaspi-1.0-api" rev="${version.jboss.jaspi.api}" conf="common,ironjacamar-core-impl,ironjacamar-depchain,brew"/>
+    <dependency org="org.jboss.spec.javax.transaction" name="jboss-transaction-1.1-api" rev="${version.transaction.api}" conf="common,ironjacamar-core-api,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-fungal,ironjacamar-spec-api,ironjacamar-jdbc,brew"/>
     <dependency org="org.jboss.stdio" name="jboss-stdio" rev="${version.jboss.stdio}" conf="common,ironjacamar-depchain"/>
     <dependency org="org.jboss.threads" name="jboss-threads" rev="${version.jboss.threads}" conf="common,ironjacamar-core-api,ironjacamar-core-impl,ironjacamar-depchain,brew"/>
     <dependency org="org.mockito" name="mockito-all" rev="${version.mockito}" conf="test"/>