[jboss-cvs] JBossAS SVN: r107663 - projects/jboss-jca/trunk/codegenerator/src/main/resources.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Aug 18 10:08:13 EDT 2010
Author: jeff.zhang
Date: 2010-08-18 10:08:12 -0400 (Wed, 18 Aug 2010)
New Revision: 107663
Modified:
projects/jboss-jca/trunk/codegenerator/src/main/resources/build.ivy.xml.template
projects/jboss-jca/trunk/codegenerator/src/main/resources/ivy.settings.xml.template
projects/jboss-jca/trunk/codegenerator/src/main/resources/ivy.xml.template
Log:
[JBJCA-397] use depchain to make dependency simple
Modified: projects/jboss-jca/trunk/codegenerator/src/main/resources/build.ivy.xml.template
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/build.ivy.xml.template 2010-08-18 12:34:40 UTC (rev 107662)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/build.ivy.xml.template 2010-08-18 14:08:12 UTC (rev 107663)
@@ -51,61 +51,15 @@
================================= -->
<property name="central.repo" value="http://repo1.maven.org/maven2"/>
<property name="jboss.repo" value="http://repository.jboss.org/nexus/content/groups/public/"/>
- <property name="snapshots.repo" value="http://repository.jboss.org/nexus/content/repositories/snapshots/"/>
<property name="fungal.repo" value="http://jesperpedersen.github.com/fungal/maven2"/>
<!-- =================================
Versions
================================= -->
- <property name="version.activation" value="1.1.1"/>
- <property name="version.ant" value="1.8.1"/>
- <property name="version.apache-log4j" value="1.2.16"/>
- <property name="version.apache-logging" value="1.1.0.jboss"/>
- <property name="version.apache-xerces" value="2.9.1"/>
- <property name="version.apiviz" value="1.3.1.GA"/>
- <property name="version.arquillian" value="1.0.0.Alpha3"/>
- <property name="version.dom4j" value="1.6.1"/>
- <property name="version.mockito" value="1.8.5"/>
- <property name="version.eclipse.ecj" value="3.5.1"/>
- <property name="version.fungal" value="0.8.0.Beta6"/>
- <property name="version.hibernate-validator" value="4.0.2.GA"/>
- <property name="version.javassist" value="3.12.0.GA"/>
- <property name="version.jaxb.api" value="2.1"/>
- <property name="version.jaxb.impl" value="2.1.9"/>
- <property name="version.jboss.common" value="2.2.17.GA"/>
- <property name="version.jboss.integration" value="5.1.0.CR1"/>
- <property name="version.jboss.jaspi.api" value="1.0.0.GA"/>
- <property name="version.jboss.logging" value="2.2.0.CR1"/>
- <property name="version.jboss.logging.metadata" value="1.0.0.CR4"/>
- <property name="version.jboss.logmanager" value="1.1.1.GA"/>
- <property name="version.jboss.logmanager.log4j" value="1.0.0.CR2"/>
- <property name="version.jboss.naming" value="5.0.3.GA"/>
- <property name="version.jboss.papaki" value="1.0.0.Beta3"/>
- <property name="version.jboss.picketbox" value="3.0.0.Beta6"/>
- <property name="version.jboss.picketbox.bare" value="3.0.0.Beta5"/>
- <property name="version.jboss.reflect" value="2.0.2.GA"/>
- <property name="version.jboss.security" value="2.1.0.20090318"/>
- <property name="version.jboss.shrinkwrap" value="1.0.0-alpha-11"/>
- <property name="version.jboss.slf4j" value="1.0.2.GA"/>
- <property name="version.jboss.slf4j.logmanager" value="1.0.0.CR2"/>
- <property name="version.jboss.stdio" value="1.0.0.CR3"/>
- <property name="version.jboss.threads" value="2.0.0.CR3"/>
- <property name="version.jboss.ts" value="4.11.0.Final"/>
- <property name="version.jboss.xb" value="2.0.1.GA"/>
- <property name="version.jdepend" value="2.9.1"/>
- <property name="version.jetty" value="7.1.5.v20100705"/>
- <property name="version.jetty.servlet" value="6.1.14"/>
- <property name="version.jetty.glassfish" value="2.1.v20100127"/>
- <property name="version.jasper" value="glassfish_2.1.0.v201004190952"/>
+
<property name="version.junit" value="4.8.1"/>
- <property name="version.maven" value="2.2.1"/>
- <property name="version.slf4j" value="1.5.6"/>
- <property name="version.stax" value="1.0.1"/>
- <property name="version.transaction.api" value="1.0.1.GA"/>
- <property name="version.validation-api" value="1.0.0.GA"/>
+ <property name="version.ironjacamar" value="1.0.0-SNAPSHOT"/>
- <property name="version.ironjacamar" value="1.0.0.Beta1"/>
-
<!-- =================================
Bootstrap Ivy
================================= -->
@@ -133,7 +87,7 @@
================================= -->
<target name="resolve" depends="init">
<ivy:retrieve pattern="${lib.dir}/[conf]/[artifact].[ext]"
- conf="common,sjc,embedded,arquillian,jetty,test,tools,ironjacamar"
+ conf="compile,test"
sync="true"/>
</target>
Modified: projects/jboss-jca/trunk/codegenerator/src/main/resources/ivy.settings.xml.template
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/ivy.settings.xml.template 2010-08-18 12:34:40 UTC (rev 107662)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/ivy.settings.xml.template 2010-08-18 14:08:12 UTC (rev 107663)
@@ -7,18 +7,15 @@
<ivy pattern="${ivy.cache.dir}/[module]/ivy-[revision].xml"/>
<artifact pattern="${ivy.cache.dir}/[module]/[artifact]-[revision](-[classifier]).[ext]"/>
</filesystem>
- <ibiblio name="jboss" m2compatible="true" usepoms="false" root="${jboss.repo}"
+ <ibiblio name="jboss" m2compatible="true" usepoms="true" root="${jboss.repo}"
pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
- <ibiblio name="snapshots" m2compatible="true" usepoms="false" root="${snapshots.repo}" useMavenMetadata="true"
+ <ibiblio name="central" m2compatible="true" usepoms="true" root="${central.repo}"
pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
- <ibiblio name="central" m2compatible="true" usepoms="false" root="${central.repo}"
+ <ibiblio name="fungal" m2compatible="true" usepoms="true" root="${fungal.repo}"
pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
- <ibiblio name="fungal" m2compatible="true" usepoms="false" root="${fungal.repo}"
- 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>
Modified: projects/jboss-jca/trunk/codegenerator/src/main/resources/ivy.xml.template
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/ivy.xml.template 2010-08-18 12:34:40 UTC (rev 107662)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/ivy.xml.template 2010-08-18 14:08:12 UTC (rev 107663)
@@ -9,100 +9,24 @@
<repository name="jboss" url="http://repository.jboss.org"/>
</info>
- <configurations defaultconfmapping="common->default;sjc->default;embedded->default;arquillian->default;jetty->default;test->default;tools->default;ironjacamar->default">
- <conf name="common" transitive="false"/>
- <conf name="sjc" transitive="false"/>
- <conf name="embedded" transitive="false"/>
- <conf name="arquillian" transitive="false"/>
- <conf name="jetty" transitive="false"/>
- <conf name="test" transitive="false"/>
- <conf name="tools" transitive="false"/>
-
- <conf name="ironjacamar" transitive="false"/>
-
+ <configurations defaultconfmapping="compile->default;test->default">
+ <conf name="compile" transitive="false"/>
+ <conf name="test" transitive="true"/>
</configurations>
<dependencies>
- <dependency org="apache-logging" name="commons-logging" rev="${version.apache-logging}" conf="common"/>
- <dependency org="com.github.fungal" name="fungal" rev="${version.fungal}" conf="sjc"/>
- <dependency org="com.github.fungal" name="fungal-cli" rev="${version.fungal}" conf="sjc"/>
- <dependency org="com.sun.xml.bind" name="jaxb-impl" rev="${version.jaxb.impl}" conf="common"/>
- <dependency org="dom4j" name="dom4j" rev="${version.dom4j}" conf="tools"/>
- <dependency org="javassist" name="javassist" rev="${version.javassist}" conf="common"/>
- <dependency org="javax.activation" name="activation" rev="${version.activation}" conf="common"/>
- <dependency org="javax.validation" name="validation-api" rev="${version.validation-api}" conf="common"/>
- <dependency org="javax.xml.bind" name="jaxb-api" rev="${version.jaxb.api}" conf="common"/>
- <dependency org="jdepend" name="jdepend" rev="${version.jdepend}" conf="tools"/>
+ <dependency org="org.jboss.ironjacamar" name="ironjacamar-spec-api" rev="${version.ironjacamar}" conf="compile"/>
+ <dependency org="org.jboss.ironjacamar" name="ironjacamar-common-api" rev="${version.ironjacamar}" conf="test"/>
+ <dependency org="org.jboss.ironjacamar" name="ironjacamar-common-impl" rev="${version.ironjacamar}" conf="test"/>
+ <dependency org="org.jboss.ironjacamar" name="ironjacamar-core-api" rev="${version.ironjacamar}" conf="test"/>
+ <dependency org="org.jboss.ironjacamar" name="ironjacamar-core-impl" rev="${version.ironjacamar}" conf="test"/>
+ <dependency org="org.jboss.ironjacamar" name="ironjacamar-core-spi" rev="${version.ironjacamar}" conf="test"/>
+ <dependency org="org.jboss.ironjacamar" name="ironjacamar-depchain" rev="${version.ironjacamar}" conf="test"/>
+ <dependency org="org.jboss.ironjacamar" name="ironjacamar-deployers-fungal" rev="${version.ironjacamar}" conf="test"/>
+ <dependency org="org.jboss.ironjacamar" name="ironjacamar-embedded-arquillian" rev="${version.ironjacamar}" conf="test"/>
+ <dependency org="org.jboss.ironjacamar" name="ironjacamar-embedded" rev="${version.ironjacamar}" conf="test"/>
+ <dependency org="org.jboss.ironjacamar" name="ironjacamar-validator" rev="${version.ironjacamar}" conf="test"/>
<dependency org="junit" name="junit" rev="${version.junit}" conf="test"/>
- <dependency org="log4j" name="log4j" rev="${version.apache-log4j}" conf="common"/>
- <dependency org="org.apache" name="jasper" rev="${version.jasper}" conf="jetty"/>
- <dependency org="org.apache.ant" name="ant" rev="${version.ant}" conf="tools"/>
- <dependency org="org.apache.maven" name="maven-plugin-api" rev="${version.maven}" conf="tools"/>
- <dependency org="org.eclipse.jdt.core.compiler" name="ecj" rev="${version.eclipse.ecj}" conf="jetty"/>
- <dependency org="org.eclipse.jetty" name="jetty-continuation" rev="${version.jetty}" conf="jetty"/>
- <dependency org="org.eclipse.jetty" name="jetty-http" rev="${version.jetty}" conf="jetty"/>
- <dependency org="org.eclipse.jetty" name="jetty-io" rev="${version.jetty}" conf="jetty"/>
- <dependency org="org.eclipse.jetty" name="jetty-jsp-2.1" rev="${version.jetty}" conf="jetty"/>
- <dependency org="org.eclipse.jetty" name="jetty-security" rev="${version.jetty}" conf="jetty"/>
- <dependency org="org.eclipse.jetty" name="jetty-server" rev="${version.jetty}" conf="jetty"/>
- <dependency org="org.eclipse.jetty" name="jetty-servlet" rev="${version.jetty}" conf="jetty"/>
- <dependency org="org.eclipse.jetty" name="jetty-util" rev="${version.jetty}" conf="jetty"/>
- <dependency org="org.eclipse.jetty" name="jetty-webapp" rev="${version.jetty}" conf="jetty"/>
- <dependency org="org.eclipse.jetty" name="jetty-xml" rev="${version.jetty}" conf="jetty"/>
- <dependency org="org.hibernate" name="hibernate-validator" rev="${version.hibernate-validator}" conf="common"/>
- <dependency org="org.jboss" name="jboss-common-core" rev="${version.jboss.common}" conf="common"/>
- <dependency org="org.jboss" name="jboss-reflect" rev="${version.jboss.reflect}" conf="common"/>
- <dependency org="org.jboss" name="jbossxb" rev="${version.jboss.xb}" conf="common"/>
- <dependency org="org.jboss.apiviz" name="apiviz" rev="${version.apiviz}" conf="tools"/>
- <dependency org="org.jboss.arquillian" name="arquillian-api" rev="${version.arquillian}" conf="arquillian"/>
- <dependency org="org.jboss.arquillian" name="arquillian-impl-base" rev="${version.arquillian}" conf="arquillian"/>
- <dependency org="org.jboss.arquillian" name="arquillian-junit" rev="${version.arquillian}" conf="arquillian"/>
- <dependency org="org.jboss.arquillian" name="arquillian-spi" rev="${version.arquillian}" conf="arquillian"/>
- <dependency org="org.jboss.arquillian.testenricher" name="arquillian-testenricher-resource" rev="${version.arquillian}" conf="arquillian"/>
- <dependency org="org.jboss.arquillian.protocol" name="arquillian-protocol-local" rev="${version.arquillian}" conf="arquillian"/>
- <dependency org="org.jboss.integration" name="jboss-integration" rev="${version.jboss.integration}" conf="common"/>
- <dependency org="org.jboss.javaee" name="jboss-jaspi-api" rev="${version.jboss.jaspi.api}" conf="common"/>
- <dependency org="org.jboss.javaee" name="jboss-transaction-api" rev="${version.transaction.api}" conf="common"/>
- <dependency org="org.jboss.jbossts" name="jbossjts" rev="${version.jboss.ts}" conf="common"/>
- <dependency org="org.jboss.jbossts" name="jbossjts-integration" rev="${version.jboss.ts}" conf="common"/>
- <dependency org="org.jboss.logging" name="jboss-logging-jdk" rev="${version.jboss.logging}" conf="common"/>
- <dependency org="org.jboss.logging" name="jboss-logging-log4j" rev="${version.jboss.logging}" conf="common"/>
- <dependency org="org.jboss.logging" name="jboss-logging-logmanager" rev="${version.jboss.logging}" conf="common"/>
- <dependency org="org.jboss.logging" name="jboss-logging-spi" rev="${version.jboss.logging}" conf="common"/>
- <dependency org="org.jboss.logging" name="logging-service-metadata" rev="${version.jboss.logging.metadata}" conf="common"/>
- <dependency org="org.jboss.logmanager" name="jboss-logmanager" rev="${version.jboss.logmanager}" conf="common"/>
- <dependency org="org.jboss.logmanager" name="jboss-logmanager-log4j" rev="${version.jboss.logmanager.log4j}" conf="common"/>
- <dependency org="org.jboss.naming" name="jnpserver" rev="${version.jboss.naming}" conf="common"/>
- <dependency org="org.jboss.papaki" name="papaki-core" rev="${version.jboss.papaki}" conf="common"/>
- <dependency org="org.jboss.security" name="jboss-security-spi-bare" rev="${version.jboss.security}" conf="common"/>
- <dependency org="org.jboss.shrinkwrap" name="shrinkwrap-api" rev="${version.jboss.shrinkwrap}" conf="embedded"/>
- <dependency org="org.jboss.shrinkwrap" name="shrinkwrap-impl-base" rev="${version.jboss.shrinkwrap}" conf="embedded"/>
- <dependency org="org.jboss.shrinkwrap" name="shrinkwrap-spi" rev="${version.jboss.shrinkwrap}" conf="embedded"/>
- <dependency org="org.jboss.slf4j" name="slf4j-jboss-logging" rev="${version.jboss.slf4j}" conf="common"/>
- <dependency org="org.jboss.slf4j" name="slf4j-jboss-logmanager" rev="${version.jboss.slf4j.logmanager}" conf="common"/>
- <dependency org="org.jboss.stdio" name="jboss-stdio" rev="${version.jboss.stdio}" conf="common"/>
- <dependency org="org.jboss.threads" name="jboss-threads" rev="${version.jboss.threads}" conf="common"/>
- <dependency org="org.mockito" name="mockito-all" rev="${version.mockito}" conf="test"/>
- <dependency org="org.mortbay.jetty" name="jsp-api-2.1-glassfish" rev="${version.jetty.glassfish}" conf="jetty"/>
- <dependency org="org.mortbay.jetty" name="servlet-api-2.5" rev="${version.jetty.servlet}" conf="jetty"/>
- <dependency org="org.picketbox" name="jboss-security-spi" rev="${version.jboss.picketbox}" conf="common"/>
- <dependency org="org.picketbox" name="jbosssx" rev="${version.jboss.picketbox}" conf="common"/>
- <dependency org="org.picketbox" name="picketbox-bare" rev="${version.jboss.picketbox.bare}" conf="common"/>
- <dependency org="org.slf4j" name="jcl-over-slf4j" rev="${version.slf4j}" conf="common"/>
- <dependency org="org.slf4j" name="slf4j-api" rev="${version.slf4j}" conf="common"/>
- <dependency org="stax" name="stax-api" rev="${version.stax}" conf="common"/>
- <dependency org="xerces" name="xercesImpl" rev="${version.apache-xerces}" conf="common"/>
-
- <dependency org="org.jboss.ironjacamar" name="ironjacamar-common-api" rev="${version.ironjacamar}" conf="ironjacamar"/>
- <dependency org="org.jboss.ironjacamar" name="ironjacamar-common-impl" rev="${version.ironjacamar}" conf="ironjacamar"/>
- <dependency org="org.jboss.ironjacamar" name="ironjacamar-core-api" rev="${version.ironjacamar}" conf="ironjacamar"/>
- <dependency org="org.jboss.ironjacamar" name="ironjacamar-core-impl" rev="${version.ironjacamar}" conf="ironjacamar"/>
- <dependency org="org.jboss.ironjacamar" name="ironjacamar-core-spi" rev="${version.ironjacamar}" conf="ironjacamar"/>
- <dependency org="org.jboss.ironjacamar" name="ironjacamar-deployers-fungal" rev="${version.ironjacamar}" conf="ironjacamar"/>
- <dependency org="org.jboss.ironjacamar" name="ironjacamar-embedded-arquillian" rev="${version.ironjacamar}" conf="ironjacamar"/>
- <dependency org="org.jboss.ironjacamar" name="ironjacamar-embedded" rev="${version.ironjacamar}" conf="ironjacamar"/>
- <dependency org="org.jboss.ironjacamar" name="ironjacamar-spec-api" rev="${version.ironjacamar}" conf="ironjacamar"/>
- <dependency org="org.jboss.ironjacamar" name="ironjacamar-validator" rev="${version.ironjacamar}" conf="ironjacamar"/>
</dependencies>
</ivy-module>
More information about the jboss-cvs-commits
mailing list