merge initial commit by @aterleto, tweak package names and structure
Merge branch 'aterleto-master'
Merge branch 'master' of https://github.com/aterleto/xap-drools-integration into aterleto-master2

Conflicts:
	Distributed-Drools/mycompany-client/src/main/java/com/mycompany/app/analyze/PrintOutAllKnowledgePackages.java
	Distributed-Drools/mycompany-client/src/main/java/com/mycompany/app/analyze/PrintOutSingleKnowledgePackage.java
	Distributed-Drools/mycompany-client/src/main/java/com/mycompany/app/loader/DroolsRulesLoader.java
	Distributed-Drools/mycompany-client/src/main/java/com/mycompany/app/loader/FactLoader.java
	Distributed-Drools/mycompany-client/src/main/java/com/mycompany/app/rules/ExecuteRule.java
	Distributed-Drools/mycompany-client/src/main/java/com/mycompany/app/rules/RemoveRule.java
	Distributed-Drools/mycompany-common/src/main/java/com/mycompany/app/exceptions/ObjectNotFoundException.java
	Distributed-Drools/mycompany-common/src/main/java/com/mycompany/app/exceptions/TypeNotFoundException.java
	Distributed-Drools/mycompany-common/src/main/java/com/mycompany/app/model/drools/DroolsDslDefinition.java
	Distributed-Drools/mycompany-common/src/main/java/com/mycompany/app/model/drools/DroolsRule.java
	Distributed-Drools/mycompany-common/src/main/java/com/mycompany/app/model/drools/DroolsRuleAddEvent.java
	Distributed-Drools/mycompany-common/src/main/java/com/mycompany/app/model/drools/DroolsRuleRemoveEvent.java
	Distributed-Drools/mycompany-common/src/main/java/com/mycompany/app/model/drools/KnowledgeBaseWrapper.java
	Distributed-Drools/mycompany-common/src/main/java/com/mycompany/app/model/drools/KnowledgePackage.java
	Distributed-Drools/mycompany-common/src/main/java/com/mycompany/app/model/facts/Applicant.java
	Distributed-Drools/mycompany-common/src/main/java/com/mycompany/app/model/facts/Application.java
	Distributed-Drools/mycompany-common/src/main/java/com/mycompany/app/model/facts/Holiday.java
	Distributed-Drools/mycompany-common/src/main/java/com/mycompany/app/service/drools/IRulesExecutionService.java
	Distributed-Drools/mycompany-common/src/main/java/com/mycompany/app/util/DataGenerationUtils.java
	Distributed-Drools/mycompany-common/src/main/java/com/mycompany/app/util/GigaSpacesUtils.java
	Distributed-Drools/mycompany-common/src/main/java/com/mycompany/app/util/IterableMapWrapper.java
	Distributed-Drools/mycompany-common/src/main/java/com/mycompany/app/util/RulesConstants.java
	Distributed-Drools/mycompany-common/src/main/java/com/mycompany/app/util/xml/XmlAdd.java
	Distributed-Drools/mycompany-common/src/main/java/com/mycompany/app/util/xml/XmlChangeSet.java
	Distributed-Drools/mycompany-common/src/main/java/com/mycompany/app/util/xml/XmlReader.java
	Distributed-Drools/mycompany-common/src/main/java/com/mycompany/app/util/xml/XmlRemove.java
	Distributed-Drools/mycompany-common/src/main/java/com/mycompany/app/util/xml/XmlResource.java
	Distributed-Drools/mycompany-space/src/main/java/com/mycompany/app/dao/DroolsRuleDao.java
	Distributed-Drools/mycompany-space/src/main/java/com/mycompany/app/dao/KnowledgeBaseWrapperDao.java
	Distributed-Drools/mycompany-space/src/main/java/com/mycompany/app/dao/KnowledgePackageDao.java
	Distributed-Drools/mycompany-space/src/main/java/com/mycompany/app/event/listener/DroolsRuleAddEventListener.java
	Distributed-Drools/mycompany-space/src/main/java/com/mycompany/app/event/listener/DroolsRuleRemoveEventListener.java
	Distributed-Drools/mycompany-space/src/main/java/com/mycompany/app/service/drools/impl/RulesExecutionServiceImpl.java
	Distributed-Drools/mycompany-web-services/src/main/java/com/mycompany/app/web/controller/DecisionRESTfulServiceController.java
	Distributed-Drools/mycompany-web-services/src/main/java/com/mycompany/app/web/controller/GenericRESTfulServiceController.java
	Distributed-Drools/mycompany-web-services/src/main/java/com/mycompany/app/web/dao/ApplicantDao.java
	Distributed-Drools/mycompany-web-services/src/main/java/com/mycompany/app/web/dao/GenericObjectDao.java
	Distributed-Drools/mycompany-web-services/src/main/java/com/mycompany/app/web/services/ApplicationService.java
	Distributed-Drools/mycompany-web-services/src/main/java/com/mycompany/app/web/services/HolidayDecisionService.java
	Distributed-Drools/mycompany-web-services/src/main/java/com/mycompany/app/web/services/delegate/DecisionServiceDelegate.java
	client/pom.xml
	client/src/main/java/com/gigaspaces/droolsintegration/analyze/PrintOutAllKnowledgePackages.java
	client/src/main/java/com/gigaspaces/droolsintegration/analyze/PrintOutSingleKnowledgePackage.java
	client/src/main/java/com/gigaspaces/droolsintegration/loader/DroolsRulesLoader.java
	client/src/main/java/com/gigaspaces/droolsintegration/loader/FactLoader.java
	client/src/main/java/com/gigaspaces/droolsintegration/rules/ExecuteRule.java
	client/src/main/java/com/gigaspaces/droolsintegration/rules/RemoveRule.java
	client/src/main/java/com/mycompany/app/analyze/PrintOutAllKnowledgePackages.java
	client/src/main/java/com/mycompany/app/analyze/PrintOutSingleKnowledgePackage.java
	client/src/main/java/com/mycompany/app/loader/DroolsRulesLoader.java
	client/src/main/java/com/mycompany/app/loader/FactLoader.java
	client/src/main/java/com/mycompany/app/rules/ExecuteRule.java
	client/src/main/java/com/mycompany/app/rules/RemoveRule.java
	common/src/main/java/com/gigaspaces/droolsintegration/exceptions/ObjectNotFoundException.java
	common/src/main/java/com/gigaspaces/droolsintegration/exceptions/TypeNotFoundException.java
	common/src/main/java/com/gigaspaces/droolsintegration/model/drools/DroolsDslDefinition.java
	common/src/main/java/com/gigaspaces/droolsintegration/model/drools/DroolsRule.java
	common/src/main/java/com/gigaspaces/droolsintegration/model/drools/DroolsRuleAddEvent.java
	common/src/main/java/com/gigaspaces/droolsintegration/model/drools/DroolsRuleRemoveEvent.java
	common/src/main/java/com/gigaspaces/droolsintegration/model/drools/KnowledgeBaseWrapper.java
	common/src/main/java/com/gigaspaces/droolsintegration/model/drools/KnowledgePackage.java
	common/src/main/java/com/gigaspaces/droolsintegration/model/facts/Applicant.java
	common/src/main/java/com/gigaspaces/droolsintegration/model/facts/Application.java
	common/src/main/java/com/gigaspaces/droolsintegration/model/facts/Holiday.java
	common/src/main/java/com/gigaspaces/droolsintegration/service/drools/IRulesExecutionService.java
	common/src/main/java/com/gigaspaces/droolsintegration/util/DataGenerationUtils.java
	common/src/main/java/com/gigaspaces/droolsintegration/util/GigaSpacesUtils.java
	common/src/main/java/com/gigaspaces/droolsintegration/util/IterableMapWrapper.java
	common/src/main/java/com/gigaspaces/droolsintegration/util/RulesConstants.java
	common/src/main/java/com/gigaspaces/droolsintegration/util/xml/XmlAdd.java
	common/src/main/java/com/gigaspaces/droolsintegration/util/xml/XmlChangeSet.java
	common/src/main/java/com/gigaspaces/droolsintegration/util/xml/XmlReader.java
	common/src/main/java/com/gigaspaces/droolsintegration/util/xml/XmlRemove.java
	common/src/main/java/com/gigaspaces/droolsintegration/util/xml/XmlResource.java
	common/src/main/java/com/mycompany/app/exceptions/ObjectNotFoundException.java
	common/src/main/java/com/mycompany/app/exceptions/TypeNotFoundException.java
	common/src/main/java/com/mycompany/app/model/drools/DroolsDslDefinition.java
	common/src/main/java/com/mycompany/app/model/drools/DroolsRule.java
	common/src/main/java/com/mycompany/app/model/drools/DroolsRuleAddEvent.java
	common/src/main/java/com/mycompany/app/model/drools/DroolsRuleRemoveEvent.java
	common/src/main/java/com/mycompany/app/model/drools/KnowledgeBaseWrapper.java
	common/src/main/java/com/mycompany/app/model/drools/KnowledgePackage.java
	common/src/main/java/com/mycompany/app/model/facts/Applicant.java
	common/src/main/java/com/mycompany/app/model/facts/Application.java
	common/src/main/java/com/mycompany/app/model/facts/Holiday.java
	common/src/main/java/com/mycompany/app/service/drools/IRulesExecutionService.java
	common/src/main/java/com/mycompany/app/util/DataGenerationUtils.java
	common/src/main/java/com/mycompany/app/util/GigaSpacesUtils.java
	common/src/main/java/com/mycompany/app/util/IterableMapWrapper.java
	common/src/main/java/com/mycompany/app/util/RulesConstants.java
	common/src/main/java/com/mycompany/app/util/xml/XmlAdd.java
	common/src/main/java/com/mycompany/app/util/xml/XmlChangeSet.java
	common/src/main/java/com/mycompany/app/util/xml/XmlReader.java
	common/src/main/java/com/mycompany/app/util/xml/XmlRemove.java
	common/src/main/java/com/mycompany/app/util/xml/XmlResource.java
	pom.xml
	space/pom.xml
	space/src/main/assembly/assembly.xml
	space/src/main/java/com/gigaspaces/droolsintegration/dao/DroolsRuleDao.java
	space/src/main/java/com/gigaspaces/droolsintegration/dao/KnowledgeBaseWrapperDao.java
	space/src/main/java/com/gigaspaces/droolsintegration/dao/KnowledgePackageDao.java
	space/src/main/java/com/gigaspaces/droolsintegration/event/listener/DroolsRuleAddEventListener.java
	space/src/main/java/com/gigaspaces/droolsintegration/event/listener/DroolsRuleRemoveEventListener.java
	space/src/main/java/com/gigaspaces/droolsintegration/service/drools/impl/RulesExecutionServiceImpl.java
	space/src/main/java/com/mycompany/app/dao/DroolsRuleDao.java
	space/src/main/java/com/mycompany/app/dao/KnowledgeBaseWrapperDao.java
	space/src/main/java/com/mycompany/app/dao/KnowledgePackageDao.java
	space/src/main/java/com/mycompany/app/event/listener/DroolsRuleAddEventListener.java
	space/src/main/java/com/mycompany/app/event/listener/DroolsRuleRemoveEventListener.java
	space/src/main/java/com/mycompany/app/service/drools/impl/RulesExecutionServiceImpl.java
	web-services/pom.xml
	web-services/src/main/java/com/gigaspaces/droolsintegration/web/controller/DecisionRESTfulServiceController.java
	web-services/src/main/java/com/gigaspaces/droolsintegration/web/controller/GenericRESTfulServiceController.java
	web-services/src/main/java/com/gigaspaces/droolsintegration/web/dao/ApplicantDao.java
	web-services/src/main/java/com/gigaspaces/droolsintegration/web/dao/GenericObjectDao.java
	web-services/src/main/java/com/gigaspaces/droolsintegration/web/services/ApplicationService.java
	web-services/src/main/java/com/gigaspaces/droolsintegration/web/services/HolidayDecisionService.java
	web-services/src/main/java/com/gigaspaces/droolsintegration/web/services/delegate/DecisionServiceDelegate.java
	web-services/src/main/java/com/mycompany/app/web/controller/DecisionRESTfulServiceController.java
	web-services/src/main/java/com/mycompany/app/web/controller/GenericRESTfulServiceController.java
	web-services/src/main/java/com/mycompany/app/web/dao/ApplicantDao.java
	web-services/src/main/java/com/mycompany/app/web/dao/GenericObjectDao.java
	web-services/src/main/java/com/mycompany/app/web/services/ApplicationService.java
	web-services/src/main/java/com/mycompany/app/web/services/HolidayDecisionService.java
	web-services/src/main/java/com/mycompany/app/web/services/delegate/DecisionServiceDelegate.java
Merge
Manual merge
Merge branch 'aterleto-master2'
Update XAP version
Commit Code without .orig files