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

IDEMPIERE-2910:update.sh run with issue 

remove version in plug-in, use cquery to control
remove this plugin because just use in eclipse launch:org.apache.felix.webconsole.plugins.memoryusage
remove this plub-in because useless:org.apache.felix.webconsole.plugins.packageadmin
This commit is contained in:
hieplq 2015-11-10 17:07:12 +07:00
parent f5da9f0721
commit 4b9b980fb3
14 changed files with 40 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/artifacts.xml
View File

@ -1,22 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<?artifactRepository version='1.1.0'?>
<repository name='idempiere local repository - artifacts' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1'>
<properties size='2'>
<property name='p2.timestamp' value='1410940772016'/>
<property name='p2.compressed' value='false'/>
</properties>
<mappings size='3'>
<rule filter='(&amp; (classifier=osgi.bundle))' output='${repoUrl}/plugins/${id}_${version}.jar'/>
<rule filter='(&amp; (classifier=binary))' output='${repoUrl}/binary/${id}_${version}'/>
<rule filter='(&amp; (classifier=org.eclipse.update.feature))' output='${repoUrl}/features/${id}_${version}.jar'/>
</mappings>
<artifacts size='1'>
<artifact classifier='osgi.bundle' id='org.apache.felix.webconsole.plugins.packageadmin' version='1.0.0.1'>
<properties size='3'>
<property name='artifact.size' value='27244'/>
<property name='download.size' value='27244'/>
<property name='download.md5' value='12db1250ba0e1ee705771d8ce293ce52'/>
</properties>
</artifact>
</artifacts>
</repository>

45
lib/content.xml
View File

@ -1,45 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<?metadataRepository version='1.1.0'?>
<repository name='idempiere local repository - metadata' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1'>
<properties size='2'>
<property name='p2.timestamp' value='1410940772018'/>
<property name='p2.compressed' value='false'/>
</properties>
<units size='1'>
<unit id='org.apache.felix.webconsole.plugins.packageadmin' version='1.0.0.1' singleton='false'>
<update id='org.apache.felix.webconsole.plugins.packageadmin' range='[0.0.0,1.0.0.1)' severity='0'/>
<properties size='4'>
<property name='org.eclipse.equinox.p2.name' value='Apache Felix Web Console Package Admin Service Plugin'/>
<property name='org.eclipse.equinox.p2.description' value='Plugin providing support to query the Package Admin service for various details; e.g. finding duplicate package exports or finding bundles exporting given packages'/>
<property name='org.eclipse.equinox.p2.provider' value='The Apache Software Foundation'/>
<property name='org.eclipse.equinox.p2.doc.url' value='http://www.apache.org/'/>
</properties>
<provides size='3'>
<provided namespace='org.eclipse.equinox.p2.iu' name='org.apache.felix.webconsole.plugins.packageadmin' version='1.0.0.1'/>
<provided namespace='osgi.bundle' name='org.apache.felix.webconsole.plugins.packageadmin' version='1.0.0.1'/>
<provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
</provides>
<requires size='8'>
<required namespace='java.package' name='javax.servlet' range='0.0.0'/>
<required namespace='java.package' name='javax.servlet.http' range='0.0.0'/>
<required namespace='java.package' name='org.apache.commons.io' range='[1.4.0,3.0.0)'/>
<required namespace='java.package' name='org.apache.felix.webconsole' range='[3.1.0,4.0.0)'/>
<required namespace='java.package' name='org.json' range='0.0.0'/>
<required namespace='java.package' name='org.osgi.framework' range='[1.3.0,2.0.0)'/>
<required namespace='java.package' name='org.osgi.service.packageadmin' range='[1.2.0,2.0.0)'/>
<required namespace='java.package' name='org.osgi.util.tracker' range='[1.3.0,2.0.0)'/>
</requires>
<artifacts size='1'>
<artifact classifier='osgi.bundle' id='org.apache.felix.webconsole.plugins.packageadmin' version='1.0.0.1'/>
</artifacts>
<touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
<touchpointData size='1'>
<instructions size='1'>
<instruction key='manifest'>
Bundle-SymbolicName: org.apache.felix.webconsole.plugins.packageadmin&#xA;Bundle-Version: 1.0.0.1&#xA;
</instruction>
</instructions>
</touchpointData>
</unit>
</units>
</repository>

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

@ -117,7 +117,7 @@
id="org.eclipse.jetty.osgi-servlet-api"
download-size="0"
install-size="0"
version="3.1.0.M0"
version="0.0.0"
unpack="false"/>
<plugin

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

@ -19,7 +19,7 @@
<cq:advisorNode namePattern="^org\.apache\.xml\.resolver$" componentType="osgi.bundle" versionOverride="[1.2.0,1.3.0)"/>
<cq:advisorNode namePattern="^org\.apache\.xerces$" componentType="osgi.bundle" versionOverride="[2.9.0,2.9.1)"/>
<cq:advisorNode namePattern="^org\.apache\.xml\.serializer$" componentType="osgi.bundle" versionOverride="[2.7.1,2.7.2)"/>
<cq:advisorNode namePattern="^org\.apache\.felix\.webconsole$" versionOverride="[4.2.2,4.2.2]"/>
<cq:advisorNode namePattern="^org\.apache\.felix\.webconsole$" versionOverride="[4.2.2,4.3.0)"/>
<cq:advisorNode namePattern="^org\.objectweb(\..+)?" componentType="osgi.bundle" versionOverride="[5.0.1,5.0.1]"/>
<cq:advisorNode namePattern="^javax\.jms$" componentType="osgi.bundle" versionOverride="[1.1.0,1.1.1)"/>
<cq:advisorNode namePattern="^javax\.ejb$" componentType="osgi.bundle" versionOverride="[3.1.1,3.1.2)"/>
@ -30,4 +30,7 @@
<cq:advisorNode namePattern="^org\.apache\.servicemix\.bundles\.cglib$" componentType="osgi.bundle" versionOverride="raw:[3.1.0.'1',3.1.0.'1']/format(n[.n=0;[.n=0;]][d?S=M;]):3.1_1,3.1_1"/>
<cq:advisorNode namePattern="^org\.eclipse\.jetty\.osgi-servlet-api$" versionOverride="[3.1.0.M0,3.1.0.M0]"/>
<cq:advisorNode namePattern="^org\.eclipse\.jetty(\..+)?" versionOverride="[9.2.0,9.3.0)"/>
<cq:advisorNode namePattern="^javax\.annotation-api$" versionOverride="[1.2.0,1.2.0]"/>
<cq:advisorNode namePattern="^org\.apache\.felix\.webconsole\.plugins\.packageadmin$" versionOverride="[1.0.0,1.0.0]"/>
<cq:advisorNode namePattern="org.apache.commons.io" componentType="osgi.bundle" versionOverride="[1.4.0,2.0.0)"/>
</cq:componentQuery>

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<rm:rmap xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0" xmlns:maven="http://www.eclipse.org/buckminster/MavenProvider-1.0" xmlns:rm="http://www.eclipse.org/buckminster/RMap-1.0">
<rm:locator pattern="^org\.apache\.felix\.webconsole\.plugins\.packageadmin$" searchPathRef="workspace.bundle"/>
<rm:locator pattern="^org\.apache\.felix\.webconsole\.plugins\.packageadmin$" searchPathRef="bundles.maven"/>
<rm:locator pattern="^org\.idempiere\.hazelcast\.service$" searchPathRef="workspace.feature" failOnError="false"/>
<rm:locator pattern="^org\.idempiere\.hazelcast\.service$" searchPathRef="workspace.project"/>
<rm:locator pattern="^org\.apache\.poi$" searchPathRef="orbit"/>
@ -75,7 +75,7 @@
<rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">
<rm:property key="buckminster.source" value="false"/>
<rm:property key="buckminster.mutable" value="false"/>
<rm:uri format="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/"/>
<rm:uri format="http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/"/>
</rm:provider>
</rm:searchPath>
<rm:searchPath name="restlet.maven">
@ -121,6 +121,7 @@
<maven:entry artifactId="org.apache.felix.webconsole.plugins.ds" groupId="org.apache.felix" name="org.apache.felix.webconsole.plugins.ds"/>
<maven:entry artifactId="org.apache.felix.webconsole.plugins.memoryusage" groupId="org.apache.felix" name="org.apache.felix.webconsole.plugins.memoryusage"/>
<maven:entry artifactId="org.apache.felix.inventory" groupId="org.apache.felix" name="org.apache.felix.inventory"/>
<maven:entry artifactId="org.apache.felix.webconsole.plugins.packageadmin" groupId="org.apache.felix" name="org.apache.felix.webconsole.plugins.packageadmin"/>
</maven:mappings>
</rm:provider>
</rm:searchPath>

23
org.adempiere.server-feature/feature.xml
View File

@ -117,7 +117,7 @@
id="javax.annotation-api"
download-size="0"
install-size="0"
version="1.2.0"
version="0.0.0"
unpack="false"/>
<plugin
@ -252,27 +252,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.felix.webconsole"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.felix.webconsole.plugins.memoryusage"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.felix.webconsole.plugins.packageadmin"
download-size="0"
install-size="0"
version="1.0.0.1"
unpack="false"/>
<plugin
id="org.json"
download-size="0"

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

@ -51,7 +51,6 @@
<plugin id="org.adempiere.webstore" autoStart="true" startLevel="4" />
<plugin id="org.apache.aries.spifly.dynamic.bundle" autoStart="true" startLevel="2" />
<plugin id="org.apache.felix.webconsole" autoStart="true" startLevel="0" />
<plugin id="org.apache.felix.webconsole.plugins.packageadmin" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
<plugin id="org.eclipse.equinox.cm" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />

2
org.adempiere.server-feature/server.product.functionaltest.launch
View File

File diff suppressed because one or more lines are too long

2
org.adempiere.server-feature/server.product.launch
View File

File diff suppressed because one or more lines are too long

2
org.adempiere.server-feature/setup/configuration/config.ini
View File

@ -1,4 +1,4 @@
osgi.framework=file\:../plugins/org.eclipse.osgi_3.10.1.v20140909-1633.jar
osgi.framework=file\:../plugins/org.eclipse.osgi_3.10.2.v20150203-1939.jar
osgi.install.area=setup
equinox.use.ds=true
osgi.bundles=org.eclipse.equinox.ds@1:start,\

34
org.adempiere.target.platform-feature/feature.xml
View File

@ -19,18 +19,18 @@
<includes
id="org.eclipse.equinox.executable"
version="3.6.100.v20140819-1617"
version="0.0.0"
os="linux,macosx,win32"
ws="cocoa,gtk,win32"
arch="x86,x86_64"/>
<includes
id="org.eclipse.equinox.server.core"
version="1.3.0.v20140909-1633"/>
version="0.0.0"/>
<includes
id="org.eclipse.equinox.server.p2"
version="1.2.100.v20140606-1602"/>
version="0.0.0"/>
<includes
id="org.adempiere.bundles.external"
@ -38,11 +38,11 @@
<includes
id="org.eclipse.ecf.core.feature"
version="1.1.0.v20140827-1444"/>
version="0.0.0"/>
<includes
id="org.eclipse.ecf.core.ssl.feature"
version="1.0.0.v20140827-1444"/>
version="0.0.0"/>
<includes
id="org.eclipse.osgi.compatibility.plugins.feature"
@ -52,83 +52,83 @@
id="javax.xml"
download-size="0"
install-size="0"
version="1.3.4.v201005080400"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.ant"
download-size="0"
install-size="0"
version="1.9.2.v201404171502"/>
version="0.0.0"/>
<plugin
id="org.eclipse.core.contenttype"
download-size="0"
install-size="0"
version="3.4.200.v20140207-1251"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.core.runtime"
download-size="0"
install-size="0"
version="3.10.0.v20140318-2214"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.equinox.p2.director.app"
download-size="0"
install-size="0"
version="1.0.300.v20140228-1829"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.equinox.p2.publisher"
download-size="0"
install-size="0"
version="1.3.0.v20140911-0143"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ant.core"
download-size="0"
install-size="0"
version="3.3.0.v20140518-0042"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.core.variables"
download-size="0"
install-size="0"
version="3.2.800.v20130819-1716"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.felix.gogo.command"
download-size="0"
install-size="0"
version="0.10.0.v201209301215"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.felix.gogo.runtime"
download-size="0"
install-size="0"
version="0.10.0.v201209301036"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.felix.gogo.shell"
download-size="0"
install-size="0"
version="0.10.0.v201212101605"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.equinox.console"
download-size="0"
install-size="0"
version="1.1.0.v20140131-1639"
version="0.0.0"
unpack="false"/>
</feature>

2
org.idempiere.eclipse.platform-feature/director/configuration/config.ini
View File

@ -1,4 +1,4 @@
osgi.framework=file\:../plugins/org.eclipse.osgi_3.10.1.v20140909-1633.jar
osgi.framework=file\:../plugins/org.eclipse.osgi_3.10.2.v20150203-1939.jar
osgi.install.area=director
equinox.use.ds=true
osgi.bundles=org.eclipse.core.net@start,\

20
org.idempiere.eclipse.platform-feature/feature.xml
View File

@ -31,32 +31,32 @@
<includes
id="org.eclipse.ecf.core.feature"
version="1.1.0.v20140827-1444"/>
version="0.0.0"/>
<includes
id="org.eclipse.ecf.core.ssl.feature"
version="1.0.0.v20140827-1444"/>
version="0.0.0"/>
<includes
id="org.eclipse.ecf.filetransfer.feature"
version="3.9.0.v20140827-1444"/>
version="0.0.0"/>
<includes
id="org.eclipse.ecf.filetransfer.httpclient4.feature"
version="3.9.1.v20140827-1444"/>
version="0.0.0"/>
<includes
id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"
version="1.0.0.v20140827-1444"/>
version="0.0.0"/>
<includes
id="org.eclipse.ecf.filetransfer.ssl.feature"
version="1.0.0.v20140827-1444"/>
version="0.0.0"/>
<includes
id="org.eclipse.osgi.compatibility.plugins.feature"
version="0.0.0"/>
<plugin
id="org.eclipse.core.runtime"
download-size="0"
@ -162,21 +162,21 @@
id="org.apache.felix.gogo.command"
download-size="0"
install-size="0"
version="0.10.0.v201209301215"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.felix.gogo.runtime"
download-size="0"
install-size="0"
version="0.10.0.v201209301036"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.felix.gogo.shell"
download-size="0"
install-size="0"
version="0.10.0.v201212101605"
version="0.0.0"
unpack="false"/>
</feature>

14
org.idempiere.felix.webconsole-feature/feature.xml
View File

@ -23,20 +23,6 @@
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.felix.webconsole.plugins.memoryusage"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.apache.felix.webconsole.plugins.packageadmin"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.idempiere.felix.webconsole"
download-size="0"