[jboss-cvs] JBossAS SVN: r108301 - in projects/jboss-jca/trunk: adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 23 14:46:34 EDT 2010
Author: jesper.pedersen
Date: 2010-09-23 14:46:31 -0400 (Thu, 23 Sep 2010)
New Revision: 108301
Added:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/spi/annotations/repository/AnnotationScannerFactory.java
Removed:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/repository/papaki/AnnotationScannerFactory.java
Modified:
projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa/XAManagedConnectionFactory.java
projects/jboss-jca/trunk/build.xml
projects/jboss-jca/trunk/codegenerator/src/main/resources/pom.xml.template
projects/jboss-jca/trunk/common/build.xml
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/repository/papaki/AnnotationScannerImpl.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/deployers/annotations/AnnotationsTestCase.java
projects/jboss-jca/trunk/ivy.xml
projects/jboss-jca/trunk/tools/findbugs/filter.xml
projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/Validation.java
Log:
[JBJCA-429] Create common-impl-papaki artifact
Modified: projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa/XAManagedConnectionFactory.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa/XAManagedConnectionFactory.java 2010-09-23 16:02:37 UTC (rev 108300)
+++ projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa/XAManagedConnectionFactory.java 2010-09-23 18:46:31 UTC (rev 108301)
@@ -287,8 +287,8 @@
//HACK for now until we can rethink the XADataSourceProperties variable and pass type information
Method isMethod = clazz.getMethod("is" + name, (Class[])null);
type = isMethod.getReturnType();
- }
- catch(NoSuchMethodException nsme)
+ }
+ catch (NoSuchMethodException nsme)
{
type = String.class;
}
@@ -539,8 +539,8 @@
//HACK for now until we can rethink the XADataSourceProperties variable and pass type information
Method isMethod = clazz.getMethod("is" + name, (Class[])null);
type = isMethod.getReturnType();
- }
- catch(NoSuchMethodException nsme)
+ }
+ catch (NoSuchMethodException nsme)
{
type = String.class;
}
Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml 2010-09-23 16:02:37 UTC (rev 108300)
+++ projects/jboss-jca/trunk/build.xml 2010-09-23 18:46:31 UTC (rev 108301)
@@ -471,6 +471,8 @@
<class location="${target.dir}/${name}-codegenerator.jar" />
<class location="${target.dir}/${name}-common-api.jar" />
<class location="${target.dir}/${name}-common-impl.jar" />
+ <class location="${target.dir}/${name}-common-impl-papaki.jar" />
+ <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" />
@@ -518,6 +520,8 @@
<class location="${target.dir}/${name}-codegenerator.jar" />
<class location="${target.dir}/${name}-common-api.jar" />
<class location="${target.dir}/${name}-common-impl.jar" />
+ <class location="${target.dir}/${name}-common-impl-papaki.jar" />
+ <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" />
@@ -937,10 +941,10 @@
<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-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-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"/>
+ <!-- <fail message="Required Apache Ivy update missing"/> -->
<delete file="${target.dir}/release.sh"/>
<delete file="${target.dir}/snapshot.sh"/>
@@ -997,12 +1001,30 @@
templatefile="${tools.dir}/mvn/pom.template"
printIvyInfo="false">
<mapping conf="${name}-common-impl" scope="runtime"/>
+ <dependency artifact="${name}-common-api" scope="runtime"/>
+ <dependency artifact="${name}-common-spi" scope="runtime"/>
<dependency artifact="${name}-spec-api" scope="runtime"/>
</ivy:makepom>
<deploy-file file="release.sh" artifact="${name}-common-impl" extension="jar"/>
<snapshot-deploy-file file="snapshot.sh" artifact="${name}-common-impl" extension="jar"/>
+ <!-- ironjacamar-common-impl-papaki -->
+ <delete file="${target.dir}/${name}-common-impl-papaki.xml"/>
+ <ivy:makepom artifactName="${name}-common-impl-papaki"
+ conf="${name}-common-impl-papaki"
+ ivyfile="${basedir}/ivy.xml"
+ pomfile="${target.dir}/${name}-common-impl-papaki.xml"
+ headerFile="${tools.dir}/mvn/HEADER"
+ templatefile="${tools.dir}/mvn/pom.template"
+ printIvyInfo="false">
+ <mapping conf="${name}-common-impl-papaki" scope="runtime"/>
+ <dependency artifact="${name}-common-spi" scope="runtime"/>
+ </ivy:makepom>
+
+ <deploy-file file="release.sh" artifact="${name}-common-impl" extension="jar"/>
+ <snapshot-deploy-file file="snapshot.sh" artifact="${name}-common-impl" extension="jar"/>
+
<!-- ironjacamar-common-spi -->
<delete file="${target.dir}/${name}-common-spi.xml"/>
<ivy:makepom artifactName="${name}-common-spi"
@@ -1165,7 +1187,9 @@
templatefile="${tools.dir}/mvn/pom.template"
printIvyInfo="false">
<mapping conf="${name}-validator" scope="runtime"/>
+ <dependency artifact="${name}-common-api" scope="runtime"/>
<dependency artifact="${name}-common-impl" scope="runtime"/>
+ <dependency artifact="${name}-common-spi" scope="runtime"/>
<dependency artifact="${name}-spec-api" scope="runtime"/>
</ivy:makepom>
Modified: projects/jboss-jca/trunk/codegenerator/src/main/resources/pom.xml.template
===================================================================
--- projects/jboss-jca/trunk/codegenerator/src/main/resources/pom.xml.template 2010-09-23 16:02:37 UTC (rev 108300)
+++ projects/jboss-jca/trunk/codegenerator/src/main/resources/pom.xml.template 2010-09-23 18:46:31 UTC (rev 108301)
@@ -34,6 +34,12 @@
</dependency>
<dependency>
<groupId>org.jboss.ironjacamar</groupId>
+ <artifactId>ironjacamar-common-impl-papaki</artifactId>
+ <version>@VERSION.IRONJACAMAR@</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ironjacamar</groupId>
<artifactId>ironjacamar-core-api</artifactId>
<version>@VERSION.IRONJACAMAR@</version>
<scope>test</scope>
Modified: projects/jboss-jca/trunk/common/build.xml
===================================================================
--- projects/jboss-jca/trunk/common/build.xml 2010-09-23 16:02:37 UTC (rev 108300)
+++ projects/jboss-jca/trunk/common/build.xml 2010-09-23 18:46:31 UTC (rev 108301)
@@ -83,7 +83,7 @@
indexMetaInf="true"
update="true"
level="9"
- excludes="**/*.java, **/common/api/**, **/common/spi/**">
+ excludes="**/*.java, **/common/api/**, **/common/spi/**, **/papaki/**">
<manifest>
<attribute name="Implementation-Title" value="IronJacamar Common Implementation"/>
<attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
@@ -91,6 +91,21 @@
<attribute name="Implementation-Vendor-Id" value="org.jboss"/>
</manifest>
</jar>
+
+ <jar destfile="${target.dir}/${name}-common-impl-papaki.jar"
+ basedir="${build.common.dir}"
+ index="true"
+ indexMetaInf="true"
+ update="true"
+ level="9"
+ includes="**/papaki/**">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Common Implementation - Papaki SPI Implementation"/>
+ <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>
<!-- =================================
@@ -276,7 +291,7 @@
indexMetaInf="true"
update="true"
level="9"
- excludes="**/common/api/**,**/common/spi/**">
+ excludes="**/common/api/**,**/common/spi/**,**/papaki/**">
<manifest>
<attribute name="Implementation-Title" value="IronJacamar Common Implementation - Sources"/>
<attribute name="Implementation-Version" value="${major}.${minor}.${patch}.${type}"/>
@@ -285,6 +300,21 @@
</manifest>
</jar>
+ <jar destfile="${target.dir}/${name}-common-impl-papaki-sources.jar"
+ basedir="src/main/java"
+ index="true"
+ indexMetaInf="true"
+ update="true"
+ level="9"
+ includes="**/papaki/**">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Common Implementation - Papaki - 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.common.dir}/docs"/>
<mkdir dir="${build.common.dir}/docs/api"/>
@@ -380,6 +410,7 @@
<packageset dir="src/main/java" defaultexcludes="yes">
<exclude name="**/common/api/**"/>
<exclude name="**/common/spi/**"/>
+ <exclude name="**/papaki/**"/>
</packageset>
<link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
@@ -402,6 +433,44 @@
</manifest>
</jar>
+ <mkdir dir="${build.common.dir}/docs/papaki"/>
+ <javadoc destdir="${build.common.dir}/docs/papaki"
+ doclet="org.jboss.apiviz.APIviz"
+ docletpathref="sjc.lib.path.id"
+ author="true"
+ version="true"
+ windowtitle="IronJacamar Common - Implementation - Papaki"
+ doctitle="IronJacamar Common - Implementation - Papaki"
+ use="true"
+ additionalparam="-author -version"
+ classpath="${build.common.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="**/papaki/**"/>
+ </packageset>
+
+ <link offline="true" href="http://java.sun.com/j2se/5/docs/api/" packagelistLoc="${java.home}/../docs/api"/>
+ </javadoc>
+ <copy todir="${build.common.dir}/docs/papaki" overwrite="true">
+ <fileset dir="${tools.dir}/api"/>
+ </copy>
+
+ <jar destfile="${target.dir}/${name}-common-impl-papaki-javadoc.jar"
+ basedir="${build.common.dir}/docs/papaki"
+ index="true"
+ indexMetaInf="true"
+ update="true"
+ level="9">
+ <manifest>
+ <attribute name="Implementation-Title" value="IronJacamar Common Implementation - Papaki - 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>
Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/repository/papaki/AnnotationScannerFactory.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/repository/papaki/AnnotationScannerFactory.java 2010-09-23 16:02:37 UTC (rev 108300)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/repository/papaki/AnnotationScannerFactory.java 2010-09-23 18:46:31 UTC (rev 108301)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.common.annotations.repository.papaki;
-
-import org.jboss.jca.common.spi.annotations.repository.AnnotationScanner;
-
-/**
- *
- * A AnnotationScannerFactory static class
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
-public class AnnotationScannerFactory
-{
-
- /**
- *
- * create a scanner with papaki backend with default parameters
- *
- * @return scanner backed by papaki
- */
- public AnnotationScanner createScanner()
- {
- org.jboss.papaki.AnnotationScanner annotationScanner = org.jboss.papaki.AnnotationScannerFactory
- .getStrategy(org.jboss.papaki.AnnotationScannerFactory.JAVASSIST_INPUT_STREAM);
- annotationScanner.configure().constructorLevel(false).parameterLevel(false);
- return new AnnotationScannerImpl(annotationScanner);
- }
-
-
-
-}
-
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/repository/papaki/AnnotationScannerImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/repository/papaki/AnnotationScannerImpl.java 2010-09-23 16:02:37 UTC (rev 108300)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/repository/papaki/AnnotationScannerImpl.java 2010-09-23 18:46:31 UTC (rev 108301)
@@ -27,36 +27,29 @@
import java.net.URL;
/**
+ * An AnnotationScannerImpl based on Papaki.
*
- * A AnnotationScannerImpl.
- *
* @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
+ * @author <a href="jesper.pedersen at jboss.org">Jesper Pedersen</a>
*/
public class AnnotationScannerImpl implements AnnotationScanner
{
- private final org.jboss.papaki.AnnotationScanner backingScanner;
+ private final org.jboss.papaki.AnnotationScanner annotationScanner;
/**
- *
- * Create a new AnnotationScannerImpl with papaki backend
- *
- * @param annotationScanner the papaki backing annotation scanner
- * @throws IllegalArgumentException in case passed papaki scanner is null
+ * Create a new AnnotationScannerImpl with a Papaki backend
*/
- public AnnotationScannerImpl(org.jboss.papaki.AnnotationScanner annotationScanner)
- throws IllegalArgumentException
+ public AnnotationScannerImpl()
{
- if (annotationScanner == null)
- throw new IllegalArgumentException("annotationscanner cannot be null");
- this.backingScanner = annotationScanner;
+ this.annotationScanner = org.jboss.papaki.AnnotationScannerFactory
+ .getStrategy(org.jboss.papaki.AnnotationScannerFactory.JAVASSIST_INPUT_STREAM);
+ this.annotationScanner.configure().constructorLevel(false).parameterLevel(false);
}
@Override
public AnnotationRepository scan(URL[] urls, ClassLoader cl)
{
- return new AnnotationRepositoryImpl(backingScanner.scan(urls, cl));
+ return new AnnotationRepositoryImpl(annotationScanner.scan(urls, cl));
}
-
}
Added: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/spi/annotations/repository/AnnotationScannerFactory.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/spi/annotations/repository/AnnotationScannerFactory.java (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/spi/annotations/repository/AnnotationScannerFactory.java 2010-09-23 18:46:31 UTC (rev 108301)
@@ -0,0 +1,76 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.common.spi.annotations.repository;
+
+/**
+ * The AnnotationScannerFactory which creates an annotation scanner instance
+ *
+ * @author <a href="jesper.pedersen at jboss.org">Jesper Pedersen</a>
+ */
+public class AnnotationScannerFactory
+{
+ /** Papaki implementation */
+ private static final String PAPAKI = "org.jboss.jca.common.annotations.repository.papaki.AnnotationScannerImpl";
+
+ /** The default implementation of the annotation scanner */
+ private static AnnotationScanner defaultImplementation = null;
+
+ /** The activate implementation */
+ private static AnnotationScanner active = null;
+
+ static
+ {
+ try
+ {
+ Class<?> clz = Class.forName(PAPAKI);
+ defaultImplementation = (AnnotationScanner)clz.newInstance();
+ }
+ catch (Throwable t)
+ {
+ // Ok - count on registerAnnotationScanner
+ }
+ }
+
+ /**
+ * Register an annotation scanner
+ * @param scanner The scanner
+ */
+ public static void registerAnnotationScanner(AnnotationScanner scanner)
+ {
+ active = scanner;
+ }
+
+ /**
+ * Get the annotation scanner
+ * @return The scanner
+ */
+ public static AnnotationScanner getAnnotationScanner()
+ {
+ if (active != null)
+ return active;
+
+ if (defaultImplementation == null)
+ throw new IllegalStateException("Unable to find an annotation scanner implementation");
+
+ return defaultImplementation;
+ }
+}
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2010-09-23 16:02:37 UTC (rev 108300)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2010-09-23 18:46:31 UTC (rev 108301)
@@ -23,7 +23,6 @@
package org.jboss.jca.deployers.fungal;
import org.jboss.jca.common.annotations.Annotations;
-import org.jboss.jca.common.annotations.repository.papaki.AnnotationScannerFactory;
import org.jboss.jca.common.api.metadata.common.TransactionSupportEnum;
import org.jboss.jca.common.api.metadata.ironjacamar.IronJacamar;
import org.jboss.jca.common.api.metadata.ra.AdminObject;
@@ -38,6 +37,7 @@
import org.jboss.jca.common.metadata.merge.Merger;
import org.jboss.jca.common.spi.annotations.repository.AnnotationRepository;
import org.jboss.jca.common.spi.annotations.repository.AnnotationScanner;
+import org.jboss.jca.common.spi.annotations.repository.AnnotationScannerFactory;
import org.jboss.jca.core.connectionmanager.ConnectionManager;
import org.jboss.jca.core.connectionmanager.ConnectionManagerFactory;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
@@ -172,7 +172,7 @@
// Annotation scanning
Annotations annotator = new Annotations();
- AnnotationScanner scanner = (new AnnotationScannerFactory()).createScanner();
+ AnnotationScanner scanner = AnnotationScannerFactory.getAnnotationScanner();
AnnotationRepository repository = scanner.scan(cl.getURLs(), cl);
cmd = annotator.merge(cmd, repository);
Modified: projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/deployers/annotations/AnnotationsTestCase.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/deployers/annotations/AnnotationsTestCase.java 2010-09-23 16:02:37 UTC (rev 108300)
+++ projects/jboss-jca/trunk/deployers/src/test/java/org/jboss/jca/deployers/annotations/AnnotationsTestCase.java 2010-09-23 18:46:31 UTC (rev 108301)
@@ -23,7 +23,7 @@
package org.jboss.jca.deployers.annotations;
import org.jboss.jca.common.annotations.Annotations;
-import org.jboss.jca.common.annotations.repository.papaki.AnnotationScannerFactory;
+import org.jboss.jca.common.annotations.repository.papaki.AnnotationScannerImpl;
import org.jboss.jca.common.api.validator.ValidateException;
import org.jboss.jca.common.spi.annotations.repository.AnnotationRepository;
import org.jboss.jca.common.spi.annotations.repository.AnnotationScanner;
@@ -106,7 +106,7 @@
{
URL url = getURL("ra16inoutanno.rar");
System.out.println(url);
- AnnotationScanner asf = (new AnnotationScannerFactory()).createScanner();
+ AnnotationScanner asf = new AnnotationScannerImpl();
AnnotationRepository ar = asf.scan(new URL[] {url}, Thread.currentThread().getContextClassLoader());
annotations.process(ar, null);
@@ -128,7 +128,7 @@
try
{
URL url = getURL("rafail2connector.rar");
- AnnotationScanner asf = (new AnnotationScannerFactory()).createScanner();
+ AnnotationScanner asf = new AnnotationScannerImpl();
AnnotationRepository ar = asf.scan(new URL[] {url}, Thread.currentThread().getContextClassLoader());
annotations.process(ar, null);
@@ -151,7 +151,7 @@
try
{
URL url = getURL("ra16annoconndefs.rar");
- AnnotationScanner asf = (new AnnotationScannerFactory()).createScanner();
+ AnnotationScanner asf = new AnnotationScannerImpl();
AnnotationRepository ar = asf.scan(new URL[] {url}, Thread.currentThread().getContextClassLoader());
annotations.process(ar, null);
@@ -174,7 +174,7 @@
try
{
URL url = getURL("ra16annoconndef.rar");
- AnnotationScanner asf = (new AnnotationScannerFactory()).createScanner();
+ AnnotationScanner asf = new AnnotationScannerImpl();
AnnotationRepository ar = asf.scan(new URL[] {url}, Thread.currentThread().getContextClassLoader());
annotations.process(ar, null);
@@ -195,7 +195,7 @@
try
{
URL url = getURL("ra16annoactiv.rar");
- AnnotationScanner asf = (new AnnotationScannerFactory()).createScanner();
+ AnnotationScanner asf = new AnnotationScannerImpl();
AnnotationRepository ar = asf.scan(new URL[] {url}, Thread.currentThread().getContextClassLoader());
annotations.process(ar, null);
@@ -216,7 +216,7 @@
try
{
URL url = getURL("ra16annoauthmech.rar");
- AnnotationScanner asf = (new AnnotationScannerFactory()).createScanner();
+ AnnotationScanner asf = new AnnotationScannerImpl();
AnnotationRepository ar = asf.scan(new URL[] {url}, Thread.currentThread().getContextClassLoader());
annotations.process(ar, null);
@@ -237,7 +237,7 @@
try
{
URL url = getURL("ra16annoadminobj.rar");
- AnnotationScanner asf = (new AnnotationScannerFactory()).createScanner();
+ AnnotationScanner asf = new AnnotationScannerImpl();
AnnotationRepository ar = asf.scan(new URL[] {url}, Thread.currentThread().getContextClassLoader());
annotations.process(ar, null);
@@ -258,7 +258,7 @@
try
{
URL url = getURL("ra16annoconfprop.rar");
- AnnotationScanner asf = (new AnnotationScannerFactory()).createScanner();
+ AnnotationScanner asf = new AnnotationScannerImpl();
AnnotationRepository ar = asf.scan(new URL[] {url}, Thread.currentThread().getContextClassLoader());
annotations.process(ar, null);
Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml 2010-09-23 16:02:37 UTC (rev 108300)
+++ projects/jboss-jca/trunk/ivy.xml 2010-09-23 18:46:31 UTC (rev 108301)
@@ -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-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-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"/>
@@ -45,6 +45,7 @@
<conf name="ironjacamar-codegenerator" transitive="false"/>
<conf name="ironjacamar-common-api" transitive="false"/>
<conf name="ironjacamar-common-impl" transitive="false"/>
+ <conf name="ironjacamar-common-impl-papaki" transitive="false"/>
<conf name="ironjacamar-common-spi" transitive="false"/>
<conf name="ironjacamar-core-api" transitive="false"/>
<conf name="ironjacamar-core-impl" transitive="false"/>
@@ -66,6 +67,7 @@
<artifact name="ironjacamar-codegenerator" type="jar"/>
<artifact name="ironjacamar-common-api" type="jar"/>
<artifact name="ironjacamar-common-impl" type="jar"/>
+ <artifact name="ironjacamar-common-impl-papaki" type="jar"/>
<artifact name="ironjacamar-common-spi" type="jar"/>
<artifact name="ironjacamar-core-api" type="jar"/>
<artifact name="ironjacamar-core-impl" type="jar"/>
@@ -85,7 +87,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-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-fungal"/>
<dependency org="org.jboss.logmanager" name="jboss-logmanager" rev="${version.jboss.logmanager}" conf="common,ironjacamar-depchain"/>
<!-- Keep these sorted -->
@@ -133,7 +135,7 @@
<dependency org="org.jboss.jbossts" name="jbossjts" rev="${version.jboss.ts}" conf="common,ironjacamar-depchain"/>
<dependency org="org.jboss.jbossts" name="jbossjts-integration" rev="${version.jboss.ts}" conf="common,ironjacamar-depchain"/>
<dependency org="org.jboss.naming" name="jnpserver" rev="${version.jboss.naming}" conf="common,ironjacamar-depchain"/>
- <dependency org="org.jboss.papaki" name="papaki-core" rev="${version.jboss.papaki}" conf="common,ironjacamar-common-impl,ironjacamar-depchain"/>
+ <dependency org="org.jboss.papaki" name="papaki-core" rev="${version.jboss.papaki}" conf="common,ironjacamar-common-impl-papaki,ironjacamar-depchain"/>
<dependency org="org.jboss.security" name="jboss-security-spi-bare" rev="${version.jboss.security}" conf="common,ironjacamar-core-impl,ironjacamar-depchain"/>
<dependency org="org.jboss.shrinkwrap" name="shrinkwrap-api" rev="${version.jboss.shrinkwrap}" conf="embedded,ironjacamar-depchain,ironjacamar-embedded,ironjacamar-embedded-arquillian"/>
<dependency org="org.jboss.shrinkwrap" name="shrinkwrap-impl-base" rev="${version.jboss.shrinkwrap}" conf="embedded,ironjacamar-depchain"/>
Modified: projects/jboss-jca/trunk/tools/findbugs/filter.xml
===================================================================
--- projects/jboss-jca/trunk/tools/findbugs/filter.xml 2010-09-23 16:02:37 UTC (rev 108300)
+++ projects/jboss-jca/trunk/tools/findbugs/filter.xml 2010-09-23 18:46:31 UTC (rev 108301)
@@ -81,6 +81,14 @@
<Class name="org.jboss.jca.deployers.fungal.RADeployment"/>
<Bug code="EI2"/>
</Match>
+ <Match>
+ <Class name="org.jboss.jca.deployers.fungal.RaXmlDeployment"/>
+ <Bug code="EI2"/>
+ </Match>
+ <Match>
+ <Class name="org.jboss.jca.deployers.fungal.RAActivatorDeployment"/>
+ <Bug code="EI2"/>
+ </Match>
<!-- org.jboss.jca.sjc filter -->
<Match>
Modified: projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/Validation.java
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/Validation.java 2010-09-23 16:02:37 UTC (rev 108300)
+++ projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/Validation.java 2010-09-23 18:46:31 UTC (rev 108301)
@@ -22,7 +22,6 @@
package org.jboss.jca.validator;
import org.jboss.jca.common.annotations.Annotations;
-import org.jboss.jca.common.annotations.repository.papaki.AnnotationScannerFactory;
import org.jboss.jca.common.api.metadata.ra.AdminObject;
import org.jboss.jca.common.api.metadata.ra.ConfigProperty;
import org.jboss.jca.common.api.metadata.ra.ConnectionDefinition;
@@ -35,6 +34,7 @@
import org.jboss.jca.common.metadata.MetadataFactory;
import org.jboss.jca.common.spi.annotations.repository.AnnotationRepository;
import org.jboss.jca.common.spi.annotations.repository.AnnotationScanner;
+import org.jboss.jca.common.spi.annotations.repository.AnnotationScannerFactory;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
@@ -144,7 +144,7 @@
// Annotation scanning
Annotations annotator = new Annotations();
- AnnotationScanner scanner = (new AnnotationScannerFactory()).createScanner();
+ AnnotationScanner scanner = AnnotationScannerFactory.getAnnotationScanner();
AnnotationRepository repository = scanner.scan(cl.getURLs(), cl);
cmd = annotator.merge(cmd, repository);
More information about the jboss-cvs-commits
mailing list