midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-3531:avoid dupplicate of bundle id 

correct relative files
This commit is contained in:
hieplq 2018-01-30 14:42:03 +07:00
parent 073d0a7ddf
commit 7ceadfafed
23 changed files with 46 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.payment.processor-feature/feature.xml
View File

@ -17,7 +17,7 @@
</license> </license>
<requires> <requires>
<import feature="org.adempiere.base" version="0.0.0"/> <import feature="org.adempiere.base.feature" version="0.0.0"/>
</requires> </requires>
<plugin <plugin

2
org.adempiere.pipo-feature/feature.xml
View File

@ -17,7 +17,7 @@
</license> </license>
<requires> <requires>
<import feature="org.adempiere.base" version="0.0.0"/> <import feature="org.adempiere.base.feature" version="0.0.0"/>
</requires> </requires>
<plugin <plugin

2
org.adempiere.replication-feature/feature.xml
View File

@ -17,7 +17,7 @@
</license> </license>
<requires> <requires>
<import feature="org.adempiere.base" version="0.0.0"/> <import feature="org.adempiere.base.feature" version="0.0.0"/>
</requires> </requires>
<plugin <plugin

2
org.adempiere.sdk-feature/adempiere.cquery
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?><cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="adempiere.rmap" properties="materialize.properties"> <?xml version="1.0" encoding="UTF-8"?><cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="adempiere.rmap" properties="materialize.properties">
<cq:rootRequest name="org.adempiere.sdk" componentType="eclipse.feature"/> <cq:rootRequest name="org.adempiere.sdk.feature" componentType="eclipse.feature"/>
<cq:property key="buckminster.download.source" value="true"/> <cq:property key="buckminster.download.source" value="true"/>
<cq:property key="osgi.configuration.area.default" value="configuration"/> <cq:property key="osgi.configuration.area.default" value="configuration"/>
<cq:property key="osgi.user.area" value="${user.home}"/> <cq:property key="osgi.user.area" value="${user.home}"/>

5
org.adempiere.sdk-feature/adempiere.rmap
View File

@ -108,9 +108,12 @@
</rm:searchPath> </rm:searchPath>
<rm:searchPath name="workspace.feature"> <rm:searchPath name="workspace.feature">
<rm:provider componentTypes="eclipse.feature" readerType="local"> <rm:provider componentTypes="eclipse.feature" readerType="local">
<rm:uri format="{0}/{1}-feature"> <rm:uri format="{0}/{1}">
<bc:propertyRef key="workspace.root"/> <bc:propertyRef key="workspace.root"/>
<bc:replace pattern=".feature" replacement="-feature">
<bc:propertyRef key="buckminster.component"/> <bc:propertyRef key="buckminster.component"/>
</bc:replace>
</rm:uri> </rm:uri>
</rm:provider> </rm:provider>
</rm:searchPath> </rm:searchPath>

9
org.adempiere.server-feature/buckminster.cspex
View File

@ -5,8 +5,8 @@
xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"> xmlns="http://www.eclipse.org/buckminster/CSpec-1.0">
<dependencies> <dependencies>
<!-- Place your Dependencies here --> <!-- Place your Dependencies here -->
<dependency name="org.idempiere.equinox.p2.director" componentType="eclipse.feature"/> <dependency name="org.idempiere.equinox.p2.director.feature" componentType="eclipse.feature"/>
<dependency name="org.idempiere.fitnesse" componentType="eclipse.feature"/> <dependency name="org.idempiere.fitnesse.feature" componentType="eclipse.feature"/>
<dependency name="org.idempiere.fitnesse.fixture" componentType="osgi.bundle"/> <dependency name="org.idempiere.fitnesse.fixture" componentType="osgi.bundle"/>
<dependency name="org.idempiere.fitnesse.server" componentType="osgi.bundle"/> <dependency name="org.idempiere.fitnesse.server" componentType="osgi.bundle"/>
<dependency name="org.idempiere.fitrecorder" componentType="osgi.bundle"/> <dependency name="org.idempiere.fitrecorder" componentType="osgi.bundle"/>
@ -76,13 +76,12 @@
<public name="bundle.jars"> <public name="bundle.jars">
<attribute name="bundle.jars" component="org.idempiere.fitnesse.fixture"/> <attribute name="bundle.jars" component="org.idempiere.fitnesse.fixture"/>
<attribute name="bundle.jars" component="org.idempiere.fitnesse.server"/> <attribute name="bundle.jars" component="org.idempiere.fitnesse.server"/>
<attribute name="bundle.jars" component="org.idempiere.fitnesse"/>
<attribute name="bundle.jars" component="org.idempiere.fitrecorder"/> <attribute name="bundle.jars" component="org.idempiere.fitrecorder"/>
<attribute name="bundle.jars" component="org.idempiere.ui.zk.selenium"/> <attribute name="bundle.jars" component="org.idempiere.ui.zk.selenium"/>
</public> </public>
<public name="feature.references"> <public name="feature.references">
<attribute name="feature.jars" component="org.idempiere.equinox.p2.director"/> <attribute name="feature.jars" component="org.idempiere.equinox.p2.director.feature"/>
<attribute name="feature.jars" component="org.idempiere.fitnesse"/> <attribute name="feature.jars" component="org.idempiere.fitnesse.feature"/>
</public> </public>
</alterGroups> </alterGroups>
</cspecExtension> </cspecExtension>

2
org.adempiere.server-feature/buckminster.properties
View File

@ -10,7 +10,7 @@ target.os=*
target.ws=* target.ws=*
target.arch=* target.arch=*
product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group product.features=org.idempiere.fitnesse.feature.feature.group, org.idempiere.equinox.p2.director.feature.feature.group
product.profile=DefaultProfile product.profile=DefaultProfile
product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director

2
org.adempiere.server-feature/buckminster_linux_gtk_x86.properties
View File

@ -10,7 +10,7 @@ target.os=linux
target.ws=gtk target.ws=gtk
target.arch=x86 target.arch=x86
product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group product.features=org.idempiere.fitnesse.feature.feature.group, org.idempiere.equinox.p2.director.feature.feature.group
product.profile=DefaultProfile product.profile=DefaultProfile
product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director

2
org.adempiere.server-feature/buckminster_linux_gtk_x86_64.properties
View File

@ -10,7 +10,7 @@ target.os=linux
target.ws=gtk target.ws=gtk
target.arch=x86_64 target.arch=x86_64
product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group product.features=org.idempiere.fitnesse.feature.feature.group, org.idempiere.equinox.p2.director.feature.feature.group
product.profile=DefaultProfile product.profile=DefaultProfile
product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director

2
org.adempiere.server-feature/buckminster_macosx_x86.properties
View File

@ -10,7 +10,7 @@ target.os=macosx
target.ws=cocoa target.ws=cocoa
target.arch=x86 target.arch=x86
product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group product.features=org.idempiere.fitnesse.feature.feature.group, org.idempiere.equinox.p2.director.feature.feature.group
product.profile=DefaultProfile product.profile=DefaultProfile
product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director

2
org.adempiere.server-feature/buckminster_solaris_gtk_x86.properties
View File

@ -10,7 +10,7 @@ target.os=solaris
target.ws=gtk target.ws=gtk
target.arch=x86 target.arch=x86
product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group product.features=org.idempiere.fitnesse.feature.feature.group, org.idempiere.equinox.p2.director.feature.feature.group
product.profile=DefaultProfile product.profile=DefaultProfile
product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director

2
org.adempiere.server-feature/buckminster_win32_x86.properties
View File

@ -10,7 +10,7 @@ target.os=win32
target.ws=win32 target.ws=win32
target.arch=x86 target.arch=x86
product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group product.features=org.idempiere.fitnesse.feature.feature.group, org.idempiere.equinox.p2.director.feature.feature.group
product.profile=DefaultProfile product.profile=DefaultProfile
product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director

2
org.adempiere.server-feature/buckminster_win32_x86_64.properties
View File

@ -10,7 +10,7 @@ target.os=win32
target.ws=win32 target.ws=win32
target.arch=x86_64 target.arch=x86_64
product.features=org.idempiere.fitnesse.feature.group, org.idempiere.equinox.p2.director.feature.group product.features=org.idempiere.fitnesse.feature.feature.group, org.idempiere.equinox.p2.director.feature.feature.group
product.profile=DefaultProfile product.profile=DefaultProfile
product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director product.id=org.adempiere.server.product, org.eclipse.equinox.p2.director

10
org.adempiere.server-feature/server.product
View File

@ -3,6 +3,7 @@
<product name="iDempiere Server" uid="org.adempiere.server.product" id="org.adempiere.server.server_product" application="org.adempiere.server.application" version="5.1.0.qualifier" useFeatures="true" includeLaunchers="true"> <product name="iDempiere Server" uid="org.adempiere.server.product" id="org.adempiere.server.server_product" application="org.adempiere.server.application" version="5.1.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default"> <configIni use="default">
</configIni> </configIni>
@ -17,23 +18,26 @@
<windowImages/> <windowImages/>
<launcher name="idempiere"> <launcher name="idempiere">
<win useIco="false"> <win useIco="false">
<bmp/> <bmp/>
</win> </win>
</launcher> </launcher>
<vm> <vm>
<linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</linux> <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</linux>
</vm> </vm>
<plugins> <plugins>
</plugins> </plugins>
<features> <features>
<feature id="org.adempiere.server"/> <feature id="org.adempiere.server.feature"/>
<feature id="org.adempiere.target.platform"/> <feature id="org.adempiere.target.platform.feature"/>
<feature id="org.idempiere.eclipse.platform"/> <feature id="org.idempiere.eclipse.platform.feature"/>
</features> </features>
<configurations> <configurations>

7
org.adempiere.ui.swing-feature/buckminster.cspex
View File

@ -5,7 +5,7 @@
xmlns="http://www.eclipse.org/buckminster/CSpec-1.0"> xmlns="http://www.eclipse.org/buckminster/CSpec-1.0">
<dependencies> <dependencies>
<!-- Place your Dependencies here --> <!-- Place your Dependencies here -->
<dependency name="org.idempiere.eclipse.platform" componentType="eclipse.feature"/> <dependency name="org.idempiere.eclipse.platform.feature" componentType="eclipse.feature"/>
</dependencies> </dependencies>
<generators> <generators>
<!-- Place your Generators here --> <!-- Place your Generators here -->
@ -57,11 +57,8 @@
<!-- Place your Action alterations here --> <!-- Place your Action alterations here -->
</alterActions> </alterActions>
<alterGroups> <alterGroups>
<public name="bundle.jars">
<attribute name="bundle.jars" component="org.idempiere.eclipse.platform"/>
</public>
<public name="feature.references"> <public name="feature.references">
<attribute name="feature.jars" component="org.idempiere.eclipse.platform"/> <attribute name="feature.jars" component="org.idempiere.eclipse.platform.feature"/>
</public> </public>
</alterGroups> </alterGroups>
</cspecExtension> </cspecExtension>

2
org.adempiere.ui.swing-feature/buckminster.properties
View File

@ -10,6 +10,6 @@ target.os=*
target.ws=* target.ws=*
target.arch=* target.arch=*
product.features=org.idempiere.eclipse.platform.feature.group product.features=org.idempiere.eclipse.platform.feature.feature.group
product.profile=DefaultProfile product.profile=DefaultProfile
product.id=org.adempiere.ui.swing.product product.id=org.adempiere.ui.swing.product

2
org.adempiere.ui.swing-feature/buckminster_linux_gtk_x86.properties
View File

@ -10,6 +10,6 @@ target.os=linux
target.ws=gtk target.ws=gtk
target.arch=x86 target.arch=x86
product.features=org.idempiere.eclipse.platform.feature.group product.features=org.idempiere.eclipse.platform.feature.feature.group
product.profile=DefaultProfile product.profile=DefaultProfile
product.id=org.adempiere.ui.swing.product product.id=org.adempiere.ui.swing.product

2
org.adempiere.ui.swing-feature/buckminster_linux_gtk_x86_64.properties
View File

@ -10,6 +10,6 @@ target.os=linux
target.ws=gtk target.ws=gtk
target.arch=x86_64 target.arch=x86_64
product.features=org.idempiere.eclipse.platform.feature.group product.features=org.idempiere.eclipse.platform.feature.feature.group
product.profile=DefaultProfile product.profile=DefaultProfile
product.id=org.adempiere.ui.swing.product product.id=org.adempiere.ui.swing.product

2
org.adempiere.ui.swing-feature/buckminster_macosx_x86.properties
View File

@ -10,6 +10,6 @@ target.os=macosx
target.ws=cocoa target.ws=cocoa
target.arch=x86 target.arch=x86
product.features=org.idempiere.eclipse.platform.feature.group product.features=org.idempiere.eclipse.platform.feature.feature.group
product.profile=DefaultProfile product.profile=DefaultProfile
product.id=org.adempiere.ui.swing.product product.id=org.adempiere.ui.swing.product

2
org.adempiere.ui.swing-feature/buckminster_solaris_gtk_x86.properties
View File

@ -10,6 +10,6 @@ target.os=solaris
target.ws=gtk target.ws=gtk
target.arch=x86 target.arch=x86
product.features=org.idempiere.eclipse.platform.feature.group product.features=org.idempiere.eclipse.platform.feature.feature.group
product.profile=DefaultProfile product.profile=DefaultProfile
product.id=org.adempiere.ui.swing.product product.id=org.adempiere.ui.swing.product

2
org.adempiere.ui.swing-feature/buckminster_win32_x86.properties
View File

@ -10,6 +10,6 @@ target.os=win32
target.ws=win32 target.ws=win32
target.arch=x86 target.arch=x86
product.features=org.idempiere.eclipse.platform.feature.group product.features=org.idempiere.eclipse.platform.feature.feature.group
product.profile=DefaultProfile product.profile=DefaultProfile
product.id=org.adempiere.ui.swing.product product.id=org.adempiere.ui.swing.product

18
org.adempiere.ui.swing-feature/swingclient.product
View File

@ -7,13 +7,15 @@
</configIni> </configIni>
<launcherArgs> <launcherArgs>
<programArgs>--launcher.XXMaxPermSize 192m</programArgs> <programArgs>--launcher.XXMaxPermSize 192m
<vmArgs>-Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true</vmArgs> </programArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac> <vmArgs>-Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dosgi.compatibility.bootdelegation=true
</vmArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
</vmArgsMac>
</launcherArgs> </launcherArgs>
<launcher name="adempiere-client"> <launcher name="adempiere-client">
<solaris/>
<win useIco="false"> <win useIco="false">
<bmp/> <bmp/>
</win> </win>
@ -26,10 +28,10 @@
</plugins> </plugins>
<features> <features>
<feature id="org.adempiere.base" version="5.1.0.qualifier"/> <feature id="org.adempiere.base.feature" version="5.1.0.qualifier"/>
<feature id="org.adempiere.ui.swing" version="5.1.0.qualifier"/> <feature id="org.adempiere.pipo.feature" version="5.1.0.qualifier"/>
<feature id="org.idempiere.hazelcast.service" version="5.1.0.qualifier"/> <feature id="org.adempiere.ui.swing.feature" version="5.1.0.qualifier"/>
<feature id="org.adempiere.pipo" version="5.1.0.qualifier"/> <feature id="org.idempiere.hazelcast.service.feature" version="5.1.0.qualifier"/>
</features> </features>
<configurations> <configurations>

2
org.compiere.db.provider-feature/feature.xml
View File

@ -17,7 +17,7 @@
</license> </license>
<requires> <requires>
<import feature="org.adempiere.base" version="0.0.0"/> <import feature="org.adempiere.base.feature" version="0.0.0"/>
</requires> </requires>
<plugin <plugin