[jboss-cvs] JBossAS SVN: r93291 - in projects/jboss-jca/trunk: sjc/src/main/java/org/jboss/jca/sjc and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 8 14:54:34 EDT 2009
Author: jesper.pedersen
Date: 2009-09-08 14:54:34 -0400 (Tue, 08 Sep 2009)
New Revision: 93291
Removed:
projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/annotationscanner/
Modified:
projects/jboss-jca/trunk/build.xml
projects/jboss-jca/trunk/ivy.xml
projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/Annotations.java
projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/RADeployer.java
Log:
[JBJCA-168] Papaki 1.0.0.Beta1
Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml 2009-09-08 18:26:29 UTC (rev 93290)
+++ projects/jboss-jca/trunk/build.xml 2009-09-08 18:54:34 UTC (rev 93291)
@@ -97,6 +97,7 @@
<property name="version.jboss.mdr" value="2.0.1.GA"/>
<property name="version.jboss.metadata" value="2.0.0.Alpha"/>
<property name="version.jboss.naming" value="5.0.3.GA"/>
+ <property name="version.jboss.papaki" value="1.0.0.Beta1"/>
<property name="version.jboss.reflect" value="2.0.2.GA"/>
<property name="version.jboss.slf4j" value="1.0.2.GA"/>
<property name="version.jboss.slf4j.logmanager" value="1.0.0.CR2"/>
Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml 2009-09-08 18:26:29 UTC (rev 93290)
+++ projects/jboss-jca/trunk/ivy.xml 2009-09-08 18:54:34 UTC (rev 93291)
@@ -38,8 +38,8 @@
<dependencies>
<dependency org="apache-log4j" name="log4j" rev="${version.apache-log4j}" conf="standalone->default;sjc->*"/>
<dependency org="apache-logging" name="commons-logging" rev="${version.apache-logging}" conf="*"/>
+ <dependency org="com.sun.xml.bind" name="jaxb-impl" rev="${version.jaxb.impl}" conf="standalone->default;sjc->*"/>
<dependency org="com.sun.xml.bind" name="jaxb-xjc" rev="${version.jaxb.xjc}" conf="standalone->default;sjc->*"/>
- <dependency org="com.sun.xml.bind" name="jaxb-impl" rev="${version.jaxb.impl}" conf="standalone->default;sjc->*"/>
<dependency org="javassist" name="javassist" rev="${version.javassist}" conf="standalone->default;sjc->*"/>
<dependency org="javax.activation" name="activation" rev="${version.activation}" conf="standalone->default;sjc->*"/>
<dependency org="javax.validation" name="validation-api" rev="${version.validation-api}" conf="standalone->default;sjc->*"/>
@@ -86,6 +86,7 @@
<dependency org="org.jboss.microcontainer" name="jboss-dependency" rev="${version.jboss.mc.dependency}" conf="standalone->default"/>
<dependency org="org.jboss.microcontainer" name="jboss-kernel" rev="${version.jboss.mc.kernel}" conf="standalone->default"/>
<dependency org="org.jboss.naming" name="jnpserver" rev="${version.jboss.naming}" conf="standalone->default;sjc->*"/>
+ <dependency org="org.jboss.papaki" name="papaki-core" rev="${version.jboss.papaki}" conf="standalone->default;sjc->*"/>
<dependency org="org.jboss.slf4j" name="slf4j-jboss-logging" rev="${version.jboss.slf4j}" conf="standalone->default;sjc->*"/>
<dependency org="org.jboss.slf4j" name="slf4j-jboss-logmanager" rev="${version.jboss.slf4j.logmanager}" conf="standalone->default;sjc->*"/>
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="${version.slf4j}" conf="standalone->default;sjc->*"/>
Modified: projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/Annotations.java
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/Annotations.java 2009-09-08 18:26:29 UTC (rev 93290)
+++ projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/Annotations.java 2009-09-08 18:54:34 UTC (rev 93291)
@@ -23,10 +23,10 @@
package org.jboss.jca.sjc.deployers.ra;
import org.jboss.jca.fungal.deployers.DeployException;
-import org.jboss.jca.sjc.annotationscanner.Annotation;
import java.lang.reflect.Array;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -57,6 +57,8 @@
import org.jboss.metadata.rar.spec.ResourceAdapterMetaData;
import org.jboss.metadata.rar.spec.SecurityPermissionMetaData;
import org.jboss.metadata.rar.spec.TransactionSupportMetaData;
+import org.jboss.papaki.Annotation;
+import org.jboss.papaki.AnnotationRepository;
/**
* The annotation processor for JCA 1.6
@@ -77,11 +79,11 @@
/**
* Process annotations
* @param md The metadata
- * @param annotations The annotations
+ * @param annotationRepository The annotation repository
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
- public static ConnectorMetaData process(ConnectorMetaData md, Map<Class, List<Annotation>> annotations)
+ public static ConnectorMetaData process(ConnectorMetaData md, AnnotationRepository annotationRepository)
throws Exception
{
/* Process
@@ -104,25 +106,25 @@
}
// @Connector
- md = processConnector(md, annotations);
+ md = processConnector(md, annotationRepository);
// @ConnectionDefinitions
- md = processConnectionDefinitions(md, annotations);
+ md = processConnectionDefinitions(md, annotationRepository);
// @ConnectionDefinition (outside of @ConnectionDefinitions)
- md = processConnectionDefinition(md, annotations);
+ md = processConnectionDefinition(md, annotationRepository);
// @ConfigProperty
- md = processConfigProperty(md, annotations);
+ md = processConfigProperty(md, annotationRepository);
// @AuthenticationMechanism
- md = processAuthenticationMechanism(md, annotations);
+ md = processAuthenticationMechanism(md, annotationRepository);
// @AdministeredObject
- md = processAdministeredObject(md, annotations);
+ md = processAdministeredObject(md, annotationRepository);
// @Activation
- md = processActivation(md, annotations);
+ md = processActivation(md, annotationRepository);
//log.debug("ConnectorMetadata " + md);
@@ -132,19 +134,19 @@
/**
* Process: @Connector
* @param md The metadata
- * @param annotations The annotations
+ * @param annotationRepository The annotation repository
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
- private static ConnectorMetaData processConnector(ConnectorMetaData md, Map<Class, List<Annotation>> annotations)
+ private static ConnectorMetaData processConnector(ConnectorMetaData md, AnnotationRepository annotationRepository)
throws Exception
{
- List<Annotation> values = annotations.get(Connector.class);
+ Collection<Annotation> values = annotationRepository.getAnnotation(Connector.class);
if (values != null)
{
if (values.size() == 1)
{
- Annotation annotation = values.get(0);
+ Annotation annotation = values.iterator().next();
Connector c = (Connector)annotation.getAnnotation();
if (trace)
@@ -351,20 +353,20 @@
/**
* Process: @ConnectionDefinitions
* @param md The metadata
- * @param annotations The annotations
+ * @param annotationRepository The annotation repository
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
private static ConnectorMetaData processConnectionDefinitions(ConnectorMetaData md,
- Map<Class, List<Annotation>> annotations)
+ AnnotationRepository annotationRepository)
throws Exception
{
- List<Annotation> values = annotations.get(ConnectionDefinitions.class);
+ Collection<Annotation> values = annotationRepository.getAnnotation(ConnectionDefinitions.class);
if (values != null)
{
if (values.size() == 1)
{
- Annotation annotation = values.get(0);
+ Annotation annotation = values.iterator().next();
ConnectionDefinitions c = (ConnectionDefinitions)annotation.getAnnotation();
if (trace)
@@ -396,15 +398,15 @@
/**
* Process: @ConnectionDefinition
* @param md The metadata
- * @param annotations The annotations
+ * @param annotationRepository The annotation repository
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
private static ConnectorMetaData processConnectionDefinition(ConnectorMetaData md,
- Map<Class, List<Annotation>> annotations)
+ AnnotationRepository annotationRepository)
throws Exception
{
- List<Annotation> values = annotations.get(ConnectionDefinition.class);
+ Collection<Annotation> values = annotationRepository.getAnnotation(ConnectionDefinition.class);
if (values != null)
{
for (Annotation annotation : values)
@@ -438,15 +440,15 @@
/**
* Process: @ConfigProperty
* @param md The metadata
- * @param annotations The annotations
+ * @param annotationRepository The annotation repository
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
private static ConnectorMetaData processConfigProperty(ConnectorMetaData md,
- Map<Class, List<Annotation>> annotations)
+ AnnotationRepository annotationRepository)
throws Exception
{
- List<Annotation> values = annotations.get(ConfigProperty.class);
+ Collection<Annotation> values = annotationRepository.getAnnotation(ConfigProperty.class);
if (values != null)
{
for (Annotation annotation : values)
@@ -480,15 +482,15 @@
/**
* Process: @AuthenticationMechanism
* @param md The metadata
- * @param annotations The annotations
+ * @param annotationRepository The annotation repository
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
private static ConnectorMetaData processAuthenticationMechanism(ConnectorMetaData md,
- Map<Class, List<Annotation>> annotations)
+ AnnotationRepository annotationRepository)
throws Exception
{
- List<Annotation> values = annotations.get(AuthenticationMechanism.class);
+ Collection<Annotation> values = annotationRepository.getAnnotation(AuthenticationMechanism.class);
if (values != null)
{
for (Annotation annotation : values)
@@ -553,15 +555,15 @@
/**
* Process: @AdministeredObject
* @param md The metadata
- * @param annotations The annotations
+ * @param annotationRepository The annotation repository
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
private static ConnectorMetaData processAdministeredObject(ConnectorMetaData md,
- Map<Class, List<Annotation>> annotations)
+ AnnotationRepository annotationRepository)
throws Exception
{
- List<Annotation> values = annotations.get(AdministeredObject.class);
+ Collection<Annotation> values = annotationRepository.getAnnotation(AdministeredObject.class);
if (values != null)
{
for (Annotation annotation : values)
@@ -610,15 +612,15 @@
/**
* Process: @Activation
* @param md The metadata
- * @param annotations The annotations
+ * @param annotationRepository The annotation repository
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
private static ConnectorMetaData processActivation(ConnectorMetaData md,
- Map<Class, List<Annotation>> annotations)
+ AnnotationRepository annotationRepository)
throws Exception
{
- List<Annotation> values = annotations.get(Activation.class);
+ Collection<Annotation> values = annotationRepository.getAnnotation(Activation.class);
if (values != null)
{
for (Annotation annotation : values)
Modified: projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/RADeployer.java
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/RADeployer.java 2009-09-08 18:26:29 UTC (rev 93290)
+++ projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/deployers/ra/RADeployer.java 2009-09-08 18:54:34 UTC (rev 93291)
@@ -28,8 +28,6 @@
import org.jboss.jca.fungal.util.FileUtil;
import org.jboss.jca.fungal.util.Injection;
import org.jboss.jca.fungal.util.JarFilter;
-import org.jboss.jca.sjc.annotationscanner.Annotation;
-import org.jboss.jca.sjc.annotationscanner.AnnotationScanner;
import java.io.File;
import java.io.IOException;
@@ -54,6 +52,10 @@
import org.jboss.metadata.rar.spec.JCA16DefaultNSMetaData;
import org.jboss.metadata.rar.spec.JCA16MetaData;
import org.jboss.metadata.rar.spec.MessageListenerMetaData;
+import org.jboss.papaki.Annotation;
+import org.jboss.papaki.AnnotationRepository;
+import org.jboss.papaki.AnnotationScanner;
+import org.jboss.papaki.AnnotationScannerFactory;
/**
* The RA deployer for JCA/SJC
@@ -139,7 +141,9 @@
// Process annotations
if (cmd == null || cmd.is16())
{
- Map<Class, List<Annotation>> annotations = AnnotationScanner.scan(cl.getURLs(), cl);
+ AnnotationScanner annotationScanner =
+ AnnotationScannerFactory.getStrategy(AnnotationScannerFactory.JAVASSIST_INPUT_STREAM);
+ AnnotationRepository annotationRepository = annotationScanner.scan(cl.getURLs(), cl);
isMetadataComplete = false;
if (cmd != null)
@@ -162,7 +166,7 @@
}
if (cmd == null || !isMetadataComplete)
- cmd = Annotations.process(cmd, annotations);
+ cmd = Annotations.process(cmd, annotationRepository);
}
// Validate metadata
More information about the jboss-cvs-commits
mailing list