Changeset 488

Timestamp:

07/21/09 13:52:57 (3 years ago)

Author:

sam

Message:

sync with Dokiel & migr 3.6.015

Location:

trunk

Files:

• deriver/overwrite/sources/.wspmeta (modified) (1 diff)
• model/sources/.wspmeta (modified) (1 diff)
• model/sources/dkCore/genSld/transf/content/text.transf (modified) (2 diffs)
• model/sources/dkCore/genWeb/transf/content/text.transf (modified) (2 diffs)
• model/sources/dkGuide/genWeb/transf/tree/section@/section@secAlone.transf (modified) (2 diffs)

trunk/deriver/overwrite/sources/.wspmeta

@@ -4 +4 @@
 <option defaultSelect="no" refUri="utc_sc3-3.6"/>
 </categ>
-</config><wspUpdate currentVersion="3.6.012" localAutoUpdate="minor"><res key="sm_modeling-3.6"><description title="Atelier de conception de modèles documentaires"/></res></wspUpdate><systemSpace space="~param/sc3/base" currentVersion="3.6.012" localAutoUpdate="minor"><res key="sm.base-3.6"><description title="Classes de base"/></res></systemSpace><systemSpace space="~param/sc3/resources" currentVersion="3.6.012" localAutoUpdate="minor"><res key="sm.resources-3.6"><description title="Classes de ressources"/></res></systemSpace><systemSpace space="~param/sc3/modeling" currentVersion="3.6.012" localAutoUpdate="minor"><res key="sm.modeling-3.6"><description title="Classes pour la construction de modèles"/></res></systemSpace><editionSheet pack="sm_modeling3_6" xpi="http://scenari.utc.fr/deploiement/update/sm_modeling3_6.xpi"/><editionSheet pack="sm_resources3_6" xpi="http://scenari.utc.fr/deploiement/update/sm_resources3_6.xpi"/><editionSheet pack="sm_base3_6" xpi="http://scenari.utc.fr/deploiement/update/sm_base3_6.xpi"/></wspType>
+</config><wspUpdate currentVersion="3.6.015" localAutoUpdate="minor"><res key="sm_modeling-3.6"><description title="Atelier de conception de modèles documentaires"/></res></wspUpdate><systemSpace space="~param/sc3/base" localAutoUpdate="minor"><res key="sm.base-3.6"><description title="Classes de base"/></res></systemSpace><systemSpace space="~param/sc3/resources" localAutoUpdate="minor"><res key="sm.resources-3.6"><description title="Classes de ressources"/></res></systemSpace><systemSpace space="~param/sc3/modeling" localAutoUpdate="minor"><res key="sm.modeling-3.6"><description title="Classes pour la construction de modèles"/></res></systemSpace><editionSheet pack="sm_modeling3_6" xpi="http://scenari.utc.fr/deploiement/update/sm_modeling3_6.xpi"/><editionSheet pack="sm_resources3_6" xpi="http://scenari.utc.fr/deploiement/update/sm_resources3_6.xpi"/><editionSheet pack="sm_base3_6" xpi="http://scenari.utc.fr/deploiement/update/sm_base3_6.xpi"/></wspType>

trunk/model/sources/.wspmeta

@@ -4 +4 @@
 <option defaultSelect="no" refUri="utc_sc3-3.6"/>
 </categ>
-</config><wspUpdate currentVersion="3.6.012" localAutoUpdate="minor"><res key="sm_modeling-3.6"><description title="Atelier de conception de modèles documentaires"/></res></wspUpdate><systemSpace space="~param/sc3/base" currentVersion="3.6.012" localAutoUpdate="minor"><res key="sm.base-3.6"><description title="Classes de base"/></res></systemSpace><systemSpace space="~param/sc3/resources" currentVersion="3.6.012" localAutoUpdate="minor"><res key="sm.resources-3.6"><description title="Classes de ressources"/></res></systemSpace><systemSpace space="~param/sc3/modeling" currentVersion="3.6.012" localAutoUpdate="minor"><res key="sm.modeling-3.6"><description title="Classes pour la construction de modèles"/></res></systemSpace><editionSheet pack="sm_modeling3_6" xpi="http://scenari.utc.fr/deploiement/update/sm_modeling3_6.xpi"/><editionSheet pack="sm_resources3_6" xpi="http://scenari.utc.fr/deploiement/update/sm_resources3_6.xpi"/><editionSheet pack="sm_base3_6" xpi="http://scenari.utc.fr/deploiement/update/sm_base3_6.xpi"/></wspType>
+</config><wspUpdate currentVersion="3.6.015" localAutoUpdate="minor"><res key="sm_modeling-3.6"><description title="Atelier de conception de modèles documentaires"/></res></wspUpdate><systemSpace space="~param/sc3/base" localAutoUpdate="minor"><res key="sm.base-3.6"><description title="Classes de base"/></res></systemSpace><systemSpace space="~param/sc3/resources" localAutoUpdate="minor"><res key="sm.resources-3.6"><description title="Classes de ressources"/></res></systemSpace><systemSpace space="~param/sc3/modeling" localAutoUpdate="minor"><res key="sm.modeling-3.6"><description title="Classes pour la construction de modèles"/></res></systemSpace><editionSheet pack="sm_modeling3_6" xpi="http://scenari.utc.fr/deploiement/update/sm_modeling3_6.xpi"/><editionSheet pack="sm_resources3_6" xpi="http://scenari.utc.fr/deploiement/update/sm_resources3_6.xpi"/><editionSheet pack="sm_base3_6" xpi="http://scenari.utc.fr/deploiement/update/sm_base3_6.xpi"/></wspType>

trunk/model/sources/dkCore/genSld/transf/content/text.transf

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sm:textXhtmlTransf xmlns:sc="http://www.utc.fr/ics/scenari/v3/core" xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling">
+<?xml version="1.0" encoding="UTF-8"?><sm:textXhtmlTransf xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling" xmlns:sc="http://www.utc.fr/ics/scenari/v3/core">
         <sm:model sc:refUri="/dkCore/model/content/text.model"/>
         <sm:content>
@@ -13 +12 @@
                         <sm:columnTag role="colTi" preferedCellTagName="th"/>
                         <sm:columnTag role="col"/>
-                        <sm:rowTag role="rowTi" preferedRowPosition="head" preferedCellTagName="th"/>
+                        <sm:rowTag role="rowTi" preferedCellTagName="th"/>
                         <sm:rowTag role="row"/>
                         <sm:cellTag role="cell"/>

trunk/model/sources/dkCore/genWeb/transf/content/text.transf

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sm:textXhtmlTransf xmlns:sc="http://www.utc.fr/ics/scenari/v3/core" xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling">
+<?xml version="1.0" encoding="UTF-8"?><sm:textXhtmlTransf xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling" xmlns:sc="http://www.utc.fr/ics/scenari/v3/core">
         <sm:model sc:refUri="/dkCore/model/content/text.model"/>
         <sm:content classConstructionType="legacy">
@@ -13 +12 @@
                         <sm:columnTag role="colTi" preferedCellTagName="th"/>
                         <sm:columnTag role="col"/>
-                        <sm:rowTag role="rowTi" preferedRowPosition="head" preferedCellTagName="th"/>
+                        <sm:rowTag role="rowTi" preferedCellTagName="th"/>
                         <sm:rowTag role="row"/>
                         <sm:cellTag role="cell"/>

trunk/model/sources/dkGuide/genWeb/transf/tree/section@/section@secAlone.transf

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8"?><sm:compositionXhtmlTransf xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling" xmlns:sc="http://www.utc.fr/ics/scenari/v3/core">
+<?xml version="1.0" encoding="UTF-8"?>
+<sm:compositionXhtmlTransf xmlns:sc="http://www.utc.fr/ics/scenari/v3/core" xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling">
         <sm:model sc:refUri="/dkGuide/model/tree/section.model"/>
         <sm:axis code="secAlone"/>
@@ -6 +7 @@
                         <sm:when codes="content seeAlso">
                                 <sm:callModel>
-                                        <sm:lookForAscendants direction="currentToRoot" axis="secAlone">
-                                                <sm:callableModel sc:refUri="/dkGuide/model/tree/webRoot.model"/>
-                                        </sm:lookForAscendants>
+                                        <sm:root axis="secAlone"/>
                                 </sm:callModel>
                         </sm:when>