Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhancement: Decouple stockmanagement module from dependent modules coreapps and its dependent modules #18

Merged
merged 5 commits into from
May 8, 2024
Merged

Enhancement: Decouple stockmanagement module from dependent modules coreapps and its dependent modules #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e9aa55e
Enhancement: Decouple stockmanagement module from dependent modules c…
Apr 24, 2024
c3fa1eb
Generalized name since it's now a community module and updated build …
May 3, 2024
e76fd8f
Decouple dataexchange module from stockmangement module. DataExchange…
May 7, 2024
1b79bdd
Decouple dataexchange module from stockmangement module. DataExchange…
May 7, 2024
e27b17a
Update config_xml_proejct_description
May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 49 additions & 6 deletions api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand All @@ -13,17 +14,36 @@
<description>API project for Stock Management</description>

<dependencies>
<!-- Begin OpenMRS core -->

<dependency>
<groupId>org.openmrs.api</groupId>
<artifactId>openmrs-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.openmrs.api</groupId>
<artifactId>openmrs-api</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.openmrs.test</groupId>
<artifactId>openmrs-test</artifactId>
<type>pom</type>
<scope>test</scope>
</dependency>

<!-- End OpenMRS core -->

<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
<version>0.9.11</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>dataexchange-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
Expand All @@ -38,4 +58,27 @@
</dependency>

</dependencies>

<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>

<testResources>
<testResource>
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
</testResources>

<plugins>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
1 change: 0 additions & 1 deletion api/src/main/java/org/openmrs/module/stockmanagement/StockManagementActivator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ public void started() {
List<StartupTask> startUpTasks = new ArrayList<>();
startUpTasks.add(new LocationTagsSynchronize());
startUpTasks.add(new LocationTreeSynchronize());
startUpTasks.add(new DataImport());
startUpTasks.add(new PartySynchronize());
startUpTasks.sort(Comparator.comparing(StartupTask::getPriority));

Expand Down
31 changes: 0 additions & 31 deletions api/src/main/java/org/openmrs/module/stockmanagement/tasks/DataImport.java
View file
Open in desktop

This file was deleted.

18 changes: 1 addition & 17 deletions api/src/main/resources/moduleApplicationContext.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,8 @@

<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:p="http://www.springframework.org/schema/p"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:jee="http://www.springframework.org/schema/jee"
xmlns:tx="http://www.springframework.org/schema/tx"
xmlns:aop="http://www.springframework.org/schema/aop"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.0.xsd
http://www.springframework.org/schema/jee
http://www.springframework.org/schema/jee/spring-jee-3.0.xsd
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
http://www.springframework.org/schema/aop
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util-3.0.xsd">
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">

<!--<context:component-scan base-package="org.openmrs.module.stockmanagement" />-->

Expand Down
99 changes: 0 additions & 99 deletions api/src/main/resources/stockmgmt/metadata/Role_Privilege.xml
View file
Open in desktop

This file was deleted.

41 changes: 31 additions & 10 deletions omod/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,36 +17,54 @@
<artifactId>${project.parent.artifactId}-api</artifactId>
<version>${project.parent.version}</version>
</dependency>

<!-- Begin OpenMRS core -->

<dependency>
<groupId>org.openmrs.web</groupId>
<artifactId>openmrs-web</artifactId>
<groupId>org.openmrs.api</groupId>
<artifactId>openmrs-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.openmrs.web</groupId>
<artifactId>openmrs-web</artifactId>
<scope>provided</scope>
<classifier>tests</classifier>
</dependency>

<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>uiframework-api</artifactId>
<groupId>org.openmrs.web</groupId>
<artifactId>openmrs-web</artifactId>
<scope>provided</scope>
<classifier>tests</classifier>
</dependency>

<!-- End OpenMRS core -->

<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>webservices.rest-omod</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.openmrs.module</groupId>
<artifactId>appframework-api</artifactId>
</dependency>
</dependencies>

<build>
<finalName>${project.parent.artifactId}-${project.parent.version}</finalName>

<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>

<testResources>
<testResource>
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
</testResources>

<plugins>
<plugin>
<groupId>org.openmrs.maven.plugins</groupId>
Expand All @@ -56,7 +74,10 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
</plugin>

<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

Expand Down
Loading
Loading