From 2f8adb48c99807d3e941ac4d111247cdcad42201 Mon Sep 17 00:00:00 2001
From: hengsin <hengsin@gmail.com>
Date: Sat, 18 Sep 2021 15:36:50 +0800
Subject: [PATCH] IDEMPIERE-4842 Easier model registration (#887)

- Temporary disable AnnotationBasedModelFactory until getSubclasses()
doesn't work for subclass from different package is resolve.
---
 .../org.adempiere.base.AnnotationBasedModelFactory.xml         | 2 +-
 org.adempiere.base/build.properties                            | 3 ++-
 .../src/org/adempiere/base/AnnotationBasedModelFactory.java    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/org.adempiere.base/OSGI-INF/org.adempiere.base.AnnotationBasedModelFactory.xml b/org.adempiere.base/OSGI-INF/org.adempiere.base.AnnotationBasedModelFactory.xml
index 1e35a49785..9a28712678 100644
--- a/org.adempiere.base/OSGI-INF/org.adempiere.base.AnnotationBasedModelFactory.xml
+++ b/org.adempiere.base/OSGI-INF/org.adempiere.base.AnnotationBasedModelFactory.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate" immediate="true" name="org.adempiere.base.AnnotationBasedModelFactory">
-   <property name="service.ranking" type="Integer" value="1"/>
+   <property name="service.ranking" type="Integer" value="-1"/>
    <service>
       <provide interface="org.adempiere.base.IModelFactory"/>
    </service>
diff --git a/org.adempiere.base/build.properties b/org.adempiere.base/build.properties
index fc7c615c96..56ff8ad77e 100644
--- a/org.adempiere.base/build.properties
+++ b/org.adempiere.base/build.properties
@@ -9,5 +9,6 @@ bin.includes = plugin.xml,\
                lib/cron4j.jar,\
                lib/classindex.jar
 src.includes = schema/
-source.. = src/
+source.. = src/,\
+           .apt_generated/
 output.. = target/classes/
diff --git a/org.adempiere.base/src/org/adempiere/base/AnnotationBasedModelFactory.java b/org.adempiere.base/src/org/adempiere/base/AnnotationBasedModelFactory.java
index 602ad40cf7..7d2fdc9fa8 100644
--- a/org.adempiere.base/src/org/adempiere/base/AnnotationBasedModelFactory.java
+++ b/org.adempiere.base/src/org/adempiere/base/AnnotationBasedModelFactory.java
@@ -27,7 +27,7 @@ import org.osgi.service.component.annotations.Component;
  * discovery using SPI is preferred over reflection-based methods.
  * @author Saulo Gil
  */
-@Component(immediate = true, service = IModelFactory.class, property = {"service.ranking:Integer=1"})
+@Component(immediate = true, service = IModelFactory.class, property = {"service.ranking:Integer=-1"})
 public class AnnotationBasedModelFactory extends AbstractModelFactory implements IModelFactory
 {