[jboss-cvs] JBossAS SVN: r112581 - projects/jboss-jca/trunk.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 17 08:50:23 EST 2012
Author: jesper.pedersen
Date: 2012-01-17 08:50:21 -0500 (Tue, 17 Jan 2012)
New Revision: 112581
Removed:
projects/jboss-jca/trunk/rhq/
Modified:
projects/jboss-jca/trunk/build.xml
projects/jboss-jca/trunk/ivy.xml
Log:
Remove RHQ plugin
Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml 2012-01-17 08:06:40 UTC (rev 112580)
+++ projects/jboss-jca/trunk/build.xml 2012-01-17 13:50:21 UTC (rev 112581)
@@ -106,7 +106,6 @@
Versions
================================= -->
<property name="version.ant" value="1.8.1"/>
- <property name="version.activation" value="1.1"/>
<property name="version.apache-log4j" value="1.2.16"/>
<property name="version.apache-logging" value="1.1.0.jboss"/>
<property name="version.apiviz" value="1.3.1.GA"/>
@@ -116,7 +115,6 @@
<property name="version.eclipse.ecj" value="3.5.1"/>
<property name="version.fungal" value="0.10.0.RC2"/>
<property name="version.h2" value="1.3.159"/>
- <property name="version.hibernate-annotations" value="3.5.1-Final"/>
<property name="version.hibernate-validator" value="4.2.0.Final"/>
<property name="version.hornetq" value="2.2.2.Final"/>
<property name="version.javassist" value="3.14.0-GA"/>
@@ -145,13 +143,9 @@
<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.jpa" value="1.0"/>
<property name="version.junit" value="4.8.2"/>
- <property name="version.jaxb.api" value="2.0"/>
- <property name="version.jaxb.impl" value="2.1"/>
<property name="version.mail-api" value="1.4.4"/>
<property name="version.maven" value="2.2.1"/>
- <property name="version.rhq" value="4.0.0.Beta1"/>
<property name="version.slf4j" value="1.6.1"/>
<property name="version.transaction.api" value="1.0.0.Final"/>
<property name="version.validation-api" value="1.0.0.GA"/>
@@ -184,9 +178,6 @@
<fileset dir="${lib.dir}/tools">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${lib.dir}/rhq">
- <include name="**/*.jar"/>
- </fileset>
<fileset dir="${target.dir}">
<include name="**/*.jar"/>
</fileset>
@@ -226,9 +217,6 @@
<fileset dir="${lib.dir}/tools">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${lib.dir}/rhq">
- <include name="**/*.jar"/>
- </fileset>
<fileset dir="${target.dir}">
<include name="**/*.jar"/>
</fileset>
@@ -263,9 +251,6 @@
<fileset dir="${lib.dir}/tools">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${lib.dir}/rhq">
- <include name="**/*.jar"/>
- </fileset>
<fileset dir="${target.dir}">
<include name="**/*.jar"/>
</fileset>
@@ -315,7 +300,7 @@
<target name="resolve" depends="init,resolve-brew" unless="brew">
<ivy:retrieve pattern="${lib.dir}/[conf]/[artifact].[ext]"
- conf="common,sjc,embedded,arquillian,jetty,hornetq,mail,rhq,test,tools"
+ conf="common,sjc,embedded,arquillian,jetty,hornetq,mail,test,tools"
sync="true"/>
</target>
@@ -343,7 +328,6 @@
<ant dir="web" inheritRefs="true" target="jars"/>
<ant dir="sjc" inheritRefs="true" target="jars"/>
<ant dir="codegenerator" inheritRefs="true" target="jars"/>
- <ant dir="rhq" inheritRefs="true" target="jars"/>
<ant dir="as" inheritRefs="true" target="jars"/>
</target>
@@ -364,7 +348,6 @@
<ant dir="web" inheritRefs="true" target="docs"/>
<ant dir="sjc" inheritRefs="true" target="docs"/>
<ant dir="codegenerator" inheritRefs="true" target="docs"/>
- <ant dir="rhq" inheritRefs="true" target="docs"/>
<ant dir="as" inheritRefs="true" target="docs"/>
</target>
@@ -394,7 +377,6 @@
<ant dir="validator" inheritRefs="true" target="prepare-test"/>
<ant dir="codegenerator" inheritRefs="true" target="prepare-test"/>
<ant dir="adapters" inheritRefs="true" target="prepare-test"/>
- <ant dir="rhq" inheritRefs="true" target="prepare-test"/>
<ant dir="as" inheritRefs="true" target="prepare-test"/>
</target>
@@ -408,7 +390,6 @@
<ant dir="deployers" inheritRefs="true" target="test"/>
<ant dir="validator" inheritRefs="true" target="test"/>
<ant dir="adapters" inheritRefs="true" target="test"/>
- <ant dir="rhq" inheritRefs="true" target="test"/>
<ant dir="as" inheritRefs="true" target="test"/>
</target>
@@ -575,9 +556,6 @@
<fileset dir="${lib.dir}/mail">
<include name="*.jar"/>
</fileset>
- <fileset dir="${lib.dir}/rhq">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${lib.dir}/test">
<include name="*.jar"/>
</fileset>
@@ -597,7 +575,6 @@
<class location="${target.dir}/${name}-deployers-fungal.jar" />
<class location="${target.dir}/${name}-embedded.jar" />
<class location="${target.dir}/${name}-embedded-arquillian.jar" />
- <class location="${target.dir}/${name}-rhq.jar" />
<class location="${target.dir}/${name}-sjc.jar" />
<class location="${target.dir}/${name}-spec-api.jar" />
<class location="${target.dir}/${name}-validator.jar" />
@@ -635,9 +612,6 @@
<fileset dir="${lib.dir}/mail">
<include name="*.jar"/>
</fileset>
- <fileset dir="${lib.dir}/rhq">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${lib.dir}/test">
<include name="*.jar"/>
</fileset>
@@ -657,7 +631,6 @@
<class location="${target.dir}/${name}-deployers-fungal.jar" />
<class location="${target.dir}/${name}-embedded.jar" />
<class location="${target.dir}/${name}-embedded-arquillian.jar" />
- <class location="${target.dir}/${name}-rhq.jar" />
<class location="${target.dir}/${name}-sjc.jar" />
<class location="${target.dir}/${name}-spec-api.jar" />
<class location="${target.dir}/${name}-validator.jar" />
@@ -735,7 +708,6 @@
<fileset dir="${lib.dir}/mail" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
<fileset dir="${lib.dir}/tools" includes="*.jar" />
- <fileset dir="${lib.dir}/rhq" includes="*.jar" />
</classpath>
<classpath refid="cobertura.lib.path.id" />
@@ -775,7 +747,6 @@
<fileset dir="${lib.dir}/mail" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
<fileset dir="${lib.dir}/tools" includes="*.jar" />
- <fileset dir="${lib.dir}/rhq" includes="*.jar" />
</classpath>
<classpath refid="cobertura.lib.path.id" />
@@ -815,7 +786,6 @@
<fileset dir="${lib.dir}/mail" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
<fileset dir="${lib.dir}/tools" includes="*.jar" />
- <fileset dir="${lib.dir}/rhq" includes="*.jar" />
</classpath>
<classpath refid="cobertura.lib.path.id" />
@@ -855,7 +825,6 @@
<fileset dir="${lib.dir}/mail" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
<fileset dir="${lib.dir}/tools" includes="*.jar" />
- <fileset dir="${lib.dir}/rhq" includes="*.jar" />
</classpath>
<classpath refid="cobertura.lib.path.id" />
@@ -895,7 +864,6 @@
<fileset dir="${lib.dir}/mail" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
<fileset dir="${lib.dir}/tools" includes="*.jar" />
- <fileset dir="${lib.dir}/rhq" includes="*.jar" />
</classpath>
<classpath refid="cobertura.lib.path.id" />
@@ -935,7 +903,6 @@
<fileset dir="${lib.dir}/mail" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
<fileset dir="${lib.dir}/tools" includes="*.jar" />
- <fileset dir="${lib.dir}/rhq" includes="*.jar" />
</classpath>
<classpath refid="cobertura.lib.path.id" />
@@ -977,7 +944,6 @@
<fileset dir="${lib.dir}/mail" includes="*.jar" />
<fileset dir="${lib.dir}/test" includes="*.jar" />
<fileset dir="${lib.dir}/tools" includes="*.jar" />
- <fileset dir="${lib.dir}/rhq" includes="*.jar" />
</classpath>
<classpath refid="cobertura.lib.path.id" />
@@ -990,48 +956,6 @@
</batchtest>
</junit>
- <junit dir="rhq/src/test"
- printsummary="${junit.printsummary}"
- haltonerror="${junit.haltonerror}"
- haltonfailure="${junit.haltonfailure}"
- fork="yes"
- timeout="${junit.timeout}">
-
- <jvmarg line="${junit.jvm.options}"/>
- <sysproperty key="test.dir" value="${test.dir}"/>
- <sysproperty key="archives.dir" value="${build.dir}/rhq"/>
- <sysproperty key="net.sourceforge.cobertura.datafile" file="${reports.dir}/cobertura/cobertura.ser" />
- <sysproperty key="xb.builder.useUnorderedSequence" value="true"/>
- <sysproperty key="java.util.logging.manager" value="org.jboss.logmanager.LogManager"/>
- <sysproperty key="org.jboss.logging.Logger.pluginClass" value="org.jboss.logging.logmanager.LoggerPluginImpl"/>
- <sysproperty key="log4j.defaultInitOverride" value="true"/>
-
- <classpath>
- <fileset dir="${build.dir}/instrumented" includes="*.jar" />
- <pathelement location="${build.dir}/rhq/"/>
- <pathelement location="${build.dir}/rhq/test"/>
- <fileset dir="${lib.dir}/common" includes="*.jar" />
- <fileset dir="${lib.dir}/embedded" includes="*.jar" />
- <fileset dir="${lib.dir}/arquillian" includes="*.jar" />
- <fileset dir="${lib.dir}/jetty" includes="*.jar" />
- <fileset dir="${lib.dir}/hornetq" includes="*.jar" />
- <fileset dir="${lib.dir}/sjc" includes="*.jar" />
- <fileset dir="${lib.dir}/mail" includes="*.jar" />
- <fileset dir="${lib.dir}/test" includes="*.jar" />
- <fileset dir="${lib.dir}/tools" includes="*.jar" />
- <fileset dir="${lib.dir}/rhq" includes="*.jar" />
- </classpath>
- <classpath refid="cobertura.lib.path.id" />
-
- <formatter type="xml"/>
-
- <batchtest todir="${reports.dir}/cobertura/tests">
- <fileset dir="${build.dir}/rhq/test">
- <include name="**/*TestCase.class"/>
- </fileset>
- </batchtest>
- </junit>
-
<cobertura-report format="html"
destdir="${reports.dir}/cobertura/html"
datafile="${reports.dir}/cobertura/cobertura.ser">
@@ -1065,9 +989,6 @@
<fileset dir="web/src/main/java">
<include name="**/*.java" />
</fileset>
- <fileset dir="rhq/src/main/java">
- <include name="**/*.java" />
- </fileset>
</cobertura-report>
<cobertura-report format="xml"
@@ -1103,9 +1024,6 @@
<fileset dir="web/src/main/java">
<include name="**/*.java" />
</fileset>
- <fileset dir="rhq/src/main/java">
- <include name="**/*.java" />
- </fileset>
</cobertura-report>
</target>
Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml 2012-01-17 08:06:40 UTC (rev 112580)
+++ projects/jboss-jca/trunk/ivy.xml 2012-01-17 13:50:21 UTC (rev 112581)
@@ -33,7 +33,7 @@
</description>
</info>
- <configurations defaultconfmapping="common->default;sjc->default;embedded->default;arquillian->default;jetty->default;test->default;mail->default;;tools->default;ironjacamar-as->default;ironjacamar-codegenerator->default;ironjacamar-common-api->default;ironjacamar-common-impl->default;ironjacamar-common-impl-papaki->default;ironjacamar-common-spi->default;ironjacamar-core-api->default;ironjacamar-core-impl->default;ironjacamar-depchain->default;ironjacamar-deployers-common->default;ironjacamar-deployers-fungal->default;ironjacamar-embedded->default;ironjacamar-embedded-arquillian->default;ironjacamar.jdbc->default;ironjacamar-spec-api->default;ironjacamar-validator->default;ironjacamar-validator-ant->default;ironjacamar-validator-cli->default;ironjacamar-validator-maven->default;jdbc-local->default;jdbc-xa->default;rhq->default;hornetq->default;brew->default">
+ <configurations defaultconfmapping="common->default;sjc->default;embedded->default;arquillian->default;jetty->default;test->default;mail->default;;tools->default;ironjacamar-as->default;ironjacamar-codegenerator->default;ironjacamar-common-api->default;ironjacamar-common-impl->default;ironjacamar-common-impl-papaki->default;ironjacamar-common-spi->default;ironjacamar-core-api->default;ironjacamar-core-impl->default;ironjacamar-depchain->default;ironjacamar-deployers-common->default;ironjacamar-deployers-fungal->default;ironjacamar-embedded->default;ironjacamar-embedded-arquillian->default;ironjacamar.jdbc->default;ironjacamar-spec-api->default;ironjacamar-validator->default;ironjacamar-validator-ant->default;ironjacamar-validator-cli->default;ironjacamar-validator-maven->default;jdbc-local->default;jdbc-xa->default;hornetq->default;brew->default">
<conf name="arquillian" transitive="false"/>
<conf name="common" transitive="false"/>
<conf name="embedded" transitive="false"/>
@@ -43,7 +43,6 @@
<conf name="sjc" transitive="false"/>
<conf name="test" transitive="false"/>
<conf name="tools" transitive="false"/>
- <conf name="rhq" transitive="false"/>
<conf name="brew" transitive="false"/>
<conf name="ironjacamar-as" transitive="false"/>
@@ -108,12 +107,8 @@
<dependency org="com.github.fungal" name="fungal-cli" rev="${version.fungal}" conf="sjc,ironjacamar-depchain"/>
<dependency org="com.h2database" name="h2" rev="${version.h2}" conf="test"/>
<dependency org="dom4j" name="dom4j" rev="${version.dom4j}" conf="jetty,tools"/>
- <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.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="junit" name="junit" rev="${version.junit}" conf="test"/>
<dependency org="log4j" name="log4j" rev="${version.apache-log4j}" conf="common,ironjacamar-depchain"/>
@@ -132,7 +127,6 @@
<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-annotations" rev="${version.hibernate-annotations}" conf="rhq"/>
<dependency org="org.hibernate" name="hibernate-validator" rev="${version.hibernate-validator}" conf="common,ironjacamar-depchain"/>
<dependency org="org.hornetq" name="hornetq-core" rev="${version.hornetq}" conf="hornetq,ironjacamar-depchain"/>
<dependency org="org.hornetq" name="hornetq-core-client" rev="${version.hornetq}" conf="hornetq,ironjacamar-depchain"/>
@@ -186,13 +180,6 @@
<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="picketbox" rev="${version.jboss.picketbox}" conf="common,ironjacamar-depchain,ironjacamar-core-impl,brew"/>
- <dependency org="org.rhq" name="rhq-core-client-api" rev="${version.rhq}" conf="rhq"/>
- <dependency org="org.rhq" name="rhq-core-comm-api" rev="${version.rhq}" conf="rhq"/>
- <dependency org="org.rhq" name="rhq-core-domain" rev="${version.rhq}" conf="rhq"/>
- <dependency org="org.rhq" name="rhq-core-native-system" rev="${version.rhq}" conf="rhq"/>
- <dependency org="org.rhq" name="rhq-core-plugin-api" rev="${version.rhq}" conf="rhq"/>
- <dependency org="org.rhq" name="rhq-core-plugin-container" rev="${version.rhq}" conf="rhq"/>
- <dependency org="org.rhq" name="rhq-core-util" rev="${version.rhq}" conf="rhq"/>
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="${version.slf4j}" conf="common,ironjacamar-depchain"/>
<dependency org="org.slf4j" name="slf4j-api" rev="${version.slf4j}" conf="common,ironjacamar-depchain"/>
</dependencies>
More information about the jboss-cvs-commits
mailing list