Buckminster import - Use p2 reader instead of local file reader for the resolution of local bundle.

This commit is contained in:
Heng Sin Low 2012-11-21 16:50:10 +08:00
parent 86eb3d32fa
commit f0cac5bd82
5 changed files with 211 additions and 14 deletions

36
lib/artifacts.xml Normal file
View File

@ -0,0 +1,36 @@
<?xml version='1.0' encoding='UTF-8'?>
<?artifactRepository version='1.1.0'?>
<repository name='file:/home/hengsin/workspace/idempiere-trekglobal/lib/ - artifacts' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1'>
<properties size='2'>
<property name='p2.timestamp' value='1353402021279'/>
<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='3'>
<artifact classifier='osgi.bundle' id='org.apache.poi' version='3.7.0'>
<properties size='3'>
<property name='artifact.size' value='1651480'/>
<property name='download.size' value='1651480'/>
<property name='download.md5' value='982062b95e5299e63d25de5144f5b136'/>
</properties>
</artifact>
<artifact classifier='osgi.bundle' id='com.springsource.javax.mail' version='1.4.5'>
<properties size='3'>
<property name='artifact.size' value='570498'/>
<property name='download.size' value='570498'/>
<property name='download.md5' value='a867863806ddab9b8cecd115fe56159c'/>
</properties>
</artifact>
<artifact classifier='osgi.bundle' id='com.springsource.javax.activation' version='1.1.1'>
<properties size='3'>
<property name='artifact.size' value='12359'/>
<property name='download.size' value='12359'/>
<property name='download.md5' value='4ffafe635551f1f1096dffc01a7e0c50'/>
</properties>
</artifact>
</artifacts>
</repository>

167
lib/content.xml Normal file
View File

@ -0,0 +1,167 @@
<?xml version='1.0' encoding='UTF-8'?>
<?metadataRepository version='1.1.0'?>
<repository name='file:/home/hengsin/workspace/idempiere-trekglobal/lib/ - metadata' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1'>
<properties size='2'>
<property name='p2.timestamp' value='1353402021281'/>
<property name='p2.compressed' value='false'/>
</properties>
<units size='3'>
<unit id='com.springsource.javax.mail' version='1.4.5' singleton='false'>
<update id='com.springsource.javax.mail' range='[0.0.0,1.4.5)' severity='0'/>
<properties size='4'>
<property name='org.eclipse.equinox.p2.name' value='Java Mail'/>
<property name='org.eclipse.equinox.p2.description' value='JavaMail API (compat)'/>
<property name='org.eclipse.equinox.p2.provider' value='SpringSource'/>
<property name='org.eclipse.equinox.p2.doc.url' value='http://www.oracle.com'/>
</properties>
<provides size='18'>
<provided namespace='org.eclipse.equinox.p2.iu' name='com.springsource.javax.mail' version='1.4.5'/>
<provided namespace='osgi.bundle' name='com.springsource.javax.mail' version='1.4.5'/>
<provided namespace='java.package' name='com.sun.mail.auth' version='1.4.5'/>
<provided namespace='java.package' name='com.sun.mail.handlers' version='1.4.5'/>
<provided namespace='java.package' name='com.sun.mail.iap' version='1.4.5'/>
<provided namespace='java.package' name='com.sun.mail.imap' version='1.4.5'/>
<provided namespace='java.package' name='com.sun.mail.imap.protocol' version='1.4.5'/>
<provided namespace='java.package' name='com.sun.mail.pop3' version='1.4.5'/>
<provided namespace='java.package' name='com.sun.mail.smtp' version='1.4.5'/>
<provided namespace='java.package' name='com.sun.mail.util' version='1.4.5'/>
<provided namespace='java.package' name='com.sun.mail.util.logging' version='1.4.5'/>
<provided namespace='java.package' name='javax.mail' version='1.4.5'/>
<provided namespace='java.package' name='javax.mail.event' version='1.4.5'/>
<provided namespace='java.package' name='javax.mail.internet' version='1.4.5'/>
<provided namespace='java.package' name='javax.mail.search' version='1.4.5'/>
<provided namespace='java.package' name='javax.mail.util' version='1.4.5'/>
<provided namespace='java.package' name='javax.activation' version='1.1.1'/>
<provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
</provides>
<requires size='9'>
<required namespace='java.package' name='javax.crypto' range='0.0.0'/>
<required namespace='java.package' name='javax.crypto.spec' range='0.0.0'/>
<required namespace='java.package' name='javax.net' range='0.0.0'/>
<required namespace='java.package' name='javax.net.ssl' range='0.0.0'/>
<required namespace='java.package' name='javax.security.auth.callback' range='0.0.0'/>
<required namespace='java.package' name='javax.security.auth.x500' range='0.0.0'/>
<required namespace='java.package' name='javax.security.sasl' range='0.0.0'/>
<required namespace='java.package' name='javax.xml.transform' range='0.0.0'/>
<required namespace='java.package' name='javax.xml.transform.stream' range='0.0.0'/>
</requires>
<artifacts size='1'>
<artifact classifier='osgi.bundle' id='com.springsource.javax.mail' version='1.4.5'/>
</artifacts>
<touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
<touchpointData size='1'>
<instructions size='1'>
<instruction key='manifest'>
Bundle-SymbolicName: com.springsource.javax.mail&#xA;Bundle-Version: 1.4.5&#xA;
</instruction>
</instructions>
</touchpointData>
</unit>
<unit id='com.springsource.javax.activation' version='1.1.1' singleton='false'>
<update id='com.springsource.javax.activation' range='[0.0.0,1.1.1)' severity='0'/>
<properties size='2'>
<property name='org.eclipse.equinox.p2.name' value='Java Activation API'/>
<property name='org.eclipse.equinox.p2.provider' value='SpringSource'/>
</properties>
<provides size='3'>
<provided namespace='org.eclipse.equinox.p2.iu' name='com.springsource.javax.activation' version='1.1.1'/>
<provided namespace='osgi.bundle' name='com.springsource.javax.activation' version='1.1.1'/>
<provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
</provides>
<artifacts size='1'>
<artifact classifier='osgi.bundle' id='com.springsource.javax.activation' version='1.1.1'/>
</artifacts>
<touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
<touchpointData size='1'>
<instructions size='1'>
<instruction key='manifest'>
Bundle-SymbolicName: com.springsource.javax.activation&#xA;Bundle-Version: 1.1.1&#xA;
</instruction>
</instructions>
</touchpointData>
</unit>
<unit id='org.apache.poi' version='3.7.0' singleton='false'>
<update id='org.apache.poi' range='[0.0.0,3.7.0)' severity='0'/>
<properties size='2'>
<property name='org.eclipse.equinox.p2.name' value='Apache POI'/>
<property name='org.eclipse.equinox.p2.provider' value='Apache'/>
</properties>
<provides size='50'>
<provided namespace='org.eclipse.equinox.p2.iu' name='org.apache.poi' version='3.7.0'/>
<provided namespace='osgi.bundle' name='org.apache.poi' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.common.usermodel' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.ddf' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.dev' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hpsf' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hpsf.extractor' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hpsf.wellknown' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf.dev' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf.eventmodel' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf.eventusermodel' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf.eventusermodel.dummyrecord' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf.extractor' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf.model' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf.record' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf.record.aggregates' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf.record.cf' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf.record.chart' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf.record.common' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf.record.constant' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf.record.cont' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf.record.crypto' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf.record.formula' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf.record.formula.atp' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf.record.formula.eval' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf.record.formula.function' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf.record.formula.functions' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf.record.formula.udf' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf.record.pivottable' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf.usermodel' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.hssf.util' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.poifs.common' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.poifs.crypt' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.poifs.dev' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.poifs.eventfilesystem' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.poifs.filesystem' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.poifs.property' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.poifs.storage' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.ss' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.ss.extractor' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.ss.format' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.ss.formula' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.ss.formula.eval' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.ss.formula.eval.forked' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.ss.usermodel' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.ss.util' version='3.7.0'/>
<provided namespace='java.package' name='org.apache.poi.util' version='3.7.0'/>
<provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
</provides>
<requires size='11'>
<required namespace='java.package' name='javax.imageio' range='0.0.0'/>
<required namespace='java.package' name='javax.xml.transform' range='0.0.0'/>
<required namespace='java.package' name='javax.crypto.spec' range='0.0.0'/>
<required namespace='java.package' name='javax.crypto' range='0.0.0'/>
<required namespace='java.package' name='org.apache.commons.logging' range='0.0.0'/>
<required namespace='java.package' name='javax.imageio.metadata' range='0.0.0'/>
<required namespace='java.package' name='javax.imageio.stream' range='0.0.0'/>
<required namespace='java.package' name='javax.swing' range='0.0.0'/>
<required namespace='java.package' name='javax.xml.parsers' range='0.0.0'/>
<required namespace='java.package' name='javax.xml.transform.stream' range='0.0.0'/>
<required namespace='java.package' name='org.w3c.dom' range='1.3.4'/>
</requires>
<artifacts size='1'>
<artifact classifier='osgi.bundle' id='org.apache.poi' version='3.7.0'/>
</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.poi&#xA;Bundle-Version: 3.7.0&#xA;
</instruction>
</instructions>
</touchpointData>
</unit>
</units>
</repository>

2
lib/generatep2.txt Normal file
View File

@ -0,0 +1,2 @@
eclipse -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher -metadataRepository file:/<workspace root>/lib -artifactRepository file:/<workspace root>/lib -source lib -publishArtifact

View File

@ -6,13 +6,7 @@
<cq:property key="target.ws" value="*"/>
<cq:advisorNode namePattern="^org\.restlet(\..+)?" componentType="osgi.bundle" versionOverride="[2.0.7,2.1.0)"/>
<cq:advisorNode namePattern="^com\.springsource\.slf4j\.jcl$" componentType="osgi.bundle" versionOverride="[1.6.1,1.7.0)"/>
<cq:advisorNode namePattern="^org\.apache\.poi$" componentType="osgi.bundle" versionOverride="[3.7.0,4.0.0)">
<cq:property key="jar.version" value="3.7.0"/>
</cq:advisorNode>
<cq:advisorNode namePattern="^com\.springsource\.javax\.mail$" componentType="osgi.bundle" versionOverride="[1.4.5,1.4.5]">
<cq:property key="jar.version" value="1.4.5"/>
</cq:advisorNode>
<cq:advisorNode namePattern="^com\.springsource\.javax\.activation$" componentType="osgi.bundle">
<cq:property key="jar.version" value="1.1.1"/>
</cq:advisorNode>
<cq:advisorNode namePattern="^org\.apache\.poi$" componentType="osgi.bundle" versionOverride="[3.7.0,4.0.0)"/>
<cq:advisorNode namePattern="^com\.springsource\.javax\.mail$" componentType="osgi.bundle" versionOverride="[1.4.5,1.4.5]"/>
<cq:advisorNode namePattern="^com\.springsource\.javax\.activation$" componentType="osgi.bundle"/>
</cq:componentQuery>

View File

@ -3,6 +3,7 @@
<rm:locator pattern="^org\.apache\.poi$" searchPathRef="workspace.bundle.jar"/>
<rm:locator pattern="^com\.springsource\.javax\.mail$" searchPathRef="workspace.bundle.jar"/>
<rm:locator pattern="^com\.springsource\.javax\.activation$" searchPathRef="workspace.bundle.jar"/>
<rm:locator searchPathRef="workspace.bundle.jar" failOnError="false"/>
<rm:locator pattern="^org\.eclipse(\..+)?" searchPathRef="equinox" failOnError="false"/>
<rm:locator pattern="^org\.sat4j(\..+)?" searchPathRef="equinox"/>
<rm:locator pattern="^org\.slf4j(\..+)?" searchPathRef="orbit"/>
@ -13,7 +14,6 @@
<rm:locator pattern="^com\.springsource(\..+)?" searchPathRef="gemini" failOnError="false"/>
<rm:locator pattern="^org\.springframework(\..+)?" searchPathRef="gemini" failOnError="false"/>
<rm:locator pattern="^javax(\..+)?" searchPathRef="gemini" failOnError="false"/>
<rm:locator pattern="^com\.springsource(\..+)?" searchPathRef="workspace.bundle.jar" failOnError="false"/>
<rm:locator pattern="^org\.restlet(\..+)?" searchPathRef="restlet.maven" failOnError="false"/>
<rm:locator pattern="^com\.springsource(\..+)?" searchPathRef="spring.external.maven" failOnError="false"/>
<rm:locator searchPathRef="orbit" failOnError="false"/>
@ -35,16 +35,14 @@
</rm:provider>
</rm:searchPath>
<rm:searchPath name="workspace.bundle.jar">
<rm:provider componentTypes="osgi.bundle" readerType="url" source="false" mutable="false">
<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="file:///{0}/lib/plugins/{1}_{2}.jar">
<rm:uri format="file:///{0}/lib">
<bc:replace>
<bc:propertyRef key="workspace.root"/>
<bc:match pattern="\s" replacement="%20"/>
</bc:replace>
<bc:propertyRef key="buckminster.component"/>
<bc:propertyRef key="jar.version"/>
</rm:uri>
</rm:provider>
</rm:searchPath>