[jboss-cvs] JBossAS SVN: r106762 - in projects/jboss-jca/trunk: api and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jul 15 12:56:16 EDT 2010
Author: jesper.pedersen
Date: 2010-07-15 12:56:15 -0400 (Thu, 15 Jul 2010)
New Revision: 106762
Removed:
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/mc/
projects/jboss-jca/trunk/standalone/
Modified:
projects/jboss-jca/trunk/api/build.xml
projects/jboss-jca/trunk/build.xml
projects/jboss-jca/trunk/codegenerator/build.xml
projects/jboss-jca/trunk/core/build.xml
projects/jboss-jca/trunk/deployers/build.xml
projects/jboss-jca/trunk/doc/developerguide/en/modules/building.xml
projects/jboss-jca/trunk/ivy.xml
projects/jboss-jca/trunk/tools/findbugs/filter.xml
projects/jboss-jca/trunk/validator/build.xml
Log:
[JBJCA-383] Remove existing standalone module
Modified: projects/jboss-jca/trunk/api/build.xml
===================================================================
--- projects/jboss-jca/trunk/api/build.xml 2010-07-15 16:15:37 UTC (rev 106761)
+++ projects/jboss-jca/trunk/api/build.xml 2010-07-15 16:56:15 UTC (rev 106762)
@@ -36,7 +36,7 @@
<javac srcdir="src"
destdir="${build.api.dir}"
- classpathref="standalone.lib.path.id"
+ classpathref="sjc.lib.path.id"
debug="${javac.debug}">
<!-- <compilerarg value="-Xlint"/> -->
</javac>
Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml 2010-07-15 16:15:37 UTC (rev 106761)
+++ projects/jboss-jca/trunk/build.xml 2010-07-15 16:56:15 UTC (rev 106762)
@@ -96,19 +96,13 @@
<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.bootstrap" value="1.0.0-Beta-3"/>
- <property name="version.jboss.classloading" value="2.0.7.CR2"/>
<property name="version.jboss.common" value="2.2.17.GA"/>
- <property name="version.jboss.deployers" value="2.0.8.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.managed" value="2.1.0.CR7"/>
- <property name="version.jboss.mc.dependency" value="2.0.9.GA"/>
- <property name="version.jboss.mc.kernel" value="2.0.9.GA"/>
<property name="version.jboss.mdr" value="2.0.2.GA"/>
<property name="version.jboss.metadata.common" value="2.0.0.Alpha15"/>
<property name="version.jboss.metadata.rar" value="2.0.0.Alpha7"/>
@@ -124,7 +118,6 @@
<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.vfs" value="2.1.3.SP1"/>
<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"/>
@@ -135,7 +128,6 @@
<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.trove" value="1.0.2"/>
<property name="version.validation-api" value="1.0.0.GA"/>
<!-- =================================
@@ -159,28 +151,10 @@
</fileset>
</path>
- <path id="standalone.lib.path.id">
- <fileset dir="${lib.dir}/common">
- <include name="**/*.jar"/>
- </fileset>
- <fileset dir="${lib.dir}/sjc">
- <include name="**/*.jar"/>
- </fileset>
- <fileset dir="${lib.dir}/standalone">
- <include name="**/*.jar"/>
- </fileset>
- <fileset dir="${target.dir}">
- <include name="**/*.jar"/>
- </fileset>
- </path>
-
<path id="test.lib.path.id">
<fileset dir="${lib.dir}/common">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${lib.dir}/standalone">
- <include name="**/*.jar"/>
- </fileset>
<fileset dir="${lib.dir}/sjc">
<include name="**/*.jar"/>
</fileset>
@@ -276,7 +250,6 @@
<ant dir="embedded" inheritRefs="true" target="jars"/>
<ant dir="web" inheritRefs="true" target="jars"/>
<ant dir="sjc" inheritRefs="true" target="jars"/>
- <ant dir="standalone" inheritRefs="true" target="jars"/>
<ant dir="codegenerator" inheritRefs="true" target="jars"/>
</target>
@@ -292,7 +265,6 @@
<ant dir="embedded" inheritRefs="true" target="docs"/>
<ant dir="web" inheritRefs="true" target="docs"/>
<ant dir="sjc" inheritRefs="true" target="docs"/>
- <ant dir="standalone" inheritRefs="true" target="docs"/>
<ant dir="codegenerator" inheritRefs="true" target="docs"/>
</target>
@@ -348,13 +320,6 @@
</target>
<!-- =================================
- Target: standalone
- ================================= -->
- <target name="standalone" depends="jars">
- <ant dir="standalone" inheritRefs="true" target="standalone"/>
- </target>
-
- <!-- =================================
Target: release
================================= -->
<target name="release" depends="sjc">
@@ -467,7 +432,6 @@
<class location="${target.dir}/${name}-embedded-arquillian.jar" />
<class location="${target.dir}/${name}-sjc.jar" />
<class location="${target.dir}/${name}-spec-api.jar" />
- <class location="${target.dir}/${name}-standalone.jar" />
<class location="${target.dir}/${name}-validator.jar" />
<class location="${target.dir}/${name}-validator-ant.jar" />
<class location="${target.dir}/${name}-validator-cli.jar" />
@@ -507,7 +471,6 @@
<class location="${target.dir}/${name}-embedded-arquillian.jar" />
<class location="${target.dir}/${name}-sjc.jar" />
<class location="${target.dir}/${name}-spec-api.jar" />
- <class location="${target.dir}/${name}-standalone.jar" />
<class location="${target.dir}/${name}-validator.jar" />
<class location="${target.dir}/${name}-validator-ant.jar" />
<class location="${target.dir}/${name}-validator-cli.jar" />
@@ -754,9 +717,6 @@
<fileset dir="sjc/src/main/java">
<include name="**/*.java" />
</fileset>
- <fileset dir="standalone/src/main/java">
- <include name="**/*.java" />
- </fileset>
<fileset dir="validator/src/main/java">
<include name="**/*.java" />
</fileset>
@@ -789,9 +749,6 @@
<fileset dir="sjc/src/main/java">
<include name="**/*.java" />
</fileset>
- <fileset dir="standalone/src/main/java">
- <include name="**/*.java" />
- </fileset>
<fileset dir="validator/src/main/java">
<include name="**/*.java" />
</fileset>
Modified: projects/jboss-jca/trunk/codegenerator/build.xml
===================================================================
--- projects/jboss-jca/trunk/codegenerator/build.xml 2010-07-15 16:15:37 UTC (rev 106761)
+++ projects/jboss-jca/trunk/codegenerator/build.xml 2010-07-15 16:56:15 UTC (rev 106762)
@@ -37,7 +37,7 @@
<javac srcdir="src/main"
destdir="${build.codegenerator.dir}/impl"
- classpathref="standalone.lib.path.id"
+ classpathref="sjc.lib.path.id"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
optimize="${javac.optimize}">
@@ -85,7 +85,7 @@
sourcepath="src/main/java"
destdir="${target.dir}/docs/codegenerator"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="standalone.lib.path.id"
+ docletpathref="sjc.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Code Generator"
@@ -93,7 +93,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.codegenerator.dir}/impl"
- classpathref="standalone.lib.path.id"
+ classpathref="sjc.lib.path.id"
bottom="Copyright © 2008-2009 Red Hat Middleware LLC (http://www.jboss.com/)">
<link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
</javadoc>
Modified: projects/jboss-jca/trunk/core/build.xml
===================================================================
--- projects/jboss-jca/trunk/core/build.xml 2010-07-15 16:15:37 UTC (rev 106761)
+++ projects/jboss-jca/trunk/core/build.xml 2010-07-15 16:56:15 UTC (rev 106762)
@@ -37,7 +37,7 @@
<javac srcdir="src/main"
destdir="${build.core.dir}/impl"
- classpathref="standalone.lib.path.id"
+ classpathref="sjc.lib.path.id"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
optimize="${javac.optimize}">
Modified: projects/jboss-jca/trunk/deployers/build.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/build.xml 2010-07-15 16:15:37 UTC (rev 106761)
+++ projects/jboss-jca/trunk/deployers/build.xml 2010-07-15 16:56:15 UTC (rev 106762)
@@ -37,7 +37,7 @@
<javac srcdir="src/main"
destdir="${build.deployers.dir}/impl"
- classpathref="standalone.lib.path.id"
+ classpathref="sjc.lib.path.id"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
optimize="${javac.optimize}">
@@ -317,7 +317,7 @@
sourcepath="src/main/java"
destdir="${target.dir}/docs/deployers"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="standalone.lib.path.id"
+ docletpathref="sjc.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Deployers"
@@ -325,7 +325,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.deployers.dir}/impl"
- classpathref="standalone.lib.path.id"
+ classpathref="sjc.lib.path.id"
bottom="Copyright © 2008-2009 Red Hat Middleware LLC (http://www.jboss.com/)">
<link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
</javadoc>
Modified: projects/jboss-jca/trunk/doc/developerguide/en/modules/building.xml
===================================================================
--- projects/jboss-jca/trunk/doc/developerguide/en/modules/building.xml 2010-07-15 16:15:37 UTC (rev 106761)
+++ projects/jboss-jca/trunk/doc/developerguide/en/modules/building.xml 2010-07-15 16:56:15 UTC (rev 106762)
@@ -119,10 +119,6 @@
<para>Builds the API documentation for the project.</para>
</listitem>
<listitem>
- <para>standalone</para>
- <para>Builds the standalone environment using JBoss Microcontainer.</para>
- </listitem>
- <listitem>
<para>sjc</para>
<para>Builds the standalone environment using IronJacamar/SJC.</para>
</listitem>
Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml 2010-07-15 16:15:37 UTC (rev 106761)
+++ projects/jboss-jca/trunk/ivy.xml 2010-07-15 16:56:15 UTC (rev 106762)
@@ -29,9 +29,8 @@
<repository name="jboss" url="http://repository.jboss.org"/>
</info>
- <configurations defaultconfmapping="common->default;standalone->default;sjc->default;embedded->default;jetty->default;test->default">
+ <configurations defaultconfmapping="common->default;sjc->default;embedded->default;jetty->default;test->default">
<conf name="common" transitive="false"/>
- <conf name="standalone" transitive="false"/>
<conf name="sjc" transitive="false"/>
<conf name="embedded" transitive="false"/>
<conf name="jetty" transitive="false"/>
@@ -68,7 +67,6 @@
<dependency org="org.jboss" name="jboss-common-core" rev="${version.jboss.common}" conf="common"/>
<dependency org="org.jboss" name="jboss-mdr" rev="${version.jboss.mdr}" conf="common"/>
<dependency org="org.jboss" name="jboss-reflect" rev="${version.jboss.reflect}" conf="common"/>
- <dependency org="org.jboss" name="jboss-vfs" rev="${version.jboss.vfs}" conf="standalone"/>
<dependency org="org.jboss" name="jbossxb" rev="${version.jboss.xb}" conf="common"/>
<dependency org="org.jboss.apiviz" name="apiviz" rev="${version.apiviz}" conf="common"/>
<dependency org="org.jboss.arquillian" name="arquillian-api" rev="${version.arquillian}" conf="embedded"/>
@@ -77,19 +75,6 @@
<dependency org="org.jboss.arquillian" name="arquillian-spi" rev="${version.arquillian}" conf="embedded"/>
<dependency org="org.jboss.arquillian.testenricher" name="arquillian-testenricher-resource" rev="${version.arquillian}" conf="embedded"/>
<dependency org="org.jboss.arquillian.protocol" name="arquillian-protocol-local" rev="${version.arquillian}" conf="embedded"/>
- <dependency org="org.jboss.bootstrap" name="jboss-bootstrap" rev="${version.jboss.bootstrap}" conf="standalone"/>
- <dependency org="org.jboss.cl" name="jboss-classloader" rev="${version.jboss.classloading}" conf="standalone"/>
- <dependency org="org.jboss.cl" name="jboss-classloading" rev="${version.jboss.classloading}" conf="standalone"/>
- <dependency org="org.jboss.cl" name="jboss-classloading-vfs" rev="${version.jboss.classloading}" conf="standalone"/>
- <dependency org="org.jboss.deployers" name="jboss-deployers-client" rev="${version.jboss.deployers}" conf="standalone"/>
- <dependency org="org.jboss.deployers" name="jboss-deployers-client-spi" rev="${version.jboss.deployers}" conf="standalone"/>
- <dependency org="org.jboss.deployers" name="jboss-deployers-core" rev="${version.jboss.deployers}" conf="standalone"/>
- <dependency org="org.jboss.deployers" name="jboss-deployers-core-spi" rev="${version.jboss.deployers}" conf="standalone"/>
- <dependency org="org.jboss.deployers" name="jboss-deployers-impl" rev="${version.jboss.deployers}" conf="standalone"/>
- <dependency org="org.jboss.deployers" name="jboss-deployers-spi" rev="${version.jboss.deployers}" conf="standalone"/>
- <dependency org="org.jboss.deployers" name="jboss-deployers-structure-spi" rev="${version.jboss.deployers}" conf="standalone"/>
- <dependency org="org.jboss.deployers" name="jboss-deployers-vfs" rev="${version.jboss.deployers}" conf="standalone"/>
- <dependency org="org.jboss.deployers" name="jboss-deployers-vfs-spi" rev="${version.jboss.deployers}" conf="standalone"/>
<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"/>
@@ -102,12 +87,8 @@
<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.man" name="jboss-managed" rev="${version.jboss.managed}" conf="standalone"/>
- <dependency org="org.jboss.man" name="jboss-metatype" rev="${version.jboss.managed}" conf="standalone"/>
<dependency org="org.jboss.metadata" name="jboss-metadata-common" rev="${version.jboss.metadata.common}" conf="common"/>
<dependency org="org.jboss.metadata" name="jboss-metadata-rar" rev="${version.jboss.metadata.rar}" conf="common"/>
- <dependency org="org.jboss.microcontainer" name="jboss-dependency" rev="${version.jboss.mc.dependency}" conf="standalone"/>
- <dependency org="org.jboss.microcontainer" name="jboss-kernel" rev="${version.jboss.mc.kernel}" conf="standalone"/>
<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"/>
@@ -118,7 +99,6 @@
<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.jboss.threads" name="jboss-threads-metadata" rev="${version.jboss.threads}" conf="standalone"/>
<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"/>
@@ -128,7 +108,6 @@
<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="trove" name="trove" rev="${version.trove}" conf="standalone"/>
<dependency org="xerces" name="xercesImpl" rev="${version.apache-xerces}" conf="common"/>
</dependencies>
Modified: projects/jboss-jca/trunk/tools/findbugs/filter.xml
===================================================================
--- projects/jboss-jca/trunk/tools/findbugs/filter.xml 2010-07-15 16:15:37 UTC (rev 106761)
+++ projects/jboss-jca/trunk/tools/findbugs/filter.xml 2010-07-15 16:56:15 UTC (rev 106762)
@@ -58,12 +58,6 @@
<Bug code="Dm,PZLA"/>
</Match>
- <!-- org.jboss.jca.standalone filter -->
- <Match>
- <Class name="org.jboss.jca.standalone.Main"/>
- <Bug code="UPM"/>
- </Match>
-
<!-- org.jboss.jca.web filter -->
<Match>
<Class name="org.jboss.jca.web.WARDeployer"/>
Modified: projects/jboss-jca/trunk/validator/build.xml
===================================================================
--- projects/jboss-jca/trunk/validator/build.xml 2010-07-15 16:15:37 UTC (rev 106761)
+++ projects/jboss-jca/trunk/validator/build.xml 2010-07-15 16:56:15 UTC (rev 106762)
@@ -37,7 +37,7 @@
<javac srcdir="src/main"
destdir="${build.validator.dir}/impl"
- classpathref="standalone.lib.path.id"
+ classpathref="sjc.lib.path.id"
debug="${javac.debug}"
deprecation="${javac.deprecation}"
optimize="${javac.optimize}">
@@ -107,7 +107,7 @@
sourcepath="src/main/java"
destdir="${target.dir}/docs/validator"
doclet="org.jboss.apiviz.APIviz"
- docletpathref="standalone.lib.path.id"
+ docletpathref="sjc.lib.path.id"
author="true"
version="true"
windowtitle="IronJacamar Validator"
@@ -115,7 +115,7 @@
use="true"
additionalparam="-author -version"
classpath="${build.validator.dir}/impl"
- classpathref="standalone.lib.path.id"
+ classpathref="sjc.lib.path.id"
bottom="Copyright © 2008-2009 Red Hat Middleware LLC (http://www.jboss.com/)">
<link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
</javadoc>
More information about the jboss-cvs-commits
mailing list