myrle-krantz closed pull request #5: Updating package names. URL: https://github.com/apache/fineract-cn-mariadb/pull/5
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/README.md b/README.md index d03d976..4eb27af 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,5 @@ # Apache Fineract CN MariaDB -[](https://gitter.im/mifos-initiative/mifos.io?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - -This project is an umbrella for all Mifos I/O Core components. - ## Abstract Apache Fineract CN is an application framework for digital financial services, a system to support nationwide and cross-national financial transactions and help to level and speed the creation of an inclusive, interconnected digital economy for every nation in the world. diff --git a/src/main/java/io/mifos/core/mariadb/config/EnableMariaDB.java b/src/main/java/org/apache/fineract/cn/mariadb/config/EnableMariaDB.java similarity index 96% rename from src/main/java/io/mifos/core/mariadb/config/EnableMariaDB.java rename to src/main/java/org/apache/fineract/cn/mariadb/config/EnableMariaDB.java index efed793..c6eaa87 100644 --- a/src/main/java/io/mifos/core/mariadb/config/EnableMariaDB.java +++ b/src/main/java/org/apache/fineract/cn/mariadb/config/EnableMariaDB.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.core.mariadb.config; +package org.apache.fineract.cn.mariadb.config; import org.springframework.context.annotation.Import; diff --git a/src/main/java/io/mifos/core/mariadb/config/MariaDBJavaConfiguration.java b/src/main/java/org/apache/fineract/cn/mariadb/config/MariaDBJavaConfiguration.java similarity index 93% rename from src/main/java/io/mifos/core/mariadb/config/MariaDBJavaConfiguration.java rename to src/main/java/org/apache/fineract/cn/mariadb/config/MariaDBJavaConfiguration.java index 285345c..9a6884d 100644 --- a/src/main/java/io/mifos/core/mariadb/config/MariaDBJavaConfiguration.java +++ b/src/main/java/org/apache/fineract/cn/mariadb/config/MariaDBJavaConfiguration.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.core.mariadb.config; +package org.apache.fineract.cn.mariadb.config; import com.jolbox.bonecp.BoneCPDataSource; -import io.mifos.core.lang.ApplicationName; -import io.mifos.core.lang.config.EnableApplicationName; -import io.mifos.core.mariadb.domain.FlywayFactoryBean; -import io.mifos.core.mariadb.util.JdbcUrlBuilder; -import io.mifos.core.mariadb.util.MariaDBConstants; +import org.apache.fineract.cn.mariadb.domain.FlywayFactoryBean; +import org.apache.fineract.cn.mariadb.util.JdbcUrlBuilder; +import org.apache.fineract.cn.mariadb.util.MariaDBConstants; +import org.apache.fineract.cn.lang.ApplicationName; +import org.apache.fineract.cn.lang.config.EnableApplicationName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -69,7 +69,7 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactory(final DataSou final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean(); em.setPersistenceUnitName("metaPU"); em.setDataSource(dataSource); - em.setPackagesToScan("io.mifos.**.repository"); + em.setPackagesToScan("org.apache.fineract.cn.**.repository"); final JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter(); em.setJpaVendorAdapter(vendorAdapter); diff --git a/src/main/java/io/mifos/core/mariadb/config/MariaDBJavaConfigurationImportSelector.java b/src/main/java/org/apache/fineract/cn/mariadb/config/MariaDBJavaConfigurationImportSelector.java similarity index 97% rename from src/main/java/io/mifos/core/mariadb/config/MariaDBJavaConfigurationImportSelector.java rename to src/main/java/org/apache/fineract/cn/mariadb/config/MariaDBJavaConfigurationImportSelector.java index a41f326..81d74a7 100644 --- a/src/main/java/io/mifos/core/mariadb/config/MariaDBJavaConfigurationImportSelector.java +++ b/src/main/java/org/apache/fineract/cn/mariadb/config/MariaDBJavaConfigurationImportSelector.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.core.mariadb.config; +package org.apache.fineract.cn.mariadb.config; import org.springframework.context.annotation.ImportSelector; import org.springframework.core.type.AnnotationMetadata; diff --git a/src/main/java/io/mifos/core/mariadb/config/MariaDBTenantBasedJavaConfiguration.java b/src/main/java/org/apache/fineract/cn/mariadb/config/MariaDBTenantBasedJavaConfiguration.java similarity index 88% rename from src/main/java/io/mifos/core/mariadb/config/MariaDBTenantBasedJavaConfiguration.java rename to src/main/java/org/apache/fineract/cn/mariadb/config/MariaDBTenantBasedJavaConfiguration.java index 9c7e53c..e0cb454 100644 --- a/src/main/java/io/mifos/core/mariadb/config/MariaDBTenantBasedJavaConfiguration.java +++ b/src/main/java/org/apache/fineract/cn/mariadb/config/MariaDBTenantBasedJavaConfiguration.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.core.mariadb.config; +package org.apache.fineract.cn.mariadb.config; -import io.mifos.core.mariadb.domain.ContextAwareRoutingDataSource; -import io.mifos.core.mariadb.util.JdbcUrlBuilder; -import io.mifos.core.mariadb.util.MariaDBConstants; +import org.apache.fineract.cn.mariadb.domain.ContextAwareRoutingDataSource; +import org.apache.fineract.cn.mariadb.util.JdbcUrlBuilder; +import org.apache.fineract.cn.mariadb.util.MariaDBConstants; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/src/main/java/io/mifos/core/mariadb/config/MariaDBTenantFreeJavaConfiguration.java b/src/main/java/org/apache/fineract/cn/mariadb/config/MariaDBTenantFreeJavaConfiguration.java similarity index 96% rename from src/main/java/io/mifos/core/mariadb/config/MariaDBTenantFreeJavaConfiguration.java rename to src/main/java/org/apache/fineract/cn/mariadb/config/MariaDBTenantFreeJavaConfiguration.java index 54dcacc..8e78bc2 100644 --- a/src/main/java/io/mifos/core/mariadb/config/MariaDBTenantFreeJavaConfiguration.java +++ b/src/main/java/org/apache/fineract/cn/mariadb/config/MariaDBTenantFreeJavaConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.core.mariadb.config; +package org.apache.fineract.cn.mariadb.config; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/src/main/java/io/mifos/core/mariadb/config/MetaDataSourceWrapper.java b/src/main/java/org/apache/fineract/cn/mariadb/config/MetaDataSourceWrapper.java similarity index 96% rename from src/main/java/io/mifos/core/mariadb/config/MetaDataSourceWrapper.java rename to src/main/java/org/apache/fineract/cn/mariadb/config/MetaDataSourceWrapper.java index a1c003e..9aa7bbb 100644 --- a/src/main/java/io/mifos/core/mariadb/config/MetaDataSourceWrapper.java +++ b/src/main/java/org/apache/fineract/cn/mariadb/config/MetaDataSourceWrapper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.core.mariadb.config; +package org.apache.fineract.cn.mariadb.config; import com.jolbox.bonecp.BoneCPDataSource; diff --git a/src/main/java/io/mifos/core/mariadb/domain/ContextAwareRoutingDataSource.java b/src/main/java/org/apache/fineract/cn/mariadb/domain/ContextAwareRoutingDataSource.java similarity index 92% rename from src/main/java/io/mifos/core/mariadb/domain/ContextAwareRoutingDataSource.java rename to src/main/java/org/apache/fineract/cn/mariadb/domain/ContextAwareRoutingDataSource.java index 944411d..34ababd 100644 --- a/src/main/java/io/mifos/core/mariadb/domain/ContextAwareRoutingDataSource.java +++ b/src/main/java/org/apache/fineract/cn/mariadb/domain/ContextAwareRoutingDataSource.java @@ -16,12 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.core.mariadb.domain; +package org.apache.fineract.cn.mariadb.domain; import com.jolbox.bonecp.BoneCPDataSource; -import io.mifos.core.lang.TenantContextHolder; -import io.mifos.core.mariadb.util.JdbcUrlBuilder; -import io.mifos.core.mariadb.util.MariaDBConstants; +import org.apache.fineract.cn.mariadb.util.JdbcUrlBuilder; +import org.apache.fineract.cn.mariadb.util.MariaDBConstants; +import org.apache.fineract.cn.lang.TenantContextHolder; +import org.apache.fineract.cn.mariadb.util.JdbcUrlBuilder.DatabaseType; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; @@ -36,12 +37,12 @@ public final class ContextAwareRoutingDataSource extends AbstractRoutingDataSource { private final Logger logger; - private final JdbcUrlBuilder.DatabaseType type; + private final DatabaseType type; private final ConcurrentHashMap<String, DataSource> dynamicDataSources; private DataSource metaDataSource; public ContextAwareRoutingDataSource(@Qualifier(MariaDBConstants.LOGGER_NAME) final Logger logger, - final JdbcUrlBuilder.DatabaseType type) { + final DatabaseType type) { super(); this.logger = logger; this.type = type; diff --git a/src/main/java/io/mifos/core/mariadb/domain/FlywayFactoryBean.java b/src/main/java/org/apache/fineract/cn/mariadb/domain/FlywayFactoryBean.java similarity index 93% rename from src/main/java/io/mifos/core/mariadb/domain/FlywayFactoryBean.java rename to src/main/java/org/apache/fineract/cn/mariadb/domain/FlywayFactoryBean.java index 877922e..b5aae99 100644 --- a/src/main/java/io/mifos/core/mariadb/domain/FlywayFactoryBean.java +++ b/src/main/java/org/apache/fineract/cn/mariadb/domain/FlywayFactoryBean.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.core.mariadb.domain; +package org.apache.fineract.cn.mariadb.domain; -import io.mifos.core.lang.ApplicationName; +import org.apache.fineract.cn.lang.ApplicationName; import org.flywaydb.core.Flyway; import javax.sql.DataSource; diff --git a/src/main/java/io/mifos/core/mariadb/domain/Tenant.java b/src/main/java/org/apache/fineract/cn/mariadb/domain/Tenant.java similarity index 97% rename from src/main/java/io/mifos/core/mariadb/domain/Tenant.java rename to src/main/java/org/apache/fineract/cn/mariadb/domain/Tenant.java index cd61546..1c7355c 100644 --- a/src/main/java/io/mifos/core/mariadb/domain/Tenant.java +++ b/src/main/java/org/apache/fineract/cn/mariadb/domain/Tenant.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.core.mariadb.domain; +package org.apache.fineract.cn.mariadb.domain; @SuppressWarnings("WeakerAccess") public final class Tenant { diff --git a/src/main/java/io/mifos/core/mariadb/util/JdbcUrlBuilder.java b/src/main/java/org/apache/fineract/cn/mariadb/util/JdbcUrlBuilder.java similarity index 98% rename from src/main/java/io/mifos/core/mariadb/util/JdbcUrlBuilder.java rename to src/main/java/org/apache/fineract/cn/mariadb/util/JdbcUrlBuilder.java index 01d0bda..b4d6c17 100644 --- a/src/main/java/io/mifos/core/mariadb/util/JdbcUrlBuilder.java +++ b/src/main/java/org/apache/fineract/cn/mariadb/util/JdbcUrlBuilder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.core.mariadb.util; +package org.apache.fineract.cn.mariadb.util; public final class JdbcUrlBuilder { diff --git a/src/main/java/io/mifos/core/mariadb/util/LocalDateConverter.java b/src/main/java/org/apache/fineract/cn/mariadb/util/LocalDateConverter.java similarity index 97% rename from src/main/java/io/mifos/core/mariadb/util/LocalDateConverter.java rename to src/main/java/org/apache/fineract/cn/mariadb/util/LocalDateConverter.java index 3a2331e..4de5d60 100644 --- a/src/main/java/io/mifos/core/mariadb/util/LocalDateConverter.java +++ b/src/main/java/org/apache/fineract/cn/mariadb/util/LocalDateConverter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.core.mariadb.util; +package org.apache.fineract.cn.mariadb.util; import javax.persistence.AttributeConverter; import javax.persistence.Converter; diff --git a/src/main/java/io/mifos/core/mariadb/util/LocalDateTimeConverter.java b/src/main/java/org/apache/fineract/cn/mariadb/util/LocalDateTimeConverter.java similarity index 94% rename from src/main/java/io/mifos/core/mariadb/util/LocalDateTimeConverter.java rename to src/main/java/org/apache/fineract/cn/mariadb/util/LocalDateTimeConverter.java index 45a553c..57d1059 100644 --- a/src/main/java/io/mifos/core/mariadb/util/LocalDateTimeConverter.java +++ b/src/main/java/org/apache/fineract/cn/mariadb/util/LocalDateTimeConverter.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.core.mariadb.util; +package org.apache.fineract.cn.mariadb.util; -import io.mifos.core.lang.DateConverter; import javax.persistence.AttributeConverter; import javax.persistence.Converter; import java.sql.Timestamp; import java.time.LocalDateTime; +import org.apache.fineract.cn.lang.DateConverter; @Converter public class LocalDateTimeConverter implements AttributeConverter<LocalDateTime, Timestamp> { diff --git a/src/main/java/io/mifos/core/mariadb/util/MariaDBConstants.java b/src/main/java/org/apache/fineract/cn/mariadb/util/MariaDBConstants.java similarity index 98% rename from src/main/java/io/mifos/core/mariadb/util/MariaDBConstants.java rename to src/main/java/org/apache/fineract/cn/mariadb/util/MariaDBConstants.java index 5446b8e..d1cdf84 100644 --- a/src/main/java/io/mifos/core/mariadb/util/MariaDBConstants.java +++ b/src/main/java/org/apache/fineract/cn/mariadb/util/MariaDBConstants.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.core.mariadb.util; +package org.apache.fineract.cn.mariadb.util; public interface MariaDBConstants { diff --git a/src/test/java/io/mifos/core/mariadb/util/JdbcUrlBuilderTest.java b/src/test/java/org/apache/fineract/cn/mariadb/util/JdbcUrlBuilderTest.java similarity index 97% rename from src/test/java/io/mifos/core/mariadb/util/JdbcUrlBuilderTest.java rename to src/test/java/org/apache/fineract/cn/mariadb/util/JdbcUrlBuilderTest.java index d9d564a..bff9194 100644 --- a/src/test/java/io/mifos/core/mariadb/util/JdbcUrlBuilderTest.java +++ b/src/test/java/org/apache/fineract/cn/mariadb/util/JdbcUrlBuilderTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.core.mariadb.util; +package org.apache.fineract.cn.mariadb.util; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/io/mifos/core/mariadb/util/LocalDateConverterTest.java b/src/test/java/org/apache/fineract/cn/mariadb/util/LocalDateConverterTest.java similarity index 96% rename from src/test/java/io/mifos/core/mariadb/util/LocalDateConverterTest.java rename to src/test/java/org/apache/fineract/cn/mariadb/util/LocalDateConverterTest.java index bd8d12f..4a9ea8e 100644 --- a/src/test/java/io/mifos/core/mariadb/util/LocalDateConverterTest.java +++ b/src/test/java/org/apache/fineract/cn/mariadb/util/LocalDateConverterTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.core.mariadb.util; +package org.apache.fineract.cn.mariadb.util; import org.junit.Assert; import org.junit.Test; ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
