[jboss-cvs] JBossAS SVN: r97129 - in projects/jboss-jca/trunk: fungal/src/main/java/org/jboss/jca/fungal/util and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Nov 28 11:55:15 EST 2009
Author: jesper.pedersen
Date: 2009-11-28 11:55:14 -0500 (Sat, 28 Nov 2009)
New Revision: 97129
Modified:
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/Annotations.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/BeanValidation.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/Metadata.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/util/FileUtil.java
projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/util/Injection.java
projects/jboss-jca/trunk/web/src/main/java/org/jboss/jca/web/WARDeployer.java
Log:
Allow mutiple thread access
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/Annotations.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/Annotations.java 2009-11-28 16:10:41 UTC (rev 97128)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/Annotations.java 2009-11-28 16:55:14 UTC (rev 97129)
@@ -82,7 +82,7 @@
/**
* Constructor
*/
- private Annotations()
+ public Annotations()
{
}
@@ -93,7 +93,7 @@
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
- public static ConnectorMetaData process(ConnectorMetaData md, AnnotationRepository annotationRepository)
+ public ConnectorMetaData process(ConnectorMetaData md, AnnotationRepository annotationRepository)
throws Exception
{
if (annotationRepository == null)
@@ -150,7 +150,7 @@
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
- private static ConnectorMetaData processConnector(ConnectorMetaData md, AnnotationRepository annotationRepository)
+ private ConnectorMetaData processConnector(ConnectorMetaData md, AnnotationRepository annotationRepository)
throws Exception
{
Collection<Annotation> values = annotationRepository.getAnnotation(Connector.class);
@@ -180,7 +180,7 @@
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
- private static ConnectorMetaData attachConnector(ConnectorMetaData md, Connector c)
+ private ConnectorMetaData attachConnector(ConnectorMetaData md, Connector c)
throws Exception
{
// AuthenticationMechanism
@@ -401,7 +401,7 @@
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
- private static ConnectorMetaData processConnectionDefinitions(ConnectorMetaData md,
+ private ConnectorMetaData processConnectionDefinitions(ConnectorMetaData md,
AnnotationRepository annotationRepository)
throws Exception
{
@@ -432,7 +432,7 @@
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
- private static ConnectorMetaData attachConnectionDefinitions(ConnectorMetaData md,
+ private ConnectorMetaData attachConnectionDefinitions(ConnectorMetaData md,
ConnectionDefinitions cds)
throws Exception
{
@@ -447,7 +447,7 @@
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
- private static ConnectorMetaData processConnectionDefinition(ConnectorMetaData md,
+ private ConnectorMetaData processConnectionDefinition(ConnectorMetaData md,
AnnotationRepository annotationRepository)
throws Exception
{
@@ -470,7 +470,7 @@
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
- private static ConnectorMetaData attachConnectionDefinition(ConnectorMetaData md, Annotation annotation)
+ private ConnectorMetaData attachConnectionDefinition(ConnectorMetaData md, Annotation annotation)
throws Exception
{
ConnectionDefinition cd = (ConnectionDefinition)annotation.getAnnotation();
@@ -505,7 +505,7 @@
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
- private static ConnectorMetaData processConfigProperty(ConnectorMetaData md,
+ private ConnectorMetaData processConfigProperty(ConnectorMetaData md,
AnnotationRepository annotationRepository)
throws Exception
{
@@ -528,7 +528,7 @@
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
- private static ConnectorMetaData attachConfigProperty(ConnectorMetaData md, Annotation annotation)
+ private ConnectorMetaData attachConfigProperty(ConnectorMetaData md, Annotation annotation)
throws Exception
{
ConfigProperty configProperty = (ConfigProperty)annotation.getAnnotation();
@@ -636,7 +636,7 @@
* @param targetClassName
* @return
*/
- private static boolean hasInterface(Class c, String targetClassName)
+ private boolean hasInterface(Class c, String targetClassName)
{
for (Class face : c.getInterfaces())
{
@@ -673,7 +673,7 @@
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
- private static ConnectorMetaData attachAuthenticationMechanism(ConnectorMetaData md,
+ private ConnectorMetaData attachAuthenticationMechanism(ConnectorMetaData md,
AuthenticationMechanism authenticationmechanism)
throws Exception
{
@@ -735,7 +735,7 @@
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
- private static ConnectorMetaData processAdministeredObject(ConnectorMetaData md,
+ private ConnectorMetaData processAdministeredObject(ConnectorMetaData md,
AnnotationRepository annotationRepository)
throws Exception
{
@@ -763,7 +763,7 @@
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
- private static ConnectorMetaData attachAdministeredObject(ConnectorMetaData md, AdministeredObject a)
+ private ConnectorMetaData attachAdministeredObject(ConnectorMetaData md, AdministeredObject a)
throws Exception
{
createAdminObject(md);
@@ -785,7 +785,7 @@
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
- private static ConnectorMetaData processActivation(ConnectorMetaData md,
+ private ConnectorMetaData processActivation(ConnectorMetaData md,
AnnotationRepository annotationRepository)
throws Exception
{
@@ -808,7 +808,7 @@
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
- private static ConnectorMetaData attachActivation(ConnectorMetaData md, Annotation annotation)
+ private ConnectorMetaData attachActivation(ConnectorMetaData md, Annotation annotation)
throws Exception
{
Activation activation = (Activation)annotation.getAnnotation();
@@ -835,7 +835,7 @@
* @param md
* @throws Exception
*/
- private static void createMessageListeners(ConnectorMetaData md) throws Exception
+ private void createMessageListeners(ConnectorMetaData md) throws Exception
{
if (md.getRa() == null)
{
@@ -860,7 +860,7 @@
* @param md
* @throws Exception
*/
- private static void createAdminObject(ConnectorMetaData md) throws Exception
+ private void createAdminObject(ConnectorMetaData md) throws Exception
{
if (md.getRa() == null)
{
@@ -877,7 +877,7 @@
* @param md
* @throws Exception
*/
- private static void createConDefs(ConnectorMetaData md) throws Exception
+ private void createConDefs(ConnectorMetaData md) throws Exception
{
if (md.getRa() == null)
{
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/BeanValidation.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/BeanValidation.java 2009-11-28 16:10:41 UTC (rev 97128)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/BeanValidation.java 2009-11-28 16:55:14 UTC (rev 97129)
@@ -49,6 +49,13 @@
private static boolean trace = log.isTraceEnabled();
/**
+ * Constructor
+ */
+ public BeanValidation()
+ {
+ }
+
+ /**
* Validate the object against the Bean Validation specification (JSR-303).
* The object must be fully initialized
* @param object The object that should be validated
@@ -56,7 +63,7 @@
* @exception ConstraintViolationException Thrown if the object can't be validated
*/
@SuppressWarnings("unchecked")
- public static void validate(Object object, List<Class> groupsClasses) throws ConstraintViolationException
+ public void validate(Object object, List<Class> groupsClasses) throws ConstraintViolationException
{
if (object == null)
{
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/Metadata.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/Metadata.java 2009-11-28 16:10:41 UTC (rev 97128)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/Metadata.java 2009-11-28 16:55:14 UTC (rev 97129)
@@ -64,7 +64,7 @@
/**
* Constructor
*/
- private Metadata()
+ public Metadata()
{
}
@@ -74,7 +74,7 @@
* @return The metadata
* @exception Exception Thrown if an error occurs
*/
- public static ConnectorMetaData getStandardMetaData(File root) throws Exception
+ public ConnectorMetaData getStandardMetaData(File root) throws Exception
{
ConnectorMetaData result = null;
@@ -123,7 +123,7 @@
* @return The metadata
* @exception Exception Thrown if an error occurs
*/
- public static JBossRAMetaData getJBossMetaData(File root) throws Exception
+ public JBossRAMetaData getJBossMetaData(File root) throws Exception
{
JBossRAMetaData result = null;
@@ -168,7 +168,7 @@
* @return The merged metadata
* @exception Exception Thrown if an error occurs
*/
- public static ConnectorMetaData merge(ConnectorMetaData cmd, JBossRAMetaData jmd) throws Exception
+ public ConnectorMetaData merge(ConnectorMetaData cmd, JBossRAMetaData jmd) throws Exception
{
if (cmd != null && jmd != null)
{
@@ -289,7 +289,7 @@
* @return The merged metadata
* @exception Exception Thrown if an error occurs
*/
- public static ConnectorMetaData validate(ConnectorMetaData cmd) throws Exception
+ public ConnectorMetaData validate(ConnectorMetaData cmd) throws Exception
{
//make sure all need metadata parsered and processed after annotation handle
if (cmd.getRa() == null)
@@ -312,7 +312,7 @@
* @return validate
* @exception Exception Thrown if an error occurs
*/
- private static boolean validateOutbound(OutboundRaMetaData omd) throws Exception
+ private boolean validateOutbound(OutboundRaMetaData omd) throws Exception
{
if (omd == null)
return false;
@@ -335,7 +335,7 @@
* @return validate
* @exception Exception Thrown if an error occurs
*/
- private static boolean validateInbound(InboundRaMetaData imd) throws Exception
+ private boolean validateInbound(InboundRaMetaData imd) throws Exception
{
if (imd == null)
return false;
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 2009-11-28 16:10:41 UTC (rev 97128)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2009-11-28 16:55:14 UTC (rev 97129)
@@ -121,8 +121,9 @@
if (f.isFile())
{
+ FileUtil fileUtil = new FileUtil();
File destination = new File(SecurityActions.getSystemProperty("jboss.jca.home"), "/tmp/");
- root = FileUtil.extract(f, destination);
+ root = fileUtil.extract(f, destination);
}
else
{
@@ -135,8 +136,9 @@
SecurityActions.setThreadContextClassLoader(cl);
// Parse metadata
- ConnectorMetaData cmd = Metadata.getStandardMetaData(root);
- JBossRAMetaData jrmd = Metadata.getJBossMetaData(root);
+ Metadata metadataHandler = new Metadata();
+ ConnectorMetaData cmd = metadataHandler.getStandardMetaData(root);
+ JBossRAMetaData jrmd = metadataHandler.getJBossMetaData(root);
boolean isMetadataComplete = true;
// Process annotations
@@ -167,14 +169,17 @@
}
if (cmd == null || !isMetadataComplete)
- cmd = Annotations.process(cmd, annotationRepository);
+ {
+ Annotations annotator = new Annotations();
+ cmd = annotator.process(cmd, annotationRepository);
+ }
}
// Validate metadata
- Metadata.validate(cmd);
+ metadataHandler.validate(cmd);
// Merge metadata
- cmd = Metadata.merge(cmd, jrmd);
+ cmd = metadataHandler.merge(cmd, jrmd);
// Create objects
// And
@@ -270,9 +275,10 @@
if (objects != null && objects.size() > 0)
{
+ BeanValidation beanValidator = new BeanValidation();
for (Object mcf : objects)
{
- BeanValidation.validate(mcf, groupsClasses);
+ beanValidator.validate(mcf, groupsClasses);
}
}
}
@@ -319,9 +325,10 @@
{
if (cpMetas != null)
{
+ Injection injector = new Injection();
for (ConfigPropertyMetaData cpmd : cpMetas)
{
- Injection.inject(cpmd.getType(), cpmd.getName(), cpmd.getValue(), mcf);
+ injector.inject(cpmd.getType(), cpmd.getName(), cpmd.getValue(), mcf);
}
}
}
@@ -374,9 +381,6 @@
*/
public Deployer clone() throws CloneNotSupportedException
{
- RADeployer copy = new RADeployer();
- copy.setBeanValidation(getBeanValidation());
-
- return copy;
+ return new RADeployer();
}
}
Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/util/FileUtil.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/util/FileUtil.java 2009-11-28 16:10:41 UTC (rev 97128)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/util/FileUtil.java 2009-11-28 16:55:14 UTC (rev 97129)
@@ -51,7 +51,7 @@
/**
* Constructor
*/
- private FileUtil()
+ public FileUtil()
{
}
@@ -61,7 +61,7 @@
* @param target The JAR file
* @exception IOException Thrown if an error occurs
*/
- public static void compress(File directory, File target) throws IOException
+ public void compress(File directory, File target) throws IOException
{
if (directory == null)
throw new IllegalArgumentException("Directory is null");
@@ -171,7 +171,7 @@
* @return The root of the extracted JAR file
* @exception IOException Thrown if an error occurs
*/
- public static File extract(File file, File directory) throws IOException
+ public File extract(File file, File directory) throws IOException
{
if (file == null)
throw new IllegalArgumentException("File is null");
@@ -254,7 +254,7 @@
* @param f The file handler
* @exception IOException Thrown if a file could not be deleted
*/
- public static void recursiveDelete(File f) throws IOException
+ public void recursiveDelete(File f) throws IOException
{
if (f != null && f.exists())
{
@@ -284,7 +284,7 @@
* @param file The root directory
* @return The list of files
*/
- private static List<File> findEntries(File root)
+ private List<File> findEntries(File root)
{
try
{
@@ -305,7 +305,7 @@
* @return The list of files
* @exception Exception Thrown if an error occurs
*/
- private static List<File> getListing(File root, File directory) throws Exception
+ private List<File> getListing(File root, File directory) throws Exception
{
List<File> result = new ArrayList<File>();
Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/util/Injection.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/util/Injection.java 2009-11-28 16:10:41 UTC (rev 97128)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/util/Injection.java 2009-11-28 16:55:14 UTC (rev 97129)
@@ -32,6 +32,12 @@
*/
public class Injection
{
+ /**
+ * Constructor
+ */
+ public Injection()
+ {
+ }
/**
* Inject a value into an object property
@@ -43,7 +49,7 @@
* @exception IllegalAccessException If the property method cannot be accessed
* @exception InvocationTargetException If the property method cannot be executed
*/
- public static void inject(String propertyType, String propertyName, String propertyValue, Object object)
+ public void inject(String propertyType, String propertyName, String propertyValue, Object object)
throws NoSuchMethodException, IllegalAccessException, InvocationTargetException
{
if (propertyType == null || propertyType.trim().equals(""))
@@ -182,7 +188,7 @@
* @param input The input string
* @return The output
*/
- private static String getSubstitutionValue(String input)
+ private String getSubstitutionValue(String input)
{
if (input == null || input.trim().equals(""))
return input;
Modified: projects/jboss-jca/trunk/web/src/main/java/org/jboss/jca/web/WARDeployer.java
===================================================================
--- projects/jboss-jca/trunk/web/src/main/java/org/jboss/jca/web/WARDeployer.java 2009-11-28 16:10:41 UTC (rev 97128)
+++ projects/jboss-jca/trunk/web/src/main/java/org/jboss/jca/web/WARDeployer.java 2009-11-28 16:55:14 UTC (rev 97129)
@@ -133,7 +133,10 @@
File tmpDeployment = new File(tmp, "/web" + contextPath);
if (tmpDeployment.exists())
- FileUtil.recursiveDelete(tmpDeployment);
+ {
+ FileUtil fileUtil = new FileUtil();
+ fileUtil.recursiveDelete(tmpDeployment);
+ }
if (!tmpDeployment.mkdirs())
throw new IOException("Unable to create " + tmpDeployment);
More information about the jboss-cvs-commits
mailing list