Create a p2 site for the Ptolemy II bundles

[cxbrooks]

Now that the Ptolemy II bundles have completed the CQ IP process, we need to update the [https://wiki.eclipse.org/Triquetrum/Ptolemy/osgi-2-0 osg-2-0 build] on the [http://terra.eecs.berkeley.edu:8080/job/ptIIosgi/ Ptolemy II Jenkins osgi-2-0 build] to create the p2 site and update a website with this information.

After that is done, the .tpd files should be updated to refer to the new location.

See https://wiki.eclipse.org/Triquetrum/Ptolemy/osgi-2-0#Setting_up_the_p2_repository

[cxbrooks]

The summary is that I have set up p2 site at https://chess.eecs.berkeley.edu/triq/p2/osgi-2-0/.
However, it does not quite work yet.

Details below:

I have a p2 site set up as part of the osgi-2-0 build on http://terra.eecs.berkeley.edu:8080/job/ptIIosgi. At the end of the build, the contents of releng/org.ptolemy.tycho.update/target/** are copied to ~www/cvswww/chess.eecs.berkeley.edu/triq/. A symbolic link from ~www/cvswww/chess.eecs.berkeley.edu/triq/p2/osgi-2-0 to ../releng/org.ptolemy.tycho.update/target/repository was created, so the update site may be found at https://chess.eecs.berkeley.edu/triq/p2/osgi-2-0/

The problem is that if updating the tpd siteto use the new p2 site fails because the ptolemy classes are not found.

Details:

1. Close the org.eclipse.triquetrum.dependencies project. Can we just delete this project? If it is not closed, then you will get errors about ptolemy.vergil.kernel.attributes missing because that package is not present in the dependencies project.

2. Edit org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.target.platform.tpd so that the old site is not used and the new site is used:

// location "http://users.telenet.be/triquetrum-ptolemy-p2/" {
//      org.eclipse.triquetrum.ptolemy.feature.source.feature.group lazy
//        org.eclipse.triquetrum.ptolemy.feature.feature.group lazy
//}
location "https://chess.eecs.berkeley.edu/triq/p2/osgi-2-0/" {
     org.ptolemy.tycho.feature.feature.group lazy
}

3. Right click on the tpd file and click on Create Target Definition File

org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.target.platform.target now contains:

<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
...
    <location includeMode="slicer" includeAllPlatforms="true" includeSource="false" includeConfigurePhase="true" type="InstallableUnit">
      <unit id="org.ptolemy.tycho.feature.feature.group" version="0.0.0"/>
      <repository location="https://chess.eecs.berkeley.edu/triq/p2/osgi-2-0/"/>
    </location>

4. Open the target and click on "Set as Target Platform

5. The build will fail, there will be many problems because the ptolemy classes are not found.

However, if, in the target window (org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.target.platform.target), I press reload and then Set as Target Platform, the build works without problems!

If I save org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.target.platform.target, then it now contains:

<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="false" type="InstallableUnit">
<unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<unit id="org.apache.commons.io.source" version="2.2.0.v201405211200"/>
<unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
<unit id="org.apache.commons.lang.source" version="2.6.0.v201404270220"/>
<unit id="org.apache.commons.lang" version="2.6.0.v201404270220"/>
<unit id="org.apache.commons.codec" version="1.6.0.v201305230611"/>
<unit id="org.apache.commons.logging" version="1.1.1.v201101211721"/>
<unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
<unit id="org.apache.ws.commons.util" version="1.0.1.v20100518-1140"/>
<unit id="org.apache.xmlrpc" version="3.0.0.v20100427-1100"/>
<unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
<unit id="org.hamcrest.generator" version="1.3.0.v201305210900"/>
<unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/>
<unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.impl.log4j12" version="1.7.2.v20131105-2200"/>
<unit id="javax.xml" version="1.3.4.v201005080400"/>
<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
<unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
<unit id="javax.activation" version="1.1.0.v201211130549"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20151118145958/repository/"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="true" includeMode="slicer" includeSource="false" type="InstallableUnit">
<unit id="org.ptolemy.tycho.feature.feature.group" version="0.0.0"/>
<repository location="https://chess.eecs.berkeley.edu/triq/p2/osgi-2-0/"/>
</location>

Note that the comment about "generated with" is missing.

So, what I think is going on is that I'm not properly creating feature.

The content.xml file in https://chess.eecs.berkeley.edu/triq/p2/osgi-2-0/content.jar defins the following unit for org.ptolemy.tycho.feature.featue.group:

    <unit id='org.ptolemy.tycho.feature.feature.group' version='1.0.0.201608301739' singleton='false'>
      <update id='org.ptolemy.tycho.feature.feature.group' range='[0.0.0,1.0.0.201608301739)' severity='0'/>
      <properties size='7'>
        <property name='org.eclipse.equinox.p2.name' value='Feature'/>
        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
        <property name='org.eclipse.equinox.p2.type.group' value='true'/>
        <property name='maven-groupId' value='org.ptolemy.tycho'/>
        <property name='maven-artifactId' value='org.ptolemy.tycho.feature'/>
        <property name='maven-version' value='1.0.0-SNAPSHOT'/>
      </properties>
      <provides size='1'>
        <provided namespace='org.eclipse.equinox.p2.iu' name='org.ptolemy.tycho.feature.feature.group' version='1.0.0.201608301739'/>
      </provides>
      <requires size='28'>
        <required namespace='org.eclipse.equinox.p2.iu' name='org.w3c.dom.svg' range='0.0.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='org.ptolemy.testsupport' range='10.1.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.core' range='10.1.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.actor.lib' range='10.1.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.domains.sdf' range='10.1.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.gui' range='10.1.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='org.junit' range='0.0.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.osgi' range='0.0.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='org.ptolemy.testsupport' range='11.0.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.core' range='11.0.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.actor.lib' range='11.0.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.domains.sdf' range='11.0.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.domains.process' range='11.0.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.moml' range='11.0.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='diva' range='[11.0.0.201608301739,11.0.0.201608301739]'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='org.ptolemy.actor.gui.test' range='[10.1.0.201608301739,10.1.0.201608301739]'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='org.ptolemy.commons' range='[11.0.0.201608301739,11.0.0.201608301739]'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='org.ptolemy.core.test' range='[11.0.0.201608301739,11.0.0.201608301739]'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='org.ptolemy.core.test.actor' range='[11.0.0.201608301739,11.0.0.201608301739]'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='org.ptolemy.testsupport' range='[11.0.0.201608301739,11.0.0.201608301739]'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.actor.lib' range='[11.0.0.201608301739,11.0.0.201608301739]'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.actor.lib.gui' range='[11.0.0.201608301739,11.0.0.201608301739]'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.core' range='[11.0.0.201608301739,11.0.0.201608301739]'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.domains.process' range='[11.0.0.201608301739,11.0.0.201608301739]'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.domains.sdf' range='[11.0.0.201608301739,11.0.0.201608301739]'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.gui' range='[11.0.0.201608301739,11.0.0.201608301739]'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.moml' range='[11.0.0.201608301739,11.0.0.201608301739]'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='org.ptolemy.tycho.feature.feature.jar' range='[1.0.0.201608301739,1.0.0.201608301739]'>
          <filter>
            (org.eclipse.update.install.features=true)
          </filter>
        </required>
      </requires>
      <touchpoint id='null' version='0.0.0'/>
      <licenses size='1'>
        <license uri='http://www.example.com/license' url='http://www.example.com/license'>
          [Enter License Description here.]
        </license>
      </licenses>
      <copyright uri='http://www.example.com/copyright' url='http://www.example.com/copyright'>
        [Enter Copyright Description here.]
      </copyright>
    </unit>

However, content.xml for ttp://users.telenet.be/triquetrum-ptolemy-p2/content.jar is different:

    <unit id='org.eclipse.triquetrum.ptolemy.feature.feature.group' version='1.0.0.201605041253' singleton='false'>
      <update id='org.eclipse.triquetrum.ptolemy.feature.feature.group' range='[0.0.0,1.0.0.201605041253)' severity='0'/>
      <properties size='4'>
        <property name='org.eclipse.equinox.p2.name' value='Triquetrum ptolemy feature'/>
        <property name='org.eclipse.equinox.p2.description' value='[Enter Feature Description here.]'/>
        <property name='org.eclipse.equinox.p2.description.url' value='http://www.example.com/description'/>
    <property name='org.eclipse.equinox.p2.type.group' value='true'/>
      </properties>
      <provides size='1'>
    <provided namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.triquetrum.ptolemy.feature.feature.group' version='1.0.0.201605041253'/>
      </provides>
      <requires size='10'>
        <required namespace='org.eclipse.equinox.p2.iu' name='diva' range='[11.0.0.201603211938,11.0.0.201603211938]'/>
    <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.actor.lib' range='[11.0.0.201605041253,11.0.0.201605041253]'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.actor.lib.gui' range='[11.0.0.201605041253,11.0.0.201605041253]'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.core' range='[11.0.0.201605041253,11.0.0.201605041253]'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.domains.process' range='[11.0.0.201605041253,11.0.0.201605041253]'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.domains.sdf' range='[11.0.0.201605041253,11.0.0.201605041253]'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.gui' range='[11.0.0.201605041253,11.0.0.201605041253]'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.moml' range='[11.0.0.201605041253,11.0.0.201605041253]'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='org.ptolemy.commons' range='[11.0.0.201605041253,11.0.0.201605041253]'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.triquetrum.ptolemy.feature.feature.jar' range='[1.0.0.201605041253,1.0.0.201\
605041253]'>
          <filter>
            (org.eclipse.update.install.features=true)
          </filter>
        </required>
      </requires>
      <touchpoint id='null' version='0.0.0'/>
      <licenses size='1'>
    <license uri='http://www.example.com/license' url='http://www.example.com/license'>
          [Enter License Description here.]
    </license>
      </licenses>
      <copyright uri='http://www.example.com/copyright' url='http://www.example.com/copyright'>
        [Enter Copyright Description here.]
      </copyright>
    </unit>

If I edit content.xml from the chess site and remove

       <required namespace='org.eclipse.equinox.p2.iu' name='org.w3c.dom.svg' range='0.0.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='org.ptolemy.testsupport' range='10.1.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.core' range='10.1.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.actor.lib' range='10.1.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.domains.sdf' range='10.1.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.gui' range='10.1.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='org.junit' range='0.0.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.osgi' range='0.0.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='org.ptolemy.testsupport' range='11.0.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.core' range='11.0.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.actor.lib' range='11.0.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.domains.sdf' range='11.0.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.domains.process' range='11.0.0'/>
        <required namespace='org.eclipse.equinox.p2.iu' name='ptolemy.moml' range='11.0.0'/>

and then recreate content.jar and update it on the chess site, then creating the target file from the tpd file works!

So, the question is how to make it so that the content.xml file on the chess p2 update site does not include the duplicate requirements.

[cxbrooks]

The fix was to update the osgi-2-0 repo and remove the ptolemy and diva plug-ins from the feature and category.

The p2 repo is now being updated automatically from the osgi-2-0 Jenkins job at http://terra.eecs.berkeley.edu:8080/job/ptIIosgi/

Details are at https://wiki.eclipse.org/Triquetrum/Ptolemy/osgi-2-0#The_Ptolemy_II_osgi-2-0_p2_repository

[erwindl0]

The dependencies project can (should) indeed be deleted, as far as I can
tell.

Op 8/30/2016 om 8:11 PM schreef Christopher Brooks:

The summary is that I have set up p2 site at
https://chess.eecs.berkeley.edu/triq/p2/osgi-2-0/.
However, it does not quite work yet.

Details below:

I have a p2 site set up as part of the osgi-2-0 build on
http://terra.eecs.berkeley.edu:8080/job/ptIIosgi. At the end of the
build, the contents of releng/org.ptolemy.tycho.update/target/** are
copied to ~www/cvswww/chess.eecs.berkeley.edu/triq/. A symbolic link
from ~www/cvswww/chess.eecs.berkeley.edu/triq/p2/osgi-2-0 to
../releng/org.ptolemy.tycho.update/target/repository was created, so
the update site may be found at
https://chess.eecs.berkeley.edu/triq/p2/osgi-2-0/

The problem is that if updating the tpd siteto use the new p2 site
fails because the ptolemy classes are not found.

Details:

1. Close the org.eclipse.triquetrum.dependencies project. Can we just
   delete this project? If it is not closed, then you will get errors
   about ptolemy.vergil.kernel.attributes missing because that package is
   not present in the dependencies project.

2. Edit
   org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.target.platform.tpd
   so that the old site is not used and the new site is used:

|// location "http://users.telenet.be/triquetrum-ptolemy-p2/" { //
org.eclipse.triquetrum.ptolemy.feature.source.feature.group lazy //
org.eclipse.triquetrum.ptolemy.feature.feature.group lazy //} location
"https://chess.eecs.berkeley.edu/triq/p2/osgi-2-0/" {
org.ptolemy.tycho.feature.feature.group lazy } |

3. Right click on the tpd file and click on Create Target Definition File

org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.target.platform.target
now contains:

| ...


|

4. Open the target and click on "Set as Target Platform

5. The build will fail, there will be many problems because the
   ptolemy classes are not found.

However, if, in the target window
(org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.target.platform.target),
I press reload and then Set as Target Platform, the build works
without problems!

If I save
org.eclipse.triquetrum.target.platform/org.eclipse.triquetrum.target.platform.target,
then it now contains:

|








|

Note that the comment about "generated with" is missing.

So, what I think is going on is that I'm not properly creating feature.

The content.xml file in
https://chess.eecs.berkeley.edu/triq/p2/osgi-2-0/content.jar defins
the following unit for org.ptolemy.tycho.feature.featue.group:

|


(org.eclipse.update.install.features=true)
[Enter License Description
here.] [Enter Copyright Description
here.] |

However, content.xml for
ttp://users.telenet.be/triquetrum-ptolemy-p2/content.jar is different:

|


(org.eclipse.update.install.features=true)
[Enter License Description
here.] [Enter Copyright Description
here.] |

If I edit content.xml from the chess site and remove

|
|

and then recreate content.jar and update it on the chess site, then
creating the target file from the tpd file works!

So, the question is how to make it so that the content.xml file on the
chess p2 update site does not include the duplicate requirements.

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
#114 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AGKZ4ThDmnwyU215EeJ-cG6UH-2zQwH4ks5qlHJLgaJpZM4Jv-6C.