[jboss-cvs] JBossAS SVN: r111242 - in projects/jboss-jca/trunk: core and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Apr 25 10:17:59 EDT 2011


Author: jesper.pedersen
Date: 2011-04-25 10:17:59 -0400 (Mon, 25 Apr 2011)
New Revision: 111242

Modified:
   projects/jboss-jca/trunk/build.xml
   projects/jboss-jca/trunk/core/build.xml
   projects/jboss-jca/trunk/doc/userguide/en-US/modules/download.xml
   projects/jboss-jca/trunk/ivy.xml
Log:
[JBJCA-558] Remove the core-spi artifact

Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml	2011-04-25 13:21:48 UTC (rev 111241)
+++ projects/jboss-jca/trunk/build.xml	2011-04-25 14:17:59 UTC (rev 111242)
@@ -538,7 +538,6 @@
       <class location="${target.dir}/${name}-common-spi.jar" />
       <class location="${target.dir}/${name}-core-api.jar" />
       <class location="${target.dir}/${name}-core-impl.jar" />
-      <class location="${target.dir}/${name}-core-spi.jar" />
       <class location="${target.dir}/${name}-deployers-common.jar" />
       <class location="${target.dir}/${name}-deployers-fungal.jar" />
       <class location="${target.dir}/${name}-embedded.jar" />
@@ -598,7 +597,6 @@
       <class location="${target.dir}/${name}-common-spi.jar" />
       <class location="${target.dir}/${name}-core-api.jar" />
       <class location="${target.dir}/${name}-core-impl.jar" />
-      <class location="${target.dir}/${name}-core-spi.jar" />
       <class location="${target.dir}/${name}-deployers-common.jar" />
       <class location="${target.dir}/${name}-deployers-fungal.jar" />
       <class location="${target.dir}/${name}-embedded.jar" />
@@ -651,7 +649,6 @@
     <copy todir="${build.dir}/instrumented">
       <fileset dir="${target.dir}">
         <include name="${name}-core-api.jar"/>
-        <include name="${name}-core-spi.jar"/>
       </fileset>
     </copy>
 
@@ -1157,7 +1154,7 @@
     <fail message="IronJacamar doesn't support JDK 7+ artifacts" if="HAVE_JDK_1.7"/>
   
     <ivy:retrieve pattern="${lib.dir}/[conf]/[artifact].[ext]" 
-                  conf="${name}-codegenerator,${name}-common-api,${name}-common-impl,${name}-common-impl-papaki,${name}-common-spi,${name}-core-api,${name}-core-impl,${name}-core-spi,${name}-deployers-common,${name}-deployers-fungal,${name}-embedded,${name}-embedded-arquillian,${name}-spec-api,${name}-validator,${name}-validator-ant,${name}-validator-cli,jdbc-local,jdbc-xa,mail"
+                  conf="${name}-codegenerator,${name}-common-api,${name}-common-impl,${name}-common-impl-papaki,${name}-common-spi,${name}-core-api,${name}-core-impl,${name}-deployers-common,${name}-deployers-fungal,${name}-embedded,${name}-embedded-arquillian,${name}-spec-api,${name}-validator,${name}-validator-ant,${name}-validator-cli,jdbc-local,jdbc-xa,mail"
                   sync="true"/>
 
     <delete file="${target.dir}/release.sh"/>
@@ -1277,7 +1274,6 @@
                  templatefile="${tools.dir}/mvn/pom.template"
                  printIvyInfo="false">
       <mapping conf="${name}-core-api" scope="runtime"/>
-      <dependency artifact="${name}-core-spi" scope="runtime"/>
       <dependency artifact="${name}-spec-api" scope="runtime"/>
     </ivy:makepom>
 
@@ -1297,7 +1293,6 @@
       <mapping conf="${name}-core-impl" scope="runtime"/>
       <dependency artifact="${name}-common-impl" scope="runtime"/>
       <dependency artifact="${name}-core-api" scope="runtime"/>
-      <dependency artifact="${name}-core-spi" scope="runtime"/>
       <dependency artifact="${name}-spec-api" scope="runtime"/>
     </ivy:makepom>
 
@@ -1305,22 +1300,6 @@
     <snapshot-deploy-file file="snapshot.sh" artifact="${name}-core-impl" extension="jar"/>
     <snapshot-install-file file="install-snapshot.sh" artifact="${name}-core-impl" extension="jar"/>
 
-    <!-- ironjacamar-core-spi -->
-    <delete file="${target.dir}/${name}-core-spi.xml"/>
-    <ivy:makepom artifactName="${name}-core-spi" 
-                 conf="${name}-core-spi"
-                 ivyfile="${basedir}/ivy.xml" 
-                 pomfile="${target.dir}/${name}-core-spi.xml"
-                 headerFile="${tools.dir}/mvn/HEADER"
-                 templatefile="${tools.dir}/mvn/pom.template"
-                 printIvyInfo="false">
-      <mapping conf="${name}-core-spi" scope="runtime"/>
-    </ivy:makepom>
-
-    <deploy-file file="release.sh" artifact="${name}-core-spi" extension="jar"/>
-    <snapshot-deploy-file file="snapshot.sh" artifact="${name}-core-spi" extension="jar"/>
-    <snapshot-install-file file="install-snapshot.sh" artifact="${name}-core-spi" extension="jar"/>
-
     <!-- ironjacamar-depchain -->
     <delete file="${target.dir}/${name}-depchain.xml"/>
     <ivy:makepom artifactName="${name}-depchain" 
@@ -1372,7 +1351,6 @@
       <dependency artifact="${name}-common-impl" scope="runtime"/>
       <dependency artifact="${name}-core-api" scope="runtime"/>
       <dependency artifact="${name}-core-impl" scope="runtime"/>
-      <dependency artifact="${name}-core-spi" scope="runtime"/>
       <dependency artifact="${name}-spec-api" scope="runtime"/>
       <dependency artifact="${name}-validator" scope="runtime"/>
     </ivy:makepom>

Modified: projects/jboss-jca/trunk/core/build.xml
===================================================================
--- projects/jboss-jca/trunk/core/build.xml	2011-04-25 13:21:48 UTC (rev 111241)
+++ projects/jboss-jca/trunk/core/build.xml	2011-04-25 14:17:59 UTC (rev 111242)
@@ -79,7 +79,7 @@
          indexMetaInf="true"
          update="true"
          level="9"
-         includes="**/core/api/**">
+         includes="**/core/api/**, **/core/spi/**">
       <manifest>
         <attribute name="Implementation-Title" value="IronJacamar Core API"/>
         <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
@@ -88,21 +88,6 @@
       </manifest>
     </jar>
 
-    <jar destfile="${target.dir}/${name}-core-spi.jar"
-         basedir="${build.core.dir}/impl"
-         index="true"
-         indexMetaInf="true"
-         update="true"
-         level="9"
-         includes="**/core/spi/**">
-      <manifest>
-        <attribute name="Implementation-Title" value="IronJacamar Core SPI"/>
-        <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
-        <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/ironjacamar)"/>
-        <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
-      </manifest>
-    </jar>
-
     <jar destfile="${target.dir}/${name}-core-impl.jar"
          basedir="${build.core.dir}/impl"
          index="true"
@@ -391,7 +376,7 @@
          indexMetaInf="true"
          update="true"
          level="9"
-         includes="**/core/api/**">
+         includes="**/core/api/**,**/core/spi/**">
       <manifest>
         <attribute name="Implementation-Title" value="IronJacamar Core API - Sources"/>
         <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
@@ -415,21 +400,6 @@
       </manifest>
     </jar>
 
-    <jar destfile="${target.dir}/${name}-core-spi-sources.jar"
-         basedir="src/main/java"
-         index="true"
-         indexMetaInf="true"
-         update="true"
-         level="9"
-         includes="**/core/spi/**">
-      <manifest>
-        <attribute name="Implementation-Title" value="IronJacamar Core SPI - Sources"/>
-        <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
-        <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/ironjacamar)"/>
-        <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
-      </manifest>
-    </jar>
-
     <mkdir dir="${build.core.dir}/docs"/>
     <mkdir dir="${build.core.dir}/docs/api"/>
     <javadoc destdir="${build.core.dir}/docs/api"
@@ -447,6 +417,7 @@
 
       <packageset dir="src/main/java" defaultexcludes="yes">
         <include name="**/core/api/**"/>
+        <include name="**/core/spi/**"/>
       </packageset>
 
       <link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
@@ -508,44 +479,6 @@
       </manifest>
     </jar>
 
-    <mkdir dir="${build.core.dir}/docs/spi"/>
-    <javadoc destdir="${build.core.dir}/docs/spi"
-             doclet="org.jboss.apiviz.APIviz"
-             docletpathref="sjc.lib.path.id"
-             author="true"
-             version="true"
-             windowtitle="IronJacamar Core - SPI"
-             doctitle="IronJacamar Core - SPI"
-             use="true"
-             additionalparam="-author -version"
-             classpath="${build.core.dir}"
-             classpathref="sjc.lib.path.id"
-             bottom="Copyright &#169; 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
-
-      <packageset dir="src/main/java" defaultexcludes="yes">
-        <include name="**/core/spi/**"/>
-      </packageset>
-
-      <link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
-    </javadoc>
-    <copy todir="${build.core.dir}/docs/spi" overwrite="true">
-      <fileset dir="${tools.dir}/api"/>
-    </copy>
-
-    <jar destfile="${target.dir}/${name}-core-spi-javadoc.jar"
-         basedir="${build.core.dir}/docs/spi"
-         index="true"
-         indexMetaInf="true"
-         update="true"
-         level="9">
-      <manifest>
-        <attribute name="Implementation-Title" value="IronJacamar Core SPI - JavaDoc"/>
-        <attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
-        <attribute name="Implementation-Vendor" value="The IronJacamar project (http://www.jboss.org/ironjacamar)"/>
-        <attribute name="Implementation-Vendor-Id" value="org.jboss"/>
-      </manifest>
-    </jar>
-
   </target>
 
 </project>

Modified: projects/jboss-jca/trunk/doc/userguide/en-US/modules/download.xml
===================================================================
--- projects/jboss-jca/trunk/doc/userguide/en-US/modules/download.xml	2011-04-25 13:21:48 UTC (rev 111241)
+++ projects/jboss-jca/trunk/doc/userguide/en-US/modules/download.xml	2011-04-25 14:17:59 UTC (rev 111242)
@@ -109,7 +109,7 @@
             <row>
               <entry><code>ironjacamar-core-api</code></entry>
               <entry>
-                The API for the core module
+                The API / SPI for the core module
               </entry>
             </row>
             <row>
@@ -119,12 +119,6 @@
               </entry>
             </row>
             <row>
-              <entry><code>ironjacamar-core-spi</code></entry>
-              <entry>
-                The SPI for the core module
-              </entry>
-            </row>
-            <row>
               <entry><code>ironjacamar-deployers-common</code></entry>
               <entry>
                 The common classes for the deployer chains

Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml	2011-04-25 13:21:48 UTC (rev 111241)
+++ projects/jboss-jca/trunk/ivy.xml	2011-04-25 14:17:59 UTC (rev 111242)
@@ -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-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-core-spi->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">
+  <configurations defaultconfmapping="common->default;sjc->default;embedded->default;arquillian->default;jetty->default;test->default;mail->default;;tools->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">
     <conf name="arquillian" transitive="false"/>
     <conf name="common" transitive="false"/>
     <conf name="embedded" transitive="false"/>
@@ -52,7 +52,6 @@
     <conf name="ironjacamar-common-spi" transitive="false"/>
     <conf name="ironjacamar-core-api" transitive="false"/>
     <conf name="ironjacamar-core-impl" transitive="false"/>
-    <conf name="ironjacamar-core-spi" transitive="false"/>
     <conf name="ironjacamar-depchain" transitive="false"/>
     <conf name="ironjacamar-deployers-common" transitive="false"/>
     <conf name="ironjacamar-deployers-fungal" transitive="false"/>
@@ -77,7 +76,6 @@
     <artifact name="ironjacamar-common-spi" type="jar"/>
     <artifact name="ironjacamar-core-api" type="jar"/>
     <artifact name="ironjacamar-core-impl" type="jar"/>
-    <artifact name="ironjacamar-core-spi" type="jar"/>
     <artifact name="ironjacamar-depchain" type="pom"/>
     <artifact name="ironjacamar-deployers-common" type="jar"/>
     <artifact name="ironjacamar-deployers-fungal" type="jar"/>



More information about the jboss-cvs-commits mailing list