[jboss-svn-commits] JBL Code SVN: r32173 - labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/src/main/java/org/drools/server.

[jboss-svn-commits at lists.jboss.org]

Author: lucazamador
Date: 2010-03-22 15:40:14 -0400 (Mon, 22 Mar 2010)
New Revision: 32173

Modified:
   labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/src/main/java/org/drools/server/KnowledgeService.java
Log:
added jaxb classes-names support

Modified: labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/src/main/java/org/drools/server/KnowledgeService.java
===================================================================
--- labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/src/main/java/org/drools/server/KnowledgeService.java	2010-03-22 18:31:41 UTC (rev 32172)
+++ labs/jbossrules/branches/drools_server_camel_lucaz_baunax/drools-server/src/main/java/org/drools/server/KnowledgeService.java	2010-03-22 19:40:14 UTC (rev 32173)
@@ -97,23 +97,32 @@
 
 			List<String> allClassNames = new ArrayList<String>();
 			if ("jaxb".equals(contextProfile.getMarshaller())) {
-				for (ProfileFile modelFile : contextProfile.getJaxbModels()) {
-					// Create model from xsd definition and add to kbase classloader
 
-					Options xjcOpts = new Options();
-					xjcOpts.setSchemaLanguage( Language.XMLSCHEMA );
+				if (contextProfile.getClasses()!=null) {
+					for (ClassName className : contextProfile.getClasses()) {
+						allClassNames.add(className.getContent());
+					}
+				}
 
-					try {
-						String classNames[] = KnowledgeBuilderHelper.addXsdModel( ResourceFactory.newClassPathResource(modelFile.getFileName(), getClass()),
-								kbuilder,
-								xjcOpts,
-						"xsd" );
-						for (int i = 0; i < classNames.length; i++) {
-							allClassNames.add(classNames[i]);
+				if (contextProfile.getJaxbModels()!=null) {
+					for (ProfileFile modelFile : contextProfile.getJaxbModels()) {
+						// Create model from xsd definition and add to kbase classloader
+						
+						Options xjcOpts = new Options();
+						xjcOpts.setSchemaLanguage( Language.XMLSCHEMA );
+						
+						try {
+							String classNames[] = KnowledgeBuilderHelper.addXsdModel( ResourceFactory.newClassPathResource(modelFile.getFileName(), getClass()),
+									kbuilder,
+									xjcOpts,
+							"xsd" );
+							for (int i = 0; i < classNames.length; i++) {
+								allClassNames.add(classNames[i]);
+							}
+							kbase.addKnowledgePackages(kbuilder.getKnowledgePackages());
+						} catch (IOException e) {
+							throw new CheckedDroolsException("Error creating XSD model", e);
 						}
-						kbase.addKnowledgePackages(kbuilder.getKnowledgePackages());
-					} catch (IOException e) {
-						throw new CheckedDroolsException("Error creating XSD model", e);
 					}
 				}
 			}