[Windup-commits] [windup/windup] eb9563: WINDUP-584 - Added support for extracting Datasour...

Branch: refs/heads/master Home: https://github.com/windup/windup Commit: eb956336ceb327ae124c3aff71c56f8c226d2563 https://github.com/windup/windup/commit/eb956336ceb327ae124c3aff71c56f8c2... Author: Brad Davis <bradsdavis(a)gmail.com&gt; Date: 2015-05-18 (Mon, 18 May 2015) Changed paths: M reporting/impl/src/main/resources/reports/resources/css/windup.css A reporting/impl/src/main/resources/reports/resources/img/styles/jpa-small-white-icon.png A reporting/impl/src/main/resources/reports/resources/img/styles/server-resource-small-white-icon.png M reporting/impl/src/main/resources/reports/templates/source.ftl A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/DataSourceModel.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/EjbMessageDrivenModel.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/EjbSessionBeanModel.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/EnvironmentReferenceModel.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/JNDIResourceModel.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/JPAConfigurationFileModel.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/JPAEntityModel.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/JPAPersistenceUnitModel.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/JmsConnectionFactoryModel.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/JmsDestinationModel.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/JmsDestinationType.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/CreateJPAReportRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/CreateServerResourceRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/DiscoverEjbAnnotationsRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/DiscoverEjbConfigurationXmlRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/DiscoverHibernateConfigurationRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/DiscoverJpaConfigurationXmlRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/DiscoverSpringConfigurationFilesRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/jboss/ResolveJBossEjbXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/jboss/ResolveJBossLegacyEjbXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/jboss/ResolveJBossWebXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/orion/ResolveOrionEjbXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/orion/ResolveOrionWebXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/weblogic/ResolveWeblogicEjbXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/weblogic/ResolveWeblogicWebXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/websphere/ResolveWebsphereEjbBindingXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/websphere/ResolveWebsphereEjbExtensionXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/websphere/ResolveWebsphereWebXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/websphere/ResolveWebsphereWsBindingXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/websphere/ResolveWebsphereWsClientBindingXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/websphere/ResolveWebsphereWsExtBindingXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/service/DataSourceService.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/service/EnvironmentReferenceService.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/service/JNDIResourceService.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/service/JPAConfigurationFileService.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/service/JPAEntityService.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/service/JPAPersistenceUnitService.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/service/JmsConnectionFactoryService.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/service/JmsDestinationService.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/util/HibernateDialectDataSourceTypeResolver.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/util/ModelSourceTypeResolver.java M rules-java-ee/addon/src/main/resources/reports/templates/ejb.ftl A rules-java-ee/addon/src/main/resources/reports/templates/jpa.ftl A rules-java-ee/addon/src/main/resources/reports/templates/server.ftl M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/reporting/freemarker/IterableHasContent.java M rules-xml/addon/src/main/java/org/jboss/windup/rules/apps/xml/condition/XmlFile.java M rules-xml/addon/src/main/java/org/jboss/windup/rules/apps/xml/model/NamespaceMetaModel.java M utils/src/main/java/org/jboss/windup/util/xml/LocationAwareXmlReader.java Log Message: ----------- WINDUP-584 - Added support for extracting Datasource from JPA and Hibernate files. Added DAOs for Datasources and JMS. Added in support for resolving jboss, orion, weblogic, and websphere web XML descriptors for resolving Server Resources. WINDUP-587 - Added in Spring JNDI reference extraction to the Server Resource report. Commit: 650936bcac07a2a2be7cbd14f114214af35e16a8 https://github.com/windup/windup/commit/650936bcac07a2a2be7cbd14f114214af... Author: Jess Sightler <jesse.sightler(a)gmail.com&gt; Date: 2015-05-18 (Mon, 18 May 2015) Changed paths: R reporting/impl/src/main/java/org/jboss/windup/reporting/DefaultSourceTypeResolver.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/DataSourceModel.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/EjbSessionBeanModel.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/EnvironmentReferenceModel.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/JNDIResourceModel.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/JPAConfigurationFileModel.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/JmsConnectionFactoryModel.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/JmsDestinationModel.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/JmsDestinationType.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/CreateServerResourceRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/DiscoverEjbAnnotationsRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/DiscoverEjbConfigurationXmlRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/DiscoverHibernateConfigurationRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/DiscoverJpaConfigurationXmlRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/DiscoverSpringConfigurationFilesRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/jboss/ResolveJBossEjbXmlRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/jboss/ResolveJBossLegacyEjbXmlRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/jboss/ResolveJBossWebXmlRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/orion/ResolveOrionEjbXmlRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/orion/ResolveOrionWebXmlRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/weblogic/ResolveWeblogicEjbXmlRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/weblogic/ResolveWeblogicWebXmlRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/websphere/ResolveWebsphereEjbBindingXmlRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/websphere/ResolveWebsphereEjbExtensionXmlRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/websphere/ResolveWebsphereWebXmlRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/websphere/ResolveWebsphereWsBindingXmlRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/websphere/ResolveWebsphereWsClientBindingXmlRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/websphere/ResolveWebsphereWsExtBindingXmlRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/service/DataSourceService.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/service/EnvironmentReferenceService.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/service/JNDIResourceService.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/service/JmsDestinationService.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/util/HibernateDialectDataSourceTypeResolver.java R rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/util/ModelSourceTypeResolver.java M rules-java-ee/addon/src/main/resources/reports/templates/ejb.ftl M rules-java-ee/tests/src/test/java/org/jboss/windup/rules/apps/javaee/tests/DiscoverEjbConfigurationTest.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/reporting/freemarker/IterableHasContent.java A rules-java/impl/src/main/java/org/jboss/windup/rules/apps/java/util/JavaSourceTypeResolver.java A rules-xml/addon/src/main/java/org/jboss/windup/rules/apps/xml/XmlSourceTypeResolver.java M tests/src/test/java/org/jboss/windup/tests/application/WindupArchitectureJEEExampleTest.java M tests/src/test/java/org/jboss/windup/tests/application/WindupArchitectureSourceModeTest.java Log Message: ----------- WINDUP-584: Fixed unit tests Commit: 9c690b630029151aa22b342e456f5426b28a9079 https://github.com/windup/windup/commit/9c690b630029151aa22b342e456f5426b... Author: Jesse Sightler <jesse.sightler(a)gmail.com&gt; Date: 2015-05-19 (Tue, 19 May 2015) Changed paths: R reporting/impl/src/main/java/org/jboss/windup/reporting/DefaultSourceTypeResolver.java M reporting/impl/src/main/resources/reports/resources/css/windup.css A reporting/impl/src/main/resources/reports/resources/img/styles/jpa-small-white-icon.png A reporting/impl/src/main/resources/reports/resources/img/styles/server-resource-small-white-icon.png M reporting/impl/src/main/resources/reports/templates/source.ftl A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/DataSourceModel.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/EjbMessageDrivenModel.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/EjbSessionBeanModel.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/EnvironmentReferenceModel.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/JNDIResourceModel.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/JPAConfigurationFileModel.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/JPAEntityModel.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/JPAPersistenceUnitModel.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/JmsConnectionFactoryModel.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/JmsDestinationModel.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/model/JmsDestinationType.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/CreateJPAReportRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/CreateServerResourceRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/DiscoverEjbAnnotationsRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/DiscoverEjbConfigurationXmlRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/DiscoverHibernateConfigurationRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/DiscoverJpaConfigurationXmlRuleProvider.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/DiscoverSpringConfigurationFilesRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/jboss/ResolveJBossEjbXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/jboss/ResolveJBossLegacyEjbXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/jboss/ResolveJBossWebXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/orion/ResolveOrionEjbXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/orion/ResolveOrionWebXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/weblogic/ResolveWeblogicEjbXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/weblogic/ResolveWeblogicWebXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/websphere/ResolveWebsphereEjbBindingXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/websphere/ResolveWebsphereEjbExtensionXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/websphere/ResolveWebsphereWebXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/websphere/ResolveWebsphereWsBindingXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/websphere/ResolveWebsphereWsClientBindingXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/rules/websphere/ResolveWebsphereWsExtBindingXmlRuleProvider.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/service/DataSourceService.java M rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/service/EnvironmentReferenceService.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/service/JNDIResourceService.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/service/JPAConfigurationFileService.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/service/JPAEntityService.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/service/JPAPersistenceUnitService.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/service/JmsConnectionFactoryService.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/service/JmsDestinationService.java A rules-java-ee/addon/src/main/java/org/jboss/windup/rules/apps/javaee/util/HibernateDialectDataSourceTypeResolver.java M rules-java-ee/addon/src/main/resources/reports/templates/ejb.ftl A rules-java-ee/addon/src/main/resources/reports/templates/jpa.ftl A rules-java-ee/addon/src/main/resources/reports/templates/server.ftl M rules-java-ee/tests/src/test/java/org/jboss/windup/rules/apps/javaee/tests/DiscoverEjbConfigurationTest.java M rules-java/api/src/main/java/org/jboss/windup/rules/apps/java/reporting/freemarker/IterableHasContent.java A rules-java/impl/src/main/java/org/jboss/windup/rules/apps/java/util/JavaSourceTypeResolver.java A rules-xml/addon/src/main/java/org/jboss/windup/rules/apps/xml/XmlSourceTypeResolver.java M rules-xml/addon/src/main/java/org/jboss/windup/rules/apps/xml/condition/XmlFile.java M rules-xml/addon/src/main/java/org/jboss/windup/rules/apps/xml/model/NamespaceMetaModel.java M tests/src/test/java/org/jboss/windup/tests/application/WindupArchitectureJEEExampleTest.java M tests/src/test/java/org/jboss/windup/tests/application/WindupArchitectureSourceModeTest.java M utils/src/main/java/org/jboss/windup/util/xml/LocationAwareXmlReader.java Log Message: ----------- Merge pull request #553 from jsight/bradsdavis-WINDUP-584 Bradsdavis windup 584 Compare: https://github.com/windup/windup/compare/ab68915170c5...9c690b630029