[jboss-cvs] JBossAS SVN: r108311 - in projects/jboss-jca/trunk: deployers and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 24 09:40:47 EDT 2010
Author: jesper.pedersen
Date: 2010-09-24 09:40:47 -0400 (Fri, 24 Sep 2010)
New Revision: 108311
Added:
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/package.html
Modified:
projects/jboss-jca/trunk/build.xml
projects/jboss-jca/trunk/deployers/build.xml
projects/jboss-jca/trunk/ivy.xml
projects/jboss-jca/trunk/lib/
Log:
[JBJCA-430] Create a deployers-common artifact
Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml 2010-09-24 11:49:50 UTC (rev 108310)
+++ projects/jboss-jca/trunk/build.xml 2010-09-24 13:40:47 UTC (rev 108311)
@@ -476,6 +476,7 @@
<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" />
<class location="${target.dir}/${name}-embedded-arquillian.jar" />
@@ -525,6 +526,7 @@
<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" />
<class location="${target.dir}/${name}-embedded-arquillian.jar" />
@@ -941,7 +943,7 @@
<target name="nexus" depends="clean,artifacts">
<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-fungal,${name}-embedded,${name}-embedded-arquillian,${name}-spec-api,${name}-validator,${name}-validator-ant,${name}-validator-cli,jdbc-local,jdbc-xa"
+ 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"
sync="true"/>
<!-- <fail message="Required Apache Ivy update missing"/> -->
@@ -1110,6 +1112,21 @@
mvn deploy:deploy-file -Dfile=$PWD/${name}-depchain.xml -DpomFile=${name}-depchain.xml -DuniqueVersion=false $REPOSITORY
</concat>
+ <!-- ironjacamar-deployers-common -->
+ <delete file="${target.dir}/${name}-deployers-common.xml"/>
+ <ivy:makepom artifactName="${name}-deployers-common"
+ conf="${name}-deployers-common"
+ ivyfile="${basedir}/ivy.xml"
+ pomfile="${target.dir}/${name}-deployers-common.xml"
+ headerFile="${tools.dir}/mvn/HEADER"
+ templatefile="${tools.dir}/mvn/pom.template"
+ printIvyInfo="false">
+ <mapping conf="${name}-deployers-common" scope="runtime"/>
+ </ivy:makepom>
+
+ <deploy-file file="release.sh" artifact="${name}-deployers-common" extension="jar"/>
+ <snapshot-deploy-file file="snapshot.sh" artifact="${name}-deployers-common" extension="jar"/>
+
<!-- ironjacamar-deployers-fungal -->
<delete file="${target.dir}/${name}-deployers-fungal.xml"/>
<ivy:makepom artifactName="${name}-deployers-fungal"
Modified: projects/jboss-jca/trunk/deployers/build.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/build.xml 2010-09-24 11:49:50 UTC (rev 108310)
+++ projects/jboss-jca/trunk/deployers/build.xml 2010-09-24 13:40:47 UTC (rev 108311)
@@ -51,27 +51,32 @@
<target name="jars" depends="compile">
<mkdir dir="${build.deployers.dir}/jars" />
+ <!-- Common -->
+ <jar destfile="${target.dir}/${name}-deployers-common.jar"
+ basedir="${build.deployers.dir}/impl"
+ index="true"
+ indexMetaInf="true"
+ update="true"
+ level="9"
+ includes="**/common/**">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Deployers - Common"/>
+ <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>
+
<!-- Fungal -->
- <mkdir dir="${build.deployers.dir}/jars/fungal" />
-
- <copy todir="${build.deployers.dir}/jars/fungal">
- <fileset dir="${build.deployers.dir}/impl"
- includes="**/common/**,**/fungal/**"/>
- </copy>
-
- <copy todir="${build.deployers.dir}/jars/fungal">
- <fileset dir="src/main/resources/"
- includes="**/*.properties"/>
- </copy>
-
<jar destfile="${target.dir}/${name}-deployers-fungal.jar"
- basedir="${build.deployers.dir}/jars/fungal"
+ basedir="${build.deployers.dir}/impl"
index="true"
indexMetaInf="true"
update="true"
- level="9">
+ level="9"
+ includes="**/fungal/**">
<manifest>
- <attribute name="Implementation-Title" value="IronJacamar Deployers (Fungal)"/>
+ <attribute name="Implementation-Title" value="IronJacamar Deployers - Fungal"/>
<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"/>
@@ -468,13 +473,69 @@
================================= -->
<target name="artifacts" depends="jars">
+ <!-- Common -->
+ <jar destfile="${target.dir}/${name}-deployers-common-sources.jar"
+ basedir="src/main/java"
+ index="true"
+ indexMetaInf="true"
+ update="true"
+ level="9"
+ includes="**/deployers/common/**">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Deployers Common - 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.deployers.dir}/docs"/>
+ <mkdir dir="${build.deployers.dir}/docs/common"/>
+ <javadoc destdir="${build.deployers.dir}/docs/common"
+ doclet="org.jboss.apiviz.APIviz"
+ docletpathref="sjc.lib.path.id"
+ author="true"
+ version="true"
+ windowtitle="IronJacamar Deployers - Common"
+ doctitle="IronJacamar Deployers - Common"
+ use="true"
+ additionalparam="-author -version"
+ classpath="${build.deployers.dir}"
+ classpathref="sjc.lib.path.id"
+ bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
+
+ <packageset dir="src/main/java" defaultexcludes="yes">
+ <include name="**/deployers/common/**"/>
+ </packageset>
+
+ <link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
+ </javadoc>
+ <copy todir="${build.deployers.dir}/docs/common" overwrite="true">
+ <fileset dir="${tools.dir}/api"/>
+ </copy>
+
+ <jar destfile="${target.dir}/${name}-deployers-common-javadoc.jar"
+ basedir="${build.deployers.dir}/docs/common"
+ index="true"
+ indexMetaInf="true"
+ update="true"
+ level="9">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Deployers Common - 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>
+
+ <!-- Fungal -->
<jar destfile="${target.dir}/${name}-deployers-fungal-sources.jar"
basedir="src/main/java"
index="true"
indexMetaInf="true"
update="true"
level="9"
- includes="**/deployers/common/**,**/deployers/fungal/**">
+ includes="**/deployers/fungal/**">
<manifest>
<attribute name="Implementation-Title" value="IronJacamar Deployers Fungal - Sources"/>
<attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
@@ -483,7 +544,6 @@
</manifest>
</jar>
- <mkdir dir="${build.deployers.dir}/docs"/>
<mkdir dir="${build.deployers.dir}/docs/fungal"/>
<javadoc destdir="${build.deployers.dir}/docs/fungal"
doclet="org.jboss.apiviz.APIviz"
@@ -499,7 +559,6 @@
bottom="Copyright © 2008 Red Hat Middleware LLC (http://www.jboss.com/)">
<packageset dir="src/main/java" defaultexcludes="yes">
- <include name="**/deployers/common/**"/>
<include name="**/deployers/fungal/**"/>
</packageset>
Added: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java (rev 0)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2010-09-24 13:40:47 UTC (rev 108311)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008-2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.jca.deployers.common;
+
+import org.jboss.logging.Logger;
+
+/**
+ * An abstract resource adapter deployer which contains common functionality
+ * for all resource adapter archive based deployers.
+ * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
+ */
+public abstract class AbstractResourceAdapterDeployer
+{
+ private static Logger log = Logger.getLogger(AbstractResourceAdapterDeployer.class);
+
+ private static boolean trace = log.isTraceEnabled();
+
+ /**
+ * Constructor
+ */
+ public AbstractResourceAdapterDeployer()
+ {
+ }
+}
Added: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/package.html
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/package.html (rev 0)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/package.html 2010-09-24 13:40:47 UTC (rev 108311)
@@ -0,0 +1,3 @@
+<body>
+This package contains interfaces and classes that can be shared different deployer chain implementations.
+</body>
Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml 2010-09-24 11:49:50 UTC (rev 108310)
+++ projects/jboss-jca/trunk/ivy.xml 2010-09-24 13:40:47 UTC (rev 108311)
@@ -33,7 +33,7 @@
</description>
</info>
- <configurations defaultconfmapping="common->default;sjc->default;embedded->default;arquillian->default;jetty->default;test->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-fungal->default;ironjacamar-embedded->default;ironjacamar-embedded-arquillian->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">
+ <configurations defaultconfmapping="common->default;sjc->default;embedded->default;arquillian->default;jetty->default;test->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-spec-api->default;ironjacamar-validator->default;ironjacamar-validator-ant->default;ironjacamar-validator-cli->default;ironjacamar-validator-maven->default;jdbc-local->default;jdbc-xa->default">
<conf name="common" transitive="false"/>
<conf name="sjc" transitive="false"/>
<conf name="embedded" transitive="false"/>
@@ -51,6 +51,7 @@
<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"/>
<conf name="ironjacamar-embedded" transitive="false"/>
<conf name="ironjacamar-embedded-arquillian" transitive="false"/>
@@ -73,6 +74,7 @@
<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"/>
<artifact name="ironjacamar-embedded-arquillian" type="jar"/>
<artifact name="ironjacamar-embedded" type="jar"/>
@@ -87,7 +89,7 @@
<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-fungal"/>
+ <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"/>
<dependency org="org.jboss.logmanager" name="jboss-logmanager" rev="${version.jboss.logmanager}" conf="common,ironjacamar-depchain"/>
<!-- Keep these sorted -->
Property changes on: projects/jboss-jca/trunk/lib
___________________________________________________________________
Name: svn:ignore
- *.jar
standalone
test
qe
sjc
common
embedded
jetty
arquillian
tools
ironjacamar-core-api
ironjacamar-deployers-fungal
ironjacamar-codegenerator
ironjacamar-spec-api
ironjacamar-validator-ant
ironjacamar-validator
ironjacamar-common-impl
ironjacamar-core-impl
ironjacamar-embedded-arquillian
ironjacamar-embedded
+ *.jar
standalone
test
qe
sjc
common
embedded
jetty
arquillian
tools
ironjacamar-core-api
ironjacamar-deployers-common
ironjacamar-deployers-fungal
ironjacamar-codegenerator
ironjacamar-spec-api
ironjacamar-validator-ant
ironjacamar-validator
ironjacamar-common-impl
ironjacamar-common-impl-papaki
ironjacamar-core-impl
ironjacamar-embedded-arquillian
ironjacamar-embedded
More information about the jboss-cvs-commits
mailing list