Changeset 983 for AnalyzerBeans/trunk/src/main/java/org/eobjects/analyzer/configuration/JaxbConfigurationFactory.java

Timestamp:

08/28/10 23:54:43 (21 months ago)

Author:

kasper

Message:

Ticket #382: Improved testing and examples. Added classpath scanning and more to configuration.

File:

• AnalyzerBeans/trunk/src/main/java/org/eobjects/analyzer/configuration/JaxbConfigurationFactory.java (modified) (3 diffs)

AnalyzerBeans/trunk/src/main/java/org/eobjects/analyzer/configuration/JaxbConfigurationFactory.java

@@ -14 +14 @@
 import javax.xml.bind.Unmarshaller;
 
+import org.eobjects.analyzer.configuration.jaxb.ClasspathScannerType;
+import org.eobjects.analyzer.configuration.jaxb.ClasspathScannerType.Package;
 import org.eobjects.analyzer.configuration.jaxb.CompositeDatastoreType;
 import org.eobjects.analyzer.configuration.jaxb.Configuration;
@@ -31 +33 @@
 import org.eobjects.analyzer.connection.JdbcDatastore;
 import org.eobjects.analyzer.descriptors.ClasspathScanDescriptorProvider;
-import org.eobjects.analyzer.descriptors.DescriptorProvider;
 import org.eobjects.analyzer.job.JaxbJobFactory;
 import org.eobjects.analyzer.job.concurrent.MultiThreadedTaskRunner;
@@ -102 +103 @@
                                 .getDatastoreCatalog());
 
+                ClasspathScanDescriptorProvider descriptorProvider = new ClasspathScanDescriptorProvider();
+                ClasspathScannerType classpathScanner = configuration
+                                .getClasspathScanner();
+                if (classpathScanner != null) {
+                        List<Package> packages = classpathScanner.getPackage();
+                        for (Package pkg : packages) {
+                                String packageName = pkg.getValue();
+                                if (packageName != null) {
+                                        packageName = packageName.trim();
+                                        Boolean recursive = pkg.isRecursive();
+                                        if (recursive == null) {
+                                                recursive = true;
+                                        }
+                                        descriptorProvider.scanPackage(packageName, recursive);
+                                }
+                        }
+                }
+
                 // TODO: Make these components configurable as well
                 ReferenceDataCatalog referenceDataCatalog = new ReferenceDataCatalogImpl();
-                DescriptorProvider descriptorProvider = new ClasspathScanDescriptorProvider()
-                                .scanPackage("org.eobjects.analyzer.beans", true).scanPackage(
-                                                "org.eobjects.analyzer.result.renderer", true);
                 CollectionProvider collectionProvider = new BerkeleyDbCollectionProvider();
                 return new AnalyzerBeansConfigurationImpl(datastoreCatalog,